From 56cd5e3e617a5d1d79eb1e602ef8e56ecaa79e4e Mon Sep 17 00:00:00 2001
From: banche <wxdtest@yolipai.com>
Date: Sat, 25 Dec 2021 16:53:47 +0800
Subject: [PATCH] 组合购预热商品页

---
 packageB/pages/zuhegou/preindex/index.js   | 15 ++++++++-------
 packageB/pages/zuhegou/preindex/index.wxml | 22 +++-------------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/packageB/pages/zuhegou/preindex/index.js b/packageB/pages/zuhegou/preindex/index.js
index ce91880..3ec6801 100644
--- a/packageB/pages/zuhegou/preindex/index.js
+++ b/packageB/pages/zuhegou/preindex/index.js
@@ -179,6 +179,7 @@ Page({
                 var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + th.data.id + "/" + userInfo.user_id;
                 getApp().request.get(url, {
                     success: function (e) {
+
                         th.data.is_get_act = 1;
                         if (e.data.code == 0 && e.data.data) {
                             self.setData({
@@ -190,12 +191,12 @@ Page({
                                 });
                                 return false;
                             }
-                            if (ut.gettimestamp() < e.data.data.start_time) {
-                                th.setData({
-                                    error: '活动还未开始'
-                                });
-                                return false;
-                            }
+                            // if (ut.gettimestamp() < e.data.data.start_time) {
+                            //     th.setData({
+                            //         error: '活动还未开始'
+                            //     });
+                            //     return false;
+                            // }
                             if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) {
                                 //-- 获取商品列表 --
                                 self.get_list();
@@ -823,7 +824,7 @@ Page({
         if (!this.data.is_timer) return false;
         var th = this;
         // 获取当前时间，同时得到活动结束时间数组
-        var endTime = this.data.act.end_time;
+        var endTime = this.data.act.start_time;
         var newTime = ut.gettimestamp();
         // 对结束时间进行处理渲染到页面
         var obj = null;
diff --git a/packageB/pages/zuhegou/preindex/index.wxml b/packageB/pages/zuhegou/preindex/index.wxml
index dc70551..cf64874 100644
--- a/packageB/pages/zuhegou/preindex/index.wxml
+++ b/packageB/pages/zuhegou/preindex/index.wxml
@@ -16,14 +16,7 @@
     </view>
 
 
-    <view class="c_w mt20 fs32">门店:
-       <block  wx:if="{{def_pick_store}}">
-           <text wx:if="{{all_price>0}}">{{def_pick_store.pickup_name}}</text>
-           <text wx:else  bindtap="choose_store">{{def_pick_store.pickup_name}}</text>
-       </block>
-
-       <text wx:else bindtap="choose_store" >请选择门店</text>
-    </view>
+   
 
     <!-- 商品列表 -->
     <view class="list-container">
@@ -58,10 +51,7 @@
                                 </block>
                                 <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text>
                             </view>
-                            <view class="c-red pdr10 {{item.haveAdded ? 'active':''}}" catchtap="addToCart"
-                                  data-index="{{index}}">
-                                <text class="iconfont icon-gouwuche fs60"></text>
-                            </view>
+                            
                         </view>
                     </view>
                 </view>
@@ -89,13 +79,7 @@
                     买{{act.zhbuyqty}}件，下单立享【{{act.zhprice}}元任选{{act.zhbuyqty}}件】
                 </view>
         </block>
-        <view class="flex jc_sb ai_c pd20">
-            <view class="fs30">合计：
-                <text class="rmb c-red fs40">{{filters.toFix(all_price,2)}}</text>
-                <text class="iconfont icon-info cb fs24 mgl10" bindtap="showInfo"></text>
-            </view>
-            <view bindtap="go_cart" class="btn-container">去购物车</view>
-        </view>
+   
     </view>
     <!-- 分享 -->
     <view wx:if="{{imgDraw}}" class="share-container" bindtap="share">
--
libgit2 0.21.4