Merge branch 'test' into 'qa'

Test See merge request !1026

Merge branch 'test' into 'qa'
Test See merge request !1026
后端研发-苏明海
2 parents 1e8e0e4f 716de7e1
Showing 13 changed files with 13 additions and 13 deletions
components/diy_store_select/diy_store_select.wxss
packageA/pages/goodsInfo/goodsInfo.wxss
packageA/pages/profile/profile.wxss
packageA/pages/prom_list/prom_list.wxss
packageA/pages/serviceCard_pd/team_show/team_show.wxss
packageB/pages/zuhegou/index/index.wxss
packageB/pages/zuhegou/preindex/index.wxss
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
packageC/pages/presell/goodsInfo/goodsInfo.wxss
packageC/pages/presell/pregoodsInfo/goodsInfo.wxss
pages/goods/goodsInfo/goodsInfo.wxss
pages/team/team_show/team_show.wxss
pages/user/userinfo/userinfo.wxss
@@ -188,7 +188,7 @@
  
 /* 门店分类列表 */
 .sort_store_list {
-	height: 82%;
+	max-height: 700rpx;
 	overflow: hidden;
 	overflow-y: scroll;
 	width: 95%;
@@ -2575,7 +2575,7 @@ line-height: 38rpx;
  }
  /* 门店分类列表 */
 .sort_store_list{
-  height: 82%;
+  max-height: 700rpx;
   overflow: hidden;
   overflow-y: scroll;
   width: 95%;
@@ -532,7 +532,7 @@ input {
 /* 门店分类列表 */
  
 .sort_store_list {
-  height: 82%;
+  max-height: 700rpx;
   overflow: hidden;
   overflow-y: scroll;
   width: 95%;
@@ -267,7 +267,7 @@
 }
 /* 门店分类列表 */
 .sort_store_list{
-    height: 82%;
+    max-height: 700rpx;
     overflow: hidden;
     overflow-y: scroll;
     width: 95%;
@@ -2178,7 +2178,7 @@ page {
  
  
  .sort_store_list{
-   height: 82%;
+   max-height: 700rpx;
    overflow: hidden;
    overflow-y: scroll;
    width: 95%;
@@ -338,7 +338,7 @@ page {
 }
 /* 门店分类列表 */
 .sort_store_list{
-    height: 82%;
+	max-height: 700rpx;
     overflow: hidden;
     overflow-y: scroll;
     width: 95%;
@@ -334,7 +334,7 @@ page {
 }
 /* 门店分类列表 */
 .sort_store_list{
-    height: 82%;
+	max-height: 700rpx;
     overflow: hidden;
     overflow-y: scroll;
     width: 95%;
@@ -2574,7 +2574,7 @@ line-height: 38rpx;
  }
  /* 门店分类列表 */
 .sort_store_list{
-  height: 82%;
+  max-height: 700rpx;
   overflow: hidden;
   overflow-y: scroll;
   width: 95%;
@@ -2570,7 +2570,7 @@ line-height: 38rpx;
  }
  /* 门店分类列表 */
 .sort_store_list{
-  height: 82%;
+  max-height: 700rpx;
   overflow: hidden;
   overflow-y: scroll;
   width: 95%;
@@ -2570,7 +2570,7 @@ line-height: 38rpx;
  }
  /* 门店分类列表 */
 .sort_store_list{
-  height: 82%;
+  max-height: 700rpx;
   overflow: hidden;
   overflow-y: scroll;
   width: 95%;
@@ -3447,7 +3447,7 @@ margin: auto; */
  
 /* 门店分类列表 */
 .sort_store_list {
-	height: 82%;
+	max-height: 700rpx;
 	overflow: hidden;
 	overflow-y: scroll;
 	width: 95%;
@@ -2178,7 +2178,7 @@ page {
  
  
  .sort_store_list{
-   height: 82%;
+   max-height: 700rpx;
    overflow: hidden;
    overflow-y: scroll;
    width: 95%;
@@ -529,7 +529,7 @@ input {
 /* 门店分类列表 */
  
 .sort_store_list {
-  height: 82%;
+  max-height: 700rpx;
   overflow: hidden;
   overflow-y: scroll;
   width: 95%;