diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index ec66ad2..e34e511 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -151,6 +151,9 @@ Component({
           index = 0,
           gdata = [];
 
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+
       //--初始化卡类--
       th.card_init();
       var os=getApp().globalData.setting;
@@ -162,8 +165,10 @@ Component({
           for (var i = 0; i < g_id.length; i++) {
             str += g_id[i].goodsid + ",";           
           }
-          str=str.substring(0, str.length - 1);     
+          str=str.substring(0, str.length - 1);
+
           await app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str,  {
+          	    data:{user_id:user_id},
 			    isShowLoading:false,  
 			    success: function(res) {
                      th.data.loading=0;
@@ -218,6 +223,10 @@ Component({
            if(th.data.is_hot) r_data.is_hot=th.data.is_hot;
            if(th.data.is_new) r_data.is_new=th.data.is_new;
 
+            var user_id=getApp().globalData.user_id;
+            if(!user_id) user_id=0;
+            r_data.user_id=user_id;
+
          await app.request.promiseGet("/api/weshop/goods/page", {
               data:r_data
           }).then(res => {
@@ -245,6 +254,7 @@ Component({
 			  isonsale: 1,
 			  orderField: "sort",
 			  orderType: 'asc',
+			  user_id:user_id
             }
           }).then(res => {
             th.data.loading=0;
diff --git a/packageB/pages/user/collect_list/collect_list.wxml b/packageB/pages/user/collect_list/collect_list.wxml
index d20e43a..9b0b649 100644
--- a/packageB/pages/user/collect_list/collect_list.wxml
+++ b/packageB/pages/user/collect_list/collect_list.wxml
@@ -46,7 +46,7 @@
                 <!-- 优惠价 -->
                 <view class="price flex xc-wc">
                   <view class="fs24">￥</view>
-                  <view class="fs40">{{item.shop_price}}</view>
+                  <view class="fs40">{{item.prom_price?item.prom_price:item.shop_price}}</view>
                 </view>
                 <!-- 原价 -->
                 <view class="flex fs24 line through xc-ash">
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index caf3f37..e0492f8 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -605,7 +605,7 @@ Page({
     }).then(res => {
       var t = res;
       var data = t.data.data.pageData;
-      if (data.length > 0) {
+      if (data && data.length > 0) {
         //ee.setData({ is_collect: 1, collect_id: data[0].collect_id, });
         is_collect = 1;
         collect_id = data[0].collect_id;