1

pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -15,27 +15,32 @@
 				<jiazhengUpload @getFileUrl="getSfzGuohui" :img='idcardUrl2' bottomText="上传身份证国徽面"></jiazhengUpload>
 			</view>
 		</view>
+
+		<uni-collapse>
+			<uni-collapse-item title="展开更多">
 		<view class="form-label-switch form-top-margin">
-			<view class="phone-form-label"><text class="form-label-require"></text>体检报告</view>
+			<view class="phone-form-label"><text class="form-label-require"></text>体检报告</view> 
 			<!-- <switch @change="switchGzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
 		</view>
 		<view class="zhaopianZiliao-shenfenzhengImg">
 			<view class="ziliao-upload-box">
-				<view v-for="(item, index) in tijianbaogaoList" :key="index" v-if="tijianbaogaoList.length>0" class="ziliao-image-box">
+				<view v-for="(item, index) in tijianbaogaoList" :key="index" v-if="tijianbaogaoList.length>0"
+					class="ziliao-image-box">
 					<img class="ziliao-image" :src="item" alt="">
 					<view @click="deleteTijianbaogao(item,index)" class="ziliao-image-close"></view>
 				</view>
 				<jiazhengUpload changjingType="more" @getFileUrl="getTijianbaogao"></jiazhengUpload>
 			</view>
 		</view>
-
+		
 		<view class="form-label-switch form-top-margin">
 			<view class="phone-form-label"><text class="form-label-require"></text>工作生活照</view>
 			<!-- <switch @change="switchGzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
 		</view>
 		<view class="zhaopianZiliao-shenfenzhengImg">
 			<view class="ziliao-upload-box">
-				<view v-for="(item, index) in shenghuizhaoList" :key="index" v-if="shenghuizhaoList.length>0" class="ziliao-image-box">
+				<view v-for="(item, index) in shenghuizhaoList" :key="index" v-if="shenghuizhaoList.length>0"
+					class="ziliao-image-box">
 					<img class="ziliao-image" :src="item" alt="">
 					<view @click="deleteShenghuoZhao(item,index)" class="ziliao-image-close"></view>
 				</view>
@@ -48,7 +53,8 @@
 		</view>
 		<view class="zhaopianZiliao-shenfenzhengImg">
 			<view class="ziliao-upload-box">
-				<view v-for="(item, index) in zigezhaoList" :key="index" v-if="zigezhaoList.length>0" class="ziliao-image-box">
+				<view v-for="(item, index) in zigezhaoList" :key="index" v-if="zigezhaoList.length>0"
+					class="ziliao-image-box">
 					<img class="ziliao-image" :src="item" alt="">
 					<view @click="deleteZigeZhao(item,index)" class="ziliao-image-close"></view>
 				</view>
@@ -64,7 +70,7 @@
 				</view>
 			</uni-datetime-picker>
 		</view>
-
+		
 		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require"></text>健康证日期</view>
 			<uni-datetime-picker class="form-radio-picker" type="date" @change="changeJiankang">
@@ -74,6 +80,11 @@
 				</view>
 			</uni-datetime-picker>
 		</view>
+			</uni-collapse-item>
+
+		</uni-collapse>
+
+	
 
 		<!-- 	<view class="zpzl-tip-box form-top-margin">
 			<view>体检报告文件</view>
@@ -132,7 +143,7 @@
 			jiazhengUpload
 		},
 		methods: {
-			editinfo(data) {
+			editinfo(data) { 
 				console.log('data', data);
 				this.$nextTick(() => {
 					this.icon = data.icon
@@ -208,9 +219,9 @@
 					idcardUrl1: this.idcardUrl1,
 					idcardUrl2: this.idcardUrl2,
 					tijianbaogaoFlag: this.tijianbaogaoFlag,
-					shenghuoUrls:  this.shenghuizhaoList?this.shenghuizhaoList.join(','):'',
-					zhengshuUrls:  this.zigezhaoList?this.zigezhaoList.join(','):'',
-					tijianUrls:  this.tijianbaogaoList?this.tijianbaogaoList.join(','):'',
+					shenghuoUrls: this.shenghuizhaoList ? this.shenghuizhaoList.join(',') : '',
+					zhengshuUrls: this.zigezhaoList ? this.zigezhaoList.join(',') : '',
+					tijianUrls: this.tijianbaogaoList ? this.tijianbaogaoList.join(',') : '',
 					tijianDate: this.tijianDate,
 					jiankangDate: this.jiankangDate,
 
@@ -229,7 +240,7 @@
 					zhengshuUrls: this.zigezhaoList.length > 0 ? this.zigezhaoList.join(',') : '',
 					tijianDate: this.tijianDate,
 					jiankangDate: this.jiankangDate,
-					tijianUrls:  this.tijianbaogaoList?this.tijianbaogaoList.join(','):'',
+					tijianUrls: this.tijianbaogaoList ? this.tijianbaogaoList.join(',') : '',
 
 				}
 				console.log('this.formData', this.formData);

uni_modules/uni-collapse/changelog.md

@@ -1,3 +1,5 @@
+## 1.4.4（2024-03-20）
+- 修复 titleBorder类型修正
 ## 1.4.3（2022-01-25）
 - 修复 初始化的时候 ，open 属性失效的bug
 ## 1.4.2（2022-01-21）

uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue

@@ -40,7 +40,7 @@
 	 * @property {String} name 唯一标志符
 	 * @property {Boolean} open = [true|false] 是否展开组件
 	 * @property {Boolean} titleBorder = [true|false] 是否显示标题分隔线
-	 * @property {Boolean} border = [true|false] 是否显示分隔线
+	 * @property {String} border = ['auto'|'show'|'none'] 是否显示分隔线
 	 * @property {Boolean} disabled = [true|false] 是否展开面板
 	 * @property {Boolean} showAnimation = [true|false] 开启动画
 	 * @property {Boolean} showArrow = [true|false] 是否显示右侧箭头

uni_modules/uni-collapse/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-collapse",
   "displayName": "uni-collapse 折叠面板",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "Collapse 组件，可以折叠 / 展开的内容区域。",
   "keywords": [
     "uni-ui",
@@ -16,11 +16,7 @@
   "directories": {
     "example": "../../temps/example_temps"
   },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
+"dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -37,7 +33,8 @@
       "data": "无",
       "permissions": "无"
     },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
   },
   "uni_modules": {
     "dependencies": [

uni_modules/uni-icons/changelog.md

@@ -1,3 +1,23 @@
+## 2.0.10（2024-06-07）
+- 优化 uni-app x 中，size 属性的类型
+## 2.0.9（2024-01-12）
+fix: 修复图标大小默认值错误的问题
+## 2.0.8（2023-12-14）
+- 修复 项目未使用 ts 情况下，打包报错的bug
+## 2.0.7（2023-12-14）
+- 修复 size 属性为 string 时，不加单位导致尺寸异常的bug
+## 2.0.6（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.5（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.4（2023-12-06）
+- 优化 uni-app x 下示例项目图标排序
+## 2.0.3（2023-12-06）
+- 修复 nvue下引入组件报错的bug
+## 2.0.2（2023-12-05）
+-优化 size 属性支持单位
+## 2.0.1（2023-12-05）
+- 新增 uni-app x 支持定义图标
 ## 1.3.5（2022-01-24）
 - 优化 size 属性可以传入不带单位的字符串数值
 ## 1.3.4（2022-01-24）

uni_modules/uni-icons/components/uni-icons/uni-icons.vue

@@ -1,24 +1,28 @@
 <template>
 	<!-- #ifdef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<text :style="styleObj" class="uni-icons" @click="_onClick">{{unicode}}</text>
 	<!-- #endif -->
 	<!-- #ifndef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<text :style="styleObj" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick">
+		<slot></slot>
+	</text>
 	<!-- #endif -->
 </template>
 
 <script>
-	import icons from './icons.js';
+	import { fontData } from './uniicons_file_vue.js';
+
 	const getVal = (val) => {
 		const reg = /^[0-9]*$/g
-		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
-	} 
+		return (typeof val === 'number' || reg.test(val)) ? val + 'px' : val;
+	}
+
 	// #ifdef APP-NVUE
 	var domModule = weex.requireModule('dom');
 	import iconUrl from './uniicons.ttf'
 	domModule.addRule('fontFace', {
 		'fontFamily': "uniicons",
-		'src': "url('"+iconUrl+"')"
+		'src': "url('" + iconUrl + "')"
 	});
 	// #endif
 
@@ -34,7 +38,7 @@
 	 */
 	export default {
 		name: 'UniIcons',
-		emits:['click'],
+		emits: ['click'],
 		props: {
 			type: {
 				type: String,
@@ -48,26 +52,36 @@
 				type: [Number, String],
 				default: 16
 			},
-			customPrefix:{
+			customPrefix: {
+				type: String,
+				default: ''
+			},
+			fontFamily: {
 				type: String,
 				default: ''
 			}
 		},
 		data() {
 			return {
-				icons: icons.glyphs
+				icons: fontData
 			}
 		},
-		computed:{
-			unicode(){
-				let code = this.icons.find(v=>v.font_class === this.type)
-				if(code){
-					return unescape(`%u${code.unicode}`)
+		computed: {
+			unicode() {
+				let code = this.icons.find(v => v.font_class === this.type)
+				if (code) {
+					return code.unicode
 				}
 				return ''
 			},
-			iconSize(){
+			iconSize() {
 				return getVal(this.size)
+			},
+			styleObj() {
+				if (this.fontFamily !== '') {
+					return `color: ${this.color}; font-size: ${this.iconSize}; font-family: ${this.fontFamily};`
+				}
+				return `color: ${this.color}; font-size: ${this.iconSize};`
 			}
 		},
 		methods: {
@@ -81,9 +95,10 @@
 <style lang="scss">
 	/* #ifndef APP-NVUE */
 	@import './uniicons.css';
+
 	@font-face {
 		font-family: uniicons;
-		src: url('./uniicons.ttf') format('truetype');
+		src: url('./uniicons.ttf');
 	}
 
 	/* #endif */
@@ -92,5 +107,4 @@
 		text-decoration: none;
 		text-align: center;
 	}
-
 </style>

uni_modules/uni-icons/components/uni-icons/uniicons.css

@@ -1,3 +1,12 @@
+
+.uniui-cart-filled:before {
+  content: "\e6d0";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
 .uniui-color:before {
   content: "\e6cf";
 }
@@ -58,10 +67,6 @@
   content: "\e6c3";
 }
 
-.uniui-gift-filled:before {
-  content: "\e6c4";
-}
-
 .uniui-fire-filled:before {
   content: "\e6c5";
 }
@@ -82,6 +87,18 @@
   content: "\e698";
 }
 
+.uniui-arrowthinleft:before {
+  content: "\e6d2";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6d3";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6d4";
+}
+
 .uniui-back:before {
   content: "\e6b9";
 }
@@ -94,55 +111,43 @@
   content: "\e6bb";
 }
 
-.uniui-arrowthinright:before {
-  content: "\e6bb";
-}
-
 .uniui-arrow-left:before {
   content: "\e6bc";
 }
 
-.uniui-arrowthinleft:before {
-  content: "\e6bc";
-}
-
 .uniui-arrow-up:before {
   content: "\e6bd";
 }
 
-.uniui-arrowthinup:before {
-  content: "\e6bd";
-}
-
 .uniui-arrow-down:before {
   content: "\e6be";
 }
 
-.uniui-arrowthindown:before {
-  content: "\e6be";
+.uniui-arrowthinright:before {
+  content: "\e6d1";
 }
 
-.uniui-bottom:before {
+.uniui-down:before {
   content: "\e6b8";
 }
 
-.uniui-arrowdown:before {
+.uniui-bottom:before {
   content: "\e6b8";
 }
 
-.uniui-right:before {
-  content: "\e6b5";
+.uniui-arrowright:before {
+  content: "\e6d5";
 }
 
-.uniui-arrowright:before {
+.uniui-right:before {
   content: "\e6b5";
 }
 
-.uniui-top:before {
+.uniui-up:before {
   content: "\e6b6";
 }
 
-.uniui-arrowup:before {
+.uniui-top:before {
   content: "\e6b6";
 }
 
@@ -150,8 +155,8 @@
   content: "\e6b7";
 }
 
-.uniui-arrowleft:before {
-  content: "\e6b7";
+.uniui-arrowup:before {
+  content: "\e6d6";
 }
 
 .uniui-eye:before {
@@ -638,10 +643,6 @@
   content: "\e627";
 }
 
-.uniui-cart-filled:before {
-  content: "\e629";
-}
-
 .uniui-checkbox:before {
   content: "\e62b";
 }

uni_modules/uni-icons/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "1.3.5",
+  "version": "2.0.10",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",
@@ -16,11 +16,7 @@
   "directories": {
     "example": "../../temps/example_temps"
   },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
+"dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -37,7 +33,8 @@
       "data": "无",
       "permissions": "无"
     },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
   },
   "uni_modules": {
     "dependencies": ["uni-scss"],
@@ -45,12 +42,14 @@
     "platforms": {
       "cloud": {
         "tcb": "y",
-        "aliyun": "y"
+        "aliyun": "y",
+        "alipay": "n"
       },
       "client": {
         "App": {
           "app-vue": "y",
-          "app-nvue": "y"
+          "app-nvue": "y",
+          "app-uvue": "y"
         },
         "H5-mobile": {
           "Safari": "y",
@@ -70,11 +69,15 @@
           "阿里": "y",
           "百度": "y",
           "字节跳动": "y",
-          "QQ": "y"
+          "QQ": "y",
+					"钉钉": "y",
+					"快手": "y",
+					"飞书": "y",
+					"京东": "y"
         },
         "快应用": {
-          "华为": "u",
-          "联盟": "u"
+          "华为": "y",
+          "联盟": "y"
         },
         "Vue": {
             "vue2": "y",
@@ -83,4 +86,4 @@
       }
     }
   }
-}
+}