Merge branch 'zhongqi-quickOrder' of git.huaml.com:zhh/front-end into zhongqi-quickOrder

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'"
@@ -336,7 +336,7 @@
                   <tui-list-cell class="line-cell" :hover="false" :arrow="false">
                     <view class="tui-title title-reduction">满减规则</view>
                     <button @tap="form.reductionRule = 0" class="admin-button-com mini-btn btn-reduction" :class="form.reductionRule == 0 ? 'active' : 'default'">没有满减</button>
-                    <button @tap="form.reductionRule = 1" class="admin-button-com mini-btn btn-reduction" :class="form.reductionRule == 1 ? 'active' : 'default'">用花材</button>
+                    <button @tap="form.reductionRule = 1" class="admin-button-com mini-btn btn-reduction" :class="form.reductionRule == 1 ? 'active' : 'default'">花材满减</button>
                   </tui-list-cell>
                   <tui-list-cell class="line-cell" :hover="false" :arrow="false">
                     <view class="tui-title">运费</view>
@@ -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/deliveryPop.vue

@@ -300,9 +300,12 @@ export default {
 <style lang="scss" scoped>
 .delivery-pop {
     width: 300upx;
+    height: 99vh;
     background: #fff;
     border-radius: 5upx;
     overflow: hidden;
+    display: flex;
+    flex-direction: column;
     
     .delivery-pop-title {
         display: flex;
@@ -313,6 +316,7 @@ export default {
         font-weight: bold;
         border-bottom: 1rpx solid #eee;
         position: relative;
+        flex-shrink: 0;
         
         .close-icon {
             position: absolute;
@@ -320,13 +324,15 @@ export default {
             font-size: 16upx;
             color: #999;
             padding: 0 5upx;
+            cursor: pointer;
         }
     }
     
     .delivery-body {
         padding: 10upx;
-        max-height: 70vh;
+        flex: 1;
         overflow-y: auto;
+        min-height: 0; // 重要：确保scroll能正常工作
     }
     
     .select-item_box {
@@ -342,6 +348,7 @@ export default {
                 width: 70upx;
                 font-size: 12upx;
                 color: #333;
+                flex-shrink: 0;
             }
             
             .address-box {
@@ -371,6 +378,7 @@ export default {
             .title {
                 font-size: 12upx;
                 color: #333;
+                flex-shrink: 0;
                 
                 .required {
                     color: red;
@@ -437,6 +445,8 @@ export default {
         align-items: center;
         justify-content: center;
         box-sizing: border-box;
+        cursor: pointer;
+        transition: all 0.2s ease;
         
         &.active {
             background: #e6f7ff;
@@ -453,6 +463,7 @@ export default {
         &.disabled {
             background: #f5f5f5;
             opacity: 0.6;
+            cursor: not-allowed;
             
              .platform-name, .platform-price, .platform-type {
                  color: #999;
@@ -483,13 +494,15 @@ export default {
     .delivery-footer {
         display: flex;
         border-top: 1rpx solid #eee;
+        flex-shrink: 0;
+        background: #fff;
         
         button {
             flex: 1;
             border-radius: 0;
-            font-size: 13upx;
-            height: 50upx;
-            line-height: 50upx;
+            font-size: 15upx;
+            height: 40upx;
+            line-height: 40upx;
             
             &::after {
                 border: none;
@@ -498,6 +511,7 @@ export default {
             &.btn-cancel {
                 background: #fff;
                 color: #666;
+                border-right: 1rpx solid #eee;
             }
             
             &.btn-confirm {

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>
 
@@ -206,9 +206,9 @@
               </tui-list-cell>
               <tui-list-cell class="line-cell" :hover="false" :arrow="false">
                 <view class="tui-title title-reduction" style="width: 150upx;">满减规则</view>
-                <button @tap="changeReductionRule(0)" class="admin-button-com mini-btn btn-reduction" :class="form.reductionRule == 0 ? 'active' : 'default'">没有满减</button>
-                <button @tap="changeReductionRule(1)" class="admin-button-com mini-btn btn-reduction" :class="form.reductionRule == 1 ? 'active' : 'default'">用花材</button>
-                <button @tap="changeReductionRule(2)" class="admin-button-com mini-btn btn-reduction-last" :class="form.reductionRule == 2 ? 'active' : 'default'">用花束</button>
+                <button @tap="changeReductionRule(0)" class="admin-button-com mini-btn btn-reduction" :class="form.reductionRule == 0 ? 'active' : 'default'">没有</button>
+                <button @tap="changeReductionRule(1)" class="admin-button-com mini-btn btn-reduction" :class="form.reductionRule == 1 ? 'active' : 'default'">花材满减</button>
+                <button @tap="changeReductionRule(2)" class="admin-button-com mini-btn btn-reduction-last" :class="form.reductionRule == 2 ? 'active' : 'default'">花束满减</button>
               </tui-list-cell>
               <tui-list-cell class="line-cell" :hover="false" :arrow="false">
                 <view class="tui-title">运费</view>
@@ -1896,8 +1896,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/deliveryPop.vue

@@ -304,9 +304,12 @@ export default {
 <style lang="scss" scoped>
 .delivery-pop {
   width: 300upx;
+  height: 99vh;
   background: #fff;
   border-radius: 5upx;
   overflow: hidden;
+  display: flex;
+  flex-direction: column;
 
   .delivery-pop-title {
     display: flex;
@@ -317,6 +320,7 @@ export default {
     font-weight: bold;
     border-bottom: 1rpx solid #eee;
     position: relative;
+    flex-shrink: 0;
 
     .close-icon {
       position: absolute;
@@ -324,13 +328,15 @@ export default {
       font-size: 16upx;
       color: #999;
       padding: 0 5upx;
+      cursor: pointer;
     }
   }
 
   .delivery-body {
     padding: 10upx;
-    max-height: 70vh;
+    flex: 1;
     overflow-y: auto;
+    min-height: 0;
   }
 
   .select-item_box {
@@ -346,6 +352,7 @@ export default {
         width: 70upx;
         font-size: 12upx;
         color: #333;
+        flex-shrink: 0;
       }
 
       .address-box {
@@ -375,6 +382,7 @@ export default {
       .title {
         font-size: 12upx;
         color: #333;
+        flex-shrink: 0;
 
         .required {
           color: red;
@@ -395,7 +403,7 @@ export default {
         }
 
         .blue-text {
-          color: #3385ff;
+          color: #09c567;
           font-size: 12upx;
         }
 
@@ -441,6 +449,8 @@ export default {
     align-items: center;
     justify-content: center;
     box-sizing: border-box;
+    cursor: pointer;
+    transition: all 0.2s ease;
 
     &.active {
       background: rgba(4, 158, 44, 0.05);
@@ -458,6 +468,7 @@ export default {
     &.disabled {
       background: #f5f5f5;
       opacity: 0.6;
+      cursor: not-allowed;
 
       .platform-name,
       .platform-price,
@@ -490,13 +501,15 @@ export default {
   .delivery-footer {
     display: flex;
     border-top: 1rpx solid #eee;
+    flex-shrink: 0;
+    background: #fff;
 
     button {
       flex: 1;
       border-radius: 0;
-      font-size: 13upx;
-      height: 50upx;
-      line-height: 50upx;
+      font-size: 15upx;
+      height: 40upx;
+      line-height: 40upx;
 
       &::after {
         border: none;
@@ -505,6 +518,7 @@ export default {
       &.btn-cancel {
         background: #fff;
         color: #666;
+        border-right: 1rpx solid #eee;
       }
 
       &.btn-confirm {

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

@@ -104,8 +104,8 @@
                         <view class="title">满减规则</view>
                         <view class="item-list_box">
                             <view @tap="changeReductionRule(0)" :class="[form.reductionRule == 0 ? 'active' : '']">没有满减</view>
-                            <view @tap="changeReductionRule(1)" :class="[form.reductionRule == 1 ? 'active' : '']">用花材</view>
-                            <view @tap="changeReductionRule(2)" :class="[form.reductionRule == 2 ? 'active' : '']">用花束</view>
+                            <view @tap="changeReductionRule(1)" :class="[form.reductionRule == 1 ? 'active' : '']">花材满减</view>
+                            <view @tap="changeReductionRule(2)" :class="[form.reductionRule == 2 ? 'active' : '']">花束满减</view>
                         </view>
                     </view>
 
@@ -287,7 +287,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:[],