修改请求地址

feat: 师傅端报事报修开发And 接口修改
2025-06-16 17:51:32 +08:00 · 2025-06-16 17:50:34 +08:00 · 2025-06-16 17:50:33 +08:00 · 2025-06-16 15:42:33 +08:00 · 2025-06-16 15:40:00 +08:00
54 changed files with 2235 additions and 2411 deletions
--- a/api/area.js
+++ b/api/area.js
@ -1,5 +1,5 @@
-export const apiArr = {
-  city: '/citys/s/list', // 获取省份列表
-  area: '/citys/c/list', // 获取城市列表
-  business: '/citys/x/list', // 获取区县列表
+export const apiArr = {
+  city: '/api/v1/citys/s/list', // 获取省份列表
+  area: '/api/v1/citys/c/list', // 获取城市列表
+  business: '/api/v1/citys/x/list', // 获取区县列表
 }
--- a/api/community.js
+++ b/api/community.js
@ -1,32 +1,32 @@
 export const apiArr = {
-  list: '/wechat/community/list', // 获取社区列表
-  info: '/wechat/community/info', // 获取单个社区信息
-	isJoin: '/wechat/community/is-join', // 用户是否加入社区、楼宇、房间
-  tipsList: '/wechat/community/tips/list', // 获取全部通知列表
-  oneTips: '/wechat/community/tips/one', // 获取单个社区通知
-  apply: '/wechat/community/apply', // 申请加入小区
-  getFacilityList:'/wechat/community/facility/list', //获取楼号，
-  getRoomList:'/wechat/community/room/list', //获取房间号
-  ownerList: '/wechat/community/owner/list', // 获取社区业主列表
+  list: '/api/v1/wechat/community/list', // 获取社区列表
+  info: '/api/v1/wechat/community/info', // 获取单个社区信息
+	isJoin: '/api/v1/wechat/community/is-join', // 用户是否加入社区、楼宇、房间
+  tipsList: '/api/v1/wechat/community/tips/list', // 获取全部通知列表
+  oneTips: '/api/v1/wechat/community/tips/one', // 获取单个社区通知
+  apply: '/api/v1/wechat/community/apply', // 申请加入小区
+  getFacilityList:'/api/v1/wechat/community/facility/list', //获取楼号，
+  getRoomList:'/api/v1/wechat/community/room/list', //获取房间号
+  ownerList: '/api/v1/wechat/community/owner/list', // 获取社区业主列表
  
-  submit:"/wechat/community/owner/feedback-create", //报修提交
-  getListByRepair:"/wechat/community/owner/feedback-list",//报事报修列表
-  getInfoById:"/wechat/community/owner/feedback-info", //报事报修根据id查询详情
+  submit:"/api/v1/wechat/community/owner/feedback-create", //报修提交
+  getListByRepair:"/api/v1/wechat/community/owner/feedback-list",//报事报修列表
+  getInfoById:"/api/v1/wechat/community/owner/feedback-info", //报事报修根据id查询详情
 	
-	getUserCommunity:"/wechat/community/owner/mylist",//获取用户社区信息
+	getUserCommunity:"/api/v1/wechat/community/owner/mylist",//获取用户社区信息
 	
 	get_host_info: 'https://zhsq.hshuishang.com/Miniapi/Index/get_host_info',
 	
 	get_community_area_list:"https://zhsq.hshuishang.com/Miniapi/Community/get_community_area_list",
 	
 	
-	carList: '/wechat/community/car/list', // 获取社区列表
-	addCar: '/wechat/community/car/add', // 添加车辆
-	getCarList: '/wechat/community/car/list', //获取车辆列表
-	deleteItem: "/wechat/community/car/del",//删除车牌
+	carList: '/api/v1/wechat/community/car/list', // 获取社区列表
+	addCar: '/api/v1/wechat/community/car/add', // 添加车辆
+	getCarList: '/api/v1/wechat/community/car/list', //获取车辆列表
+	deleteItem: "/api/v1/wechat/community/car/del",//删除车牌
 	
-	getBanner:"/wechat/home-page/banner-list",//获取banner图
-	getButton:"/wechat/home-page/button-list",//获取button
-	getHotWords:"/wechat/home-page/search-hot-word/info",//搜索热词
+	getBanner:"/api/v1/wechat/home-page/banner-list",//获取banner图
+	getButton:"/api/v1/wechat/home-page/button-list",//获取button
+	getHotWords:"/api/v1/wechat/home-page/search-hot-word/info",//搜索热词
 	
 };
--- a/api/doorToDoor.js
+++ b/api/doorToDoor.js
@ -1,11 +1,11 @@
 export const apiArr = {
-  AllDoorToDoor: '/wechat/appoints/get-cate-list', //获取服务列表
-  ServerInfo: '/wechat/appoints/get-one', //获取服务列表
-  getServerById: '/wechat/appoints/get-all-list', //跟据不同的id 查分类
-  submitServer: '/wechat/appoint-orders/now', //预约服务
-  createServerOrder: '/wechat/appoint-orders/create', //创建上门服务订单
-  getCurrentShopMsg: '/wechat/water/device/shop-info', //获取店铺支付信息
-  getBanner: '/wechat/banner-list  ', //banner图
-  getGoodsList: '/wechat/get-shop-list', //获取商家列表
-  getGoodsDesc:"/wechat/shop/shop_info", //商家详情
+  AllDoorToDoor: '/api/v1/wechat/appoints/get-cate-list', //获取服务列表
+  ServerInfo: '/api/v1/wechat/appoints/get-one', //获取服务列表
+  getServerById: '/api/v1/wechat/appoints/get-all-list', //跟据不同的id 查分类
+  submitServer: '/api/v1/wechat/appoint-orders/now', //预约服务
+  createServerOrder: '/api/v1/wechat/appoint-orders/create', //创建上门服务订单
+  getCurrentShopMsg: '/api/v1/wechat/water/device/shop-info', //获取店铺支付信息
+  getBanner: '/api/v1/wechat/banner-list  ', //banner图
+  getGoodsList: '/api/v1/wechat/get-shop-list', //获取商家列表
+  getGoodsDesc:"/api/v1/wechat/shop/shop_info", //商家详情
 }
--- a/api/kitchen.js
+++ b/api/kitchen.js
@ -1,6 +1,6 @@
-export const apiArr = {
-	shopList: '/wechat/shop/shop_list', // 获取厨房信息
-	balance: '/wechat/shop/user_balance', // 用户余额
-	pay: '/wechat/shop/shop_pay', // 支付
-	recharge: '/wechat/shop/recharge', // 充值
+export const apiArr = {
+	shopList: '/api/v1/wechat/shop/shop_list', // 获取厨房信息
+	balance: '/api/v1/wechat/shop/user_balance', // 用户余额
+	pay: '/api/v1/wechat/shop/shop_pay', // 支付
+	recharge: '/api/v1/wechat/shop/recharge', // 充值
 };
--- a/api/login.js
+++ b/api/login.js
@ -1,5 +1,5 @@
 export const apiArr = {
-	login: '/wechat/multi-login', // 小程序登录
-	loginInfo: '/wechat/mpusers/login-info', // 获取用户信息
-	loginGetPhone: '/wechat/mpusers/get-phone', // 获取用户手机号
+	login: '/api/v1/wechat/multi-login', // 小程序登录
+	loginInfo: '/api/v1/wechat/mpusers/login-info', // 获取用户信息
+	loginGetPhone: '/api/v1/wechat/mpusers/get-phone', // 获取用户手机号
 }
--- a/api/pay.js
+++ b/api/pay.js
@ -1,4 +1,4 @@
 export const apiPay = {
-	pay: '/lakala/preorder', //预下单
-	queryPay: '/lakala/trade-query' //查询交易结果
+	pay: '/api/v1/lakala/preorder', //预下单
+	queryPay: '/api/v1/lakala/trade-query' //查询交易结果
 }
--- a/api/reservation.js
+++ b/api/reservation.js
@ -1,17 +1,17 @@
 export const apiArr = {
-	getActiveList: '/wechat/community/activity/list', //获取活动列表
-	getActiveInfoById: "/wechat/community/activity/detail", //获取活动详情
+	getActiveList: '/api/v1/wechat/community/activity/list', //获取活动列表
+	getActiveInfoById: "/api/v1/wechat/community/activity/detail", //获取活动详情

-	eliminate: "/wechat/community/activity/eliminate", //核销
-	eliminateList: "/wechat/community/activity/eliminate/list", //核销列表
-	eliminateInfo: "/wechat/community/activity/eliminate/detail", //核销详情
-	ScanCodeInfo: "/wechat/community/activity/one", //商家扫码详情
+	eliminate: "/api/v1/wechat/community/activity/eliminate", //核销
+	eliminateList: "/api/v1/wechat/community/activity/eliminate/list", //核销列表
+	eliminateInfo: "/api/v1/wechat/community/activity/eliminate/detail", //核销详情
+	ScanCodeInfo: "/api/v1/wechat/community/activity/one", //商家扫码详情

-	getReserationList: "/wechat/community/activity/reservation/list", //获取预约列表
-	Reservation: "/wechat/community/activity/reservation", //预约
-	modify: '/wechat/community/activity/order/modify', // 订单修改
+	getReserationList: "/api/v1/wechat/community/activity/reservation/list", //获取预约列表
+	Reservation: "/api/v1/wechat/community/activity/reservation", //预约
+	modify: '/api/v1/wechat/community/activity/order/modify', // 订单修改

 	// getShopList: "/wechat/community/activity/shop/list", // 查看自提点列表 接口作废
-	getShopList: '/wechat/community/activity/shop/pick_up_point_list', // 查看自提点列表
+	getShopList: '/api/v1/wechat/community/activity/shop/pick_up_point_list', // 查看自提点列表

 }
--- a/api/shopEnter.js
+++ b/api/shopEnter.js
@ -1,6 +1,6 @@
 export const apiArr = {
-  settledShop: '/wechat/shop/settled-shop', // 商家入驻
-  settledDeal: '/wechat/water/dealer/settled-deal', // 经销商入驻
-  settledComm: '/wechat/community/settled-comm', // 社区入驻
-  getTree: '/wechat/shop/cates/get-tree', // 商家商户分类树信息
+  settledShop: '/api/v1/wechat/shop/settled-shop', // 商家入驻
+  settledDeal: '/api/v1/wechat/water/dealer/settled-deal', // 经销商入驻
+  settledComm: '/api/v1/wechat/community/settled-comm', // 社区入驻
+  getTree: '/api/v1/wechat/shop/cates/get-tree', // 商家商户分类树信息
 }
--- a/api/user.js
+++ b/api/user.js
@ -1,20 +1,20 @@
 export const apiArr = {
-  getAllList:' /wechat/appoints/get-all-list', // 上门服务商品列表
-  revoke: '/wechat/appoint-orders/revoke', // 取消订单
-  getOne: '/wechat/appoint-orders/get-one', // 订单详情
-  create: '/wechat/appoint-orders/create', // 订单提交
-  getOrdersAllList: '/wechat/appoint-orders/get-all-list', // 查询这个登录人的所有订单
-  signCycle: '/wechat/sign/sign-cycle', // 签到周期详情
-  signList: '/wechat/sign/sign-list', // 获取签到记录列表
-  sign: '/wechat/sign/sign', // 积分签到
-  signIntegral: '/wechat/sign/integral', // 查询账户积分
-  signInfo: '/wechat/sign/info', // 获取签到详情
-  addr: '/wechat/mpusers/addr', // 获取地址信息
-  setAddr: '/wechat/mpusers/set-addr',//  修改地址接口
-  avatar: '/wechat/mpusers/avatar', // 上传头像
-  modifyPass: '/wechat/mpusers/modify-pass', //  修改登录密码
-  payPass: '/wechat/mpusers/pay-pass', // 设置支付密码
-  couponList: '/wechat/discuss/list', // 获取优惠券列表
-  getUserCommunity:"/wechat/community/owner/mylist",//获取用户社区信息
-	createQrcode: '/wechat/water/device/qr-code', //获取小程序码
+  getAllList:' /api/v1/wechat/appoints/get-all-list', // 上门服务商品列表
+  revoke: '/api/v1/wechat/appoint-orders/revoke', // 取消订单
+  getOne: '/api/v1/wechat/appoint-orders/get-one', // 订单详情
+  create: '/api/v1/wechat/appoint-orders/create', // 订单提交
+  getOrdersAllList: '/api/v1/wechat/appoint-orders/get-all-list', // 查询这个登录人的所有订单
+  signCycle: '/api/v1/wechat/sign/sign-cycle', // 签到周期详情
+  signList: '/api/v1/wechat/sign/sign-list', // 获取签到记录列表
+  sign: '/api/v1/wechat/sign/sign', // 积分签到
+  signIntegral: '/api/v1/wechat/sign/integral', // 查询账户积分
+  signInfo: '/api/v1/wechat/sign/info', // 获取签到详情
+  addr: '/api/v1/wechat/mpusers/addr', // 获取地址信息
+  setAddr: '/api/v1/wechat/mpusers/set-addr',//  修改地址接口
+  avatar: '/api/v1/wechat/mpusers/avatar', // 上传头像
+  modifyPass: '/api/v1/wechat/mpusers/modify-pass', //  修改登录密码
+  payPass: '/api/v1/wechat/mpusers/pay-pass', // 设置支付密码
+  couponList: '/api/v1/wechat/discuss/list', // 获取优惠券列表
+  getUserCommunity:"/api/v1/wechat/community/owner/mylist",//获取用户社区信息
+	createQrcode: '/api/v1/wechat/water/device/qr-code', //获取小程序码
 };
--- a/api/v2Community.js
+++ b/api/v2Community.js
@ -0,0 +1,5 @@
+export const apiArr = {
+    getCommunityList:"/api/v2/wechat/community-room/list", //小区房源列表
+    getCommunityInfo:"/api/v2/wechat/community-room/info", //小区房源详情
+    
+  };
--- a/api/v2Home.js
+++ b/api/v2Home.js
@ -0,0 +1,3 @@
+export const apiArr = {
+    getCateList:"/api/v2/wechat/merchant-cate-crud/list", //小区房源列表
+  };
--- a/packages/community/applyOwer/index.vue
+++ b/packages/community/applyOwer/index.vue
@ -89,9 +89,7 @@ export default {


 		chooseMsg(){
-			uni.navigateTo({
-				url:"../chooseMsg/index"
-			})
+			NavgateTo("../chooseMsg/index")
 		},


--- a/packages/community/chooseMsg/index.vue
+++ b/packages/community/chooseMsg/index.vue
@ -33,7 +33,7 @@
 </template>

 <script>
-import { request } from '../../../utils';
+import { request,NavgateTo } from '../../../utils';
 import { apiArr } from '../../../api/community';
 export default {
 	data() {
@ -43,9 +43,7 @@ export default {
 	},
 	methods: {
 		chooseCommunityInfo() {
-			uni.navigateTo({
-				url: '../chooseMsgInfo/index'
-			});
+			NavgateTo("../chooseMsgInfo/index")
 		}

 	},
--- a/packages/community/chooseMsgInfo/index.vue
+++ b/packages/community/chooseMsgInfo/index.vue
@ -202,7 +202,8 @@ import {
 	request,
 	picUrl,
 	uniqueByField,
-	menuButtonInfo
+	menuButtonInfo,
+	NavgateTo
 } from '../../../utils';

 export default {
@ -273,9 +274,7 @@ export default {
 				if (this.type == "1") {
 					return this.type = "0"
 				}
-				uni.navigateBack({
-					delta: 1
-				})
+				NavgateTo("1")
 			}
 			if (this.step == "1") {
 				if (this.type == "1") {
--- a/packages/community/communityDetail/index.vue
+++ b/packages/community/communityDetail/index.vue
@ -303,7 +303,8 @@ import {
 	request,
 	picUrl,
 	uniqueByField,
-	menuButtonInfo
+	menuButtonInfo,
+	NavgateTo
 } from '../../../utils';
 import {
 	apiArr
@ -333,21 +334,15 @@ export default {
 		},

 		mores() {
-			uni.navigateTo({
-				url: '../serverList/index'
-			})
+			NavgateTo("../serverList/index")
 		},

 		notice(){
-			uni.navigateTo({
-				url: '../notice/index'
-			})
+			NavgateTo("../notice/index")
 		},

 		repair(){
-			uni.navigateTo({
-				url: '../repairList/index'
-			})
+			NavgateTo("../repairList/index")
 		},
 	},

--- a/packages/community/index/index.css
+++ b/packages/community/index/index.css
@ -1,5 +1,6 @@
 page {
 	background-color: #F6F6FA;
+	
 }

 .container {
--- a/packages/community/index/index.vue
+++ b/packages/community/index/index.vue
@ -1,20 +1,20 @@
 <template>
 	<view class="container">

-		<view class="addRealEstateList" :style="{paddingTop: 54 + top + 'px'}">
+		<view class="addRealEstateList" :style="{ paddingTop: 54 + top + 'px' }">
 			<div class="addRealEstate" @click="apply">
 				申请入驻 / 新增房产
 			</div>
 		</view>

-		<view class="searchBox" :style="{height: localHeight + 'px',paddingTop: top + 'px'}" v-if="false">
+		<view class="searchBox" :style="{ height: localHeight + 'px', paddingTop: top + 'px' }" v-if="false">
 			<view class="searchBox_add">
 				<img src="http://192.168.0.172:5500/com_communityIcon.png" alt="" />
 				我的房产
 			</view>
 		</view>

-		<view class="searchBox" >
+		<view class="searchBox">
 			<view class="searchBox_add2">
 				我的房产
 			</view>
@ -23,19 +23,19 @@
 		<div class="myRealEstate">
 			<div class="myRealEstateEmpty" v-if="false">
 				抱歉！您尚未绑定任何房产
-				<div class="btn"  @click="apply">
+				<div class="btn" @click="apply">
 					商户申请入驻
 				</div>
 			</div>
-			
+
 			<div class="myRealEstates">
-					<image src="http://192.168.0.172:5500/com_communityNav.png" mode="aspectFill"></image>
-					<div class="name">滏阳锦苑</div>
-					<div class="Visitor" v-if="false">访客身份 点击立即入驻本社区</div>
-					<div class="Householder">
-						3号楼 2单元 17层 1706室 | 1人 | 物业公积金：￥55.68
-					</div>
-					
+				<image src="http://192.168.0.172:5500/com_communityNav.png" mode="aspectFill"></image>
+				<div class="name">滏阳锦苑</div>
+				<div class="Visitor" v-if="false">访客身份 点击立即入驻本社区</div>
+				<div class="Householder">
+					3号楼 2单元 17层 1706室 | 1人 | 物业公积金：￥55.68
+				</div>
+
 			</div>
 		</div>

@ -55,10 +55,10 @@


 			<div class="communityList">
-				<div class="communityItem" v-for="item in 3">
+				<div class="communityItem" v-for="item in communityList">
 					<div class="communityItem_Box">
 						<div class="communityItem_Box_left">
-							<image src="http://192.168.0.172:5500/test.png" alt="" mode="aspectFill" />
+							<image :src="picUrl + item.community.pic" alt="" mode="aspectFill" />
 						</div>
 						<div class="communityItem_Box_right">
 							<div class="communityItem_Box_right_tit">滏阳锦苑</div>
@ -66,11 +66,13 @@
 							<div class="communityItem_Box_right_msg">
 								<div class="communityItem_Box_right_msg_left">
 									<div class="communityItem_Box_right_msg_left1">
-										<image src="http://192.168.0.172:5500/com_navigationIcon.png" mode="aspectFill"></image>
+										<image src="http://192.168.0.172:5500/com_navigationIcon.png" mode="aspectFill">
+										</image>
 										导航
 									</div>
 									<div class="communityItem_Box_right_msg_left2">
-										<image src="http://192.168.0.172:5500/com_phoneIconIcon.png" mode="aspectFill"></image>
+										<image src="http://192.168.0.172:5500/com_phoneIconIcon.png" mode="aspectFill">
+										</image>
 										电话
 									</div>

@ -91,49 +93,72 @@
 </template>

 <script>
-	import {
-		request,
-		picUrl,
-		uniqueByField,
-		menuButtonInfo
-	} from '../../../utils';
-	import {
-		apiArr
-	} from '../../../api/community';
+import {
+	request,
+	picUrl,
+	uniqueByField,
+	menuButtonInfo,
+	NavgateTo
+} from '../../../utils';
+
+import { apiArr } from '../../../api/v2Community';


-	export default {
-		data() {
-			return {
-				top: "",
-				localHeight: "",
-			}
-		},
-		onLoad(options) {
-			const meun = menuButtonInfo();
-			this.top = meun.top;
-			// this.top = meun.height + meun.top;
-			this.localHeight = meun.height;
-		},
-
-
-		methods: {
-			desc(){
-				uni.navigateTo({
-					url:"../communityDetail/index"
-				})
-			},
-			apply(){
-				uni.navigateTo({
-					url:"../applyOwer/index"
-				})
+export default {
+	data() {
+		return {
+			picUrl,
+			top: "",
+			localHeight: "",
+			queryPage: {
+				page_num: 1,
+				page_size: 10,
 			},
+			communityList: [],
+			flag:false,
+		}
+	},
+	onLoad(options) {
+		const meun = menuButtonInfo();
+		this.top = meun.top;
+		// this.top = meun.height + meun.top;
+		this.localHeight = meun.height;
+		this.getCommunityList()
+	},
+
+
+	methods: {
+		desc() {
+			NavgateTo("../communityDetail/index")
+		},
+		apply() {
+			NavgateTo("../applyOwer/index")
 		},

+		getCommunityList() {
+			let that = this
+			request(apiArr.getCommunityList, 'POST', {
+				page_num: that.queryPage.page_num,
+				page_size: that.queryPage.page_size,
+				user_id:""
+			}).then(res => {
+				console.log(res)
+				if (res.rows.length == that.queryPage.page_size) {
+					that.queryPage.page_num++
+					that.flag = true
+					that.communityList = that.communityList.concat(res.rows)
+				}else{
+					that.flag = false
+					that.communityList = that.communityList.concat(res.rows)
+				}
+			})
+		},
+	},

-	}
+
+}
 </script>

 <style>
-	@import url("./index.css");
+@import url("./index.css");
 </style>
--- a/packages/community/notice/index.vue
+++ b/packages/community/notice/index.vue
@ -51,7 +51,8 @@ import {
 	request,
 	picUrl,
 	uniqueByField,
-	menuButtonInfo
+	menuButtonInfo,
+	NavgateTo
 } from '../../../utils';
 import {
 	apiArr
@ -84,9 +85,7 @@ export default {
 			});
 		},
 		desc(){
-			uni.navigateTo({
-				url: '../noticeDesc/index'
-			});
+			NavgateTo('../noticeDesc/index');
 		},
 	},

--- a/packages/community/repairList/index.vue
+++ b/packages/community/repairList/index.vue
@ -94,15 +94,11 @@ export default {
 	},
 	methods: {
 		oneRepair(){
-			uni.navigateTo({
-				url: '../oneRepair/index'
-			});
+			NavgateTo("../oneRepair/index")
 		},

 		desc(){
-			uni.navigateTo({
-				url: '../repairDetail/index'
-			});
+			NavgateTo("../repairDetail/index")
 		},


--- a/packages/workOrderDashboard/detail/index.css
+++ b/packages/workOrderDashboard/detail/index.css
@ -0,0 +1,182 @@
+page {
+	background-color: #f6f7fb;
+	
+}
+
+.searchBox {
+	padding-bottom: 24rpx;
+	background-color: #fff;
+}
+
+.searchBox_add {
+	height: 100%;
+	width: 100%;
+	display: flex;
+}
+
+.searchBox_left {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	padding-left: 20rpx;
+}
+
+.searchBox_mid {
+	flex: 1;
+	font-size: 40rpx;
+	color: #222222;
+	text-align: center;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.searchBox_right {
+	flex: 1;
+}
+
+
+.repairMsg {
+	margin: 20rpx;
+	box-sizing: border-box;
+	padding: 25rpx 20rpx;
+	border-radius: 20rpx 20rpx 20rpx 20rpx;
+	background-color: #fff;
+
+}
+
+
+page {
+	padding-bottom: 60rpx;
+}
+
+
+
+.orderItemTit {
+	display: flex;
+	background: linear-gradient(304deg, #FFFFFF 0%, #FFF6E6 100%);
+	border-radius: 20rpx 20rpx 0rpx 0rpx;
+	height: 85rpx;
+	justify-content: space-between;
+	padding: 0 20rpx;
+	align-items: center;
+	box-sizing: border-box;
+}
+
+.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(290deg, #FFFFFF 0%, #EDEDED 100%);
+}
+.orderItemTit_state3 > .orderItemTit_right {
+	font-size: 28rpx;
+	color: #999999;
+	font-size: 600;
+}
+
+.orderItemTit_state4 {
+	background: linear-gradient(283deg, #FFFFFF 0%, #E1FFF0 100%);
+}
+.orderItemTit_state4 > .orderItemTit_right {
+	font-size: 28rpx;
+	color: #2BE186;
+	font-size: 600;
+}
+
+.row {
+	display: flex;
+	padding: 0 20rpx;
+	justify-content: center;
+	padding-top: 30rpx;
+}
+
+.row_label {
+	font-size: 28rpx;
+	color: #999999;
+	width: 190rpx;
+}
+
+.row_con {
+	font-size: 28rpx;
+	color: #222222;
+	padding-bottom: 30rpx;
+	border-bottom: 1rpx solid #EBEBEB;
+	flex: 1;
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+}
+
+.row_con image {
+	width: 120rpx;
+	height: 120rpx;
+	border-radius: 10rpx 10rpx 10rpx 10rpx;
+	margin-right: 20rpx;
+}
+
+.noneBor{
+	border-bottom: none;
+}
+.df{
+	display: flex;
+	align-items: center;
+}
+.btn {
+	margin: 40rpx auto 60rpx;
+	width: 600rpx;
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center;
+	background: linear-gradient( 91deg, #FF7658 0%, #FF370B 100%);
+	border-radius: 100rpx 100rpx 100rpx 100rpx;
+	font-size: 36rpx;
+	color: #FFFFFF;
+	font-weight: 600;
+}
+.white_container {
+	position: relative;
+	margin: 20rpx;
+	box-sizing: border-box;
+	padding: 25rpx 20rpx;
+	border-radius: 20rpx 20rpx 20rpx 20rpx;
+	background-color: #fff;
+/* 	display: flex;
+	justify-content: space-between; */
+}
+.white_label {
+	font-size: 28rpx;
+	color: #999999;
+	width: 190rpx;
+}
+.whit_desc {
+	font-weight: 600;
+	font-size: 28rpx;
+	color: #FF0000;
+}
+.statePupop {
+	width: 100%;
+	/* position: absolute; */
+	background: #FFFFFF;
+	/* top: -220rpx; */
+	/* left: 0; */
+	/* z-index: 10; */
+}
+.statePopop_label {
+	padding: 10px 0;
+}
--- a/packages/workOrderDashboard/detail/index.vue
+++ b/packages/workOrderDashboard/detail/index.vue
@ -0,0 +1,224 @@
+<template>
+	<div class="container">
+		<div class="searchBox" :style="{ height: localHeight + 'px', paddingTop: top + 'px' }">
+			<div class="searchBox_add">
+				<div class="searchBox_left">
+					<u-icon bold color="#000" 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="orderItemTit orderItemTit_state1" v-if="state == 1">
+				<div class="orderItemTit_left">工单编号：123456789145</div>
+				<div class="orderItemTit_right ">待指派</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_label">小区房源名称</div>
+				<div class="row_con">世纪名城1号楼1单元101</div>
+			</div>
+
+			<div class="row">
+				<div class="row_label">报修类型</div>
+				<div class="row_con">家具维修</div>
+			</div>
+
+			<div class="row">
+				<div class="row_label">问题描述</div>
+				<div class="row_con">门坏了</div>
+			</div>
+
+			<div class="row">
+				<div class="row_label">联系人</div>
+				<div class="row_con">高尚</div>
+			</div>
+
+			<div class="row">
+				<div class="row_label">联系电话</div>
+				<div class="row_con">15901518415</div>
+			</div>
+
+			<div class="row">
+				<div class="row_label">上门时间</div>
+				<div class="row_con">2025-06-12 12:00</div>
+			</div>
+		</div>
+
+		<div class="repairMsg">
+			<div class="row">
+				<div class="row_label df">图片</div>
+				<div class="row_con">
+					<image v-for="item in 3" src="http://192.168.0.172:5500/com_communityNav.png" mode="aspectFill">
+					</image>
+				</div>
+			</div>
+
+			<div class="row">
+				<div class="row_label df">视频</div>
+				<div class="row_con">
+					<image src="http://192.168.0.172:5500/com_communityNav.png" mode="aspectFill"></image>
+				</div>
+			</div>
+
+			<div class="row">
+				<div class="row_label">创建时间</div>
+				<div class="row_con noneBor">2025-06-12 12:00</div>
+			</div>
+		</div>
+
+		<div class="repairMsg" v-if="state != 1">
+			<div class="row">
+				<div class="row_label">维修师傅</div>
+				<div class="row_con">
+					刘师傅
+				</div>
+			</div>
+
+			<div class="row">
+				<div class="row_label">师傅手机号</div>
+				<div class="row_con">
+					13445667552
+				</div>
+			</div>
+
+			<div class="row">
+				<div class="row_label">师傅工号</div>
+				<div class="row_con noneBor">123456789</div>
+			</div>
+		</div>
+
+		<div class="repairMsg" v-if="state != 1">
+			<div class="row">
+				<div class="row_label df">维修图片</div>
+				<div class="row_con">
+					<image v-for="item in 3" src="http://192.168.0.172:5500/com_communityNav.png" mode="aspectFill">
+					</image>
+				</div>
+			</div>
+
+			<div class="row">
+				<div class="row_label df">维修视频</div>
+				<div class="row_con">
+					<image src="http://192.168.0.172:5500/com_communityNav.png" mode="aspectFill"></image>
+				</div>
+			</div>
+
+			<div class="row">
+				<div class="row_label">维修描述</div>
+				<div class="row_con noneBor">大门坏了文案文案文案文案</div>
+			</div>
+		</div>
+		<div class="white_container" v-if="state == 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 || orderStateList[0].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" v-if="state == 1" @click="headerTakeClick">接单</div>
+		<div class="btn" v-if="state == 2" @click="headerEditClick">{{type === 'edit' ? '确定' : '编辑'}}</div>
+	</div>
+</template>
+
+<script>
+import {
+	request,
+	picUrl,
+	NavgateTo,
+	upload,
+	isPhone,
+	menuButtonInfo
+} from '../../../utils';
+import {
+	apiArr
+} from '../../../api/community';
+export default {
+	data() {
+		return {
+			active: "1",
+			top: "",
+			localHeight: "",
+			state: '4',
+			type: 'edit',
+			orderSelect: false,
+			orderStateList: [
+				{
+					desc: '进行中',
+					state: '2'
+				},
+				{
+					desc: '已作废',
+					state: '3'
+				},
+				{
+					desc: '已完成',
+					state: '4'
+				},
+			],
+			orderState: {},
+		}
+	},
+	methods: {
+		headerBackClick() {
+			uni.navigateBack({
+				delta: 1
+			});
+		},
+		headerTakeClick() {
+			console.log('接单')
+		},
+		headerEditClick() {
+			if(this.type === 'edit') {
+				console.log('确定')
+			} else {
+				this.type = 'edit';
+				console.log('编辑')
+			}
+		},
+		headerChangeStateClick() {
+			this.orderSelect = true;
+		},
+		headerSelectClick(item) {
+			this.orderState = item;
+			this.orderSelect = false;
+		}
+	},
+
+	onLoad(options) {
+		const meun = menuButtonInfo();
+		this.top = meun.top;
+		this.localHeight = meun.height;
+	},
+
+	onShow() {
+
+	},
+
+}
+</script>
+
+<style>
+@import url("./index.css");
+</style>
--- a/packages/workOrderDashboard/index/index.css
+++ b/packages/workOrderDashboard/index/index.css
@ -0,0 +1,147 @@
+.searchBox {
+	padding-bottom: 24rpx;
+	background-color: #fff;
+}
+
+.searchBox_add {
+	height: 100%;
+	width: 100%;
+	display: flex;
+}
+
+.searchBox_left {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	padding-left: 20rpx;
+}
+
+.searchBox_mid {
+	flex: 1;
+	font-size: 40rpx;
+	color: #222222;
+	text-align: center;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.searchBox_right {
+	flex: 1;
+}
+
+.tabList {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin: 0 20rpx;
+	padding-top: 38rpx;
+	padding-bottom: 26rpx;
+}
+
+.tab {
+	font-size: 30rpx;
+	color: #222222;
+}
+
+.tab span {
+	color: 30rpx;
+}
+
+.active {
+	font-weight: 700;
+	position: relative;
+}
+
+.active::after {
+	content: '';
+	width: 52rpx;
+	height: 22rpx;
+	background: url(http://192.168.0.172:5500/com_active.png);
+	background-size: cover;
+	position: absolute;
+	left: 50%;
+	bottom: -20rpx;
+	transform: translateX(-50%);
+}
+
+
+.orderList {
+	margin-top: 20rpx;
+}
+
+.orderItem {
+	width: 710rpx;
+	height: 435rpx;
+	background-color: #fff;
+	margin: 0 auto;
+	border-radius: 20rpx;
+}
+
+page {
+	background-color: #f6f7fb;
+	min-height: 100vh;
+	padding: 0;
+}
+
+.orderItemTit {
+	display: flex;
+	background: linear-gradient(304deg, #FFFFFF 0%, #FFF6E6 100%);
+	border-radius: 20rpx 20rpx 0rpx 0rpx;
+	width: 710rpx;
+	height: 85rpx;
+	justify-content: space-between;
+	padding: 0 20rpx;
+	align-items: center;
+	box-sizing: border-box;
+}
+.orderItemTit_state1{
+	background: linear-gradient(304deg, #FFFFFF 0%, #FFF6E6 100%);
+}
+.orderItemTit_state2{
+	background: linear-gradient( 280deg, #FFFFFF 0%, #FFE7E7 100%);
+}
+.orderItemTit_state3{
+	background: linear-gradient( 290deg, #FFFFFF 0%, #EDEDED 100%);
+}
+.orderItemTit_state4{
+	background: linear-gradient( 280deg, #FFFFFF 0%, #FFE7E7 100%);
+}
+
+.orderItemTit_left {
+	font-size: 28rpx;
+	color: #222222;
+	font-weight: 600;
+}
+
+.orderItemTit_right {
+	font-size: 24rpx;
+	color: #999999;
+}
+
+.orderItem_row {
+	display: flex;
+	align-items: center;
+	padding: 0 20rpx;
+	box-sizing: border-box;
+	font-size: 26rpx;
+	color: #999999;
+	margin-top: 20rpx;
+	justify-content: space-between;
+}
+
+.orderItem_row_label {
+	width: 200rpx;
+}
+
+.orderItem_row_state {
+	font-size: 28rpx;
+	color: #FFA600;
+	font-weight: 600;
+}
+
+.df {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
--- a/packages/workOrderDashboard/index/index.vue
+++ b/packages/workOrderDashboard/index/index.vue
@ -0,0 +1,117 @@
+<template>
+	<view class="box">
+		<div class="searchBox" :style="{ height: localHeight + 'px', paddingTop: top + 'px' }">
+			<div class="searchBox_add">
+				<div class="searchBox_left">
+					<u-icon bold color="#000" size="40" name="arrow-left" @click="headerBackClick"></u-icon>
+				</div>
+				<div class="searchBox_mid">工作台</div>
+				<div class="searchBox_right"></div>
+			</div>
+		</div>
+
+		<div class="tabList">
+			<div :class="active == '1' ? 'tab active' : 'tab'" @click="headertabsClick(1)">待指派 <span>(1)</span></div>
+			<div :class="active == '2' ? 'tab active' : 'tab'" @click="headertabsClick(2)">进行中 <span>(1)</span></div>
+			<div :class="active == '3' ? 'tab active' : 'tab'" @click="headertabsClick(3)">已作废 <span>(1)</span></div>
+			<div :class="active == '4' ? 'tab active' : 'tab'" @click="headertabsClick(4)">已完成 <span>(1)</span></div>
+		</div>
+
+		<div class="orderList">
+			<div class="orderItem" @click="headerDetailsClick">
+				<div class="orderItemTit orderItemTit_state1" v-if="false">
+					<div class="orderItemTit_left">工单编号：123456789145</div>
+					<div class="orderItemTit_right">2025-06-04 16:27:35</div>
+				</div>
+				<div class="orderItemTit orderItemTit_state2" v-if="true">
+					<div class="orderItemTit_left">工单编号：123456789145</div>
+					<div class="orderItemTit_right">2025-06-04 16:27:35</div>
+				</div>
+				<div class="orderItemTit orderItemTit_state3" v-if="false">
+					<div class="orderItemTit_left">工单编号：123456789145</div>
+					<div class="orderItemTit_right">2025-06-04 16:27:35</div>
+				</div>
+				<div class="orderItemTit orderItemTit_state4" v-if="false">
+					<div class="orderItemTit_left">工单编号：123456789145</div>
+					<div class="orderItemTit_right">2025-06-04 16:27:35</div>
+				</div>
+				
+				<div class="orderItem_row">
+					<div class="df">
+						<div class="orderItem_row_label">小区房源名称</div>
+						<div class="orderItem_row_con">世纪名城1号楼1单元101</div>
+					</div>
+
+					<div class="orderItem_row_state">
+						待指派
+					</div>
+				</div>
+
+				<div class="orderItem_row">
+					<div class="orderItem_row_label">报修类型</div>
+					<div class="orderItem_row_con">家具维修</div>
+				</div>
+
+				<div class="orderItem_row">
+					<div class="orderItem_row_label">问题描述</div>
+					<div class="orderItem_row_con">门坏了</div>
+				</div>
+
+				<div class="orderItem_row">
+					<div class="orderItem_row_label">上门时间</div>
+					<div class="orderItem_row_con">2025-06-12 12:00</div>
+				</div>
+
+				<div class="orderItem_row">
+					<div class="orderItem_row_label">联系人</div>
+					<div class="orderItem_row_con">高尚</div>
+				</div>
+
+				<div class="orderItem_row">
+					<div class="orderItem_row_label">联系人手机号</div>
+					<div class="orderItem_row_con">15901518415</div>
+				</div>
+			</div>
+		</div>
+
+	</view>
+</template>
+
+<script>
+import { request, NavgateTo, menuButtonInfo } from '../../../utils';
+import { apiArr } from '../../../api/community';
+export default {
+	data() {
+		return {
+			top: "",
+			localHeight: "",
+			active: "1"
+		}
+	},
+	methods: {
+
+		headerDetailsClick(){
+			NavgateTo(`../detail/index`);
+		},
+		headertabsClick(item) {
+			this.active = item;
+		},
+
+		headerBackClick() {
+			uni.navigateBack({
+				delta: 1
+			});
+		},
+	},
+
+	onLoad(options) {
+		const meun = menuButtonInfo();
+		this.top = meun.top;
+		this.localHeight = meun.height;
+	},
+}
+</script>
+
+<style>
+@import url("./index.css");
+</style>
--- a/pages.json
+++ b/pages.json
@ -4,7 +4,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationStyle": "custom",
-				"navigationBarBackgroundColor": "#F9F9F9",
+				"navigationBarBackgroundColor": "#FFF",
 				"usingComponents": {
 					"nav-footer": "/components/nav/nav"
 				}
@ -75,7 +75,25 @@
 				}
 			}]
 		},
-
+		{
+			"root": "packages/workOrderDashboard",
+			"pages": [{
+				"path": "index/index",
+				"style": {
+					"navigationStyle": "custom",
+					"navigationBarTitleText": "",
+					"navigationBarBackgroundColor": "#F9F9F9"
+				}
+			},
+			{
+				"path": "detail/index",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationStyle": "custom"
+				}
+			}
+			]
+		},
 		{
 			"root": "reservation",
 			"pages": [{
@ -114,7 +132,6 @@
 					"style": {
 						"navigationStyle": "custom",
 						"usingComponents": {
-							"tabularCard": "/components/tabularCard/tabularCard",
 							"nav-footer": "/components/nav/nav"
 						}
 					}
--- a/pages/index/index.css
+++ b/pages/index/index.css
@ -1,87 +1,23 @@
-.content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
+.container {
+	background-color: #f9f9f9;
 }
-
-.logo {
-	height: 200rpx;
-	width: 200rpx;
-	margin-top: 200rpx;
-	margin-left: auto;
-	margin-right: auto;
-	margin-bottom: 50rpx;
-}
-
-.text-area {
-	display: flex;
-	justify-content: center;
-}
-
-.title {
-	font-size: 36rpx;
-	color: #8f8f94;
-}
-
-
-.nav-box {
-	box-sizing: border-box;
-	width: 100%;
-	position: relative;
-	/* position: fixed; */
-	z-index: 2;
-}
-
-.nav-box .nav-bar {
-	display: flex;
-	align-items: center;
-}
-
-.nav-box .nav-bar .nav-bar-left,
-.nav-box .nav-bar .nav-bar-right {
+.white_container {
+	background: #FFFFFF;
 	padding: 0 20rpx;
-	min-width: 36rpx;
 }
-
-.nav-box .nav-bar .nav-bar-left van-icon {
-	vertical-align: sub;
-	color: #333333;
+page {
+	background-color: #FFFFFF;
 }
-
-.nav-box .nav-bar .nav-bar-title {
-	flex: 1;
-	text-align: center;
-	font-weight: 400;
-	font-size: 36rpx;
-	color: #000000;
-}
-
-.nav-box .nav-bar-title {
-	margin-left: -20rpx;
-}
-
 .grid_Pic {
 	width: 54rpx;
 	height: 46rpx;
 	margin-bottom: 20rpx;
 }

-
-.indexBg {
-	width: 750rpx;
-	height: 775rpx;
-	position: absolute;
-	top: -20rpx;
-	left: 0;
-	z-index: -1;
-}
-
 .searchBox {
 	display: flex;
 	align-items: center;
-	margin: 0 20rpx;
-	/* margin-top: 35rpx; */
+	background-color: #FFFFFF;
 	justify-content: space-between;
 }

@ -99,47 +35,6 @@
 	margin-right: 10rpx;
 }

-.iptbox {
-	width: 480rpx;
-	height: 60rpx;
-	background: #FFFFFF;
-	border-radius: 100rpx;
-	display: flex;
-	align-items: center;
-	box-sizing: border-box;
-	padding: 0 15rpx;
-	justify-content: space-between;
-	font-weight: 400;
-	font-size: 26rpx;
-	color: #000000;
-}
-
-.iptbox image {
-	width: 33rpx;
-	height: 33rpx;
-}
-
-.map {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	font-weight: 400;
-	font-size: 20rpx;
-	color: #222222;
-	margin-left: 20rpx;
-}
-
-.map image {
-	width: 31rpx;
-	height: 31rpx;
-	margin-bottom: 6rpx;
-}
-
-.searchBox_msg {
-	display: flex;
-	align-items: center;
-}
-
 .swiper {
 	width: 710rpx;
 	height: 300rpx;
@ -148,6 +43,10 @@
 	position: relative;
 }

+.margin_top20 {
+	margin-top: 20rpx;
+}
+
 .cirList {
 	position: absolute;
 	left: 50%;
@ -205,373 +104,170 @@
 }

 .Tit {
-	font-weight: bold;
-	font-size: 32rpx;
+	display: flex;
+	align-items: center;
+	padding-top: 30rpx;
+	margin-bottom: 35rpx;
+	font-weight: normal;
+	font-size: 36rpx;
 	color: #222222;
-	margin-left: 20rpx;
-	margin-bottom: 40rpx;
+}
+.local {
+	max-width: 414rpx;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	
+}
+.Tit_desc {
+	padding: 0 12rpx;
+	height: 36rpx;
+	background: linear-gradient( 90deg, #FFA100 0%, #FF6A00 100%);
+	border-radius: 100rpx 100rpx 100rpx 100rpx;
+	font-weight: normal;
+	font-size: 26rpx;
+	color: #FFFFFF;
 }

 .serverList {
 	display: flex;
 	flex-wrap: wrap;
 	align-items: center;
-	margin-left: 20rpx;
-	margin-right: 20rpx;
 	justify-content: space-between;
 }

 .serverItem {
 	border-radius: 30rpx;
-	width: 345rpx;
-	height: 188rpx;
+	width: 208rpx;
+	height: 114rpx;
 	box-sizing: border-box;
-	padding-top: 30rpx;
-	padding-left: 40rpx;
-	font-weight: bold;
+	padding-top: 11rpx;
+	padding-left: 13rpx;
+	font-weight: 600;
 	font-size: 26rpx;
 	color: #222222;
 	position: relative;
-	margin-bottom: 20rpx;
+	margin-bottom: 12rpx;
+}
+.serverList_left {
+	display: block;
+	width: 260rpx;
+	height: 369rpx;
+	margin-right: 17rpx;
+}
+.serverList_right {
+	flex: 1;
+	display: flex;
+	flex-wrap: wrap;
 }

 .serverItem1 {
 	background: linear-gradient(139deg, #FEF4F4 0%, #FEDCD2 100%);
+	margin-right: 12rpx;
 }

 .serverItem2 {
-	background: #F7F7F7;
+	background: #FFF4E5;
 }

 .serverItem3 {
-	background: linear-gradient(139deg, #FEFBF4 0%, #FEEFD2 100%);
+	background: #F1FFEC;
+margin-right: 12rpx;
 }

 .serverItem4 {
-	background: #EFF3FF;
+	background: #F0FDFF;
+}
+.serverItem5 {
+background: #EFF7FF;
+margin-right: 12rpx;
+}
+
+.serverItem6 {
+background: linear-gradient( 180deg, #FFFFFF 0%, #FFEDF2 100%);
 }

 .serverItem1 image {
 	position: absolute;
-	right: 13rpx;
-	top: 25rpx;
-	width: 172rpx;
-	height: 172rpx;
+	right: 12rpx;
+	top: 14rpx;
+	width: 103rpx;
+	height: 100rpx;
 }

 .serverItem2 image {
 	position: absolute;
-	right: 12rpx;
-	top: 57rpx;
-	width: 190rpx;
-	height: 127rpx;
+	right: 6rpx;
+	top: 8rpx;
+	width: 108rpx;
+	height: 108rpx;
 }

 .serverItem3 image {
-	width: 138rpx;
-	height: 123rpx;
+	width: 116rpx;
+	height: 83rpx;
 	position: absolute;
-	right: 30rpx;
-	top: 50rpx;
+	right: 0rpx;
+	top: 30rpx;
 }

 .serverItem4 image {
-	width: 143rpx;
-	height: 143rpx;
+	width: 130rpx;
+	height: 86rpx;
 	position: absolute;
-	top: 37rpx;
-	right: 16rpx;
+	top: 30rpx;
+	right: 11rpx;
 }
-
-.List_tabList {
-	display: flex;
-	align-items: center;
-	margin: 0 20rpx;
-	margin-top: 24rpx;
-}
-
-.List_tabItem {
-	font-weight: 400;
-	font-size: 28rpx;
-	color: #555555;
-	margin-right: 60rpx;
-}
-
-.List_active {
-	font-weight: bold;
-	font-size: 32rpx;
-	color: #222222;
-	position: relative;
-}
-
-.List_active::after {
-	width: 63rpx;
-	height: 10rpx;
-	background: #FF512A;
-	border-radius: 0rpx;
-	content: '';
+.serverItem5 image {
+	width: 162rpx;
+	height: 93rpx;
 	position: absolute;
-	left: 50%;
-	bottom: -10rpx;
-	transform: translateX(-50%);
+	right: 0rpx;
+	top: 23rpx;
 }

-.List_active::before {
-	content: '';
-	width: 63rpx;
-	height: 10rpx;
-	background: #FF512A;
-	border-radius: 0rpx;
-	filter: blur(6.599999904632568rpx);
+.serverItem6 image {
+	width: 72rpx;
+	height: 72rpx;
 	position: absolute;
-	left: 50%;
-	bottom: -10rpx;
-	transform: translateX(-50%);
+	top: 30rpx;
+	right: 20rpx;
 }

-.List {
-	margin: 0 20rpx;
-	margin-top: 30rpx;
-}
-
-.List_Item {
-	padding-top: 10rpx;
-	padding-bottom: 30rpx;
-	display: flex;
-}
-
-.List .List_Item:last-of-type .Item_msg {
-	border-bottom: none;
-}
-
-.Item_img {
-	width: 180rpx;
-	height: 180rpx;
-	border-radius: 30rpx;
-	margin-right: 30rpx;
-}
-
-.Item_msg {
-	flex: 1;
-	padding-bottom: 55rpx;
-	border-bottom: 1rpx solid #E6E6E6;
-}
-
-.Item_top {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-
-.Item_top_name {
-	font-weight: 400;
-	font-size: 32rpx;
-	color: #000000;
-}
-
-.Item_top_apart {
-	font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
-	font-weight: 400;
-	font-size: 22rpx;
-	color: #a8682bcc;
-}
-
-.Item_sceond {
-	font-weight: 400;
-	font-size: 24rpx;
-	color: #555555;
-	margin-top: 15rpx;
-}
-
-.Item_third {
-	display: flex;
-	align-items: center;
-	font-weight: 400;
-	font-size: 24rpx;
-	color: #999999;
-	margin-top: 18rpx;
-}
-
-.Item_third image {
-	width: 24rpx;
-	height: 26rpx;
-	margin-right: 12rpx;
-}
-
-.Item_fourth {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin-top: 20rpx;
-}
-
-.Item_fourth_left {
-	display: flex;
-	align-items: center;
-}
-
-.Item_fourth_right {
-	font-weight: 400;
-	font-size: 26rpx;
+.merchant {
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center;
+	width: 710rpx;
+	border-radius: 100rpx 100rpx 100rpx 100rpx;
+	background: linear-gradient( 91deg, #FF7658 0%, #FF370B 100%);
+	font-weight: normal;
+	font-size: 36rpx;
 	color: #FFFFFF;
-	width: 150rpx;
-	height: 50rpx;
-	background: #D5AC66;
-	border-radius: 100rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
+	margin-top: 28rpx;
 }

-.Item_fourth_left1 {
-	width: 110rpx;
-	height: 40rpx;
-	background: rgba(255, 81, 42, 0.1);
-	border-radius: 100rpx;
-	margin-right: 4rpx;
+.padding_bottom32 {
+	padding-bottom: 32rpx;
 }
-
-.Item_fourth_left1 {
-	width: 110rpx;
-	height: 40rpx;
-	background: rgba(255, 81, 42, 0.1);
-	border-radius: 100rpx;
+.main {
 	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-weight: 400;
-	font-size: 22rpx;
-	color: #555555;
-	display: flex;
-	align-items: center;
-	justify-content: center;
+	flex-wrap: wrap;
+}
+.list_pic {
+	width: 345rpx;
+	height: 345rpx;
 	margin-right: 20rpx;
-}
-
-.Item_fourth_left2 {
-	width: 110rpx;
-	height: 40rpx;
-	background: #FFF2DA;
-	border-radius: 100rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-weight: 400;
-	font-size: 22rpx;
-	background: #FFF2DA;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.Item_fourth_left1 image {
-	width: 24rpx;
-	height: 24rpx;
-	margin-right: 4rpx;
-}
-
-.Item_fourth_left2 image {
-	width: 24rpx;
-	height: 24rpx;
-	margin-right: 4rpx;
-}
-
-.list {
-	margin-top: 36rpx;
-}
-
-.item_tit {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin: 0 20rpx;
-	margin-bottom: 32rpx;
-	margin-top: 30rpx;
-}
-
-.item_tit_left {
-	font-weight: bold;
-	font-size: 28rpx;
-	color: #000000;
-}
-
-.item_tit_right {
-	font-weight: 400;
-	font-size: 24rpx;
-	color: #D5AC66;
-	display: flex;
-	align-items: center;
-}
-
-.item_tit_right image {
-	width: 12rpx;
-	height: 22rpx;
-	margin-left: 8rpx;
-}
-
-.item_goodsItem {
-	display: flex;
-	align-items: center;
-	margin: 0 20rpx;
 	margin-bottom: 20rpx;
 }
-
-.item_goodsItem_tit {
-	width: 180rpx;
-	height: 180rpx;
-	margin-right: 30rpx;
-	margin-left: 19rpx;
+.list_pic:nth-child(2n) {
+	margin-right: 0;
 }

-.item_goodsItem_name {
-	font-weight: 400;
+.more {
+	font-weight: normal;
 	font-size: 26rpx;
-	color: #222222;
-	margin-top: 20rpx;
-	margin-left: 10rpx;
-}
-
-.item_goodsItem_msg {
-	font-weight: 400;
-	font-size: 22rpx;
-	color: #FF512A;
-	display: flex;
-	align-items: flex-end;
-	margin-top: 6rpx;
-	margin-left: 13rpx;
-}
-
-.item_goodsItem_msg view {
-	font-weight: 500;
-	font-size: 36rpx;
-}
-
-.item_goodsItem_msg text {
-	font-size: 22rpx;
-	color: #FF512A;
-}
-
-.item_goodsList {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: 0 20rpx;
-}
-
-.list_item {
-	padding-bottom: 32rpx;
-	border-bottom: 1rpx solid #E6E6E6;
-}
-
-.btn {
-	display: inline-flex;
-	align-items: center;
-	background: rgba(255, 81, 42, 0.1);
-	border-radius: 100rpx;
-	padding: 7rpx 22rpx 7rpx 0;
-}
-
-.mobile {
-	background: #FFF2DA;
-	margin-left: 20rpx;
+	color: #999999;
+	margin: 65rpx auto;
+	text-align: center;
 }
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -1,135 +1,86 @@
 <template>
-	<view class="box" :style="{paddingTop: top + 'px'}">
-
-		<!-- 背景图 -->
-		<!-- <view class="indexBg">
-			<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Index_bg.png" mode="widthFix" />
-		</view> -->
-
-		<!-- 搜索框部分 -->
-		<view class="searchBox" :style="{height: localHeight + 'px'}">
-			<view class="searchBox_add" @tap="map">
-				<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Index_add.png" mode="widthFix" />
-				<view v-if="!currentCity.city">
-					{{city ? city.city : '选择城市'}}
-				</view>
-				<view v-if="currentCity.city">
-					{{currentCity.city}}
-				</view>
-			</view>
-		<!-- 	<view class="searchBox_msg">
-				<view class="iptbox">
-					<input type="text" v-model="iptMsg" @input="iptChange" :placeholder="currentPlaceholder" />
-					<image @tap="searchCurrent"
-						src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/water_filter/dervice/deriveSearch.png"
-						mode="widthFix" />
-				</view>
-				<view class="map" @tap="opMap">
-					<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Index_map.png" mode="widthFix" />
-					地图
-				</view>
-			</view> -->
-		</view>
-
-		<!-- 轮播图 -->
-		<view class="swiper">
-			<swiper @animationfinish="swipers">
-				<swiper-item v-for="(item, index) in bannerList" :key="index" @click="details(item)">
-					<image :src="item.pic_src" mode="widthFix" />
-				</swiper-item>
-			</swiper>
-
-			<view class="cirList">
-				<view :class="['cir', currentIdx == index ? 'active' : '']" v-for="(item, index) in bannerList" :key="index">
-				</view>
-			</view>
-		</view>
-
-
-		<!-- 标签列表 -->
-		<!-- <view class="tabList">
-			<view class="tabItem" v-for="(item, index) in tabList" :key="index" @tap="desc" :data-url="item.link_url">
-				<view class="tabImg">
-					<image :src="item.icon_src" mode="widthFix" />
-				</view>
-				<view class="tabname">{{item.title}}</view>
-			</view>
-		</view> -->
-
-		<view class="tabList">
-	    <u-grid col="5" :border="false">
-	      <u-grid-item
-	        v-for="(item, index) in tabList"
-	        @click="desc(item.link_url)"
-					:key="index"
-	      >
-				<image class="grid_Pic" :src="item.icon_src" mode=""></image>
-				<text>{{item.title}}</text>
-				</u-grid-item>
-	    </u-grid>
-	  </view>
-
-		<view class="line"></view>
-
-		<!-- 精选服务 -->
-		<view class="Tit">精选服务</view>
-		<view class="serverList">
-			<view class="serverItem serverItem1" @tap="cf">
-				<view class="serverTit">榴园厨房</view>
-				<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/server_img1.png" mode="widthFix" />
-			</view>
-			<view class="serverItem serverItem2" @tap="wybx">
-				<view class="serverTit">物业报修</view>
-				<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/server_img2.png" mode="widthFix" />
-			</view>
-			<view class="serverItem serverItem3" @tap="shopEnter">
-				<view class="serverTit">商家入驻</view>
-				<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/indexSubcontract/_assets/Merchantsettlement.png"
-					mode="widthFix" />
-			</view>
-			<view class="serverItem serverItem4" @tap="water_filter">
-				<view class="serverTit">人人爱净水</view>
-				<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/server_img4.png" mode="widthFix" />
-			</view>
-		</view>
-
-		<!-- 列表选项卡 -->
-		<view class="List_tabList">
-			<view :class="['List_tabItem', current == 0 ? 'List_active' : '']" @tap="changeCurrent" data-idx="0">小区</view>
-			<view :class="['List_tabItem', current == 1 ? 'List_active' : '']" @tap="changeCurrent" data-idx="1">服务</view>
-			<view :class="['List_tabItem', current == 2 ? 'List_active' : '']" @tap="changeCurrent" data-idx="2">店铺</view>
-			<view :class="['List_tabItem', current == 3 ? 'List_active' : '']" @tap="changeCurrent" data-idx="3">团购</view>
-			<view :class="['List_tabItem', current == 4 ? 'List_active' : '']" @tap="changeCurrent" data-idx="4">预定</view>
-		</view>
-
-		<!-- 列表内容 -->
-		<view class="List" v-if="current == 0">
-			<tabularCard v-for="(item, index) in CommunityList" :key="index" :item="item"
-				:isLast="index === CommunityList.length -1" />
-		</view>
-
-		<view class="list" v-if="current == 1">
-			<view class="item_goodsItem" v-if="serverList.length > 0" v-for="(items, index) in serverList" :key="index"
-				@tap="ServerDesc(items.appoint_id)" :data-id="items.appoint_id">
-				<view class="item_goodsItem_tit">
-					<image :src="items.photo" mode="aspectFill" />
-				</view>
-				<view style="flex: 1;">
-					<view class="item_goodsItem_name">{{items.title}}</view>
-					<view class="item_goodsItem_msg">
-						￥
-						<view>{{items.price}}</view>
-						<text>/{{items.unit}}</text>
+	<view class="container" :style="{marginTop: top + 'px'}">
+		<view class="white_container">
+			<!-- 搜索框部分 -->
+			<view class="searchBox" :style="{height: localHeight + 'px'}">
+				<view class="searchBox_add" @tap="map">
+					<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Index_add.png" mode="widthFix" />
+					<view >
+						{{currentCity.cityName || '选择城市'}}
 					</view>
 				</view>
 			</view>
-			<van-empty v-if="serverList.length == 0" description="暂无内容" />
+			<!-- 轮播图 -->
+			<view class="swiper">
+				<swiper @animationfinish="swipers">
+					<swiper-item v-for="(item, index) in bannerList" :key="index" @click="details(item)">
+						<image :src="item.pic_src" mode="widthFix" />
+					</swiper-item>
+				</swiper>
+			
+				<view class="cirList">
+					<view :class="['cir', currentIdx == index ? 'active' : '']" v-for="(item, index) in bannerList" :key="index">
+					</view>
+				</view>
+			</view>
+			
+			<!-- 宫格列表 -->
+			<view class="tabList">
+				<u-grid col="5" :border="false">
+					<u-grid-item
+						v-for="(item, index) in tabList"
+						@click="desc(item.link_url)"
+						:key="index"
+					>
+					<image class="grid_Pic" :src="item.icon_src" mode=""></image>
+					<text>{{item.title}}</text>
+					</u-grid-item>
+				</u-grid>
+			</view>
 		</view>
-
-		<view class="empty" v-if="current != 0 && current != 1">
-			<van-empty description="暂无内容" />
+		
+		<view class="white_container margin_top20 padding_bottom32">
+			<view v-if="!currentCity.district" class="Tit">定位错误 未知区域</view>
+			<view v-else class="Tit">
+				<view class="local">{{currentCity.district}}</view>附近
+				<view class="Tit_desc">公积金补贴商户</view>
+			</view>
+			<view class="serverList">
+				<image class="serverList_left" src="http://127.0.0.1:5500/assets/index_Group_1169.png" alt="" />
+				<view class="serverList_right">
+					<view class="serverItem serverItem1" @tap="cf">
+						<view class="serverTit">便利超市</view>
+						<image src="http://127.0.0.1:5500/assets/index_Group_1167.png" mode="widthFix" />
+					</view>
+					<view class="serverItem serverItem2" @tap="cf">
+						<view class="serverTit">茶馆咖啡</view>
+						<image src="http://127.0.0.1:5500/assets/index_Group_1166.png" mode="widthFix" />
+					</view>
+					<view class="serverItem serverItem3" @tap="cf">
+						<view class="serverTit">休闲娱乐</view>
+						<image src="http://127.0.0.1:5500/assets/index_Group_1168.png" mode="widthFix" />
+					</view>
+					<view class="serverItem serverItem4" @tap="cf">
+						<view class="serverTit">蔬菜水果</view>
+						<image src="http://127.0.0.1:5500/assets/index_Group_1298.png" mode="widthFix" />
+					</view>
+					<view class="serverItem serverItem5" @tap="cf">
+						<view class="serverTit">养生健身</view>
+						<image src="http://127.0.0.1:5500/assets/index_Group_1165.png" mode="widthFix" />
+					</view>
+					<view class="serverItem serverItem6" @tap="cf">
+						<view class="serverTit">更多</view>
+						<image src="http://127.0.0.1:5500/assets/index_Group_1283.png" mode="widthFix" />
+					</view>
+				</view>
+			</view>
+			<view class="merchant" @click="headershopEnterClick">商户申请入驻</view>
 		</view>
-
+		
+		<view class="white_container margin_top20 main padding_bottom32">
+			<image v-for="(item, index) in 8" :key="index" class="list_pic" src="http://127.0.0.1:5500/assets/index_Mask_group.png" mode=""></image>
+		</view>
+		<view class="more">下拉加载后续10条，共计30条</view>
 		<nav-footer />
 	</view>

@ -153,7 +104,7 @@

 	import {
 		apiArr as apiArr2
-	} from '../../api/doorToDoor.js'
+	} from '../../api/v2Home.js'

 	import {
 		apiArr as citys
@ -168,28 +119,13 @@
 		}, //2.注册组件
 		data() {
 			return {
-				// s: uni.getSystemInfoSync().statusBarHeight, // 状态栏高度
-				// n: (uni.getMenuButtonBoundingClientRect().top - uni.getSystemInfoSync().statusBarHeight) * 2 + uni
-				// 	.getMenuButtonBoundingClientRect().height, // 导航栏高度
-				// t: uni.getMenuButtonBoundingClientRect().top, // 胶囊局顶部距离
-				// h: uni.getMenuButtonBoundingClientRect().height, // 胶囊高度
-				// picUrl: picUrl,
 				city: "",
 				qqmap_key: '',
-				tabList: [
-					// ... 保持原有tabList数据不变 ...
-				],
-				nearbyLocation: '',
-				current: 0,
+				tabList: [],
+				nearbyLocation: '', // 城区附近地址
 				flag: false,
-				page_num: 1,
-				page_size: 10,
-				serverList: [], // 服务列表
-				CommunityList: [], // 小区列表
-				iptMsg: "",
 				currentIdx: 0,
-				currentCity: "",
-				city: "",
+				currentCity: "", // ? 什么作用
 				top: 0,
 				localHeight: 44,
 				userlocat: "",
@ -197,64 +133,7 @@
 				bannerList: [],
 				buttonList: [],

-				tabList: [{
-						img: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img1.png",
-						name: "社区列表",
-						url: "/packages/community/index/index?title=社区列表&types=2"
-					},
-					{
-						img: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img2.png",
-						name: "社区服务",
-						url: "/packages/communityService/index/index"
-					},
-					{
-						img: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img3.png",
-						name: "周边商家",
-						url: ""
-					},
-					// {
-					//     img:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img4.png",
-					//     name:"社区团购",
-					//     // url:""
-					// },
-					// {
-					//     img:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img5.png",
-					//     name:"餐饮美食",
-					//     url:""
-					// },
-					{
-						img: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img6.png",
-						name: "智慧康养",
-						url: ""
-					},
-					{
-						img: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img11.png",
-						name: "我的预约",
-						url: "/packages/community/repairList/index"
-					},
-					{
-						img: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img8.png",
-						name: "便民服务",
-						url: ""
-					},
-					// {
-					//     img:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img9.png",
-					//     name:"积分兑换",
-					//     // url:""
-					// },
-					// {
-					//     img:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img10.png",
-					//     name:"官方商城",
-					//     url:""
-					// },
-				],
-				title: 'Hello',
-				currentCity: "",
 				currentProviceCity: "",
-
-				HotWords: [],
-				currentPlaceholder: '',
-				placeholderIndex: 0
 			}
 		},

@ -263,55 +142,12 @@
 				this.currentIdx = e.detail.current
 			},

-			iptChange(e) {
-				this.iptMsg = e.detail.value
-			},
-			searchCurrent() {
-				this.flag = false
-				this.page_num = 1
-				this.serverList = []
-				this.current = 1
-				this.getServerList()
-			},
-			opMap() {
-				uni.chooseLocation({
-					success(res) {
-						console.log(res)
-					}
-				})
-			},
 			map() {
-				// if (uni.getStorageSync('userId')) {
 				uni.navigateTo({
 					url: '/pages/shopcity/shopcity'
 				});
-				// } else {
-				// 	uni.navigateTo({
-				// 		url: '/pages/login/login'
-				// 	})
-				// }
 			},
-			getCommunityList() {
-				let that = this;
-				request(apiArr.list, "POST", {
-					page_num: that.page_num,
-					page_size: that.page_size
-				}).then(res => {
-					let flag = false;
-					if (res.rows && res.rows.length == that.page_size) {
-						flag = true;
-					} else {
-						flag = false;
-					}
-					res.rows.forEach(item => {
-						item.pic = picUrl + item.pic
-					})
-					that.CommunityList = that.CommunityList.concat(res.rows || []);
-					that.flag = flag;
-					that.page_num = that.page_num + 1;

-				});
-			},
 			getHostInfo() {
 				const that = this;
 				uni.request({
@ -330,27 +166,7 @@
 					}
 				});
 			},
-			changeCurrent(e) {
-				const idx = e.currentTarget.dataset.idx;
-				this.current = idx;
-				this.flag = false;
-				this.page_num = 1;
-				this.serverList = [];
-				this.CommunityList = [];
-				this.iptMsg = '';
-
-				if (idx == 0) {
-					this.getCommunityList();
-				} else if (idx == 1) {
-					if (!uni.getStorageSync('ctoken')) {
-						uni.navigateTo({
-							url: '/pages/login/login'
-						});
-						return;
-					}
-					this.getServerList();
-				}
-			},
+	

 			getUserLocation() {
 				let that = this
@ -369,17 +185,16 @@
 							success: function(res) {
 								const {  data:{ result: { address_component } } } = res;
 								console.log('获取地址', address_component);
-								var city = res.data.result.address_component.city;
-								userlocat = {
-									userlat: latitude,
-									userlng: longitude,
-									city: city,
+								
+								// 精确到xx路 信息
+								let preciseLocation = {
+									cityName: address_component.city, // 市区
+									district: address_component.district + address_component.street_number, // 详细地址
+									lat: latitude,
+									lng: longitude,
 								};
-								that.city = userlocat;
-								that.nearbyLocation = address_component.district + address_component.street_number;
-								uni.setStorageSync('userlocat', userlocat);
-								uni.setStorageSync('Usercity', city);
-								uni.setStorageSync('city', city);
+								that.currentCity = preciseLocation;
+								uni.setStorageSync('location', preciseLocation);
 							},
 							fail(err) {
 								console.log(err);
@ -460,7 +275,6 @@
 			},

 			desc(e) {
-				console.log('eeee', e);
 				if (!e) {
 					this.NotOpen();
 					return
@ -487,7 +301,6 @@
 					uni.getLocation({
 						type: "gcj02",
 						success(res) {
-							console.log('1231231', res);
 							NavgateTo(`${e}?lat=${res.latitude}&log=${res.longitude}`)
 						}
 					})
@ -500,6 +313,8 @@

 			},

+
+
 			// 获取省份信息
 			async getProvList() {
 				const res = await request(citys.city, 'POST', {}, {
@ -564,7 +379,6 @@
 										}))
 								}))
 						}))
-						console.log('接口返回数据处理 省市区', cascaderOptions);
 					};

 					// 如果读的接口返回数据，则不二次进行处理， 否则对缓存数据进行二次处理
@ -585,21 +399,16 @@
 										}))
 								}))
 						}))
-						console.log('读缓存数据处理的省市区', cascaderOptions)
 					}

 					this.currentProviceCity = this.getProvinceCityId(cascaderOptions, uni.getStorageSync('city'))
-					console.log('currentProviceCitycurrentProviceCity', this.getProvinceCityId(cascaderOptions, uni
-						.getStorageSync('city')));
-
-
 					await this.getButtonList()
 					await this.getBannerList()

 					uni.hideLoading();
 				} catch (error) {
 					uni.hideLoading();
-					console.log('获取省市区信息异常', error);
+					console.log('页面初始化失败', error);
 				}
 			},

@ -621,33 +430,6 @@
 				return null; // 如果没找到匹配的城市
 			},

-			// 获取服务列表
-			async getServerList() {
-				const res = await request(apiArr2.getServerById, 'POST', {
-					page_num: this.page_num,
-					page_size: this.page_size,
-					title: this.iptMsg,
-				});
-				console.log('获取服务列表', res);
-				let flag = false;
-				if (res.rows && res.rows.length == this.page_size) {
-					flag = true
-				} else {
-					flag = false
-				}
-				res.rows.forEach(item => {
-					item.photo = picUrl + item.photo
-				});
-				console.log('res.rowsres.rows ', res.rows);
-				this.serverList = this.serverList.concat(res.rows || []);
-				this.flag = flag;
-				this.page_num = this.page_num + 1;
-			},
-
-			//服务详情
-			ServerDesc(id) {
-				NavgateTo(`/packages/communityService/reservation/index?id=${id}`);
-			},

 			NotOpen() {
 				uni.showModal({
@ -662,87 +444,39 @@
 				})
 			},

-			getHotWords() {
-				request(apiArr.getHotWords, "POST").then(res => {
-					let msg = res.search_hot_word
-					this.HotWords = msg.split(",")
-					this.rotatePlaceholder()
-				})
-			},
-
-			rotatePlaceholder() {
-				const interval = setInterval(() => {
-					const nextIndex = (this.placeholderIndex + 1) % this.HotWords.length;
-					this.currentPlaceholder = this.HotWords[nextIndex]
-					this.placeholderIndex = nextIndex
-				}, 30000); // 每2秒切换一次
-
-				this.placeholderInterval = interval
-				this.currentPlaceholder = this.HotWords[0]
-			},
-
-
 			//   榴园厨房
 			cf() {
 				NavgateTo('/kitchen/index/index');
 			},
-
-			//物业报修
-			wybx() {
-				NavgateTo('/packages/community/oneRepair/index')
-			},
-			//商家入驻
-			shopEnter() {
-				this.NotOpen();
-				// wx.navigateTo({
-				//   url: '/packages/indexSubcontract/shopEnter/index',
-				// })
-			},
-			//人人爱净水
-			water_filter() {
-				this.NotOpen();
+			
+			headershopEnterClick() {
+				NavgateTo('/packages/shopEnter/index/index');
 			},

 		},
 		onLoad(options) {
+			uni.showLoading({
+				title:'加载中'
+			})
 			this.init()
-			this.getCommunityList()
 			this.getHostInfo()
 			const meun = menuButtonInfo();
-			console.log('meunmeun', meun);
 			this.top = meun.top;
-			// this.top = meun.height + meun.top;
 			this.localHeight = meun.height;
-			this.getHotWords()
 		},
 		onShow() {
-			console.log(this.currentCity, '   this.currentCity')
-			if (uni.getStorageSync('city')) {
-				let obj = {
-					city: uni.getStorageSync('city')
-				}
-				if (this.currentCity && this.currentCity.city !== uni.getStorageSync('city')) {
+			console.log('this.currentCity', this.currentCity)
+			if (uni.getStorageSync('location')) {
+				if (this.currentCity && this.currentCity.cityName !== uni.getStorageSync('city')) {
 					console.log('缓存中的城市，与 新选择的城市 不一致, 缓存中的城市', this.currentCity);
-					console.log('新选择的的城市', uni.getStorageSync('city'));
+					console.log('新选择的的城市', uni.getStorageSync('location'));
 					this.init();
 				}
-				this.currentCity = obj;
-			} else {
-				uni.setStorageSync('city', uni.getStorageSync('Usercity'))
+				this.currentCity = uni.getStorageSync('location');
 			}
 		},
-		onReachBottom() {
-			if (this.current == 0) {
-				if (this.flag) {
-					this.getCommunityList()
-				}
-			} else if (this.current == 1) {
-				if (this.flag) {
-					this.getServerList()
-				}
-			}
-		}
-
+		
+		onReachBottom() {}
 	}
 </script>

--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@ -38,7 +38,7 @@

 <script>
 	import { apiArr } from '../../api/login';
-	import { request } from '../../utils';
+	import { request,request2 } from '../../utils';
 	export default {
 		data() {
 			return {
@ -106,7 +106,8 @@
 				console.log('小程序登录获取手机号', event);
 				const { isLogin } = this;
 				uni.setStorageSync('phone', '15933112204');
-				 this.tohome();
+
+				this.tohome();
 				 return
 				if (event.detail.errMsg === "getPhoneNumber:ok") {
 					request(apiArr.loginGetPhone, 'POST', {
--- a/pages/shopcity/index.css
+++ b/pages/shopcity/index.css
@ -0,0 +1,104 @@
+page {
+	height: 100vh;
+	overflow: hidden;
+}
+.city-select-page {
+	background-color: #f9f9f9;
+	background-color: red;
+}
+.white_container {
+	background: #FFFFFF;
+	padding: 0 20rpx;
+}
+
+
+.current-city {
+	display: flex;
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
+}
+.current-city image {
+	width: 33rpx;
+	height: 33rpx;
+	margin-right: 10rpx;
+}
+
+.hot-cities {
+	margin-top: 40rpx;
+  margin-bottom: 20rpx;
+}
+
+.title {
+  font-weight: bold;
+  margin-bottom: 30rpx;
+  display: block;
+}
+
+.city-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+.city_name {
+	display: inline-block;
+	padding: 13rpx 52rpx 18rpx;
+	border-radius: 8rpx 8rpx 8rpx 8rpx;
+	border: 1rpx solid #EBEBEB;
+	font-size: 28rpx;
+	color: #222222;
+	font-weight: 600;
+	margin-right: 10rpx;
+	margin-bottom: 10rpx;
+}
+
+.padding_bottom40 {
+	padding-bottom: 40rpx;
+}
+
+.margin_top20 {
+	margin-top: 20rpx;
+}
+
+
+
+
+.container {
+  display: flex;
+  height: 50vh;
+}
+ 
+.list-scroll {
+  flex: 1;
+  height: 100%;
+  overflow-y: auto;
+}
+ 
+.letter-title {
+  padding: 10px;
+  background-color: #f5f5f5;
+  color: #333;
+}
+ 
+.list-item {
+  padding: 12px 15px;
+  border-bottom: 1px solid #eee;
+}
+ 
+.index-bar {
+  width: 30px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  background-color: #ffffff;
+}
+ 
+.index-item {
+  color: #666;
+}
+ 
+.index-item:active {
+  color: #007aff;
+}
+.no_border {
+	border: none;
+}
--- a/pages/shopcity/shopcity.vue
+++ b/pages/shopcity/shopcity.vue
@ -1,443 +1,259 @@
 <template>
-    <view class="wrapper">
-        <view class="itemwrap">
-            <text class="title">当前选择城市</text>
-            <view class="listwrap">
-                <view class="itemlist" @tap="goShopList" :data-id="shopArea[address].area_id" :data-name="address">
-                    <view class="itemTitle">{{address}}</view>
-                </view>
-            </view>
-        </view>
-        
-        <view class="itemwrap">
-            <text class="title">当前定位城市</text>
-            <view class="listwrap">
-                <view class="itemlist" @tap="goShopList" :data-id="shopArea[address].area_id" :data-name="Usercity">
-                    <view class="itemTitle">{{Usercity}}</view>
-                </view>
-            </view>
-        </view>
-        
-        <view class="itemwrap">
-            <text class="title">已开通城市</text>
-            <view class="listwrap">
-                <view class="itemlist" @tap="goShopList" data-id="0" data-name="全部">
-                    <view class="itemTitle">全部</view>
-                </view>
-                <view class="itemlist" v-for="(item, index) in shopArea" :key="index" @tap="goShopList" :data-id="item.area_id" :data-name="item.area_name">
-                    <view class="itemTitle">{{item.area_name}}</view>
-                </view>
-            </view>
-        </view>
-    </view>
+	<view class="city-select-page">
+		<view class="white_container padding_bottom40">
+			<!-- 搜索框 -->
+			<u-search placeholder="输入城市进行搜索" :value="searchValue" @search="handleSearch" @change="handleSearch"
+				:showAction=false height="70" searchIconSize="40" shape="round"></u-search>
+				<view v-if="searchValue" class="search_popup">
+					<view
+						v-for="(item, index) in searchRes"
+						:key="index"
+						:class="['list-item', index === searchRes.length -1 && 'no_border' ]"
+						@click="headerSelectMapClick(item)"
+					>
+						{{item.name}}
+					</view>
+				</view>
+			<view v-if="!searchValue">
+				<!-- 当前定位城市 -->
+				<view class="current-city">
+					<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Index_add.png" mode="widthFix" />
+					<text>当前定位城市 {{ location.cityName }}</text>
+				</view>
+				
+				<!-- 国内热门城市 -->
+				<view class="hot-cities">
+					<text class="title">国内热门城市</text>
+					<view class="city-list">
+						<view v-for="(item, index) in hotCities" class="city_name" :key="index" @click="headerSelectMapClick(item)">{{item}}</view>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+
+
+
+		<view v-if="!searchValue" class="container">
+			<!-- 左侧列表 -->
+			<scroll-view class="list-scroll" scroll-y :scroll-into-view="activeId" @scroll="handleScroll">
+				<view v-for="(group, index) in groupedData" :key="index" class="white_container" :id="'group-' + group.letter">
+					<!-- 字母标题 -->
+					<view class="letter-title">{{ group.letter }}</view>
+					<!-- 列表项 -->
+					<view v-for="(item, ind) in group.list" :key="item.id" :class="['list-item', ind === group.list.length -1 && 'no_border' ]"  @click="headerSelectMapClick(item)">
+						{{ item.name }}
+					</view>
+				</view>
+			</scroll-view>
+
+			<!-- 右侧索引栏 -->
+			<view class="index-bar">
+				<view v-for="(letter, index) in letters" :key="index" class="index-item" @tap="scrollToLetter(letter)">
+					{{ letter }}
+				</view>
+			</view>
+		</view>
+
+	</view>
 </template>


+
 <script>
-	import {apiArr} from '../../api/community.js';
-
-
+	import {
+		apiArr
+	} from '../../api/community.js';

 	export default {
 		data() {
 			return {
-				shopArea: [],
-				address: '定位中',
-				lat: '',
-				lng: '',
-				qqmap_key: '',
-				Usercity: '',
+				location: {},
+				searchValue: '',
+				currentCity: '衡水',
+				hotCities: ['上海', '北京', '广州', '杭州', '成都', '深圳', '苏州', '南京', '重庆', '西安', '长沙', '天津', '三亚', '厦门', '武汉', '无锡'],
+				rawData: [{
+						id: 1,
+						name: '阿巴嘎旗',
+						letters: 'A',
+						lat: '39.908823',
+						long: '116.39747',
+					},
+					{
+						id: 2,
+						name: '阿坝',
+						letters: 'A',
+						lat: '31.196322',
+						long: '121.339841'
+					},
+					{
+						id: 3,
+						name: '阿坝县',
+						letters: 'A',
+					},
+					{
+						id: 4,
+						name: '阿城区',
+						letters: 'A',
+					},
+					{
+						id: 5,
+						name: '阿尔山市',
+						letters: 'B',
+					},
+					{
+						id: 6,
+						name: '阿合奇县',
+						letters: 'B',
+					},
+					{
+						id: 7,
+						name: '阿克塞哈萨克族自治县',
+						letters: 'B',
+					},
+					{
+						id: 8,
+						name: '阿克苏地区',
+						letters: 'C',
+					},
+					{
+						id: 9,
+						name: '阿克苏市',
+						letters: 'D',
+					},
+					{
+						id: 10,
+						name: '阿拉尔',
+						letters: 'E',
+					},
+				],
+				letters: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+					'U', 'V', 'W', 'X', 'Y', 'Z'
+				],
+				groupedData: [], // 分组后的数据
+				activeId: '', // 当前高亮的字母区域 ID
+				activeLetter: '' ,// 当前高亮的字母
+				searchRes: [
+					{
+						name: '河北,石家庄'
+					},
+					{
+						name: '河北,廊坊'
+					},
+					{
+						name: '河北,保定'
+					},
+					{
+						name: '河北,衡水'
+					},
+					{
+						name: '河北,沧州'
+					},
+					{
+						name: '河北,唐山'
+					},
+				]
 			}
 		},
 		onLoad(options) {
-			this.getHostInfo();
-			this.getAddress();
-			this.getShopAreaList();
-			this.Usercity = uni.getStorageSync('Usercity');
+			this.location = uni.getStorageSync('location');
+			this.groupData();
 		},
 		methods: {
-			getHostInfo() {
-				uni.request({
-					url: apiArr.get_host_info,
-					method: 'POST',
-					header: {
-						'Content-type': 'application/x-www-form-urlencoded'
-					},
-					success: (result) => {
-						let wxapp = result.data.all.wxapp;
-						if (wxapp.qqmap_key) {
-							this.qqmap_key = wxapp.qqmap_key;
-						}
-					}
-				});
-			},
-			getAddress() {
-				let userlocat = uni.getStorageSync('userlocat');
-				let nowtime = Date.parse(new Date()) / 1000;

-				if (!userlocat || userlocat.overtime < nowtime || !userlocat.city) {
-					uni.showLoading({
-						title: '定位中...'
-					});
-					uni.getLocation({
-						success: (res) => {
-							let overtime = Date.parse(new Date()) / 1000 + 7200;
-							this.lat = res.latitude;
-							this.lng = res.longitude;
-
-							if (this.qqmap_key) {
-								uni.request({
-									url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${res.latitude},${res.longitude}&key=${this.qqmap_key}&get_poi=0`,
-									success: (res) => {
-										let city = res.data.result.address_component.city;
-										uni.setStorageSync('city', city);
-										
-										console.log(res,'asdasd');
-										
-										if (city) {
-											this.address = city;
-											let area = this.shopArea;
-											if (typeof area[city] !== 'undefined') {
-												// setData(this, 'area_id', area[city]['area_id']);
-											}
-										}
-										userlocat = {
-											userlat: this.lat,
-											userlng: this.lng,
-											overtime: overtime,
-											city: city
-										};
-										uni.setStorageSync('userlocat', userlocat);
-										uni.hideLoading();
-									}
-								});
-							} else {
-								uni.request({
-									url: apiArr.get_maps_geocoder,
-									success: (res) => {
-										let city = res.data.city;
-										if (city) {
-											this.address = city;
-											let area = this.shopArea;
-											if (typeof area[city] !== 'undefined') {
-												// setData(this, 'area_id', area[city]['area_id']);
-											}
-										}
-										userlocat = {
-											userlat: this.lat,
-											userlng: this.lng,
-											overtime: overtime,
-											city: city
-										};
-										uni.setStorageSync('userlocat', userlocat);
-										uni.hideLoading();
-									}
-								});
-							}
-
-							uni.request({
-								url: apiArr.setcookie_location,
-								method: 'POST',
-								header: {
-									'Content-type': 'application/x-www-form-urlencoded'
-								},
-								data: userlocat,
-								success: (result) => {
-									console.log(result);
-								}
-							});
-						}
-					});
-				} else {
-					let address = uni.getStorageSync('city') || userlocat.city;
-					this.address = address;
-				}
-			},
-			getShopAreaList() {
-				
-				console.log(apiArr.get_community_area_list);
-				uni.showLoading({
-					title: '加载中...'
-				});
-				uni.request({
-					url: apiArr.get_community_area_list,
-					method: 'GET',
-					header: {
-						'Content-type': 'application/x-www-form-urlencoded'
-					},
-					success: (result) => {
-						console.log(result);
-						
-						let {
-							data: {
-								list
-							}
-						} = result;
-						if (list) {
-							this.shopArea = list
-						}
-							
-						
-					},
-					fail(err) {
-						console.log(err);
-					},
-					complete: () => uni.hideLoading()
-				});
-			},
-			goShopList(event) {
-				console.log('点全部', event);
-				let area_id = event.currentTarget.dataset.id;
-				let name = event.currentTarget.dataset.name;
-				if (name == '定位中') {
-					this.getAddress();
-					return;
-				}
-
-				const pages = getCurrentPages();
-				const prevPage = pages[pages.length - 2];
-				area_id = area_id || '';
-
-				const userlocat = uni.getStorageSync('userlocat');
-				userlocat.city = name;
-				console.log(event);
-				uni.setStorageSync('userlocat', userlocat);
-				uni.setStorageSync('city', name);
-				
-				// prevPage.setData({
-				// 	area_id: area_id,
-				// 	address: name
-				// });
-				this.address = name
-				this.area_id = area_id
-
-				uni.navigateBack({
-					delta: 1,
+			headerSelectMapClick(item) {
+				console.log('地图选点', item);
+				const lat = Number(item.lat);
+				const long = Number(item.long);
+				uni.chooseLocation({
+					latitude: lat,
+					longitude: long,
 					success: (res) => {
-						console.log('返回成功', res);
+						console.log('打开地图选择商铺名称', res);
+						if (!res.name) {
+							uni.showToast({
+								title: '请选择具体城市信息',
+								icon: 'none'
+							});
+							return;
+						}
+						// 更新页面数据，如标记点等
+						const selectLocation = {
+							cityName: res.address.match(/(.*?(?:省|自治区)|^)(.*?)(?:市|地区|盟|州|县|区)?$/)[2].match(/(.*市)/)[1],
+							district: res.address.match(/市(.*)/)[1],
+							lat: res.latitude,
+							long: res.longitude
+						};
+						uni.setStorageSync('location', selectLocation); // 缓存数据信息
+						uni.setStorageSync('city', selectLocation.cityName); // 缓存数据信息
+						console.log('location', selectLocation);
+						uni.navigateBack({
+							delta: 1
+						});
 					},
 					fail: (err) => {
-						console.error('返回失败', err);
+						console.log('选择位置失败', err);
 					}
 				});
+			},
+
+			handleSearch(e) {
+				// 搜索逻辑，可以在这里根据 searchValue 过滤城市数据
+				this.searchValue = e;
+				console.log('搜ee索:', e);
+			},
+			
+			groupData() {
+				const map = {};
+				this.letters.forEach(letter => {
+					map[letter] = {
+						letter,
+						list: []
+					};
+				});
+
+				this.rawData.forEach(item => {
+					if (map[item.letters]) {
+						map[item.letters].list.push(item);
+					}
+				});
+				console.log('112312313', Object.values(map).filter(group => group.list.length > 0))
+				// 过滤掉没有数据的字母
+				this.groupedData = Object.values(map).filter(group => group.list.length > 0);
+			},
+
+			// 点击字母滚动到对应区域
+			scrollToLetter(letter) {
+				this.$nextTick(() => {
+					this.activeId = 'group-' + letter;
+					this.activeLetter = letter;
+				});
+			},
+			// 滚动时监听当前位置
+			handleScroll(e) {
+				const query = uni.createSelectorQuery().in(this);
+				let activeLetter = '';
+
+				// 遍历每个字母区域，检查是否在可视范围内
+				this.letters.some(letter => {
+					query.select(`#group-${letter}`).boundingClientRect(rect => {
+						if (rect && rect.top <= 100 && rect.bottom >= 0) {
+							activeLetter = letter;
+						}
+					}).exec();
+					return activeLetter; // 找到第一个符合条件的字母后退出循环
+				});
+				if (activeLetter && activeLetter !== this.activeLetter) {
+					this.activeLetter = activeLetter;
+				}
 			}
-		}
+
+		},
+
+
 	}
 </script>

 <style>
-	.top_nav {
-		margin-left: 16px;
-		display: flex;
-		flex-direction: row;
-		margin-top: 24px;
-	}
-
-	.nav-name {
-		color: #fff;
-		font-size: 30rpx;
-		width: 16.66%;
-		text-align: center;
-		line-height: 28px;
-		flex-direction: column;
-		display: inline-flex;
-		height: 60px;
-		position: relative;
-	}
-
-	/* .nav-hover  {
-  font-weight: 600;
-  border-bottom: 3px solid #D3BA77;
-} */
-
-	.nav-hover::after {
-		content: " ";
-		width: 30%;
-		height: 4px;
-		background: #D3BA77;
-		position: absolute;
-		bottom: 1px;
-		left: 50%;
-		transform: translateX(-50%);
-		border-radius: 10px;
-	}
-
-	.nav-date {
-		width: 16.66%;
-		text-align: center;
-		line-height: 30px;
-		flex-direction: column;
-		display: inline-flex;
-		justify-items: center;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.nav-date image {
-		width: 15px;
-		height: 15px;
-	}
-
-	.wrapper {
-		margin-top: 20px;
-		border-radius: 10px 10px 0 0;
-	}
-
-	.itemwrap {
-		margin-top: 0;
-		border-radius: 10px 10px 0 0;
-		width: 100%;
-		overflow: hidden;
-	}
-
-	.itemwrap .title {
-		font-size: 14px;
-		font-weight: bold;
-		margin-left: 15px;
-	}
-
-	.itemwrap,
-	.listwrap {
-		height: auto;
-		overflow: hidden;
-	}
-
-	.listwrap {
-		margin: 10px auto;
-		width: 96%;
-	}
-
-	.itemlist {
-		margin: 5px 1.5%;
-		padding: 10px;
-		border-radius: 5px;
-		width: 30.33%;
-		float: left;
-		text-align: center;
-		background-color: #f1f1f1;
-	}
-
-	.itemTitle {
-		text-overflow: ellipsis;
-		overflow: hidden;
-		white-space: nowrap;
-	}
-
-	.intro {
-		height: 60px;
-	}
-
-	.intro-left {
-		display: inline-flex;
-	}
-
-	.room-img {
-		border-radius: 4px;
-	}
-
-	.room-intro {
-		margin-left: 8px;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-	}
-
-	.room-name {
-		font-size: 16px;
-	}
-
-	.room-price {
-		font-size: 14px;
-		margin-top: 5px;
-		color: #D3BA77;
-	}
-
-	.room-nume {
-		font-size: 12px;
-		margin-top: 4px;
-	}
-
-	.in-free {
-		float: right;
-		border: 1px solid #6F9473;
-		border-radius: 4px;
-	}
-
-	.in-use {
-		float: right;
-		border: 1px solid #DB8259;
-		border-radius: 4px;
-	}
-
-	.use {
-		width: 100%;
-		height: 35px;
-		border-radius: 3px 3px 0 0;
-	}
-
-	.use text {
-		line-height: 35px;
-		font-size: 16px;
-		color: #FFFFFF;
-		display: flex;
-		justify-content: center;
-	}
-
-	.in {
-		width: 52px;
-		height: 17px;
-	}
-
-	.in text {
-		line-height: 17px;
-		font-size: 10px;
-		display: flex;
-		justify-content: center;
-	}
-
-	.notes {
-		margin-top: 18px;
-	}
-
-	.color-card {
-		display: inline-flex;
-	}
-
-	.card-list {
-		border-radius: 2px;
-		margin: 4px 0 0 24px;
-	}
-
-	.color-card text {
-		margin-left: 6px;
-		font-size: 13px;
-	}
-
-	.endtime {
-		float: right;
-	}
-
-	.endtime text {
-		font-size: 13px;
-	}
-
-	.timeline {
-		display: flex;
-		margin-top: 16px;
-	}
-
-	.line {
-		width: 4.3%
-	}
-
-	.line-card {
-		border-radius: 2px;
-	}
-
-	.line text {
-		font-size: 10px;
-		margin-top: 4px;
-		display: flex;
-		justify-content: center;
-	}
+	@import url("./index.css");
 </style>
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/kitchen/index/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/kitchen/index/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/reservation/index/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/reservation/index/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@ -21,6 +21,13 @@
        "index/index"
      ]
    },
+    {
+      "root": "packages/workOrderDashboard",
+      "pages": [
+        "index/index",
+        "detail/index"
+      ]
+    },
    {
      "root": "reservation",
      "pages": [
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@ -101,13 +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 */ 564))
+      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 */ 574))
    },
    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 */ 572))
-    },
-    tabularCard: function () {
-      return __webpack_require__.e(/*! import() | components/tabularCard/tabularCard */ "components/tabularCard/tabularCard").then(__webpack_require__.bind(null, /*! @/components/tabularCard/tabularCard.vue */ 580))
+      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 */ 582))
    },
  }
 } catch (e) {
@ -131,39 +128,6 @@ var render = function () {
  var _vm = this
  var _h = _vm.$createElement
  var _c = _vm._self._c || _h
-  var l0 =
-    _vm.current == 0
-      ? _vm.__map(_vm.CommunityList, function (item, index) {
-          var $orig = _vm.__get_orig(item)
-          var g0 = _vm.CommunityList.length
-          return {
-            $orig: $orig,
-            g0: g0,
-          }
-        })
-      : null
-  var l1 =
-    _vm.current == 1
-      ? _vm.__map(_vm.serverList, function (items, index) {
-          var $orig = _vm.__get_orig(items)
-          var g1 = _vm.serverList.length
-          return {
-            $orig: $orig,
-            g1: g1,
-          }
-        })
-      : null
-  var g2 = _vm.current == 1 ? _vm.serverList.length : null
-  _vm.$mp.data = Object.assign(
-    {},
-    {
-      $root: {
-        l0: l0,
-        l1: l1,
-        g2: g2,
-      },
-    }
-  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@ -207,18 +171,17 @@ exports.default = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 58));
 var _slicedToArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ 5));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 60));
-var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _index = __webpack_require__(/*! ../../utils/index */ 167);
 var _index2 = __webpack_require__(/*! ../../utils/index.js */ 167);
 var _community = __webpack_require__(/*! ../../api/community.js */ 168);
-var _doorToDoor = __webpack_require__(/*! ../../api/doorToDoor.js */ 169);
+var _v2Home = __webpack_require__(/*! ../../api/v2Home.js */ 169);
 var _area = __webpack_require__(/*! ../../api/area.js */ 170);
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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 */ 587));
+    return resolve(__webpack_require__(/*! ../../components/nav/nav */ 590));
  }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 //1.导入组件
@ -228,130 +191,32 @@ var _default = {
  },
  //2.注册组件
  data: function data() {
-    var _ref;
-    return _ref = {
-      // s: uni.getSystemInfoSync().statusBarHeight, // 状态栏高度
-      // n: (uni.getMenuButtonBoundingClientRect().top - uni.getSystemInfoSync().statusBarHeight) * 2 + uni
-      // 	.getMenuButtonBoundingClientRect().height, // 导航栏高度
-      // t: uni.getMenuButtonBoundingClientRect().top, // 胶囊局顶部距离
-      // h: uni.getMenuButtonBoundingClientRect().height, // 胶囊高度
-      // picUrl: picUrl,
+    return {
      city: "",
      qqmap_key: '',
-      tabList: [
-        // ... 保持原有tabList数据不变 ...
-      ],
+      tabList: [],
      nearbyLocation: '',
-      current: 0,
+      // 城区附近地址
      flag: false,
-      page_num: 1,
-      page_size: 10,
-      serverList: [],
-      // 服务列表
-      CommunityList: [],
-      // 小区列表
-      iptMsg: "",
      currentIdx: 0,
-      currentCity: ""
-    }, (0, _defineProperty2.default)(_ref, "city", ""), (0, _defineProperty2.default)(_ref, "top", 0), (0, _defineProperty2.default)(_ref, "localHeight", 44), (0, _defineProperty2.default)(_ref, "userlocat", ""), (0, _defineProperty2.default)(_ref, "bannerList", []), (0, _defineProperty2.default)(_ref, "buttonList", []), (0, _defineProperty2.default)(_ref, "tabList", [{
-      img: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img1.png",
-      name: "社区列表",
-      url: "/packages/community/index/index?title=社区列表&types=2"
-    }, {
-      img: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img2.png",
-      name: "社区服务",
-      url: "/packages/communityService/index/index"
-    }, {
-      img: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img3.png",
-      name: "周边商家",
-      url: ""
-    },
-    // {
-    //     img:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img4.png",
-    //     name:"社区团购",
-    //     // url:""
-    // },
-    // {
-    //     img:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img5.png",
-    //     name:"餐饮美食",
-    //     url:""
-    // },
-    {
-      img: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img6.png",
-      name: "智慧康养",
-      url: ""
-    }, {
-      img: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img11.png",
-      name: "我的预约",
-      url: "/packages/community/repairList/index"
-    }, {
-      img: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img8.png",
-      name: "便民服务",
-      url: ""
-    }
-    // {
-    //     img:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img9.png",
-    //     name:"积分兑换",
-    //     // url:""
-    // },
-    // {
-    //     img:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/tabItem_img10.png",
-    //     name:"官方商城",
-    //     url:""
-    // },
-    ]), (0, _defineProperty2.default)(_ref, "title", 'Hello'), (0, _defineProperty2.default)(_ref, "currentCity", ""), (0, _defineProperty2.default)(_ref, "currentProviceCity", ""), (0, _defineProperty2.default)(_ref, "HotWords", []), (0, _defineProperty2.default)(_ref, "currentPlaceholder", ''), (0, _defineProperty2.default)(_ref, "placeholderIndex", 0), _ref;
+      currentCity: "",
+      // ? 什么作用
+      top: 0,
+      localHeight: 44,
+      userlocat: "",
+      bannerList: [],
+      buttonList: [],
+      currentProviceCity: ""
+    };
  },
  methods: {
    swipers: function swipers(e) {
      this.currentIdx = e.detail.current;
    },
-    iptChange: function iptChange(e) {
-      this.iptMsg = e.detail.value;
-    },
-    searchCurrent: function searchCurrent() {
-      this.flag = false;
-      this.page_num = 1;
-      this.serverList = [];
-      this.current = 1;
-      this.getServerList();
-    },
-    opMap: function opMap() {
-      uni.chooseLocation({
-        success: function success(res) {
-          console.log(res);
-        }
-      });
-    },
    map: function map() {
-      // if (uni.getStorageSync('userId')) {
      uni.navigateTo({
        url: '/pages/shopcity/shopcity'
      });
-      // } else {
-      // 	uni.navigateTo({
-      // 		url: '/pages/login/login'
-      // 	})
-      // }
-    },
-    getCommunityList: function getCommunityList() {
-      var that = this;
-      (0, _index2.request)(_community.apiArr.list, "POST", {
-        page_num: that.page_num,
-        page_size: that.page_size
-      }).then(function (res) {
-        var flag = false;
-        if (res.rows && res.rows.length == that.page_size) {
-          flag = true;
-        } else {
-          flag = false;
-        }
-        res.rows.forEach(function (item) {
-          item.pic = _index2.picUrl + item.pic;
-        });
-        that.CommunityList = that.CommunityList.concat(res.rows || []);
-        that.flag = flag;
-        that.page_num = that.page_num + 1;
-      });
    },
    getHostInfo: function getHostInfo() {
      var _this = this;
@ -372,26 +237,6 @@ var _default = {
        }
      });
    },
-    changeCurrent: function changeCurrent(e) {
-      var idx = e.currentTarget.dataset.idx;
-      this.current = idx;
-      this.flag = false;
-      this.page_num = 1;
-      this.serverList = [];
-      this.CommunityList = [];
-      this.iptMsg = '';
-      if (idx == 0) {
-        this.getCommunityList();
-      } else if (idx == 1) {
-        if (!uni.getStorageSync('ctoken')) {
-          uni.navigateTo({
-            url: '/pages/login/login'
-          });
-          return;
-        }
-        this.getServerList();
-      }
-    },
    getUserLocation: function getUserLocation() {
      var that = this;
      var qqmap_key = this.qqmap_key;
@ -406,17 +251,18 @@ var _default = {
            success: function success(res) {
              var address_component = res.data.result.address_component;
              console.log('获取地址', address_component);
-              var city = res.data.result.address_component.city;
-              userlocat = {
-                userlat: latitude,
-                userlng: longitude,
-                city: city
+
+              // 精确到xx路 信息
+              var preciseLocation = {
+                cityName: address_component.city,
+                // 市区
+                district: address_component.district + address_component.street_number,
+                // 详细地址
+                lat: latitude,
+                lng: longitude
              };
-              that.city = userlocat;
-              that.nearbyLocation = address_component.district + address_component.street_number;
-              uni.setStorageSync('userlocat', userlocat);
-              uni.setStorageSync('Usercity', city);
-              uni.setStorageSync('city', city);
+              that.currentCity = preciseLocation;
+              uni.setStorageSync('location', preciseLocation);
            },
            fail: function fail(err) {
              console.log(err);
@ -482,7 +328,6 @@ var _default = {
      });
    },
    desc: function desc(e) {
-      console.log('eeee', e);
      if (!e) {
        this.NotOpen();
        return;
@ -509,7 +354,6 @@ var _default = {
        uni.getLocation({
          type: "gcj02",
          success: function success(res) {
-            console.log('1231231', res);
            (0, _index.NavgateTo)("".concat(e, "?lat=").concat(res.latitude, "&log=").concat(res.longitude));
          }
        });
@ -605,7 +449,7 @@ var _default = {
                businessList = uni.getStorageSync('businessList');
                cascaderOptions = null; // 有缓存数据时 不进行接口请求
                if (!(!proviceList || !cityList || !businessList)) {
-                  _context4.next = 19;
+                  _context4.next = 18;
                  break;
                }
                _context4.next = 9;
@ -648,9 +492,7 @@ var _default = {
                    })
                  };
                });
-
-                console.log('接口返回数据处理 省市区', cascaderOptions);
-              case 19:
+              case 18:
                ;

                // 如果读的接口返回数据，则不二次进行处理， 否则对缓存数据进行二次处理
@ -684,31 +526,29 @@ var _default = {
                      })
                    };
                  });
-
-                  console.log('读缓存数据处理的省市区', cascaderOptions);
                }
+
                _this4.currentProviceCity = _this4.getProvinceCityId(cascaderOptions, uni.getStorageSync('city'));
-                console.log('currentProviceCitycurrentProviceCity', _this4.getProvinceCityId(cascaderOptions, uni.getStorageSync('city')));
-                _context4.next = 25;
+                _context4.next = 23;
                return _this4.getButtonList();
-              case 25:
-                _context4.next = 27;
+              case 23:
+                _context4.next = 25;
                return _this4.getBannerList();
-              case 27:
+              case 25:
                uni.hideLoading();
-                _context4.next = 34;
+                _context4.next = 32;
                break;
-              case 30:
-                _context4.prev = 30;
+              case 28:
+                _context4.prev = 28;
                _context4.t0 = _context4["catch"](1);
                uni.hideLoading();
-                console.log('获取省市区信息异常', _context4.t0);
-              case 34:
+                console.log('页面初始化失败', _context4.t0);
+              case 32:
              case "end":
                return _context4.stop();
            }
          }
-        }, _callee4, null, [[1, 30]]);
+        }, _callee4, null, [[1, 28]]);
      }))();
    },
    getProvinceCityId: function getProvinceCityId(areaList, cityName) {
@ -746,49 +586,6 @@ var _default = {
      }
      return null; // 如果没找到匹配的城市
    },
-    // 获取服务列表
-    getServerList: function getServerList() {
-      var _this5 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
-        var res, flag;
-        return _regenerator.default.wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-                _context5.next = 2;
-                return (0, _index2.request)(_doorToDoor.apiArr.getServerById, 'POST', {
-                  page_num: _this5.page_num,
-                  page_size: _this5.page_size,
-                  title: _this5.iptMsg
-                });
-              case 2:
-                res = _context5.sent;
-                console.log('获取服务列表', res);
-                flag = false;
-                if (res.rows && res.rows.length == _this5.page_size) {
-                  flag = true;
-                } else {
-                  flag = false;
-                }
-                res.rows.forEach(function (item) {
-                  item.photo = _index2.picUrl + item.photo;
-                });
-                console.log('res.rowsres.rows ', res.rows);
-                _this5.serverList = _this5.serverList.concat(res.rows || []);
-                _this5.flag = flag;
-                _this5.page_num = _this5.page_num + 1;
-              case 11:
-              case "end":
-                return _context5.stop();
-            }
-          }
-        }, _callee5);
-      }))();
-    },
-    //服务详情
-    ServerDesc: function ServerDesc(id) {
-      (0, _index.NavgateTo)("/packages/communityService/reservation/index?id=".concat(id));
-    },
    NotOpen: function NotOpen() {
      uni.showModal({
        title: '提示',
@ -799,83 +596,36 @@ var _default = {
        }
      });
    },
-    getHotWords: function getHotWords() {
-      var _this6 = this;
-      (0, _index2.request)(_community.apiArr.getHotWords, "POST").then(function (res) {
-        var msg = res.search_hot_word;
-        _this6.HotWords = msg.split(",");
-        _this6.rotatePlaceholder();
-      });
-    },
-    rotatePlaceholder: function rotatePlaceholder() {
-      var _this7 = this;
-      var interval = setInterval(function () {
-        var nextIndex = (_this7.placeholderIndex + 1) % _this7.HotWords.length;
-        _this7.currentPlaceholder = _this7.HotWords[nextIndex];
-        _this7.placeholderIndex = nextIndex;
-      }, 30000); // 每2秒切换一次
-
-      this.placeholderInterval = interval;
-      this.currentPlaceholder = this.HotWords[0];
-    },
    //   榴园厨房
    cf: function cf() {
      (0, _index.NavgateTo)('/kitchen/index/index');
    },
-    //物业报修
-    wybx: function wybx() {
-      (0, _index.NavgateTo)('/packages/community/oneRepair/index');
-    },
-    //商家入驻
-    shopEnter: function shopEnter() {
-      this.NotOpen();
-      // wx.navigateTo({
-      //   url: '/packages/indexSubcontract/shopEnter/index',
-      // })
-    },
-    //人人爱净水
-    water_filter: function water_filter() {
-      this.NotOpen();
+    headershopEnterClick: function headershopEnterClick() {
+      (0, _index.NavgateTo)('/packages/shopEnter/index/index');
    }
  },
  onLoad: function onLoad(options) {
+    uni.showLoading({
+      title: '加载中'
+    });
    this.init();
-    this.getCommunityList();
    this.getHostInfo();
    var meun = (0, _index2.menuButtonInfo)();
-    console.log('meunmeun', meun);
    this.top = meun.top;
-    // this.top = meun.height + meun.top;
    this.localHeight = meun.height;
-    this.getHotWords();
  },
  onShow: function onShow() {
-    console.log(this.currentCity, '   this.currentCity');
-    if (uni.getStorageSync('city')) {
-      var obj = {
-        city: uni.getStorageSync('city')
-      };
-      if (this.currentCity && this.currentCity.city !== uni.getStorageSync('city')) {
+    console.log('this.currentCity', this.currentCity);
+    if (uni.getStorageSync('location')) {
+      if (this.currentCity && this.currentCity.cityName !== uni.getStorageSync('city')) {
        console.log('缓存中的城市，与 新选择的城市 不一致, 缓存中的城市', this.currentCity);
-        console.log('新选择的的城市', uni.getStorageSync('city'));
+        console.log('新选择的的城市', uni.getStorageSync('location'));
        this.init();
      }
-      this.currentCity = obj;
-    } else {
-      uni.setStorageSync('city', uni.getStorageSync('Usercity'));
+      this.currentCity = uni.getStorageSync('location');
    }
  },
-  onReachBottom: function onReachBottom() {
-    if (this.current == 0) {
-      if (this.flag) {
-        this.getCommunityList();
-      }
-    } else if (this.current == 1) {
-      if (this.flag) {
-        this.getServerList();
-      }
-    }
-  }
+  onReachBottom: function onReachBottom() {}
 };
 exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"]))
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.json
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.json
@ -1,10 +1,9 @@
 {
  "navigationStyle": "custom",
-  "navigationBarBackgroundColor": "#F9F9F9",
+  "navigationBarBackgroundColor": "#FFF",
  "usingComponents": {
    "u-grid": "/uni_modules/uview-ui/components/u-grid/u-grid",
    "u-grid-item": "/uni_modules/uview-ui/components/u-grid-item/u-grid-item",
-    "tabular-card": "/components/tabularCard/tabularCard",
    "nav-footer": "/components/nav/nav",
    "nav": "/components/nav/nav"
  }
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
@ -1,73 +1,22 @@
-.content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
+.container {
+	background-color: #f9f9f9;
 }
-.logo {
-	height: 200rpx;
-	width: 200rpx;
-	margin-top: 200rpx;
-	margin-left: auto;
-	margin-right: auto;
-	margin-bottom: 50rpx;
-}
-.text-area {
-	display: flex;
-	justify-content: center;
-}
-.title {
-	font-size: 36rpx;
-	color: #8f8f94;
-}
-.nav-box {
-	box-sizing: border-box;
-	width: 100%;
-	position: relative;
-	/* position: fixed; */
-	z-index: 2;
-}
-.nav-box .nav-bar {
-	display: flex;
-	align-items: center;
-}
-.nav-box .nav-bar .nav-bar-left,
-.nav-box .nav-bar .nav-bar-right {
+.white_container {
+	background: #FFFFFF;
 	padding: 0 20rpx;
-	min-width: 36rpx;
 }
-.nav-box .nav-bar .nav-bar-left van-icon {
-	vertical-align: sub;
-	color: #333333;
-}
-.nav-box .nav-bar .nav-bar-title {
-	flex: 1;
-	text-align: center;
-	font-weight: 400;
-	font-size: 36rpx;
-	color: #000000;
-}
-.nav-box .nav-bar-title {
-	margin-left: -20rpx;
+page {
+	background-color: #FFFFFF;
 }
 .grid_Pic {
 	width: 54rpx;
 	height: 46rpx;
 	margin-bottom: 20rpx;
 }
-.indexBg {
-	width: 750rpx;
-	height: 775rpx;
-	position: absolute;
-	top: -20rpx;
-	left: 0;
-	z-index: -1;
-}
 .searchBox {
 	display: flex;
 	align-items: center;
-	margin: 0 20rpx;
-	/* margin-top: 35rpx; */
+	background-color: #FFFFFF;
 	justify-content: space-between;
 }
 .searchBox_add {
@ -82,42 +31,6 @@
 	height: 33rpx;
 	margin-right: 10rpx;
 }
-.iptbox {
-	width: 480rpx;
-	height: 60rpx;
-	background: #FFFFFF;
-	border-radius: 100rpx;
-	display: flex;
-	align-items: center;
-	box-sizing: border-box;
-	padding: 0 15rpx;
-	justify-content: space-between;
-	font-weight: 400;
-	font-size: 26rpx;
-	color: #000000;
-}
-.iptbox image {
-	width: 33rpx;
-	height: 33rpx;
-}
-.map {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	font-weight: 400;
-	font-size: 20rpx;
-	color: #222222;
-	margin-left: 20rpx;
-}
-.map image {
-	width: 31rpx;
-	height: 31rpx;
-	margin-bottom: 6rpx;
-}
-.searchBox_msg {
-	display: flex;
-	align-items: center;
-}
 .swiper {
 	width: 710rpx;
 	height: 300rpx;
@ -125,6 +38,9 @@
 	margin-top: 30rpx;
 	position: relative;
 }
+.margin_top20 {
+	margin-top: 20rpx;
+}
 .cirList {
 	position: absolute;
 	left: 50%;
@ -176,328 +92,155 @@
 	height: 100%;
 }
 .Tit {
-	font-weight: bold;
-	font-size: 32rpx;
+	display: flex;
+	align-items: center;
+	padding-top: 30rpx;
+	margin-bottom: 35rpx;
+	font-weight: normal;
+	font-size: 36rpx;
 	color: #222222;
-	margin-left: 20rpx;
-	margin-bottom: 40rpx;
+}
+.local {
+	max-width: 414rpx;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.Tit_desc {
+	padding: 0 12rpx;
+	height: 36rpx;
+	background: linear-gradient( 90deg, #FFA100 0%, #FF6A00 100%);
+	border-radius: 100rpx 100rpx 100rpx 100rpx;
+	font-weight: normal;
+	font-size: 26rpx;
+	color: #FFFFFF;
 }
 .serverList {
 	display: flex;
 	flex-wrap: wrap;
 	align-items: center;
-	margin-left: 20rpx;
-	margin-right: 20rpx;
 	justify-content: space-between;
 }
 .serverItem {
 	border-radius: 30rpx;
-	width: 345rpx;
-	height: 188rpx;
+	width: 208rpx;
+	height: 114rpx;
 	box-sizing: border-box;
-	padding-top: 30rpx;
-	padding-left: 40rpx;
-	font-weight: bold;
+	padding-top: 11rpx;
+	padding-left: 13rpx;
+	font-weight: 600;
 	font-size: 26rpx;
 	color: #222222;
 	position: relative;
-	margin-bottom: 20rpx;
+	margin-bottom: 12rpx;
+}
+.serverList_left {
+	display: block;
+	width: 260rpx;
+	height: 369rpx;
+	margin-right: 17rpx;
+}
+.serverList_right {
+	flex: 1;
+	display: flex;
+	flex-wrap: wrap;
 }
 .serverItem1 {
 	background: linear-gradient(139deg, #FEF4F4 0%, #FEDCD2 100%);
+	margin-right: 12rpx;
 }
 .serverItem2 {
-	background: #F7F7F7;
+	background: #FFF4E5;
 }
 .serverItem3 {
-	background: linear-gradient(139deg, #FEFBF4 0%, #FEEFD2 100%);
+	background: #F1FFEC;
+margin-right: 12rpx;
 }
 .serverItem4 {
-	background: #EFF3FF;
+	background: #F0FDFF;
+}
+.serverItem5 {
+background: #EFF7FF;
+margin-right: 12rpx;
+}
+.serverItem6 {
+background: linear-gradient( 180deg, #FFFFFF 0%, #FFEDF2 100%);
 }
 .serverItem1 image {
 	position: absolute;
-	right: 13rpx;
-	top: 25rpx;
-	width: 172rpx;
-	height: 172rpx;
+	right: 12rpx;
+	top: 14rpx;
+	width: 103rpx;
+	height: 100rpx;
 }
 .serverItem2 image {
 	position: absolute;
-	right: 12rpx;
-	top: 57rpx;
-	width: 190rpx;
-	height: 127rpx;
+	right: 6rpx;
+	top: 8rpx;
+	width: 108rpx;
+	height: 108rpx;
 }
 .serverItem3 image {
-	width: 138rpx;
-	height: 123rpx;
+	width: 116rpx;
+	height: 83rpx;
 	position: absolute;
-	right: 30rpx;
-	top: 50rpx;
+	right: 0rpx;
+	top: 30rpx;
 }
 .serverItem4 image {
-	width: 143rpx;
-	height: 143rpx;
+	width: 130rpx;
+	height: 86rpx;
 	position: absolute;
-	top: 37rpx;
-	right: 16rpx;
+	top: 30rpx;
+	right: 11rpx;
 }
-.List_tabList {
-	display: flex;
-	align-items: center;
-	margin: 0 20rpx;
-	margin-top: 24rpx;
-}
-.List_tabItem {
-	font-weight: 400;
-	font-size: 28rpx;
-	color: #555555;
-	margin-right: 60rpx;
-}
-.List_active {
-	font-weight: bold;
-	font-size: 32rpx;
-	color: #222222;
-	position: relative;
-}
-.List_active::after {
-	width: 63rpx;
-	height: 10rpx;
-	background: #FF512A;
-	border-radius: 0rpx;
-	content: '';
+.serverItem5 image {
+	width: 162rpx;
+	height: 93rpx;
 	position: absolute;
-	left: 50%;
-	bottom: -10rpx;
-	-webkit-transform: translateX(-50%);
-	        transform: translateX(-50%);
+	right: 0rpx;
+	top: 23rpx;
 }
-.List_active::before {
-	content: '';
-	width: 63rpx;
-	height: 10rpx;
-	background: #FF512A;
-	border-radius: 0rpx;
-	-webkit-filter: blur(6.599999904632568rpx);
-	        filter: blur(6.599999904632568rpx);
+.serverItem6 image {
+	width: 72rpx;
+	height: 72rpx;
 	position: absolute;
-	left: 50%;
-	bottom: -10rpx;
-	-webkit-transform: translateX(-50%);
-	        transform: translateX(-50%);
+	top: 30rpx;
+	right: 20rpx;
 }
-.List {
-	margin: 0 20rpx;
-	margin-top: 30rpx;
-}
-.List_Item {
-	padding-top: 10rpx;
-	padding-bottom: 30rpx;
-	display: flex;
-}
-.List .List_Item:last-of-type .Item_msg {
-	border-bottom: none;
-}
-.Item_img {
-	width: 180rpx;
-	height: 180rpx;
-	border-radius: 30rpx;
-	margin-right: 30rpx;
-}
-.Item_msg {
-	flex: 1;
-	padding-bottom: 55rpx;
-	border-bottom: 1rpx solid #E6E6E6;
-}
-.Item_top {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-.Item_top_name {
-	font-weight: 400;
-	font-size: 32rpx;
-	color: #000000;
-}
-.Item_top_apart {
-	font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
-	font-weight: 400;
-	font-size: 22rpx;
-	color: #a8682bcc;
-}
-.Item_sceond {
-	font-weight: 400;
-	font-size: 24rpx;
-	color: #555555;
-	margin-top: 15rpx;
-}
-.Item_third {
-	display: flex;
-	align-items: center;
-	font-weight: 400;
-	font-size: 24rpx;
-	color: #999999;
-	margin-top: 18rpx;
-}
-.Item_third image {
-	width: 24rpx;
-	height: 26rpx;
-	margin-right: 12rpx;
-}
-.Item_fourth {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin-top: 20rpx;
-}
-.Item_fourth_left {
-	display: flex;
-	align-items: center;
-}
-.Item_fourth_right {
-	font-weight: 400;
-	font-size: 26rpx;
+.merchant {
+	height: 90rpx;
+	line-height: 90rpx;
+	text-align: center;
+	width: 710rpx;
+	border-radius: 100rpx 100rpx 100rpx 100rpx;
+	background: linear-gradient( 91deg, #FF7658 0%, #FF370B 100%);
+	font-weight: normal;
+	font-size: 36rpx;
 	color: #FFFFFF;
-	width: 150rpx;
-	height: 50rpx;
-	background: #D5AC66;
-	border-radius: 100rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
+	margin-top: 28rpx;
 }
-.Item_fourth_left1 {
-	width: 110rpx;
-	height: 40rpx;
-	background: rgba(255, 81, 42, 0.1);
-	border-radius: 100rpx;
-	margin-right: 4rpx;
+.padding_bottom32 {
+	padding-bottom: 32rpx;
 }
-.Item_fourth_left1 {
-	width: 110rpx;
-	height: 40rpx;
-	background: rgba(255, 81, 42, 0.1);
-	border-radius: 100rpx;
+.main {
 	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-weight: 400;
-	font-size: 22rpx;
-	color: #555555;
-	display: flex;
-	align-items: center;
-	justify-content: center;
+	flex-wrap: wrap;
+}
+.list_pic {
+	width: 345rpx;
+	height: 345rpx;
 	margin-right: 20rpx;
-}
-.Item_fourth_left2 {
-	width: 110rpx;
-	height: 40rpx;
-	background: #FFF2DA;
-	border-radius: 100rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-weight: 400;
-	font-size: 22rpx;
-	background: #FFF2DA;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-.Item_fourth_left1 image {
-	width: 24rpx;
-	height: 24rpx;
-	margin-right: 4rpx;
-}
-.Item_fourth_left2 image {
-	width: 24rpx;
-	height: 24rpx;
-	margin-right: 4rpx;
-}
-.list {
-	margin-top: 36rpx;
-}
-.item_tit {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin: 0 20rpx;
-	margin-bottom: 32rpx;
-	margin-top: 30rpx;
-}
-.item_tit_left {
-	font-weight: bold;
-	font-size: 28rpx;
-	color: #000000;
-}
-.item_tit_right {
-	font-weight: 400;
-	font-size: 24rpx;
-	color: #D5AC66;
-	display: flex;
-	align-items: center;
-}
-.item_tit_right image {
-	width: 12rpx;
-	height: 22rpx;
-	margin-left: 8rpx;
-}
-.item_goodsItem {
-	display: flex;
-	align-items: center;
-	margin: 0 20rpx;
 	margin-bottom: 20rpx;
 }
-.item_goodsItem_tit {
-	width: 180rpx;
-	height: 180rpx;
-	margin-right: 30rpx;
-	margin-left: 19rpx;
+.list_pic:nth-child(2n) {
+	margin-right: 0;
 }
-.item_goodsItem_name {
-	font-weight: 400;
+.more {
+	font-weight: normal;
 	font-size: 26rpx;
-	color: #222222;
-	margin-top: 20rpx;
-	margin-left: 10rpx;
-}
-.item_goodsItem_msg {
-	font-weight: 400;
-	font-size: 22rpx;
-	color: #FF512A;
-	display: flex;
-	align-items: flex-end;
-	margin-top: 6rpx;
-	margin-left: 13rpx;
-}
-.item_goodsItem_msg view {
-	font-weight: 500;
-	font-size: 36rpx;
-}
-.item_goodsItem_msg text {
-	font-size: 22rpx;
-	color: #FF512A;
-}
-.item_goodsList {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: 0 20rpx;
-}
-.list_item {
-	padding-bottom: 32rpx;
-	border-bottom: 1rpx solid #E6E6E6;
-}
-.btn {
-	display: inline-flex;
-	align-items: center;
-	background: rgba(255, 81, 42, 0.1);
-	border-radius: 100rpx;
-	padding: 7rpx 22rpx 7rpx 0;
-}
-.mobile {
-	background: #FFF2DA;
-	margin-left: 20rpx;
+	color: #999999;
+	margin: 65rpx auto;
+	text-align: center;
 }

--- a/unpackage/dist/dev/mp-weixin/project.private.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.private.config.json
@ -1,7 +1,38 @@
+<<<<<<< HEAD
 {
  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
  "projectname": "uniapp-ZHSQ",
  "setting": {
    "compileHotReLoad": true
  }
+=======
+{
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "packages/workOrderDashboard/detail/index",
+          "pathName": "packages/workOrderDashboard/detail/index",
+          "query": "",
+          "scene": null,
+          "launchMode": "default"
+        },
+        {
+          "name": "packages/workOrderDashboard/index/index",
+          "pathName": "packages/community/repairList/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "师傅端报事报修",
+          "pathName": "packages/workOrderDashboard/index/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        }
+      ]
+    }
+  }
+>>>>>>> ed9d942ac05be4e10c07fa69ba960691cea53997
 }
--- a/unpackage/dist/dev/mp-weixin/reservation/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/reservation/index/index.js
@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["reservation/index/index"],{

-/***/ 238:
+/***/ 246:
 /*!*****************************************************************************************!*\
  !*** D:/projection/Hbuilder/uniapp-ZHSQ/main.js?{"page":"reservation%2Findex%2Findex"} ***!
  \*****************************************************************************************/
@ -13,7 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./reservation/index/index.vue */ 239));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./reservation/index/index.vue */ 247));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@ -21,7 +21,7 @@ createPage(_index.default);

 /***/ }),

-/***/ 239:
+/***/ 247:
 /*!**********************************************************************!*\
  !*** D:/projection/Hbuilder/uniapp-ZHSQ/reservation/index/index.vue ***!
  \**********************************************************************/
@ -30,10 +30,10 @@ createPage(_index.default);

 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_24984374___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=24984374& */ 240);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 242);
+/* harmony import */ var _index_vue_vue_type_template_id_24984374___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=24984374& */ 248);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 250);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_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 _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.vue?vue&type=style&index=0&lang=css& */ 245);
+/* harmony import */ var _index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.vue?vue&type=style&index=0&lang=css& */ 253);
 /* 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
@ -62,7 +62,7 @@ component.options.__file = "reservation/index/index.vue"

 /***/ }),

-/***/ 240:
+/***/ 248:
 /*!*****************************************************************************************************!*\
  !*** D:/projection/Hbuilder/uniapp-ZHSQ/reservation/index/index.vue?vue&type=template&id=24984374& ***!
  \*****************************************************************************************************/
@ -71,7 +71,7 @@ component.options.__file = "reservation/index/index.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_index_vue_vue_type_template_id_24984374___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!./index.vue?vue&type=template&id=24984374& */ 241);
+/* 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_index_vue_vue_type_template_id_24984374___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!./index.vue?vue&type=template&id=24984374& */ 249);
 /* 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_index_vue_vue_type_template_id_24984374___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_index_vue_vue_type_template_id_24984374___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@ -84,7 +84,7 @@ __webpack_require__.r(__webpack_exports__);

 /***/ }),

-/***/ 241:
+/***/ 249:
 /*!*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** ./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/reservation/index/index.vue?vue&type=template&id=24984374& ***!
  \*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@ -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 */ 619))
+      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 */ 630))
    },
    dropdown: function () {
-      return __webpack_require__.e(/*! import() | components/dropdown/dropdown */ "components/dropdown/dropdown").then(__webpack_require__.bind(null, /*! @/components/dropdown/dropdown.vue */ 627))
+      return __webpack_require__.e(/*! import() | components/dropdown/dropdown */ "components/dropdown/dropdown").then(__webpack_require__.bind(null, /*! @/components/dropdown/dropdown.vue */ 638))
    },
    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 */ 594))
+      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 */ 605))
    },
  }
 } catch (e) {
@ -175,7 +175,7 @@ render._withStripped = true

 /***/ }),

-/***/ 242:
+/***/ 250:
 /*!***********************************************************************************************!*\
  !*** D:/projection/Hbuilder/uniapp-ZHSQ/reservation/index/index.vue?vue&type=script&lang=js& ***!
  \***********************************************************************************************/
@ -184,14 +184,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_index_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!./index.vue?vue&type=script&lang=js& */ 243);
+/* 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_index_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!./index.vue?vue&type=script&lang=js& */ 251);
 /* 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_index_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_index_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_index_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_index_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_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 

 /***/ }),

-/***/ 243:
+/***/ 251:
 /*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** ./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/reservation/index/index.vue?vue&type=script&lang=js& ***!
  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@ -210,7 +210,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 60));
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _index = __webpack_require__(/*! ../../utils/index */ 167);
-var _reservation = __webpack_require__(/*! ../../api/reservation */ 244);
+var _reservation = __webpack_require__(/*! ../../api/reservation */ 252);
 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; }
 var _default = {
@ -427,7 +427,7 @@ exports.default = _default;

 /***/ }),

-/***/ 245:
+/***/ 253:
 /*!*******************************************************************************************************!*\
  !*** D:/projection/Hbuilder/uniapp-ZHSQ/reservation/index/index.vue?vue&type=style&index=0&lang=css& ***!
  \*******************************************************************************************************/
@ -436,14 +436,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_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_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_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_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_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-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--6-oneOf-1-2!../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../../下载目录/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!./index.vue?vue&type=style&index=0&lang=css& */ 246);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_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_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_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_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-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--6-oneOf-1-2!../../../../../下载目录/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../../下载目录/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!./index.vue?vue&type=style&index=0&lang=css& */ 254);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_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_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_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_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_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_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_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_index_vue_vue_type_style_index_0_lang_css___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_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_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_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_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_index_vue_vue_type_style_index_0_lang_css___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_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_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_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_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_index_vue_vue_type_style_index_0_lang_css___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_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_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_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_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_index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 

 /***/ }),

-/***/ 246:
+/***/ 254:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-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--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./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/reservation/index/index.vue?vue&type=style&index=0&lang=css& ***!
  \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@ -456,5 +456,5 @@ __webpack_require__.r(__webpack_exports__);

 /***/ })

-},[[238,"common/runtime","common/vendor"]]]);
+},[[246,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/reservation/index/index.js.map
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js
+++ b/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"],{

-/***/ 610:
+/***/ 621:
 /*!********************************************************************************************!*\
  !*** 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& */ 611);
-/* 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& */ 613);
+/* 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& */ 622);
+/* 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& */ 624);
 /* 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& */ 617);
+/* 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& */ 628);
 /* 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"

 /***/ }),

-/***/ 611:
+/***/ 622:
 /*!***************************************************************************************************************************************!*\
  !*** 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& */ 612);
+/* 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& */ 623);
 /* 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__);

 /***/ }),

-/***/ 612:
+/***/ 623:
 /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** ./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

 /***/ }),

-/***/ 613:
+/***/ 624:
 /*!*********************************************************************************************************************!*\
  !*** 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& */ 614);
+/* 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& */ 625);
 /* 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); 

 /***/ }),

-/***/ 614:
+/***/ 625:
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** ./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 */ 615));
-var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 616));
+var _icons = _interopRequireDefault(__webpack_require__(/*! ./icons */ 626));
+var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 627));
 //
 //
 //
@ -291,7 +291,7 @@ exports.default = _default;

 /***/ }),

-/***/ 617:
+/***/ 628:
 /*!******************************************************************************************************************************************************!*\
  !*** 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& */ 618);
+/* 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& */ 629);
 /* 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); 

 /***/ }),

-/***/ 618:
+/***/ 629:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** ./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__(610))
+            __webpack_require__('2')['createComponent'](__webpack_require__(621))
        })
    },
    [['uni_modules/uview-ui/components/u-icon/u-icon-create-component']]
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.json
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.json
@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js
+++ b/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"],{

-/***/ 676:
+/***/ 687:
 /*!**************************************************************************************************!*\
  !*** 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& */ 677);
-/* 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& */ 679);
+/* 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& */ 688);
+/* 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& */ 690);
 /* 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& */ 682);
+/* 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& */ 693);
 /* 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.

 /***/ }),

-/***/ 677:
+/***/ 688:
 /*!*********************************************************************************************************************************************!*\
  !*** 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& */ 678);
+/* 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& */ 689);
 /* 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__);

 /***/ }),

-/***/ 678:
+/***/ 689:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** ./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 */ 684))
+      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 */ 695))
    },
  }
 } catch (e) {
@ -113,7 +113,7 @@ render._withStripped = true

 /***/ }),

-/***/ 679:
+/***/ 690:
 /*!***************************************************************************************************************************!*\
  !*** 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& */ 680);
+/* 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& */ 691);
 /* 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); 

 /***/ }),

-/***/ 680:
+/***/ 691:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** ./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 */ 681));
+var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 692));
 //
 //
 //
@ -197,7 +197,7 @@ exports.default = _default;

 /***/ }),

-/***/ 682:
+/***/ 693:
 /*!************************************************************************************************************************************************************!*\
  !*** 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& */ 683);
+/* 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& */ 694);
 /* 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); 

 /***/ }),

-/***/ 683:
+/***/ 694:
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** ./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__(676))
+            __webpack_require__('2')['createComponent'](__webpack_require__(687))
        })
    },
    [['uni_modules/uview-ui/components/u-overlay/u-overlay-create-component']]
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js
+++ b/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"],{

-/***/ 684:
+/***/ 695:
 /*!********************************************************************************************************!*\
  !*** 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& */ 685);
-/* 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& */ 687);
+/* 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& */ 696);
+/* 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& */ 698);
 /* 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& */ 692);
+/* 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& */ 703);
 /* 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

 /***/ }),

-/***/ 685:
+/***/ 696:
 /*!***************************************************************************************************************************************************!*\
  !*** 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& */ 686);
+/* 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& */ 697);
 /* 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__);

 /***/ }),

-/***/ 686:
+/***/ 697:
 /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** ./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

 /***/ }),

-/***/ 687:
+/***/ 698:
 /*!*********************************************************************************************************************************!*\
  !*** 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& */ 688);
+/* 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& */ 699);
 /* 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); 

 /***/ }),

-/***/ 688:
+/***/ 699:
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** ./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 */ 689));
-var _transition = _interopRequireDefault(__webpack_require__(/*! ./transition.js */ 690));
+var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 700));
+var _transition = _interopRequireDefault(__webpack_require__(/*! ./transition.js */ 701));
 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;

 /***/ }),

-/***/ 692:
+/***/ 703:
 /*!******************************************************************************************************************************************************************!*\
  !*** 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& */ 693);
+/* 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& */ 704);
 /* 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); 

 /***/ }),

-/***/ 693:
+/***/ 704:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
  !*** ./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__(684))
+            __webpack_require__('2')['createComponent'](__webpack_require__(695))
        })
    },
    [['uni_modules/uview-ui/components/u-transition/u-transition-create-component']]
--- a/utils/index.js
+++ b/utils/index.js
@ -1,5 +1,5 @@
 // const RequsetUrl = 'https://huishang.magicany.cc/api/v1'; // 请求地址前缀
-const RequsetUrl = 'https://test.hshuishang.com/api/v1'; // 请求地址前缀
+const RequsetUrl = 'https://test.hshuishang.com'; // 请求地址前缀
 export const picUrl = 'https://test.hshuishang.com'; // 图片地址前缀

 /**
@ -17,6 +17,12 @@ export const NavgateTo = (path, options = {}) => {
 			uni.redirectTo({ url: '/pages/login/login' })
 			return
 		} else {
+      if(path == '1'){
+        uni.navigateBack({
+					delta: 1
+				})
+        return
+      }
 			uni.navigateTo({
 				url: path
 			});
@ -36,11 +42,11 @@ export const NavgateTo = (path, options = {}) => {
 * @param {Boolean} options.nested - 是否平铺接口返回参数，默认为 false
 * @returns {Promise} 返回一个Promise对象
 */
-export const request = (url, method = 'POST', data = {}, options = {}) => {
-	console.log('request 请求拓展参数 options', options);
-	const { silent = true, nested = false  } = options;


+export const request = (url, method = 'POST', data = {}, options = {}) => {
+	const { silent = true, nested = false  } = options;
+
 	let ctoken = null;
 	if (options.token) {
 		ctoken = options.token;
Author	SHA1	Message	Date
qiaojiale	55b69c35f8	修改请求地址	2025-06-16 17:51:32 +08:00
qiaojiale	4b33228d78	修改请求地址	2025-06-16 17:50:34 +08:00
mayubo@gmail.com	ed9d942ac0	feat: 师傅端报事报修开发And 接口修改	2025-06-16 17:50:33 +08:00
mayubo@gmail.com	5c1458d5b8	fix: 合并master	2025-06-16 15:42:33 +08:00
mayubo@gmail.com	c8baeb4384	feat: 首页改造	2025-06-16 15:40:00 +08:00