diff --git a/api/request.js b/api/request.js index def0936..9d1bceb 100644 --- a/api/request.js +++ b/api/request.js @@ -4,7 +4,10 @@ import {updToken} from './updateToken' // 请求方式配置 // https://lifetest.ysd-bs.com //测试地址 // https://card.ysd-bs.com -const api = "https://lifetest.ysd-bs.com/api/" //正式地址 + +// wx8e424dbdc443381f 测试appid +// wxb2e3e8091d9feac3 正式appid +const api = "https://card.ysd-bs.com/api/" //正式地址 const header = { "Accept" : "application/json" } diff --git a/pages/account/account.js b/pages/account/account.js index 72bf728..891a102 100644 --- a/pages/account/account.js +++ b/pages/account/account.js @@ -39,7 +39,6 @@ Page({ }, onShow() { - console.log(this.data.screenChannel) // 获取账变记录 this.accountInfo(); }, diff --git a/pages/frozen/frozen.js b/pages/frozen/frozen.js index 3ff161e..adad58a 100644 --- a/pages/frozen/frozen.js +++ b/pages/frozen/frozen.js @@ -33,7 +33,6 @@ Page({ */ frozenInfo() { wx.$api.user.ungrants(this.data.type).then(res=>{ - console.log(res) this.setData({ frozenData: res.data }) diff --git a/pages/frozen/frozen.wxml b/pages/frozen/frozen.wxml index 84e34b0..96eb956 100644 --- a/pages/frozen/frozen.wxml +++ b/pages/frozen/frozen.wxml @@ -36,7 +36,7 @@ - + 待发放(额度) {{item.ungrant}} @@ -57,32 +57,42 @@ 消费红包分期发放 - 应发余额¥{{item.variable}},发放期数 {{item.num}} - 期,每期发放¥{{item.avg}}/期 + + 应发余额¥{{item.variable}},发放期数{{item.num}}期,每期发放¥{{item.avg}}/期 + - - - - - - 第{{listItem.num}} - - 共{{item.items.length}} - - - - {{listItem.variable}}( 发放额度 ) - 发放时间:{{listItem.start_at}} - - - {{listItem.status_text}} + + + + + + + 第{{listItem.num}} + + 共{{item.items.length}} + + + + {{listItem.variable}}( 发放额度 ) + + 发放时间:{{listItem.start_at}} + + + {{listItem.status_text}} + + + - - + + + + + 抱歉,目前发放期数~ @@ -109,6 +119,7 @@ - + + 抱歉,目前暂无内容~ \ No newline at end of file diff --git a/pages/frozen/frozen.wxss b/pages/frozen/frozen.wxss index db4d449..7e08db0 100644 --- a/pages/frozen/frozen.wxss +++ b/pages/frozen/frozen.wxss @@ -103,11 +103,11 @@ /* 最新样式 2021-06-22 */ page, -.pack-center { +.no-pack-center { background-image: linear-gradient(to bottom, #24315d, #24315d); } -.pack-center { +.no-pack-center { color: #fff; } @@ -480,5 +480,21 @@ page, .dots .active { width: 24rpx; border-radius: 40rpx; - background-color: #b13509; + background-color: #ffdf95; +} + +.grantIssue-pack { + background: rgba(0, 0, 0, .2); + border-radius: 10rpx; + text-align: center; + padding: 40rpx 0; + color: #c9d3f7; + font-weight: 600; + font-size: 30rpx; +} + +.grantIssue-pack image { + width: 200rpx; + height: 200rpx; + margin-bottom: 20rpx; } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index b44e99d..c12f133 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -26,6 +26,7 @@ Page({ isUser : false, //用户登录状态 noticeData : '', //首页公告 loading : true, //骨架屏加载 + subState : '', //订阅状态 address : { city: "", //市 area: "", //区 @@ -70,13 +71,13 @@ Page({ indexInfo() { if(this.data.stateType == 'shaky') { wx.$api.index.index(this.data.city, this.data.longitude, this.data.latitude).then(res=>{ - console.log(res.data.adverts) this.setData({ adverts : res.data.adverts, cardArr : res.data.rights, activities : res.data.activities, noticeData : res.data.notice, loading : false, + subState :res.data.welfare_subscribe, address : { city: res.data.location.city_name, area: res.data.location.district_name || "", @@ -96,7 +97,6 @@ Page({ }) } else { wx.$api.index.choice(this.data.stateType,this.data.city, this.data.longitude, this.data.latitude).then(res=>{ - console.log(res.data.adverts) this.setData({ adverts : res.data.adverts, cardArr : res.data.categorys, @@ -171,7 +171,6 @@ Page({ * 点击轮播图片 */ clickImg(e) { - console.log(e.currentTarget.dataset) let newChannel = e.currentTarget.dataset.channel, newImg = e.currentTarget.dataset.img, newUrl = e.currentTarget.dataset.url @@ -325,8 +324,15 @@ Page({ * 订阅 */ subscribeTap() { + if(!this.data.isUser) { + // 去登录 + wx.navigateTo({ + url: "/pages/login/login" + }) + return + } wx.requestSubscribeMessage({ - tmplIds: ['g8cEL-Tf2_Pdh8VyBdsYbhv09VVm8om-ZblhXIaVDiY'], + tmplIds: ['6SJqWbasj42O_d7yET1s5G1eg62Z4SS3pByBeuXekSo'], success: res=> { if(res.errMsg == "requestSubscribeMessage:ok") { wx.$api.index.subscribe(1).then(res=>{ @@ -334,9 +340,14 @@ Page({ title: res.data, icon : 'none', }) + + // 获取卡权益 + this.indexInfo(); + setTimeout(function () { wx.hideLoading(); }, 1000) + }).catch(err=>{ }) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 4d705c4..1247c72 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -86,7 +86,6 @@ - {{ activities.length }} 大会员权益,福利全线升级 + + + + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 800a676..bfc21d8 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -573,5 +573,116 @@ page { /* 订阅消息 */ .subscribe { - color: #fff; -} \ No newline at end of file + color: #89663f; + width: 100%; + padding: 0 100rpx; + display: inline-block; + box-sizing: border-box; + margin-top: 50rpx; + display: flex; + /* -webkit-animation: Tada 3s both infinite; + -moz-animation: Tada 3s both infinite; + -ms-animation: Tada 3s both infinite; + animation: Tada 3s both infinite; */ +} + +.subscribe-icon, +.subscribe-cont { + height: 80rpx; + text-align: center; + line-height: 80rpx; + position: relative; +} + +.subscribe-icon { + width: 150rpx; + padding-left: 30rpx; + box-sizing: border-box; + background: linear-gradient(to right, #f3c988, #f9e0b8); + border-radius: 40rpx 0 0 40rpx; +} + +.subscribe-icon::after{ + position: absolute; + content: ''; + right: -50rpx; + top: 0; + width: 0; + height: 0; + border-bottom: 80rpx solid #f9e0b8; + border-right: 50rpx solid transparent; + z-index: 9; +} + +.subscribe-cont { + width: calc(100% - 150rpx); + background: linear-gradient(to right, #f3c988, #f9e0b8); + border-radius: 0 40rpx 40rpx 0; + font-weight: 600; +} + +.subscribe-cont text { + display: inline-block; + -webkit-animation: subscribeCont 1s linear infinite; + animation: subscribeCont 1s linear infinite; +} + +@keyframes subscribeCont { + 25% {transform: scale(.98);} + 50%, 100% {transform: scale(1);} + 75% {transform: scale(1.05);} +} + +.subscribe-icon image { + width: 54rpx; + height: 54rpx; + margin-top: 14rpx; +} + +@keyframes Tada { + 0% { + transform: scale(1); + transform: scale(1) + } + + 70%,73%{ + transform: scale(1) rotate(-3deg); + transform: scale(1) rotate(-3deg) + } + + 77%,83%,90%,97% { + transform: scale(1) rotate(3deg); + transform: scale(1) rotate(3deg) + } + + 80%,87%,93%{ + transform: scale(1) rotate(-3deg); + transform: scale(1) rotate(-3deg) + } + + 100% { + transform: scale(1) rotate(0); + transform: scale(1) rotate(0) + } +} + +.subscribe-icon-one { + -webkit-animation: bounce-right 1s linear infinite; + animation: bounce-right 1s linear infinite; +} + +@keyframes bounce-right { + 25% {transform: translateX(-3px);} + 50%, 100% {transform: translateX(0);} + 75% {transform: translateX(3px);} +} + +.subscribe-icon-two { + -webkit-animation: bounce-two 1s linear infinite; + animation: bounce-two 1s linear infinite; +} + +@keyframes bounce-two { + 25% {opacity: 0;transform: translateX(-3px);} + 75% {opacity: 1;transform: translateX(3px);} +} diff --git a/pages/makeForm/makeForm.js b/pages/makeForm/makeForm.js index 2db2ff2..362be67 100644 --- a/pages/makeForm/makeForm.js +++ b/pages/makeForm/makeForm.js @@ -21,7 +21,6 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad (options) { - console.log(options) this.setData({ businessId: options.business_id }) diff --git a/pages/user/user.wxss b/pages/user/user.wxss index ad9d9ce..1c7387a 100644 --- a/pages/user/user.wxss +++ b/pages/user/user.wxss @@ -160,6 +160,10 @@ font-size: 36rpx; } +.userCard-parice text { + font-size: 28rpx; +} + .userCard-arrow-left, .userCard-arrow-right { width: 50rpx; height: 50rpx; diff --git a/pages/washcar/washcar.js b/pages/washcar/washcar.js index abacc70..721259a 100644 --- a/pages/washcar/washcar.js +++ b/pages/washcar/washcar.js @@ -12,7 +12,6 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad (options) { - console.log(options.url) this.setData({ url : decodeURIComponent(options.url) }) diff --git a/project.config.json b/project.config.json index 35eb3c7..dad671f 100644 --- a/project.config.json +++ b/project.config.json @@ -23,14 +23,13 @@ "compileHotReLoad": false, "useMultiFrameRuntime": true, "useApiHook": true, - "useApiHostProcess": true, + "useApiHostProcess": false, "babelSetting": { "ignore": [], "disablePlugins": [], "outputPath": "" }, "enableEngineNative": false, - "bundle": false, "useIsolateContext": true, "useCompilerModule": true, "userConfirmedUseCompilerModuleSwitch": false, @@ -41,7 +40,7 @@ }, "compileType": "miniprogram", "libVersion": "2.12.1", - "appid": "wx8e424dbdc443381f", + "appid": "wxb2e3e8091d9feac3", "projectname": "%E4%BA%BF%E6%97%B6%E4%BB%A3%EF%BC%88%E6%B5%8B%E8%AF%95%EF%BC%89", "debugOptions": { "hidedInDevtools": [] diff --git a/static/img/Account_icon.png b/static/img/Account_icon.png new file mode 100644 index 0000000..0276e73 Binary files /dev/null and b/static/img/Account_icon.png differ diff --git a/static/img/Account_icon_tips.png b/static/img/Account_icon_tips.png new file mode 100644 index 0000000..96bb03b Binary files /dev/null and b/static/img/Account_icon_tips.png differ diff --git a/static/img/finger_00.png b/static/img/finger_00.png new file mode 100644 index 0000000..7108375 Binary files /dev/null and b/static/img/finger_00.png differ diff --git a/static/img/finger_01.png b/static/img/finger_01.png new file mode 100644 index 0000000..798ca43 Binary files /dev/null and b/static/img/finger_01.png differ diff --git a/static/img/frozen_back.png b/static/img/frozen_back.png index ba97e27..b37ae0d 100644 Binary files a/static/img/frozen_back.png and b/static/img/frozen_back.png differ diff --git a/static/img/frozen_btn.png b/static/img/frozen_btn.png index 909e488..4d4503a 100644 Binary files a/static/img/frozen_btn.png and b/static/img/frozen_btn.png differ diff --git a/static/img/frozen_identity_00.png b/static/img/frozen_identity_00.png index 35bfb67..2a908d2 100644 Binary files a/static/img/frozen_identity_00.png 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 index b2af7a9..e4e49cd 100644 Binary files a/static/img/frozen_identity_01.png and b/static/img/frozen_identity_01.png differ diff --git a/static/img/frozen_img.png b/static/img/frozen_img.png index 10de0f8..b019b4c 100644 Binary files a/static/img/frozen_img.png and b/static/img/frozen_img.png differ diff --git a/static/img/makeForm_checked.png b/static/img/makeForm_checked.png index 442bb54..d242730 100644 Binary files a/static/img/makeForm_checked.png and b/static/img/makeForm_checked.png differ diff --git a/static/img/makeForm_price_back.png b/static/img/makeForm_price_back.png index 67c10c3..d001603 100644 Binary files a/static/img/makeForm_price_back.png and b/static/img/makeForm_price_back.png differ diff --git a/static/img/makeForm_price_back_active.png b/static/img/makeForm_price_back_active.png index 3422c05..a070a88 100644 Binary files a/static/img/makeForm_price_back_active.png and b/static/img/makeForm_price_back_active.png differ diff --git a/static/img/makeForm_title_00.png b/static/img/makeForm_title_00.png index b783914..7316655 100644 Binary files a/static/img/makeForm_title_00.png and b/static/img/makeForm_title_00.png differ diff --git a/static/img/makeForm_title_01.png b/static/img/makeForm_title_01.png index 50f3c54..6afb8c7 100644 Binary files a/static/img/makeForm_title_01.png and b/static/img/makeForm_title_01.png differ diff --git a/static/img/makeForm_title_02.png b/static/img/makeForm_title_02.png index edfccb3..648b540 100644 Binary files a/static/img/makeForm_title_02.png and b/static/img/makeForm_title_02.png differ diff --git a/static/img/user_card_00.png b/static/img/user_card_00.png index f8ba00a..01601bb 100644 Binary files a/static/img/user_card_00.png and b/static/img/user_card_00.png differ diff --git a/static/img/user_card_02.png b/static/img/user_card_02.png index d6682c1..f46e38d 100644 Binary files a/static/img/user_card_02.png and b/static/img/user_card_02.png differ