自配送

ghsApp/src/admin/billing/affirm.vue

@@ -244,15 +244,15 @@
                 <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"
+                    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: 16upx; height: 70upx; line-height: 46upx"
+                    style="margin-right: 6upx; height: 70upx; line-height: 46upx"
                     @tap="setSendType(1)"
                     class="admin-button-com mini-btn"
                     :class="form.sendType == 1 ? 'blue' : 'default'"
@@ -260,7 +260,7 @@
                     自取
                   </button>
                   <button
-                    style="margin-right: 16upx; height: 70upx; line-height: 46upx"
+                    style="margin-right: 6upx; height: 70upx; line-height: 46upx"
                     @click="setSendType(2)"
                     class="admin-button-com mini-btn"
                     :class="form.sendType == 2 ? 'blue' : 'default'"
@@ -1642,8 +1642,7 @@ export default {
 }
 
 .delivery-section {
-    border: 1upx solid #80B3FF;
-    box-shadow: 0 0 12upx #6ba3f8;
+    border: 4upx solid #80B3FF;
     margin: 8upx 20upx;
     border-radius: 8upx;
 }

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

@@ -279,7 +279,7 @@ export default {
                 deliveryRemark: ''
             },
             proceeds: '0',
-            sendTypeList:[{name:'自取',id:1},{name:'出车',id:0},{name:'跑腿',id:2}],
+            sendTypeList:[{name:'自取',id:1},{name:'自配送',id:0},{name:'跑腿',id:2}],
             hasPayList:[{ name:'扫码', id:0, },{ name:'赊账', id:2, },{ name:'线下', id:1, }],
             payWayList:[{ name:'线下微信', id:0 }, { name:'线下支付宝', id:1 },{ name:'现金', id:4 },{name:'银行卡',id:5}],
             currentInputType:'proceeds',

hdApp/src/admin/billing/affirm.vue

@@ -143,9 +143,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;" @tap="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
-            <button style="margin-right:16upx;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:16upx;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: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: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>
 
@@ -1900,8 +1900,7 @@ export default {
 }
 
 .delivery-section {
-    border: 1upx solid #2ECE7E;
-    box-shadow: 0 0 12upx #09C567;
+    border: 4upx solid #2ECE7E;
     margin: 8upx 20upx;
     border-radius: 8upx;
 }

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

@@ -286,7 +286,7 @@ export default {
             currentInputType:'proceeds',
             totalMoney: 0,
             needPrintList:[ { name:'不需要', id:2 },{ name:'需要', id:1 } ],
-            sendTypeList:[ { name:'自取', id:1 },{ name:'配送', id:0 },{ name:'跑腿', id:2},{ name:'物流', id:3}],
+            sendTypeList:[ { name:'自取', id:1 },{ name:'自配送', id:0 },{ name:'跑腿', id:2},{ name:'物流', id:3}],
             getGoodsList:[{name:'已取货',id:1},{name:'未取货',id:0}],
             getStaffList:[],
             shopAdminIdList:[],