Browse Source

wesmiler 更新第5期更新代码合并

wesmiler 4 năm trước cách đây
mục cha
commit
74d8046568

+ 1 - 1
public/themes/default/weixin/match/index.html

@@ -118,7 +118,7 @@
     </div>
     </div>
 
 
     <!-- 签到 -->
     <!-- 签到 -->
-   <div class="signBox" v-if="!memberInfo.signed && showSign>0">
+   <div class="signBox" v-if="memberInfo.id && !memberInfo.signed && showSign>0">
        <div class="bg" @click="hideSign(2)"></div>
        <div class="bg" @click="hideSign(2)"></div>
        <div class="sign">
        <div class="sign">
            <div class="close" @click="hideSign(1)">x</div>
            <div class="close" @click="hideSign(1)">x</div>

+ 3 - 4
public/themes/default/weixin/public/assets/js/match.js

@@ -97,6 +97,8 @@ var app = new Vue({
         var total = sessionStorage.getItem('total');
         var total = sessionStorage.getItem('total');
         var dataList = sessionStorage.getItem('dataList')
         var dataList = sessionStorage.getItem('dataList')
         dataList = typeof (dataList) != 'undefined' && dataList != null? JSON.parse(dataList) : []
         dataList = typeof (dataList) != 'undefined' && dataList != null? JSON.parse(dataList) : []
+        var showSign = sessionStorage.getItem('showSign');
+        this.showSign = typeof(showSign) != 'undefined' && showSign !== null? showSign : 1;
         if(dataList && dataList.length>0 && !reset){
         if(dataList && dataList.length>0 && !reset){
             this.slideIndex = typeof (slideIndex) != 'undefined' && slideIndex>0? slideIndex : 0
             this.slideIndex = typeof (slideIndex) != 'undefined' && slideIndex>0? slideIndex : 0
             this.slideIndex = this.slideIndex <= dataList.length? this.slideIndex : 0
             this.slideIndex = this.slideIndex <= dataList.length? this.slideIndex : 0
@@ -109,11 +111,8 @@ var app = new Vue({
             this.getDataList(false);
             this.getDataList(false);
         }
         }
 
 
-        var showSign = sessionStorage.getItem('showSign');
-        this.showSign = typeof(showSign) != 'undefined' && showSign !== null? showSign : 1;
-
-        this.getInfo();
         this.getMeal();
         this.getMeal();
+        this.getInfo();
         this.getTopList();
         this.getTopList();
         this.getParams();
         this.getParams();
         this.initShare();
         this.initShare();