From 2bc07acea6175b4ea7b2f38ae93f2adc5eac4a4e Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Mon, 9 Dec 2019 09:42:53 +0800
Subject: [PATCH] 商品分组的自定义组件的修改

---
 components/diy_goodsGroup/diy_goodsGroup.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index f0a1954..da026af 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -90,6 +90,9 @@ Component({
           index = 0,
           gdata = [];
 
+      //--初始化卡类--
+      th.card_init();
+
       classstyle_id = classstyle_id + "";
       switch (classstyle_id) {
         case "1":
@@ -135,7 +138,7 @@ Component({
               var prom = res.data.data;
               var now=ut.gettimestamp();
               if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
-                item.shop_price = res.data.data.price;
+                item.prom_price = res.data.data.price;
               }
               th.data.requestData.push(item);
               th.setData({
@@ -200,7 +203,7 @@ Component({
                await app.request.promiseGet(url, {}).then(res => {
                   var prom = res.data.data;
                   if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
-                    item.shop_price = res.data.data.price;
+                    item.prom_price = res.data.data.price;
                   }
                   th.data.requestData.push(item);
                   th.setData({
@@ -268,7 +271,7 @@ Component({
                await app.request.promiseGet(url, {}).then(res => {
                   var prom = res.data.data;
                   if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
-                    item.shop_price = res.data.data.price;
+                    item.prom_price = res.data.data.price;
                   }
                   th.data.requestData.push(item);
                   th.setData({
@@ -304,7 +307,7 @@ Component({
     },
 	
 	//---卡的初始化----
-	card_init: function(func) {
+	card_init: function() {
 	  var th = this;
 	  getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
 	    success: function(e) {
@@ -343,11 +346,9 @@ Component({
 	                    card_list: ob.card_list
 	                  });
 	                }
-	                //---回调----
-                    if(func)  func()
+
 	              }
-                  //---回调----
-                  if(func) func()
+
 	            }, 500)
 	          })
 	
--
libgit2 0.21.4