diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml index 0f19b5d..a2a5e5d 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxml +++ b/components/diy_goodsGroup/diy_goodsGroup.wxml @@ -534,8 +534,8 @@ - - + + @@ -567,9 +567,8 @@ - - {{item.goods_name}} + {{item.goods_name}} @@ -698,7 +697,6 @@ - diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss index 095e1fe..4c5461b 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxss +++ b/components/diy_goodsGroup/diy_goodsGroup.wxss @@ -139,7 +139,7 @@ border-bottom: 2rpx #eee solid; /* padding: 10rpx; */ background-color: white; - padding: 20rpx; + margin: 20rpx; /* background-color: pink; */ box-sizing: border-box; } @@ -149,7 +149,7 @@ min-height: 300rpx; display: flex; /* border-bottom: 2rpx #eee solid; */ - padding: 10rpx; + margin: 10rpx; background-color: white; } @@ -901,6 +901,10 @@ top: 10rpx; border-radius: 40rpx; } +.zs_goods_xiao_wai{ padding-top:1rpx } +.s1_gk_a1.list_border{ display: block; border-bottom: 1rpx solid #eee} + + diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index 93f7bf0..81f522e 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -1126,10 +1126,10 @@ Page({ if(this.data.reg_info.introducer_state){ let tjrname = this.data.referee; if (tjrname == "" || tjrname == null) { - app.my_warnning("请输入推荐人", 0, this); - return false; + //app.my_warnning("请输入推荐人", 0, this); + //return false; }; - data.tjrname=tjrname; + if(tjrname) data.tjrname=tjrname; } //-- 需要姓名 -- @@ -1150,7 +1150,6 @@ Page({ }; data.sex=sex; } - //需要生日 if(this.data.reg_info.birthday_state){ let birthday = this.data.datet; diff --git a/pages/template/index.js b/pages/template/index.js index 546906d..9efa74d 100644 --- a/pages/template/index.js +++ b/pages/template/index.js @@ -126,7 +126,7 @@ Page({ var ob = { title: this.data.share_title, path: url, - imageUrl:this.data.url+this.data.store_config.store_logo, + //imageUrl:this.data.url+this.data.store_config.store_logo, }; return ob; }, @@ -152,9 +152,8 @@ Page({ var ob = { title:share_title, - //path: url, query:url, - imageUrl:this.data.url+store_config.store_logo, + //imageUrl:this.data.url+store_config.store_logo, }; console.log(ob); return ob;