开单优化

ghsApp/src/admin/billing/affirm.vue

@@ -153,25 +153,9 @@
 
               <tui-list-cell class="line-cell" :hover="false" :arrow="false">
                 <view class="tui-title">收款方式</view>
-                <button
-                  @click="form.hasPay = 2"
-                  class="admin-button-com big"
-                  :class="form.hasPay == 2 ? 'blue' : 'default'"
-                  style="margin-right: 16upx"
-                >
-                  赊账
-                </button>
-                <button
-                  @click="form.hasPay = 0"
-                  class="admin-button-com big"
-                  :class="form.hasPay == 0 ? 'blue' : 'default'"
-                  style="margin-right: 16upx"
-                >
-                  扫码分享
-                </button>
-                <button @tap="form.hasPay = 1" class="admin-button-com big" :class="form.hasPay == 1 ? 'blue' : 'default'" style="margin-right: 0upx">
-                  线下
-                </button>
+                <button @click="form.hasPay = 2" class="admin-button-com big" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-right: 24upx" > 赊账 </button>
+                <button @click="form.hasPay = 0" class="admin-button-com big" :class="form.hasPay == 0 ? 'blue' : 'default'" style="margin-right: 24upx" > 待付款 </button>
+                <button @tap="form.hasPay = 1" class="admin-button-com big" :class="form.hasPay == 1 ? 'blue' : 'default'" style="margin-right: 0upx">线下</button>
               </tui-list-cell>
 
               <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">
@@ -289,8 +273,8 @@
                   <tui-list-cell class="line-cell" :hover="false" :arrow="true"  @click.stop="updateCustomAddress()">
                     <view class="tui-title" style="width: 120upx">客户地址</view>
                     <view class="address-box">
-                      <view v-if="$util.isEmpty(customInfo.long) || $util.isEmpty(customInfo.lat) || $util.isEmpty(customInfo.address)" class="addr-main" style="color: red; font-size: 28rpx;">
-                        客户地址不完善，请修改
+                      <view v-if="$util.isEmpty(customInfo.long) || $util.isEmpty(customInfo.lat) || $util.isEmpty(customInfo.address)" class="addr-main" style="color: red; font-size: 29upx;font-weight:bold;">
+                        地址不完善，请修改
                       </view>
                       <view v-else>
                         <view class="addr-main">{{ customInfo.address }}</view>
@@ -322,8 +306,8 @@
                       </scroll-view>
                     </view>
                     <view v-else class="empty-quotes-view">
-                      <text v-if="$util.isEmpty(customInfo.long) || $util.isEmpty(customInfo.lat) || $util.isEmpty(customInfo.address)" @click.stop="updateCustomAddress()">请先修改客户地址</text>
-                      <text>正在获取运费...</text>
+                      <text v-if="$util.isEmpty(customInfo.long) || $util.isEmpty(customInfo.lat) || $util.isEmpty(customInfo.address)" style="color:red;" @click.stop="updateCustomAddress()">请先修改客户地址</text>
+                      <text v-else>正在获取运费...</text>
                     </view>
                   </tui-list-cell>
                   <tui-list-cell class="line-cell" :hover="false">
@@ -1008,7 +992,7 @@ export default {
       }
       let name = '确认提交';
       if (this.form.hasPay == 0) {
-        name = '确认扫码分享？';
+        name = '确认待付款？';
       } else if (this.form.hasPay == 1) {
         name = '确认线下已付？';
       } else if (this.form.hasPay == 2) {
@@ -1069,7 +1053,7 @@ export default {
       }
 
       if(this.form.sendType == 2 && this.form.callErrand == 1 && this.form.hasPay == 0){
-        this.$msg('扫码收款，暂不支持马上发跑腿')
+        this.$msg('待付款，暂不支持马上发跑腿')
         return false
       }
 
@@ -1177,7 +1161,6 @@ export default {
     getDeliveryQuotes() {
       //如果客户地址缺少经度、纬度和address，任何一个，则不要请求后端询价接口
       if (this.$util.isEmpty(this.customInfo.long) || this.$util.isEmpty(this.customInfo.lat) || this.$util.isEmpty(this.customInfo.address)) {
-        this.$msg('客户地址缺少经纬度或地址，无法获取运费', 'none', 2200);
         return;
       }
       
@@ -1574,8 +1557,8 @@ export default {
   
   // 当只有1-2项时使用固定宽度
   &.fixed-width {
-    flex: 0 0 220rpx;
-    width: 220rpx;
+    flex: 0 0 220upx;
+    width: 220upx;
   }
   
   .platform-name {

hdApp/src/admin/billing/affirm.vue

@@ -124,9 +124,9 @@
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 						<view class="tui-title">收款方式</view>
-            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="form.hasPay = 0" class="admin-button-com mini-btn" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码</button>
-            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="form.hasPay = 4" class="admin-button-com mini-btn" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
-            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
+            <button style="margin-right:6upx;height:70upx;line-height:46upx;" @click="form.hasPay = 0" class="admin-button-com mini-btn" :class="form.hasPay == 0 ? 'blue' : 'default'">待付款</button>
+            <button style="margin-right:6upx;height:70upx;line-height:46upx;" @click="form.hasPay = 4" class="admin-button-com mini-btn" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
+            <button style="margin-right:6upx;height:70upx;line-height:46upx;" @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
             <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="form.hasPay = 2" class="admin-button-com mini-btn" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
 					</tui-list-cell>
 
@@ -159,9 +159,9 @@
             <view v-if="openIntraCity == 1" class="delivery-section">
               <!-- 客户地址信息 -->
               <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click.stop="updateCustomAddress()">
-                <view class="tui-title" style="width:120rpx;">客户地址</view>
+                <view class="tui-title" style="width:120upx;">客户地址</view>
                 <view class="address-box">
-                      <view v-if="$util.isEmpty(customInfo.long) || $util.isEmpty(customInfo.lat) || $util.isEmpty(customInfo.address)" class="addr-main" style="color: red; font-size: 29rpx;font-weight:bold;">
+                      <view v-if="$util.isEmpty(customInfo.long) || $util.isEmpty(customInfo.lat) || $util.isEmpty(customInfo.address)" class="addr-main" style="color:red;font-size:29upx;font-weight:bold;">
                         地址不完整，请修改
                       </view>
                       <view v-else>
@@ -1001,7 +1001,7 @@ export default {
       let self = this;
       let name = '确认提交'
       if(this.form.hasPay == 0){
-        name = '确认扫码付？'
+        name = '确认待付款？'
       }else if(this.form.hasPay == 1){
         name = '确认线下付款？'
         if(this.form.forward == 1){
@@ -1058,7 +1058,7 @@ export default {
         }
       }
       if(this.form.sendType == 2 && this.form.callErrand == 1 && this.form.hasPay == 0){
-        this.$msg('扫码收款，暂不支持马上发跑腿')
+        this.$msg('待付款，暂不支持马上发跑腿')
         return false
       }
 
@@ -1754,8 +1754,8 @@ export default {
 	
 	// 当只有1-2项时使用固定宽度
 	&.fixed-width {
-		flex: 0 0 220rpx;
-		width: 220rpx;
+		flex: 0 0 220upx;
+		width: 220upx;
 	}
 	
 	.platform-name {