From f21fbf63503b6d0a8fb37643c4555e75bce1fe68 Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Thu, 5 Sep 2019 14:52:33 +0800
Subject: [PATCH] 商品详情页的商品名称显示，以及在确认订单页 商品还在预热时，还是用普通商品价格来购买

---
 pages/cart/cart2/cart2.js            |  2 +-
 pages/goods/goodsInfo/goodsInfo.js   |  2 +-
 pages/goods/goodsInfo/goodsInfo.wxml | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 13c793c..3495567 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -332,7 +332,7 @@ 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(tt.data.code==0){
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 46ee0e0..5fa598e 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -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,
                   });
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 0d40213..90ce198 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -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暂时注释 -->
--
libgit2 0.21.4