shish 3 лет назад
Родитель
Сommit
b45deaadaa
32 измененных файлов с 43 добавлено и 37 удалено
  1. 6 0
      jdApp/package.json
  2. 1 1
      jdApp/src/admin/chat/index.vue
  3. 1 1
      jdApp/src/admin/custom/selectCustom.vue
  4. 1 1
      jdApp/src/admin/custom/visit.vue
  5. 1 1
      jdApp/src/admin/home/member.vue
  6. 1 1
      jdApp/src/admin/setting/level.vue
  7. 1 1
      jdApp/src/admin/staff/achieve.vue
  8. 1 1
      jdApp/src/admin/statistics/cgStat.vue
  9. 1 1
      jdApp/src/admin/statistics/customSale.vue
  10. 1 1
      jdApp/src/admin/statistics/incomeStat.vue
  11. 1 1
      jdApp/src/admin/statistics/kdIncome.vue
  12. 1 1
      jdApp/src/admin/statistics/mayPayStat.vue
  13. 1 1
      jdApp/src/admin/statistics/productSale.vue
  14. 1 1
      jdApp/src/admin/statistics/profit.vue
  15. 1 1
      jdApp/src/admin/statistics/sale.vue
  16. 1 1
      jdApp/src/components/app-area-sel-bak.vue
  17. 1 1
      jdApp/src/components/app-area-sel.vue
  18. 1 1
      jdApp/src/components/app-coupon-sel.vue
  19. 1 1
      jdApp/src/components/app-customer-sel.vue
  20. 1 1
      jdApp/src/components/app-flower-sel.vue
  21. 1 1
      jdApp/src/components/app-supplier-sel.vue
  22. 3 3
      jdApp/src/components/app-swiper.vue
  23. 2 2
      jdApp/src/pagesClient/official/clientApply.vue
  24. 1 1
      jdApp/src/pagesStatistics/business.vue
  25. 1 1
      jdApp/src/pagesStorehouse/allot/addExDetails.vue
  26. 1 1
      jdApp/src/pagesStorehouse/allot/exDetails.vue
  27. 1 1
      jdApp/src/pagesStorehouse/allot/putDetails.vue
  28. 2 2
      jdApp/src/pagesStorehouse/flower/category.vue
  29. 3 3
      jdApp/src/pagesStorehouse/flower/manage.vue
  30. 1 1
      jdApp/src/pagesStorehouse/inventory/details.vue
  31. 1 1
      jdApp/src/pagesStorehouse/inventory/update.vue
  32. 1 1
      jdApp/src/pagesStorehouse/stockWarn/detailed.vue

+ 6 - 0
jdApp/package.json

@@ -33,11 +33,15 @@
     "@dcloudio/uni-mp-toutiao": "^2.0.0-25120200103006",
     "@dcloudio/uni-mp-weixin": "^2.0.2-3071120230427001",
     "@dcloudio/uni-stat": "^2.0.0-25120200103006",
+    "autoprefixer": "^8.0.0",
     "echarts": "4.2.1",
     "flyio": "^0.6.2",
     "js-base64": "^2.5.1",
     "jweixin-module": "^1.4.1",
     "lodash": "^4.17.20",
+    "postcss": "^7.0.0",
+    "postcss-import": "^12.0.1",
+    "postcss-loader": "^4.0.3",
     "regenerator-runtime": "^0.12.1",
     "text-encoding": "^0.7.0",
     "to-array-buffer": "^3.2.0",
@@ -67,7 +71,9 @@
     "mini-types": "*",
     "miniprogram-api-typings": "^2.8.0-2",
     "moment": "^2.24.0",
+    "postcss": "^7.0.0",
     "postcss-comment": "^2.0.0",
+    "postcss-import": "^12.0.1",
     "qs": "^6.8.0",
     "sass": "1.32.13",
     "sass-migrator": "^1.7.3",

+ 1 - 1
jdApp/src/admin/chat/index.vue

@@ -223,7 +223,7 @@
 		}
 		// 输入框
 		.input-wrap {
-			/deep/.app-search-module {
+			::v-deep.app-search-module {
 				height: 70px;
 				input {
 					font-size: 32px;

+ 1 - 1
jdApp/src/admin/custom/selectCustom.vue

@@ -192,7 +192,7 @@ export default {
       }
     }
     .level-img {
-      /deep/.vip-text {
+      ::v-deep.vip-text {
         left: 70px;
         top: 8px;
       }

+ 1 - 1
jdApp/src/admin/custom/visit.vue

@@ -172,7 +172,7 @@ export default {
       }
     }
     .level-img {
-      /deep/.vip-text {
+      ::v-deep.vip-text {
         left: 70px;
         top: 8px;
       }

+ 1 - 1
jdApp/src/admin/home/member.vue

@@ -210,7 +210,7 @@ export default {
       }
     }
     .level-img {
-      /deep/.vip-text {
+      ::v-deep.vip-text {
         left: 70px;
         top: 8px;
       }

+ 1 - 1
jdApp/src/admin/setting/level.vue

@@ -163,7 +163,7 @@ export default {
     padding: 0 30px;
     border-bottom: 2px solid $borderColor;
     .level-img {
-      /deep/.vip-text {
+      ::v-deep.vip-text {
         left: 70px;
         top: 3px;
       }

+ 1 - 1
jdApp/src/admin/staff/achieve.vue

@@ -252,7 +252,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.icon-info {
+			::v-deep.icon-info {
 				color: #333333;
 			}
 		}

+ 1 - 1
jdApp/src/admin/statistics/cgStat.vue

@@ -293,7 +293,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.icon-info {
+			::v-deep.icon-info {
 				color: #333333;
 			}
 		}

+ 1 - 1
jdApp/src/admin/statistics/customSale.vue

@@ -317,7 +317,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.icon-info {
+			::v-deep.icon-info {
 				color: #333333;
 			}
 		}

+ 1 - 1
jdApp/src/admin/statistics/incomeStat.vue

@@ -244,7 +244,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.icon-info {
+			::v-deep.icon-info {
 				color: #333333;
 			}
 		}

+ 1 - 1
jdApp/src/admin/statistics/kdIncome.vue

@@ -237,7 +237,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.icon-info {
+			::v-deep.icon-info {
 				color: #333333;
 			}
 		}

+ 1 - 1
jdApp/src/admin/statistics/mayPayStat.vue

@@ -241,7 +241,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.icon-info {
+			::v-deep.icon-info {
 				color: #333333;
 			}
 		}

+ 1 - 1
jdApp/src/admin/statistics/productSale.vue

@@ -262,7 +262,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.icon-info {
+			::v-deep.icon-info {
 				color: #333333;
 			}
 		}

+ 1 - 1
jdApp/src/admin/statistics/profit.vue

@@ -250,7 +250,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.icon-info {
+			::v-deep.icon-info {
 				color: #333333;
 			}
 		}

+ 1 - 1
jdApp/src/admin/statistics/sale.vue

@@ -255,7 +255,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.icon-info {
+			::v-deep.icon-info {
 				color: #333333;
 			}
 		}

+ 1 - 1
jdApp/src/components/app-area-sel-bak.vue

@@ -160,7 +160,7 @@ export default {
 
 <style lang="scss" scoped>
 	// 弹窗
-	/deep/.popup-wrap {
+	::v-deep.popup-wrap {
 		.tui-popup-class {
 			border-top-left-radius: 20px;
 			border-top-right-radius: 20px;

+ 1 - 1
jdApp/src/components/app-area-sel.vue

@@ -178,7 +178,7 @@
 
 <style lang="scss" scoped>
 	// 弹窗
-	/deep/.popup-wrap {
+	::v-deep.popup-wrap {
 		.tui-popup-class {
 			border-top-left-radius: 20px;
 			border-top-right-radius: 20px;

+ 1 - 1
jdApp/src/components/app-coupon-sel.vue

@@ -208,7 +208,7 @@ export default {
 		}
 	}
 	// 修改uni-app组件
-	/deep/.uni-radio-input-checked {
+	::v-deep.uni-radio-input-checked {
 		background-color: $mainColor !important;
 		border-color: $mainColor !important;
 	}

+ 1 - 1
jdApp/src/components/app-customer-sel.vue

@@ -140,7 +140,7 @@ export default {
 
 <style lang="scss" scoped>
 // 弹窗
-/deep/.popup-wrap {
+::v-deep.popup-wrap {
 	.tui-popup-class {
 		border-top-left-radius: 20px;
 		border-top-right-radius: 20px;

+ 1 - 1
jdApp/src/components/app-flower-sel.vue

@@ -157,7 +157,7 @@ export default {
 
 <style lang="scss" scoped>
 // 弹窗
-/deep/.popup-wrap {
+::v-deep.popup-wrap {
 	.tui-popup-class {
 		border-top-left-radius: 20px;
 		border-top-right-radius: 20px;

+ 1 - 1
jdApp/src/components/app-supplier-sel.vue

@@ -162,7 +162,7 @@ export default {
 
 <style lang="scss" scoped>
 // 弹窗
-/deep/.popup-wrap {
+::v-deep.popup-wrap {
 	.tui-popup-class {
 		border-top-left-radius: 20px;
 		border-top-right-radius: 20px;

+ 3 - 3
jdApp/src/components/app-swiper.vue

@@ -121,7 +121,7 @@ export default {
     background: rgba(0,0,0,0.6)
   }
 	/* #ifdef H5 */
-	/deep/.tui-banner-swiper .uni-swiper-dot {
+	::v-deep.tui-banner-swiper .uni-swiper-dot {
 		width: 28rpx;
 		height: 8rpx;
 		display: inline-flex;
@@ -129,7 +129,7 @@ export default {
 		justify-content: space-between;
 	}
 
-	/deep/.tui-banner-swiper .uni-swiper-dot::before {
+	::v-deep.tui-banner-swiper .uni-swiper-dot::before {
 		content: '';
 		flex-grow: 1;
 		background: #969696;
@@ -137,7 +137,7 @@ export default {
 		overflow: hidden;
 	}
 
-	/deep/.tui-banner-swiper .uni-swiper-dot-active::before {
+	::v-deep.tui-banner-swiper .uni-swiper-dot-active::before {
 		background: #F04545;
 	}
 

+ 2 - 2
jdApp/src/pagesClient/official/clientApply.vue

@@ -126,11 +126,11 @@
     }
     .clientApp-content_box {
         min-height: 100vh;
-        & .app-result_xx  /deep/ .result-title {
+        & .app-result_xx  ::v-deep .result-title {
             margin-bottom: 0!important;
             font-weight: 600;
         }
-        & .app-result_xx  /deep/ .billing_box_bg {
+        & .app-result_xx  ::v-deep .billing_box_bg {
             padding-bottom: 30upx;
         }
         .apply-content_box {

+ 1 - 1
jdApp/src/pagesStatistics/business.vue

@@ -418,7 +418,7 @@ export default {
 			 	 padding: 0px 17px;
 				//width: 165upx;
 				height: 44upx;
-				& /deep/ .select-title {
+				& ::v-deep .select-title {
 					color: #FFFFFF;
 				}
 			// 	font-size: 24px;

+ 1 - 1
jdApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -300,7 +300,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.list-icon {
+			::v-deep.list-icon {
 				display: flex;
 				.icon-image {
 					width: 80upx;

+ 1 - 1
jdApp/src/pagesStorehouse/allot/exDetails.vue

@@ -258,7 +258,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.list-icon {
+			::v-deep.list-icon {
 				display: flex;
 				.icon-image {
 					width: 80upx;

+ 1 - 1
jdApp/src/pagesStorehouse/allot/putDetails.vue

@@ -260,7 +260,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.list-icon {
+			::v-deep.list-icon {
 				display: flex;
 				.icon-image {
 					width: 80upx;

+ 2 - 2
jdApp/src/pagesStorehouse/flower/category.vue

@@ -315,7 +315,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.input-td {
+			::v-deep.input-td {
 				input {
 					width: 130upx;
 					height: 70upx;
@@ -324,7 +324,7 @@ export default {
 					text-align: center;
 				}
 			}
-			/deep/.edit-td {
+			::v-deep.edit-td {
 				.iconfont {
 					font-size: 40upx;
 					margin: 0 5upx;

+ 3 - 3
jdApp/src/pagesStorehouse/flower/manage.vue

@@ -313,7 +313,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.input-td {
+			::v-deep.input-td {
 				input {
 					width: 130upx;
 					height: 70upx;
@@ -322,7 +322,7 @@ export default {
 					text-align: center;
 				}
 			}
-			/deep/.edit-td {
+			::v-deep.edit-td {
 				.iconfont {
 					font-size: 40upx;
 					margin: 0 20upx;
@@ -353,7 +353,7 @@ export default {
 		}
 	}
 
-	/deep/.inpput-cmd_bx {
+	::v-deep.inpput-cmd_bx {
 		margin: 20upx 0;
 
 		width: 100%;

+ 1 - 1
jdApp/src/pagesStorehouse/inventory/details.vue

@@ -228,7 +228,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.list-icon {
+			::v-deep.list-icon {
 				display: flex;
 				.icon-image {
 					width: 80upx;

+ 1 - 1
jdApp/src/pagesStorehouse/inventory/update.vue

@@ -340,7 +340,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.list-icon {
+			::v-deep.list-icon {
 				display: flex;
 				.icon-image {
 					width: 80upx;

+ 1 - 1
jdApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -278,7 +278,7 @@ export default {
 			}
 		}
 		.ex-table {
-			/deep/.icon-info {
+			::v-deep.icon-info {
 				color: #333333;
 			}
 		}