shish 6 tháng trước cách đây
mục cha
commit
b2b3e83d35

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

@@ -341,9 +341,10 @@
                     </view>
                   </tui-list-cell>
                   <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-                    <view class="tui-title">呼叫跑腿</view>
-                    <button @tap="form.callErrand = 0" class="admin-button-com middle btn-call" :class="form.callErrand == 0? 'active' : 'default'">先不要叫</button>
-                    <button @tap="form.callErrand = 1" class="admin-button-com middle btn-call" :class="form.callErrand == 1 ? 'active' : 'default'">现在就叫</button>
+                    <view class="checkbox-row-call" @tap="form.callErrand = form.callErrand == 1 ? 0 : 1">
+                      <checkbox value="1" :checked="form.callErrand == 1" class="checkbox-input" />
+                      <text class="checkbox-label">开单后直接叫跑腿</text>
+                    </view>
                   </tui-list-cell>
                   <tui-list-cell v-if="form.callErrand == 1" class="line-cell" :hover="false" :arrow="false">
                     <view class="tui-title">取件时间</view>
@@ -1307,6 +1308,20 @@ export default {
 .admin-button-com {
   margin-right: 30upx;
 }
+.checkbox-row-call {
+  display: flex;
+  align-items: center;
+  padding: 20upx 0;
+  cursor: pointer;
+  .checkbox-input {
+    margin-right: 4upx;
+  }
+  .checkbox-label {
+    font-size: 38upx;
+    color: #333333;
+    line-height: 28upx;
+  }
+}
 .affirm-page {
   position: relative;
   height: 100%;

+ 18 - 5
ghsPad/src/pages/home/components/settlePop.vue

@@ -93,17 +93,16 @@
                     </view>
 
                     <view class="select-item_box">
-                        <view class="title">呼叫跑腿</view>
-                        <view class="item-list_box">
-                            <view @tap="form.callErrand = 0" :class="[form.callErrand == 0 ? 'active' : '']">先不要叫</view>
-                            <view @tap="form.callErrand = 1" :class="[form.callErrand == 1 ? 'active' : '']">现在就叫</view>
+                        <view class="checkbox-row" @tap="form.callErrand = form.callErrand == 1 ? 0 : 1">
+                            <checkbox value="1" :checked="form.callErrand == 1" class="checkbox-input" />
+                            <text class="checkbox-label">开单后直接叫跑腿</text>
                         </view>
                     </view>
 
                     <view class="select-item_box" v-if="form.callErrand == 1">
                         <view class="title">取件时间</view>
                         <view class="item-list_box" @click.stop="openTimePicker">
-                            <text class="blue-text" style="font-size:12upx;">{{ pickupTime.label || '立即取件' }}</text>
+                            <text class="blue-text" style="font-size:14upx;">{{ pickupTime.label || '立即取件' }}</text>
                         </view>
                     </view>
 
@@ -891,6 +890,20 @@ export default {
                     }
                 }
             }
+            & .checkbox-row {
+                display: flex;
+                align-items: center;
+                padding: 6upx 0;
+                cursor: pointer;
+                .checkbox-input {
+                    margin-right:2upx;
+                }
+                .checkbox-label {
+                    font-size: 14upx;
+                    color: #333333;
+                    line-height: 24upx;
+                }
+            }
         }
     }
     & .line {

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

@@ -242,9 +242,10 @@
                 </view>
               </tui-list-cell>
               <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-                <view class="tui-title">呼叫跑腿</view>
-                <button @tap="form.callErrand = 0" class="admin-button-com middle btn-call" :class="form.callErrand == 0? 'active' : 'default'">先不要叫</button>
-                <button @tap="form.callErrand = 1" class="admin-button-com middle btn-call" :class="form.callErrand == 1 ? 'active' : 'default'">现在就叫</button>
+                <view class="checkbox-row-call" @tap="form.callErrand = form.callErrand == 1 ? 0 : 1">
+                  <checkbox value="1" :checked="form.callErrand == 1" class="checkbox-input" />
+                  <text class="checkbox-label">开单后直接叫跑腿</text>
+                </view>
               </tui-list-cell>
               <tui-list-cell v-if="form.callErrand == 1" class="line-cell" :hover="false" :arrow="false">
                 <view class="tui-title">取件时间</view>
@@ -1338,6 +1339,20 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.checkbox-row-call {
+  display: flex;
+  align-items: center;
+  padding: 20upx 0;
+  cursor: pointer;
+  .checkbox-input {
+    margin-right:4upx;
+  }
+  .checkbox-label {
+    font-size: 38upx;
+    color: #333333;
+    line-height: 28upx;
+  }
+}
 .discount-quick-btn {
     width: 120upx;
     height: 120upx;

+ 21 - 6
hdPad/src/pages/home/components/settlePop.vue

@@ -112,18 +112,19 @@
                     </view>
 
                     <view class="select-item_box">
-                        <view class="title">呼叫跑腿</view>
-                        <view class="item-list_box">
-                            <view @tap="form.callErrand = 0" :class="[form.callErrand == 0 ? 'active' : '']">先不要叫</view>
-                            <view @tap="form.callErrand = 1" :class="[form.callErrand == 1 ? 'active' : '']">现在就叫</view>
+                        <view class="checkbox-row" @tap="form.callErrand = form.callErrand == 1 ? 0 : 1">
+                            <checkbox value="1" :checked="form.callErrand == 1" class="checkbox-input" />
+                            <text class="checkbox-label">开单后直接叫跑腿</text>
                         </view>
                     </view>
 
                     <view class="select-item_box" v-if="form.callErrand == 1">
-                        <view class="title" @click.stop="openTimePicker">
-                            取件时间:<text class="blue-text">{{ pickupTime.label || '立即取件' }}</text>
+                        <view class="title">取件时间</view>
+                        <view class="item-list_box" @click.stop="openTimePicker">
+                            <text class="blue-text" style="font-size:14upx;">{{ pickupTime.label || '立即取件' }}</text>
                         </view>
                     </view>
+
                     <view class="select-item_box" style="padding:12upx 0;" v-if="form.callErrand == 1">
                         <view class="title" style="display:flex;align-items:center;">重量:<WeightInput v-model="form.weight" style="margin-left:2upx;" /></view>
                     </view>
@@ -1038,6 +1039,20 @@ export default {
                     }
                 }
             }
+            & .checkbox-row {
+                display: flex;
+                align-items: center;
+                padding: 6upx 0;
+                cursor: pointer;
+                .checkbox-input {
+                    margin-right:2upx;
+                }
+                .checkbox-label {
+                    font-size: 14upx;
+                    color: #333333;
+                    line-height: 24upx;
+                }
+            }
         }
     }
     & .line {