From b03a4dc6361869c7bdeb89f59676bc1cc89ca7f3 Mon Sep 17 00:00:00 2001
From: abson <antploy.ni@meidd.com>
Date: Thu, 3 Mar 2022 10:30:18 +0800
Subject: [PATCH] oa单优化

---
 app.js                                                        | 12 ++----------
 packageA/pages/jfbuy/jfbuy.js                                 |  3 ---
 packageA/pages/liveStream/liveStream.js                       | 16 +++++++---------
 packageA/pages/quan_list/quan_list.wxml                       | 51 ++++++++++++++++++++++++++-------------------------
 packageA/pages/quan_pro/quan_pro.wxml                         |  2 +-
 packageB/pages/zuhegou/index/index.js                         | 10 +++++-----
 packageB/pages/zuhegou/preindex/index.js                      |  9 ++++-----
 packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml          |  2 +-
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js | 11 ++++++-----
 pages/activity/pind_list/pind_list.js                         |  3 ---
 pages/activity/seckill_list/seckill_list.js                   |  3 ---
 pages/giftpack/buygiftpack/giftpackbuy.js                     | 12 ++++++------
 pages/giftpack/giftpacklist/giftpacklist.js                   | 13 ++++---------
 pages/giftpack/mygiftpack/mygiftpack.js                       | 11 ++++++-----
 pages/goods/categoryList/categoryList.js                      |  3 ---
 pages/goods/goodsInfo/buy_flash_normal.wxml                   |  2 +-
 pages/goods/goodsInfo/buy_integral.wxml                       |  2 +-
 pages/goods/goodsInfo/buy_integral_normal.wxml                |  2 +-
 pages/goods/goodsInfo/buy_pt.wxml                             |  2 +-
 pages/goods/goodsInfo/goodsInfo.js                            | 40 ++++++++++++++++++++++++++++++++++++----
 pages/goods/goodsInfo/goodsInfo.wxml                          |  4 ++--
 pages/index/index/index.js                                    |  3 ---
 pages/template/index.js                                       |  3 ---
 pages/user/assistance/assistance.js                           |  9 ++++-----
 pages/user/index/index.js                                     | 17 ++++++++++++++++-
 pages/user/index/index.wxml                                   |  2 +-
 pages/user/userinfo/userinfo.js                               | 17 +++++++++++++++++
 pages/user/userinfo/userinfo.wxml                             |  6 ++----
 28 files changed, 150 insertions(+), 120 deletions(-)

diff --git a/app.js b/app.js
index f24da70..7c34f27 100644
--- a/app.js
+++ b/app.js
@@ -430,16 +430,8 @@ App({
     //获取场景值 判断是否是单页面
     is_Single_page() {
         let scene = wx.getLaunchOptionsSync().scene; 
-        //--先判断会员状态--
-        if (scene == 1154) {
-            wx.showToast({
-                title: '请前往小程序',
-                icon: "error",
-                duration: 3000,
-            })
-            return false
-        }
-        return true;
+        //--判断是否是单页面--
+        return  scene == 1154? false:true;
     },
 
 
diff --git a/packageA/pages/jfbuy/jfbuy.js b/packageA/pages/jfbuy/jfbuy.js
index de31b5b..1e5edd9 100644
--- a/packageA/pages/jfbuy/jfbuy.js
+++ b/packageA/pages/jfbuy/jfbuy.js
@@ -65,9 +65,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-	if(!getApp().is_Single_page()){
-		return false;
-	  }
 	    var th=this;
 	    this.data.requestData={
 			store_id:oo.stoid,
diff --git a/packageA/pages/liveStream/liveStream.js b/packageA/pages/liveStream/liveStream.js
index 637bd7f..158e0e5 100644
--- a/packageA/pages/liveStream/liveStream.js
+++ b/packageA/pages/liveStream/liveStream.js
@@ -208,17 +208,15 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    if(!getApp().is_Single_page()){
-      return false;
-    }
 		self = this;
-    // console.log('ppppp',this.pageTotal(4, 10));
+		if(getApp().is_Single_page()){
+      app.isLogin().then(function(data) {//进入页面前已经授权登录成功
+        self.setData({
+          userInfo: data,
+        });
+      });
+    }
 		
-		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
-			self.setData({
-				userInfo: data,
-			});
-		});
   },
 
   /**
diff --git a/packageA/pages/quan_list/quan_list.wxml b/packageA/pages/quan_list/quan_list.wxml
index f702d52..50866d9 100644
--- a/packageA/pages/quan_list/quan_list.wxml
+++ b/packageA/pages/quan_list/quan_list.wxml
@@ -4,44 +4,46 @@
 
 <block wx:if="{{config2.couponset}}">
     <view class="header">
-       <rich-text  nodes="{{config2.couponset}}" class="r_txt fs26"></rich-text>
+        <rich-text nodes="{{config2.couponset}}" class="r_txt fs26"></rich-text>
     </view>
 </block>
 <view class="content">
-   <view bindtap="go_detail" data-ind="{{index}}" class="quan_item flex fs30" wx:for="{{dataList}}">
+    <view bindtap="go_detail" data-ind="{{index}}" class="quan_item flex fs30" wx:for="{{dataList}}">
         <!-- 左边 -->
         <view class="left {{tool.get_color(index,dataList)}} flex ai-center jc-center co-w">
             <view class="t-c">
-               <view class="fs40"><text class="fs24">￥</text>{{filters.toFix(item.money,2)}}</view>
-               <view>满{{filters.toFix(item.condition,2)}}可用</view>
+                <view class="fs40"><text class="fs24">￥</text>{{filters.toFix(item.money,2)}}</view>
+                <view>满{{filters.toFix(item.condition,2)}}可用</view>
             </view>
         </view>
-       <!-- 右边 -->
+        <!-- 右边 -->
         <view class="right fs24 co_g pding" style="background-image:url({{iurl}}/miniapp/images/coupon_img/white.png); position: relative">
-              <view class="fs28 co_b" style="margin-top: 15rpx">{{item.name}}</view>
+            <view class="fs28 co_b" style="margin-top: 15rpx">{{item.name}}</view>
 
-              <view class="ellipsis-1" style="margin-top: 5rpx" wx:if="{{item.coupon_remark!=null && item.coupon_remark!=''}}">{{item.coupon_remark}}</view>
-              <view style="margin-top: 5rpx" wx:else>所有门店通用</view>
-              <view wx:if="{{item.endtype==0}}">有效期              
-                 <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
-                  <text wx:if="{{item.starttype==0 && item.use_start_time>0}}"> {{filters.format_time(item.use_start_time)}}</text>至
-                  <text wx:if="{{item.use_end_time>0}}"> {{filters.format_time(item.use_end_time)}}</text><text wx:else>不限</text>
-              </view>
-              <view wx:else>有效期 <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
+            <view class="ellipsis-1" style="margin-top: 5rpx" wx:if="{{item.coupon_remark!=null && item.coupon_remark!=''}}">{{item.coupon_remark}}</view>
+            <view style="margin-top: 5rpx" wx:else>所有门店通用</view>
+            <view wx:if="{{item.endtype==0}}">有效期
+                <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
+                <text wx:if="{{item.starttype==0 && item.use_start_time>0}}"> {{filters.format_time(item.use_start_time)}}</text>
+                至
+                <text wx:if="{{item.use_end_time>0}}"> {{filters.format_time(item.use_end_time)}}</text><text wx:else>不限</text>
+            </view>
+            <view wx:else>有效期 
+                <text wx:if="{{item.starttype==1}}">{{filters.format_time(getcurday+3600*24*item.startdays)}}</text>
                 <text wx:else>{{filters.format_time(getcurday)}}</text>
                 至
-                 <text wx:if="{{item.days>0}}">{{filters.format_time(getcurday+3600*24*item.days)}}</text>
-                 <text wx:else>不限</text>
-                
-                </view>
-              <view>每人限领：<text wx:if="{{item.everyone_num>0}}">{{item.everyone_num}}</text><text wx:else>不限</text></view>
-              <!-- 领取按钮 -->
-              <view data-ind="{{index}}"  data-cid="{{item.id}}" catchtap="get_quan">
+                <text wx:if="{{item.days>0}}">{{filters.format_time(getcurday+3600*24*item.days+3600*24*item.startdays)}}</text>
+                <text wx:else>不限</text>
+
+            </view>
+            <view>每人限领：<text wx:if="{{item.everyone_num>0}}">{{item.everyone_num}}</text><text wx:else>不限</text></view>
+            <!-- 领取按钮 -->
+            <view data-ind="{{index}}" data-cid="{{item.id}}" catchtap="get_quan">
                 <view wx:if="{{item.everyone_num>0 && item.lqnum>=item.everyone_num}}" class="btn flex jc-center ai-center is_get">已领取</view>
                 <view wx:else class="btn flex jc-center ai-center">立即领取</view>
-              </view>
+            </view>
         </view>
-   </view>
+    </view>
 </view>
 
 <view wx:if="{{show_success}}">
@@ -58,5 +60,4 @@
 </view>
 
 <warn id="warn"></warn>
-<nav_box id="nav"></nav_box>
-
+<nav_box id="nav"></nav_box>
\ No newline at end of file
diff --git a/packageA/pages/quan_pro/quan_pro.wxml b/packageA/pages/quan_pro/quan_pro.wxml
index 0c6bfa6..e1e45dc 100644
--- a/packageA/pages/quan_pro/quan_pro.wxml
+++ b/packageA/pages/quan_pro/quan_pro.wxml
@@ -40,7 +40,7 @@
                 <view wx:else class="lower fs30">有效期
                     <text wx:if="{{ q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}</text>
                     <text wx:else>{{filters.format_time(getcurday)}}</text>至
-                    <text wx:if="{{q_data.days>0}}"> {{filters.format_time(getcurday+3600*24*q_data.days)}}</text><text wx:else>不限</text>
+                    <text wx:if="{{q_data.days>0}}"> {{filters.format_time(getcurday+3600*24*q_data.days+3600*24*q_data.startdays)}}</text><text wx:else>不限</text>
                 </view>
             </block>
 
diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js
index babfe12..f21a4be 100644
--- a/packageB/pages/zuhegou/index/index.js
+++ b/packageB/pages/zuhegou/index/index.js
@@ -123,9 +123,7 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-        if(!getApp().is_Single_page()){
-            return false;
-          }
+        
         console.log(options, 111);
         self = this;
         var the_id = options.id;
@@ -160,8 +158,10 @@ Page({
         //如果有会员的时候
         var userInfo = getApp().globalData.userInfo;
         if (!userInfo) {
-            getApp().goto("/pages/togoin/togoin");
-            return false;
+            if(getApp().is_Single_page()){
+                getApp().goto("/pages/togoin/togoin");
+                return false;
+              }
         }
     },
 
diff --git a/packageB/pages/zuhegou/preindex/index.js b/packageB/pages/zuhegou/preindex/index.js
index b875711..d8bad75 100644
--- a/packageB/pages/zuhegou/preindex/index.js
+++ b/packageB/pages/zuhegou/preindex/index.js
@@ -123,9 +123,6 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-        if(!getApp().is_Single_page()){
-            return false;
-          }
         console.log(options, 111);
         self = this;
         var the_id = options.id;
@@ -160,8 +157,10 @@ Page({
         //如果有会员的时候
         var userInfo = getApp().globalData.userInfo;
         if (!userInfo) {
-            getApp().goto("/pages/togoin/togoin");
-            return false;
+            if(getApp().is_Single_page()){
+                getApp().goto("/pages/togoin/togoin");
+                return false;
+              }
         }
     },
 
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
index df0180a..a35df7b 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
@@ -5,7 +5,7 @@
 
       <!-- 商品名称 -->
       <view class="spec-goods">
-        <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
+        <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
         <view class="spec-goods-info">
           <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
           <view class="flex ai_end xc-val-money {{sele_g[card_field]}}" >
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index b03a1a9..fe2c7e0 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -285,9 +285,7 @@ Page({
 
   //------初始化加载----------
   onLoad: function (t) {
-    if(!getApp().is_Single_page()){
-      return false;
-    }
+    
     // console.log('onload');		
 		if(t && t.group_id) {
 			this.data.group_id = t.group_id;
@@ -534,10 +532,13 @@ Page({
     //--先判断会员登陆状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+        
+      if(getApp().is_Single_page()){
         wx.navigateTo({
-        url: '/pages/togoin/togoin',
-        })
+          url: '/pages/togoin/togoin',
+          })
         return false;
+      }
     }
 		
   },
diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js
index af4770e..e6c1775 100644
--- a/pages/activity/pind_list/pind_list.js
+++ b/pages/activity/pind_list/pind_list.js
@@ -22,9 +22,6 @@ Page({
 
   //------初始化加载----------
   onLoad: function (t) {
-    if(!getApp().is_Single_page()){
-      return false;
-    }
     wx.setNavigationBarTitle({
       title: "天天拼单",
     })
diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js
index c732c09..0c27e38 100644
--- a/pages/activity/seckill_list/seckill_list.js
+++ b/pages/activity/seckill_list/seckill_list.js
@@ -21,9 +21,6 @@ Page({
 
   //------初始化加载----------
   onLoad: function (t) {
-    if(!getApp().is_Single_page()){
-      return false;
-    }
     wx.setNavigationBarTitle({
       title: "商品秒杀",
     })
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
index 6d890ba..1b3de11 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.js
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -29,9 +29,7 @@ Page({
     first_leader: e.globalData.first_leader || 0, // 推荐人ID
   },
   onLoad: function (options) {
-    if(!getApp().is_Single_page()){
-      return false;
-    }
+    
     var th = this;
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     my_confirm.open_cancel(0);
@@ -73,15 +71,17 @@ Page({
         });
       }
     })
-
+    
 
   },
   onShow: function () {
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      getApp().goto('/pages/togoin/togoin');
-      return false;
+      if(getApp().is_Single_page()){
+        getApp().goto('/pages/togoin/togoin');
+        return false;
+      }
     }
     this.getList();
 
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 61d9712..e19352c 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -32,9 +32,6 @@ Page({
     first_leader: e.globalData.first_leader || 0, // 推荐人ID
   },
   onLoad: function (options) {
-    if(!getApp().is_Single_page()){
-      return false;
-    }
     var th = this;
     th.setData({
       isBuy: options.isBuy,
@@ -65,13 +62,11 @@ Page({
   onShow: function () {
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
-    
-    if(!getApp().is_Single_page()){
-      return false;
-    }
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      getApp().goto('/pages/togoin/togoin');
-      return false;
+      if(getApp().is_Single_page()){
+        getApp().goto('/pages/togoin/togoin');
+        return false;
+      }
     }
     if (this.data.isBuy == 0) {
       this.GetMyGiftList();
diff --git a/pages/giftpack/mygiftpack/mygiftpack.js b/pages/giftpack/mygiftpack/mygiftpack.js
index 0f38239..f893a97 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.js
+++ b/pages/giftpack/mygiftpack/mygiftpack.js
@@ -30,9 +30,6 @@ Page({
   },
 
   onLoad: function(options) {
-    if(!getApp().is_Single_page()){
-      return false;
-    }
     var th = this;
     th.setData({
       getStorageID: a.stoid,
@@ -79,8 +76,12 @@ Page({
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      getApp().goto('/pages/togoin/togoin');
-      return false;
+      if(getApp().is_Single_page()){
+        getApp().goto('/pages/togoin/togoin');
+        return false;
+      }
+      // getApp().goto('/pages/togoin/togoin');
+      // return false;
     }
     this.getList();
 
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index d37023c..e3d1305 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -93,9 +93,6 @@ Page({
 
 
     onLoad: function(tt) { 
-      if(!getApp().is_Single_page()){
-        return false;
-      }
       var that = this;
 	  var first_leader=tt.first_leader;  
 	  if(first_leader){
diff --git a/pages/goods/goodsInfo/buy_flash_normal.wxml b/pages/goods/goodsInfo/buy_flash_normal.wxml
index 056da29..0d15a59 100644
--- a/pages/goods/goodsInfo/buy_flash_normal.wxml
+++ b/pages/goods/goodsInfo/buy_flash_normal.wxml
@@ -3,7 +3,7 @@
 		  <view class="pding"> 
 		            <icon bindtap="closeSpecModal_flash_normal" class="modal-close" color="black" size="22" type="cancel"></icon>
 		            <view class="spec-goods">
-		              <image class="wh100 spec-img xc-distance-bottom" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
+		              <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
 		              <view class="spec-goods-info">
 		                <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view>
 		                <view class="flex ai_end xc-val-money">            		                    
diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
index 194cfb4..04b58fb 100644
--- a/pages/goods/goodsInfo/buy_integral.wxml
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -3,7 +3,7 @@
 		  <view class="pding"> 
 		            <icon bindtap="closeSpecModal_inte" class="modal-close" color="black" size="22" type="cancel"></icon>
 		            <view class="spec-goods">
-		              <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
+		              <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
 		              <view class="spec-goods-info">
 		                <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>
 		                <view class="flex ai_end xc-val-money">            
diff --git a/pages/goods/goodsInfo/buy_integral_normal.wxml b/pages/goods/goodsInfo/buy_integral_normal.wxml
index 80a417e..9449d8b 100644
--- a/pages/goods/goodsInfo/buy_integral_normal.wxml
+++ b/pages/goods/goodsInfo/buy_integral_normal.wxml
@@ -3,7 +3,7 @@
 		  <view class="pding"> 
 		            <icon bindtap="closeSpecModal_inte_normal" class="modal-close" color="black" size="22" type="cancel"></icon>
 		            <view class="spec-goods">
-		              <image class="wh100 spec-img xc-distance-bottom" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
+		              <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
 		              <view class="spec-goods-info">
 		                <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view>
 		                <view class="flex ai_end xc-val-money">            		                    
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index ae9a32f..96f4d63 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -5,7 +5,7 @@
 
       <!-- 商品名称 -->
       <view class="spec-goods">
-        <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
+        <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
         <view class="spec-goods-info">
           <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
           <view class="flex ai_end xc-val-money {{sele_g[card_field]}}" >
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index e2f0c16..146b870 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -4519,12 +4519,44 @@ Page({
             if (quan_list) {
                 for (var ind in quan_list) {
                     var ep = quan_list[ind];
-                    var start = ut.formatTime(ep.use_start_time, "yyyy-MM-dd");
-                    var end = ut.formatTime(ep.use_end_time, "yyyy-MM-dd");
-                    start = start.replace("00:00:00", "");
-                    end = end.replace("00:00:00", "");
+                    var start = "";
+                    var end = "";
+                    if(ep.endtype == 1){
+                        if(ep.starttype == 1) {
+                           start = ut.formatTime(ut.gettimestamp()+3600*24*ep.startdays,"yyyy-MM-dd");
+                        }else{
+                            start = ut.formatTime(ut.gettimestamp(),"yyyy-MM-dd");
+                        }
+                        if(ep.days > 0) {
+                            end = ut.formatTime(ut.gettimestamp()+3600*24*ep.startdays+3600*24*ep.days,"yyyy-MM-dd");
+                        }else{
+                            end = "不限";
+                        }
+                    }else {
+                        if(ep.starttype == 1 ){
+                            start = ut.formatTime(ut.gettimestamp()+3600*24*ep.startdays,"yyyy-MM-dd");
+                        }else{
+                            if(ep.starttype == 0 && ep.use_start_time >0) {
+                                start = ut.formatTime(ep.use_start_time ,"yyyy-MM-dd");
+                            }else{
+                                start = "不限"
+                            }
+                        }
+                        
+                        if(ep.use_end_time > 0 ) {
+                            end = ut.formatTime(ep.use_end_time ,"yyyy-MM-dd");
+                        }else{
+                            end = "不限"
+                        }
+                    }
                     quan_list[ind].start = start;
                     quan_list[ind].end = end;
+                    // var start = ut.formatTime(ep.use_start_time, "yyyy-MM-dd");
+                    // var end = ut.formatTime(ep.use_end_time, "yyyy-MM-dd");
+                    // start = start.replace("00:00:00", "");
+                    // end = end.replace("00:00:00", "");
+                    // quan_list[ind].start = start;
+                    // quan_list[ind].end = end;
                 }
             }
 
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index da994e7..04da22f 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -295,7 +295,7 @@
               <view class="co-red" wx:if="{{prom_type==0 || prom_type==3}}">
 
                 <view class="market-price flex" style="align-items: baseline;">
-                  <block wx:if="{{card_field && data[card_field]>0}}">
+                  <block wx:if="{{card_field && data[card_field]>0 && is_no_plus}}">
                     <view class="flex ai-center  grade-card-frame">
                       <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
                       <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
@@ -1470,7 +1470,7 @@
       <view class="top-frame">
         <view class="xc-coupon-frame ">
           <!-- -单张的券- -->
-          <view class="rel" wx:for="{{quan_list}}" wx:key="{{index}}">
+          <view class="rel" wx:for="{{quan_list}}" wx:key="id">
             <view class="coupon flex">
               <view class="circle xc-circular-one"></view>
               <view class="xc-coupon-left ">
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 26e62c9..dedb298 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -88,9 +88,6 @@ Page({
   },
 
   onLoad: async function (tt) {
-    if(!getApp().is_Single_page()){
-      return false;
-    }
     var th = this;
     var first_leader = tt.first_leader;
     if (!first_leader && tt.scene) {
diff --git a/pages/template/index.js b/pages/template/index.js
index 9a9a9d8..8a3e50c 100644
--- a/pages/template/index.js
+++ b/pages/template/index.js
@@ -15,9 +15,6 @@ Page({
   },
 
   onLoad: function(e) {
-    if(!getApp().is_Single_page()){
-      return false;
-    }
     var th = this;
 	this.data.temp_id=e.scene;
 	if(!this.data.temp_id)  
diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index b5541a8..5637522 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -39,9 +39,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-    if(!getApp().is_Single_page()){
-      return false;
-    }
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.set_name("助力", "/pages/user/assistance/assistance");
@@ -56,8 +53,10 @@ Page({
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      getApp().goto('/pages/togoin/togoin');
-      return false;
+      if(getApp().is_Single_page()){
+        getApp().goto('/pages/togoin/togoin');
+        return false;
+      }
     }
 
     var th = this;
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 08d61bf..d553601 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -25,6 +25,7 @@ Page({
     txmon: 0,
     byquan: 0,
     yuer: 0,
+    is_no_plus:1,
     currentPage: 1,
     recommend_list: [],
     tc_hide: true,
@@ -134,7 +135,21 @@ Page({
           }
       })
 
-
+       //调用接口判断商家plus有没有过期
+       rq.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
+        if (res.data.code == 0) {
+            var arr = res.data.data.pageData;
+            if (arr.length > 0) {
+                var item = arr[0];
+                if (item.is_sy == 0) {
+                    var now = Date.parse(new Date()); now = now / 1000;
+                    if (item.end_time < now) {
+                        th.setData({ is_no_plus: 0 })
+                    }
+                }
+            }
+        }
+    })
     var th=this;
 		
 		// 判断是否开启美业
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 32a1156..fc4fe8a 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -69,7 +69,7 @@
       </image>
 
     </view>
-    <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==2 && show_buy_plus}}">
+    <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==2 && show_buy_plus && is_no_plus}}">
       <view class="xc-add-member flex-center-around ">
       <view class="flex jc-center ai-center">
         <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index 4628203..6206e89 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -49,6 +49,7 @@ Page({
     fir_pick_index: 0,
     sec_pick_index: 0,
     is_gps: 1,
+    is_no_plus:1,
     lon: 0,
     only_pk: 0,
     open_ind_store: 0, //哪里打开的门店列表的控制属性
@@ -608,6 +609,7 @@ Page({
   },
   //------初始化加载----------
   onLoad: function(t) {
+    let th= this;
     var user = getApp().globalData.userInfo;
     if (user.card_field != '' && user.card_field != null && user.card_field != undefined && user.card_expiredate) {
       var now = ut.gettimestamp();
@@ -618,6 +620,21 @@ Page({
         this.puls_user();
       }
     }
+    //调用接口判断商家plus有没有过期
+    getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + r.stoid + "&type=3", {}).then(res => {
+      if (res.data.code == 0) {
+          var arr = res.data.data.pageData;
+          if (arr.length > 0) {
+              var item = arr[0];
+              if (item.is_sy == 0) {
+                  var now = Date.parse(new Date()); now = now / 1000;
+                  if (item.end_time < now) {
+                      th.setData({ is_no_plus: 0 })
+                  }
+              }
+          }
+      }
+  })
     this.initial_user();
 
     // 获取用户昵称
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index 5d93e3e..68cfc8b 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -11,17 +11,15 @@
 
       <view class="flex-center vipmax">
         <view>
-
           <view>
             <view class="ellipsis-2 Nickname" style="font-size: 31rpx">
               <view style="float:left;">{{user.nickname}}</view>
               <button bindtap="getUserProfile" style="margin-left:10rpx;float:left;width: 200rpx;height:50rpx;font-size:20rpx;" class="flex-center fs30 confirmtext"> 点击更新头像昵称 </button>
             </view>
-            
           </view>
 
           <view class="flex fs22 vip">
-            <block wx:if="{{isBool&&gradename}}">
+            <block wx:if="{{isBool && gradename}}">
               <navigator url="/pages/user/userqy/userqy">
                 <view class="flex-center AncrownMax">
                   <image class="Ancrown" src="{{iurl}}/miniapp/images/userqy/user_userqy_huang.png"></image>
@@ -29,7 +27,7 @@
                 </view>
               </navigator>
             </block>
-            <block wx:if="{{pulscardname && rank_switch > 0 }}">
+            <block wx:if="{{pulscardname && rank_switch > 0 && is_no_plus}}">
               <navigator url="/pages/user/plus/plus">
                 <view class="flex-center plusMax">
                   <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
--
libgit2 0.21.4