From 2ab1b6df536a2e4d8affe21dddeacf55a86aecd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87?= Date: Thu, 6 Feb 2025 23:22:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=B8=AD=E7=9A=84=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/shop.js | 1 + api/user.js | 16 ++++++++- app.js | 26 +++++++------- app.wxss | 10 ++++-- assets/icon/shop/coupon-empty@2x.png | Bin 0 -> 2967 bytes assets/icon/shop/point-empty@2x.png | Bin 0 -> 2194 bytes assets/icon/shop/promation@2x.png | Bin 0 -> 325 bytes pages/my/coupon/index.js | 17 +++++++-- pages/my/coupon/index.wxml | 15 +++++--- pages/my/coupon/index.wxss | 20 +++++++++++ pages/my/firend/index.js | 11 ++++-- pages/my/firend/index.wxml | 7 ++-- pages/my/firend/index.wxss | 2 +- pages/my/index/index.js | 11 ++++-- pages/my/index/index.wxml | 10 +++--- pages/my/index/index.wxss | 27 ++------------ pages/my/money/index.js | 11 ++++-- pages/my/money/index.wxml | 16 +++++---- pages/my/money/index.wxss | 11 +++--- pages/order/detail-group/index.js | 21 +++++++++-- pages/order/detail-group/index.json | 3 +- pages/order/detail-group/index.wxml | 29 ++++++++------- pages/order/detail-group/index.wxss | 4 ++- pages/order/detail/index.js | 22 +++++++++--- pages/order/detail/index.wxml | 52 ++++++++++++--------------- pages/order/detail/index.wxss | 10 +++--- pages/order/index/index.js | 26 ++++++++++---- pages/order/index/index.wxml | 43 +++++++++++++++++++--- pages/order/index/index.wxss | 44 ++++++++++++++++++++++- pages/shop/detail/index.wxml | 4 +++ pages/shop/detail/index.wxss | 26 ++++++++------ pages/shop/index/index.js | 9 ++++- pages/shop/index/index.wxml | 4 +-- pages/shop/index/index.wxss | 9 +++-- 34 files changed, 354 insertions(+), 163 deletions(-) create mode 100644 assets/icon/shop/coupon-empty@2x.png create mode 100644 assets/icon/shop/point-empty@2x.png create mode 100644 assets/icon/shop/promation@2x.png diff --git a/api/shop.js b/api/shop.js index 2a44968..1ecd7be 100644 --- a/api/shop.js +++ b/api/shop.js @@ -10,6 +10,7 @@ export default { const data = {}; return request.post('/api/merchant/order',{merchant_product_id,order_amount}) }, + orderList:()=>request.get('/api/merchant-pay'), calculatePrice:(merchant_product_id)=>request.post('/api/merchant/order/calculate-price',{merchant_product_id}), merchantPay:(merchant_id,amount)=>request.post('/api/merchant-pay',{merchant_id,amount}) } \ No newline at end of file diff --git a/api/user.js b/api/user.js index 8bcf321..1c011f1 100644 --- a/api/user.js +++ b/api/user.js @@ -23,7 +23,21 @@ export default { pre:(data)=>request.post('/api/order/pre-order',data), real:(data)=>request.post('/api/order',data), list:()=>request.get('/api/order/user/list'), - merchantList:()=>request.get('/api/merchant/order/user') + merchantList:()=>request.get('/api/merchant/order/user'), + merchantDetail:(order_id)=>request.get(`/api/merchant/order/${order_id}`), + detail:(orderid)=>request.get(`/api/order/${orderid}`) + }, + coupon:{ + status:{ + unused:'UNUSED',used:'USED',expired:'EXPIRED' + }, + list:(status)=>request.get('/api/coupon/user/list',status?{status}:{}) + }, + point:{ + list:()=>request.get('/api/point/records') + }, + friend:{ + list:()=>request.get('/api/user/referrals') }, createPayment(order_id,order_type){ return request.post('/api/wechat/create-payment',{order_id,order_type}); diff --git a/app.js b/app.js index 334bf99..8e86360 100644 --- a/app.js +++ b/app.js @@ -2,25 +2,12 @@ import userApi from './api/user'; import commonApi from './api/common'; App({ onLaunch() { - // 展示本地存储能力 - const logs = wx.getStorageSync('logs') || [] - logs.unshift(Date.now()) - wx.setStorageSync('logs', logs) - - // 登录 - wx.login({ - success: res => { - // 发送 res.code 到后台换取 openId, sessionKey, unionId - } - }) wx.getStorage({ key:'accessToken', success:(res)=>{ this.globalData.accessToken = res.data; if(res.data){ - userApi.info().then((data)=>{ - this.globalData.userInfo = data; - }); + this.getUserInfo(); } } }) @@ -30,6 +17,17 @@ App({ url: '/pages/login/login', }) }, + async getUserInfo(){ + if(this.globalData.userInfoGetTime&& + this.globalData.userInfo&& + new Date()-this.globalData.userInfoGetTime<1000*60*5){ + return this.globalData.userInfo; + } + const data = await userApi.info(); + this.globalData.userInfo = data; + this.globalData.userInfoGetTime = new Date(); + return data; + }, globalData: { userInfo: null, accessToken:null, diff --git a/app.wxss b/app.wxss index 6960084..6a726f1 100644 --- a/app.wxss +++ b/app.wxss @@ -163,6 +163,9 @@ page-container .content{ .money-promation{ color:#FF8400; } +.money-yellow{ + color:var(--main-color); +} .money-blue{ color:#1A4DEB; } @@ -270,11 +273,11 @@ page-container .content{ width:100%; position: absolute; bottom:0; - background-color: #1A4DEB; + background-color:var(--main-color); transition-duration: .4s; } .tab-bar .current .item{ - color: #000; + color: var(--main-color); } .tab-bar .current .item::before{ opacity: 1; @@ -289,6 +292,9 @@ navigator button{ text-align: center; padding:60rpx 0 30rpx 0; } +.list-empty .icon{ + width:132rpx;height:132rpx; +} .list-empty .title{ font-size: 30rpx; font-weight: 500; diff --git a/assets/icon/shop/coupon-empty@2x.png b/assets/icon/shop/coupon-empty@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2e237c5278391f2b0334db23d996c8202ff0d409 GIT binary patch literal 2967 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 F{R^X5DklH{ literal 0 HcmV?d00001 diff --git a/assets/icon/shop/promation@2x.png b/assets/icon/shop/promation@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f8160738349d1fa745b28243b6192092965f2f8a GIT binary patch literal 325 zcmV-L0lNN)P)Px#1am@3R0s$N2z&@+hyVZp?@2^KR7i>KmeFm4Fc3hWqyCo>7$GAt0wZ*UjL;Q2 zK{G-&2pgmuI3v&rUO$SZ3JI{%*!^gpgoMO#&m6v!;lZ5==|=5sL}GA z)fV-&f-LbK)CjbNN;zi?s+D8_>}tyXMEH~$cLh$s=fd-6;00(lGnv;Chm1Ujj6CPm zhrN1P3sgI`UAXoe??<(tuW+BS!dvN*=jW!`uK(?f^RMe&|Cg7k0!t1A)E^3{_lJN XG^i}V7}-Y%00000NkvXXu0mjfG;WKL literal 0 HcmV?d00001 diff --git a/pages/my/coupon/index.js b/pages/my/coupon/index.js index 926414c..be1de4d 100644 --- a/pages/my/coupon/index.js +++ b/pages/my/coupon/index.js @@ -1,23 +1,34 @@ -// pages/my/coupon/index.js +import userApi from '../../../api/user'; + Page({ /** * 页面的初始数据 */ data: { - tabIndex:0 - + tabIndex:0, + list:[] }, changeTab(event){ const tabIndex = event.currentTarget.dataset.index; this.setData({tabIndex}) + this.loadList(); }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + this.loadList(); + }, + loadList(){ + const status = [userApi.coupon.status.unused,userApi.coupon.status.used,userApi.coupon.status.expired]; + userApi.coupon.list(status[this.data.tabIndex]).then((data)=>{ + this.setData({ + list:data + }); + }) }, /** diff --git a/pages/my/coupon/index.wxml b/pages/my/coupon/index.wxml index 1f0395d..7a22483 100644 --- a/pages/my/coupon/index.wxml +++ b/pages/my/coupon/index.wxml @@ -10,12 +10,17 @@ - - + + - 平台奖励跑腿券 - 有效期至2025.03.06 + {{item.coupon_name}} + 有效期至 {{item.expire_time}} - 3.0 + {{item.coupon_amount}} + + + + + 暂无跑腿券 \ No newline at end of file diff --git a/pages/my/coupon/index.wxss b/pages/my/coupon/index.wxss index 62229da..3fc7bfe 100644 --- a/pages/my/coupon/index.wxss +++ b/pages/my/coupon/index.wxss @@ -38,4 +38,24 @@ .coupon-list .item::before{ right:-12rpx; left:auto; +} + +.coupon-list .item.used .name{ + color: #888888; +} +.coupon-list .item.used .money{ + color: #888888; +} + +.list-empty{ + padding-top:400rpx; +} +.list-empty .icon{ + width:132rpx;height:132rpx; +} + +.list-empty .title{ + color: rgba(136, 136, 136, 0.6); + font-size: 30rpx; + margin-top:20rpx; } \ No newline at end of file diff --git a/pages/my/firend/index.js b/pages/my/firend/index.js index ee36b8b..b3e6c48 100644 --- a/pages/my/firend/index.js +++ b/pages/my/firend/index.js @@ -1,18 +1,23 @@ -// pages/my/firend/index.js +import userApi from '../../../api/user'; + Page({ /** * 页面的初始数据 */ data: { - + list:[] }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - + userApi.friend.list().then((data)=>{ + this.setData({ + list:data + }) + }) }, /** diff --git a/pages/my/firend/index.wxml b/pages/my/firend/index.wxml index 6a9c5fe..7d0552e 100644 --- a/pages/my/firend/index.wxml +++ b/pages/my/firend/index.wxml @@ -1,5 +1,5 @@ - - + + 跑腿订单返现 134****6777 @@ -9,4 +9,7 @@ 2023.04.06 17:00 + + + 暂无邻友 \ No newline at end of file diff --git a/pages/my/firend/index.wxss b/pages/my/firend/index.wxss index f554de7..59a56ae 100644 --- a/pages/my/firend/index.wxss +++ b/pages/my/firend/index.wxss @@ -25,5 +25,5 @@ font-size: 34rpx; } .firend-list .item .status{ - color:#1A4DEB; + color:var(--main-color) } \ No newline at end of file diff --git a/pages/my/index/index.js b/pages/my/index/index.js index ebbb5ac..a297244 100644 --- a/pages/my/index/index.js +++ b/pages/my/index/index.js @@ -1,11 +1,12 @@ -// pages/my/index/index.js +const app = getApp(); + Page({ /** * 页面的初始数据 */ data: { - + userInfo:{} }, goToCouponList(){ @@ -23,7 +24,11 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - + app.getUserInfo().then((data)=>{ + this.setData({ + userInfo:data + }); + }) }, /** diff --git a/pages/my/index/index.wxml b/pages/my/index/index.wxml index b1a6c2b..558984c 100644 --- a/pages/my/index/index.wxml +++ b/pages/my/index/index.wxml @@ -1,7 +1,7 @@