fix conflicts

ghsPad/src/components/TimePicker.vue

@@ -43,7 +43,7 @@ export default {
       days: [],
       hours: [],
       minutes: [],
-      indicatorStyle: `height: 70rpx;`,
+      indicatorStyle: `height: 70upx;`,
     };
   },
   created() {
@@ -239,9 +239,9 @@ export default {
 <style lang="scss" scoped>
 .time-picker-container {
   background-color: #fff;
-  border-radius: 20rpx;
-  width: 300rpx;
-  height: 400rpx;
+  border-radius: 20upx;
+  width: 300upx;
+  height: 400upx;
   display: flex;
   flex-direction: column;
   overflow: hidden;
@@ -249,44 +249,45 @@ export default {
 .picker-header {
   position: relative;
   text-align: center;
-  padding: 20rpx;
+  padding: 20upx;
   flex-shrink: 0;
 
   .title {
-    font-size: 26rpx;
+    font-size: 26upx;
     font-weight: 350;
   }
 
   .close-btn {
     position: absolute;
-    right: 24rpx;
+    right: 24upx;
     top: 50%;
     transform: translateY(-50%);
-    padding: 10rpx;
+    padding: 10upx;
   }
 }
 .picker-view {
   width: 100%;
-  height: 100%;
+  flex: 1;
+  overflow: hidden;
 }
 .picker-item {
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 22rpx;
+  font-size: 22upx;
 }
 .confirm-button-wrapper {
-  padding: 15rpx 20rpx;
-  padding-bottom: 25rpx;
+  padding: 15upx 20upx;
+  padding-bottom: 25upx;
   flex-shrink: 0;
 }
 .confirm-btn {
   background: linear-gradient(to right, #409eff, #67c2ff);
   color: white;
-  border-radius: 50rpx;
-  font-size: 24rpx;
-  height: 50rpx;
-  line-height: 50rpx;
+  border-radius: 50upx;
+  font-size: 24upx;
+  height: 50upx;
+  line-height: 50upx;
   border: none;
   &::after {
     border: none;

ghsPad/src/pages/home/components/deliveryPop.vue

@@ -11,7 +11,7 @@
                 <view class="title">客户地址</view>
                 <view class="address-box">
                     <view v-if="$util.isEmpty(custom.long) || $util.isEmpty(custom.lat) || $util.isEmpty(custom.address)" class="addr-main" style="color: red; font-size: 10upx;">
-                        客户地址不完善，请修改
+                        地址不完整，请修改
                     </view>
                     <view v-else>
                         <view class="addr-main">{{ custom.address }}</view>

ghsPad/src/pages/home/components/settlePop.vue

@@ -19,11 +19,11 @@
             <view class="select-item_box" v-if="form.sendType == 2">
                 <view v-if="openIntraCity == 1" class="delivery-section">
                     <!-- 客户地址 -->
-                    <view class="select-item_box" style="display: flex; align-items: center; border-bottom:1upx solid #eee; margin-bottom:3upx;">
+                    <view class="select-item_box" style="display: flex; align-items: center; border-bottom:1upx solid #eee; margin-bottom:5upx;padding-bottom:5upx;">
                         <view class="title">客户地址</view>
                         <view class="address-box">
-                            <view v-if="$util.isEmpty(custom.long) || $util.isEmpty(custom.lat) || $util.isEmpty(custom.address)" class="addr-main" style="color: red; font-size: 11upx;">
-                                客户地址不完善，请修改
+                            <view v-if="$util.isEmpty(custom.long) || $util.isEmpty(custom.lat) || $util.isEmpty(custom.address)" class="addr-main" style="color: red; font-size: 14upx;font-weight:bold;">
+                                地址不完整，请用手机修改
                             </view>
                             <view v-else>
                                 <view class="addr-main">{{ custom.address }}</view>
@@ -85,7 +85,7 @@
                         <view class="title">满减规则</view>
                         <view class="item-list_box">
                             <view @tap="form.reductionRule = 0" :class="[form.reductionRule == 0 ? 'active' : '']">没有满减</view>
-                            <view @tap="form.reductionRule = 1" :class="[form.reductionRule == 1 ? 'active' : '']">用花材</view>
+                            <view @tap="form.reductionRule = 1" :class="[form.reductionRule == 1 ? 'active' : '']">花材满减</view>
                         </view>
                     </view>
 
@@ -716,13 +716,12 @@ export default {
         getDeliveryQuotes() {
             console.log('getDeliveryQuotes', Number(this.customId));
             if(Number(this.customId) === 0){
-                this.$msg('请先选择客户');
+                //this.$msg('请先选择客户')
                 return false;
             }
-
             //客户地址不完善
             if (this.isAddressInvalid) {
-                this.$msg('客户地址不完善，无法发跑腿');
+                //this.$msg('客户地址不完善，无法发跑腿')
                 return false;
             }
 
@@ -809,7 +808,7 @@ export default {
 .app-select_customer {
     background-color: #ffffff;
     display: flex;
-    width:80vw;
+    width:92vw;
     height: 99vh;
     .select-left {
         flex: 1;
@@ -863,10 +862,26 @@ export default {
                     margin: 0 3upx 3upx 0;
                     color: #333333;
                     border-radius: 3upx;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
                     &.active {
                         background-color: #3385FF;
                         color: #ffffff;
                     }
+                    /* 输入框样式 */
+                    input {
+                        width: 100%;
+                        height: 32upx;
+                        line-height: 32upx;
+                        font-size: 13upx;
+                        border: none;
+                        background: transparent;
+                        color: #333333;
+                        text-align: center;
+                        padding: 0;
+                        margin: 0;
+                    }
                 }
             }
         }
@@ -1015,8 +1030,7 @@ export default {
 }
 
 .delivery-section {
-    border: 1px solid #80B3FF;
-    box-shadow: 0 0 8upx #80B3FF;
+    border: 3px solid #80B3FF;
     margin: 5upx 0;
     border-radius: 4upx;
     padding: 5upx;
@@ -1043,11 +1057,11 @@ export default {
     justify-content: center;
     align-items: center;
     .addr-main {
-        font-size: 10upx;
+        font-size: 13upx;
         color: #333;
     }
     .addr-sub {
-        font-size: 8upx;
+        font-size:11upx;
         color: #999;
         margin-top: 2upx;
     }

hdPad/src/components/TimePicker.vue

@@ -43,7 +43,7 @@ export default {
       days: [],
       hours: [],
       minutes: [],
-      indicatorStyle: `height: 70rpx;`,
+      indicatorStyle: `height: 70upx;`,
     };
   },
   created() {
@@ -239,9 +239,9 @@ export default {
 <style lang="scss" scoped>
 .time-picker-container {
   background-color: #fff;
-  border-radius: 20rpx;
-  width: 300rpx;
-  height: 400rpx;
+  border-radius: 20upx;
+  width: 300upx;
+  height: 400upx;
   display: flex;
   flex-direction: column;
   overflow: hidden;
@@ -249,44 +249,45 @@ export default {
 .picker-header {
   position: relative;
   text-align: center;
-  padding: 20rpx;
+  padding: 20upx;
   flex-shrink: 0;
 
   .title {
-    font-size: 26rpx;
+    font-size: 24upx;
     font-weight: 350;
   }
 
   .close-btn {
     position: absolute;
-    right: 24rpx;
+    right: 24upx;
     top: 50%;
     transform: translateY(-50%);
-    padding: 10rpx;
+    padding: 10upx;
   }
 }
 .picker-view {
   width: 100%;
-  height: 100%;
+  flex: 1;
+  overflow: hidden;
 }
 .picker-item {
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 22rpx;
+  font-size: 22upx;
 }
 .confirm-button-wrapper {
-  padding: 15rpx 20rpx;
-  padding-bottom: 25rpx;
+  padding: 15upx 20upx;
+  padding-bottom: 25upx;
   flex-shrink: 0;
 }
 .confirm-btn {
   background: linear-gradient(to right, #409eff, #67c2ff);
   color: white;
-  border-radius: 50rpx;
-  font-size: 24rpx;
-  height: 50rpx;
-  line-height: 50rpx;
+  border-radius: 50upx;
+  font-size: 24upx;
+  height: 50upx;
+  line-height: 50upx;
   border: none;
   &::after {
     border: none;

hdPad/src/pages/home/components/settlePop.vue

@@ -38,11 +38,11 @@
             <view class="select-item_box" v-if="form.sendType == 2">
                 <view v-if="openIntraCity == 1" class="delivery-section">
                     <!-- 客户地址 -->
-                    <view class="select-item_box" style="display: flex; align-items: center; border-bottom:1upx solid #eee; margin-bottom:3upx;">
+                    <view class="select-item_box" style="display: flex; align-items: center; border-bottom:1upx solid #eee; margin-bottom:5upx;padding-bottom:5upx;">
                         <view class="title">客户地址</view>
                         <view class="address-box">
-                            <view v-if="$util.isEmpty(custom.long) || $util.isEmpty(custom.lat) || $util.isEmpty(custom.address)" class="addr-main" style="color: red; font-size: 11upx;">
-                                客户地址不完善，请修改
+                            <view v-if="$util.isEmpty(custom.long) || $util.isEmpty(custom.lat) || $util.isEmpty(custom.address)" class="addr-main" style="color: red; font-size: 14upx;font-weight:bold;">
+                                地址不完整，请用手机修改
                             </view>
                             <view v-else>
                                 <view class="addr-main">{{ custom.address }}</view>
@@ -142,7 +142,7 @@
                     </view>
                 </view>
             </view>
-            <view class="select-item_box" v-if="form.sendType == 1" style="border:1upx solid #CCCCCC;">
+            <view class="select-item_box" v-if="form.sendType == 1" style="border:2upx solid #2ECE7E;border-radius:4upx;padding:5upx;">
                 <view class="title" style="margin-top:8upx;">取货状态</view>
                 <view class="item-list_box">
                     <view :key="item.id" @tap="changeGetGoods(item.id)" v-for="item in getGoodsList" :class="[form.getGoods===item.id?'active':'']"> {{item.name}} </view>     
@@ -650,11 +650,11 @@ export default {
         getDeliveryQuotes() {
             console.log('getDeliveryQuotes', Number(this.customId));
             if(Number(this.customId) === 0){
-                this.$msg('请先选择客户');
+                //this.$msg('请先选择客户');
                 return false;
             }
             if (this.isAddressInvalid) {
-                this.$msg('客户地址不完善，无法发跑腿');
+                //this.$msg('客户地址不完善，无法发跑腿');
                 return false;
             }
 
@@ -863,7 +863,7 @@ export default {
 .app-select_customer {
     background-color: #ffffff;
     display: flex;
-    width:90vw;
+    width:92vw;
     height: 99vh;
     .select-left {
         flex: 4;
@@ -918,10 +918,26 @@ export default {
                     margin: 0 3upx 3upx 0;
                     color: #333333;
                     border-radius: 3upx;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
                     &.active {
                         background-color: #09C567;
                         color: #ffffff;
                     }
+                    /* 输入框样式 */
+                    input {
+                        width: 100%;
+                        height: 32upx;
+                        line-height: 32upx;
+                        font-size: 13upx;
+                        border: none;
+                        background: transparent;
+                        color: #333333;
+                        text-align: center;
+                        padding: 0;
+                        margin: 0;
+                    }
                 }
             }
         }
@@ -1070,8 +1086,7 @@ export default {
 }
 
 .delivery-section {
-    border: 1px solid #2ECE7E;
-    box-shadow: 0 0 8upx #2ECE7E;
+    border: 3px solid #2ECE7E;
     margin: 5upx 0;
     border-radius: 4upx;
     padding: 5upx;
@@ -1098,11 +1113,11 @@ export default {
     justify-content: center;
     align-items: center;
     .addr-main {
-        font-size: 10upx;
+        font-size: 13upx;
         color: #333;
     }
     .addr-sub {
-        font-size: 8upx;
+        font-size: 11upx;
         color: #999;
         margin-top: 2upx;
     }