diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7a6fc7c..7ca65d5 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,7 +3,8 @@
 		<view class="swiper-container">
 			<view class="swiper-page" v-if="currentIndex == 0">
 				<view style="position: relative;height: 545rpx;">
-					<view style="width:100%;height: 180rpx;position: fixed;top: 0;background: #fff;z-index: 90;" v-if="lastScrollTop>583"></view>
+					<view style="width:100%;height: 180rpx;position: fixed;top: 0;background: #fff;z-index: 90;"
+						v-if="lastScrollTop>583"></view>
 					<view style="position: absolute;top: 110rpx;left: 20rpx;z-index: 999;">
 						<view @click="checkArea" v-if="areaName == ''">
 							点击选择区域
@@ -16,20 +17,25 @@
 					</view>
 					<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"
 						:interval="interval" :duration="duration">
-						<swiper-item v-if="item.position == 'home_top' " v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
+						<swiper-item v-if="item.position == 'home_top' " v-for="(item,index) in mallAds" :key="index"
+							@tap="goAdPage(item)">
 							<img :src="item.adImage" alt="" />
 						</swiper-item>
 					</swiper>
 					<view class="" style="background: #fff;">
 						<swiper class="swiper" vertical circular :autoplay="orderLists.length > 0"
-						:interval="onlineWorkerInterval" :duration="onlineWorkerDuration" style="height: 74px;margin-top: -50px;">
-							<swiper-item v-if="orderLists.length > 0" v-for="(item,index) in orderLists" :key="index" @tap="goOrderDetail(item)">
+							:interval="onlineWorkerInterval" :duration="onlineWorkerDuration"
+							style="height: 74px;margin-top: -50px;">
+							<swiper-item v-if="orderLists.length > 0" v-for="(item,index) in orderLists" :key="index"
+								@tap="goOrderDetail(item)">
 								<view class="order-msg-box">
 									<view class="order-msg-left">
-										<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/bf2bb7f80e17428391c407aef769517a.png" alt="" />
+										<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/bf2bb7f80e17428391c407aef769517a.png"
+											alt="" />
 									</view>
 									<view class="order-msg-center">
-										<view style="font-weight: 700;font-size: 30rpx;line-height: 60rpx;margin-top: 5%;">
+										<view
+											style="font-weight: 700;font-size: 30rpx;line-height: 60rpx;margin-top: 5%;">
 											<text v-if="item.status == 0">待支付</text>
 											<text v-if="item.status == 2">等待配送员接单</text>
 											<text v-if="item.status == 10">待成团</text>
@@ -43,59 +49,71 @@
 											<text v-if="item.status == 11">售后中</text>
 											<text v-if="item.status == 12">订单已售后</text>
 										</view>
-										<view style="font-size: 24rpx;" v-if="item.deliveryType == 1 && (item.status == 3 || item.status == 4) && item.deliveryInfo != null">
-											预计<text style="color: red;">{{item.deliveryInfo.mustFinishTime | formatHourMinute }}</text>送达
+										<view style="font-size: 24rpx;"
+											v-if="item.deliveryType == 1 && (item.status == 3 || item.status == 4) && item.deliveryInfo != null">
+											预计<text
+												style="color: red;">{{item.deliveryInfo.mustFinishTime | formatHourMinute }}</text>送达
 										</view>
 									</view>
 									<view class="order-msg-right" @tap.stop="$refs.pagesPopup.open()">
-										<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/579569bfcc954f52baea06f6f11951be.png" alt="" />
+										<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/579569bfcc954f52baea06f6f11951be.png"
+											alt="" />
 									</view>
 								</view>
 							</swiper-item>
 						</swiper>
 					</view>
-					
-					
-					<view class="menu-box" :style="{'margin-top':orderLists.length < 1?'-140rpx':'','height':orderLists.length < 1?'190rpx':'','padding-top':orderLists.length < 1?'40rpx':''}">
+
+
+					<view class="menu-box"
+						:style="{'margin-top':orderLists.length < 1?'-140rpx':'','height':orderLists.length < 1?'190rpx':'','padding-top':orderLists.length < 1?'40rpx':''}">
 						<view class="menu-list" @tap="goDetail('1')">
-							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/7690c4f897604fca804ea932bc3c1239.png" alt="" />
+							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/7690c4f897604fca804ea932bc3c1239.png"
+								alt="" />
 							<view class="menu-name">跑腿/快递</view>
 						</view>
 						<view class="menu-list" @tap="goDetail('2')" style="position: relative;">
-							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/553230c20dea4e5c85f1e396058a7493.png" alt="" />
-							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1a02b40d853a4cfdb062fff44ec49e6a.png" alt=""
-								style="position: absolute;top: -16rpx;right: 0;width: 88rpx;height: 36rpx;">
+							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/553230c20dea4e5c85f1e396058a7493.png"
+								alt="" />
+							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1a02b40d853a4cfdb062fff44ec49e6a.png"
+								alt="" style="position: absolute;top: -16rpx;right: 0;width: 88rpx;height: 36rpx;">
 							<view class="menu-name">饭团</view>
 						</view>
 						<view class="menu-list" @tap="goDetail('3')">
-							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/a2f41e2d45cb4d418d273f6e9ceafff0.png" alt="" />
+							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/a2f41e2d45cb4d418d273f6e9ceafff0.png"
+								alt="" />
 							<view class="menu-name">农场</view>
 						</view>
 						<view class="menu-list" @tap="goDetail('4')">
-							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/41cfb56caff4419b94b69d0f2303b602.png" alt="" />
+							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/41cfb56caff4419b94b69d0f2303b602.png"
+								alt="" />
 							<view class="menu-name">扭蛋机</view>
 						</view>
 						<view class="menu-list" @tap="goDetail('5')">
-							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/a083b7d159264bbc967034088fa7eb3a.png" alt="" />
+							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/a083b7d159264bbc967034088fa7eb3a.png"
+								alt="" />
 							<view class="menu-name">ie浏览器</view>
 						</view>
 					</view>
 					<view class="like-box">
 						<view class="like-title">
-							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/e0c44bc9b69a46559d3aa4160d3cf4a5.png" alt="" />
+							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/e0c44bc9b69a46559d3aa4160d3cf4a5.png"
+								alt="" />
 						</view>
-						
+
 						<view class="like-content-box">
 							<view class="like-left">
 								<view class="like-content-title">
 									<view style="width: 100%;font-weight: 700;">爆品拼团</view>
-									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/0eeb2e28f84a43a0aefddd8edb430d73.png" alt=""
+									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/0eeb2e28f84a43a0aefddd8edb430d73.png"
+										alt=""
 										style="width: 140rpx;height: 64rpx;position: absolute;top: -16rpx;left: 40%;" />
 									<img src="/static/images/img/yousanjiao.png" alt=""
 										style="width: 28rpx;height: 28rpx;position: absolute;top: 20rpx;right: 12rpx;">
 								</view>
 								<view class="like-content">
-									<view class="content-list" v-if="item.position == 'home_center_left_top' " v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
+									<view class="content-list" v-if="item.position == 'home_center_left_top' "
+										v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
 										<view class="list-img">
 											<img :src="item.adImage" alt="">
 											<view class="list-type">{{item.productList[0].groupMembers}}人团</view>
@@ -105,23 +123,26 @@
 
 												<view class="list-text">{{item.title}}</view>
 											</view>
-											<view class="list-price" style="color: #00231C;">￥{{item.productList[0].originalPrice}}</view>
+											<view class="list-price" style="color: #00231C;">
+												￥{{item.productList[0].originalPrice}}</view>
 											<view class="list-total">
 												拼团<text style="color: red;">￥{{item.productList[0].groupPrice}}</text>
 											</view>
 										</view>
 									</view>
-									<view class="content-list" v-if="item.position == 'home_center_left_bottom' " v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
+									<view class="content-list" v-if="item.position == 'home_center_left_bottom' "
+										v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
 										<view class="list-img">
 											<img :src="item.adImage" alt="">
 											<view class="list-type">{{item.productList[0].groupMembers}}人团</view>
 										</view>
 										<view class="list-product">
 											<view class="list-name">
-									
+
 												<view class="list-text">{{item.title}}</view>
 											</view>
-											<view class="list-price" style="color: #00231C;">￥{{item.productList[0].originalPrice}}</view>
+											<view class="list-price" style="color: #00231C;">
+												￥{{item.productList[0].originalPrice}}</view>
 											<view class="list-total">
 												拼团<text style="color: red;">￥{{item.productList[0].groupPrice}}</text>
 											</view>
@@ -132,39 +153,44 @@
 							<view class="like-left">
 								<view class="like-content-title">
 									<view style="font-weight: 700;">爆品拼团</view>
-									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/0eeb2e28f84a43a0aefddd8edb430d73.png" alt=""
+									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/0eeb2e28f84a43a0aefddd8edb430d73.png"
+										alt=""
 										style="width: 140rpx;height: 64rpx;position: absolute;top: -16rpx;left: 40%;" />
 									<img src="/static/images/img/yousanjiao.png" alt=""
 										style="width: 28rpx;height: 28rpx;position: absolute;top: 20rpx;right: 12rpx;">
 								</view>
 								<view class="like-content">
-									<view class="content-list" v-if="item.position == 'home_center_right_top' " v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
+									<view class="content-list" v-if="item.position == 'home_center_right_top' "
+										v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
 										<view class="list-img">
 											<img :src="item.adImage" alt="">
 											<view class="list-type">{{item.productList[0].groupMembers}}人团</view>
 										</view>
 										<view class="list-product">
 											<view class="list-name">
-									
+
 												<view class="list-text">{{item.title}}</view>
 											</view>
-											<view class="list-price" style="color: #00231C;">￥{{item.productList[0].originalPrice}}</view>
+											<view class="list-price" style="color: #00231C;">
+												￥{{item.productList[0].originalPrice}}</view>
 											<view class="list-total">
 												拼团<text style="color: red;">￥{{item.productList[0].groupPrice}}</text>
 											</view>
 										</view>
 									</view>
-									<view class="content-list" v-if="item.position == 'home_center_right_bottom' " v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
+									<view class="content-list" v-if="item.position == 'home_center_right_bottom' "
+										v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
 										<view class="list-img">
 											<img :src="item.adImage" alt="">
 											<view class="list-type">{{item.productList[0].groupMembers}}人团</view>
 										</view>
 										<view class="list-product">
 											<view class="list-name">
-									
+
 												<view class="list-text">{{item.title}}</view>
 											</view>
-											<view class="list-price" style="color: #00231C;">￥{{item.productList[0].originalPrice}}</view>
+											<view class="list-price" style="color: #00231C;">
+												￥{{item.productList[0].originalPrice}}</view>
 											<view class="list-total">
 												拼团<text style="color: red;">￥{{item.productList[0].groupPrice}}</text>
 											</view>
@@ -175,38 +201,55 @@
 						</view>
 					</view>
 					<view class="daimai-box" style="padding-bottom:180rpx;">
-						<view class="daimai-tab" id="menuList" :style="{'top': (navBarHeight+46) + 'px','background':lastScrollTop>583?'#fff':''}">
+						<view class="daimai-tab" id="menuList"
+							:style="{'top': (navBarHeight+46) + 'px','background':lastScrollTop>583?'#fff':''}">
 							<view @tap="checkTab1('waimai')" style="flex: 1;">
-								<view class="like-title"  style="position: relative;width: 160rpx;height: 50rpx;margin-top:8rpx;" v-if="checked == 'waimai'">
-									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4d3207adb25546f68ce4d3428e571867.png" alt="" style="width: 160rpx;height: 50rpx;" />
-									<text style="position: absolute;top: 0;left: 60rpx;font-size: 30rpx;font-weight: 700;height: 50rpx;line-height: 40rpx;">（{{waimaiCount}}）</text>
+								<view class="like-title"
+									style="position: relative;width: 160rpx;height: 50rpx;margin-top:8rpx;"
+									v-if="checked == 'waimai'">
+									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4d3207adb25546f68ce4d3428e571867.png"
+										alt="" style="width: 160rpx;height: 50rpx;" />
+									<text
+										style="position: absolute;top: 0;left: 60rpx;font-size: 30rpx;font-weight: 700;height: 50rpx;line-height: 40rpx;">（{{waimaiCount}}）</text>
 								</view>
 								<view style="font-size: 30rpx;font-weight: 700;margin-left: 20rpx;color: #777;" v-else>
 									外卖({{waimaiCount}})
 								</view>
 							</view>
 							<view @tap="checkTab1('kuaidi')" style="margin-left: 20rpx;flex: 1;">
-								<view class="like-title" style="position: relative;width: 160rpx;height: 50rpx;margin-top:8rpx;" v-if="checked == 'kuaidi'">
-									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/aeff6530c1c4486e9c7d088522de0c98.png" alt="" style="width: 160rpx;height: 50rpx;">
-									<text style="position: absolute;top: 0;left: 60rpx;font-size: 30rpx;font-weight: 700;height: 50rpx;line-height: 40rpx;">（{{kuaidiCount}}）</text>
+								<view class="like-title"
+									style="position: relative;width: 160rpx;height: 50rpx;margin-top:8rpx;"
+									v-if="checked == 'kuaidi'">
+									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/aeff6530c1c4486e9c7d088522de0c98.png"
+										alt="" style="width: 160rpx;height: 50rpx;">
+									<text
+										style="position: absolute;top: 0;left: 60rpx;font-size: 30rpx;font-weight: 700;height: 50rpx;line-height: 40rpx;">（{{kuaidiCount}}）</text>
 								</view>
 								<view style="font-size: 30rpx;font-weight: 700;margin-left: 20rpx;color: #777;" v-else>
 									快递({{kuaidiCount}})
 								</view>
 							</view>
 							<view @tap="checkTab1('paotui')" style="margin-left: 20rpx;flex: 1;">
-								<view class="like-title" style="position: relative;width: 160rpx;height: 50rpx;margin-top:8rpx;" v-if="checked == 'paotui'">
-									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/e2cccb5ad1534b2aaae9b2b67ed401b4.png" alt="" style="width: 160rpx;height: 50rpx;">
-									<text style="position: absolute;top: 0;left: 60rpx;font-size: 30rpx;font-weight: 700;height: 50rpx;line-height: 40rpx;">（{{paotuiCount}}）</text>
+								<view class="like-title"
+									style="position: relative;width: 160rpx;height: 50rpx;margin-top:8rpx;"
+									v-if="checked == 'paotui'">
+									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/e2cccb5ad1534b2aaae9b2b67ed401b4.png"
+										alt="" style="width: 160rpx;height: 50rpx;">
+									<text
+										style="position: absolute;top: 0;left: 60rpx;font-size: 30rpx;font-weight: 700;height: 50rpx;line-height: 40rpx;">（{{paotuiCount}}）</text>
 								</view>
 								<view style="font-size: 30rpx;font-weight: 700;margin-left: 20rpx;color: #777;" v-else>
 									跑腿({{paotuiCount}})
 								</view>
 							</view>
 							<view @tap="checkTab1('zhipai')" style="margin-left: 20rpx;flex: 1;" v-if="worker != null">
-								<view class="like-title" style="position: relative;width: 160rpx;height: 50rpx;margin-top:8rpx;" v-if="checked == 'zhipai'">
-									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/2bfc2333818b47478572e4d1a430049a.png" alt="" style="width: 160rpx;height: 50rpx;">
-									<text style="position: absolute;top: 0;left: 80rpx;font-size: 30rpx;font-weight: 700;height: 50rpx;line-height: 40rpx;">（{{zhipaiCount}}）</text>
+								<view class="like-title"
+									style="position: relative;width: 160rpx;height: 50rpx;margin-top:8rpx;"
+									v-if="checked == 'zhipai'">
+									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/2bfc2333818b47478572e4d1a430049a.png"
+										alt="" style="width: 160rpx;height: 50rpx;">
+									<text
+										style="position: absolute;top: 0;left: 80rpx;font-size: 30rpx;font-weight: 700;height: 50rpx;line-height: 40rpx;">（{{zhipaiCount}}）</text>
 								</view>
 								<view style="font-size: 30rpx;font-weight: 700;margin-left: 20rpx;color: #777;" v-else>
 									指派单({{zhipaiCount}})
@@ -232,13 +275,15 @@
 										@tap="searchOrder('putarea',item)">{{item.title}}</view>
 								</view>
 							</view>
-							<view @tap="searchOrder('yongjin')" class="sort-member" style="border-radius: 60rpx" :style="{'background':checkYongjin==true?'rgba(138, 255, 67, 0.16)':'#f5f5f5','border':checkYongjin==true?'1px solid rgba(138, 255, 67, 1)':'0'}">
+							<view @tap="searchOrder('yongjin')" class="sort-member" style="border-radius: 60rpx"
+								:style="{'background':checkYongjin==true?'rgba(138, 255, 67, 0.16)':'rgba(247, 248, 248, 0.6)','border':checkYongjin==true?'1px solid rgba(138, 255, 67, 1)':'0'}">
 								佣金
 							</view>
 						</view>
 						<view class="sort-text" v-if="lastScrollTop>583" :style="{'top': (navBarHeight+126) + 'px'}">
 							<view style="display: flex; width: 100%;">
-								<view @tap="searchOrder('delgetarea',item)" class="guize1-qusong" v-if="getAreaData.id != undefined">
+								<view @tap="searchOrder('delgetarea',item)" class="guize1-qusong"
+									v-if="getAreaData.id != undefined">
 									<view class="qusong1">
 										取
 									</view>
@@ -246,7 +291,8 @@
 										{{getAreaData.title}}
 									</view>
 								</view>
-								<view @tap="searchOrder('delputarea',item)" class="guize1-qusong" v-if="putAreaData.id != undefined">
+								<view @tap="searchOrder('delputarea',item)" class="guize1-qusong"
+									v-if="putAreaData.id != undefined">
 									<view class="qusong1">
 										送
 									</view>
@@ -254,13 +300,16 @@
 										{{putAreaData.title}}
 									</view>
 								</view>
-								<view @tap="clearCheck" v-if="getAreaData.id != undefined || putAreaData.id != undefined" style="color:#00BFFF;">
+								<view @tap="clearCheck"
+									v-if="getAreaData.id != undefined || putAreaData.id != undefined"
+									style="color:#00BFFF;">
 									清空
 								</view>
 							</view>
 						</view>
 						<view :style="{'height':lastScrollTop>583?'900px':'auto'}">
-							<view class="list-1" v-for="(item,index) in deliveryItem" :key="index" @tap="goDetail('search',item)">
+							<view class="list-1" v-for="(item,index) in deliveryItem" :key="index"
+								@tap="goDetail('search',item)">
 								<view class="daoda-time">
 									送达时间：{{item.mustFinishTime != null ? item.mustFinishTime : '' | formatHourMinute }}
 								</view>
@@ -269,12 +318,13 @@
 										#<text>{{item.numberCode != null ? item.numberCode : ''}} </text>
 									</view>
 									<view class="shangjia">
-										<text style="font-weight: 700;">{{item.shopName != null ? item.shopName : ''}}</text>
+										<text
+											style="font-weight: 700;">{{item.shopName != null ? item.shopName : ''}}</text>
 										<view @tap="productDetail(item)" v-if="item.deliveryType == 1"
 											style="width: 32rpx;height: 30rpx;font-weight: 700;font-size: 20rpx;color: #fff;text-align: center;background: #00BFFF;border-radius: 10rpx;margin: 20rpx 0 0 10rpx;line-height: 30rpx;">
-											祥
+											详
 										</view>
-										<view v-else  style="font-weight: 700;">
+										<view v-else style="font-weight: 700;">
 											{{item.allCount ? item.allCount : 0}}件
 										</view>
 									</view>
@@ -282,7 +332,8 @@
 										<view class="qu-song">
 											<view class="qu-box">
 												<view class='qu-tu'>
-													<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1f77398a73454a6595c12a3c18731599.png" alt="" />
+													<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1f77398a73454a6595c12a3c18731599.png"
+														alt="" />
 												</view>
 												<view class="qu-text">
 													<view class="qu-left">
@@ -297,7 +348,8 @@
 											</view>
 											<view class="qu-box" style="margin-top:15rpx;">
 												<view class='qu-tu'>
-													<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d0764fb4138747769538cf1cafa3b017.png" alt="" />
+													<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d0764fb4138747769538cf1cafa3b017.png"
+														alt="" />
 												</view>
 												<view class="qu-text">
 													<view class="qu-left">
@@ -322,14 +374,16 @@
 									</view>
 									<view style="font-weight: 700;width: 50%;text-align: right;">
 										￥{{(item.deliveryFee + item.deliveryFeeMarketplace).toFixed(2)}}
-										<text style="color: #777;font-size: 22rpx;" v-if="item.deliveryFeeMarketplace > 0">（包含￥{{item.deliveryFeeMarketplace}}平台佣金）</text>
+										<text style="color: #777;font-size: 22rpx;"
+											v-if="item.deliveryFeeMarketplace > 0">（包含￥{{item.deliveryFeeMarketplace}}平台佣金）</text>
 									</view>
 								</view>
 								<view class="beizhu" v-if="item.remark != null && item.remark != ''">
 									备注：{{item.remark}}
 								</view>
 								<view class="qiangdan-btn" @tap="getOrder(item,index)">
-									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1b8b815302a34902ac79a76a469e4ee6.png" alt="">
+									<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1b8b815302a34902ac79a76a469e4ee6.png"
+										alt="">
 								</view>
 								<view class="yongjin" v-if="checked == 'zhipai'">
 									<text @tap="rejectOrder(item,index)">拒绝接单</text>
@@ -356,7 +410,8 @@
 				<view class="popup-area-title">
 					<text>请选择所属区域</text>
 				</view>
-				<view class="popup-area-container" v-for="(item,index) in areaList" :key="index" @tap="onClickArea(item)">
+				<view class="popup-area-container" v-for="(item,index) in areaList" :key="index"
+					@tap="onClickArea(item)">
 					<text style="display: inline-block">{{item.title}}</text>
 				</view>
 			</view>
@@ -373,16 +428,163 @@
 			</view>
 		</uni-popup>
 		<uni-popup ref="productPopup" background-color="#fff">
-			<view class="popup-area-content" style="height: 1200rpx;overflow: scroll;">
+			<view class="popup-area-content" style="width: 700rpx;overflow: scroll;">
 				<view class="popup-area-title">
 					<text>订单详情</text>
 				</view>
-				<view class="popup-area-container" v-for="(item,index) in productData" :key="index">
-					<text style="display: inline-block">{{item.productName}} {{item.specs}} * {{item.quantity}}</text>
+				<view>
+					<view class="box1">
+						<view style="height: 160rpx;line-height: 80rpx;">
+							<view style="flex: 1;color: #777;font-weight: 700;">
+								取货地址
+							</view>
+							<view style="color: #000;font-weight: 700;">
+								{{productData.shopAddress}}
+							</view>
+						</view>
+						<view style="height: 160rpx;line-height: 80rpx;">
+							<view style="flex: 1;color: #777;font-weight: 700;">
+								收货地址
+							</view>
+							<view style="color: #000;font-weight: 700;">
+								{{productData.receiverAddress}}
+							</view>
+						</view>
+					</view>
+					<view class="box1">
+						
+						<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;display: flex;"
+							v-if="productData.shopName != null">
+							<text style="flex:1">{{productData.shopName}}</text>
+							<img @tap="makeCall(productData.shopPhone)"
+								src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
+								alt="" style="width: 40rpx;height: 40rpx;margin-top: 14rpx;" />
+						</view>
+					
+						<view v-for="(item1,index1) in productData.goodsList" :key="index1"
+							v-if="productData.goodsList != null && productData.goodsList.length > 0"
+							style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
+							<view class="goods-img">
+								<img :src="item1.productPicture" alt="">
+							</view>
+							<view class="goods-content">
+								<view class="goods-name">
+									{{item1.productName}}
+								</view>
+								<view class="goods-content-center">
+									{{item1.specs | delNode}}
+								</view>
+								<view class="goods-content-bottom">
+									<view style="width: 50%;">
+										X{{item1.quantity}}
+									</view>
+									<view class="pintuan-left-price">
+										￥{{item1.price}}
+									</view>
+								</view>
+							</view>
+						</view>
+						<view>
+							<view style="height: 80rpx;line-height: 80rpx;display: flex;"
+								v-if="productData.packageFee != null && productData.packageFee > 0">
+								<view style="flex: 1;color: #777;font-weight: 700;">
+									打包费
+								</view>
+								<view style="color: #000;font-weight:700;">
+									￥{{productData.packageFee}}
+								</view>
+							</view>
+							<view style="height: 80rpx;line-height: 80rpx;display: flex;"
+								v-if="productData.deliveryType == 1">
+								<view style="flex: 1;color: #777;font-weight: 700;">
+									配送费
+								</view>
+								<view style="color: #000;font-weight:700;">
+									￥{{productData.deliveryFee}}
+								</view>
+							</view>
+							<view style="height: 80rpx;line-height: 80rpx;display: flex;"
+								v-if="productData.userCouponNum > 0">
+								<view style="flex: 1;color: #777;font-weight: 700;">
+									优惠券
+								</view>
+								<view style="color: #000;font-weight:700;">
+									-￥{{productData.userCouponNum}}
+								</view>
+							</view>
+						</view>
+						<view
+							style="display: flex;height: 80rpx;line-height: 100rpx;border-top: 1px solid #eee;font-size: 32rpx;font-weight: 700;">
+							<view style="flex: 1;">
+								实付
+							</view>
+							<view class="">
+								￥{{productData.totalAmount}}
+							</view>
+						</view>
+					</view>
+					
+					<view class="box1">
+						<view>
+							<view style="height: 80rpx;line-height: 80rpx;display: flex;"
+								v-if="productData.otherOrder == 1">
+								<view style="flex: 1;color: #777;font-weight: 700;">
+									取件地址
+								</view>
+								<view style="color: #000;font-weight: 700;">
+									{{productData.shopAddress}}
+								</view>
+							</view>
+							<view style="height: 80rpx;line-height: 80rpx;display: flex;"
+								v-if="productData.otherOrder == 1">
+								<view style="flex: 1;color: #777;font-weight: 700;">
+									收件地址
+								</view>
+								<view style="color: #000;font-weight: 700;">
+									{{productData.receiverAddress}}
+								</view>
+							</view>
+							<view style="height: 80rpx;line-height: 80rpx;display: flex;"
+								v-if="productData.otherOrder == 1">
+								<view style="flex: 1;color: #777;font-weight: 700;">
+									件数
+								</view>
+								<view style="color: #000;font-weight: 700;">
+									{{productData.deliveryInfo.allCount}}
+								</view>
+							</view>
+							<view style="height: 80rpx;line-height: 80rpx;display: flex;"
+								v-if="productData.otherOrder == 1">
+								<view style="flex: 1;color: #777;font-weight: 700;">
+									服务类型
+								</view>
+								<view style="color: #000;font-weight: 700;">
+									快递/跑腿
+								</view>
+							</view>
+							<view style="height: 80rpx;line-height: 80rpx;display: flex;"
+								v-if="productData.numberCode != null">
+								<view style="flex: 1;color: #777;font-weight: 700;">
+									订单号
+								</view>
+								<view style="color: #000;font-weight: 700;">
+									{{productData.numberCode}}
+								</view>
+							</view>
+							<view style="height: 80rpx;line-height: 80rpx;display: flex;">
+								<view style="flex: 1;color: #777;font-weight: 700;">
+									下单时间
+								</view>
+								<view style="color: #000;font-weight: 700;">
+									{{productData.createTime | formatHourMinute}}
+								</view>
+							</view>
+						</view>
+					</view>
 				</view>
 			</view>
 		</uni-popup>
-		
+
 		<tab-bar ref="tabBar" :width="width" @tab-index="changeIndex" :currentIndex="currentIndex"></tab-bar>
 	</view>
 </template>
@@ -394,109 +596,109 @@
 	export default {
 		data() {
 			return {
-				pages:[{
-					name:'商家账单详情111',
-					url:'/package2/shop/shopSettlementDetail'
-				},{
-					name:'商家订单详情111',
-					url:'/package2/shop/orderDetail'
-				},{
-					name:'发布订单评价111',
-					url:'/package1/order/orderEvaluate'
-				},{
-					name:'优惠券列表111',
-					url:'/package1/myCenter/couponList'
-				},{
-					name:'订单列表111',
-					url:'/package1/order/orderList'
-				},{
-					name:'待成团页111',
-					url:'/package1/order/pendGroup'
-				},{
-					name:'新增商品111',
-					url:'/package1/myCenter/addGoods'
-				},{
-					name:'代买饭111',
-					url:'/package1/buyFood/buyFood'
-				},{
-					name:'配送员列表111',
-					url:'/package1/index/deliveryPersonList'
-				},{
-					name:'拼团商家详情111',
-					url:'/package1/group/groupBuyDetail'
-				},{
-					name:'拼团单一商家111',
-					url:'/package1/group/groupBuySingle'
-				},{
-					name:'拼团页111',
-					url:'/package1/group/groupBuyList'
-				},{
-					name:'商家搜索页111',
-					url:'/package1/group/searchGroup'
-				},{
-					name:'商家评价111',
-					url:'/package1/group/shopEvaluate'
-				},{
-					name:'商品详情页111',
-					url:'/package1/goods/goodsDetail'
-				},{
-					name:'订单详情111',
-					url:'/package1/order/orderDetail'
-				},{
-					name:'订单支付页111',
-					url:'/package1/order/orderConfirm'
-				},{
-					name:'商家注册111',
-					url:'/package2/shop/merchantRegister'
-				},{
-					name:'代取快递/跑腿111',
-					url:'/package1/runErrand/runErrand'
-				},{
-					name:'兼职注册111',
-					url:'/package1/myCenter/partTimeJobRegister'
-				},{
-					name:'支付页',
-					url:'/package1/payment/payment'
-				},{
-					name:'帖子详情页',
-					url:'/package1/post/postDetail'
-				},{
-					name:'地址列表',
-					url:'/package1/myCenter/addressList'
-				},{
-					name:'我的钱包',
-					url:'/package1/myCenter/wallet'
-				},{
-					name:'我的发布',
-					url:'/package1/myCenter/myPost'
-				},{
-					name:'我的朋友',
-					url:'/package1/myCenter/myFriend'
-				},{
-					name:'我的收藏',
-					url:'/package1/myCenter/myCollect'
-				},{
-					name:'个人中心',
-					url:'/package1/myCenter/myCenter'
-				},{
-					name:'商家注册',
-					url:'/package2/shop/merchantRegister'
-				},{
-					name:'发布',
-					url:'/package1/tabbar/release'
-				},{
-					name:'农场',
-					url:'/package1/farm/farm'
+				pages: [{
+					name: '商家账单详情111',
+					url: '/package2/shop/shopSettlementDetail'
+				}, {
+					name: '商家订单详情111',
+					url: '/package2/shop/orderDetail'
+				}, {
+					name: '发布订单评价111',
+					url: '/package1/order/orderEvaluate'
+				}, {
+					name: '优惠券列表111',
+					url: '/package1/myCenter/couponList'
+				}, {
+					name: '订单列表111',
+					url: '/package1/order/orderList'
+				}, {
+					name: '待成团页111',
+					url: '/package1/order/pendGroup'
+				}, {
+					name: '新增商品111',
+					url: '/package1/myCenter/addGoods'
+				}, {
+					name: '代买饭111',
+					url: '/package1/buyFood/buyFood'
+				}, {
+					name: '配送员列表111',
+					url: '/package1/index/deliveryPersonList'
+				}, {
+					name: '拼团商家详情111',
+					url: '/package1/group/groupBuyDetail'
+				}, {
+					name: '拼团单一商家111',
+					url: '/package1/group/groupBuySingle'
+				}, {
+					name: '拼团页111',
+					url: '/package1/group/groupBuyList'
+				}, {
+					name: '商家搜索页111',
+					url: '/package1/group/searchGroup'
+				}, {
+					name: '商家评价111',
+					url: '/package1/group/shopEvaluate'
+				}, {
+					name: '商品详情页111',
+					url: '/package1/goods/goodsDetail'
+				}, {
+					name: '订单详情111',
+					url: '/package1/order/orderDetail'
+				}, {
+					name: '订单支付页111',
+					url: '/package1/order/orderConfirm'
+				}, {
+					name: '商家注册111',
+					url: '/package2/shop/merchantRegister'
+				}, {
+					name: '代取快递/跑腿111',
+					url: '/package1/runErrand/runErrand'
+				}, {
+					name: '兼职注册111',
+					url: '/package1/myCenter/partTimeJobRegister'
+				}, {
+					name: '支付页',
+					url: '/package1/payment/payment'
+				}, {
+					name: '帖子详情页',
+					url: '/package1/post/postDetail'
+				}, {
+					name: '地址列表',
+					url: '/package1/myCenter/addressList'
+				}, {
+					name: '我的钱包',
+					url: '/package1/myCenter/wallet'
+				}, {
+					name: '我的发布',
+					url: '/package1/myCenter/myPost'
+				}, {
+					name: '我的朋友',
+					url: '/package1/myCenter/myFriend'
+				}, {
+					name: '我的收藏',
+					url: '/package1/myCenter/myCollect'
+				}, {
+					name: '个人中心',
+					url: '/package1/myCenter/myCenter'
+				}, {
+					name: '商家注册',
+					url: '/package2/shop/merchantRegister'
+				}, {
+					name: '发布',
+					url: '/package1/tabbar/release'
+				}, {
+					name: '农场',
+					url: '/package1/farm/farm'
 				}],
-				areaName:'',
+				areaName: '',
 				indicatorDots: false,
 				autoplay: true,
-				mallAds:[],
-				deliveryItem:[],
+				mallAds: [],
+				deliveryItem: [],
 				interval: 4000,
-				onlineWorkerInterval:4000,
+				onlineWorkerInterval: 4000,
 				duration: 1000,
-				onlineWorkerDuration:1000,
+				onlineWorkerDuration: 1000,
 				latitude: 39.909, // 默认纬度，可以设为用户当前位置或配送员位置
 				longitude: 116.39742, // 默认经度
 				markers: [], // 标记点，可以包括配送员位置和用户位置
@@ -514,41 +716,43 @@
 					isCheck: false
 				}],
 				dataList: [],
-				areaList:[],
-				orderLists:[],
-				waimaiCount:0,
-				kuaidiCount:0,
-				paotuiCount:0,
-				productData:[],
-				zhipaiCount:0,
-				searchForm:{
+				areaList: [],
+				orderLists: [],
+				waimaiCount: 0,
+				kuaidiCount: 0,
+				paotuiCount: 0,
+				productData: [],
+				zhipaiCount: 0,
+				searchForm: {
 					hallOnly: true,
 					status: 0,
-					pageNum:1,
-					getAreaId:'',
-					putAreaId:'',
-					paths:['home_top','home_center_left_top','home_center_left_bottom','home_center_right_top','home_center_right_bottom'],
-					order:'',
-					regionId:'',
+					pageNum: 1,
+					getAreaId: '',
+					putAreaId: '',
+					paths: ['home_top', 'home_center_left_top', 'home_center_left_bottom', 'home_center_right_top',
+						'home_center_right_bottom'
+					],
+					order: '',
+					regionId: '',
 					deliveryType: 1,
 					waimaiData: [],
 					workerId: uni.getStorageSync('worker') ? uni.getStorageSync('worker').workerId : '',
 					kuaidiData: []
 				},
-				checked:'waimai',
+				checked: 'waimai',
 				navBarHeight: 0,
 				menuListOffsetTop: 0,
 				lastScrollTop: 0,
-				worker:null,
+				worker: null,
 				isSwitching: true,
-				getAreaData:{},
-				putAreaData:{},
-				yongjin:false,
-				waimailistData:[],
-				kuaidilistData:[],
+				getAreaData: {},
+				putAreaData: {},
+				yongjin: false,
+				waimailistData: [],
+				kuaidilistData: [],
 				isgetArea: false,
-				isputArea:false,
-				checkYongjin:false,
+				isputArea: false,
+				checkYongjin: false,
 				getshopArea: [],
 				putshopArea: []
 			}
@@ -560,23 +764,40 @@
 			myCenter
 		},
 		filters: {
-		  formatHourMinute(value) {
-		    if (!value) return '';
-		        
-		        const date = new Date(value);
-		        
-		        // 获取日 (getDate)，并补齐0
-		        const day = String(date.getDate()).padStart(2, '0');
-		        
-		        // 获取小时 (getHours)，并补齐0
-		        const hour = String(date.getHours()).padStart(2, '0');
-		        
-		        // 获取分钟 (getMinutes)，并补齐0
-		        const minute = String(date.getMinutes()).padStart(2, '0');
-		        
-		        // 拼接格式：日-日-时:分
-		        return `${day}-${hour}:${minute}`;
-		  }
+			formatHourMinute(value) {
+				if (!value) return '';
+
+				const date = new Date(value);
+
+				// 获取日 (getDate)，并补齐0
+				const day = String(date.getDate()).padStart(2, '0');
+
+				// 获取小时 (getHours)，并补齐0
+				const hour = String(date.getHours()).padStart(2, '0');
+
+				// 获取分钟 (getMinutes)，并补齐0
+				const minute = String(date.getMinutes()).padStart(2, '0');
+
+				// 拼接格式：日-日-时:分
+				return `${day}-${hour}:${minute}`;
+			},
+			delNode(data) {
+				// 1. 统一转为字符串
+				let str;
+				if (typeof data === 'object' && data !== null) {
+					// 对象或数组 → JSON 字符串
+					str = JSON.stringify(data);
+				} else if (typeof data === 'string') {
+					str = data;
+				} else {
+					// 其他类型（数字、布尔等）先转字符串
+					str = String(data);
+				}
+
+				// 2. 删除所有大括号 { } 和双引号 "
+				const result = str.replace(/[{}"]/g, '');
+				return result;
+			}
 		},
 		onPageScroll(e) {
 			const scrollTop = e.scrollTop;
@@ -599,7 +820,7 @@
 			}
 		},
 		onLoad() {
-			
+
 		},
 		onShow() {
 			this.indexInit()
@@ -614,7 +835,7 @@
 			}, 500);
 		},
 		methods: {
-			indexInit(){
+			indexInit() {
 				let that = this
 				uni.getSystemInfo({
 					success: function(info) {
@@ -622,7 +843,7 @@
 					}
 				});
 				let worker = uni.getStorageSync('worker')
-				if(worker != '' && worker != undefined && worker != null){
+				if (worker != '' && worker != undefined && worker != null) {
 					this.worker = worker
 				}
 				that.searchForm.workerId = uni.getStorageSync('worker') ? uni.getStorageSync('worker').workerId : ''
@@ -631,35 +852,35 @@
 				this.getUserOrders();
 				// 建立WebSocket连接或定时请求获取配送员位置
 				this.getDeliveryLocation();
-				if(!uni.getStorageSync('area')){
+				if (!uni.getStorageSync('area')) {
 					this.checkArea()
-				}else{
-					if(uni.getStorageSync('area')){
+				} else {
+					if (uni.getStorageSync('area')) {
 						this.searchForm.regionId = JSON.parse(uni.getStorageSync('area')).id;
 					}
 					let area = JSON.parse(uni.getStorageSync('area'))
 					this.areaName = area.title
-					if(uni.getStorageSync('waimaiData')){
+					if (uni.getStorageSync('waimaiData')) {
 						this.waimailistData = []
 						let waimailist = uni.getStorageSync('waimaiData')
-						if(waimailist.length > 0){
-							for(let a = 0;a<waimailist.length;a++){
+						if (waimailist.length > 0) {
+							for (let a = 0; a < waimailist.length; a++) {
 								let waimai = {
-									getAreaId:waimailist[a].getAreaId,
-									putAreaId:waimailist[a].putAreaId
+									getAreaId: waimailist[a].getAreaId,
+									putAreaId: waimailist[a].putAreaId
 								}
 								this.waimailistData.push(waimai);
 							}
 						}
 					}
-					if(uni.getStorageSync('kuaidiData')){
+					if (uni.getStorageSync('kuaidiData')) {
 						this.kuaidilistData = []
 						let waimailist = uni.getStorageSync('kuaidiData')
-						if(waimailist.length > 0){
-							for(let a = 0;a<waimailist.length;a++){
+						if (waimailist.length > 0) {
+							for (let a = 0; a < waimailist.length; a++) {
 								let waimai = {
-									getAreaId:waimailist[a].getAreaId,
-									putAreaId:waimailist[a].putAreaId
+									getAreaId: waimailist[a].getAreaId,
+									putAreaId: waimailist[a].putAreaId
 								}
 								this.kuaidilistData.push(waimai);
 							}
@@ -675,12 +896,12 @@
 				const info = uni.getSystemInfoSync();
 				this.navBarHeight = info.statusBarHeight;
 			},
-			clearCheck(){
+			clearCheck() {
 				this.checkYongjin = false
 				this.putAreaData = {}
 				this.getAreaData = {}
-				this.searchForm.getAreaId=""
-				this.searchForm.putAreaId=""
+				this.searchForm.getAreaId = ""
+				this.searchForm.putAreaId = ""
 				this.searchForm.order = ""
 				this.getDelivery()
 				this.$forceUpdate()
@@ -691,66 +912,82 @@
 				this.isSwitching = true;
 				this.checkTab(index);
 				// 400ms后解除锁（动画200ms，预留200ms缓冲）
-				setTimeout(() => { this.isSwitching = false; }, 400);
+				setTimeout(() => {
+					this.isSwitching = false;
+				}, 400);
 			},
-			productDetail(item){
-				this.productData = item.goodsList;
+			productDetail(item) {
+				this.productData = item;
 				this.$refs.productPopup.open()
 			},
-			getOrder(item,index){
+			getOrder(item, index) {
 				let that = this
-				that.getUserLocation()
+				
 				let data = {
-					groupId:item.groupId ? item.groupId : '',
-					deliveryId:item.id,
-					workerId:uni.getStorageSync('worker') ? uni.getStorageSync('worker').workerId : '',
-					workerPhone:uni.getStorageSync('worker') ? uni.getStorageSync('worker').mobile : '',
-					workerName:uni.getStorageSync('worker') ? uni.getStorageSync('worker').workerName : '',
-					regionId:JSON.parse(uni.getStorageSync('area')).id,
-					geolocation:that.latitude + ',' + that.longitude
+					groupId: item.groupId ? item.groupId : '',
+					deliveryId: item.id,
+					workerId: uni.getStorageSync('worker') ? uni.getStorageSync('worker').workerId : '',
+					workerPhone: uni.getStorageSync('worker') ? uni.getStorageSync('worker').mobile : '',
+					workerName: uni.getStorageSync('worker') ? uni.getStorageSync('worker').workerName : '',
+					regionId: JSON.parse(uni.getStorageSync('area')).id,
+					geolocation: that.latitude + ',' + that.longitude
 				}
-				
-				this.tui.request("/mall/delivery/accept", "POST",data, false, true).then((res) => {
-					that.loadStatus = 'nomore';
-					if (res.code == 200) {
-						if(!uni.getStorageSync('worker') && res.result != null){
-							uni.setStorageSync('worker',res.result)
-						}
-						that.deliveryItem.splice(index,1)
-						that.tui.toast(res.message);
-						if(item.workerId != null && item.workerId != undefined && item.workerId != ''){
-							that.zhipaiCount -= 1
-						}else{
-							if(item.deliveryType == 1){
-								that.waimaiCount -= 1
-							}else if(item.deliveryType == 2){
-								that.kuaidiCount -= 1
-							}else if(item.deliveryType == 3){
-								that.paotuiCount -= 1
+				uni.getLocation({
+					type: 'gcj02', // 返回国测局坐标，用于微信小程序地图组件
+					success: (res) => {
+						console.log('位置', res)
+						that.latitude = res.latitude;
+						that.longitude = res.longitude;
+						
+						that.tui.request("/mall/delivery/accept", "POST", data, false, true).then((res) => {
+							that.loadStatus = 'nomore';
+							if (res.code == 200) {
+								if (!uni.getStorageSync('worker') && res.result != null) {
+									uni.setStorageSync('worker', res.result)
+								}
+								that.deliveryItem.splice(index, 1)
+								that.tui.toast(res.message);
+								if (item.workerId != null && item.workerId != undefined && item.workerId != '') {
+									that.zhipaiCount -= 1
+								} else {
+									if (item.deliveryType == 1) {
+										that.waimaiCount -= 1
+									} else if (item.deliveryType == 2) {
+										that.kuaidiCount -= 1
+									} else if (item.deliveryType == 3) {
+										that.paotuiCount -= 1
+									}
+								}
+								that.$forceUpdate();
+							} else {
+								that.tui.toast(res.message);
+								return;
 							}
-						}
-						that.$forceUpdate();
-					} else {
-						that.tui.toast(res.message);
-						return;
+							uni.hideLoading();
+						}).catch((res) => {});
+					},
+					fail: (err) => {
+						console.log('获取位置失败', err);
 					}
-					uni.hideLoading();
-				}).catch((res) => {});
+				});
+				
 			},
-			rejectOrder(item,index){
+			rejectOrder(item, index) {
 				let that = this
-				this.tui.request("/mall/delivery/reject", "POST",{deliveryId:item.id}, false, true).then((res) => {
+				this.tui.request("/mall/delivery/reject", "POST", {
+					deliveryId: item.id
+				}, false, true).then((res) => {
 					if (res.code == 200) {
-						that.deliveryItem.splice(index,1)
+						that.deliveryItem.splice(index, 1)
 						that.tui.toast(res.message);
-						if(item.workerId != null && item.workerId != undefined && item.workerId != ''){
+						if (item.workerId != null && item.workerId != undefined && item.workerId != '') {
 							that.zhipaiCount -= 1
-						}else{
-							if(item.deliveryType == 1){
+						} else {
+							if (item.deliveryType == 1) {
 								that.waimaiCount -= 1
-							}else if(item.deliveryType == 2){
+							} else if (item.deliveryType == 2) {
 								that.kuaidiCount -= 1
-							}else if(item.deliveryType == 3){
+							} else if (item.deliveryType == 3) {
 								that.paotuiCount -= 1
 							}
 						}
@@ -762,25 +999,25 @@
 					uni.hideLoading();
 				}).catch((res) => {});
 			},
-			getDelivery(){
+			getDelivery() {
 				let that = this
 				this.tui.request("/mall/delivery/page", "POST", this.searchForm, false, false).then((res) => {
 					that.loadStatus = 'nomore';
 					if (res.code == 200) {
 						that.mallAds = res.result.mallAds
 						that.deliveryItem = res.result.records;
-						if(res.result.orderCount != null){
-							for(let i =0;i<res.result.orderCount.length;i++){
-								if(res.result.orderCount[i].deliveryType == 1){
+						if (res.result.orderCount != null) {
+							for (let i = 0; i < res.result.orderCount.length; i++) {
+								if (res.result.orderCount[i].deliveryType == 1) {
 									that.waimaiCount = res.result.orderCount[i].orderCount
-								}else if(res.result.orderCount[i].deliveryType == 2){
+								} else if (res.result.orderCount[i].deliveryType == 2) {
 									that.kuaidiCount = res.result.orderCount[i].orderCount
-								}else if(res.result.orderCount[i].deliveryType == 3){
+								} else if (res.result.orderCount[i].deliveryType == 3) {
 									that.paotuiCount = res.result.orderCount[i].orderCount
 								}
 							}
 						}
-						if(res.result.zhipaiCount != undefined && res.result.zhipaiCount != null){
+						if (res.result.zhipaiCount != undefined && res.result.zhipaiCount != null) {
 							that.zhipaiCount = res.result.zhipaiCount
 						}
 						that.$forceUpdate();
@@ -791,7 +1028,7 @@
 					uni.hideLoading();
 				}).catch((res) => {});
 			},
-			goAdPage(item){
+			goAdPage(item) {
 				uni.navigateTo({
 					url: item.linkUrl + item.linkParams
 				})
@@ -809,15 +1046,18 @@
 				// 滚动到正确位置：分类栏刚好吸顶在nav-bar下方
 				// menuListOffsetTop - navBarHeight 使分类栏正好在sticky位置，首条商品可见
 				const target = this.menuListOffsetTop - this.navBarHeight;
-				uni.pageScrollTo({ scrollTop: target > 0 ? target : 0, duration: 200 });
+				uni.pageScrollTo({
+					scrollTop: target > 0 ? target : 0,
+					duration: 200
+				});
 			},
 			//本方法展示所有已经完成页面，方便查找
-			aaaaaaa(item){
+			aaaaaaa(item) {
 				uni.navigateTo({
 					url: item.url
 				})
 			},
-			goDetail(type){
+			goDetail(type) {
 				let url = ''
 				switch (type) {
 					case '1':
@@ -829,7 +1069,7 @@
 					case '3':
 						url = ''
 						break;
-					case '4':	
+					case '4':
 						url = ''
 						break;
 					case '5':
@@ -840,21 +1080,25 @@
 					url: url
 				})
 			},
-			goOrderDetail(item){
+			goOrderDetail(item) {
 				uni.redirectTo({
-					url: '/package1/order/orderDetail?id=' + item.id 
+					url: '/package1/order/orderDetail?id=' + item.id
 				});
 			},
-			onClickArea(item){
-				uni.setStorageSync('area',JSON.stringify(item))
+			onClickArea(item) {
+				uni.setStorageSync('area', JSON.stringify(item))
 				this.searchForm.regionId = item.id
 				this.getDelivery();
 				this.getShopArea();
 				let that = this
-				that.tui.request("/worker/admin/add", "POST", {userId:uni.getStorageSync('id'),isChangeArea:0,region:item.id}, false, true).then((res) => {
+				that.tui.request("/worker/admin/add", "POST", {
+					userId: uni.getStorageSync('id'),
+					isChangeArea: 0,
+					region: item.id
+				}, false, true).then((res) => {
 					if (res.code == 200) {
-						if(res.result != null){
-							uni.setStorageSync('worker',res.result)
+						if (res.result != null) {
+							uni.setStorageSync('worker', res.result)
 						}
 					} else {
 						that.tui.toast(res.message)
@@ -864,7 +1108,7 @@
 				}).catch((res) => {})
 				this.$refs.areaPopup.close()
 			},
-			checkArea(){
+			checkArea() {
 				this.tui.request("/app/shopArea/getByParentId/0", "get", {}, false, false).then((res) => {
 					if (res.code == 200) {
 						this.areaList = res.result
@@ -874,11 +1118,12 @@
 					}
 				})
 			},
-			getShopArea(){
+			getShopArea() {
 				let that = this
-				that.tui.request("/app/shopArea/getByParentId/"+ that.searchForm.regionId, "GET", {}, false, true).then((res) => {
+				that.tui.request("/app/shopArea/getByParentId/" + that.searchForm.regionId, "GET", {}, false, true).then((
+					res) => {
 					if (res.code == 200) {
-						if(res.result != null){
+						if (res.result != null) {
 							that.getshopArea = res.result
 							that.putshopArea = res.result
 						}
@@ -888,50 +1133,51 @@
 					}
 				}).catch((res) => {})
 			},
-			getUserOrders(){
+			getUserOrders() {
 				let that = this
-				that.tui.request("/mall/order/getOrdersByUserId/"+ uni.getStorageSync('id'), "GET", {}, false, true).then((res) => {
-					if (res.code == 200) {
-						if(res.result != null){
-							that.orderLists = res.result
-							that.$forceUpdate()
+				that.tui.request("/mall/order/getOrdersByUserId/" + uni.getStorageSync('id'), "GET", {}, false, true).then(
+					(res) => {
+						if (res.code == 200) {
+							if (res.result != null) {
+								that.orderLists = res.result
+								that.$forceUpdate()
+							}
+						} else {
+							that.tui.toast(res.message)
+							return
 						}
-					} else {
-						that.tui.toast(res.message)
-						return
-					}
-				}).catch((res) => {})
+					}).catch((res) => {})
 			},
 			searchOrder(type, value) {
 				if (type == 'getarea') {
-					if(this.searchForm.getAreaId == value.id){
+					if (this.searchForm.getAreaId == value.id) {
 						this.searchForm.getAreaId = ''
 						this.getAreaData = {}
-					}else{
+					} else {
 						this.searchForm.getAreaId = value.id
 						this.getAreaData = value
 					}
 					this.isgetArea = !this.isgetArea
 					// this.searchForm.shopArea = value
 				} else if (type == 'putarea') {
-					if(this.searchForm.putAreaId == value.id){
+					if (this.searchForm.putAreaId == value.id) {
 						this.searchForm.putAreaId = ''
 						this.putAreaData = {}
-					}else{
+					} else {
 						this.searchForm.putAreaId = value.id
 						this.putAreaData = value
 					}
 					this.isputArea = !this.isputArea
-				}else if (type == 'yongjin') {
+				} else if (type == 'yongjin') {
 					this.checkYongjin = !this.checkYongjin
-					if(this.checkYongjin){
+					if (this.checkYongjin) {
 						this.searchForm.order = 'deliveryFee'
-					}else{
+					} else {
 						this.searchForm.order = ''
 					}
-				}else if(type == 'delgetarea'){
+				} else if (type == 'delgetarea') {
 					this.getAreaData = {}
-				}else if(type == 'delputarea'){
+				} else if (type == 'delputarea') {
 					this.putAreaData = {}
 				}
 				this.getDelivery();
@@ -939,44 +1185,23 @@
 			// 获取用户位置
 			getUserLocation() {
 				let that = this;
-				uni.getLocation({
-					type: 'gcj02', // 返回国测局坐标，用于微信小程序地图组件
-					success: (res) => {
-						console.log('位置', res)
-						this.latitude = res.latitude;
-						this.longitude = res.longitude;
-						
-						// // 将用户位置添加到标记点
-						// this.markers.push({
-						// 	id: 0,
-						// 	latitude: res.latitude,
-						// 	longitude: res.longitude,
-						// 	title: '我的位置',
-						// 	iconPath: '/static/images/tabbar/fabu1.png', // 用户位置图标
-						// 	width: 30,
-						// 	height: 30
-						// });
-					},
-					fail: (err) => {
-						console.log('获取位置失败', err);
-					}
-				});
+				
 			},
-			checkTab1(type){
+			checkTab1(type) {
 				this.checked = type
-				if(type == 'waimai'){
+				if (type == 'waimai') {
 					this.searchForm.deliveryType = 1
 					this.searchForm.waimaiData = this.waimailistData;
 					this.searchForm.kuaidiData = [];
-				}else if(type == 'kuaidi'){
+				} else if (type == 'kuaidi') {
 					this.searchForm.deliveryType = 2
 					this.searchForm.waimaiData = [];
 					this.searchForm.kuaidiData = this.kuaidilistData;
-				}else if(type == 'paotui'){
+				} else if (type == 'paotui') {
 					this.searchForm.deliveryType = 3
 					this.searchForm.waimaiData = [];
 					this.searchForm.kuaidiData = [];
-				}else if(type == 'zhipai'){
+				} else if (type == 'zhipai') {
 					this.searchForm.deliveryType = 4
 					this.searchForm.waimaiData = [];
 					this.searchForm.kuaidiData = [];
@@ -984,7 +1209,7 @@
 				this.getDelivery()
 				this.$forceUpdate()
 			},
-			makeCall(phone){
+			makeCall(phone) {
 				uni.makePhoneCall({
 					phoneNumber: phone
 				});
@@ -1050,9 +1275,9 @@
 						break;
 					case 1:
 						let worker = uni.getStorageSync('worker')
-						if(worker == '' || worker == undefined || worker == null){
+						if (worker == '' || worker == undefined || worker == null) {
 							this.tui.toast('您还没有注册兼职')
-						}else{
+						} else {
 							that.$refs.deLiveryPage.init()
 						}
 						break;
@@ -1229,7 +1454,7 @@
 		margin-top: 40rpx;
 		background: #F5F8F5;
 		position: relative;
-		z-index:99
+		z-index: 99
 	}
 
 	.menu-list {
@@ -1261,10 +1486,10 @@
 		height: 60rpx;
 		line-height: 60rpx;
 		position: sticky;
-		top:0;
-		z-index:90;
+		top: 0;
+		z-index: 90;
 	}
-	
+
 	.like-title {
 		width: 218rpx;
 		height: 64rpx;
@@ -1529,39 +1754,42 @@
 			background-size: 100%;
 		}
 	}
-	.paotui-title{
+
+	.paotui-title {
 		display: flex;
 		flex: 1;
 		line-height: 88rpx;
 		text-align: right;
 		padding-right: 20rpx;
 	}
-	.paotui-text{
+
+	.paotui-text {
 		font-size: 28rpx;
 		color: red;
 		font-weight: bold;
 		flex: 1;
 	}
-	.paotui-num{
+
+	.paotui-num {
 		font-size: 24rpx;
 		padding: 0 10rpx;
 	}
+
 	.popup-area-content {
 		align-items: center;
 		justify-content: center;
-		padding: 30rpx;
-		width: 500rpx;
 		height: auto;
 		background-color: #fff;
 	}
-	
+
 	.popup-area-title {
 		font-size: 36rpx;
 		font-weight: bold;
 		text-align: center;
 		position: relative;
+		    margin-top: 10px;
 	}
-	
+
 	.popup-area-container {
 		margin-top: 20rpx;
 		height: 100rpx;
@@ -1573,7 +1801,8 @@
 		border-top: 1px solid #eee;
 		color: #fff;
 	}
-	.chaoda{
+
+	.chaoda {
 		height: 30rpx;
 		line-height: 30rpx;
 		margin: 10rpx 0 0 20rpx;
@@ -1583,43 +1812,47 @@
 		border-radius: 10rpx;
 		font-size: 20rpx;
 	}
-	.beizhu{
-		    width: 95%;
-		    margin: 0 auto;
-		    background: rgba(255, 117, 88, 0.08);
-		    border: 1px solid rgba(255, 117, 88, 0.12);
-		    border-radius: 20rpx;
-		    height: 120rpx;
-		    padding: 20rpx;
-		    color: rgba(255, 57, 57, 1);
+
+	.beizhu {
+		width: 95%;
+		margin: 0 auto;
+		background: rgba(255, 117, 88, 0.08);
+		border: 1px solid rgba(255, 117, 88, 0.12);
+		border-radius: 20rpx;
+		height: 120rpx;
+		padding: 20rpx;
+		color: rgba(255, 57, 57, 1);
 	}
+
 	.title-sort {
 		height: 100rpx;
 		display: flex;
 		position: sticky;
-		top:0;
-		z-index:90;
+		top: 0;
+		z-index: 90;
 		background: #fff;
-		padding-top:20rpx;
+		padding-top: 20rpx;
 	}
-	.sort-text{
+
+	.sort-text {
 		height: auto;
 		display: flex;
 		position: sticky;
-		top:0;
-		z-index:90;
+		top: 0;
+		z-index: 90;
 		background: #fff;
 	}
+
 	.sort-member {
 		height: 60rpx;
 		line-height: 60rpx;
 		text-align: center;
-		background: #f5f5f5;
+		background: rgba(247, 248, 248, 0.6);
 		width: 24%;
 		margin-right: 4%;
 		border-radius: 10rpx;
 	}
-	
+
 	.sort-value {
 		width: 160rpx;
 		height: auto;
@@ -1633,18 +1866,18 @@
 		color: #fff;
 		font-size: 22rpx;
 	}
-	
+
 	.sort-value1 {
 		border-bottom: 1px solid #eee;
 	}
-	
+
 	.guize1-qusong {
 		display: flex;
 		margin: 0 40rpx 20rpx 0;
 	}
-	
+
 	.qusong1 {
-		width: 40rpx ;
+		width: 40rpx;
 		height: 40rpx;
 		background: rgba(0, 35, 28, 1);
 		color: #fff;
@@ -1654,7 +1887,7 @@
 		font-size: 20rpx;
 		z-index: 80;
 	}
-	
+
 	.qusong2 {
 		height: 40rpx;
 		font-size: 24rpx;
@@ -1667,4 +1900,51 @@
 		border-top-right-radius: 40rpx;
 		border-bottom-right-radius: 40rpx;
 	}
+	.box1 {
+		width: 95%;
+		margin: 0 auto 20rpx;
+		background: #fff;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	}
+	.goods-img {
+		width: 160rpx;
+		height: 160rpx;
+		position: relative;
+	
+		img {
+			width: 100%;
+			background-size: 100%;
+			height: 100%;
+		}
+	}
+	
+	.goods-content {
+		flex: 1;
+		padding-left: 20rpx;
+	}
+	
+	.goods-name {
+		font-size: 32rpx;
+		font-weight: 900;
+	}
+	
+	.goods-content-center {
+		display: flex;
+		margin: 16rpx 0;
+		color: #777;
+	}
+	
+	.goods-content-bottom {
+		display: flex;
+		line-height: 56rpx;
+		color: #777;
+	}
+	
+	.pintuan-left-price {
+		width: 50%;
+		text-align: right;
+		font-weight: 700;
+		color: #000;
+	}
 </style>
\ No newline at end of file