diff --git a/api/interfaces/user.js b/api/interfaces/user.js index c894ccd..5c9cf81 100644 --- a/api/interfaces/user.js +++ b/api/interfaces/user.js @@ -41,7 +41,7 @@ const cards = (code, pass) => req({url: "user/cards/activate", method: "POST", d const logs = (type, channel, page) => req({url: "account/logs", data:{type : type, channel: channel, page : page}}) // 冻结列表 -const ungrants = (type,) => req({url: "account/ungrants", data:{type : type}}) +const ungrants = (type,) => req({url: "account/newungrants", data:{type : type}}) // 发送短信 const send = (mobile, channel, type) => req({url: "sms/send", method: "POST", data:{mobile : mobile, channel : channel, type : type}}) diff --git a/pages/account/account.js b/pages/account/account.js index 204bb7b..72bf728 100644 --- a/pages/account/account.js +++ b/pages/account/account.js @@ -11,7 +11,7 @@ Page({ blockeds : '', //待发放余额 page : {}, //分页信息 lodingStats : false, //加载状态 - screenArray: [ + screenArray : [ { channel: 'all', name: '全部' @@ -24,8 +24,9 @@ Page({ channel: 'out', name: '出账' } - ], //账变记录筛选数组 - screenIndex: 0 //账变记录筛选index + ], //账变记录筛选数组 + screenChannel: '', //账变记录筛选数组标识 + screenIndex : 0 //账变记录筛选index }, /** @@ -38,6 +39,7 @@ Page({ }, onShow() { + console.log(this.data.screenChannel) // 获取账变记录 this.accountInfo(); }, @@ -46,7 +48,7 @@ Page({ * 账变记录 */ accountInfo(page) { - wx.$api.user.logs(this.data.type, page).then(res=>{ + wx.$api.user.logs(this.data.type, this.data.screenChannel, page).then(res=>{ //判断金卡、银卡、钻石卡 let number if(this.data.type == "silver") { @@ -73,6 +75,19 @@ Page({ }) }, + /** + * 筛选账变记录-条件 + */ + screenBind(e) { + this.setData({ + screenIndex : e.detail.value, + screenChannel: this.data.screenArray[e.detail.value].channel + }) + + // 获取账变记录 + this.accountInfo(); + }, + /** * 页面相关事件处理函数--监听用户下拉动作 */ diff --git a/pages/account/account.wxml b/pages/account/account.wxml index 1b5aa9d..d6f5909 100644 --- a/pages/account/account.wxml +++ b/pages/account/account.wxml @@ -23,7 +23,7 @@ 账变记录 - + {{screenArray[screenIndex].name}} @@ -33,16 +33,19 @@ - {{item.title}} + {{item.channel == 'in' ? '入' : '出'}}{{item.title}} - + {{item.variable}} + + {{item.remark}} + - 有效期： - {{item.created_at}} 至 {{item.expired_at}} + {{item.channel == 'in' ? '有效期：' : '扣除时间：'}} + {{item.created_at}}{{item.channel == 'in' ? ' 至 ' + item.expired_at : ''}} - - - - - 向左滑动 + + + + + 返回上一个权益 + + + + 查看下一个权益 + + + + + + + + - - - - - - - + + + 抱歉，目前暂无内容~ \ No newline at end of file diff --git a/pages/frozen/frozen.wxss b/pages/frozen/frozen.wxss index f8efa5a..db4d449 100644 --- a/pages/frozen/frozen.wxss +++ b/pages/frozen/frozen.wxss @@ -102,18 +102,29 @@ /* 最新样式 2021-06-22 */ -page { +page, +.pack-center { background-image: linear-gradient(to bottom, #24315d, #24315d); } +.pack-center { + color: #fff; +} + .banner-swiper { height: 100vh; + overflow: hidden; +} + +.banner-swiper swiper-item { + padding: 0 20rpx; + box-sizing: border-box; } .grantSwiper { width: 100%; height: 100vh; - padding: 0 80rpx; + padding: 0 40rpx; box-sizing: border-box; } @@ -167,13 +178,18 @@ page { color: #fff; } +.grantTop-price-tips { + display: inline-block; + font-size: 40rpx; +} + .grantTop-tips { bottom: 0; font-size: 26rpx; display: flex; line-height: 70rpx; height: 70rpx; - padding: 0 40rpx; + padding: 0 20rpx; box-sizing: border-box; } @@ -197,11 +213,11 @@ page { box-sizing: border-box; height: 90rpx; line-height: 90rpx; - font-size: 32rpx; + font-size: 30rpx; } .grantTitle-name { - padding-left: 30rpx; + padding-left: 20rpx; font-weight: 600; background-image:-webkit-linear-gradient(left,#fbdebe,#e5ad7a); -webkit-background-clip:text; @@ -237,14 +253,14 @@ page { } .grantIssue-title-name image { - width: 44rpx; - height: 44rpx; + width: 42rpx; + height: 42rpx; margin-right: 20rpx; } .grantIssue-title-name text { font-weight: 600; - font-size: 34rpx; + font-size: 32rpx; background-image:-webkit-linear-gradient(left,#fbdebe,#e5ad7a); -webkit-background-clip:text; -webkit-text-fill-color:transparent; @@ -290,6 +306,16 @@ page { left: 0; } +.grantIssue-label-img.active, +.grantIssue-label-tips.active { + -webkit-filter: grayscale(100%); + -moz-filter: grayscale(100%); + -ms-filter: grayscale(100%); + -o-filter: grayscale(100%); + filter: grayscale(100%); + filter: gray; +} + .grantIssue-label-cont { position: absolute; width: 100%; @@ -312,6 +338,17 @@ page { font-size: 26rpx; } +.grantIssue-left-top.active, +.grantIssue-center-top.active, +.grantIssue-label-right.active { + color: gray; +} + +.grantIssue-left-number.active { + background: -webkit-linear-gradient(left,#e2e2e2,#e2e2e2); + color: gray; +} + .grantIssue-left-top text { font-size: 34rpx; font-weight: 600; @@ -331,16 +368,16 @@ page { } .grantIssue-label-right { - width: 90rpx; + width: 80rpx; font-weight: 600; text-align: center; - font-size: 30rpx; + font-size: 26rpx; color: #3d2a26; line-height: 140rpx; } .grantIssue-label-center { - width: calc(100% - 250rpx); + width: calc(100% - 240rpx); margin: 20rpx 20rpx 0 20rpx; } @@ -391,13 +428,13 @@ page { } .frozenArrow-left { - left: 10rpx; + left: 8rpx; -webkit-animation: bounce-left 1s linear infinite; animation: bounce-left 1s linear infinite; } .frozenArrow-right { - right: 10rpx; + right: 8rpx; -webkit-animation: bounce-right 1s linear infinite; animation: bounce-right 1s linear infinite; } @@ -443,5 +480,5 @@ page { .dots .active { width: 24rpx; border-radius: 40rpx; - background-color: #f46851; + background-color: #b13509; } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 71ab954..b44e99d 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -20,7 +20,7 @@ Page({ longitude : 0, //经度 latitude : 0, //纬度 adverts : [], //轮播图 - stateType : "shaky", + stateType : "silver", cardArr : [], //权益数组 activities : [], //周五福利 isUser : false, //用户登录状态 diff --git a/pages/makeForm/makeForm.js b/pages/makeForm/makeForm.js index 7af6182..2db2ff2 100644 --- a/pages/makeForm/makeForm.js +++ b/pages/makeForm/makeForm.js @@ -40,15 +40,11 @@ Page({ */ makeInfo() { wx.$api.index.busineSee(this.data.businessId).then(res=>{ - console.log(res.data) - res.data.type[0].checked = true this.setData({ businessId: res.data.business_id, makeData : res.data, makeTime : res.data.type, - makeItems : res.data.items, - checkedId : res.data.type[0].id, - itemsId : res.data.items[0].business_item_id, + makeItems : res.data.items }) }).catch(err=>{ if(!err.login){ diff --git a/pages/makeForm/makeForm.wxml b/pages/makeForm/makeForm.wxml index 8d65ab4..a129258 100644 --- a/pages/makeForm/makeForm.wxml +++ b/pages/makeForm/makeForm.wxml @@ -28,7 +28,7 @@ - * 请选择权益套餐 + * 请选择权益套餐类型 diff --git a/static/img/frozen_identity.png b/static/img/frozen_identity.png deleted file mode 100644 index fa7e075..0000000 Binary files a/static/img/frozen_identity.png and /dev/null differ diff --git a/static/img/frozen_identity_00.png b/static/img/frozen_identity_00.png new file mode 100644 index 0000000..35bfb67 Binary files /dev/null and b/static/img/frozen_identity_00.png differ diff --git a/static/img/frozen_identity_01.png b/static/img/frozen_identity_01.png new file mode 100644 index 0000000..b2af7a9 Binary files /dev/null and b/static/img/frozen_identity_01.png differ