Merge branch 'zhongqi-delivery' of git.huaml.com:zhh/front-end into zhongqi-delivery

ghsApp/src/admin/home/components/OrderItem.vue

@@ -18,7 +18,7 @@
       </view>
       <view class="order-list_info">
         <view class="order-info_box">
-          <view>编号：</view>
+          <view>货号：</view>
           <view>{{ item.sendNum }}</view>
         </view>
         <view class="order-info_box">

ghsApp/src/admin/home/me.vue

@@ -166,7 +166,7 @@
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">跑腿设置</view>
+              <view class="tui-title">绑定跑腿</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/sk' })" class="line-cell" :hover="false" :arrow="true">

ghsApp/src/admin/shop/expressSet.vue

@@ -220,7 +220,7 @@ export default {
   },
   onShow() {
     uni.setNavigationBarTitle({
-      title: `跑腿设置`,
+      title: `绑定跑腿`,
     });
   },
   methods: {

ghsApp/src/admin/shop/sk.vue

@@ -24,11 +24,11 @@
             <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>
@@ -38,7 +38,7 @@
             <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" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
@@ -95,7 +95,7 @@
           <view class="section-title" style="border-top:1upx solid #2bb931;">【花束】跑腿费计算方式</view>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">包配送的</view>
+            <view class="tui-title">包运费的</view>
             <input class="input-field" v-model="hsFreeKm" type="number" placeholder="0" @focus="hsFreeKm = ''" />
             <view>公里内免费配送</view>
           </tui-list-cell>
@@ -109,7 +109,7 @@
             </view>
           </tui-list-cell>
 
-          <view class="warning-text">没有包配送的花束，按实际跑腿费计算</view>
+          <view class="warning-text">没有包运费的花束，按实际跑腿费计算</view>
 
         </view>
 

ghsApp/src/pages.json

@@ -226,7 +226,7 @@
 				{"path": "wl","style": {"navigationBarTitleText": "物流列表"}},
 				{"path": "myShop","style": {"navigationBarTitleText": "我的门店"}},
 				{"path": "renew","style": {"navigationBarTitleText": "续期与购买"}},
-				{"path": "expressSet","style": {"navigationBarTitleText": "跑腿设置"}}
+				{"path": "expressSet","style": {"navigationBarTitleText": "绑定跑腿"}}
 			]
 		},
 		{

ghsApp/src/pagesOrder/detail.vue

@@ -64,9 +64,9 @@
 				</view>
 			</view>
 			<view class="bills-info_box content-box">
-				<view class="order-info_box" v-if="detailInfo.hasNoticeCustom && detailInfo.hasNoticeCustom == 1">
-					<view>通知客户：</view>
-					<view style="color:green;font-weight:bold;">已自动通知</view>
+				<view class="order-info_box">
+					<view>取货号码：</view>
+					<view>{{ detailInfo.sendNum }}</view>
 				</view>
 				<view class="order-info_box">
 					<view>创建日期：</view>
@@ -184,7 +184,6 @@
 					<view>订单状态：</view>
 					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 				</view>
-
 				<view class="order-info_box" v-if="detailInfo.fhType == 1">
 					<view>物流名称：</view>
 					<view>{{ detailInfo.fhWl }}</view>

hdApp/src/admin/home/components/order-item.vue

@@ -7,7 +7,7 @@
 				</view>
 				<image class="scan-icon" v-if="info.repeat == 1 && info.payStatus == 1" :src="`${constant.imgUrl}/gathering/scan.jpg`" mode="aspectFit"></image>
 				<view class="list-msg">
-					<view><text>客户：</text><text>{{info.customName||''}}</text></view>
+					<view><text>货号：</text><text>{{info.sendNum||''}}</text></view>
 					<view style="margin-top:3upx;">
 						<text>{{info.sendType==1?'取花':'配送'}}：</text>
 						<text>

hdApp/src/admin/home/me.vue

@@ -101,7 +101,7 @@
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/delivery/deliveryManage' })" class="line-cell" :hover="false" :arrow="true" >
-              <view class="tui-title">跑腿设置</view>
+              <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>

hdApp/src/admin/home/order.vue

@@ -38,7 +38,7 @@
       <block v-if="!$util.isEmpty(list.data)">
         <view class="list" v-for="(item, index) in list.data" :key="index" @click="$util.pageTo({ url: '/admin/order/detail', query: { id: item.id } })" >
           <view class="list-top flex-center-between" style="border-bottom:1upx solid #EEEEEE;">
-            <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">编号 {{ item.sendNum }}<text v-if="item.bookName!=''" style="margin-left:12upx;">| {{item.bookName}}</text></view>
+            <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">{{ item.customName||'' }}<text v-if="item.bookName!=''" style="margin-left:30upx;color:#866b6b;font-weight: normal;">{{item.bookName}}</text></view>
             <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;padding:5upx 10upx;background-color: red;color:white;" v-if="item.debt == 1">赊账</view>
             <view style="border:1upx solid #0e7ed8;border-radius:18upx;font-size:19upx;color:white;padding:5upx 10upx;background-color: #0e7ed8;" v-if="item.refund == 1">有售后</view>
             <view style="font-size:28upx;" class='app-price app-green' v-if="item.status==2&&item.sendType==1">待取货</view>

hdApp/src/admin/order/detail.vue

@@ -156,6 +156,12 @@
                   @click.stop="callUp(orderInfo.bookMobile)">{{orderInfo.bookMobile}}</text>
               </view>
             </view>
+
+            <view class="msg-list">
+              <view class="label">取货号码：</view>
+              <view class="value"><text class="tag tag--primary">{{ orderInfo.sendNum }}</text></view>
+            </view>
+
           </view>
         </view>
       </view>

hdApp/src/admin/shop/sk.vue

@@ -36,11 +36,11 @@
             <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>
@@ -50,7 +50,7 @@
             <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" style="display: flex; align-items: center; white-space: nowrap;">
                 <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
@@ -107,7 +107,7 @@
           <view class="section-title" style="border-top:1upx solid #2bb931;">【花束】跑腿费计算方式</view>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">包配送的</view>
+            <view class="tui-title">包运费的</view>
             <input class="input-field" v-model="hsFreeKm" type="number" placeholder="0" @focus="hsFreeKm = ''" />
             <view>公里内免费配送</view>
           </tui-list-cell>
@@ -121,7 +121,7 @@
             </view>
           </tui-list-cell>
 
-          <view class="warning-text">没有包配送的花束，按实际跑腿费计算</view>
+          <view class="warning-text">没有包运费的花束，按实际跑腿费计算</view>
 
         </view>
 

hdApp/src/pages.json

@@ -580,7 +580,7 @@
 		{
 			"root": "admin/delivery",
 			"pages": [
-				{ "path": "deliveryManage", "style": { "navigationBarTitleText": "跑腿设置" } },
+				{ "path": "deliveryManage", "style": { "navigationBarTitleText": "绑定跑腿" } },
 				{ "path": "shopDetail", "style": { "navigationBarTitleText": "门店" } },
 				{ "path": "allDelivery", "style": { "navigationBarTitleText": "配送平台报价" } }
 			]

hdApp/src/pagesStore/me/expressSet.vue

@@ -221,7 +221,7 @@ export default {
   },
   onShow() {
     uni.setNavigationBarTitle({
-      title: `跑腿设置`,
+      title: `绑定跑腿`,
     });
   },
   methods: {

mallApp/src/pages/billing/affirmGhs.vue

@@ -71,7 +71,7 @@
 						</view>
 						<view v-if="form.sendType == 2">
 							<view v-if="form.openIntraCity == 0">
-								<text style="color: #3385FF;width:100%;">运费自理或到付（请联系客服）</text>
+								<text style="color: #3385FF;width:100%;font-size:32upx;font-weight:bold;">运费自理或到付（请联系客服）</text>
 							</view>
 							<!-- 跑腿平台报价列表 -->
 							<view v-if="form.openIntraCity == 1 && deliveryQuotes.length > 0" class="delivery-quotes-container">