| @@ -17,7 +17,7 @@ Page({ | |||||
| //存储计时器 | //存储计时器 | ||||
| setInter: "", | setInter: "", | ||||
| staticGamedata: {}, | staticGamedata: {}, | ||||
| showIf:false | |||||
| showIf:false, | |||||
| }, | }, | ||||
| onUnload: function() { | onUnload: function() { | ||||
| let that = this; | let that = this; | ||||
| @@ -73,12 +73,10 @@ | |||||
| <text>退款时间:</text> | <text>退款时间:</text> | ||||
| <text>{{updateDate}}</text> | <text>{{updateDate}}</text> | ||||
| </view> | </view> | ||||
| <view> | <view> | ||||
| <text>订单编号:</text> | <text>订单编号:</text> | ||||
| <text>{{data.orderId}}</text> | <text>{{data.orderId}}</text> | ||||
| </view> | </view> | ||||
| <!-- <view><text>手机号</text><text>2018.05.25</text></view> --> | |||||
| </view> | </view> | ||||
| <view class='notes' style="border-bottom:0"> | <view class='notes' style="border-bottom:0"> | ||||
| <view> | <view> | ||||
| @@ -92,7 +90,7 @@ | |||||
| <view class='game' bindtap="gotogame" wx-if="{{showIf}}"> | <view class='game' bindtap="gotogame" wx-if="{{showIf}}"> | ||||
| <view class='game-entry'> | <view class='game-entry'> | ||||
| <image src="{{staticGamedata.imgUrl}}" class='gameimg' mode='widthFix'></image> | <image src="{{staticGamedata.imgUrl}}" class='gameimg' mode='widthFix'></image> | ||||
| <text>新用户专享神秘礼物</text> | |||||
| <text>专享神秘礼物</text> | |||||
| <text>独家福利,抢完即止</text> | <text>独家福利,抢完即止</text> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -36,16 +36,11 @@ Page({ | |||||
| } | } | ||||
| }) | }) | ||||
| .then(res=>{ | .then(res=>{ | ||||
| console.log(res); | |||||
| console.log(JSON.parse(res.data.score.rules)); | |||||
| that.setData({ | that.setData({ | ||||
| flags: 'have', | flags: 'have', | ||||
| consumptionScoreNumber: res.data.score.consumptionScoreNumber, | |||||
| loginscoreNumber: res.data.score.loginScoreNumber, | |||||
| personscoreNumber: res.data.score.personScoreNumber, | |||||
| phonescoreNumber: res.data.score.phoneScoreNumber, | |||||
| wifiscoreNumber: res.data.score.wifiScoreNumber, | |||||
| bindCarScoreNumber: res.data.score.bindCarScoreNumber, | |||||
| rules: JSON.parse(res.data.score.rules), | |||||
| levelList: res.data.levelList | levelList: res.data.levelList | ||||
| }) | }) | ||||
| }) | }) | ||||
| @@ -2,59 +2,13 @@ | |||||
| <view class='title'>生成规则</view> | <view class='title'>生成规则</view> | ||||
| <view class='scroll'> | <view class='scroll'> | ||||
| <scroll-view scroll-x class="scroll-header"> | <scroll-view scroll-x class="scroll-header"> | ||||
| <view class="scroll-view-item"> | |||||
| <view class='thin_circle'> | |||||
| <view class='view'> | |||||
| <text>每日</text> | |||||
| <text>登录</text> | |||||
| </view> | |||||
| </view> | |||||
| <text>{{loginscoreNumber}}成长值</text> | |||||
| </view> | |||||
| <view class="scroll-view-item"> | |||||
| <view class='thin_circle'> | |||||
| <view class='view'> | |||||
| <text>线上</text> | |||||
| <text>交易1元</text> | |||||
| </view> | |||||
| </view> | |||||
| <text>{{consumptionScoreNumber}}成长值</text> | |||||
| </view> | |||||
| <view class="scroll-view-item"> | |||||
| <view class='thin_circle'> | |||||
| <view class='view'> | |||||
| <text>授权</text> | |||||
| <text>个人信息</text> | |||||
| </view> | |||||
| </view> | |||||
| <text>{{personscoreNumber}}成长值</text> | |||||
| </view> | |||||
| <view class="scroll-view-item"> | |||||
| <view class='thin_circle'> | |||||
| <view class='view'> | |||||
| <text>授权</text> | |||||
| <text>手机号</text> | |||||
| </view> | |||||
| </view> | |||||
| <text>{{phonescoreNumber}}成长值</text> | |||||
| </view> | |||||
| <view class="scroll-view-item"> | |||||
| <view class='thin_circle'> | |||||
| <view class='view'> | |||||
| <text>连接</text> | |||||
| <text>WIFI一次</text> | |||||
| </view> | |||||
| </view> | |||||
| <text>{{wifiscoreNumber}}成长值</text> | |||||
| </view> | |||||
| <view class="scroll-view-item"> | |||||
| <view class="scroll-view-item" wx:for="{{rules}}" wx:key="index"> | |||||
| <view class='thin_circle last'> | <view class='thin_circle last'> | ||||
| <view class="view"> | <view class="view"> | ||||
| <text>绑定</text> | |||||
| <text>车牌一个</text> | |||||
| <text>{{item.desc}}</text> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <text>{{bindCarScoreNumber}}成长值</text> | |||||
| <text>{{item.score}}成长值</text> | |||||
| </view> | </view> | ||||
| </scroll-view> | </scroll-view> | ||||
| </view> | </view> | ||||
| @@ -55,6 +55,7 @@ | |||||
| text-align: center; | text-align: center; | ||||
| display: inline-block; | display: inline-block; | ||||
| padding-left: 3rpx; | padding-left: 3rpx; | ||||
| margin-right: 30rpx; | |||||
| } | } | ||||
| .view text { | .view text { | ||||
| @@ -63,6 +64,9 @@ | |||||
| text-align: center; | text-align: center; | ||||
| color: #fd9643; | color: #fd9643; | ||||
| line-height: 32rpx; | line-height: 32rpx; | ||||
| width: 80rpx; | |||||
| margin: 0 auto; | |||||
| white-space: normal; | |||||
| } | } | ||||
| .scroll-view-item > text { | .scroll-view-item > text { | ||||
| @@ -7,7 +7,16 @@ Component({ | |||||
| /** | /** | ||||
| * 组件的属性列表 | * 组件的属性列表 | ||||
| */ | */ | ||||
| properties: {}, | |||||
| properties: { | |||||
| loading: { | |||||
| type: Boolean, | |||||
| value: '' | |||||
| }, | |||||
| loadingtext: { | |||||
| type: String, | |||||
| value: '' | |||||
| }, | |||||
| }, | |||||
| /** | /** | ||||
| * 组件的初始数据 | * 组件的初始数据 | ||||
| @@ -9,4 +9,5 @@ | |||||
| <text>我们正在筹备一大波优惠活动</text> | <text>我们正在筹备一大波优惠活动</text> | ||||
| </view> | </view> | ||||
| <view class="loading" wx:if="{{loading}}"><image src="./../../../assets/img/loading.gif" mode="widthFix"></image>{{content}}</view> | <view class="loading" wx:if="{{loading}}"><image src="./../../../assets/img/loading.gif" mode="widthFix"></image>{{content}}</view> | ||||
| <view class='loadingtext' wx:if="{{loadingtext}}">{{loadingtext}}</view> | |||||
| </view> | </view> | ||||
| @@ -44,3 +44,9 @@ | |||||
| height: 300rpx; | height: 300rpx; | ||||
| margin: 0 auto 16rpx; | margin: 0 auto 16rpx; | ||||
| } | } | ||||
| .loadingtext{ | |||||
| text-align: center; | |||||
| color: #888; | |||||
| font-size: 30rpx; | |||||
| margin-top:30rpx; | |||||
| } | |||||
| @@ -6,6 +6,7 @@ Page({ | |||||
| data: { | data: { | ||||
| market: app.globalData.market, | market: app.globalData.market, | ||||
| list: [], | list: [], | ||||
| loading:true, | |||||
| swiperCurrent: 0, | swiperCurrent: 0, | ||||
| title:'', | title:'', | ||||
| desc:'', | desc:'', | ||||
| @@ -222,7 +223,15 @@ Page({ | |||||
| console.log("checkUserStatus:res", res); | console.log("checkUserStatus:res", res); | ||||
| }) | }) | ||||
| .catch(err => { | .catch(err => { | ||||
| console.log("checkUserStatus:err", err); | |||||
| console.log(err); | |||||
| if(err.errMsg=='request:fail timeout'){ | |||||
| setTimeout(function(){ | |||||
| that.setData({ | |||||
| loading:false, | |||||
| loadingtext:"网络异常,请检查您的网络设置" | |||||
| }) | |||||
| },3000) | |||||
| } | |||||
| if (err.code == 11004) { | if (err.code == 11004) { | ||||
| // 用户昵称未授权 | // 用户昵称未授权 | ||||
| wx.redirectTo({ | wx.redirectTo({ | ||||
| @@ -255,7 +264,6 @@ Page({ | |||||
| token: token | token: token | ||||
| } | } | ||||
| }).then(res => { | }).then(res => { | ||||
| console.log(res.data,77777) | |||||
| if (res.data.id){ | if (res.data.id){ | ||||
| _this.setData({ | _this.setData({ | ||||
| showIf:true | showIf:true | ||||
| @@ -10,6 +10,6 @@ | |||||
| <text>独家福利,抢完即止</text> | <text>独家福利,抢完即止</text> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <c-coupons id="lists" bind:myevent="onGetCode" /> | |||||
| <c-coupons id="lists" bind:myevent="onGetCode" loadingtext="{{loadingtext}}" loading="{{loading}}" /> | |||||
| <g-entry id="listss" wx:if="{{showGame&&!played&&!havePlayEd}}" gamedata="{{gamedata}}" bind:myevent="" /> | <g-entry id="listss" wx:if="{{showGame&&!played&&!havePlayEd}}" gamedata="{{gamedata}}" bind:myevent="" /> | ||||
| </view> | </view> | ||||