shish před 6 měsíci
rodič
revize
17ca0a3d76

+ 1 - 1
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;
 	}

+ 3 - 4
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;

+ 4 - 6
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;

+ 1 - 1
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>

+ 1 - 1
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>

+ 5 - 2
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>

+ 5 - 2
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>

+ 5 - 2
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>

+ 1 - 1
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>

+ 1 - 1
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;
 

+ 35 - 32
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>

+ 1 - 1
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;

+ 1 - 1
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;
 	}

+ 1 - 1
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;
 	}

+ 1 - 1
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;
 	}

+ 5 - 2
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>

+ 5 - 2
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>

+ 5 - 2
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>