Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents f347ec14 054f9539
Showing 1 changed file with 34 additions and 23 deletions
pages/goods/categoryList/categoryList.wxss
 /*---nyf 2018-9-7---*/
-page{height: 100%; background: #fff;}
+page{height: 100%; background: #fff !important;}
 .top_view{ width: 100%;background: #fff;}
 .swiper-tab{
@@ -30,11 +30,14 @@ swiper{
 /*--搜索--*/
 .search-box {
-    width: 100%;
-    height: 88rpx;
-    z-index: 10;
+    width: 100% !important;
+    height: 88rpx !important;
+    z-index: 10 !important;
+		border-radius: 0 !important;
     /*-background: linear-gradient(rgba(0,0,0,.2),rgba(255,255,255,0));-*/ 
-		background: #f2f2f2;
+		background: #f2f2f2 !important;
+		padding: 0 !important;
+		font-size: medium !important;
 }
 .logo {
@@ -208,7 +211,7 @@ margin-top: 8rpx;
     background-color: #f2f2f2;
 }
 .project_height{
-  height: 90%;
+  height: 100%;
 }
 .project_type{
@@ -292,14 +295,14 @@ width: 60%;
  } 
  .classify_name{
-   width: 90%;
-   margin: auto;
+   /* width: 90%;
+   margin: auto; */
    height: 70rpx;
    border-bottom: 1rpx solid #f5f6f6;
-   line-height: 85rpx;
-    font-weight: 600;
-   
-
+   line-height: 70rpx;
+   font-weight: 600;
+   padding-left: 20rpx;
+	 padding-right: 20rpx;
  }
  .classify_content{
    width: 100%
@@ -425,7 +428,7 @@ margin: auto;
 .no_child_lev{width: 100%; text-align: center; color: #adadad; padding-top: 30rpx}
 .classify_title {
-  width: 80%;
+  /* width: 80%; */
 }
 .brand_img_name {color: #666;}
@@ -521,22 +524,30 @@ margin: auto;
 	}
 	.classify_content > view:only-child .classify_content-frame {
-		padding-bottom: 0;
+		/* padding-bottom: 0; */
 	}
 	.classify_content > .classify_content-frame {
 		padding-bottom: 118rpx;
 	}
-
-
-  page {
-    /* overflow-x: hidden; */
-    /* padding-bottom: 40rpx; */
-  }
-	/* .my-container {
-		padding-bottom: 118rpx;
-	} */
+	.img-wrap {
+		width: 180rpx !important;
+		height: 180rpx !important;
+	}
+	
+	.rmb::before {
+		content: '￥';
+		font-size: 24rpx;
+	}
+	
+	
+	.item-cont .title {
+		margin-bottom: 0 !important;
+	}
+	
+	
+
 /* 风格三商品列表样式引入 */
 @import "../goodsList/goodsList.wxss";
 \ No newline at end of file