Merge branch 'dev' into 'test'

Dev See merge request !19

Merge branch 'dev' into 'test'
Dev See merge request !19
后端研发-苏明海
2 parents 531eb7c3 f21fbf63
Showing 3 changed files with 10 additions and 8 deletions
pages/cart/cart2/cart2.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -332,10 +332,10 @@ Page({
               break;
             case 1: //---秒杀-----
-              getApp().request.get("/api/weshop/activitylist/getGoodsPrice/"+gd.store_id
+              getApp().request.get("/api/weshop/activitylist/getSJGoodsPrice/"+gd.store_id
                 + "/" + gd.goods_id + "/1/" + gd.prom_id,{
                 success: function (tt) {
-                  if(t.data.code==0){
+                  if(tt.data.code==0){
                     t.data.data.shop_price=tt.data.data.prom_price;
                   }else{
                     t.data.data.prom_id = 0; t.data.data.prom_type = 0;
@@ -1336,7 +1336,7 @@ Page({
                 }
                 //----已经过期-----
                 var now = ut.gettimestamp();
-                if (t.data.data.end_time < now) {
+                if (t.data.data.end_time < now ) {
                   ee.setData({
                     prom_type: 0,isshow:1,
                   });
@@ -124,9 +124,10 @@
             <view class="pt_fir_title ">
               <!-- 许程 商家团主页 -->
               <view class="xc-goods-explain flex-vertical-between">
-                <view class="xc-explain fs32 ellipsis-2"  wx:if="{{data.prom_type!=0}}">
+                <view class="xc-explain fs32 ellipsis-2"  wx:if="{{prom_type!=0 }}">
                   {{data.goods_name}}
                 </view>
+
                 <view class="xc-share-frame-jieti flex"  bindtap="saveImageToPhotosAlbum" style="top:0">
                   <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image>
                   <view class="share-font">分享</view>
@@ -251,7 +252,7 @@
               </view>
             </view>
-            <view class="goods-num" wx:if="{{data.prom_type!=1}}">
+            <view class="goods-num" wx:if="{{prom_type!=1}}">
               <view class="sales">销量:{{data.sales_sum}}件</view>
               <view class="stock">折扣：{{data.disc}}折</view>
               <view class="stock">{{categories3[0].num}}人评价</view>
@@ -272,19 +273,20 @@
               </view>
             </view>
             <view style='height:42rpx'></view>
-            <view class="xc-explain fs32 ellipsis-2" wx:if="{{data.prom_type!=0}}">
+            <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0}}">
               {{data.goods_name}}
             </view>
             <view wx:if="{{prom_type==1}}" style='height:58rpx'></view>
             <!-- 许程 7.24 暂时注释 -->
-            <view wx:if="{{prom_type!=1}}">
-              <view class="goods-num" wx:if="{{data.prom_type==1}}">
+            <view wx:if="{{prom_type==1}}">
+              <view class="goods-num" wx:if="{{prom_type==1}}">
                 <view class="stock">总数量：{{prom_act.goods_num}}件</view>
                 <view class="stock">限购:{{prom_act.buy_limit}}件</view>
                 <view class="sales">已购:{{prom_act.buy_num}}件</view>
               </view>
             </view>
+
           </view>
         </block>
         <!--许程 7.24暂时注释 -->