Merge branch 'master' into zhongqi-delivery

ghsApp/src/admin/home/me.vue

@@ -152,9 +152,6 @@
               <view class="tui-title">密码修改</view>
             </tui-list-cell>
 
-            <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">跑腿设置</view>
-            </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/print' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">接单小票机</view>
@@ -168,6 +165,10 @@
               <view class="tui-title">云音箱</view>
             </tui-list-cell>
 
+            <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true">
+              <view class="tui-title">跑腿设置</view>
+            </tui-list-cell>
+
             <tui-list-cell @click="pageTo({ url: '/admin/shop/sk' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">更多设置</view>
             </tui-list-cell>

ghsApp/src/admin/home/workbench.vue

@@ -200,25 +200,27 @@
 
 	<uni-popup ref="errorPriceRef" background-color="#fff" type="center" :animation="false">
 		<view class="error-price-content">
-			<view class="price-row" v-for="(errItem, errIndex) in errorPirceList" :key="errIndex">
-				<view class="name-cell">{{ errItem.name }}</view>
-				<view class="price-cell" @click.stop="goErrorItem(errItem.name+'a')">
-					<text v-if="errItem.a">A级 ¥{{ errItem.a ? parseFloat(errItem.a) : 0 }}</text>
-					<text v-else class="no-data">A级 -</text>
-				</view>
-				<view class="price-cell" @click.stop="goErrorItem(errItem.name+'b')">
-					<text v-if="errItem.b">B级 ¥{{ errItem.b ? parseFloat(errItem.b) : 0 }}</text>
-					<text v-else class="no-data">B级 -</text>
-				</view>
-				<view class="price-cell" @click.stop="goErrorItem(errItem.name+'c')">
-					<text v-if="errItem.c">C级 ¥{{ errItem.c ? parseFloat(errItem.c) : 0 }}</text>
-					<text v-else class="no-data">C级 -</text>
-				</view>
-				<view class="price-cell" @click.stop="goErrorItem(errItem.name+'d')">
-					<text v-if="errItem.d">D级 ¥{{ errItem.d ? parseFloat(errItem.d) : 0 }}</text>
-					<text v-else class="no-data">D级 -</text>
+			<scroll-view class="price-scroll" scroll-y="true">
+				<view class="price-row" v-for="(errItem, errIndex) in errorPirceList" :key="errIndex">
+					<view class="name-cell">{{ errItem.name }}</view>
+					<view class="price-cell" @click.stop="goErrorItem(errItem.name+'a')">
+						<text v-if="errItem.a">A级 ¥{{ errItem.a ? parseFloat(errItem.a) : 0 }}</text>
+						<text v-else class="no-data">A级 -</text>
+					</view>
+					<view class="price-cell" @click.stop="goErrorItem(errItem.name+'b')">
+						<text v-if="errItem.b">B级 ¥{{ errItem.b ? parseFloat(errItem.b) : 0 }}</text>
+						<text v-else class="no-data">B级 -</text>
+					</view>
+					<view class="price-cell" @click.stop="goErrorItem(errItem.name+'c')">
+						<text v-if="errItem.c">C级 ¥{{ errItem.c ? parseFloat(errItem.c) : 0 }}</text>
+						<text v-else class="no-data">C级 -</text>
+					</view>
+					<view class="price-cell" @click.stop="goErrorItem(errItem.name+'d')">
+						<text v-if="errItem.d">D级 ¥{{ errItem.d ? parseFloat(errItem.d) : 0 }}</text>
+						<text v-else class="no-data">D级 -</text>
+					</view>
 				</view>
-			</view>
+			</scroll-view>
 			<view class="button-container">
 				<button @click="closeErrorPriceFn" class="admin-button-com middle blue">知道了</button>
 			</view>
@@ -1043,40 +1045,48 @@ export default {
 	padding: 30upx 10upx 20upx 10upx;
 	width: 100vw;
 	max-width: 800upx;
+	display: flex;
+	flex-direction: column;
 	
-	.price-row {
-		display: flex;
-		align-items: center;
-		padding: 16upx 0;
-		border-bottom: 1upx solid #f0f0f0;
-		
-		&:last-child {
-			border-bottom: none;
-		}
+	.price-scroll {
+		max-height: 80vh;
+		flex: 1;
+		overflow-y: auto;
 		
-		.name-cell {
-			flex: 3;
-			font-size: 28upx;
-			font-weight: 500;
-			color: #333;
-			padding-right: 30upx;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-		
-		.price-cell {
-			flex: 1.5;
-			text-align: center;
-			font-size: 28upx;
-			color: #d63031;
-			font-weight: 500;
-			padding: 0 10upx;
-			white-space: nowrap;
+		.price-row {
+			display: flex;
+			align-items: center;
+			padding: 16upx 0;
+			border-bottom: 1upx solid #f0f0f0;
 			
-			.no-data {
-				color: #999;
-				font-weight: normal;
+			&:last-child {
+				border-bottom: none;
+			}
+			
+			.name-cell {
+				flex: 3;
+				font-size: 28upx;
+				font-weight: 500;
+				color: #333;
+				padding-right: 30upx;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+			
+			.price-cell {
+				flex: 1.5;
+				text-align: center;
+				font-size: 28upx;
+				color: #d63031;
+				font-weight: 500;
+				padding: 0 10upx;
+				white-space: nowrap;
+				
+				.no-data {
+					color: #999;
+					font-weight: normal;
+				}
 			}
 		}
 	}
@@ -1085,6 +1095,7 @@ export default {
 		text-align: center;
 		margin-top: 30upx;
 		padding-top: 20upx;
+		flex-shrink: 0;
 	}
 }
 </style>

ghsApp/src/admin/shop/sk.vue

@@ -17,44 +17,46 @@
             <view>{{zjGatheringItemName}}</view>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">下单后</view>
-            <radio-group class="tui-input" @change="orderFlowChange">
-              <label class="list" for="orderFlowZj">
-                <radio id="orderFlowZj" value="0" :checked="orderFlow == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">直接完成</span>
-              </label>
-              <label class="list" for="orderFlowFh">
-                <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">需要发货</span>
-              </label>
-            </radio-group>
-          </tui-list-cell>
+          <view style="width:100%;border-top: 2px solid #2bb931;"></view>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">下单选跑腿</view>
+            <view class="tui-title">客户下单</view>
             <radio-group class="tui-input" @change="thirdSendChange">
               <label class="list" for="thirdSendOk">
                 <radio id="thirdSendOk" value="0" :checked="thirdSend == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">允许</span>
+                <span class="checkbox-text">允许选跑腿</span>
               </label>
               <label class="list" for="thirdSendNo">
                 <radio id="thirdSendNo" value="1" :checked="thirdSend == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">不允许</span>
+                <span class="checkbox-text">不能选跑腿</span>
               </label>
             </radio-group>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
             <view class="tui-title">跑腿费用</view>
-            <radio-group class="tui-input" @change="thirdSendFeeChange">
-              <label class="list" for="thirdSendFeeDf">
+            <radio-group class="tui-input" @change="thirdSendFeeChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
+              <label class="list" for="thirdSendFeeDf" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeDf" value="0" :checked="thirdSendFee == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">自理</span>
+                <span class="checkbox-text">客户自理或发货后补收</span>
               </label>
-              <label class="list" for="thirdSendFeeZd">
+              <label class="list" for="thirdSendFeeZd" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">预收</span>
+                <span class="checkbox-text">下单时算好，提前收取</span>
+              </label>
+            </radio-group>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">下单后</view>
+            <radio-group class="tui-input" @change="orderFlowChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
+              <label class="list" for="orderFlowZj" style="display: flex; align-items: center; white-space: nowrap;">
+                <radio id="orderFlowZj" value="0" :checked="orderFlow == 0" style="transform:scale(0.7,0.7)" />
+                <span class="checkbox-text">后台不要一键发跑腿（直接完成）</span>
+              </label>
+              <label class="list" for="orderFlowFh" style="display: flex; align-items: center; white-space: nowrap;">
+                <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
+                <span class="checkbox-text">后台需要一键发跑腿（变待发货）</span>
               </label>
             </radio-group>
           </tui-list-cell>

ghsApp/src/pagesClient/member/addCustomer.vue

@@ -104,7 +104,7 @@ export default {
       let checkRes = form.validation(formData, rules);
 
       if (!checkRes) {
-        uni.showLoading({mask:true})
+        uni.showLoading()
         setTimeout(() => {
           this.confirmFn()
         })
@@ -115,7 +115,7 @@ export default {
     },
     confirmFn () {
       let currentMiniOpenId = uni.getStorageSync('currentMiniOpenId')
-      uni.showLoading({mask:true})
+      uni.showLoading()
       createCumtomer({
         hdShopAdminId: this.option.hdShopAdminId,
         ghsShopAdminId: this.option.ghsShopAdminId,
@@ -124,6 +124,7 @@ export default {
         from: this.option.from || 0,
         miniOpenId:currentMiniOpenId
       }).then(res => {
+        uni.hideLoading()
         if(res.code == 1){
           if(res.data.customId && res.data.customId>0){
               this.$util.confirmModal({content:'客户已经存在',okText:'查看',cancelText:'取消'},() => {
@@ -131,9 +132,7 @@ export default {
               })
           }else{
             this.$msg(res.msg)
-            setTimeout(() => {
-              uni.navigateBack();
-            }, 2000)
+            setTimeout(() => { uni.navigateBack() }, 2000)
           }
         }
       });

hdApp/src/admin/ghs/pay.vue

@@ -20,8 +20,8 @@
 				<button class="button-com green" @click="wexinPayFn">微信支付</button>
 				<div style="text-align:center;margin-top:10upx;">
 					<image :src="imgUrl" mode="widthFix" style="width:230upx;height:230upx;margin:0 auto;"></image>
-					<view style="margin-top:10upx;font-size:32upx;">支付宝扫此二维码付款</view>
-					<button @click="downloadImg()" class="button-com red" style="margin:0 auto;width:560upx;">保存二维码</button>
+					<view style="margin-top:10upx;margin-bottom:10upx;font-size:32upx;">支付宝扫此二维码付款</view>
+					<button @click="downloadImg()" class="button-com red" style="margin:0 auto;width:600upx;">保存二维码</button>
 					<div style="margin-top:58upx;font-size:30upx;text-decoration: underline;" @click="teachPayFn()">不会用支付宝付款？点这里教您</div>
 				</div>
 				<!-- #endif -->

hdApp/src/admin/home/me.vue

@@ -79,10 +79,6 @@
               <view class="tui-title">密码修改</view>
             </tui-list-cell>
 
-            <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true" >
-              <view class="tui-title">跑腿设置</view>
-            </tui-list-cell>
-
             <tui-list-cell @click="pageTo({ url: '/admin/shop/print' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">前台小票机</view>
             </tui-list-cell>
@@ -104,6 +100,9 @@
               <view class="tui-title">美团云音箱</view>
             </tui-list-cell>
 
+            <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true" >
+              <view class="tui-title">跑腿设置</view>
+            </tui-list-cell>
             <tui-list-cell @click="pageTo({ url: '/admin/shop/sk' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">更多设置</view>
             </tui-list-cell>

hdApp/src/admin/order/detail.vue

@@ -79,7 +79,7 @@
           <view class="module-tit__actions">
             <button class="admin-button-com middle" @click="edit(orderInfo)" v-if="orderInfo.status == 1 || orderInfo.status == 2"> 修改 </button>
             <button class="admin-button-com middle default" v-else> 修改 </button>
-            <button class="admin-button-com middle" @click="copyInfo(orderInfo)">复制</button>
+            <button class="admin-button-com middle" @click="copyInfo(orderInfo)">复制地址</button>
           </view>
         </view>
         <view class="module-det">

hdApp/src/admin/shop/sk.vue

@@ -29,44 +29,46 @@
             </radio-group>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">下单后</view>
-            <radio-group class="tui-input" @change="orderFlowChange">
-              <label class="list" for="orderFlowZj">
-                <radio id="orderFlowZj" value="0" :checked="orderFlow == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">直接完成</span>
-              </label>
-              <label class="list" for="orderFlowFh">
-                <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">需要发货</span>
-              </label>
-            </radio-group>
-          </tui-list-cell>
+          <view style="width:100%;border-top: 2px solid #2bb931;"></view>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">下单选跑腿</view>
+            <view class="tui-title">客户下单</view>
             <radio-group class="tui-input" @change="thirdSendChange">
               <label class="list" for="thirdSendOk">
                 <radio id="thirdSendOk" value="0" :checked="thirdSend == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">允许</span>
+                <span class="checkbox-text">允许选跑腿</span>
               </label>
               <label class="list" for="thirdSendNo">
                 <radio id="thirdSendNo" value="1" :checked="thirdSend == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">不允许</span>
+                <span class="checkbox-text">不能选跑腿</span>
               </label>
             </radio-group>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
             <view class="tui-title">跑腿费用</view>
-            <radio-group class="tui-input" @change="thirdSendFeeChange">
-              <label class="list" for="thirdSendFeeDf">
+            <radio-group class="tui-input" @change="thirdSendFeeChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
+              <label class="list" for="thirdSendFeeDf" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeDf" value="0" :checked="thirdSendFee == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">自理</span>
+                <span class="checkbox-text">客户自理或事后补收</span>
               </label>
-              <label class="list" for="thirdSendFeeZd">
+              <label class="list" for="thirdSendFeeZd" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">预收</span>
+                <span class="checkbox-text">下单时算好，提前收取</span>
+              </label>
+            </radio-group>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">下单后</view>
+            <radio-group class="tui-input" @change="orderFlowChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
+              <label class="list" for="orderFlowZj" style="display: flex; align-items: center; white-space: nowrap;">
+                <radio id="orderFlowZj" value="0" :checked="orderFlow == 0" style="transform:scale(0.7,0.7)" />
+                <span class="checkbox-text">后台不要一键发跑腿（直接完成）</span>
+              </label>
+              <label class="list" for="orderFlowFh" style="display: flex; align-items: center; white-space: nowrap;">
+                <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
+                <span class="checkbox-text">后台需要一键发跑腿（变待发货）</span>
               </label>
             </radio-group>
           </tui-list-cell>

hdApp/src/pagesPurchase/aliPay.vue

@@ -35,9 +35,10 @@
             <view style="margin-top:10upx;font-size:32upx;">支付宝扫此二维码付款</view>
           </view>
           <button class="button-com" @click="savePayCode" style="margin-top:10upx;" :class="[remainPayTime >0 ? 'ali-btn green':'default']" :disabled="remainPayTime > 0 ? false : true">保存二维码</button>
-          <button class="button-com" @click="goDetail" style="margin-top:30upx;" :class="[remainPayTime >0 ? 'ali-btn green':'default']" :disabled="remainPayTime > 0 ? false : true">我已付款成功</button>
+          <button class="button-com" @click="goDetail" style="margin-top:60upx;" :class="[remainPayTime >0 ? 'ali-btn green':'default']" :disabled="remainPayTime > 0 ? false : true">我已付款成功</button>
           <view style="margin-top:25upx;font-size:32upx;text-decoration: underline;" @click="teachPayFn()">不会用支付宝付款？点这里教您</view>
-          <button class="button-com pay-wx" @click="useWxPay()" :class="[remainPayTime >0 ? 'green':'default']" style="margin-top:50upx;" :disabled="remainPayTime > 0 ? false : true">微信付款</button>
+          <!-- 不能把微信支付放出来，不能让他返回微信去支付，会造成订单号变了，支付宝又在付款，付成了会找不到订单 -->
+          <!-- <button class="button-com pay-wx" @click="useWxPay()" :class="[remainPayTime >0 ? 'green':'default']" style="margin-top:50upx;" :disabled="remainPayTime > 0 ? false : true">微信付款</button> -->
         </div>
         <!-- #endif -->
         <!-- #ifdef APP-PLUS -->

hdApp/src/pagesPurchase/gatherAliPay.vue

@@ -27,9 +27,10 @@
                 <view style="margin-top:10upx;font-size:32upx;">支付宝扫此二维码付款</view>
               </view>
               <button class="button-com ali-btn" @click="savePayCode" style="margin-top:20upx;">保存二维码</button>
-              <button class="button-com ali-btn" @click="goDetail" style="margin-top:30upx;">我已付款成功</button>
+              <button class="button-com ali-btn" @click="goDetail" style="margin-top:60upx;">我已付款成功</button>
               <view style="margin-top:25upx;font-size:32upx;text-decoration: underline;" @click="teachPayFn()">不会用支付宝付款？点这里教您</view>
-              <button class="button-com green pay-wx" @click="useWxPay" style="margin-top:60upx;">用微信付款</button>
+              <!-- 不能把微信支付放出来，不能让他返回微信去支付，会造成订单号变了，支付宝又在付款，付成了会找不到订单 -->
+              <!-- <button class="button-com green pay-wx" @click="useWxPay" style="margin-top:60upx;">用微信付款</button> -->
               <!-- #endif -->
             </block>
             <block v-else>