diff --git a/components/diy_advertising/diy_advertising.wxml b/components/diy_advertising/diy_advertising.wxml
index 8a0396c..baf1cbb 100644
--- a/components/diy_advertising/diy_advertising.wxml
+++ b/components/diy_advertising/diy_advertising.wxml
@@ -11,10 +11,10 @@
-
+
-
+
@@ -35,11 +35,11 @@
-
+
-
+
@@ -63,11 +63,11 @@
-
+
-
+
@@ -90,8 +90,8 @@
200*200
-
-
+
+
@@ -100,8 +100,8 @@
200*200
-
-
+
+
@@ -119,10 +119,10 @@
>
-
+
-
+
@@ -134,11 +134,11 @@
-
+
-
+
@@ -150,10 +150,10 @@
-
+
-
+
@@ -172,11 +172,11 @@
-
+
-
+
@@ -187,11 +187,11 @@
-
+
-
+
@@ -205,11 +205,11 @@
-
+
-
+
@@ -220,11 +220,11 @@
-
+
-
+
@@ -242,11 +242,11 @@
-
+
-
+
@@ -258,10 +258,10 @@
-
+
-
+
@@ -276,11 +276,11 @@
-
+
-
+
@@ -291,11 +291,11 @@
-
+
-
+
@@ -315,11 +315,11 @@
-
+
-
+
@@ -330,11 +330,11 @@
-
+
-
+
@@ -348,11 +348,11 @@
-
+
-
+
@@ -364,11 +364,11 @@
-
+
-
+
@@ -383,11 +383,11 @@
-
+
-
+
@@ -411,14 +411,14 @@
-
+
{{item.title}}
-
+
{{item.title}}
diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 5072fd3..0183113 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -260,6 +260,7 @@ Component({
//---卡的初始化----
card_init: function() {
var th = this,os=getApp().globalData.setting;
+ if(!getApp().globalData.user_id) return false;
getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
isShowLoading:false,
success: function(e) {
@@ -389,12 +390,12 @@ Component({
//--- 设置 ---
set_good:async function(goods){
var now=ut.gettimestamp();
- var th=this;
- for(var i in goods){
+ var th=this;
+ if(!goods || goods.length==0) return false;
+ for(var i in goods){
var val=goods[i];
var item = {};
var prom_id = null;
- console.log(val.goodsid);
//app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
item.goods_name = val.goods_name;
@@ -422,7 +423,7 @@ Component({
url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;
}
- if(url!=null){
+ if(url!=null && url!=''){
await getApp().request.promiseGet(url, {}).then(res => {
var prom =null;
if(res && res.data) res.data.data;
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index 458a9e3..e57fa8c 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -19,7 +19,7 @@
@@ -166,7 +166,7 @@
-
-
-
@@ -628,7 +628,7 @@
-
+