diff --git a/app.wxss b/app.wxss
index 6a43593..d9a0cdd 100644
--- a/app.wxss
+++ b/app.wxss
@@ -346,4 +346,7 @@ background: #ffe3e2;
}
.fs40 {
font-size: 40rpx;
+}
+.flex-wrap{
+ flex-wrap:wrap;
}
\ No newline at end of file
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 582ec11..5da9416 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -28,11 +28,12 @@ Page({
is_country:1,
//品牌的控制属性
is_brand:1,
- name: [{ names: "洗护用品" }, { names: "天天护理" }, { names: "个人洗护" }, { names: "轻奢" }, { names: "路虎" }, { names: "身体护理" }, { names: "品牌" }, { names: "面部护理" }],
+ name: [{ names: "洗护用品" }, { names: "天天护理" }, { names: "共顺利" },{ names: "个人洗护" }, { names: "轻奢" }, { names: "路虎" }, { names: "身体护理" }, { names: "品牌" }, { names: "面部护理" }],
//选择分类的控制属性
select_classify_on:223,
index:223,
classify_name:"国家",//项目类型
+ brand_list:null,//品牌列表
},
onLoad: function(tt) {
const res = wx.getSystemInfoSync(),
@@ -65,7 +66,12 @@ Page({
}
this.setData({
lettersPosition: temp
- })
+ });
+ console.log(this.data.is_used_share,"是什么东西啊");
+ if (this.data.is_used_share==0){
+ console.log("有进来m");
+ this.get_nation();
+ }
},
@@ -264,6 +270,7 @@ Page({
},
success: function (e) {
var dda = e.data.data.pageData;
+
s.setData({ nationlist:dda})
}
});
@@ -294,6 +301,8 @@ Page({
success: function (e) {
var arr=new Array();
var dda = e.data.data.pageData;
+ console.log("商品数据",dda);
+ s.setData({brand_list:dda});
for (var i = 0; i < dda.length; i++) {
dda[i].logo = oo.imghost+dda[i].logo;
@@ -353,8 +362,23 @@ Page({
// 新的版本分类
click_classify:function(e){
var indexs=e.currentTarget.dataset.index;
+ var name = e.currentTarget.dataset.name;
console.log("获取当前下标",indexs);
- this.setData({ select_classify_on: indexs, index: indexs});
- }
+ this.setData({ select_classify_on: indexs, index: indexs, classify_name:name});
+ if (indexs==220){
+ this.get_brand();
+ }
+
+ },
+// 图片失败
+ bind_bnerr_xc: function (e) {
+ var _errImg = e.target.dataset.errorimg;
+ var _errurl = e.target.dataset.url;
+
+ var _errObj = {};
+ _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
+ this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+
+ },
});
\ No newline at end of file
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index faaed5b..1eb5d76 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -128,19 +128,117 @@
品牌
-
- {{ittm.names}}
+
+
+
+
+ {{names}}
+
+
+
+
+
+ {{ittm.names}}
+
+
+
+
+
-{{classify_name}}
-
+
+{{classify_name}}
+
+ 选择更多
+
+
+
+
+
+
+
+
+
+
+ {{bitem.name}}
+
+ enname
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{user.name}}
+
+
+
+
+
+
+
+
+
+
+ 你好呃呃
+
+
+
+
+ 你好
+
+
+
+
+ 你好
+
+
+
+
+ 你好
+
+
+
+
+ 你好
+
+
+
+
+ 你好品牌
+
+
+
+
+ 你好慢慢
+
+
+
+
+ 你好
+
+
+
+
+ 你好匿名
+
+
+
+
diff --git a/pages/goods/categoryList/categoryList.wxss b/pages/goods/categoryList/categoryList.wxss
index 47a1e90..a00bbc3 100644
--- a/pages/goods/categoryList/categoryList.wxss
+++ b/pages/goods/categoryList/categoryList.wxss
@@ -10,6 +10,7 @@ page{height: 100%; background: #fff;}
flex-flow: row;
justify-content: center;
margin-left: 15%;
+
}
.swiper-tab-item{
width: 30%;
@@ -172,11 +173,14 @@ swiper{
.share-height{
line-height: 20rpx;
margin-right: 15rpx;
+margin-top: 8rpx;
}
.scanning_black-img{
width:50rpx;
height: 45rpx;
+ margin-bottom: 5rpx;
+
}
.search-img.left{
margin-left: 35rpx;
@@ -219,12 +223,12 @@ margin-top: 35rpx;
white-space: nowrap;
overflow: hidden;
width: 50%;
-letter-spacing: 60rpx;
+/* letter-spacing: 60rpx; */
margin: auto;
margin-top: 35rpx;
}
.select_classify{
- background: #ffe3e2;
+ background: #d60021;
border-radius: 30rpx;
color: #fff;
height: 48rpx;
@@ -234,8 +238,11 @@ line-height: 45rpx;
.select_classify.width80{
width: 74.5%;
}
- .text-indent{
- text-indent: 31rpx;
+ .select_classify.width80.text-indent{
+ text-indent: 38rpx;
+ padding-right: 20px;
+width: 60%;
+
}
.classify_name{
width: 90%;
@@ -244,6 +251,7 @@ line-height: 45rpx;
border-bottom: 1rpx solid #eee;
line-height: 85rpx;
font-weight: 600;
+
}
.classify_content{
@@ -252,8 +260,90 @@ line-height: 45rpx;
}
.classify_content-frame{
width: 90%;
- height: 90%;
margin: auto;
flex-wrap:wrap;
justify-content:space-between;
+ height: 90%;
+ overflow-y:scroll;
+ overflow: hidden scroll;
+
+ }
+ .country_img-frame{
+ width: 48%;
+ height: 140rpx;
+
+ }
+ .country_img{
+ width: 100%;
+ height: 100%;
+ }
+ .outer_location{
+ top:0rpx;
+ left: 0rpx;
+ margin-top: 20rpx;
+
+ }
+ .nation_box.box{
+ top: 16%;
+width:80%;
+height:70%;
+left: 70.5%;
+
+ }
+ .nt_1.line-height{
+ line-height: 65rpx;
+ height: 72rpx;
+margin-top: -5rpx;
+
+ }
+ .nt_1_t.height{
+ height: 54rpx;
+ }
+ .nt_1.height{
+ height: 56rpx;
+line-height: 65rpx;
+ }
+ .nt_2.line-height{
+ height: 0rpx;
+ line-height: 0rpx;
+
+ }
+ .nt_1_t.fs24{
+ font-size: 24rpx;
+ }
+ .nt_2.fs24{
+ font-size: 24rpx;
+ }
+ .brand_img_frame{
+ width: 30%;
+ height: 220rpx;
+ margin-top: 18rpx;
+
+ }
+
+ .brand_img{
+ width:100%;
+ height: 70%;
+ margin-bottom: 10rpx
+ }
+ .brand_img-name{
+ width: 100%;
+ height: 20%;
+ }
+ .select_classify.width80.text3{
+padding-right: 20rpx;
+padding-left: 20rpx;
+width: 62%;
+
+ }
+ .width_height{
+ width: 18rpx;
+ height: 18rpx;
+ }
+ .select_more{
+line-height: 38rpx;
+height: 35rpx;
+margin-top: 23rpx;
+
+
}
\ No newline at end of file