Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

components/tab-bar/myCenter.vue

@@ -1,12 +1,13 @@
 <template>
 	<view class="page1">
 		<view style="margin-top: 80px;" @click="navigatorTo('merchant')">商家入驻</view>
-		<view style="margin-top: 80px;" @click="navigatorTo('merchantCenter')">商家中心-{{shopCounts}}</view>
+		<view style="margin-top: 50px;" @click="navigatorTo('merchantCenter')">商家中心-{{shopCounts}}</view>
-		<view style="margin-top: 80px;" @click="navigatorTo('jianzhizhuce')">兼职注册</view>
+		<view style="margin-top: 50px;" @click="navigatorTo('jianzhizhuce')">兼职注册</view>
-		<view style="margin-top: 80px;" v-if="worker" @click="navigatorTo('jianzhizhuye')">兼职主页-{{workerCounts}}</view>
+		<view style="margin-top: 50px;" v-if="worker" @click="navigatorTo('jianzhizhuye')">兼职主页-{{workerCounts}}</view>
-		<view style="margin-top: 80px;" @click="navigatorTo('qianbao')">钱包余额 ￥{{balance}}</view>
+		<view style="margin-top: 50px;" @click="navigatorTo('qianbao')">钱包余额 ￥{{balance}}</view>
-		<view style="margin-top: 80px;" @click="navigatorTo('dingdan')">我的订单</view>
+		<view style="margin-top: 50px;" @click="navigatorTo('dingdan')">我的订单</view>
-		<view style="margin-top: 80px;" @click="navigatorTo('qiehuan')">切换校区放到设置中</view>
+		<view style="margin-top: 50px;" @click="navigatorTo('qiehuan')">切换校区放到设置中</view>
+		<view style="margin-top: 50px;" @click="navigatorTo('tuichu')">退出登录</view>
 		<!-- 未注册兼职弹窗 -->
 		<uni-popup ref="jianzhiPopup" background-color="rgba(2, 171, 255, 1)" borderRadius="40px 40px 40px 40px">
 			<view class="jianzhi-content" @tap="navigatorTo('partTimeReg')">
@@ -174,6 +175,11 @@
 					url = '/package2/myCenter/goodsList'
 				} else if (e == 'merchant') {
 					url = '/package2/shop/merchantRegister'
+				} else if (e == 'tuichu') {
+					uni.clearStorageSync()
+					uni.reLaunch({
+						url: '/package2/login/login'
+					})
 				} else if (e == 'qiehuan') {
 					this.checkArea()
 				} else if (e == 'jianzhichaping') {

manifest.json

@@ -95,12 +95,6 @@
         "optimization" : {
             "subPackages" : true
         },
-        "plugins" : {
-            "WechatSI" : {
-                "version" : "0.3.5",
-                "provider" : "wx069ba97219f66d99"
-            }
-        },
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "用于编辑收货地址"

package1/order/orderDetail.vue

@@ -685,12 +685,18 @@
 
 		<uni-popup ref="returnPopupBuy" background-color="#fff" style="height: 1600rpx !important;">
 
-			<view class="guize-list">
+			<view class="guize-list" style="height: 600rpx;width:300rpx;padding: 20rpx;background: #fff;">
 				<view style="height: 80rpx;line-height: 80rpx;font-size: 36rpx;font-weight: 700;text-align: center;">
 					确定要取消拼团吗
 				</view>
-				<view class="btn" @tap="returnOrderBuy()">
+				
-					确认取消
+				<view style="display:flex;margin-top:80px;">
+					<view class="btn" @tap="returnOrderBuy()" style="background: #777;color:#eee;">
+						取消
+					</view>
+					<view class="btn" @tap="returnOrderBuy()">
+						确认
+					</view>
 				</view>
 			</view>
 		</uni-popup>
@@ -1084,7 +1090,12 @@
 
 					this.peisongTime = `${fmt(hours1)}时${fmt(minutes1)}分${fmt(seconds1)}秒`;
 				}
-				this.$refs.returnPopup.open('bottom');
+				if(this.orderDetail.status != 10){
+					this.$refs.returnPopup.open('bottom');
+				}else{
+					this.$refs.returnPopupBuy.open()
+				}
+				
 			},
 			returnPopupPropBuy(item) {
 				this.payData = item;

package1/runErrand/runErrand.vue

@@ -1238,7 +1238,7 @@
 		height: 150rpx;
 		display: flex;
 		background: #fff;
-		z-index: 9999;
+		z-index: 99;
 		box-shadow: 0 -20rpx 30rpx rgba(0, 0, 0, 0.3);
 	}
 

package2/group/groupBuySingle.vue

@@ -560,8 +560,8 @@
 						</view>
 						<view style="height: 40rpx;text-align: center;color: #777;">
 
-							<text v-if="groupId != '' && isFaceToFaceGroup && groupdeliveryType == 1">配送费(均摊)
+							<text v-if="groupId != '' && isFaceToFaceGroup && groupdeliveryType == 1">
-								{{tuanzhangOrder.deliveryFee}} 元
+								配送费(均摊){{tuanzhangOrder.deliveryFee}} 元
 							</text>
 
 							<text v-if="groupdeliveryType == 1 && currentItem.lunchBox > 0"> 打包费