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

ghsApp/src/admin/billing/index.vue

@@ -344,7 +344,7 @@ export default {
 		}
 	}
 	.right-box {
-		height: calc(100vh - 140upx);
+		height: calc(100vh - 140upx - 120upx);
 		flex: 1;
 		box-sizing: border-box;
 	}

ghsApp/src/admin/billing/index2.vue

@@ -314,10 +314,9 @@ export default {
 	}
 	.item_list_bx {
 		padding: 40upx 16upx;
-		//padding: 0 16upx;
-    &:last-child{
-      margin-bottom: 140upx; /* 增加底部边距，确保不被购物车遮挡 */
-    }
+		&:last-child{
+			margin-bottom: 140upx; /* 增加底部边距，确保不被购物车遮挡 */
+		}
 	}
 	.item_list_title {
 		margin-bottom: 20upx;

ghsApp/src/admin/breakage/index.vue

@@ -227,17 +227,15 @@ export default {
 		}
 	}
 	.right-box {
-		height: calc(100vh - 140upx);
+		height: calc(100vh - 140upx - 120upx);
 		flex: 1;
 		box-sizing: border-box;
-
 	}
 	.item_list_bx {
 		padding: 40upx 16upx;
-		//padding: 0 16upx;
-    &:last-child{
-      margin-bottom: 70upx;
-    }
+		&:last-child{
+			margin-bottom: 70upx;
+		}
 	}
 	.item_list_title {
 		margin-bottom: 20upx;

ghsApp/src/admin/cp/addCp.vue

@@ -56,7 +56,7 @@
 
     <uni-popup ref="classRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
       <view style="margin-left:30upx;margin-top:15upx;font-size:26upx;font-weight:bold;">请选择分类：</view>
-        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:80vh;overflow:auto;">
           <view v-for="(item, index) in cpClassList" :key="index" @tap.stop="setThisClass(item)" style="margin-bottom:20upx;margin-left:3upx;">
           <image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
           <view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>

ghsApp/src/admin/cp/updateCp.vue

@@ -57,7 +57,7 @@
 
     <uni-popup ref="classRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
       <view style="margin-left:30upx;margin-top:15upx;font-size:26upx;font-weight:bold;">请选择分类：</view>
-        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:80vh;overflow:auto;">
           <view v-for="(item, index) in cpClassList" :key="index" @tap.stop="setThisClass(item)" style="margin-bottom:20upx;margin-left:3upx;">
           <image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
           <view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>

ghsApp/src/admin/item/add.vue

@@ -176,7 +176,7 @@
 
     <uni-popup ref="classRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
       <view style="margin-left:30upx;margin-top:19upx;font-size:27upx;font-weight:bold;">请选择分类：</view>
-        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:80vh;overflow:auto;">
           <view v-for="(item, index) in itemClassData" :key="index" @tap.stop="setThisClass(item)" style="margin-bottom:20upx;margin-left:3upx;">
           <image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
           <view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>
@@ -879,4 +879,7 @@ export default {
     }
   }
 }
-</style>
+.class-popup-style {
+  z-index: 99999;
+}
+</style>

ghsApp/src/admin/item/copy.vue

@@ -180,7 +180,7 @@
 
     <uni-popup ref="classRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
       <view style="margin-left:30upx;margin-top:19upx;font-size:27upx;font-weight:bold;">请选择分类：</view>
-        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:80vh;overflow:auto;">
           <view v-for="(item, index) in itemClassData" :key="index" @tap.stop="setThisClass(item)" style="margin-bottom:20upx;margin-left:3upx;">
           <image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
           <view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>
@@ -869,4 +869,7 @@ export default {
     }
   }
 }
-</style>
+.class-popup-style {
+  z-index: 99999;
+}
+</style>

ghsApp/src/admin/item/detail.vue

@@ -309,7 +309,7 @@
 
     <uni-popup ref="classRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
       <view style="margin-left:30upx;margin-top:19upx;font-size:27upx;font-weight:bold;">请选择分类：</view>
-        <view style="display:flex;padding:20upx 20upx 90upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;z-index:9999;">
+        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:80vh;overflow:auto;z-index:9999;">
           <view v-for="(item, index) in itemClassData" :key="index" @tap.stop="setThisClass(item)" style="margin-bottom:20upx;margin-left:3upx;">
           <image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
           <view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>
@@ -1625,4 +1625,7 @@ export default {
     }
   }
 }
-</style>
+.class-popup-style {
+  z-index: 99999;
+}
+</style>

ghsApp/src/admin/notice/index.vue

@@ -33,7 +33,7 @@
 
 		<uni-popup ref="classRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
             <view style="margin-left:30upx;margin-top:15upx;font-size:26upx;font-weight:bold;">请选择分类：</view>
-			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+			<view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:80vh;overflow:auto;">
 				<view v-for="(item, index) in itemClassList" :key="index" @tap.stop="setThisClass(item)" style="margin-bottom:20upx;margin-left:3upx;">
 				<image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
 				<view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>

ghsApp/src/admin/part/index.vue

@@ -227,7 +227,7 @@ export default {
 		}
 	}
 	.right-box {
-		height: calc(100vh - 140upx);
+		height: calc(100vh - 140upx - 120upx);
 		flex: 1;
 		box-sizing: border-box;
 

ghsApp/src/admin/shop/sk.vue

@@ -17,131 +17,126 @@
             <view>{{zjGatheringItemName}}</view>
           </tui-list-cell>
 
-          <view style="width:100%;border-top: 2px solid #2bb931;"></view>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">客户下单</view>
-            <radio-group class="tui-input" @change="thirdSendChange">
-              <label class="list" for="thirdSendOk">
-                <radio id="thirdSendOk" value="0" :checked="thirdSend == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">可选跑腿</span>
-              </label>
-              <label class="list" for="thirdSendNo">
-                <radio id="thirdSendNo" value="1" :checked="thirdSend == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">禁选跑腿</span>
-              </label>
-            </radio-group>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">跑腿费用</view>
-            <radio-group class="tui-input" @change="thirdSendFeeChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
-              <label class="list" for="thirdSendFeeDf" style="display: flex; align-items: center; white-space: nowrap;">
-                <radio id="thirdSendFeeDf" value="0" :checked="thirdSendFee == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">客户自叫或发货后补收</span>
-              </label>
-              <label class="list" for="thirdSendFeeZd" style="display: flex; align-items: center; white-space: nowrap;">
-                <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">下单时提前算好并收取</span>
-              </label>
-            </radio-group>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">下单后</view>
-            <radio-group class="tui-input" @change="orderFlowChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
-              <label class="list" for="orderFlowZj" style="display: flex; align-items: center; white-space: nowrap;">
-                <radio id="orderFlowZj" value="0" :checked="orderFlow == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">后台不要一键发跑腿（直接完成）</span>
-              </label>
-              <label class="list" for="orderFlowFh" style="display: flex; align-items: center; white-space: nowrap;">
-                <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">后台需要一键发跑腿（变待发货）</span>
-              </label>
-            </radio-group>
-          </tui-list-cell>
-
-
-          <!-- 批发花材 -->
-          <view class="action-btn" style="border-top:2upx solid #2bb931;margin-top:20upx;">
-            <text style="font-size: 30upx;font-weight: bold;">【批发-花材】跑腿费计算方式</text>
+          <view style="border: 1px solid #3385FF;margin:20upx 10upx;background-color: white;">
+            <tui-list-cell class="line-cell" :hover="false">
+              <view class="tui-title">客户下单</view>
+              <radio-group class="tui-input" @change="thirdSendChange">
+                <label class="list" for="thirdSendOk">
+                  <radio id="thirdSendOk" value="0" :checked="thirdSend == 0" style="transform:scale(0.7,0.7)" />
+                  <span class="checkbox-text">可选跑腿</span>
+                </label>
+                <label class="list" for="thirdSendNo">
+                  <radio id="thirdSendNo" value="1" :checked="thirdSend == 1" style="transform:scale(0.7,0.7)" />
+                  <span class="checkbox-text">禁选跑腿</span>
+                </label>
+              </radio-group>
+            </tui-list-cell>
+            <tui-list-cell class="line-cell" :hover="false">
+              <view class="tui-title">跑腿费用</view>
+              <radio-group class="tui-input" @change="thirdSendFeeChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
+                <label class="list" for="thirdSendFeeDf" style="display: flex; align-items: center; white-space: nowrap;">
+                  <radio id="thirdSendFeeDf" value="0" :checked="thirdSendFee == 0" style="transform:scale(0.7,0.7)" />
+                  <span class="checkbox-text">客户自叫或发货后补收</span>
+                </label>
+                <label class="list" for="thirdSendFeeZd" style="display: flex; align-items: center; white-space: nowrap;">
+                  <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
+                  <span class="checkbox-text">下单时提前算好并收取</span>
+                </label>
+              </radio-group>
+            </tui-list-cell>
+            <tui-list-cell class="line-cell" :hover="false">
+              <view class="tui-title">下单后</view>
+              <radio-group class="tui-input" @change="orderFlowChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
+                <label class="list" for="orderFlowZj" style="display: flex; align-items: center; white-space: nowrap;">
+                  <radio id="orderFlowZj" value="0" :checked="orderFlow == 0" style="transform:scale(0.7,0.7)" />
+                  <span class="checkbox-text">后台不要一键发跑腿（直接完成）</span>
+                </label>
+                <label class="list" for="orderFlowFh" style="display: flex; align-items: center; white-space: nowrap;">
+                  <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
+                  <span class="checkbox-text">后台需要一键发跑腿（变待发货）</span>
+                </label>
+              </radio-group>
+            </tui-list-cell>
           </view>
-          <view style="display: flex; align-items: center; margin-left:30upx;">
-            <input class="input-field" type="number" v-model="pfHcFreeKm" placeholder="0" style="width:100upx;" @focus="pfHcFreeKm = ''" />
-            <text style="margin-left: 20upx;font-size:30upx;">公里内免费配送</text>
-          </view>
-          <view class="action-btn">
-            <button class="btn-add" style="background-color: #3385FF;" @click="addPfFlowerMaterial">添加</button>
-          </view>
-          <view class="material-list">
-            <view v-for="(item, index) in pfFlowerMaterials" :key="index" class="material-item">
-              <view class="material-info">
-                <view class="info-row">
-                  <text>满</text>
-                  <input class="input-field" v-model="item.num" type="number" placeholder="0" @focus="clearItemField(item, 'num')" />
-                  <text>扎，</text>
-                  <input class="input-field" v-model="item.price" type="digit" placeholder="0" @focus="clearItemField(item, 'price')" />
-                  <text>元，</text>
-                  <input class="input-field" v-model="item.distance" type="digit" placeholder="0" @focus="clearItemField(item, 'distance')" />
-                  <text>公里内免费配送</text>
+
+          <view style="border: 1px solid #3385FF;margin:20upx 10upx;background-color: white;">
+            <view class="action-btn" style="margin-top:20upx;">
+              <text style="font-size: 30upx;font-weight: bold;">【批发-花材】跑腿费计算方式</text>
+            </view>
+            <view style="display: flex; align-items: center; margin-left:30upx;">
+              <input class="input-field" type="number" v-model="pfHcFreeKm" placeholder="0" style="width:100upx;" @focus="pfHcFreeKm = ''" />
+              <text style="margin-left: 20upx;font-size:30upx;">公里内免费配送</text>
+            </view>
+            <view class="action-btn">
+              <button class="btn-add" style="background-color: #3385FF;" @click="addPfFlowerMaterial">添加项</button>
+            </view>
+            <view class="material-list">
+              <view v-for="(item, index) in pfFlowerMaterials" :key="index" class="material-item">
+                <view class="material-info">
+                  <view class="info-row">
+                    <text>满</text>
+                    <input class="input-field" v-model="item.num" type="number" placeholder="0" @focus="clearItemField(item, 'num')" />
+                    <text>扎，</text>
+                    <input class="input-field" v-model="item.price" type="digit" placeholder="0" @focus="clearItemField(item, 'price')" />
+                    <text>元，</text>
+                    <input class="input-field" v-model="item.distance" type="digit" placeholder="0" @focus="clearItemField(item, 'distance')" />
+                    <text>公里内免费配送</text>
+                  </view>
                 </view>
+                <button class="btn-delete" style="background-color: #3385FF;" @click="deletePfFlowerMaterial(index)">删除</button>
               </view>
-              <button class="btn-delete" style="background-color: #3385FF;" @click="deletePfFlowerMaterial(index)">删除</button>
             </view>
+            <view class="warning-text">如不符合以上情况的，按实际跑腿费计算</view>
           </view>
 
-          <view class="warning-text">如不符合以上情况的，按实际跑腿费计算</view>
-
-
-          <!-- 零售花材 -->
-          <view class="action-btn" style="border-top:2upx solid #2bb931;margin-top:20upx;">
-            <text style="font-size: 30upx;font-weight: bold;">【零售-花材】跑腿费计算方式</text>
-          </view>
-          <view style="display: flex; align-items: center; margin-left:30upx;">
-            <input class="input-field" type="number" v-model="hcFreeKm" placeholder="0" style="width:100upx;" @focus="hcFreeKm = ''" />
-            <text style="margin-left: 20upx;font-size:30upx;">公里内免费配送</text>
-          </view>
-          <view class="action-btn">
-            <button class="btn-add" @click="addFlowerMaterial">添加</button>
-          </view>
-          <view class="material-list">
-            <view v-for="(item, index) in flowerMaterials" :key="index" class="material-item">
-              <view class="material-info">
-                <view class="info-row">
-                  <text>满</text>
-                  <input class="input-field" v-model="item.num" type="number" placeholder="0" @focus="clearItemField(item, 'num')" />
-                  <text>扎，</text>
-                  <input class="input-field" v-model="item.price" type="digit" placeholder="0" @focus="clearItemField(item, 'price')" />
-                  <text>元，</text>
-                  <input class="input-field" v-model="item.distance" type="digit" placeholder="0" @focus="clearItemField(item, 'distance')" />
-                  <text>公里内免费配送</text>
+          <view style="border: 1px solid #3385FF;margin:20upx 10upx;background-color: white;">
+            <view class="action-btn" style="margin-top:20upx;background-color: white;">
+              <text style="font-size: 30upx;font-weight: bold;">【零售-花材】跑腿费计算方式</text>
+            </view>
+            <view style="display: flex; align-items: center; margin-left:30upx;">
+              <input class="input-field" type="number" v-model="hcFreeKm" placeholder="0" style="width:100upx;" @focus="hcFreeKm = ''" />
+              <text style="margin-left: 20upx;font-size:30upx;">公里内免费配送</text>
+            </view>
+            <view class="action-btn">
+              <button class="btn-add" style="background-color: #3385FF;" @click="addFlowerMaterial">添加项</button>
+            </view>
+            <view class="material-list">
+              <view v-for="(item, index) in flowerMaterials" :key="index" class="material-item">
+                <view class="material-info">
+                  <view class="info-row">
+                    <text>满</text>
+                    <input class="input-field" v-model="item.num" type="number" placeholder="0" @focus="clearItemField(item, 'num')" />
+                    <text>扎，</text>
+                    <input class="input-field" v-model="item.price" type="digit" placeholder="0" @focus="clearItemField(item, 'price')" />
+                    <text>元，</text>
+                    <input class="input-field" v-model="item.distance" type="digit" placeholder="0" @focus="clearItemField(item, 'distance')" />
+                    <text>公里内免费配送</text>
+                  </view>
                 </view>
+                <button class="btn-delete" @click="deleteFlowerMaterial(index)">删除</button>
               </view>
-              <button class="btn-delete" @click="deleteFlowerMaterial(index)">删除</button>
             </view>
+            <view class="warning-text">如不符合以上情况的，按实际跑腿费计算</view>
           </view>
 
-          <view class="warning-text">如不符合以上情况的，按实际跑腿费计算</view>
-
-          <!-- 花材花束 -->
-          <view class="section-title" style="border-top:2upx solid #2bb931;">【零售-绿植花束】跑腿费计算方式</view>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">包运费的</view>
-            <input class="input-field" v-model="hsFreeKm" type="number" placeholder="0" @focus="hsFreeKm = ''" />
-            <view>公里内免费配送</view>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">{{hsFreeKm}}公里以上</view>
-            <view class="input-row">
-              <text>每公里加收</text>
-              <input class="input-field" v-model="hsAddFee" type="digit" placeholder="0" @focus="hsAddFee = ''" />
-              <text>元</text>
-            </view>
-          </tui-list-cell>
+          <view style="border: 1px solid #3385FF;margin:20upx 10upx;background-color: white;">
+            <view class="section-title" style="background-color: white;">【零售-绿植花束】跑腿费计算方式</view>
+            <tui-list-cell class="line-cell" :hover="false">
+              <view class="tui-title">包配送的</view>
+              <input class="input-field" v-model="hsFreeKm" type="number" placeholder="0" @focus="hsFreeKm = ''" />
+              <view>公里内免费配送</view>
+            </tui-list-cell>
+            <tui-list-cell class="line-cell" :hover="false">
+              <view class="tui-title">{{hsFreeKm}}公里以上</view>
+              <view class="input-row">
+                <text>每公里加收</text>
+                <input class="input-field" v-model="hsAddFee" type="digit" placeholder="0" @focus="hsAddFee = ''" />
+                <text>元</text>
+              </view>
+            </tui-list-cell>
+            <view class="warning-text">没有包配送的花束，按实际跑腿费计算</view>
+          </view>
 
-          <view class="warning-text">没有包运费的花束，按实际跑腿费计算</view>
         </view>
 
         <view class="confirm-btn">
@@ -456,7 +451,7 @@ export default {
     padding: 10upx 20upx;
     border-radius: 4upx;
     border: none;
-    font-size: 20upx;
+    font-size: 22upx;
   }
 }
 
@@ -493,7 +488,7 @@ export default {
     }
     
     .btn-delete {
-      background-color: #09C567;
+      background-color: #3385FF;
       color: white;
       padding: 8upx 16upx;
       border-radius: 4upx;

ghsApp/src/pagesOrder/refundAllList.vue

@@ -33,7 +33,7 @@
 
       <uni-popup ref="classRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
         <view style="margin-left:30upx;margin-top:19upx;font-size:27upx;font-weight:bold;">请选择分类：</view>
-          <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+          <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:80vh;overflow:auto;">
             <view v-for="(item, index) in itemClassData" :key="index" @tap.stop="setClass(index)" style="margin-bottom:20upx;margin-left:3upx;">
             <image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
             <view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;" v-if="item.select == 0">{{item.name}}</view>
@@ -202,36 +202,39 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-	.app-content{
-		.list{
-			padding: 20upx 30upx;
-			margin-bottom: 20upx;
-			background: #FFFFFF;
-			.label{
-        position: relative;
-				line-height: 50upx;
-				text{
-					display: block;
-				}
-			}
-			.val{
-				font-size: 25upx;
-				.iconfont{
-					margin-left: 12upx;
-					color: #999999;
-				}
-			}
-		}
-	}
-  .pass-red{
-    font-weight:bold;
-    color:red;
-  }
-  .cancel-pass{
-    font-weight: normal;
-    color:black;
-  }
-  .qa_cause{
-    color:blue;
+.app-content{
+  .list{
+    padding: 20upx 30upx;
+    margin-bottom: 20upx;
+    background: #FFFFFF;
+    .label{
+      position: relative;
+      line-height: 50upx;
+      text{
+        display: block;
+      }
+    }
+    .val{
+      font-size: 25upx;
+      .iconfont{
+        margin-left: 12upx;
+        color: #999999;
+      }
+    }
   }
+}
+.pass-red{
+  font-weight:bold;
+  color:red;
+}
+.cancel-pass{
+  font-weight: normal;
+  color:black;
+}
+.qa_cause{
+  color:blue;
+}
+.class-popup-style {
+  z-index: 99999;
+}
 </style>

ghsApp/src/pagesPurchase/bookProduct.vue

@@ -766,7 +766,7 @@ export default {
 		}
 	}
 	.right-box {
-		height: calc(100vh - 140upx);
+		height: calc(100vh - 140upx - 120upx);
 		flex: 1;
 		box-sizing: border-box;
 		padding-bottom:90upx;

ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -236,7 +236,7 @@ export default {
 		}
 	}
 	.right-box {
-		height: calc(100vh - 140upx);
+		height: calc(100vh - 140upx - 120upx);
 		flex: 1;
 		box-sizing: border-box;
 	}

ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -277,7 +277,7 @@ export default {
 		}
 	}
 	.right-box {
-		height: calc(100vh - 140upx);
+		height: calc(100vh - 140upx - 120upx);
 		flex: 1;
 		box-sizing: border-box;
 	}

ghsApp/src/pagesStorehouse/inventory/select2.vue

@@ -265,7 +265,7 @@ export default {
 		}
 	}
 	.right-box {
-		height: calc(100vh - 140upx);
+		height: calc(100vh - 140upx - 120upx);
 		flex: 1;
 		box-sizing: border-box;
 	}

hdApp/src/admin/billing/affirm.vue

@@ -127,9 +127,24 @@
             <button style="margin-right:10upx;height:70upx;line-height:46upx;" @click="form.hasPay = 0" class="admin-button-com mini-btn" :class="form.hasPay == 0 ? 'blue' : 'default'">待付款</button>
             <button style="margin-right:10upx;height:70upx;line-height:46upx;" @click="form.hasPay = 4" class="admin-button-com mini-btn" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
             <button style="margin-right:10upx;height:70upx;line-height:46upx;" @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
-            <button style="margin-right:10upx;height:70upx;line-height:46upx;" @click="form.hasPay = 2" class="admin-button-com mini-btn" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
+            <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="form.hasPay = 2" class="admin-button-com mini-btn" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
 					</tui-list-cell>
 
+          <tui-list-cell class="line-cell" :arrow="false" v-if="form.hasPay == 0">
+            <view class="tui-title">待付款</view>
+            <view class="tui-input" style="color:#3385ff;">扫码付款、微信邀请付款 选待付款</view>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :arrow="false" v-if="form.hasPay == 2">
+            <view class="tui-title">赊账</view>
+            <view class="tui-input" style="color:#3385ff;">客户要欠款挂账的 选赊账</view>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :arrow="false" v-if="form.hasPay == 4">
+            <view class="tui-title">余额</view>
+            <view class="tui-input" style="color:#3385ff;">使用余额支付</view>
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.hasPay == 1">
             <view class="tui-title">线下渠道</view>
             <picker mode="selector" :value="payWayindex" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input">

hdApp/src/admin/home/me.vue

@@ -644,7 +644,7 @@ export default {
         
         .category-title {
           padding: 18upx 24upx;
-          font-size: 26upx;
+          font-size: 29upx;
           font-weight: 700;
           color: #ffffff;
           background-color:rgb(224, 187, 130);
@@ -679,7 +679,7 @@ export default {
             }
             
             .item-label {
-              font-size: 28upx;
+              font-size: 30upx;
               color: #333;
               flex: 1;
             }

hdApp/src/admin/item/add.vue

@@ -186,7 +186,7 @@
 
     <uni-popup ref="classRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
       <view style="margin-left:30upx;margin-top:19upx;font-size:27upx;font-weight:bold;">请选择分类：</view>
-        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:80vh;overflow:auto;">
           <view v-for="(item, index) in itemClassData" :key="index" @tap.stop="setThisClass(item)" style="margin-bottom:20upx;margin-left:3upx;">
           <image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
           <view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>
@@ -908,4 +908,7 @@ export default {
     height: 400upx;
   }
 }
-</style>
+.class-popup-style {
+  z-index: 99999;
+}
+</style>

hdApp/src/admin/item/copy.vue

@@ -187,7 +187,7 @@
 
     <uni-popup ref="classRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
       <view style="margin-left:30upx;margin-top:19upx;font-size:27upx;font-weight:bold;">请选择分类：</view>
-        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:80vh;overflow:auto;">
           <view v-for="(item, index) in itemClassData" :key="index" @tap.stop="setThisClass(item)" style="margin-bottom:20upx;margin-left:3upx;">
           <image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
           <view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>
@@ -878,4 +878,7 @@ export default {
   color: #cccccc;
   padding: 12rpx 0;
 }
-</style>
+.class-popup-style {
+  z-index: 99999;
+}
+</style>

hdApp/src/admin/item/detail.vue

@@ -318,7 +318,7 @@
 
     <uni-popup ref="classRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
       <view style="margin-left:30upx;margin-top:19upx;font-size:27upx;font-weight:bold;">请选择分类：</view>
-        <view style="display:flex;padding:20upx 20upx 90upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;z-index:9999;">
+        <view style="display:flex;padding:20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:80vh;overflow:auto;z-index:9999;">
           <view v-for="(item, index) in itemClassData" :key="index" @tap.stop="setThisClass(item)" style="margin-bottom:20upx;margin-left:3upx;">
           <image :src="item.cover" style="width:120upx;height:120upx;border-radius:10upx;"></image>
           <view style="margin-top:5upx;overflow: hidden;white-space: nowrap;width:120upx;text-align:center;">{{item.name}}</view>
@@ -1531,4 +1531,7 @@ export default {
   color: #cccccc;
   padding: 12rpx 0;
 }
-</style>
+.class-popup-style {
+  z-index: 99999;
+}
+</style>

hdApp/src/admin/shop/sk.vue

@@ -29,99 +29,98 @@
             </radio-group>
           </tui-list-cell>
 
-          <view style="width:100%;border-top: 2px solid #2bb931;"></view>
+          <view style="border: 1px solid #2bb931;margin:20upx 10upx;background-color: white;">
+            <tui-list-cell class="line-cell" :hover="false">
+              <view class="tui-title">客户下单</view>
+              <radio-group class="tui-input" @change="thirdSendChange">
+                <label class="list" for="thirdSendOk">
+                  <radio id="thirdSendOk" value="0" :checked="thirdSend == 0" style="transform:scale(0.7,0.7)" />
+                  <span class="checkbox-text">可选跑腿</span>
+                </label>
+                <label class="list" for="thirdSendNo">
+                  <radio id="thirdSendNo" value="1" :checked="thirdSend == 1" style="transform:scale(0.7,0.7)" />
+                  <span class="checkbox-text">禁选跑腿</span>
+                </label>
+              </radio-group>
+            </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">客户下单</view>
-            <radio-group class="tui-input" @change="thirdSendChange">
-              <label class="list" for="thirdSendOk">
-                <radio id="thirdSendOk" value="0" :checked="thirdSend == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">可选跑腿</span>
-              </label>
-              <label class="list" for="thirdSendNo">
-                <radio id="thirdSendNo" value="1" :checked="thirdSend == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">禁选跑腿</span>
-              </label>
-            </radio-group>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">跑腿费用</view>
-            <radio-group class="tui-input" @change="thirdSendFeeChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
-              <label class="list" for="thirdSendFeeDf" style="display: flex; align-items: center; white-space: nowrap;">
-                <radio id="thirdSendFeeDf" value="0" :checked="thirdSendFee == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">客户自叫或发货后补收</span>
-              </label>
-              <label class="list" for="thirdSendFeeZd" style="display: flex; align-items: center; white-space: nowrap;">
-                <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">下单时提前算好并收取</span>
-              </label>
-            </radio-group>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">下单后</view>
-            <radio-group class="tui-input" @change="orderFlowChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
-              <label class="list" for="orderFlowZj" style="display: flex; align-items: center; white-space: nowrap;">
-                <radio id="orderFlowZj" value="0" :checked="orderFlow == 0" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">后台不要一键发跑腿（直接完成）</span>
-              </label>
-              <label class="list" for="orderFlowFh" style="display: flex; align-items: center; white-space: nowrap;">
-                <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
-                <span class="checkbox-text">后台需要一键发跑腿（变待发货）</span>
-              </label>
-            </radio-group>
-          </tui-list-cell>
+            <tui-list-cell class="line-cell" :hover="false">
+              <view class="tui-title">跑腿费用</view>
+              <radio-group class="tui-input" @change="thirdSendFeeChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
+                <label class="list" for="thirdSendFeeDf" style="display: flex; align-items: center; white-space: nowrap;">
+                  <radio id="thirdSendFeeDf" value="0" :checked="thirdSendFee == 0" style="transform:scale(0.7,0.7)" />
+                  <span class="checkbox-text">客户自叫或发货后补收</span>
+                </label>
+                <label class="list" for="thirdSendFeeZd" style="display: flex; align-items: center; white-space: nowrap;">
+                  <radio id="thirdSendFeeZd" value="1" :checked="thirdSendFee == 1" style="transform:scale(0.7,0.7)" />
+                  <span class="checkbox-text">下单时提前算好并收取</span>
+                </label>
+              </radio-group>
+            </tui-list-cell>
 
-          <!-- 花材批发和零售 -->
-          <view class="action-btn" style="border-top:2upx solid #2bb931;margin-top:20upx;">
-            <text style="font-size: 30upx;font-weight: bold;">【零售-花材】跑腿费计算方式</text>
+            <tui-list-cell class="line-cell" :hover="false">
+              <view class="tui-title">下单后</view>
+              <radio-group class="tui-input" @change="orderFlowChange" style="display: flex; flex-wrap: wrap; gap: 30upx;">
+                <label class="list" for="orderFlowZj" style="display: flex; align-items: center; white-space: nowrap;">
+                  <radio id="orderFlowZj" value="0" :checked="orderFlow == 0" style="transform:scale(0.7,0.7)" />
+                  <span class="checkbox-text">后台不要一键发跑腿（直接完成）</span>
+                </label>
+                <label class="list" for="orderFlowFh" style="display: flex; align-items: center; white-space: nowrap;">
+                  <radio id="orderFlowFh" value="1" :checked="orderFlow == 1" style="transform:scale(0.7,0.7)" />
+                  <span class="checkbox-text">后台需要一键发跑腿（变待发货）</span>
+                </label>
+              </radio-group>
+            </tui-list-cell>
           </view>
-          <view style="display: flex; align-items: center; margin-left:30upx;">
-            <input class="input-field" type="number" v-model="hcFreeKm" placeholder="0" style="width:100upx;" @focus="hcFreeKm = ''" />
-            <text style="margin-left: 20upx;font-size:30upx;">公里内免费配送</text>
-          </view>
-          <view class="action-btn">
-            <button class="btn-add" @click="addFlowerMaterial">添加</button>
-          </view>
-          <view class="material-list">
-            <view v-for="(item, index) in flowerMaterials" :key="index" class="material-item">
-              <view class="material-info">
-                <view class="info-row">
-                  <text>满</text>
-                  <input class="input-field" v-model="item.num" type="number" placeholder="0" @focus="clearItemField(item, 'num')" />
-                  <text>扎，</text>
-                  <input class="input-field" v-model="item.price" type="digit" placeholder="0" @focus="clearItemField(item, 'price')" />
-                  <text>元，</text>
-                  <input class="input-field" v-model="item.distance" type="digit" placeholder="0" @focus="clearItemField(item, 'distance')" />
-                  <text>公里内免费配送</text>
+
+          <view style="border: 1px solid #2bb931;margin:20upx 10upx;background-color: white;">
+            <view class="action-btn" style="margin-top:20upx;margin-bottom:10upx;background-color: white;">
+              <text style="font-size: 30upx;font-weight: bold;">【零售-花材】跑腿费计算方式</text>
+            </view>
+            <view style="display: flex; align-items: center; margin-left:30upx;">
+              <input class="input-field" type="number" v-model="hcFreeKm" placeholder="0" style="width:100upx;" @focus="hcFreeKm = ''" />
+              <text style="margin-left: 20upx;font-size:30upx;">公里内免费配送</text>
+            </view>
+            <view class="action-btn">
+              <button class="btn-add" @click="addFlowerMaterial">添加</button>
+            </view>
+            <view class="material-list">
+              <view v-for="(item, index) in flowerMaterials" :key="index" class="material-item">
+                <view class="material-info">
+                  <view class="info-row">
+                    <text>满</text>
+                    <input class="input-field" v-model="item.num" type="number" placeholder="0" @focus="clearItemField(item, 'num')" />
+                    <text>扎，</text>
+                    <input class="input-field" v-model="item.price" type="digit" placeholder="0" @focus="clearItemField(item, 'price')" />
+                    <text>元，</text>
+                    <input class="input-field" v-model="item.distance" type="digit" placeholder="0" @focus="clearItemField(item, 'distance')" />
+                    <text>公里内免费配送</text>
+                  </view>
                 </view>
+                <button class="btn-delete" @click="deleteFlowerMaterial(index)">删除</button>
               </view>
-              <button class="btn-delete" @click="deleteFlowerMaterial(index)">删除</button>
             </view>
+            <view class="warning-text">如不符合以上情况的，按实际跑腿费计算</view>
           </view>
 
-          <view class="warning-text">如不符合以上情况的，按实际跑腿费计算</view>
-
-          <!-- 花束 -->
-          <view class="section-title" style="border-top:2upx solid #2bb931;">【零售-绿植花束】跑腿费计算方式</view>
 
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">包运费的</view>
-            <input class="input-field" v-model="hsFreeKm" type="number" placeholder="0" @focus="hsFreeKm = ''" />
-            <view>公里内免费配送</view>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">{{hsFreeKm}}公里以上</view>
-            <view class="input-row">
-              <text>每公里加收</text>
-              <input class="input-field" v-model="hsAddFee" type="digit" placeholder="0" @focus="hsAddFee = ''" />
-              <text>元</text>
-            </view>
-          </tui-list-cell>
-
-          <view class="warning-text">没有包运费的花束，按实际跑腿费计算</view>
+          <view style="border: 1px solid #2bb931;margin:20upx 10upx;background-color: white;">
+            <view class="section-title" style="margin-bottom:10upx;background-color: white;">【零售-绿植花束】跑腿费计算方式</view>
+            <tui-list-cell class="line-cell" :hover="false">
+              <view class="tui-title">包配送的</view>
+              <input class="input-field" v-model="hsFreeKm" type="number" placeholder="0" @focus="hsFreeKm = ''" />
+              <view>公里内免费配送</view>
+            </tui-list-cell>
+            <tui-list-cell class="line-cell" :hover="false">
+              <view class="tui-title">{{hsFreeKm}}公里以上</view>
+              <view class="input-row">
+                <text>每公里加收</text>
+                <input class="input-field" v-model="hsAddFee" type="digit" placeholder="0" @focus="hsAddFee = ''" />
+                <text>元</text>
+              </view>
+            </tui-list-cell>
+            <view class="warning-text">没有包配送的花束，按实际跑腿费计算</view>
+          </view>
 
         </view>
 
@@ -392,7 +391,7 @@ export default {
     padding: 10upx 20upx;
     border-radius: 4upx;
     border: none;
-    font-size: 20upx;
+    font-size: 22upx;
   }
 }
 
@@ -434,7 +433,7 @@ export default {
       padding: 8upx 16upx;
       border-radius: 4upx;
       border: none;
-      font-size: 22upx;
+      font-size: 24upx;
       width: 100%;
     }
   }