shish пре 6 месеци
родитељ
комит
e0fb78d7bc

+ 3 - 3
ghsApp/src/admin/billing/affirm.vue

@@ -228,7 +228,7 @@
                 <tui-list-cell class="line-cell" :hover="false" :arrow="false">
                 <tui-list-cell class="line-cell" :hover="false" :arrow="false">
                   <view class="tui-title">配送方式</view>
                   <view class="tui-title">配送方式</view>
                   <button
                   <button
-                    style="margin-right: 6upx; height: 70upx; line-height: 46upx"
+                    style="margin-right: 10upx; height: 70upx; line-height: 46upx"
                     @tap="setSendType(0)"
                     @tap="setSendType(0)"
                     class="admin-button-com mini-btn"
                     class="admin-button-com mini-btn"
                     :class="form.sendType == 0 ? 'blue' : 'default'"
                     :class="form.sendType == 0 ? 'blue' : 'default'"
@@ -236,7 +236,7 @@
                     自配送
                     自配送
                   </button>
                   </button>
                   <button
                   <button
-                    style="margin-right: 6upx; height: 70upx; line-height: 46upx"
+                    style="margin-right: 10upx; height: 70upx; line-height: 46upx"
                     @tap="setSendType(1)"
                     @tap="setSendType(1)"
                     class="admin-button-com mini-btn"
                     class="admin-button-com mini-btn"
                     :class="form.sendType == 1 ? 'blue' : 'default'"
                     :class="form.sendType == 1 ? 'blue' : 'default'"
@@ -244,7 +244,7 @@
                     自取
                     自取
                   </button>
                   </button>
                   <button
                   <button
-                    style="margin-right: 6upx; height: 70upx; line-height: 46upx"
+                    style="margin-right: 10upx; height: 70upx; line-height: 46upx"
                     @click="setSendType(2)"
                     @click="setSendType(2)"
                     class="admin-button-com mini-btn"
                     class="admin-button-com mini-btn"
                     :class="form.sendType == 2 ? 'blue' : 'default'"
                     :class="form.sendType == 2 ? 'blue' : 'default'"

+ 17 - 23
ghsPad/src/pages/home/components/settlePop.vue

@@ -39,25 +39,23 @@
                     <!-- 跑腿平台报价列表 -->
                     <!-- 跑腿平台报价列表 -->
                     <view class="select-item_box" v-if="deliveryQuotes.length > 0">
                     <view class="select-item_box" v-if="deliveryQuotes.length > 0">
                         <!-- <view class="title">选择跑腿</view> -->
                         <!-- <view class="title">选择跑腿</view> -->
-                        <scroll-view scroll-y class="delivery-quotes-scroll">
-                            <view class="delivery-quotes-grid">
-                                <view
-                                  v-for="(item, index) in deliveryQuotes"
-                                  :key="index"
-                                  class="delivery-quote-item"
-                                  :class="{
-                                    'active': selectedDeliveryIndex === index,
-                                    'disabled': !item.isAble,
-                                    'fixed-width': deliveryQuotes.length <= 2
-                                  }"
-                                  @click="selectDelivery(item, index)"
-                                >
-                                  <view class="platform-name">{{ item.displayName || item.name }}</view>
-                                  <view class="platform-price">{{ item.priceText }}元</view>
-                                  <view v-if="item.type" class="platform-type">{{ item.type }}</view>
-                                </view>
+                        <view class="delivery-quotes-grid">
+                            <view
+                              v-for="(item, index) in deliveryQuotes"
+                              :key="index"
+                              class="delivery-quote-item"
+                              :class="{
+                                'active': selectedDeliveryIndex === index,
+                                'disabled': !item.isAble,
+                                'fixed-width': deliveryQuotes.length <= 2
+                              }"
+                              @click="selectDelivery(item, index)"
+                            >
+                              <view class="platform-name">{{ item.displayName || item.name }}</view>
+                              <view class="platform-price">{{ item.priceText }}元</view>
+                              <view v-if="item.type" class="platform-type">{{ item.type }}</view>
                             </view>
                             </view>
-                        </scroll-view>
+                        </view>
                     </view>
                     </view>
                     <view v-else class="empty-quotes-view">
                     <view v-else class="empty-quotes-view">
                       <text style="font-size:12upx;color:red;" v-if="$util.isEmpty(custom.long) || $util.isEmpty(custom.lat) || $util.isEmpty(custom.address)">请先完善客户地址</text>
                       <text style="font-size:12upx;color:red;" v-if="$util.isEmpty(custom.long) || $util.isEmpty(custom.lat) || $util.isEmpty(custom.address)">请先完善客户地址</text>
@@ -948,17 +946,13 @@ export default {
   width: 100%;
   width: 100%;
   margin-top: 5upx;
   margin-top: 5upx;
 }
 }
-.delivery-quotes-scroll {
-  width: 100%;
-  max-height: 210upx;
-  border-bottom: 1upx solid #eee;
-}
 .delivery-quotes-grid {
 .delivery-quotes-grid {
   display: flex;
   display: flex;
   flex-wrap: wrap;
   flex-wrap: wrap;
   padding: 0;
   padding: 0;
   width: 100%;
   width: 100%;
   margin: -2upx;
   margin: -2upx;
+  border-bottom: 1upx solid #eee;
 }
 }
 .delivery-quote-item {
 .delivery-quote-item {
   display: flex;
   display: flex;

+ 3 - 3
hdApp/src/admin/billing/affirm.vue

@@ -143,9 +143,9 @@
 
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">配送方式</view>
             <view class="tui-title">配送方式</view>
-            <button style="margin-right:6upx;height:70upx;line-height:46upx;" @tap="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
-            <button style="margin-right:6upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">自配送</button>
-            <button style="margin-right:6upx;height:70upx;line-height:46upx;" @click="setSendType(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? 'blue' : 'default'">跑腿</button>
+            <button style="margin-right:10upx;height:70upx;line-height:46upx;" @tap="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
+            <button style="margin-right:10upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">自配送</button>
+            <button style="margin-right:10upx;height:70upx;line-height:46upx;" @click="setSendType(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? 'blue' : 'default'">跑腿</button>
             <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="setSendType(3)" class="admin-button-com mini-btn" :class="form.sendType == 3 ? 'blue' : 'default'">物流</button>
             <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="setSendType(3)" class="admin-button-com mini-btn" :class="form.sendType == 3 ? 'blue' : 'default'">物流</button>
           </tui-list-cell>
           </tui-list-cell>
 
 

+ 17 - 23
hdPad/src/pages/home/components/settlePop.vue

@@ -57,25 +57,23 @@
                     <!-- 跑腿平台报价列表 -->
                     <!-- 跑腿平台报价列表 -->
                     <view class="select-item_box" v-if="deliveryQuotes.length > 0">
                     <view class="select-item_box" v-if="deliveryQuotes.length > 0">
                         <!-- <view class="title">选择跑腿</view> -->
                         <!-- <view class="title">选择跑腿</view> -->
-                        <scroll-view scroll-y class="delivery-quotes-scroll">
-                            <view class="delivery-quotes-grid">
-                                <view
-                                  v-for="(item, index) in deliveryQuotes"
-                                  :key="index"
-                                  class="delivery-quote-item"
-                                  :class="{
-                                    'active': selectedDeliveryIndex === index,
-                                    'disabled': !item.isAble,
-                                    'fixed-width': deliveryQuotes.length <= 2
-                                  }"
-                                  @click="selectDelivery(item, index)"
-                                >
-                                  <view class="platform-name">{{ item.displayName || item.name }}</view>
-                                  <view class="platform-price">{{ item.priceText }}元</view>
-                                  <view v-if="item.type" class="platform-type">{{ item.type }}</view>
-                                </view>
+                        <view class="delivery-quotes-grid">
+                            <view
+                              v-for="(item, index) in deliveryQuotes"
+                              :key="index"
+                              class="delivery-quote-item"
+                              :class="{
+                                'active': selectedDeliveryIndex === index,
+                                'disabled': !item.isAble,
+                                'fixed-width': deliveryQuotes.length <= 2
+                              }"
+                              @click="selectDelivery(item, index)"
+                            >
+                              <view class="platform-name">{{ item.displayName || item.name }}</view>
+                              <view class="platform-price">{{ item.priceText }}元</view>
+                              <view v-if="item.type" class="platform-type">{{ item.type }}</view>
                             </view>
                             </view>
-                        </scroll-view>
+                        </view>
                     </view>
                     </view>
                     <view v-else class="empty-quotes-view">
                     <view v-else class="empty-quotes-view">
                       <text style="font-size:12upx;color:red;" v-if="$util.isEmpty(custom.long) || $util.isEmpty(custom.lat) || $util.isEmpty(custom.address)">请先完善客户地址</text>
                       <text style="font-size:12upx;color:red;" v-if="$util.isEmpty(custom.long) || $util.isEmpty(custom.lat) || $util.isEmpty(custom.address)">请先完善客户地址</text>
@@ -1000,17 +998,13 @@ export default {
   width: 100%;
   width: 100%;
   margin-top: 2upx;
   margin-top: 2upx;
 }
 }
-.delivery-quotes-scroll {
-  width: 100%;
-  max-height: 210upx;
-  border-bottom: 1upx solid #eee;
-}
 .delivery-quotes-grid {
 .delivery-quotes-grid {
   display: flex;
   display: flex;
   flex-wrap: wrap;
   flex-wrap: wrap;
   padding: 0;
   padding: 0;
   width: 100%;
   width: 100%;
   margin: -2upx;
   margin: -2upx;
+  border-bottom: 1upx solid #eee;
 }
 }
 .delivery-quote-item {
 .delivery-quote-item {
   display: flex;
   display: flex;