Merge remote-tracking branch 'origin/jeffrey/feat/coupon-center' into jeffrey/feat/coupon-center

app.json

@@ -29,7 +29,7 @@
     "navigationBarTextStyle": "black"
   },
   "usingComponents": {
-    "page" : "components/page/index"
+    "page-wrap" : "components/pageWrap/index"
   },
   "style": "v2",
   "sitemapLocation": "sitemap.json",

pages/luckDraw/index.wxml

@@ -1,5 +1,5 @@
 <!--pages/luckDraw/index.wxml-->
-<page id="Page">
+<page-wrap id="Page">
 
    <!-- 活动列表 -->
    <view class="_list">
@@ -37,4 +37,4 @@
 
    </view>
 
-</page>
+</page-wrap>

pages/signIn/activity/activity.js

@@ -21,7 +21,6 @@ Page({
                       { pos: 6, text: '星期六' }],
         lastSignInNode: { pos: 7, text: '星期天' },
         todayIsSigned: false,
-        isLogin: getMobileCache() != "",
         notUseNum: 0,
     },
 
@@ -36,6 +35,9 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
+        this.setData({
+            isLogin: getMobileCache() != "",
+        })
         this.data.dayOfWeek = this.getDayOfWeek()
         this.startLoadActivityData()
     },

pages/signIn/activity/activity.wxml

@@ -1,5 +1,5 @@
 <!--pages/signIn/index.wxml-->
-<page id="Page" wx:if="{{showPage}}">
+<page-wrap id="Page" wx:if="{{showPage}}">
 
 <custom-page head-bg-image="{{activity.themePic}}" bind:sizes="handlePageSizes">
     <topbar slot="head" title="签到中心" back-color="{{mainColor}}" title-color="{{mainColor}}" />
@@ -130,4 +130,4 @@
     </view>
 </view>
 
-</page>
+</page-wrap>

pages/welfareMall/activityInfo/activityInfo.wxml

@@ -1,4 +1,4 @@
-<page id="#Page">
+<page-wrap id="#Page">
   <image src="{{detail.fullCoverImg}}" mode="widthFix" class="top_img"></image>
   <view class="info_all flex-row">
     <view class="flex-row info">
@@ -83,4 +83,4 @@
         </view>
       <image class="widow_del" src="/images/welfareMall/window_del.png"  bindtap="goToOrderList"></image>
     </view>
-</page>
+</page-wrap>

pages/welfareMall/activityList/activityList.wxml

@@ -1,4 +1,4 @@
-<page id="Page">
+<page-wrap id="Page">
   <view class="top_banner flex-row">
     <view class="top_banner_item flex-column" bindtap="gotoPay">
       <view class="t_b_i_title">特惠券包</view>
@@ -31,7 +31,7 @@
         </view>
       </view>
     </view>
-</page>
+</page-wrap>
 
 
 <!-- <view class="coupon_item flex-row">

pages/welfareMall/index/index.wxml

@@ -1,4 +1,4 @@
-<page id="Page" class="{{grayTheme?'page':''}}">
+<page-wrap id="Page" class="{{grayTheme?'page':''}}">
   <view class='swiper_box'>
     <swiper class="swiper" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" current="{{currentSwiper}}" bindanimationfinish="swiperChange">
       <block wx:for="{{bannerList}}" wx:key="unique">
@@ -62,4 +62,4 @@
     </view>
   </view> -->
   </view>
-</page>
+</page-wrap>

pages/welfareMall/personal/personal.wxml

@@ -1,5 +1,5 @@
 <!--pages/welfareMall/personal/personal.wxml-->
-<page id="Page" class="{{grayTheme?'page':''}}">
+<page-wrap id="Page" class="{{grayTheme?'page':''}}">
 <custom-page head-bg-color="#fff2f3">  
   <view slot="body" class="personal flex-column">
     <!-- 首部个人信息 -->
@@ -42,7 +42,7 @@
       </view>
   </view>
 </custom-page>  
-</page>
+</page-wrap>
 
 <!-- 使用wxs 手机号码中间四位显示为*号 -->
 <wxs module="phone">