diff --git a/components/coupons/index.wxml b/components/coupons/index.wxml index 0821b2a..724f24f 100644 --- a/components/coupons/index.wxml +++ b/components/coupons/index.wxml @@ -27,6 +27,7 @@ 免费领 马上购 已售罄 + 已下架 剩余{{data.remainInventory}} diff --git a/config/config.js b/config/config.js index cdbd5d0..d41fcf9 100755 --- a/config/config.js +++ b/config/config.js @@ -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; \ No newline at end of file diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index ef87e32..9dd990b 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -16,8 +16,6 @@ 剩余{{data.remainInventory}}件 - - 距结束: {{endtime}} @@ -65,5 +63,6 @@ + \ No newline at end of file diff --git a/pages/grade/grade.js b/pages/grade/grade.js index 731d316..c69f422 100644 --- a/pages/grade/grade.js +++ b/pages/grade/grade.js @@ -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 }) }) diff --git a/pages/grade/grade.wxml b/pages/grade/grade.wxml index e7ed8ce..3b2b348 100644 --- a/pages/grade/grade.wxml +++ b/pages/grade/grade.wxml @@ -5,20 +5,20 @@ - 访问 - 登陆 + 每日 + 登录 - {{logincount}}成长值 + {{loginscoreNumber}}成长值 线上 - 交易 + 交易1元 - {{loginscoreNumber}}成长值 + {{consumptionScoreNumber}}成长值 @@ -41,8 +41,8 @@ - 链接 - 系统WIFI + 连接 + WIFI一次 {{wifiscoreNumber}}成长值 @@ -50,11 +50,11 @@ - 补充 - 个人信息 + 绑定 + 车牌一个 - {{wifinumber}}成长值 + {{bindCarScoreNumber}}成长值 @@ -66,9 +66,16 @@ - - - {{item.level}} + + + {{item.level}} + {{item.points}}成长值 + {{item.points}}成长值 + {{item.points}}成长值 + {{item.points}}成长值 + {{item.points}}成长值 + {{item.points}}成长值 + {{item.description}} diff --git a/pages/grade/grade.wxss b/pages/grade/grade.wxss index 52e67af..2fd1882 100644 --- a/pages/grade/grade.wxss +++ b/pages/grade/grade.wxss @@ -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; +} \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index b307b53..b78bc2d 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -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({ diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 9f64224..f6b3a0e 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -25,7 +25,7 @@ page { } .game { - /* display: none; */ + display: none; position: relative; width: 750rpx; height: 200rpx; diff --git a/pages/index/rushToBuy/index.js b/pages/index/rushToBuy/index.js index a499a28..b6dff9e 100644 --- a/pages/index/rushToBuy/index.js +++ b/pages/index/rushToBuy/index.js @@ -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({ /** diff --git a/pages/user/index.js b/pages/user/index.js index 7500564..178c7d0 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -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(); }, /** diff --git a/pages/user/index.wxss b/pages/user/index.wxss index 7f1a750..3ee1eb1 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -219,6 +219,9 @@ overflow: hidden; box-shadow:0 6px 20px 0 rgba(0,0,0,0.15); } +.act{ + display: none; +} .of{ display: block; }