api/v2Community.js

@@ -5,8 +5,4 @@ export const apiArr = {
     workOrderCrudCreat: '/api/v2/wechat/work-order-crud/creat', // 报事报修工单信息创建
     getWorkOrderCrudList: '/api/v2/wechat/work-order-crud/page', // 报事报修工单信息分页
     workOrderCrudInfo: '/api/v2/wechat/work-order-crud/info', // 报事报修工单信息详情
-    workMasterLick: '/api/v2/wechat/community-worker/list', // 获取小区员工列表
-    workOrderCrudDispatch: '/api/v2/wechat/work-order-crud/dispatch', // 人员派单
-    workOrderCrudAccept: '/api/v2/wechat/work-order-crud/accept', // 人员接单
-    workOrderCrudUpdate: '/api/v2/wechat/work-order-crud/worker/update', // 工作人员更新工单 
   };

api/v2User.js

@@ -1,4 +1,3 @@
 export const apiArr = {
     getUserInfo: '/api/v2/wechat/mpuser-crud/info', // 获取城市列表
-    userInfoUpdate: '/api/v2/wechat/mpuser-crud/update', // 会员信息更新
   }

api/v2local.js

@@ -13,7 +13,5 @@ export const apiArr = {
     getPayList:"/api/v2/wechat/quick-payment-record-crud/page", //支付记录
     getUserPoints:"/api/v2/wechat/member-points-flow-crud/main",//获取用户积分
     getPointsList:"/api/v2/wechat/member-points-flow-crud/page", //积分记录
-
     createPay:"/api/v2/wechat/quick-payment-record-crud/creat",//创建支付信息
-    getPayInfo:"/api/v2/wechat/quick-payment-record-crud/info"
   };

packages/community/oneRepair/index.css

@@ -1,6 +1,3 @@
-.container {
-    padding-bottom: 60rpx;
-}
 page {
     background-color: #f6f7fb;
 }
@@ -133,7 +130,7 @@ page {
 
 .repairMedia {
     width: 710rpx;
-    /* height: 336rpx; */
+    height: 336rpx;
     background: #FFFFFF;
     border-radius: 20rpx 20rpx 20rpx 20rpx;
     margin: 0 auto;
@@ -142,6 +139,36 @@ page {
     padding: 30rpx 20rpx;
 }
 
+/* .u-upload {
+    width: 120rpx !important;
+    height: 120rpx !important;
+    background: #F6F7FB !important;
+    display: flex !important;
+    align-items: center !important;
+    justify-content: center !important;
+    border-radius: 10rpx 10rpx 10rpx 10rpx !important;
+    border: 1rpx solid #D1D1D1 !important;
+}
+
+.u-upload__button {
+    width: 100% !important;
+    height: 100% !important;
+    margin-right: 0 !important;
+    margin-bottom: 0 !important;
+}
+
+.u-upload__wrap {
+    width: 100% !important;
+    height: 100% !important;
+} */
+
+.df {
+    display: flex;
+    align-items: center;
+    padding-top: 0;
+    margin-bottom: 30rpx;
+}
+
 .imgCon {
     font-size: 18rpx;
     color: #222222;
@@ -151,37 +178,14 @@ page {
     justify-content: center;
     width: 120rpx;
     height: 120rpx;
-    background: #F6F7FB;
+}
-    border: 1rpx solid #D1D1D1;
+
-    border-radius: 10rpx 10rpx 10rpx 10rpx;
+.imgCon image {
-  }
-  
-  .imgCon image {
     width: 34rpx;
     height: 34rpx;
     margin-bottom: 8rpx;
-  }
-.u-upload__wrap__preview {
-    width: 120rpx;
-    height: 120rpx;
-    border-radius: 10rpx 0rpx 10rpx 10rpx !important;
-  }
-  
-  .u-upload__wrap__preview__image {
-    width: 100% !important;
-    height: 100% !important;
-    object-fit: cover;
-  }
-  
-
-.df {
-    display: flex;
-    align-items: center;
-    padding-top: 0;
-    margin-bottom: 30rpx;
 }
 
-
 .videoCon {
     width: 120rpx;
     height: 120rpx;
@@ -215,45 +219,4 @@ page {
 
 page{
     padding-bottom: 0;
-}
-
-.videoBOX {
-    width: 400rpx;
-    height: 200rpx;
-    position: relative;
-}
-
-.videoBOX video {
-    width: 100% !important;
-    height: 100% !important;
-}
-
-.mask {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 2;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.mask_con {
-    width: 40rpx;
-    height: 40rpx;
-    z-index: 2;
-}
-
-.mask_cancel {
-    background: rgba(255, 255, 255, 0.2);
-    border-radius: 5rpx 5rpx 5rpx 5rpx;
-    font-size: 24rpx;
-    color: #FFFFFF;
-    padding: 2rpx 11rpx;
-    position: absolute;
-    left: 30rpx;
-    top: 24rpx;
-    z-index: 2;
 }

packages/community/oneRepair/index.vue

@@ -65,33 +65,30 @@
 			<div class="row df">
 				<div class="row_label">上传图片</div>
 				<div class="row_con2">
-					<u-upload :fileList="imgList" name="imgList" @afterRead="afterReadImg" @delete="deletePic" multiple
+					<!-- <u-upload :fileList="imgList" name="imgList" @afterRead="afterReadImg" @delete="deletePic" multiple
 						:maxCount="10">
 						<div class="imgCon">
 							<image src="http://192.168.0.172:5500/com_imageImg.png" mode="widthFix"></image>
 							上传图片
 						</div>
-					</u-upload>
+					</u-upload> -->
+					<u-upload :fileList="imgList" name="imgList" :maxCount="10" @beforeRead="afterReadImg" multiple
+							@afterRead="afterReadImg" @delete="deletePic" uploadIcon="plus" imageMode="scaleToFill" />
 				</div>
 			</div>
 
 			<div class="row df">
 				<div class="row_label">上传视频</div>
 				<div class="row_con2">
-					<u-upload v-if="!videoList.url" :fileList="videoList" @afterRead="afterReadVideo" @delete="deleteVideo" name="videoList"
+					<!-- <u-upload :fileList="videoList" @afterRead="afterReadVideo" @delete="deletePic" name="videoList"
 						:maxCount="1" accept="video">
-						<div class="imgCon">
+						<div class="videoCon">
 							<image src="http://192.168.0.172:5500/com_videoImg.png"  mode="widthFix"></image>
 							上传视频
 						</div>
-					</u-upload>
+					</u-upload> -->
-
+					<u-upload :fileList="videoList" name="videoList" :maxCount="1" accept="video" @beforeRead="afterReadVideo" multiple
-					<div v-if="videoList.url" class="videoBOX">
+							@afterRead="afterReadVideo" @delete="deleteVideo"  imageMode="scaleToFill" />
-						<video id="myVideo" :src="videoList.url" playsinline webkit-playsinline></video>
-						<div class="mask" @click="playFullScreenVideo">
-							<div class="mask_cancel" @click="cancels">删除</div>
-						</div>
-					</div>
 				</div>
 			</div>
 		</div>
@@ -117,8 +114,9 @@
 import {
 	request,
 	picUrl,
+	NavgateTo,
 	upload,
-	uploadVideo,
+	isPhone,
 	menuButtonInfo
 } from '../../../utils';
 import {
@@ -127,7 +125,6 @@ import {
 export default {
 	data() {
 		return {
-			picUrl,
 			active:"1",
 			top: "",
 			localHeight: "",
@@ -155,7 +152,7 @@ export default {
 
 
 			imgList: [],
-			videoList: {},
+			videoList: [],
 		}
 	},
 	methods: {
@@ -165,12 +162,14 @@ export default {
 			});
 		},
 		chose() {
+			console.log(123);
 			this.show = true;
 		},
 		cancel1() {
 			this.show = false;
 		},
 		confirm1(e) {
+			console.log(e);
 			const { value } = e;
 			this.category = value[0];
 			this.show = false;
@@ -184,12 +183,14 @@ export default {
 		},
 
 		handlerInputClick(e) {
+			console.log('e', e)
 			const { name} = e.currentTarget.dataset;
 			this[name] = e.detail.value
 		},
 		
 		// 时间选择器点击确定
 		confirm2(e) {
+			console.log(e);
 			const date = new Date(e.value); // 获取选中的 Date 对象
 			const year = date.getFullYear(); // 获取年份
 			const month = date.getMonth() + 1; // 获取月份（注意月份从 0 开始，需要 +1）
@@ -197,46 +198,57 @@ export default {
 			const hours =date.getHours()
 			const minutes = date.getMinutes(); 
 			const time = `${year}-${month}-${day} ${hours}:${minutes}`;
+			console.log('time', time);
 			this.time = time;
 			this.show2 = false;
 		},
 
 		// 上传图片
 		async afterReadImg(e){
-			const { file} = e;
+			let that = this
-      file.forEach(item => {
+			uni.showLoading({
-        upload(item.url, res => {
+				title: '上传中',
-          this.imgList.push({
+			})
-            url: picUrl + res.data.path,
+			const { name, file} = e;
-						picUrl: res.data.path,
+			console.log(e);
-          })
+			// TODO: 多次上传时生成多个promise（提供个单次上传多张图片接口更合适吧？）
-        })
+			const uploadPromises = file.map(item => {
-      })
+				return new Promise((resolve, reject) => {
+					upload(item.url, (res) => {
+						let datas = JSON.parse(res);
+						resolve({
+							url: picUrl + datas.data.path,
+							picUrl: datas.data.path,
+							name: 'avatar'
+						});
+					}, (err) => {
+						reject(err);
+					});
+				});
+			});
+			const results = await Promise.all(uploadPromises);
+			console.log('1111', results);
+			that[name] = [...that[name], ...results];
 			uni.hideLoading();
-      uni.showToast({
+			uni.showToast({
 				title: '上传成功',
 				icon: 'success'
 			});
 		},
-		deletePic(e) {
-			this.imgList.splice(e.index, 1);
-		},
 		afterReadVideo(e){
-			uploadVideo(e.file.url, res => {
+			let that = this
-				this.videoList = {
+			// uni.showLoading({
-					url: this.picUrl + res.data.url,
+			// 	title: '上传中',
-					videos: res.data.url
+			// })
-				}
+			const { name, file} = e;
-			})
+			console.log(e);
-		},
-		deleteVideo(e) {
-			this.videoList = {};
 		},
 
 		changeAct(e){
 			this.active = e;
 		},
 		async handlerSubmitClick() {
+			console.log('111', this.columns);
 			uni.showLoading({
 				title: '提交中'
 			});
@@ -247,7 +259,7 @@ export default {
 				"order_category_id": this.category.id, // 报修类型ID
 				"problem_description": this.repairInfo, // 问题描述
 				"images": this.imgList.length !== 0 ? this.imgList.map(item => item.picUrl).join(',') : '', // 图片信息,可为空
-				"videos": this.videoList.videos || '', // 视频
+				"videos": this.videoList.length !== 0 ? this.videoList.map(item => item.picUrl).join(',') : '', // 视频
 				// "urgency_level": 3, // 紧急程度
 				"service_time": this.time, // 上门时间
 				// "remarks": "备注", // 备注
@@ -257,16 +269,14 @@ export default {
 				"contact_name": this.contactName, // 联系人
 				"contact_phone": this.contactPhone // 联系人手机号
 			}, { silent: false });
+			console.log('提交结果', res);
 			uni.hideLoading();
 			uni.showToast({
 				title: '提交成功'
 			});
-			setTimeout(() => {
+			uni.navigateBack({
-				uni.navigateBack({
 				delta: 1
 			})
-			}, 2000)
-			
 		},
 		async init() {
 			uni.showLoading({
@@ -275,14 +285,7 @@ export default {
 			const res = await request(apiArr.workOrderCategoryCrudList, 'POST', {});
 			uni.hideLoading();
 			this.columns = res.rows;
-		},
+		}
-		playFullScreenVideo() {
-			this.videoContext = this.videoContext || wx.createVideoContext('myVideo')
-			this.videoContext.requestFullScreen() // 请求全屏
-		},
-		cancels(e) {
-			this.videoList = {};
-		},
 	},
 
 	onLoad(options) {

packages/community/repairDetail/index.css

@@ -66,39 +66,18 @@ page {
 .orderItemTit_state1 {
 	background: linear-gradient(304deg, #FFFFFF 0%, #FFF6E6 100%);
 }
-.orderItemTit_state1 > .orderItemTit_right {
-	font-size: 28rpx;
-	color: #FFA600;
-	font-size: 600;
-}
 
 .orderItemTit_state2 {
 	background: linear-gradient(280deg, #FFFFFF 0%, #FFE7E7 100%);
 }
-.orderItemTit_state2 > .orderItemTit_right {
-	font-size: 28rpx;
-	color: #FF4800;
-	font-size: 600;
-}
 
 .orderItemTit_state3 {
-	background: linear-gradient( 283deg, #FFFFFF 0%, #E1FFF0 100%);
+	background: linear-gradient(290deg, #FFFFFF 0%, #EDEDED 100%);
-}
-.orderItemTit_state3 > .orderItemTit_right {
-	font-size: 28rpx;
-	color: #2BE186;
-	font-size: 600;
 }
 
 .orderItemTit_state4 {
-	background: linear-gradient(290deg, #FFFFFF 0%, #EDEDED 100%);
+	background: linear-gradient( 283deg, #FFFFFF 0%, #E1FFF0 100%);
 }
-.orderItemTit_state4 > .orderItemTit_right {
-	font-size: 28rpx;
-	color: #999999;
-	font-size: 600;
-}
-
 .orderItemTit_right {
 	font-size: 28rpx;
 	color: #FFA600;
@@ -142,17 +121,4 @@ page {
 .df{
 	display: flex;
 	align-items: center;
-}
+}
-
-
-
-.videoBOX {
-	width: 400rpx;
-	height: 200rpx;
-	position: relative;
-}
-
-.videoBOX video {
-	width: 100% !important;
-	height: 100% !important;
-}

packages/community/repairDetail/index.vue

@@ -66,8 +66,7 @@
             v-for="(item, index) in info.imagesList"
             :key="index"
             :src="item"
-            mode=""
+            mode="aspectFill"
-						@click="handlerPreviewImageClick(item)"
           >
           </image>
         </div>
@@ -77,9 +76,13 @@
         <div class="row_label df">视频</div>
         <div class="row_con">
 					<view v-if="info.videosList && info.videosList.length == 0">暂无视频</view>
-					<div v-else v-for="(item, index) in info.videosList" :key="index" class="videoBOX">
+          <image
-						<video id="myVideo" :src="item" playsinline webkit-playsinline></video>
+						v-else
-					</div>
+						v-for="(item, index) in info.videosList"
+            :key="index"
+            :src="item"
+            mode="aspectFill"
+          ></image>
         </div>
       </div>
 
@@ -89,51 +92,52 @@
       </div>
     </div>
 
-    <div class="repairMsg" v-if="info.status !== 1">
+    <div class="repairMsg" v-if="info.reporter_worker">
       <div class="row">
         <div class="row_label">维修师傅</div>
-        <div class="row_con">{{ info.repairman_worker.name }}</div>
+        <div class="row_con">{{ info.reporter_worker.name }}</div>
       </div>
 
       <div class="row">
         <div class="row_label">师傅手机号</div>
-        <div class="row_con">{{info.repairman_worker.mobile}}</div>
+        <div class="row_con">{{info.reporter_worker.mobile}}</div>
       </div>
 
       <div class="row">
         <div class="row_label">师傅工号</div>
-        <div class="row_con noneBor">{{info.repairman_worker.emp_no}}</div>
+        <div class="row_con noneBor">{{info.reporter_worker.emp_no}}</div>
       </div>
     </div>
 
-    <div class="repairMsg" v-if="info.status !== 1 && info.status !== 2">
+    <div class="repairMsg" v-if="info.repair_images || info.repair_videos || info.repair_description">
       <div class="row">
         <div class="row_label df">维修图片</div>
         <div class="row_con">
-          <view v-if="info.repairImagesList && info.repairImagesList.length == 0">暂无图片</view>
           <image
-            v-for="(item, index) in info.repairImagesList"
+            v-for="(item, index) in info.repair_images"
             :key="index"
             :src="item"
-            mode=""
+            mode="aspectFill"
-            @click="headerRepairImagesClick(item)"
+          >
-          />
+          </image>
         </div>
       </div>
 
       <div class="row">
         <div class="row_label df">维修视频</div>
         <div class="row_con">
-          <view v-if="info.repairVideosList && info.repairVideosList.length == 0">暂无视频</view>
+          <image
-          <div v-else v-for="(item, index) in info.repairVideosList" :key="index" class="videoBOX">
+						v-for="(item, index) in info.repair_images"
-						<video id="myVideo" :src="item" playsinline webkit-playsinline></video>
+            :key="index"
-					</div>
+						:src="item"
+            mode="aspectFill"
+          ></image>
         </div>
       </div>
 
       <div class="row">
         <div class="row_label">维修描述</div>
-        <div class="row_con noneBor">{{ info.repair_description || '暂无描述' }}</div>
+        <div class="row_con noneBor">{{info.repair_description}}</div>
       </div>
     </div>
   </div>
@@ -143,6 +147,7 @@
 import {
   request,
   picUrl,
+  NavgateTo,
   menuButtonInfo,
 } from "../../../utils";
 import { apiArr } from "../../../api/v2Community";
@@ -163,16 +168,15 @@ export default {
           desc: "进行中",
           style: "orderItemTit_state2",
         },
-        3: {
-          desc: "已完成",
-          style: "orderItemTit_state3",
-        },
         4: {
-          desc: "已作废",
+          desc: "已完成",
           style: "orderItemTit_state4",
         },
+        3: {
+          desc: "已作废",
+          style: "orderItemTit_state3",
+        },
       },
-      
     };
   },
   methods: {
@@ -183,18 +187,6 @@ export default {
     },
     changeAct(e) {
       this.active = e;
-    },
-		handlerPreviewImageClick(item) {
-			uni.previewImage({
-				urls: this.info.imagesList,
-				current: item,
-			});
-		},
-    headerRepairImagesClick(item) {
-			uni.previewImage({
-				urls: this.info.repairImagesList,
-				current: item,
-			});
     },
     async init(id) {
       const res = await request(apiArr.workOrderCrudInfo, "POST", {
@@ -202,16 +194,17 @@ export default {
       });
 			const newRes = {
 				...res,
-				imagesList: res.images !== '' ? res.images.split(',').map(url => `${picUrl}${url}`) : [],
+				imagesList: res.images !== '' ? res.images.split(',').map(url => `picUrl${url}`) : [],
-				videosList: res.videos !== '' ? res.videos.split(',').map(url => `${picUrl}${url}`) : [],
+				videosList: res.videos !== '' ? res.videos.split(',').map(url => `picUrl${url}`) : [],
-        repairImagesList: res.repair_images !== "" ? res.repair_images.split(",").map((url) => `${picUrl}${url}`) : [], // 上报图片
-        repairVideosList: res.repair_videos !== "" ? res.repair_videos.split(",").map((url) => `${picUrl}${url}`) : [], // 上报图片
 			}
+			console.log('222222', res.videos !== '' ? 222 : []);
+			console.log('newRes', newRes);
       this.info = newRes;
     },
   },
 
   onLoad(options) {
+    console.log("1111", options);
     const meun = menuButtonInfo();
     this.top = meun.top;
     this.localHeight = meun.height;

packages/community/repairList/index.css

@@ -102,10 +102,10 @@ page {
 	background: linear-gradient( 280deg, #FFFFFF 0%, #FFE7E7 100%);
 }
 .orderItemTit_state3{
-	background: linear-gradient( 283deg, #FFFFFF 0%, #E1FFF0 100%);
+	background: linear-gradient( 290deg, #FFFFFF 0%, #EDEDED 100%);
 }
 .orderItemTit_state4{
-	background: linear-gradient( 290deg, #FFFFFF 0%, #EDEDED 100%);
+	background: linear-gradient( 283deg, #FFFFFF 0%, #E1FFF0 100%);
 }
 
 .orderItemTit_left {
@@ -139,15 +139,6 @@ page {
 	color: #FFA600;
 	font-weight: 600;
 }
-.orderItem_row_state2 {
-	color: #FF4800;
-}
-.orderItem_row_state3 {
-	color: #2BE186;
-}
-.orderItem_row_state4 {
-	color: #999999;
-}
 
 .df {
 	display: flex;

packages/community/repairList/index.vue

@@ -58,7 +58,7 @@
             <div class="orderItem_row_con">{{ item.room.name }}</div>
           </div>
 
-          <div :class="['orderItem_row_state', statusType[item.status].color]">
+          <div class="orderItem_row_state">
             {{ statusType[item.status].desc }}
           </div>
         </div>
@@ -116,22 +116,18 @@ export default {
         1: {
           desc: "待指派",
           style: "orderItemTit_state1",
-          color: "orderItem_row_state1"
         },
         2: {
           desc: "进行中",
           style: "orderItemTit_state2",
-          color: "orderItem_row_state2"
         },
         3: {
           desc: "已完成",
-          style: "orderItemTit_state3",
+          style: "orderItemTit_state4",
-          color: "orderItem_row_state3"
         },
         4: {
           desc: "已作废",
-          style: "orderItemTit_state4",
+          style: "orderItemTit_state3",
-          color: "orderItem_row_state4"
         },
       },
     };
@@ -145,6 +141,7 @@ export default {
       NavgateTo(`../repairDetail/index?id=${id}`);
     },
     headerTabsClick(e) {
+      console.log("111", e);
       this.active = e;
       this.list = [];
       this.flag = false;

packages/localLife/pay/index.vue

@@ -41,7 +41,7 @@
                     </span>
                 </div>
                 <div class="Msg2_con_right">
-                    {{ room_name }}
+                    惠生活42#2单元2层202号
                 </div>
             </div>
         </div>
@@ -68,8 +68,8 @@
         </div>
 
 
-        <u-picker :show="show" :columns="[commintyList]" keyName="label" @confirm='confirm' @close='onClose'
+        <u-picker :show="show" :columns="columns" keyName="text" @confirm='confirm' @close='onClose' @cancel='onClose'
-            @cancel='onClose' closeOnClickOverlay></u-picker>
+            closeOnClickOverlay></u-picker>
 
         <div class="boxshadow" @click="changeBoxshadow" v-if="boxShow">
             <div class="boxshadow_con">
@@ -93,7 +93,6 @@ import {
     apiArr
 } from '../../../api/v2local';
 
-import { apiPay } from '../../../api/pay'
 
 export default {
     data() {
@@ -104,15 +103,12 @@ export default {
             info: "",
             integral: 0,
             homeMoney: 0,
+            commintyList: [],
             Money: "",
             show: false,
-            remarks: "",
+            remarks:"",
-            room_id: "",
+            room_id:"",
-            room_name: "",
+            boxShow:false
-            boxShow: false,
-            commintyList: [],
-            OrderMsg: "",
-            payId:""
         }
     },
     watch: {
@@ -133,23 +129,13 @@ export default {
 
 
     methods: {
-
+        //
-        changeBoxshadow() {
+        changeBoxshadow(){
             this.boxShow = !this.boxShow
         },
-
-        confirm(e) {
-            console.log(e);
-            this.room_id = e.value[0].room_id
-            this.room_name = e.value[0].label
-            this.show = false
-        },
-        onClose() {
-            this.show = false
-        },
         //选择房源
         choseComminty() {
-            this.show = true
+
         },
         back() {
             NavgateTo("1")
@@ -159,95 +145,38 @@ export default {
                 page_num: 1,
                 page_size: 30,
             }).then(res => {
-                res.rows.forEach(item => {
-                    item.label = item.name
-                })
                 this.commintyList = res.rows
-                if (res.rows.length) {
-                    this.room_id = res.rows[0].room_id
-                    this.room_name = res.rows[0].name
-                }
             })
         },
         pay() {
             let that = this
-            if (!that.Money) {
+            if(!that.Money){
                 return uni.showToast({
-                    title: "请输入金额",
+                    title:"请输入金额",
-                    icon: "none"
+                    icon:"none"
                 })
             }
             request(apiArr.createPay, "POST", {
-                merchant_id: that.info.id,
+                merchant_id:that.info.id,
-                order_amount: that.Money, //金额
+                order_amount:that.Money, //金额
-                refund_property_fee: that.homeMoney, //物业费
+                refund_property_fee:that.homeMoney, //物业费
-                refund_member_points: that.integral, //积分
+                refund_member_points:that.integral, //积分
-                remark: that.remarks,
+                remark:that.remarks,
-                room_id: that.room_id
+                room_id:that.room_id
-            }).then(res => {
+            }).then(res=>{
-                that.payId = res.id
+                console.log(res);
-                that.getPayInfo(res.id)
             })
         },
 
-        payList() {
+        payList(){
             NavgateTo("../payInfo/index")
         },
-        homeMoneList() {
+        homeMoneList(){
             NavgateTo("../houseProvident/index")
         },
-        home() {
+        home(){
             NavgateTo("/pages/index/index")
-        },
+        }
-
-        async getPayInfo(e) {
-            let that = this
-            await request(apiArr.getPayInfo, "POST", {
-                id: e
-            }).then(res => {
-                console.log(res);
-                this.OrderMsg = res
-
-                that.LakaLaPrePay()
-            })
-        },
-
-        async LakaLaPrePay() {
-            let that = this
-            request(apiPay.pay, "POST", {
-                total_amount: that.OrderMsg.order_amount,
-                subject: '快捷支付订单',
-                goods_id: that.payId,
-                address: "",
-                out_trade_no: that.OrderMsg.term_no,
-                remark: that.OrderMsg.remark,
-                quantity: '1',
-                user: uni.getStorageSync('userId'),
-                user_id: uni.getStorageSync('openId')
-            }).then(res => {
-                console.log(res,'res');
-                
-                const { resp_data, msg } = res.data
-
-                wx.requestPayment({
-                    timeStamp: String(resp_data.acc_resp_fields.time_stamp),
-                    nonceStr: String(resp_data.acc_resp_fields.nonce_str),
-                    package: String(resp_data.acc_resp_fields.package),
-                    signType: String(resp_data.acc_resp_fields.sign_type),
-                    paySign: String(resp_data.acc_resp_fields.pay_sign),
-                    success(res) {
-                        that.queryPay()
-                    },
-                    fail(fal) {
-                        if (fal.errMsg == 'requestPayment:fail cancel') {
-                            that.payFail(2)
-                        } else {
-                            that.payFail(1)
-                        }
-                    }
-                })
-            })
-        },
 
     },
 

packages/localLife/payInfo/index.vue

@@ -1,47 +1,44 @@
 <template>
     <div class="container">
         <div class="payInfoList">
-            <div class="PayInfoItem" v-for="item in payList">
+            <div class="PayInfoItem">
                 <div class="row">
                     <div class="row_label">付款金额</div>
-                    <div class="row_con">￥{{ item.order_amount }}</div>
+                    <div class="row_con">￥53.1</div>
                 </div>
                 <div class="row">
-                    <div class="row_label2">{{item.create_time}}</div>
+                    <div class="row_label2">2025-06-06 18:10:08</div>
-                    <div class="row_label2" v-if="false">Adapay微信小程序支付</div>
+                    <div class="row_label2">Adapay微信小程序支付</div>
-                    <div class="row_label2">{{item.payment_method}}</div>
                 </div>
                 <div class="line"></div>
 
                 <div class="row2">
                     <div class="label">订单号</div>
-                    <div class="con3">{{item.order_no}}</div>
+                    <div class="con3">6354245654125654</div>
                 </div>
 
                 <div class="row2">
                     <div class="label">消费门店</div>
-                    <div class="con3">{{item.merchant_info.merchant_name}}</div>
+                    <div class="con3">真彩图文</div>
                 </div>
 
                 <div class="row2">
                     <div class="label">当前状态</div>
-                    <div class="con3" v-if="item.status == 1">已支付</div>
+                    <div class="con3">已支付</div>
-                    <div class="con3" v-if="item.status == 2">待支付</div>
-                    <div class="con3" v-if="item.status == 3">已退款</div>
                 </div>
 
                 <div class="line"></div>
 
                 <div class="row3">
                     <div class="label">返物业费</div>
-                    <div class="con3" @click="houseProvident">￥{{item.refund_property_fee}}
+                    <div class="con3" @click="houseProvident">￥53.1
                         <u-icon name="arrow-right" color="#999999" size="40" style="max-lines: 10rpx;"></u-icon>
                     </div>
                 </div>
                 <div class="line"></div>
                 <div class="row">
                     <div class="label">返会员积分</div>
-                    <div class="con3" @click="points">{{ item.refund_member_points }}
+                    <div class="con3" @click="points">3
                         <u-icon name="arrow-right" color="#999999" size="40" style="max-lines: 10rpx;"></u-icon>
                     </div>
                 </div>
@@ -73,8 +70,7 @@ export default {
             localHeight: "",
             page_num: 1,
             page_size: 10,
-            flag:false,
+            flag:false
-            payList:[]
         }
     },
     onLoad(options) {
@@ -99,13 +95,7 @@ export default {
                 page_num:that.page_num,
                 page_size:that.page_size
             }).then(res=>{
-                if(res.rows.length == that.page_size){
+                console.log(res);
-                    that.flag = true
-                }else{
-                    that.flag = false
-                }
-                that.payList = that.payList.concat(res.rows)
-                that.page_num++
             })
         },
     },

packages/localLife/paySucess/index.css

@@ -10,8 +10,8 @@ image {
 }
 
 .sucessImg {
-    width: 217rpx;
+    width: 192rpx;
-    height: 191rpx;
+    height: 192rpx;
     margin: 0 auto;
     margin-top: 40rpx;
 }

packages/shopEnter/apply/index.css

@@ -0,0 +1,111 @@
+page {
+  background-color: #f6f7fb;
+  min-height: 100vh;
+  padding-bottom: 0;
+}
+
+.container {
+  background: url(http://192.168.0.172:5500/shopEn_apply.png) no-repeat;
+  background-size: 750rpx 497rpx;
+  box-sizing: border-box;
+  padding-top: 290rpx;
+}
+
+.Msg {
+  width: 710rpx;
+  background: #FFFFFF;
+  border-radius: 20rpx 20rpx 20rpx 20rpx;
+  margin: 0 auto;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+}
+
+.row {
+  padding-top: 30rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.row_label {
+  font-size: 28rpx;
+  color: #999999;
+  width: 180rpx;
+}
+
+.row_con {
+  flex: 1;
+  padding-bottom: 30rpx;
+  border-bottom: 1rpx solid #EBEBEB;
+  display: flex;
+}
+
+.row_con input {
+  flex: 1;
+}
+
+.nonebor {
+  border-bottom: none;
+}
+
+.row2 {
+  display: flex;
+  align-items: center;
+}
+
+.mt {
+  margin-top: 26rpx;
+  padding-top: 36rpx;
+  padding-bottom: 36rpx;
+}
+
+
+
+.imgCon {
+  font-size: 18rpx;
+  color: #222222;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 120rpx;
+  height: 120rpx;
+  background: #F6F7FB;
+  border: 1rpx solid #D1D1D1;
+  border-radius: 10rpx 10rpx 10rpx 10rpx;
+}
+
+.imgCon image {
+  width: 34rpx;
+  height: 34rpx;
+  margin-bottom: 8rpx;
+}
+
+.mt2 {
+  margin-top: 30rpx;
+}
+
+.u-upload__wrap__preview {
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 10rpx 0rpx 10rpx 10rpx !important;
+}
+
+.u-upload__wrap__preview__image {
+  width: 100% !important;
+  height: 100% !important;
+  object-fit: cover;
+}
+
+.addBtn {
+  font-size: 36rpx;
+  color: #FFFFFF;
+  width: 600rpx;
+  height: 90rpx;
+  background: linear-gradient(91deg, #FF7658 0%, #FF370B 100%);
+  border-radius: 100rpx 100rpx 100rpx 100rpx;
+  margin: 0 auto;
+  margin-top: 58rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}

packages/shopEnter/apply/index.vue

@@ -0,0 +1,147 @@
+<template>
+	<div class="container">
+		<div class="Msg">
+			<div class="row">
+				<div class="row_label">门店名称</div>
+				<div class="row_con">
+					<input type="text" placeholder="需与门牌照名称一致">
+				</div>
+			</div>
+			<div class="row">
+				<div class="row_label">所在城市</div>
+				<div class="row_con" @click="chooseCity">
+					<input type="text" disabled :value="area" placeholder="请选择省市区">
+					<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+				</div>
+			</div>
+			<div class="row">
+				<div class="row_label">详细地址</div>
+				<div class="row_con">
+					<input type="text" placeholder="请输入详细地址">
+				</div>
+			</div>
+			<div class="row">
+				<div class="row_label">联系人</div>
+				<div class="row_con">
+					<input type="text" placeholder="请输入联系人">
+				</div>
+			</div>
+			<div class="row">
+				<div class="row_label">手机号</div>
+				<div class="row_con nonebor">
+					<input type="text" placeholder="请输入联系方式">
+				</div>
+			</div>
+		</div>
+
+		<div class="Msg mt">
+			<div class="row2">
+				<div class="row_label">门脸照</div>
+				<div class="row_con2">
+					<u-upload :fileList="imgList" @afterRead="afterReadImg" @delete="deletePic" name="1" multiple
+						:maxCount="10">
+						<div class="imgCon">
+							<image src="http://192.168.0.172:5500/com_imageImg.png" mode="widthFix"></image>
+							上传图片
+						</div>
+					</u-upload>
+				</div>
+			</div>
+
+			<div class="row2 mt2">
+				<div class="row_label">店内环境</div>
+				<div class="row_con2">
+					<u-upload :fileList="imgList3" @afterRead="afterReadImg2" @delete="deletePic2" name="1" multiple
+						:maxCount="10">
+						<div class="imgCon">
+							<image src="http://192.168.0.172:5500/com_imageImg.png" mode="widthFix"></image>
+							上传图片
+						</div>
+					</u-upload>
+
+				</div>
+			</div>
+		</div>
+
+		<div class="addBtn">立即入驻</div>
+
+
+		<areaPopup :show="show" @selectArea='headerAreaClick' @close='onClose' />
+	</div>
+</template>
+
+<script>
+import {
+	apiArr
+} from '../../../api/shopEnter';
+import {
+	isPhone,
+	picUrl,
+	request,
+	upload
+} from '../../../utils';
+export default {
+	data() {
+		return {
+			picUrl,
+			show: false,
+			area: "",
+			confirmCity: "",
+			confirmArea: "",
+			confirmBusiness: "",
+			imgList: [],
+			imgList2: [],
+
+			imgList3: [],
+			imgList4: [],
+		}
+	},
+	methods: {
+
+		chooseCity() {
+			this.show = true;
+		},
+		headerAreaClick(data) {
+			console.log('接受参数值', data);
+			this.area = `${data.confirmProv.name}${data.confirmCity.area_name}${data.confirmDist.business_name}`;
+			this.confirmCity = data.confirmProv;
+			this.confirmArea = data.confirmCity;
+			this.confirmBusiness = data.confirmDist;
+			this.show = false;
+		},
+		afterReadImg(e) {
+			e.file.forEach(item => {
+				upload(item.url, res => {
+					console.log(res.data.path);
+					this.imgList.push({ url: this.picUrl + res.data.path })
+					this.imgList2.push({ url: res.data.path })
+				})
+			})
+		},
+		deletePic(e) {
+			this.imgList.splice(e.index, 1);
+			this.imgList2.splice(e.index, 1);
+		},
+
+		afterReadImg2(e) {
+			e.file.forEach(item => {
+				upload(item.url, res => {
+					this.imgList3.push({ url: this.picUrl + res.data.path })
+					this.imgList4.push({ url: res.data.path })
+				})
+			})
+		},
+		deletePic2(e) {
+			this.imgList3.splice(e.index, 1);
+			this.imgList4.splice(e.index, 1);
+		}
+
+	},
+	onLoad() {
+	}
+}
+</script>
+
+<style>
+@import url("./index.css");
+</style>

packages/shopEnter/edit/index.css

@@ -0,0 +1,140 @@
+page {
+    background-color: #f6f7fb;
+    min-height: 100vh;
+    padding-bottom: 0;
+}
+
+.container {
+    background: url(http://192.168.0.172:5500/shopEn_editImg.png) no-repeat;
+    background-size: 750rpx 589rpx;
+    box-sizing: border-box;
+    padding-top: 250rpx;
+}
+
+.Msg {
+    width: 710rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx 20rpx 20rpx 20rpx;
+    margin: 0 auto;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+}
+
+.row {
+    padding-top: 30rpx;
+    display: flex;
+    justify-content: space-between;
+}
+
+.row_label {
+    font-size: 28rpx;
+    color: #999999;
+    width: 180rpx;
+}
+
+.row_label span {
+    color: #FF0000;
+}
+
+.row_con {
+    flex: 1;
+    padding-bottom: 30rpx;
+    border-bottom: 1rpx solid #EBEBEB;
+    display: flex;
+}
+
+.row_con input {
+    flex: 1;
+}
+
+.nonebor {
+    border-bottom: none;
+}
+
+.row2 {
+    display: flex;
+    align-items: center;
+}
+
+.mt {
+    margin-top: 26rpx;
+    padding-top: 36rpx;
+    padding-bottom: 36rpx;
+}
+
+
+
+.imgCon {
+    font-size: 18rpx;
+    color: #222222;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    width: 120rpx;
+    height: 120rpx;
+    background: #F6F7FB;
+    border: 1rpx solid #D1D1D1;
+    border-radius: 10rpx 10rpx 10rpx 10rpx;
+}
+
+.imgCon image {
+    width: 34rpx;
+    height: 34rpx;
+    margin-bottom: 8rpx;
+}
+
+.mt2 {
+    margin-top: 30rpx;
+}
+
+.u-upload__wrap__preview {
+    width: 120rpx;
+    height: 120rpx;
+    border-radius: 10rpx 0rpx 10rpx 10rpx !important;
+}
+
+.u-upload__wrap__preview__image {
+    width: 100% !important;
+    height: 100% !important;
+    object-fit: cover;
+}
+
+.addBtn {
+    font-size: 36rpx;
+    color: #FFFFFF;
+    width: 600rpx;
+    height: 90rpx;
+    background: linear-gradient(91deg, #FF7658 0%, #FF370B 100%);
+    border-radius: 100rpx 100rpx 100rpx 100rpx;
+    margin: 0 auto;
+    margin-top: 98rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.row_con3 {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+}
+
+.province {
+    display: flex;
+    align-items: center;
+    padding-bottom: 30rpx;
+    border-bottom: 1rpx solid #EBEBEB;
+}
+.province input{
+    flex: 1;
+}
+.province image{
+    width: 28.08rpx;
+    height: 30rpx;
+}
+.address{
+    padding-top: 30rpx;
+    border-bottom: 1rpx solid #EBEBEB;
+    padding-bottom: 30rpx;
+}

packages/shopEnter/edit/index.vue

@@ -0,0 +1,159 @@
+<template>
+    <div class="container">
+        <div class="Msg">
+            <div class="row">
+                <div class="row_label">
+                    <span>*</span>
+                    门店名称
+                </div>
+                <div class="row_con">
+                    <input type="text" placeholder="需与门牌照名称一致">
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="row_label">
+                    <span>*</span>
+                    详细地址
+                </div>
+                <div class="row_con3">
+                    <div class="province" @click="chooseCity">
+                        <input type="text" disabled :value="area" placeholder="请选择省市区">
+                        <image src="http://192.168.0.172:5500/local_localIcon.png" mode="widthFix"></image>
+
+                    </div>
+
+                    <div class="address">
+                        <input type="text" placeholder="请输入详细地址">
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="row_label">
+                    <span>*</span>
+                    手机号码
+                </div>
+                <div class="row_con nonebor">
+                    <input type="text" placeholder="请输入您的联系方式">
+                </div>
+            </div>
+        </div>
+
+        <div class="Msg mt">
+            <div class="row2">
+                <div class="row_label">门脸照</div>
+                <div class="row_con2">
+                    <u-upload :fileList="imgList" @afterRead="afterReadImg" @delete="deletePic" name="1" multiple
+                        :maxCount="10">
+                        <div class="imgCon">
+                            <image src="http://192.168.0.172:5500/com_imageImg.png" mode="widthFix"></image>
+                            上传图片
+                        </div>
+                    </u-upload>
+                </div>
+            </div>
+
+            <div class="row2 mt2">
+                <div class="row_label">店内环境</div>
+                <div class="row_con2">
+                    <u-upload :fileList="imgList3" @afterRead="afterReadImg2" @delete="deletePic2" name="1" multiple
+                        :maxCount="10">
+                        <div class="imgCon">
+                            <image src="http://192.168.0.172:5500/com_imageImg.png" mode="widthFix"></image>
+                            上传图片
+                        </div>
+                    </u-upload>
+
+                </div>
+            </div>
+        </div>
+
+        <div class="addBtn">提交</div>
+
+
+        <areaPopup :show="show" @selectArea='headerAreaClick' @close='onClose' />
+    </div>
+</template>
+
+<script>
+import {
+    apiArr
+} from '../../../api/shopEnter';
+import {
+    isPhone,
+    picUrl,
+    request,
+    upload
+} from '../../../utils';
+export default {
+    data() {
+        return {
+            picUrl,
+            show: false,
+            area: "",
+            confirmCity: "",
+            confirmArea: "",
+            confirmBusiness: "",
+            imgList: [],
+            imgList2: [],
+
+            imgList3: [],
+            imgList4: [],
+        }
+    },
+    methods: {
+
+        chooseCity() {
+            this.show = true;
+        },
+
+        onClose(){
+            this.show = false;
+        },
+
+        headerAreaClick(data) {
+            console.log('接受参数值', data);
+            this.area = `${data.confirmProv.name}${data.confirmCity.area_name}${data.confirmDist.business_name}`;
+            this.confirmCity = data.confirmProv;
+            this.confirmArea = data.confirmCity;
+            this.confirmBusiness = data.confirmDist;
+            this.show = false;
+        },
+        afterReadImg(e) {
+            e.file.forEach(item => {
+                upload(item.url, res => {
+                    console.log(res.data.path);
+                    this.imgList.push({ url: this.picUrl + res.data.path })
+                    this.imgList2.push({ url: res.data.path })
+                })
+            })
+        },
+        deletePic(e) {
+            this.imgList.splice(e.index, 1);
+            this.imgList2.splice(e.index, 1);
+        },
+
+        afterReadImg2(e) {
+            e.file.forEach(item => {
+                upload(item.url, res => {
+                    console.log(res.data.path);
+                    this.imgList3.push({ url: this.picUrl + res.data.path })
+                    this.imgList4.push({ url: res.data.path })
+                })
+            })
+        },
+        deletePic2(e) {
+            this.imgList3.splice(e.index, 1);
+            this.imgList4.splice(e.index, 1);
+        }
+
+    },
+    onLoad() {
+    }
+}
+</script>
+
+<style>
+@import url("./index.css");
+</style>

packages/shopEnter/index/index.css

@@ -1,111 +1,174 @@
 page {
   background-color: #f6f7fb;
-  min-height: 100vh;
-  padding-bottom: 0;
 }
 
-.container {
+image {
-  background: url(http://192.168.0.172:5500/shopEn_apply.png) no-repeat;
+  width: 100%;
-  background-size: 750rpx 497rpx;
+  height: 100%;
+}
+
+.searchBox {
+  background-color: #fff;
+  padding-top: 40rpx;
+  padding-left: 50rpx;
+  padding-right: 50rpx;
+  padding-bottom: 44rpx;
   box-sizing: border-box;
-  padding-top: 290rpx;
+  width: 100%;
 }
 
-.Msg {
+.search {
-  width: 710rpx;
+  width: 650rpx;
-  background: #FFFFFF;
+  height: 70rpx;
-  border-radius: 20rpx 20rpx 20rpx 20rpx;
+  background: #F6F6FA;
-  margin: 0 auto;
+  border-radius: 100rpx 100rpx 100rpx 100rpx;
-  padding: 0 20rpx;
-  box-sizing: border-box;
-}
-
-.row {
-  padding-top: 30rpx;
-  display: flex;
-  justify-content: space-between;
-}
-
-.row_label {
-  font-size: 28rpx;
-  color: #999999;
-  width: 180rpx;
-}
-
-.row_con {
-  flex: 1;
-  padding-bottom: 30rpx;
-  border-bottom: 1rpx solid #EBEBEB;
-  display: flex;
-}
-
-.row_con input {
-  flex: 1;
-}
-
-.nonebor {
-  border-bottom: none;
-}
-
-.row2 {
   display: flex;
   align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+  padding-left: 35rpx;
+  padding-right: 40rpx;
 }
 
-.mt {
+.searchBox_left {
-  margin-top: 26rpx;
+  display: flex;
-  padding-top: 36rpx;
+  align-items: center;
-  padding-bottom: 36rpx;
+  font-size: 26rpx;
-}
-
-
-
-.imgCon {
-  font-size: 18rpx;
   color: #222222;
+}
+
+.searchBox_right {
+  width: 30rpx;
+  height: 30rpx;
+}
+
+.searchBox_con {
+  flex: 1;
+  margin-left: 10rpx;
+  margin-right: 10rpx;
+}
+
+.empty {
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  width: 120rpx;
+  margin-top: 95rpx;
-  height: 120rpx;
-  background: #F6F7FB;
-  border: 1rpx solid #D1D1D1;
-  border-radius: 10rpx 10rpx 10rpx 10rpx;
 }
 
-.imgCon image {
+.empty image {
-  width: 34rpx;
+  width: 454.6rpx;
-  height: 34rpx;
+  height: 305.55rpx;
-  margin-bottom: 8rpx;
 }
 
-.mt2 {
+.empty .text {
-  margin-top: 30rpx;
+  font-size: 28rpx;
+  color: #999999;
+  margin-top: -48rpx;
 }
 
-.u-upload__wrap__preview {
+.btn {
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 10rpx 0rpx 10rpx 10rpx !important;
-}
-
-.u-upload__wrap__preview__image {
-  width: 100% !important;
-  height: 100% !important;
-  object-fit: cover;
-}
-
-.addBtn {
   font-size: 36rpx;
   color: #FFFFFF;
   width: 600rpx;
   height: 90rpx;
   background: linear-gradient(91deg, #FF7658 0%, #FF370B 100%);
   border-radius: 100rpx 100rpx 100rpx 100rpx;
-  margin: 0 auto;
-  margin-top: 58rpx;
   display: flex;
   align-items: center;
   justify-content: center;
+  margin: 0 auto;
+  margin-top: 57rpx;
+}
+
+.merchantList {
+  margin-top: 30rpx;
+  box-sizing: border-box;
+  padding: 0 20rpx;
+  background-color: #fff;
+}
+
+.merchantItem {
+  border-bottom: 1rpx solid #EBEBEB;
+  padding: 30rpx 0;
+}
+
+.merchantItem_tit {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.merchantItem_tit_left {
+  font-size: 34rpx;
+  color: #222222;
+  font-weight: 600;
+}
+
+.state1 {
+  width: 138rpx;
+  height: 40rpx;
+  background: #EAFFF2;
+  border-radius: 100rpx 100rpx 100rpx 100rpx;
+  border: 1rpx solid #3DDB7C;
+  font-size: 26rpx;
+  color: #2BE186;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.state2 {
+  font-size: 26rpx;
+  color: #FF0004;
+  width: 138rpx;
+  height: 40rpx;
+  background: #FFEAEA;
+  border-radius: 100rpx 100rpx 100rpx 100rpx;
+  border: 1rpx solid #DB3D3D;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.state3 {
+  font-size: 26rpx;
+  color: #00C8FF;
+  width: 138rpx;
+  height: 40rpx;
+  background: #DDEFFE;
+  border-radius: 100rpx 100rpx 100rpx 100rpx;
+  border: 1rpx solid #28B0FF;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.merchantItem_user {
+  font-size: 28rpx;
+  color: #222222;
+  margin-top: 20rpx;
+}
+
+.merchantItem_add {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20rpx;
+}
+
+.merchantItem_add_left {
+  font-size: 28rpx;
+  color: #222222;
+}
+
+.merchantItem_add_right {
+  width: 32rpx;
+  height: 32rpx;
+}
+
+.tip {
+  font-size: 26rpx;
+  color: #999999;
+  text-align: center;
+  margin-top: 54rpx;
 }

packages/shopEnter/index/index.vue

@@ -1,72 +1,60 @@
 <template>
-	<div class="container">
+	<div class="">
-		<div class="Msg">
+		<div class="searchBox">
-			<div class="row">
+			<div class="search">
-				<div class="row_label">门店名称</div>
+				<div class="searchBox_left" @click="changeShow">
-				<div class="row_con">
+					门店名称
-					<input type="text" placeholder="需与门牌照名称一致">
+
+					<div style="margin-left: 16rpx;">
+						<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
+					</div>
 				</div>
-			</div>
+
-			<div class="row">
+				<div class="searchBox_con">
-				<div class="row_label">所在城市</div>
+					<input type="text">
-				<div class="row_con" @click="chooseCity">
-					<input type="text" disabled :value="area" placeholder="请选择省市区">
-					<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
 				</div>
-			</div>
+
-			<div class="row">
+				<div class="searchBox_right">
-				<div class="row_label">详细地址</div>
+					<image src="http://192.168.0.172:5500/com_communitySearchIcon.png" mode="aspectFill"></image>
-				<div class="row_con">
-					<input type="text" placeholder="请输入详细地址">
-				</div>
-			</div>
-			<div class="row">
-				<div class="row_label">联系人</div>
-				<div class="row_con">
-					<input type="text" placeholder="请输入联系人">
-				</div>
-			</div>
-			<div class="row">
-				<div class="row_label">手机号</div>
-				<div class="row_con nonebor">
-					<input type="text" placeholder="请输入联系方式">
 				</div>
 			</div>
 		</div>
 
-		<div class="Msg mt">
+		<div class="merchantList">
-			<div class="row2">
+			<div class="merchantItem">
-				<div class="row_label">门脸照</div>
+				<div class="merchantItem_tit">
-				<div class="row_con2">
+					<div class="merchantItem_tit_left">重庆鸡公煲1号</div>
-					<u-upload :fileList="imgList" @afterRead="afterReadImg" @delete="deletePic" name="1" multiple
+					<div class="merchantItem_tit_right">
-						:maxCount="10">
+						<div class="state1">审核通过</div>
-						<div class="imgCon">
+						<div class="state2" v-if="false">审核驳回</div>
-							<image src="http://192.168.0.172:5500/com_imageImg.png" mode="widthFix"></image>
+						<div class="state3" v-if="false">待审核</div>
-							上传图片
+					</div>
-						</div>
-					</u-upload>
 				</div>
-			</div>
 
-			<div class="row2 mt2">
+				<div class="merchantItem_user">
-				<div class="row_label">店内环境</div>
+					杜胜男 15901518415
-				<div class="row_con2">
+				</div>
-					<u-upload :fileList="imgList3" @afterRead="afterReadImg2" @delete="deletePic2" name="1" multiple
-						:maxCount="10">
-						<div class="imgCon">
-							<image src="http://192.168.0.172:5500/com_imageImg.png" mode="widthFix"></image>
-							上传图片
-						</div>
-					</u-upload>
 
+				<div class="merchantItem_add">
+					<div class="merchantItem_add_left">苏州市太仓市城厢镇桃园三村11幢105市</div>
+					<div class="merchantItem_add_right" @click="toEdit">
+						<image src="http://192.168.0.172:5500/shopEn_edit.png" mode="aspectFill"></image>
+					</div>
 				</div>
 			</div>
 		</div>
+		<div class="tip">没有更多数据了~</div>
 
-		<div class="addBtn">立即入驻</div>
+		<div class="empty" v-if="false">
+			<image src="http://192.168.0.172:5500/shopEn_empty.png" mode="aspectFill"></image>
+			<div class="text">暂时没有入驻的商家</div>
+		</div>
 
+		<div class="btn" @click="toAdd">
+			商家入驻
+		</div>
 
-		<areaPopup :show="show" @selectArea='headerAreaClick' @close='onClose' />
+		<u-picker :show="show" ref="uPicker" :columns="columns" @confirm="confirm" @cancel="cancel"></u-picker>
 	</div>
 </template>
 
@@ -78,66 +66,38 @@ import {
 	isPhone,
 	picUrl,
 	request,
-	upload
+	upload,
+	NavgateTo
 } from '../../../utils';
 export default {
 	data() {
 		return {
-			picUrl,
 			show: false,
-			area: "",
+			columns: [
-			confirmCity: "",
+				['中国', '美国', '日本']
-			confirmArea: "",
+			],
-			confirmBusiness: "",
-			imgList: [],
-			imgList2: [],
-
-			imgList3: [],
-			imgList4: [],
 		}
 	},
 	methods: {
-
+		changeShow() {
-		chooseCity() {
+			this.show = true
-			this.show = true;
 		},
-		headerAreaClick(data) {
+		confirm() {
-			console.log('接受参数值', data);
+			this.show = false
-			this.area = `${data.confirmProv.name}${data.confirmCity.area_name}${data.confirmDist.business_name}`;
-			this.confirmCity = data.confirmProv;
-			this.confirmArea = data.confirmCity;
-			this.confirmBusiness = data.confirmDist;
-			this.show = false;
 		},
-		afterReadImg(e) {
+		cancel() {
-			e.file.forEach(item => {
+			this.show = false
-				upload(item.url, res => {
-					console.log(res.data.path);
-					this.imgList.push({ url: this.picUrl + res.data.path })
-					this.imgList2.push({ url: res.data.path })
-				})
-			})
 		},
-		deletePic(e) {
+		toEdit() {
-			this.imgList.splice(e.index, 1);
+			NavgateTo("../edit/index.vue")
-			this.imgList2.splice(e.index, 1);
 		},
-
+		toAdd() {
-		afterReadImg2(e) {
+			NavgateTo("../apply/index.vue")
-			e.file.forEach(item => {
-				upload(item.url, res => {
-					this.imgList3.push({ url: this.picUrl + res.data.path })
-					this.imgList4.push({ url: res.data.path })
-				})
-			})
-		},
-		deletePic2(e) {
-			this.imgList3.splice(e.index, 1);
-			this.imgList4.splice(e.index, 1);
 		}
 
 	},
 	onLoad() {
+
 	}
 }
 </script>

packages/shopEnter/sucess/index.css

@@ -1,44 +0,0 @@
-page {
-    background-color: #f6f7fb;
-    min-height: 100vh;
-    padding-bottom: 0;
-}
-
-
-image {
-    width: 100%;
-    height: 100%;
-}
-
-.sucessImg {
-    width: 217rpx;
-    height: 191rpx;
-    margin: 0 auto;
-    margin-top: 106rpx;
-}
-
-.Msg1 {
-    font-weight: bold;
-    font-size: 36rpx;
-    color: #222222;
-    margin: 0 auto;
-    margin-top: 37rpx;
-    text-align: center;
-}
-
-.Msg2 {
-    margin: 0 auto;
-    margin-top: 43rpx;
-}
-
-.Msg2 div {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 28rpx;
-    color: #222222;
-    margin-top: 10rpx;
-}
-.Msg2 div span{
-    color: #FF370B;
-}

packages/shopEnter/sucess/index.vue

@@ -1,45 +0,0 @@
-<template>
-    <div class="container">
-        <div class="sucessImg">
-            <image src="http://192.168.0.172:5500/local_sucess.png" mode="aspectFill"></image>
-        </div>
-
-        <div class="Msg1">提交成功</div>
-        <div class="Msg2">
-            <div>入驻申请提交成功!</div>
-            <div>
-                <span>3个工作日内</span>
-                将有专属顾问与您联系
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-import {
-    apiArr
-} from '../../../api/shopEnter';
-import {
-    isPhone,
-    picUrl,
-    request,
-    upload
-} from '../../../utils';
-export default {
-    data() {
-        return {
-            picUrl,
-        }
-    },
-    methods: {
-
-
-    },
-    onLoad() {
-    }
-}
-</script>
-
-<style>
-@import url("./index.css");
-</style>

packages/user/index/index.css

@@ -1,55 +1,10 @@
 .header {
-margin: 40rpx 0 45rpx;
+  margin-left: 20rpx;
-display: flex;
+  color: #222222;
-flex-direction: column;
-align-items: center;
-}
-.avatar_pic {
-  width: 130rpx;
-  height: 130rpx;
-  border-radius: 50%;
-}
-.main {
-  margin: 45rpx 20rpx 62rpx;
-  background: #FFFFFF;
-  background: yellow;
-  border-radius: 20rpx 20rpx 20rpx 20rpx;
-}
-.tabel {
-  height: 100rpx;
-  display: flex;
-  align-items: center;
-}
-.left {
   font-size: 28rpx;
-color: #999999;
+  font-weight: bold;
-margin-right: 68rpx;
 }
-.right {
+.item{
-  display: flex;
-  align-items: center;
-  height: 100rpx;
-  flex: 1;
-  border-bottom: 1rpx solid #EBEBEB;
-}
-.right_radio {
-  margin-left: 45rpx;
-}
-.no_border{
-  border-bottom: none;
-}
-.btn {
-  margin: 62rpx 75rpx 60rpx;
-  height: 90rpx;
-  line-height: 90rpx;
-  background: linear-gradient( 91deg, #FF7658 0%, #FF370B 100%);
-  border-radius: 100rpx 100rpx 100rpx 100rpx;
-  text-align: center;
-  font-weight: 600;
-  font-size: 36rpx;
-  color: #FFFFFF;
-}
-/* .item{
   display:flex;
   border-bottom:1px solid #e6e6e6;
   height: 90rpx;
@@ -75,6 +30,7 @@ margin-right: 68rpx;
 }
 
 .item-right {
+  /* flex: 1; */
   text-align: right;
   font-size: 26rpx;
   font-weight: 400;
@@ -87,9 +43,12 @@ margin-right: 68rpx;
 .item-right-icon {
   width: 13rpx;
   height: 26rpx;
-} */
+}
-/* 
 
+/* TODO:  为什么不生效？ */
+.not-border{
+  border-bottom: none;
+}
 .item:last-child{
   border-bottom:none
 }
@@ -111,15 +70,4 @@ margin-right: 68rpx;
   font-size: 36rpx;
   font-weight: 400;
   line-height: 80rpx;
-} */
-.u-upload__wrap__preview {
-  width: 130rpx;
-  height: 130rpx;
-  border-radius: 50% !important;
-}
-
-.u-upload__wrap__preview__image {
-  width: 100% !important;
-  height: 100% !important;
-  object-fit: cover;
 }

packages/user/index/index.vue

@@ -1,175 +1,134 @@
 <template>
-  <view class="container">
+	<view class="container">
-    <view class="header">
+		<view class="item" data-url="/packages/user/uploadAvatar/index" data-title="上传头像" @click="handleSelectClick">
-      <u-upload @afterRead="afterReadImg" :deletable="false" :maxCount="1">
+			<view class="item-left">
-        <image class="avatar_pic" :src="avatarInfo.url" alt="" />
+				<image class="item-icon" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Group_422.png" />
-      </u-upload>
+				<view class="item-title">上传头像</view>
-      <view>点击更换头像</view>
-    </view>
-		<view class="main">
-			<view class="tabel">
-				<view class="left">姓名</view>
-				<view class="right">
-					<input
-						type="text"
-						placeholder="请填写昵称"
-						:value="name"
-						:data-name="name"
-						@input="headerInputClick"
-					/>
-				</view>
-			</view>
-			<view class="tabel">
-				<view class="left">性别</view>
-				<view class="right">
-					<radio
-						value="2"
-						:checked="sex == 2"
-						@click="headerRadioClick(2)"
-					/>女
-					<view class="right_radio">
-						<radio
-							value="1"
-							:checked="sex == 1"
-							@click="headerRadioClick(1)"
-						/>男
-					</view>
-				</view>
-			</view>
-			<view class="tabel">
-				<view class="left">Email</view>
-				<view class="right no_border">
-					<input
-						type="text"
-						placeholder="请填写邮箱地址"
-						:value="eMail"
-						:data-name="eMail"
-						@input="headerInputClick"
-					/>
-				</view>
 			</view>
+			<van-icon name="arrow" color="#D5AC66" />
 		</view>
-		<view class="btn">保存设置</view>
-		<view class="main">
-			<view class="tabel">
-				<view class="left">刷新登录</view>
-				<view class="right">
-					<u-icon name="arrow-right" />
-				</view>
-			</view>
 
-			<view class="tabel no_border" @click="headerSettingClick">
+		<view class="item">
-				<view class="left">设置授权</view>
+			<view class="item-left">
-				<view class="right">
+				<image class="item-icon" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Classroom.png" />
-					<u-icon name="arrow-right" />
+				<view class="item-title">当前账户</view>
-				</view>
 			</view>
+			<view class="item-right">{{userInfo.user_name}}</view>
 		</view>
-    <nav-footer />
+
-  </view>
+		<view class="item" data-url="/packages/user/resetPwd/index" data-title="修改登录密码" data-type="login"
+			@click="handleSelectClick">
+			<view class="item-left">
+				<image class="item-icon" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Group_423.png" />
+				<view class="item-title">修改登录密码</view>
+			</view>
+			<van-icon name="arrow" color="#D5AC66" />
+		</view>
+
+		<view class="item not-border" data-url="/packages/user/resetPwd/index" data-title="修改支付密码" data-type="pay"
+			@click="handleSelectClick">
+			<view class="item-left">
+				<image class="item-icon" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Group_424.png" />
+				<view class="item-title">修改支付密码</view>
+			</view>
+			<van-icon name="arrow" color="#D5AC66" />
+		</view>
+
+
+		<!-- 灰色分割线 -->
+		<view class="line"></view>
+		<view class="item not-border">
+			<view class="item-left">
+				<image class="item-icon" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Group_425.png" />
+				<view class="item-title">绑定手机</view>
+			</view>
+			<view class="item-right desc">{{phoneNum}}</view>
+		</view>
+		<button class="quit_login" @click="handleQuitLoginClick">退出登录</button>
+		
+		<nav-footer />
+	</view>
 </template>
 
 <script>
-import { NavgateTo, request, picUrl, upload } from "../../../utils/index";
+	import { NavgateTo, request } from '../../../utils/index';
-import { apiArr } from "../../../api/login";
+	import { apiArr } from '../../../api/login';
-import { apiArr as apiArr2 } from "../../../api/v2User";
+	export default {
-export default {
+		data() {
-  data() {
+			return {
-    return {
+				userInfoList: [{
-      avatarInfo: {},
+						pic: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Group_422.png',
-      userInfoList: [
+						desc: '上传头像',
-        {
+						url: "/packages/user/uploadAvatar/index",
-          pic: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Group_422.png",
+						isShowPic: true,
-          desc: "上传头像",
+					},
-          url: "/packages/user/uploadAvatar/index",
+					{
-          isShowPic: true,
+						pic: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Classroom.png',
-        },
+						desc: '当前账户',
-        {
+						url: "",
-          pic: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Classroom.png",
+						text: "微信用户"
-          desc: "当前账户",
+					},
-          url: "",
+					{
-          text: "微信用户",
+						pic: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Group_423.png',
-        },
+						desc: '修改登录密码',
-        {
+						type: 'login',
-          pic: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Group_423.png",
+						url: "/packages/user/resetPwd/index",
-          desc: "修改登录密码",
+						isShowPic: true,
-          type: "login",
+					},
-          url: "/packages/user/resetPwd/index",
+					{
-          isShowPic: true,
+						pic: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Group_424.png',
-        },
+						desc: '修改支付密码',
-        {
+						type: 'pay',
-          pic: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/Group_424.png",
+						url: "/packages/user/resetPwd/index",
-          desc: "修改支付密码",
+						isShowPic: true,
-          type: "pay",
+						isLast: true,
-          url: "/packages/user/resetPwd/index",
+					},
-          isShowPic: true,
+				],
-          isLast: true,
+				userInfo: {},
-        },
+				phoneNum: uni.getStorageSync('phone'),
-      ],
+			}
-      name: "",
+		},
-      mobile: "",
+		methods: {
-      eMail: "",
+			async init() {
-      sex: 2,
+				const res = await request(apiArr.loginInfo, 'POST', {});
-    };
+				this.userInfo = res;
-  },
+			},
-  methods: {
-    // 上传图片
-    async afterReadImg(e) {
-      console.log("eeee", e);
-      const { file } = e;
-      upload(file.url, (res) => {
-        console.log("1111", res);
-        this.avatarInfo = {
-          url: picUrl + res.data.path,
-          picUrl: res.data.path,
-        };
-      });
-      uni.showToast({
-        title: "上传成功",
-        icon: "success",
-      });
-    },
-    headerInputClick(e) {
-      console.log("ee", e);
-      const { name } = e.currentTarget.dataset;
-      const { value } = e.detail;
-      this[name] = value;
-    },
 
-		headerSettingClick() {
+			// 跳转指定页面url
-			uni.openSetting({
+			handleSelectClick(event) {
-				success(res) {
+				const { url, title, type } = event.currentTarget.dataset
-					console.log(res.authSetting)
+				if (!url) return;
-				}
+				NavgateTo(`${url}?title=${title}&type=${type}`)
-			});
+			},
+			
+			/**
+			 * 退出登录
+			 */
+			handleQuitLoginClick() {
+				console.log('退出登录');
+				uni.removeStorageSync('ctoken');
+				uni.removeStorageSync('userId');
+				uni.removeStorageSync('phone');
+				uni.removeStorageSync('device_id');
+				uni.removeStorageSync('dealerId');
+				uni.removeStorageSync('is_deal');
+				uni.removeStorageSync('is_dev');
+				uni.removeStorageSync('is_shop');
+				uni.removeStorageSync('openId');
+				uni.removeStorageSync('shopArea');
+				uni.removeStorageSync('shopId');
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			},
 		},
 
-    headerRadioClick(item) {
+		onLoad() {
-      console.log("item", item);
+			this.init();
-      this.sex = item;
+		}
-    },
+	}
-    async init() {
-      const res = await request(apiArr2.getUserInfo, "POST", {});
-      console.log("111211", res);
-      this.avatarInfo = {
-        url: res.avatar
-          ? picUrl + res.avatar
-          : "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_309.png",
-        picUrl: res.avatar,
-      };
-      this.name = res.nick_name;
-      this.mobile = res.mobile;
-      this.sex = res.gender;
-      this.eMail = res.email;
-    },
-  },
-
-  onLoad() {
-    this.init();
-  },
-};
 </script>
 
 <style>
 @import url("./index.css");
-</style>
+</style>

packages/user/replenishInfo/index.css

@@ -1,88 +0,0 @@
-.container {
-  padding-top: 87rpx;
-}
-.title {
-  font-weight: 600;
-font-size: 50rpx;
-color: #222222;
-text-align: center;
-}
-.subTitle {
-  font-weight: 500;
-font-size: 32rpx;
-color: #222222;
-text-align: center;
-margin-bottom: 123rpx;
-}
-.table {
-display: flex;
-justify-content: space-between;
-align-items: center;
-margin-left: 78rpx;
-margin-right: 72rpx;
-height: 122rpx;
-border-bottom: 1px solid #EBEBEB;
-}
-.left {
-  font-size: 26rpx;
-  color: #999999;
-}
-.label {
-  font-weight: 500;
-font-size: 30rpx;
-color: #222222;
-margin-bottom: 10rpx;
-}
-
-.right {
-  text-align: right;
-  display: flex;
-  align-items: center;
-}
-.right > .desc {
-  margin-left: 30rpx;
-  font-size: 28rpx;
-  color: #FF370B;
-  background-color: #FFFFFF;
-  padding: 0;
-}
-.right > .desc::after {
-  display: none;
-}
-.btn {
-  margin-top: 80rpx;
-  margin-left: 75rpx;
-  margin-right: 75rpx;
-  height: 90rpx;
-  line-height: 90rpx;
-  background: linear-gradient( 91deg, #FF7658 0%, #FF370B 100%);
-  border-radius: 100rpx 100rpx 100rpx 100rpx;
-  font-size: 36rpx;
-  color: #FFFFFF;
-  text-align: center;
-}
-.agreement {
-  text-align: center;
-  font-size: 26rpx;
-  color: #FF370B;
-  margin-top: 40rpx;
-}
-
-
-
-.avatar_pic {
-  width: 90rpx;
-  height: 90rpx;
-  border-radius: 50%;
-}
-.u-upload__wrap__preview {
-  width: 90rpx;
-  height: 90rpx;
-  border-radius: 50% !important;
-}
-
-.u-upload__wrap__preview__image {
-  width: 100% !important;
-  height: 100% !important;
-  object-fit: cover;
-}

packages/user/replenishInfo/index.vue

@@ -1,136 +0,0 @@
-<template>
-	<view class="container">
-		<view class="title">完善注册信息</view>
-		<view class="subTitle">请完善头像昵称及联系信息</view>
-		<view class="table">
-			<view class="left">
-				<view class="label">头像</view>
-				<view class="desc">点击更换头像</view>
-			</view>
-			<view class="right">
-				<u-upload  @afterRead="afterReadImg" :deletable="false" :maxCount="1">
-					<image class="avatar_pic" :src="avatarInfo.url" alt="" />
-				</u-upload>
-			</view>
-		</view>
-		<view class="table">
-			<view class="left">
-				<view class="label">昵称</view>
-			</view>
-			<view class="right">
-				<input type="text" placeholder="请填写昵称" :value="name"  @input="headerInputClick">
-			</view>
-		</view>
-		<view class="table">
-			<view class="left">
-				<view class="label">手机号</view>
-			</view>
-			<view class="right">
-				<view>{{ mobile }}</view>
-				<button
-					type="default"
-					class="desc"
-					open-type="getPhoneNumber"
-					@getphonenumber="getPhoneNumber"
-					@click="heandleChangePhoneClick"
-				>更换</button>
-			</view>
-		</view>
-		<view class="btn" @click="headerSubmitClick">保存</view>
-		<view class="agreement">同意《用户隐私保护政策》</view>
-	</view>
-</template>
-
-<script>
-
-	import { request, upload, picUrl } from '../../../utils';
-	import { apiArr } from '../../../api/login';
-	import { apiArr as apiArr2 } from '../../../api/v2User';
-
-	export default {
-		data() {
-			return {
-				avatarInfo: {},
-				name: '',
-				mobile: '',
-			}
-		},
-		methods: {
-			headerInputClick(e) {
-				const { value} = e.detail;
-				this.name = value;
-			},
-			heandleChangePhoneClick() {},
-
-			// 小程序登录获取手机号接口
-			getPhoneNumber(event) {
-				console.log('获取手机号', event);
-				if (event.detail.errMsg === "getPhoneNumber:ok") {
-					request(apiArr.loginGetUserPhone, 'POST', {
-						code: event.detail.code
-					}).then((res) => {
-						console.log('111', res);
-						this.mobile = res.phone;
-					})
-				} else {
-					console.error('用户拒绝授权:', event.detail.errMsg);
-				}
-			},
-
-			// 上传图片
-			async afterReadImg(e){
-				console.log('eeee', e);
-				const { file} = e;
-				upload(file.url, res => {
-					console.log('1111', res);
-					this.avatarInfo = {
-						url: picUrl + res.data.path,
-						picUrl: res.data.path,
-					}
-				})
-				uni.showToast({
-					title: '上传成功',
-					icon: 'success'
-				});
-			},
-
-
-
-			async headerSubmitClick() {
-				console.log('提交', this.name);
-				const res = await request(apiArr2.userInfoUpdate, 'POST', {
-					avatar: this.avatarInfo.picUrl,
-					nick_name: this.name,
-					mobile: this.mobile
-				});
-				console.log('111111111', res)
-				uni.showToast({
-					title: '保存成功',
-					icon: 'success',
-					mask: true
-				})
-				setTimeout(() => {
-					uni.navigateBack({ delta: 1 })
-				}, 2000)
-			},
-
-			async init() {
-				const res = await request(apiArr2.getUserInfo, 'POST', {});
-				console.log('111211', res);
-				this.avatarInfo = {
-					url: res.avatar ? picUrl + res.avatar : 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_309.png',
-					picUrl: res.avatar
-				}
-				this.name = res.nick_name;
-				this.mobile = res.mobile;
-			},
-		},
-		onLoad() {
-			this.init();
-		}
-	}
-</script>
-
-<style>
-	@import url("./index.css");
-</style>

packages/workOrderDashboard/detail/index.css

@@ -82,20 +82,20 @@ page {
 }
 
 .orderItemTit_state3 {
-	background: linear-gradient(283deg, #FFFFFF 0%, #E1FFF0 100%);
+	background: linear-gradient(290deg, #FFFFFF 0%, #EDEDED 100%);
 }
 .orderItemTit_state3 > .orderItemTit_right {
 	font-size: 28rpx;
-	color: #2BE186;
+	color: #999999;
 	font-size: 600;
 }
 
 .orderItemTit_state4 {
-	background: linear-gradient(290deg, #FFFFFF 0%, #EDEDED 100%);
+	background: linear-gradient(283deg, #FFFFFF 0%, #E1FFF0 100%);
 }
 .orderItemTit_state4 > .orderItemTit_right {
 	font-size: 28rpx;
-	color: #999999;
+	color: #2BE186;
 	font-size: 600;
 }
 
@@ -137,14 +137,6 @@ page {
 	display: flex;
 	align-items: center;
 }
-.btn_view {
-	display: flex;
-	justify-content: center;
-}
-.btn_view > .btn {
-	width: 300rpx;
-	height: 90rpx;
-}
 .btn {
 	margin: 40rpx auto 60rpx;
 	width: 600rpx;
@@ -188,151 +180,3 @@ page {
 .statePopop_label {
 	padding: 10px 0;
 }
-
-.master_popup {
-	margin: 0 59rpx 0 41rpx;
-	padding-top: 30rpx;
-}
-.master_popup_main {
-	height: 500rpx;
-	overflow: auto;
-}
-.master_popup_title {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	font-size: 28rpx;
-
-}
-.master_popup_title_text {
-	font-weight: 600;
-color: #000000;
-}
-.master_popup_title_btn {
-color: #FF370B;
-}
-
-.master_popup_tabel {
-	display: flex;
-	align-items: center;
-}
-.master_popup_tabel_left {
-	flex: 1;
-}
-.master_popup_label {
-	display: flex;
-	margin-top: 10rpx;
-}
-.master_popup_label:first-child{
-	margin-top: 0;
-}
-.label {
-	width: 140rpx;
-	text-align: left;
-	margin-right: 42rpx;
-	font-weight: 400;
-font-size: 26rpx;
-color: #999999;
-}
-
-.videoBOX {
-	width: 400rpx;
-	height: 200rpx;
-	position: relative;
-}
-
-.videoBOX video {
-	width: 100% !important;
-	height: 100% !important;
-}
-
-.mask {
-	width: 100%;
-	height: 100%;
-	position: absolute;
-	left: 0;
-	top: 0;
-	z-index: 2;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.mask_con {
-	width: 40rpx;
-	height: 40rpx;
-	z-index: 2;
-}
-
-.mask_cancel {
-	background: rgba(255, 255, 255, 0.2);
-	border-radius: 5rpx 5rpx 5rpx 5rpx;
-	font-size: 24rpx;
-	color: #FFFFFF;
-	padding: 2rpx 11rpx;
-	position: absolute;
-	left: 30rpx;
-	top: 24rpx;
-	z-index: 2;
-}
-
-.repairMedia {
-	width: 710rpx;
-	background: #FFFFFF;
-	border-radius: 20rpx 20rpx 20rpx 20rpx;
-	margin: 0 auto;
-	margin-top: 20rpx;
-	box-sizing: border-box;
-	padding: 30rpx 20rpx;
-}
-.repairMedia > .row {
-	display: flex;
-	padding-top: 30rpx;
-}
-.repairMedia > .df {
-	display: flex;
-	align-items: center;
-	/* justify-content: start; */
-	padding-top: 0;
-	margin-bottom: 30rpx;
-}
-.repairMedia > .row_label {
-	font-size: 28rpx;
-	color: #999999;
-	width: 180rpx;
-}
-.u-upload__wrap__preview {
-	width: 120rpx;
-	height: 120rpx;
-	border-radius: 10rpx 0rpx 10rpx 10rpx !important;
-}
-
-.u-upload__wrap__preview__image {
-	width: 100% !important;
-	height: 100% !important;
-	object-fit: cover;
-}
-.imgCon {
-	font-size: 18rpx;
-	color: #222222;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	width: 120rpx;
-	height: 120rpx;
-	background: #F6F7FB;
-	border: 1rpx solid #D1D1D1;
-	border-radius: 10rpx 10rpx 10rpx 10rpx;
-}
-
-.imgCon image {
-	width: 34rpx;
-	height: 34rpx;
-	margin-bottom: 8rpx;
-}
-.edit_row {
-	display: flex;
-	padding: 0 20rpx;
-	padding-top: 30rpx;
-}

packages/workOrderDashboard/detail/index.vue

@@ -1,519 +1,224 @@
 <template>
-  <div class="container">
+	<div class="container">
-    <div
+		<div class="searchBox" :style="{ height: localHeight + 'px', paddingTop: top + 'px' }">
-      class="searchBox"
+			<div class="searchBox_add">
-      :style="{ height: localHeight + 'px', paddingTop: top + 'px' }"
+				<div class="searchBox_left">
-    >
+					<u-icon bold color="#000" size="40" name="arrow-left" @click="headerBackClick"></u-icon>
-      <div class="searchBox_add">
+				</div>
-        <div class="searchBox_left">
+				<div class="searchBox_mid">工单详情</div>
-          <u-icon
+				<div class="searchBox_right"></div>
-            bold
+			</div>
-            color="#000"
+		</div>
-            size="40"
-            name="arrow-left"
-            @click="headerBackClick"
-          ></u-icon>
-        </div>
-        <div class="searchBox_mid">工单详情</div>
-        <div class="searchBox_right"></div>
-      </div>
-    </div>
 
-    <div class="repairMsg">
+		<div class="repairMsg">
-      <div :class="['orderItemTit', statusType[info.status].style]">
+			<div class="orderItemTit orderItemTit_state1" v-if="state == 1">
-        <div class="orderItemTit_left">工单编号：{{ info.order_code }}</div>
+				<div class="orderItemTit_left">工单编号：123456789145</div>
-        <div class="orderItemTit_right">{{ statusType[info.status].desc }}</div>
+				<div class="orderItemTit_right ">待指派</div>
-      </div>
+			</div>
+			<div class="orderItemTit orderItemTit_state2" v-if="state == 2">
+				<div class="orderItemTit_left">工单编号：123456789145</div>
+				<div class="orderItemTit_right">进行中</div>
+			</div>
+			<div class="orderItemTit orderItemTit_state3" v-if="state == 3">
+				<div class="orderItemTit_left">工单编号：123456789145</div>
+				<div class="orderItemTit_right">已作废</div>
+			</div>
+			<div class="orderItemTit orderItemTit_state4" v-if="state == 4">
+				<div class="orderItemTit_left">工单编号：123456789145</div>
+				<div class="orderItemTit_right">已完成</div>
+			</div>
 
-      <div class="row">
+			<div class="row">
-        <div class="row_label">小区房源名称</div>
+				<div class="row_label">小区房源名称</div>
-        <div class="row_con">{{ info.room.name }}</div>
+				<div class="row_con">世纪名城1号楼1单元101</div>
-      </div>
+			</div>
 
-      <div class="row">
+			<div class="row">
-        <div class="row_label">报修类型</div>
+				<div class="row_label">报修类型</div>
-        <div class="row_con">{{ info.ac.category_name }}</div>
+				<div class="row_con">家具维修</div>
-      </div>
+			</div>
 
-      <div class="row">
+			<div class="row">
-        <div class="row_label">问题描述</div>
+				<div class="row_label">问题描述</div>
-        <div class="row_con">{{ info.problem_description }}</div>
+				<div class="row_con">门坏了</div>
-      </div>
+			</div>
 
-      <div class="row">
+			<div class="row">
-        <div class="row_label">联系人</div>
+				<div class="row_label">联系人</div>
-        <div class="row_con">{{ info.contact_name }}</div>
+				<div class="row_con">高尚</div>
-      </div>
+			</div>
 
-      <div class="row">
+			<div class="row">
-        <div class="row_label">联系电话</div>
+				<div class="row_label">联系电话</div>
-        <div class="row_con">{{ info.contact_phone }}</div>
+				<div class="row_con">15901518415</div>
-      </div>
+			</div>
 
-      <div class="row">
+			<div class="row">
-        <div class="row_label">上门时间</div>
+				<div class="row_label">上门时间</div>
-        <div class="row_con">{{ info.service_time }}</div>
+				<div class="row_con">2025-06-12 12:00</div>
-      </div>
+			</div>
-    </div>
+		</div>
 
-    <div class="repairMsg">
+		<div class="repairMsg">
-      <div class="row">
+			<div class="row">
-        <div class="row_label df">图片</div>
+				<div class="row_label df">图片</div>
-        <div class="row_con">
+				<div class="row_con">
-          <view v-if="info.imagesList && info.imagesList.length == 0">暂无图片</view>
+					<image v-for="item in 3" src="http://192.168.0.172:5500/com_communityNav.png" mode="aspectFill">
-          <image
+					</image>
-            v-else
+				</div>
-            v-for="(item, index) in info.imagesList"
+			</div>
-            :key="index"
-            :src="item"
-            mode=""
-						@click="handlerPreviewImageClick(item)"
-          >
-          </image>
-        </div>
-      </div>
 
-      <div class="row">
+			<div class="row">
-        <div class="row_label df">视频</div>
+				<div class="row_label df">视频</div>
-        <div class="row_con">
+				<div class="row_con">
-          <view v-if="info.videosList && info.videosList.length == 0">暂无视频</view>
+					<image src="http://192.168.0.172:5500/com_communityNav.png" mode="aspectFill"></image>
-          <div v-else v-for="(item, index) in info.videosList" :key="index" class="videoBOX">
+				</div>
-						<video id="myVideo" :src="item" playsinline webkit-playsinline></video>
+			</div>
-					</div>
-        </div>
-      </div>
 
-      <div class="row" v-if="info.assign_time">
+			<div class="row">
-        <div class="row_label">指派时间</div>
+				<div class="row_label">创建时间</div>
-        <div class="row_con noneBor">{{ info.assign_time }}</div>
+				<div class="row_con noneBor">2025-06-12 12:00</div>
-      </div>
+			</div>
-    </div>
+		</div>
 
-    <!-- 维修状态非带指派 -->
+		<div class="repairMsg" v-if="state != 1">
-    <div class="repairMsg" v-if="info.status !== 1">
+			<div class="row">
-      <div class="row">
+				<div class="row_label">维修师傅</div>
-        <div class="row_label">维修师傅</div>
+				<div class="row_con">
-        <div class="row_con">{{ info.repairman_worker.name }}</div>
+					刘师傅
-      </div>
+				</div>
+			</div>
 
-      <div class="row">
+			<div class="row">
-        <div class="row_label">师傅手机号</div>
+				<div class="row_label">师傅手机号</div>
-        <div class="row_con">{{ info.repairman_worker.mobile }}</div>
+				<div class="row_con">
-      </div>
+					13445667552
+				</div>
+			</div>
 
-      <div class="row">
+			<div class="row">
-        <div class="row_label">师傅工号</div>
+				<div class="row_label">师傅工号</div>
-        <div class="row_con noneBor">{{ info.repairman_worker.emp_no }}</div>
+				<div class="row_con noneBor">123456789</div>
-      </div>
+			</div>
-    </div>
+		</div>
 
-    <!-- 工单状态非带指派或者进行中 -->
+		<div class="repairMsg" v-if="state != 1">
-    <div class="repairMsg" v-if="info.status !== 1 && info.status !== 2">
+			<div class="row">
-      <div class="row">
+				<div class="row_label df">维修图片</div>
-        <div class="row_label df">维修图片</div>
+				<div class="row_con">
-        <div class="row_con">
+					<image v-for="item in 3" src="http://192.168.0.172:5500/com_communityNav.png" mode="aspectFill">
-          <view v-if="info.repairImagesList && info.repairImagesList.length == 0">暂无图片</view>
+					</image>
-          <image
+				</div>
-            v-for="(item, index) in info.repairImagesList"
+			</div>
-            :key="index"
-            :src="item"
-            mode=""
-            @click="headerRepairImagesClick(item)"
-          />
-        </div>
-      </div>
 
-      <div class="row">
+			<div class="row">
-        <div class="row_label df">维修视频</div>
+				<div class="row_label df">维修视频</div>
-        <div class="row_con">
+				<div class="row_con">
-					<view v-if="info.repairVideosList && info.repairVideosList.length == 0">暂无视频</view>
+					<image src="http://192.168.0.172:5500/com_communityNav.png" mode="aspectFill"></image>
-          <div v-else v-for="(item, index) in info.repairVideosList" :key="index" class="videoBOX">
+				</div>
-						<video id="myVideo" :src="item" playsinline webkit-playsinline></video>
+			</div>
-					</div>
-        </div>
-      </div>
 
-      <div class="row">
+			<div class="row">
-        <div class="row_label">维修描述</div>
+				<div class="row_label">维修描述</div>
-        <div class="row_con noneBor">{{ info.repair_description || '暂无描述' }}</div>
+				<div class="row_con noneBor">大门坏了文案文案文案文案</div>
-      </div>
+			</div>
-    </div>
+		</div>
-    <div class="repairMsg" v-if="type === 'edit'">
+		<div class="white_container" v-if="state == 2 && type === 'edit'" @click="headerChangeStateClick">
-      <div class="repairMedia">
+			<div style="display: flex; justify-content: space-between;">
-        <div class="edit_row df">
+				<div style="display: flex;">
-          <div class="row_label">维修图片</div>
+					<div class="white_label">工单状态</div>
-          <div class="row_con2">
+					<div class="whit_desc">{{orderState.desc || orderStateList[0].desc }}</div>
-            <u-upload :fileList="imgList" name="imgList" @afterRead="afterReadImg" @delete="deletePic" multiple
+				</div>
-              :maxCount="10">
+				<u-icon name="arrow-up" v-if="!orderSelect" />
-              <div class="imgCon">
+				<u-icon name="arrow-down" v-if="orderSelect" />
-                <image src="http://192.168.0.172:5500/com_imageImg.png" mode="widthFix"></image>
+			</div>
-                上传图片
+			
-              </div>
+			<view class="statePupop" v-if="orderSelect">
-            </u-upload>
+				<view class="statePopop_label" v-for="(item, index) in orderStateList" :key="index" @click.stop="headerSelectClick(item)">{{item.desc}}</view>
-          </div>
+			</view>
-        </div>
+		</div>
-
+		<div class="btn" v-if="state == 1" @click="headerTakeClick">接单</div>
-        <div class="edit_row df">
+		<div class="btn" v-if="state == 2" @click="headerEditClick">{{type === 'edit' ? '确定' : '编辑'}}</div>
-          <div class="row_label">上传视频</div>
+	</div>
-          <div class="row_con2">
-            <u-upload v-if="!videoList.url" :fileList="videoList" @afterRead="afterReadVideo" @delete="deleteVideo" name="videoList"
-              :maxCount="1" accept="video">
-              <div class="imgCon">
-                <image src="http://192.168.0.172:5500/com_videoImg.png"  mode="widthFix"></image>
-                上传视频
-              </div>
-            </u-upload>
-
-            <div v-if="videoList.url" class="videoBOX">
-              <video id="myVideo" :src="videoList.url" playsinline webkit-playsinline></video>
-              <div class="mask" @click="playFullScreenVideo">
-                  <!-- <div class="mask_con">
-                      <image src="http://192.168.0.172:5500/local_play.png" mode="widthFix"></image>
-                  </div> -->
-                <div class="mask_cancel" @click="cancels">删除</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="edit_row">
-        <div class="row_label">维修描述</div>
-        <textarea placeholder="请输入维修描述" :value="repairRemarks" data-name="repairRemarks"  @input="handlerInputClick" auto-height />
-      </div>
-    </div>
-    <div
-      class="white_container"
-      v-if="info.status == 2 && type === 'edit'"
-      @click="headerChangeStateClick"
-    >
-      <div style="display: flex; justify-content: space-between">
-        <div style="display: flex">
-          <div class="white_label">工单状态</div>
-          <div class="whit_desc">
-            {{ orderState.desc }}
-          </div>
-        </div>
-        <u-icon name="arrow-up" v-if="!orderSelect" />
-        <u-icon name="arrow-down" v-if="orderSelect" />
-      </div>
-
-      <view class="statePupop" v-if="orderSelect">
-        <view
-          class="statePopop_label"
-          v-for="(item, index) in orderStateList"
-          :key="index"
-          @click.stop="headerSelectClick(item)"
-          >{{ item.desc }}</view>
-      </view>
-    </div>
-
-    <div class="btn_view" v-if="info.status == 1 && order_dispatch_permission">
-      <view class="btn" @click="headerTakeClick">接单</view>
-      <view class="btn" @click="headerSelectMasterClick">派单</view>
-    </div>
-    <!-- 待派单状态 无派单权限按钮 -->
-    <div class="btn" v-else-if="info.status == 1" @click="headerTakeClick">接单</div>
-    <!-- 进行中状态编辑维修信息 -->
-    <div class="btn" v-if="info.status == 2" @click="headerEditClick">
-      {{ type === "edit" ? "确定" : "编辑" }}
-    </div>
-
-    <u-popup
-      :show="show"
-      @close="close"
-      round="50rpx"
-      style="height: 50%; overflow: hidden"
-    >
-      <view class="master_popup">
-        <view class="master_popup_title">
-          <view></view>
-          <view class="master_popup_title_text">请选择维修师傅</view>
-          <view class="master_popup_title_btn" @click="headerConfirmClick">确定</view>
-        </view>
-        <view class="master_popup_main">
-          <view class="master_list" v-for="(item, index) in communityMasterList" :key="index">
-            <u-line margin="30rpx 0" />
-            <view class="master_popup_tabel">
-              <view class="master_popup_tabel_left">
-                <view class="master_popup_label">
-                  <view class="label">师傅名称</view>
-                  <view>{{item.name}}</view>
-                </view>
-                <view class="master_popup_label">
-                  <view class="label">师傅手机号</view>
-                  <view>{{ item.mobile }}</view>
-                </view>
-              </view>
-              <radio :value="item.worker_id" @click="headerRadioClick" :data-name="item.worker_id" :checked="checked === item.worker_id" />
-            </view>
-          </view>
-        </view>
-      </view>
-    </u-popup>
-  </div>
 </template>
 
 <script>
 import {
-  request,
+	request,
-  picUrl,
+	picUrl,
-  upload,
+	NavgateTo,
-  uploadVideo,
+	upload,
-  menuButtonInfo,
+	isPhone,
-} from "../../../utils";
+	menuButtonInfo
-import { apiArr } from "../../../api/v2Community";
+} from '../../../utils';
+import {
+	apiArr
+} from '../../../api/community';
 export default {
-  data() {
+	data() {
-    return {
+		return {
-      active: "1",
+			active: "1",
-      top: "",
+			top: "",
-      localHeight: "",
+			localHeight: "",
-      type: "",
+			state: '4',
-      checked: "",
+			type: 'edit',
-      orderSelect: false,
+			orderSelect: false,
-      orderStateList: [
+			orderStateList: [
-        {
+				{
-          desc: "进行中",
+					desc: '进行中',
-          state: 2,
+					state: '2'
-        },
+				},
-        {
+				{
-          desc: "已作废",
+					desc: '已作废',
-          state: 4,
+					state: '3'
-        },
+				},
-        {
+				{
-          desc: "已完成",
+					desc: '已完成',
-          state: 3,
+					state: '4'
-        },
+				},
-      ],
+			],
-      orderState: {
+			orderState: {},
-        desc: '进行中',
+		}
-        state: 2
+	},
-      }, // 工单状态
+	methods: {
-      info: {},
+		headerBackClick() {
-      // 状态枚举类型
+			uni.navigateBack({
-      statusType: {
+				delta: 1
-        1: {
-          desc: "待指派",
-          style: "orderItemTit_state1",
-        },
-        2: {
-          desc: "进行中",
-          style: "orderItemTit_state2",
-        },
-        3: {
-          desc: "已完成",
-          style: "orderItemTit_state3",
-        },
-        4: {
-          desc: "已作废",
-          style: "orderItemTit_state4",
-        },
-      },
-      show: false,
-      communityMasterList: [],
-			order_dispatch_permission: false,
-      repairRemarks: '', // 维修备注信息
-      imgList: [],
-			videoList: {},
-
-    };
-  },
-  methods: {
-    headerBackClick() {
-      uni.navigateBack({
-        delta: 1,
-      });
-    },
-    // 接单按钮点击
-    async headerTakeClick() {
-      const res = await request(apiArr.workOrderCrudAccept, 'POST', {
-        id: this.info.id
-      })
-      uni.showToast({
-        title: '接单成功',
-        icon: 'success',
-        mask: true
-      })
-      setTimeout(() => {
-        uni.navigateBack({
-          delta: 1
-        })
-      }, 2000)
-    },
-    // 派单按钮点击 获取师傅列表并打开弹窗
-    async headerSelectMasterClick() {
-      const res = await request(apiArr.workMasterLick, "POST", {
-        community_id: this.info.community_id,
-      });
-			
-      this.communityMasterList = res.rows;
-      this.show = true;
-    },
-
-    // 上传图片
-		async afterReadImg(e){
-			const { file} = e;
-			console.log(e);
-      file.forEach(item => {
-        upload(item.url, res => {
-          console.log(res.data.path);
-          this.imgList.push({
-            url: picUrl + res.data.path,
-						picUrl: res.data.path,
-          })
-        })
-      })
-			uni.hideLoading();
-      uni.showToast({
-				title: '上传成功',
-				icon: 'success'
 			});
 		},
-		deletePic(e) {
+		headerTakeClick() {
-			this.imgList.splice(e.index, 1);
+			console.log('接单')
 		},
-		afterReadVideo(e){
+		headerEditClick() {
-			uploadVideo(e.file.url, res => {
+			if(this.type === 'edit') {
-				this.videoList = {
+				console.log('确定')
-					url: picUrl + res.data.url,
+			} else {
-					videos: res.data.url
+				this.type = 'edit';
-				}
+				console.log('编辑')
-			})
-		},
-		deleteVideo() {
-			this.videoList = {};
-		},
-    playFullScreenVideo() {
-			this.videoContext = this.videoContext || wx.createVideoContext('myVideo')
-			this.videoContext.requestFullScreen() // 请求全屏
-		},
-		cancels(e) {
-			this.videoList = {};
-		},
-
-    // 进行中订单 按钮触发方法
-    async headerEditClick() {
-      if (this.type === "edit") {
-        this.type = '';
-        const res = await request(apiArr.workOrderCrudUpdate, 'POST', {
-          id: this.info.id,
-          status: this.orderState.state, // 工单状态
-          repair_description: this.repairRemarks, // 维修描述
-          repair_images: this.imgList.length !== 0 ? this.imgList.map(item => item.picUrl).join(',') : '', // 维修图片
-          repair_videos: this.videoList.videos || '', // 维修视频
-          repair_remarks: '', // 维修备注
-          repair_time: '', // 维修时间
-        })
-        uni.showToast({
-          title: '修改工单状态完成',
-          icon: 'none'
-        });
-        setTimeout(() => {
-          uni.navigateBack({
-          delta: 1
-        })
-        }, 2000)
-
-      } else {
-        this.type = "edit";
-      }
-    },
-    // input 输入公共方法
-    handlerInputClick(e) {
-			const { name} = e.currentTarget.dataset;
-			this[name] = e.detail.value
-		},
-
-    // 修改工单状态
-    headerChangeStateClick() {
-      this.orderSelect = true;
-    },
-
-    // 工单状态选择时间
-    headerSelectClick(item) {
-      this.orderState = item;
-      this.orderSelect = false;
-    },
-    // 派单确定按钮
-		async headerConfirmClick() {
-			if (!this.checked) {
-				uni.showToast({
-					title: '请选择维修师傅',
-					icon: 'none'
-				})
-				return;
 			}
-			console.log('this.chec', this.checked);
-			const res = await request(apiArr.workOrderCrudDispatch, 'POST', {
-				worker_id: this.checked,
-				id: this.info.id,
-			})
-				uni.showToast({
-					title: '派单成功',
-					icon: 'success',
-					mask: true
-				})
-        setTimeout(() => {
-          uni.navigateBack({
-            delta: 1
-          })
-        }, 2000)
 		},
-
+		headerChangeStateClick() {
-    // 打开图片预览
+			this.orderSelect = true;
-    handlerPreviewImageClick(item) {
-			uni.previewImage({
-				urls: this.info.imagesList,
-				current: item,
-			});
 		},
-    headerRepairImagesClick(item) {
+		headerSelectClick(item) {
-			uni.previewImage({
+			this.orderState = item;
-				urls: this.info.repairImagesList,
+			this.orderSelect = false;
-				current: item,
+		}
-			});
+	},
-    },
 
-    // 师傅选择事件
+	onLoad(options) {
-		headerRadioClick(e) {
+		const meun = menuButtonInfo();
-			console.log('e', e);
+		this.top = meun.top;
-			const { name } = e.currentTarget.dataset;
+		this.localHeight = meun.height;
-			this.checked = name;
+	},
-		},
-    close() {
-      this.show = false;
-    },
-    async init(id) {
-      const res = await request(apiArr.workOrderCrudInfo, "POST", {
-        id: Number(id),
-      });
-      const newRes = {
-        ...res,
-        imagesList: res.images !== "" ? res.images.split(",").map((url) => `${picUrl}${url}`) : [], // 上报图片
-        videosList: res.videos !== "" ? res.videos.split(",").map((url) => `${picUrl}${url}`) : [], // 上报视频
-        repairImagesList: res.repair_images !== "" ? res.repair_images.split(",").map((url) => `${picUrl}${url}`) : [], // 上报图片
-        repairVideosList: res.repair_videos !== "" ? res.repair_videos.split(",").map((url) => `${picUrl}${url}`) : [], // 上报图片
 
-      };
+	onShow() {
-      this.info = newRes;
-    },
-  },
 
-  onLoad(options) {
+	},
-    console.log("1111", options);
-		const order_dispatch_permission = uni.getStorageSync('order_dispatch_permission');
-    this.order_dispatch_permission = order_dispatch_permission;
-    const meun = menuButtonInfo();
-    this.top = meun.top;
-    this.localHeight = meun.height;
-    this.init(options.id);
-  },
 
-  onShow() {},
+}
-};
 </script>
 
 <style>
 @import url("./index.css");
-</style>
+</style>

packages/workOrderDashboard/index/index.css

@@ -1,6 +1,3 @@
-.box {
-	padding-bottom: 60rpx;
-}
 .searchBox {
 	padding-bottom: 24rpx;
 	background-color: #fff;
@@ -105,10 +102,10 @@ page {
 	background: linear-gradient( 280deg, #FFFFFF 0%, #FFE7E7 100%);
 }
 .orderItemTit_state3{
-	background: linear-gradient( 283deg, #FFFFFF 0%, #E1FFF0 100%);
+	background: linear-gradient( 290deg, #FFFFFF 0%, #EDEDED 100%);
 }
 .orderItemTit_state4{
-	background: linear-gradient( 290deg, #FFFFFF 0%, #EDEDED 100%);
+	background: linear-gradient( 283deg, #FFFFFF 0%, #E1FFF0 100%);
 }
 
 .orderItemTit_left {
@@ -142,15 +139,6 @@ page {
 	color: #FFA600;
 	font-weight: 600;
 }
-.orderItem_row_state2 {
-	color: #FF4800;
-}
-.orderItem_row_state3 {
-	color: #2BE186;
-}
-.orderItem_row_state4 {
-	color: #999999;
-}
 
 .df {
 	display: flex;

packages/workOrderDashboard/index/index.vue

@@ -49,7 +49,7 @@
             <div class="orderItem_row_con">{{ item.room.name }}</div>
           </div>
 
-          <div :class="['orderItem_row_state', statusType[item.status].color]">
+          <div class="orderItem_row_state">
             {{ statusType[item.status].desc }}
           </div>
         </div>
@@ -92,7 +92,7 @@ export default {
 		return {
 			top: "",
 			localHeight: "",
-			active: 1,
+			active: "1",
 			page_num: 1,
       page_size: 10,
       flag: false, // 是否下拉请求接口
@@ -106,22 +106,18 @@ export default {
         1: {
           desc: "待指派",
           style: "orderItemTit_state1",
-          color: "orderItem_row_state1"
         },
         2: {
           desc: "进行中",
           style: "orderItemTit_state2",
-          color: "orderItem_row_state2"
-        },
-        3: {
-          desc: "已完成",
-          style: "orderItemTit_state3",
-          color: "orderItem_row_state3"
         },
         4: {
-          desc: "已作废",
+          desc: "已完成",
           style: "orderItemTit_state4",
-          color: "orderItem_row_state4"
+        },
+        3: {
+          desc: "已作废",
+          style: "orderItemTit_state3",
         },
       },
 		}
@@ -190,7 +186,7 @@ export default {
 		// 已废弃工单数量
 		async discardRes() {
 			const res = await request(apiArr.getWorkOrderCrudList, "POST", {
-        status: 4,
+        status: 3,
         page_num: this.page_num,
         page_size: this.page_size,
       });
@@ -199,7 +195,7 @@ export default {
 		// 已完成工单数量
 		async doneRes() {
 			const res = await request(apiArr.getWorkOrderCrudList, "POST", {
-        status: 3,
+        status: 4,
         page_num: this.page_num,
         page_size: this.page_size,
       });
@@ -217,10 +213,6 @@ export default {
     const meun = menuButtonInfo();
     this.top = meun.top;
     this.localHeight = meun.height;
-  },
-  onShow() {
-    this.page_num = 1;
-    this.list = [];
     this.init();
 		this.getTabsList();
   },

pages.json

@@ -241,20 +241,13 @@
 			"pages": [{
 					"path": "index/index",
 					"style": {
-						"navigationBarTitleText": "个人设置",
+						"navigationBarTitleText": "账户信息",
 						"navigationBarBackgroundColor": "#F9F9F9",
 						"usingComponents": {
 							"nav-footer": "/components/nav/nav"
 						}
 					}
 				},
-				{
-					"path": "replenishInfo/index",
-					"style": {
-						"navigationBarTitleText": "",
-						"navigationBarBackgroundColor": "#F9F9F9"
-					}
-				},
 				{
 					"path": "uploadAvatar/index",
 					"style": {
@@ -412,14 +405,21 @@
 					}
 				},
 				{
-					"path": "sucess/index",
+					"path": "apply/index",
+					"style": {
+						"navigationBarTitleText": "门店信息录入",
+						"navigationBarBackgroundColor": "#fff"
+					}
+				},
+				{
+					"path": "edit/index",
 					"style": {
 						"navigationBarTitleText": "",
-						"navigationBarBackgroundColor": "#f6f7fb"
+						"navigationBarBackgroundColor": "#fff"
 					}
 				}
 			]
-		},
+		},
 		{
 			"root": "packages/localLife",
 			"pages": [{
@@ -449,13 +449,13 @@
 						"navigationBarTitleText": "",
 						"navigationBarBackgroundColor": "#fff"
 					}
-				},
+				},
-				{
+				{
-					"path": "detail_msg/index",
+					"path": "detail_msg/index",
-					"style": {
+					"style": {
-						"navigationBarTitleText": "商家详情",
+						"navigationBarTitleText": "商家详情",
-						"navigationBarBackgroundColor": "#fff"
+						"navigationBarBackgroundColor": "#fff"
-					}
+					}
 				},
 				{
 					"path": "UserComment/index",

pages/login/login.vue

@@ -148,7 +148,6 @@
 					uni.removeStorageSync('is_dev');
 					uni.removeStorageSync('is_shop');
 					uni.removeStorageSync('shopId');
-					uni.removeStorageSync('order_dispatch_permission');
 					console.error('用户拒绝授权:', event.detail.errMsg);
 				}
 			},
@@ -157,10 +156,6 @@
 				request(apiArr2.getUserInfo,"POST",{
 					user_id:uni.getStorageSync('userId')
 				}).then(res=>{
-					console.log('111111', res);
-					const { community_worker } = res;
-					uni.setStorageSync('order_dispatch_permission', community_worker && community_worker[0].order_dispatch_permission == 1 || false);
-
 					console.log(res)
 				})
 			},

pages/user/index.css

@@ -1,15 +1,10 @@
-page {
-  background: #F6F7FB;
-}
 .conatiner {
-  /* height: 100%; */
+  height: 100%;
-  /* height: 578rpx; */
+  background: linear-gradient(to bottom, #FFE7E1, #FFFFFF);
-  /* background: linear-gradient(to bottom, #FFE7E1, #FFFFFF); */
-  /* background: linear-gradient( 359deg, rgba(255,255,255,0) 0%, #FDD9CA 100%); */
-  background: url('http://127.0.0.1:5500/assets/page_user_Group_1584.png');
-  background-size: contain;
-  background-repeat: no-repeat;
   background-attachment: fixed;
+  background-size: cover;
+  padding-top: 20rpx;
+  padding-bottom: 20%;
 }
 
 /* 头部 */
@@ -17,16 +12,15 @@ page {
   display: flex;
   align-items: center;
   margin-left: 25rpx;
-  margin-right: 20rpx;
+  /* margin-top: 83rpx; */
-  margin-top: 37rpx;
+  margin-bottom: 30rpx;
-  margin-bottom: 35rpx;
+  pointer-events: none;
-  /* pointer-events: none; */
 }
 /* 头像 */
 .avatar-container {
   display: flex;
-  width: 130rpx;
+  width: 120rpx;
-  height: 130rpx;
+  height: 120rpx;
   border-radius: 50%;
   overflow: hidden;
   background-color: #FF7354;
@@ -37,109 +31,20 @@ page {
 }
 /* 头像图片 */
 .avatar {
-  width: 130rpx;
+  /* width: 100%;
-  height: 130rpx;
+  height: 100%; */
+  width: 73rpx;
+  height: 69rpx;
+  /* margin-bottom: 20rpx; */
   pointer-events: auto;
   border-radius: 50%;
   overflow: hidden;
 }
-.avatar_right {
-  flex: 1;
-}
-.avatar_title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.avatar_setting  {
-  display: flex;
-  pointer-events: auto;
-}
-.avatar_setting > image {
-  width: 34rpx;
-  height: 34rpx;
-}
-.avatar_setting > image:first-child {
-  margin-right: 40rpx;
-}
-
 /* 登录/注册 */
 .login-btn {
   font-size: 36rpx;
   pointer-events: auto;
 }
-.avater_mobile {
-  margin-top: 10rpx;
-}
-.center {
-  position: relative;
-  margin: 0 20rpx;
-  height: 350rpx;
-}
-
-.gold_container {
-  /* width: 710rpx; */
-  height: 127rpx;
-  background: linear-gradient( 90deg, #FFE9A3 0%, rgba(232,127,0,0.8) 100%);
-  box-shadow: inset 0rpx 1rpx 2rpx 0rpx #E2C47C;
-  border-radius: 30rpx 30rpx 30rpx 30rpx;
-  margin: 37rpx 0 0;
-  position: relative;
-}
-.gold_title {
-  display: flex;
-  align-items: center;
-  padding-top: 16rpx;
-}
-.gold {
-  margin-left: 37rpx;
-  font-weight: normal;
-font-size: 34rpx;
-color: #7F3907;
-}
-.monenyt {
-  /* display: inline-block; */
-  margin-left: 17rpx;
-  margin-right: 37rpx;
-  font-weight: 400;
-  font-size: 40rpx;
-  color: #7F3907;
-}
-.price {
-  margin-left: 37rpx;
-  font-weight: normal;
-font-size: 26rpx;
-color: #7F3907;
-margin-right: 20rpx;
-}
-.gold_pic {
-  width: 140rpx;
-  height: 113rpx;
-  position: absolute;
-  top: 0;
-  right: 39rpx;
-}
-.main {
-  margin: 0 20rpx;
-  border-radius: 20rpx 20rpx 20rpx 20rpx;
-  background: #FFFFFF;
-}
-.main1 {
-  width: 100%;
-  margin: 0;
-  position: absolute;
-  top: 80rpx;
-}
-.main_title {
-  padding-top: 25rpx;
-  margin: 0 0 40rpx 30rpx;
-  font-weight: 600;
-  font-size: 36rpx;
-  color: #222222;
-}
-.margin20 {
-  margin-top: 20rpx;
-}
 
 .section {
   display: flex;
@@ -149,14 +54,6 @@ margin-right: 20rpx;
   margin-right: 20rpx;
   margin-bottom: 21rpx;
 }
-.section1 {
-  justify-content: space-around;
-}
-.section_label {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
 .order {
 	margin-top: 24rpx;
 }
@@ -183,12 +80,11 @@ margin-right: 20rpx;
 .item1 {
   display: flex;
   justify-content: space-around;
+  width: 100%;
+  height: 220rpx;
+  background-color: #FFFFFF;
   align-items: center;
-  border-radius: 20rpx;
+  border-radius: 30rpx;
-  padding-bottom: 25rpx;
-}
-.padding_bottom0 {
-  padding-bottom: 0;
 }
 
 .item-owner {
@@ -244,30 +140,11 @@ margin-right: 20rpx;
   font-size: 32rpx;
   font-weight: bold;
 }
-.customer {
+
-  width: 130rpx;
-  height: 130rpx;
-  position: fixed;
-  right: 0;
-  bottom: 212rpx;
-  background: rgba(255,55,11,0.6);
-  border-radius: 50%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  font-weight: normal;
-font-size: 28rpx;
-color: #FFFFFF;
-}
-.customer > image {
-  width: 50rpx;
-  height: 55rpx;
-}
 
 .uicon-volume {
 	font-size: 28rpx !important;
 }
 .u-grid-item {
-	margin-bottom: 36rpx;
+	margin-bottom: 43rpx;
-}
+}

pages/user/index.vue

@@ -6,37 +6,10 @@
 					:src="userInfo.userPic || 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_309.png'"
 					mode="" />
 			</view>
-			<view class="avatar_right">
+			<view class="login-btn">{{userInfo.user_name ? userInfo.user_name : '登录/注册'}}</view>
-				<view class="avatar_title">
-					<view class="login-btn">{{userInfo.user_name ? userInfo.user_name : '登录/注册'}}</view>
-					<view class="avatar_setting">
-						<image src="http://127.0.0.1:5500/assets/page_user_Vector13.png" mode="" @click.stop="headerRefreshClick"/>
-						<image src="http://127.0.0.1:5500/assets/page_user_Vector14.png" mode="" @click.stop="headerSettingsClick"/>
-					</view>
-				</view>
-				<view class="avater_mobile">{{ phoneNum }}</view>
-			</view>
-		</view>
-		<view class="section section1">
-			<view class="section_label">
-				<view>10010</view>
-				<view>积分</view>
-			</view>
-			<view class="section_label">
-				<view>0.00</view>
-				<view>繁华币</view>
-			</view>
-			<view class="section_label">
-				<view>0.00元</view>
-				<view>物业费公积金</view>
-			</view>
-			<view class="section_label">
-				<view>0元</view>
-				<view>红包卡券</view>
-			</view>
 		</view>
 
-		<!-- <view class="section">
+		<view class="section">
 			<view class="item" @click="handlePointsClick">
 				<view class="item-content">
 					<text class="item-title">积分</text>
@@ -52,77 +25,67 @@
 				</view>
 				<image class="item-icon1" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_311.png" />
 			</view>
-		</view> -->
+		</view>
-		<view class="center">
+
-			<view class="gold_container">
+		<!-- 我的社区、申请业主、我的设备 -->
-				<view class="gold_title">
+		<view class="section">
-					<span class="gold">金币</span> <span class="monenyt">0</span> | <span class="price">价值0.00元</span> <u-icon size="30" name="arrow-right" />
+			<view class="item1">
+				<view class="item_device" @click="handleCommunityClick">
+					<image class="icon-community icon-img"
+						src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_16.png"></image>
+					<text class="community-title title-item">我的社区</text>
 				</view>
-				<image class="gold_pic" src="http://127.0.0.1:5500/assets/page_user_Group_1556.png" />
+				<view class="item_device" @click="handleApplyOwnerClick">
-			</view>
+					<image class="icon-owner icon-img" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Frame.png" />
-			<view class="main main1">
+					<text class="owner-title title-item">申请业主</text>
-				<view class="main_title">物业服务</view>
+				</view>
-				<view class="item1">
+				<view class="item_device" @click="handleFacilityClick">
-					<view class="item_device" @click="handleCommunityClick">
+					<image class="icon-device icon-img" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Frame_1.png"/>
-						<image class="icon-community icon-img"
+					<text class="device-title title-item">我的设备</text>
-							src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_16.png"></image>
+				</view>
-						<text class="community-title title-item">我的社区</text>
+				<view class="item_device" @click="handleMeApplyClick">
-					</view>
+					<image class="icon-device icon-img" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Group_905.png"/>
-					<view class="item_device" @click="handleApplyOwnerClick">
+					<text class="device-title title-item">我的申请</text>
-						<image class="icon-owner icon-img" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Frame.png" />
-						<text class="owner-title title-item">申请业主</text>
-					</view>
-					<view class="item_device" @click="handleFacilityClick">
-						<image class="icon-device icon-img" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Frame_1.png"/>
-						<text class="device-title title-item">我的设备</text>
-					</view>
-					<view class="item_device" @click="handleMeApplyClick">
-						<image class="icon-device icon-img" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Group_905.png"/>
-						<text class="device-title title-item">我的申请</text>
-					</view>
 				</view>
 			</view>
 		</view>
 
-		<view class="main margin20">
+
-			<view class="main_title">电商服务</view>
+		<!-- 我的订单 -->
-			<view class="item1 padding_bottom0">
+		<view class="navigation">我的订单</view>
-				<u-grid col="4" :border="false" >
+		<view class="order">
-				<u-grid-item  @click="headerOrderClick(item)" v-for="(item, index) in networkList" :key="index">
+			<u-grid col="4" :border="false" >
+				<u-grid-item  @click="headerOrderClick(item)" v-for="(item, index) in order_List" :key="index">
 					<image class="nav_icon" :src="item.image" mode=""></image>
 					<text class="grid-text">{{item.name}}</text>
 				</u-grid-item>
 			</u-grid>
+		</view>
+		
+		<!-- 功能服务 -->
+		<view class="navigation">功能服务</view>
+		<view class="order">
+			<u-grid col="4" :border="false" >
+				<u-grid-item  @click="headerGridItemClick(item)" v-for="(item, index) in functional_List" :key="index">
+					<image class="nav_icon" :src="item.image" mode=""></image>
+					<text class="grid-text">{{item.name}}</text>
+				</u-grid-item>
+			</u-grid>
+		</view>
+		
+		
+		<view v-if="!isShop">
+			<view class="navigation">商家服务</view>
+			<view class="order">
+				<u-grid col="4" :border="false" >
+					<u-grid-item  @click="headerGridItemClick(item)" v-for="(item, index) in shopServer" :key="index">
+						<image class="nav_icon" :src="item.image" mode=""></image>
+						<text class="grid-text">{{item.name}}</text>
+					</u-grid-item>
+				</u-grid>
 			</view>
 		</view>
 
-		<view class="main margin20">
-			<view class="main_title">到家服务</view>
-			<view class="item1 padding_bottom0">
-				<u-grid col="4" :border="false" >
-				<u-grid-item  @click="headerOrderClick(item)" v-for="(item, index) in visitList" :key="index">
-					<image class="nav_icon" :src="item.image" mode=""></image>
-					<text class="grid-text">{{item.name}}</text>
-				</u-grid-item>
-			</u-grid>
-			</view>
-		</view>
-		<view class="main margin20">
-			<view class="main_title">门店服务</view>
-			<view class="item1 padding_bottom0">
-				<u-grid col="4" :border="false" >
-				<u-grid-item  @click="headerOrderClick(item)" v-for="(item, index) in shopList" :key="index">
-					<image class="nav_icon" :src="item.image" mode=""></image>
-					<text class="grid-text">{{item.name}}</text>
-				</u-grid-item>
-			</u-grid>
-			</view>
-		</view>
-		<view class="customer" @click="headerCustomerClick">
-			<image src="http://127.0.0.1:5500/assets/page_user_Vector16.png" mode=""/>
-			<view>客服</view>
-		</view>
-		<view style="padding-top: 174rpx;"></view>
 		<nav-footer />
 	</view>
 </template>
@@ -134,98 +97,124 @@
 		data() {
 			return {
 				top: 0,
-				networkList: [{
+				order_List: [{
-						image: "http://127.0.0.1:5500/assets/page_user_Group_1568.png",
+						image: "https://zhsq.hshuishang.com/Public/img/common/order12.png",
-						name: "我的订单",
+						name: "物业账单",
+						type: "h5",
 						url: "",
 					},
 					{
-						image: "http://127.0.0.1:5500/assets/page_user_Group_1567.png",
+						image: "https://zhsq.hshuishang.com/Public/img/common/order04.png",
-						name: "我的拼团",
+						name: "社区服务",
+						type: "h5",
+						url: "/packages/communityService/index/index",
+					},
+					{
+						image: "https://zhsq.hshuishang.com/Public/img/common/order11.png",
+						name: "商家优惠",
+						type: "h5",
 						url: "",
 					},
 					{
-						image: "http://127.0.0.1:5500/assets/page_user_Group_1565.png",
+						image: "https://zhsq.hshuishang.com/Public/img/common/order08.png",
-						name: "我的收藏",
+						name: "积分商城",
+						type: "h5",
 						url: "",
 					},
 					{
-						image: "http://127.0.0.1:5500/assets/page_user_Group_1566.png",
+						image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/orderIcon_1.png",
-						name: "售后服务",
+						name: "社区健康",
+						type: "h5",
 						url: "",
 					},
 					{
-						image: "http://127.0.0.1:5500/assets/page_user_Group_1563.png",
+						image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/orderIcon_2.png",
-						name: "收货地址",
+						name: "生活缴费",
+						type: "h5",
 						url: "",
 					},
 					{
-						image: "http://127.0.0.1:5500/assets/page_user_Group_1564.png",
+						image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/orderIcon_3.png",
-						name: "购物车",
+						name: "社区商城",
+						type: "h5",
 						url: "",
 					},
+					{
+						image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/User/_assets/orderIcon_4.png",
+						name: "周边商超",
+						type: "h5",
+						url: "",
+					},
+
+				],
+				functional_List: [{
+						"image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_25.png",
+						"name": "生活缴费",
+						"url": "",
+						"type": "h5"
+					},
+					{
+						"image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_26.png",
+						"name": "优惠卡券",
+						// "url": "/packages/user/coupon/index",
+						"type": "h5"
+					},
+					{
+						"image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_35.png",
+						"name": "我的卡券",
+						"url": "",
+						"type": "h5"
+					},
+					{
+						"image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_30.png",
+						"name": "营销推广",
+						"url": "/packages/user/marketing/index",
+						"type": "h5"
+					},
+					{
+						"image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_27.png",
+						"name": "个人设置",
+						"url": "/packages/user/index/index",
+						"type": "h5"
+					},
+					{
+						"image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/person/Group_29.png",
+						"name": "平台客服",
+						"url": "/packages/user/customerService/index",
+						"type": "h5"
+					},
+
+					// {
+					// 	"image": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/repairList.png",
+					// 	"name": "报修列表",
+					// 	"url": "/packages/OneRepair/pages/OwnerRepairList/OwnerRepairList",
+					// 	"type": "h5"
+					// },
+
+				],
+				shopServer: [{
+						image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Group_774.png",
+						name: "订单核销",
+						type: "",
+						url: "/shopWrite/index/index",
+					},
+					{
+						image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Group_774.png",
+						name: "核销列表",
+						type: "",
+						url: "/shopWrite/list/index",
+					},
 				],
-				visitList: [{
-					image: "http://127.0.0.1:5500/assets/page_user_Group_1572.png",
-					name: "服务工单",
-					url: "",
-					},
-					{
-						image: "http://127.0.0.1:5500/assets/page_user_Group_1573.png",
-						name: "服务地址",
-						url: "",
-					},
-					{
-						image: "http://127.0.0.1:5500/assets/page_user_Group_1574.png",
-						name: "服务卡",
-						url: "",
-					}
-				],
-				shopList: [{
-						image: "http://127.0.0.1:5500/assets/page_user_Group_1580.png",
-						name: "附近门店",
-						url: "",
-					},
-					{
-						image: "http://127.0.0.1:5500/assets/page_user_Group_1581.png",
-						name: "服务券",
-						url: "",
-					},
-					{
-					image: "http://127.0.0.1:5500/assets/page_user_Group_1582.png",
-					name: "支付记录",
-					url: "",
-					}
-				],
-				
-				
 				userInfo: {},
 				isShop: false,
-				phoneNum: uni.getStorageSync('phone'),
 			}
 		},
 
 		methods: {	
 			// 头像点击
 			toLogin() {
-				NavgateTo('/packages/user/replenishInfo/index');
-			},
-
-			// 刷新
-			headerRefreshClick() {
-				console.log('刷新')
-			},
-
-			// 设置
-			headerSettingsClick() {
-				console.log('设置')
 				NavgateTo('/packages/user/index/index');
 			},
-
-			// 客服
-			headerCustomerClick() {
-				console.log('客服')
-			},
 			
 			// 积分跳转
 			handlePointsClick() {

unpackage/dist/dev/mp-weixin/app.json

@@ -66,7 +66,6 @@
       "root": "packages/user",
       "pages": [
         "index/index",
-        "replenishInfo/index",
         "uploadAvatar/index",
         "resetPwd/index",
         "points/index",
@@ -107,7 +106,8 @@
       "root": "packages/shopEnter",
       "pages": [
         "index/index",
-        "sucess/index"
+        "apply/index",
+        "edit/index"
       ]
     },
     {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uGrid: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-grid/u-grid */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-grid/u-grid")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-grid/u-grid.vue */ 688))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-grid/u-grid */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-grid/u-grid")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-grid/u-grid.vue */ 811))
     },
     uGridItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-grid-item/u-grid-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-grid-item/u-grid-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-grid-item/u-grid-item.vue */ 696))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-grid-item/u-grid-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-grid-item/u-grid-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-grid-item/u-grid-item.vue */ 819))
     },
   }
 } catch (e) {
@@ -181,7 +181,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var nav = function nav() {
   __webpack_require__.e(/*! require.ensure | components/nav/nav */ "components/nav/nav").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/nav/nav */ 704));
+    return resolve(__webpack_require__(/*! ../../components/nav/nav */ 827));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 //1.导入组件

unpackage/dist/dev/mp-weixin/reservation/index/index.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uEmpty: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-empty/u-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-empty/u-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-empty/u-empty.vue */ 762))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-empty/u-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-empty/u-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-empty/u-empty.vue */ 867))
     },
     dropdown: function () {
-      return __webpack_require__.e(/*! import() | components/dropdown/dropdown */ "components/dropdown/dropdown").then(__webpack_require__.bind(null, /*! @/components/dropdown/dropdown.vue */ 770))
+      return __webpack_require__.e(/*! import() | components/dropdown/dropdown */ "components/dropdown/dropdown").then(__webpack_require__.bind(null, /*! @/components/dropdown/dropdown.vue */ 875))
     },
     uPopup: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 728))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 842))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/uview-ui/components/u-icon/u-icon"],{
 
-/***/ 719:
+/***/ 858:
 /*!********************************************************************************************!*\
   !*** D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-icon/u-icon.vue ***!
   \********************************************************************************************/
@@ -9,10 +9,10 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _u_icon_vue_vue_type_template_id_2ee87dc9_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u-icon.vue?vue&type=template&id=2ee87dc9&scoped=true& */ 720);
+/* harmony import */ var _u_icon_vue_vue_type_template_id_2ee87dc9_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u-icon.vue?vue&type=template&id=2ee87dc9&scoped=true& */ 859);
-/* harmony import */ var _u_icon_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u-icon.vue?vue&type=script&lang=js& */ 722);
+/* harmony import */ var _u_icon_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u-icon.vue?vue&type=script&lang=js& */ 861);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _u_icon_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _u_icon_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _u_icon_vue_vue_type_style_index_0_id_2ee87dc9_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./u-icon.vue?vue&type=style&index=0&id=2ee87dc9&lang=scss&scoped=true& */ 726);
+/* harmony import */ var _u_icon_vue_vue_type_style_index_0_id_2ee87dc9_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./u-icon.vue?vue&type=style&index=0&id=2ee87dc9&lang=scss&scoped=true& */ 865);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 34);
 
 var renderjs
@@ -41,7 +41,7 @@ component.options.__file = "uni_modules/uview-ui/components/u-icon/u-icon.vue"
 
 /***/ }),
 
-/***/ 720:
+/***/ 859:
 /*!***************************************************************************************************************************************!*\
   !*** D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-icon/u-icon.vue?vue&type=template&id=2ee87dc9&scoped=true& ***!
   \***************************************************************************************************************************************/
@@ -50,7 +50,7 @@ component.options.__file = "uni_modules/uview-ui/components/u-icon/u-icon.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_template_id_2ee87dc9_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-icon.vue?vue&type=template&id=2ee87dc9&scoped=true& */ 721);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_template_id_2ee87dc9_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-icon.vue?vue&type=template&id=2ee87dc9&scoped=true& */ 860);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_template_id_2ee87dc9_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_template_id_2ee87dc9_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +63,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 721:
+/***/ 860:
 /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-icon/u-icon.vue?vue&type=template&id=2ee87dc9&scoped=true& ***!
   \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -125,7 +125,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 722:
+/***/ 861:
 /*!*********************************************************************************************************************!*\
   !*** D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-icon/u-icon.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************************************/
@@ -134,14 +134,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-icon.vue?vue&type=script&lang=js& */ 723);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-icon.vue?vue&type=script&lang=js& */ 862);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 723:
+/***/ 862:
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-icon/u-icon.vue?vue&type=script&lang=js& ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -156,8 +156,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _icons = _interopRequireDefault(__webpack_require__(/*! ./icons */ 724));
+var _icons = _interopRequireDefault(__webpack_require__(/*! ./icons */ 863));
-var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 725));
+var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 864));
 //
 //
 //
@@ -291,7 +291,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 726:
+/***/ 865:
 /*!******************************************************************************************************************************************************!*\
   !*** D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-icon/u-icon.vue?vue&type=style&index=0&id=2ee87dc9&lang=scss&scoped=true& ***!
   \******************************************************************************************************************************************************/
@@ -300,14 +300,14 @@ exports.default = _default;
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_style_index_0_id_2ee87dc9_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--8-oneOf-1-3!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-icon.vue?vue&type=style&index=0&id=2ee87dc9&lang=scss&scoped=true& */ 727);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_style_index_0_id_2ee87dc9_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--8-oneOf-1-3!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-icon.vue?vue&type=style&index=0&id=2ee87dc9&lang=scss&scoped=true& */ 866);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_style_index_0_id_2ee87dc9_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_style_index_0_id_2ee87dc9_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_style_index_0_id_2ee87dc9_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_style_index_0_id_2ee87dc9_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_icon_vue_vue_type_style_index_0_id_2ee87dc9_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 727:
+/***/ 866:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-icon/u-icon.vue?vue&type=style&index=0&id=2ee87dc9&lang=scss&scoped=true& ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -326,7 +326,7 @@ __webpack_require__.r(__webpack_exports__);
     'uni_modules/uview-ui/components/u-icon/u-icon-create-component',
     {
         'uni_modules/uview-ui/components/u-icon/u-icon-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(719))
+            __webpack_require__('2')['createComponent'](__webpack_require__(858))
         })
     },
     [['uni_modules/uview-ui/components/u-icon/u-icon-create-component']]

unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/uview-ui/components/u-overlay/u-overlay"],{
 
-/***/ 809:
+/***/ 932:
 /*!**************************************************************************************************!*\
   !*** D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-overlay/u-overlay.vue ***!
   \**************************************************************************************************/
@@ -9,10 +9,10 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _u_overlay_vue_vue_type_template_id_1625041b_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u-overlay.vue?vue&type=template&id=1625041b&scoped=true& */ 810);
+/* harmony import */ var _u_overlay_vue_vue_type_template_id_1625041b_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u-overlay.vue?vue&type=template&id=1625041b&scoped=true& */ 933);
-/* harmony import */ var _u_overlay_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u-overlay.vue?vue&type=script&lang=js& */ 812);
+/* harmony import */ var _u_overlay_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u-overlay.vue?vue&type=script&lang=js& */ 935);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _u_overlay_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _u_overlay_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _u_overlay_vue_vue_type_style_index_0_id_1625041b_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./u-overlay.vue?vue&type=style&index=0&id=1625041b&lang=scss&scoped=true& */ 815);
+/* harmony import */ var _u_overlay_vue_vue_type_style_index_0_id_1625041b_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./u-overlay.vue?vue&type=style&index=0&id=1625041b&lang=scss&scoped=true& */ 938);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 34);
 
 var renderjs
@@ -41,7 +41,7 @@ component.options.__file = "uni_modules/uview-ui/components/u-overlay/u-overlay.
 
 /***/ }),
 
-/***/ 810:
+/***/ 933:
 /*!*********************************************************************************************************************************************!*\
   !*** D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-overlay/u-overlay.vue?vue&type=template&id=1625041b&scoped=true& ***!
   \*********************************************************************************************************************************************/
@@ -50,7 +50,7 @@ component.options.__file = "uni_modules/uview-ui/components/u-overlay/u-overlay.
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_template_id_1625041b_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-overlay.vue?vue&type=template&id=1625041b&scoped=true& */ 811);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_template_id_1625041b_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-overlay.vue?vue&type=template&id=1625041b&scoped=true& */ 934);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_template_id_1625041b_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_template_id_1625041b_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +63,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 811:
+/***/ 934:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-overlay/u-overlay.vue?vue&type=template&id=1625041b&scoped=true& ***!
   \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uTransition: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-transition/u-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-transition/u-transition")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-transition/u-transition.vue */ 817))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-transition/u-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-transition/u-transition")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-transition/u-transition.vue */ 940))
     },
   }
 } catch (e) {
@@ -113,7 +113,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 812:
+/***/ 935:
 /*!***************************************************************************************************************************!*\
   !*** D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-overlay/u-overlay.vue?vue&type=script&lang=js& ***!
   \***************************************************************************************************************************/
@@ -122,14 +122,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-overlay.vue?vue&type=script&lang=js& */ 813);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-overlay.vue?vue&type=script&lang=js& */ 936);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 813:
+/***/ 936:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-overlay/u-overlay.vue?vue&type=script&lang=js& ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -144,7 +144,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 814));
+var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 937));
 //
 //
 //
@@ -197,7 +197,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 815:
+/***/ 938:
 /*!************************************************************************************************************************************************************!*\
   !*** D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-overlay/u-overlay.vue?vue&type=style&index=0&id=1625041b&lang=scss&scoped=true& ***!
   \************************************************************************************************************************************************************/
@@ -206,14 +206,14 @@ exports.default = _default;
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_style_index_0_id_1625041b_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--8-oneOf-1-3!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-overlay.vue?vue&type=style&index=0&id=1625041b&lang=scss&scoped=true& */ 816);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_style_index_0_id_1625041b_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--8-oneOf-1-3!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-overlay.vue?vue&type=style&index=0&id=1625041b&lang=scss&scoped=true& */ 939);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_style_index_0_id_1625041b_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_style_index_0_id_1625041b_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_style_index_0_id_1625041b_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_style_index_0_id_1625041b_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_overlay_vue_vue_type_style_index_0_id_1625041b_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 816:
+/***/ 939:
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-overlay/u-overlay.vue?vue&type=style&index=0&id=1625041b&lang=scss&scoped=true& ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -232,7 +232,7 @@ __webpack_require__.r(__webpack_exports__);
     'uni_modules/uview-ui/components/u-overlay/u-overlay-create-component',
     {
         'uni_modules/uview-ui/components/u-overlay/u-overlay-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(809))
+            __webpack_require__('2')['createComponent'](__webpack_require__(932))
         })
     },
     [['uni_modules/uview-ui/components/u-overlay/u-overlay-create-component']]

unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/uview-ui/components/u-transition/u-transition"],{
 
-/***/ 817:
+/***/ 940:
 /*!********************************************************************************************************!*\
   !*** D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-transition/u-transition.vue ***!
   \********************************************************************************************************/
@@ -9,10 +9,10 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _u_transition_vue_vue_type_template_id_8e60ec6e_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u-transition.vue?vue&type=template&id=8e60ec6e&scoped=true& */ 818);
+/* harmony import */ var _u_transition_vue_vue_type_template_id_8e60ec6e_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u-transition.vue?vue&type=template&id=8e60ec6e&scoped=true& */ 941);
-/* harmony import */ var _u_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u-transition.vue?vue&type=script&lang=js& */ 820);
+/* harmony import */ var _u_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u-transition.vue?vue&type=script&lang=js& */ 943);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _u_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _u_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _u_transition_vue_vue_type_style_index_0_id_8e60ec6e_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./u-transition.vue?vue&type=style&index=0&id=8e60ec6e&lang=scss&scoped=true& */ 825);
+/* harmony import */ var _u_transition_vue_vue_type_style_index_0_id_8e60ec6e_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./u-transition.vue?vue&type=style&index=0&id=8e60ec6e&lang=scss&scoped=true& */ 948);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 34);
 
 var renderjs
@@ -41,7 +41,7 @@ component.options.__file = "uni_modules/uview-ui/components/u-transition/u-trans
 
 /***/ }),
 
-/***/ 818:
+/***/ 941:
 /*!***************************************************************************************************************************************************!*\
   !*** D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-transition/u-transition.vue?vue&type=template&id=8e60ec6e&scoped=true& ***!
   \***************************************************************************************************************************************************/
@@ -50,7 +50,7 @@ component.options.__file = "uni_modules/uview-ui/components/u-transition/u-trans
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_template_id_8e60ec6e_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-transition.vue?vue&type=template&id=8e60ec6e&scoped=true& */ 819);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_template_id_8e60ec6e_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-transition.vue?vue&type=template&id=8e60ec6e&scoped=true& */ 942);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_template_id_8e60ec6e_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_template_id_8e60ec6e_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +63,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 819:
+/***/ 942:
 /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-transition/u-transition.vue?vue&type=template&id=8e60ec6e&scoped=true& ***!
   \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -99,7 +99,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 820:
+/***/ 943:
 /*!*********************************************************************************************************************************!*\
   !*** D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-transition/u-transition.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************************************************/
@@ -108,14 +108,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-transition.vue?vue&type=script&lang=js& */ 821);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-transition.vue?vue&type=script&lang=js& */ 944);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 821:
+/***/ 944:
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-transition/u-transition.vue?vue&type=script&lang=js& ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -131,8 +131,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
-var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 822));
+var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 945));
-var _transition = _interopRequireDefault(__webpack_require__(/*! ./transition.js */ 823));
+var _transition = _interopRequireDefault(__webpack_require__(/*! ./transition.js */ 946));
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
@@ -200,7 +200,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 825:
+/***/ 948:
 /*!******************************************************************************************************************************************************************!*\
   !*** D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-transition/u-transition.vue?vue&type=style&index=0&id=8e60ec6e&lang=scss&scoped=true& ***!
   \******************************************************************************************************************************************************************/
@@ -209,14 +209,14 @@ exports.default = _default;
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_style_index_0_id_8e60ec6e_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--8-oneOf-1-3!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-transition.vue?vue&type=style&index=0&id=8e60ec6e&lang=scss&scoped=true& */ 826);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_style_index_0_id_8e60ec6e_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--8-oneOf-1-3!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u-transition.vue?vue&type=style&index=0&id=8e60ec6e&lang=scss&scoped=true& */ 949);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_style_index_0_id_8e60ec6e_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_style_index_0_id_8e60ec6e_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_style_index_0_id_8e60ec6e_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_style_index_0_id_8e60ec6e_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_sass_loader_dist_cjs_js_ref_8_oneOf_1_4_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_8_oneOf_1_5_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_transition_vue_vue_type_style_index_0_id_8e60ec6e_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 826:
+/***/ 949:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/projection/Hbuilder/uniapp-ZHSQ/uni_modules/uview-ui/components/u-transition/u-transition.vue?vue&type=style&index=0&id=8e60ec6e&lang=scss&scoped=true& ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -235,7 +235,7 @@ __webpack_require__.r(__webpack_exports__);
     'uni_modules/uview-ui/components/u-transition/u-transition-create-component',
     {
         'uni_modules/uview-ui/components/u-transition/u-transition-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(817))
+            __webpack_require__('2')['createComponent'](__webpack_require__(940))
         })
     },
     [['uni_modules/uview-ui/components/u-transition/u-transition-create-component']]