@@ -27,6 +27,7 @@ | |||
<i-button i-class="coupons-btn-gm" wx:if="{{data.salePriceStr==0&&data.remainInventory!=0}}" data-date='{{data}}'>免费领</i-button> | |||
<i-button i-class="coupons-btn-gm" wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0}}" data-date='{{data}}'>马上购</i-button> | |||
<i-button i-class="coupons-btn-gms" wx:if="{{data.remainInventory==0}}" data-date='{{data}}'>已售罄</i-button> | |||
<i-button i-class="coupons-btn-gms" wx:if="{{data.status==1}}" data-date='{{data}}' disabled>已下架</i-button> | |||
</view> | |||
<view class="coupons-info-name sy">剩余{{data.remainInventory}}</view> | |||
<view class="coupons-border"></view> | |||
@@ -27,7 +27,7 @@ var config = { | |||
* 优惠券详情 | |||
*/ | |||
couponDetail: "/wxCoupon/detail", | |||
/** | |||
* 业态查询 | |||
*/ | |||
@@ -127,22 +127,23 @@ var config = { | |||
* 和login页面 | |||
* 页面的图标 | |||
*/ | |||
marketicon:'/mall/getAppIcon', | |||
marketicon: '/mall/getAppIcon', | |||
/** | |||
* 检查核销的状态 | |||
*/ | |||
getStatus:"/couponOrder/getStatus", | |||
getStatus: "/couponOrder/getStatus", | |||
/** | |||
* 获得成长值 | |||
*/ | |||
getScore:'/user/userinfo', | |||
getScore: '/user/userinfo', | |||
/** | |||
* 小程序分享 | |||
* title | |||
* 描述 | |||
*/ | |||
getWeapNote:'/mall/getWeapNote', | |||
scoreLevelInfo:'/mall/scoreLevelInfo' | |||
getWeapNote: '/mall/getWeapNote', | |||
scoreLevelInfo: '/mall/scoreLevelInfo', | |||
getWeRunData: '/user/getWeRunData' | |||
}, | |||
weapp: { | |||
@@ -159,4 +160,4 @@ for (var key in config.api) { | |||
config.api[key] = apiPrefix + config.api[key]; | |||
} | |||
*/ | |||
module.exports = config; | |||
module.exports = config; |
@@ -16,8 +16,6 @@ | |||
</view> | |||
<text class="restNum fr">剩余<text>{{data.remainInventory}}件</text></text> | |||
</view> | |||
<view class='rest' wx:if="{{data.endTime!=undefined&&data.endTime>=0&&data.type!=5}}"> | |||
<text class='txt01'>距结束:</text> | |||
<text class='time'>{{endtime}}</text> | |||
@@ -65,5 +63,6 @@ | |||
<button bindtap='orderFunc' hover-class='active' class='buy' wx:if="{{data.salePriceStr!=0&&data.remainInventory!=0}}"><text class='txt'>{{data.salePriceStr}}元</text>马上购买</button> | |||
<button bindtap='orderFunc' class='buy' wx:elif="{{data.salePriceStr==0&&data.remainInventory!=0}}">免费领取</button> | |||
<button class='buy' wx:elif="{{data.remainInventory==0}}" style="background:#999;color: #fff;">已售罄</button> | |||
<button class='buy' wx:elif="{{data.status==1}}" style="background:#999;color: #fff;">已下架</button> | |||
</view> | |||
</view> |
@@ -40,12 +40,12 @@ Page({ | |||
that.setData({ | |||
flags: 'have', | |||
logincount: res.data.score.loginCount, | |||
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, | |||
wifinumber: res.data.score.wifiNumber, | |||
bindCarScoreNumber: res.data.score.bindCarScoreNumber, | |||
levelList: res.data.levelList | |||
}) | |||
}) | |||
@@ -5,20 +5,20 @@ | |||
<view class="scroll-view-item"> | |||
<view class='thin_circle'> | |||
<view class='view'> | |||
<text>访问</text> | |||
<text>登陆</text> | |||
<text>每日</text> | |||
<text>登录</text> | |||
</view> | |||
</view> | |||
<text>{{logincount}}成长值</text> | |||
<text>{{loginscoreNumber}}成长值</text> | |||
</view> | |||
<view class="scroll-view-item"> | |||
<view class='thin_circle'> | |||
<view class='view'> | |||
<text>线上</text> | |||
<text>交易</text> | |||
<text>交易1元</text> | |||
</view> | |||
</view> | |||
<text>{{loginscoreNumber}}成长值</text> | |||
<text>{{consumptionScoreNumber}}成长值</text> | |||
</view> | |||
<view class="scroll-view-item"> | |||
<view class='thin_circle'> | |||
@@ -41,8 +41,8 @@ | |||
<view class="scroll-view-item"> | |||
<view class='thin_circle'> | |||
<view class='view'> | |||
<text>链接</text> | |||
<text>系统WIFI</text> | |||
<text>连接</text> | |||
<text>WIFI一次</text> | |||
</view> | |||
</view> | |||
<text>{{wifiscoreNumber}}成长值</text> | |||
@@ -50,11 +50,11 @@ | |||
<view class="scroll-view-item"> | |||
<view class='thin_circle last'> | |||
<view class="view"> | |||
<text>补充</text> | |||
<text>个人信息</text> | |||
<text>绑定</text> | |||
<text>车牌一个</text> | |||
</view> | |||
</view> | |||
<text>{{wifinumber}}成长值</text> | |||
<text>{{bindCarScoreNumber}}成长值</text> | |||
</view> | |||
</scroll-view> | |||
</view> | |||
@@ -66,9 +66,16 @@ | |||
<image wx:if="{{index==1}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade1.png"></image> | |||
<image wx:if="{{index==2}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade2.png"></image> | |||
<image wx:if="{{index==3}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade3.png"></image> | |||
<image wx:if="{{index==4}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade.png"></image> | |||
<image wx:if="{{index==5}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade.png"></image> | |||
<text class='titles fl'>{{item.level}}</text> | |||
<image wx:if="{{index==4}}" class="grade fl" mode='widthFix' src="./../../assets/img/grade3.png"></image> | |||
<view class='titles fl clearfix'> | |||
<text>{{item.level}}</text> | |||
<text wx:if="{{index==0}}">{{item.points}}成长值</text> | |||
<text wx:if="{{index==1}}">{{item.points}}成长值</text> | |||
<text wx:if="{{index==2}}">{{item.points}}成长值</text> | |||
<text wx:if="{{index==3}}">{{item.points}}成长值</text> | |||
<text wx:if="{{index==4}}">{{item.points}}成长值</text> | |||
<text wx:if="{{index==5}}">{{item.points}}成长值</text> | |||
</view> | |||
</view> | |||
<view class='des' wx:if="{{item.description==''}}">无</view> | |||
<view class='des' wx:if="{{item.description!=''}}">{{item.description}}</view> | |||
@@ -3,10 +3,14 @@ | |||
white-space: nowrap; | |||
} | |||
.scroll-view-item:first-child{ | |||
margin-left: 20rpx!important; | |||
} | |||
.thin_circle { | |||
position: relative; | |||
height: 132rpx; | |||
width: 132rpx; | |||
height: 140rpx; | |||
width: 140rpx; | |||
border: 1px solid #f69948; | |||
display: inline-block; | |||
border-radius: 50%; | |||
@@ -19,7 +23,7 @@ | |||
} | |||
.scroll { | |||
padding: 0 56rpx 20rpx; | |||
padding: 0 30rpx 20rpx 30rpx; | |||
margin-top: 22rpx; | |||
} | |||
@@ -80,8 +84,8 @@ | |||
right: 0; | |||
bottom: 0; | |||
margin: auto; | |||
width: 108rpx !important; | |||
height: 108rpx !important; | |||
width: 120rpx !important; | |||
height: 120rpx !important; | |||
border: 3px solid #f69948; | |||
border-radius: 50%; | |||
} | |||
@@ -135,7 +139,7 @@ visibility: hidden; | |||
} | |||
.quanyi > view:nth-of-type(5) .titles { | |||
color: #fd9643; | |||
color: #2ac19c; | |||
} | |||
.part { | |||
@@ -167,5 +171,15 @@ visibility: hidden; | |||
border-left:6rpx dotted #2ac19c; | |||
} | |||
.quanyi > view:nth-of-type(5) .des{ | |||
border-left:6rpx dotted #fd9643; | |||
border-left:6rpx dotted #2ac19c; | |||
} | |||
.titles text:nth-of-type(1){ | |||
float: left; | |||
} | |||
.titles text:nth-of-type(2){ | |||
float: left; | |||
font-weight: 400; | |||
color: #999; | |||
font-size: 26rpx; | |||
margin-left: 10rpx; | |||
} |
@@ -94,11 +94,20 @@ Page({ | |||
success: ({ | |||
code | |||
}) => { | |||
wx.getSystemInfo({ | |||
success: function (res) { | |||
console.log(JSON.stringify(res)) | |||
that.setData({ | |||
systemInfo: JSON.stringify(res) | |||
}) | |||
} | |||
}) | |||
var usrdata = { | |||
appId: config.weapp.AppId, | |||
code: code, | |||
sceneAddress: app.globalData.sceneAddress, | |||
scene: that.data.scene | |||
scene: that.data.scene, | |||
systemInfo: that.data.systemInfo | |||
}; | |||
if (app.globalData.locationInfo) { | |||
usrdata = { | |||
@@ -107,7 +116,8 @@ Page({ | |||
sceneAddress: app.globalData.sceneAddress, | |||
latitude: "" + app.globalData.locationInfo.latitude, | |||
longitude: "" + app.globalData.locationInfo.longitude, | |||
scene: that.data.scene | |||
scene: that.data.scene, | |||
systemInfo: that.data.systemInfo | |||
}; | |||
} | |||
Http.post({ | |||
@@ -25,7 +25,7 @@ page { | |||
} | |||
.game { | |||
/* display: none; */ | |||
display: none; | |||
position: relative; | |||
width: 750rpx; | |||
height: 200rpx; | |||
@@ -1,6 +1,7 @@ | |||
// pages/index/sw/index.js | |||
let config = require("../../../config/config.js"); | |||
let Http = require("../../../utils/HttpBasics"); | |||
// let Http = require("../../../utils/HttpBasics"); | |||
const app = getApp(); | |||
Component({ | |||
/** | |||
@@ -18,6 +18,36 @@ Page({ | |||
url: '/pages/grade/grade', | |||
}) | |||
}, | |||
getrun:function(){ | |||
let that = this; | |||
wx.getWeRunData({ | |||
success: function (res) { | |||
console.log(res); | |||
Http.post({ | |||
url: config.api.getWeRunData, | |||
data: { | |||
encryptedData: res.encryptedData, | |||
iv: res.iv | |||
} | |||
}).then(res => { | |||
console.log(res); | |||
that.setData({ | |||
step: res.data.stepInfoList[30].step | |||
}) | |||
}) | |||
} | |||
}) | |||
}, | |||
getxinghao:function(){ | |||
wx.getSystemInfo({ | |||
success:function(res){ | |||
console.log(res); | |||
wx.showModal({ | |||
content: res.brand, | |||
}) | |||
} | |||
}) | |||
}, | |||
navigateTo() { | |||
wx.navigateTo({ | |||
url: `/pages/login/index` | |||
@@ -29,7 +59,7 @@ Page({ | |||
*/ | |||
let that = this; | |||
if (that.data.flag == 'hidden') { | |||
that.setData({ | |||
that.setData({ | |||
flag: 'show' | |||
}); | |||
} | |||
@@ -79,7 +109,8 @@ Page({ | |||
score: res.data.score, | |||
levelName: res.data.levelName | |||
}) | |||
}) | |||
}); | |||
that.getrun(); | |||
}, | |||
/** | |||
@@ -219,6 +219,9 @@ | |||
overflow: hidden; | |||
box-shadow:0 6px 20px 0 rgba(0,0,0,0.15); | |||
} | |||
.act{ | |||
display: none; | |||
} | |||
.of{ | |||
display: block; | |||
} |