From a7fdbedf4c4eef582c31167c30b2c6a748811aba Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 27 Apr 2021 14:43:59 +0800
Subject: [PATCH] 秒杀，拼团，

---
 pages/activity/pind_list/pind_list.js         | 5 +++--
 pages/activity/pind_list/pind_list.wxml       | 5 ++---
 pages/activity/seckill_list/seckill_list.js   | 8 ++++----
 pages/activity/seckill_list/seckill_list.wxml | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js
index 29f9906..10325d2 100644
--- a/pages/activity/pind_list/pind_list.js
+++ b/pages/activity/pind_list/pind_list.js
@@ -20,6 +20,7 @@ Page({
 
     //------初始化加载----------
     onLoad: function(t) {
+		wx.setNavigationBarTitle({ title: "天天拼单",})
         var  first_leader = t.first_leader;
 		var th=this;
 
@@ -54,10 +55,10 @@ Page({
     },
 
     onShow: function(t) {
-
-       wx.setNavigationBarTitle({ title: "天天拼单",})
+     
        this.data.is_timer=1;
        this.data.currentPage=1;
+	   this.data.ismore=1;
        this.setData({goodlist:null});
        var th=this;
        this.requestSalelist();
diff --git a/pages/activity/pind_list/pind_list.wxml b/pages/activity/pind_list/pind_list.wxml
index b7b8789..15504b8 100644
--- a/pages/activity/pind_list/pind_list.wxml
+++ b/pages/activity/pind_list/pind_list.wxml
@@ -1,5 +1,3 @@
-<block wx:if="{{isshow}}">
-
 <view class=" body_frame">
 
 <block wx:if="{{ad_data}}">
@@ -89,6 +87,7 @@
 
 <view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view>
 </view>
-</block>
+
+
 
 <share_box id="share"></share_box>
\ No newline at end of file
diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js
index d107313..5aa7f4f 100644
--- a/pages/activity/seckill_list/seckill_list.js
+++ b/pages/activity/seckill_list/seckill_list.js
@@ -16,6 +16,8 @@ Page({
 
     //------初始化加载----------
     onLoad: function(t) {
+		 wx.setNavigationBarTitle({ title: "商品秒杀",})
+		
         var  first_leader = t.first_leader;
 		var th=this;
 
@@ -51,10 +53,8 @@ Page({
     },
 
 
-    onShow: function(t) {
-
-        wx.setNavigationBarTitle({ title: "商品秒杀",})
-
+    onShow: function(t) {       
+       this.data.ismore=1;
        this.data.is_timer=1;
        this.data.currentPage=1;
        var th=this;th.setData({goodlist:null,})
diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml
index 457b437..f714cf7 100644
--- a/pages/activity/seckill_list/seckill_list.wxml
+++ b/pages/activity/seckill_list/seckill_list.wxml
@@ -1,5 +1,5 @@
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
-<block wx:if="{{isshow}}">
+
 <view class=" body_frame">
 
 <block wx:if="{{ad_data}}">
@@ -76,6 +76,6 @@
 <view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view>
 </view>
 
-</block>
+
 
 <share_box id="share"></share_box>
--
libgit2 0.21.4