From 858470cb47036d32b0dc9c621e96492b4acee6d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87?= Date: Mon, 3 Mar 2025 19:33:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E4=BF=AE=E6=94=B9=E5=83=8F?= =?UTF-8?q?=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/common.js | 3 +- api/request.js | 3 +- app.js | 9 ++++++ app.json | 2 +- assets/icon/help/join-group.png | Bin 2237 -> 1725 bytes assets/icon/navbar/home.png | Bin 0 -> 2133 bytes components/navbar/index.js | 21 +++++++++++-- components/navbar/index.wxml | 5 ++- components/navbar/index.wxss | 3 ++ pages/help/index/index.js | 16 +++++++--- pages/help/index/index.wxml | 11 +++---- pages/help/index/index.wxss | 6 ++-- pages/my/promation/activities/index.js | 10 +++++- pages/my/promation/activities/index.json | 4 ++- pages/my/promation/activities/index.wxml | 37 ++++++++++++----------- pages/my/promation/activities/index.wxss | 6 ++-- 16 files changed, 93 insertions(+), 43 deletions(-) create mode 100644 assets/icon/navbar/home.png diff --git a/api/common.js b/api/common.js index a2937ac..922d165 100644 --- a/api/common.js +++ b/api/common.js @@ -1,6 +1,5 @@ import request from './request' let app = getApp(); -const token = wx.getStorageSync('accessToken'); export default { getConfig:()=>request.get('/api/config'), @@ -42,7 +41,7 @@ export default { filePath: file.tempFilePath, name: 'file', header:{ - Authorization: `Bearer ${token||app.globalData.accessToken}` + Authorization: `Bearer ${app?.globalData?.accessToken}` }, url: request.baseUrl+'/api/upload/image', success:(res)=>{ diff --git a/api/request.js b/api/request.js index 94d8dfc..561e1b4 100644 --- a/api/request.js +++ b/api/request.js @@ -7,7 +7,6 @@ if(envVersion=='develop'){ baseUrl = 'https://api.beefast.co' } let app = getApp(); -let token = wx.getStorageSync('accessToken'); const sendRequest = (options)=>{ @@ -53,7 +52,7 @@ const sendRequest = (options)=>{ method:options.method, data:options.data, header:{ - Authorization: `Bearer ${token||app?.globalData?.accessToken}` + Authorization: `Bearer ${app?.globalData?.accessToken}` }, fail:(res)=>{ wx.showToast({ diff --git a/app.js b/app.js index bf8decc..0ac7c91 100644 --- a/app.js +++ b/app.js @@ -3,6 +3,8 @@ import commonApi from './api/common'; let token = wx.getStorageSync('accessToken'); App({ async onLaunch(options){ + // await this.aaa(); + console.log(wx.router); console.log('app onlaunch',new Date().getTime()); wx.getStorage({ key:'accessToken', @@ -31,6 +33,13 @@ App({ } }) }, + aaa(){ + return new Promise((rs,rj)=>{ + setTimeout(()=>{ + rs(); + },2000) + }) + }, onShow(options){ console.log('app onShow',new Date().getTime()); /** diff --git a/app.json b/app.json index bcc9b21..5d371ed 100644 --- a/app.json +++ b/app.json @@ -1,8 +1,8 @@ { "pages": [ "pages/help/index/index", - "pages/my/promation/activities/index", "pages/login/login", + "pages/my/promation/activities/index", "pages/help/success/index", "pages/shop/index/index", "pages/order/index/index", diff --git a/assets/icon/help/join-group.png b/assets/icon/help/join-group.png index 1532415bd567750643e23f085de2fdf03eefd16b..d4a671be34542ead81e0ee2272bd1cf4a08f5fee 100644 GIT binary patch delta 1709 zcmV;e22%OG5xotNB!2;OQb$4nuFf3k00004b3#c}2nYxWdt6vw}B1({q0a+U5jvYByrrc35-2Gd=a&|Meku7msqKzUW*FNmo!R}uaK$fY1% zOvg+TvH1(6>+Ue#cSU3ljCLhUGLdb4I<(rSDASV}C+QDTNT*L?nlbLS}xa zweBdT!kqRuiKsOW`$Adj_qEo0 z;}Ebg;i4XJ3_xb6zU%w`PJ;c#$o_B-OT(V;`!6%pGvX9sB&TQq&~{yyf*?4t*gpl( z%xM2ftyYsk5PuwHtbd2x!YwT=wE&y~c$Cvrtat_dC<9uxTCEiX!Jj$p04P8>*LB|@ zdruhVmUz+Yd5Zj^4QRTq`*#ooAMzR!c`AFJx0Pa$9+hn=r33&W#5Rf(ZNTQhejYLl zC#75jux-1Ch)#qMtG@4(@B5^+b^*KupsbA&;<#R~KYs_XmC%e%jQ!mN`!f1La*=sf zZ8REft@W|x7UN7-(70usiBs5DzVAQI@$Bq9j+tMW%82O1HvKE5l-7C~2|drko^AOO z*@20S?0PLH}wbtzn&%P$l zqkg~NjTXsvZiF!N8Q8y-A(VDv6bJ6h|Gsf>tLM9hKifYe@&X(Z}(v3qW2 zmLl4)$1%23@Cia0uD1jcnF?iet}x3;!+&)pVCh+Nb8|Dh$&b#9V>=EJbp4H{42|=eRxM_!ol*!vYm%&~Kz}GwtDj_4s%Z)6Y5aM9koSUBKjbFI? zfKMUOLkkWR{fyK>Hup*C#yEbD9e-Tm0)#_oeB}2y=Hv1mTb4>V{tM4>cf4t1e)KVD z+>}Z<2t13u&gEMgl}k7_F1kzSP%W2m6GSCkMk?VlQVExlO1O+v!eyiqE+dt28L5QJ zNF`iGD&aCx373&dxQtZ7Wuy`=Bb9I&F$rf3gRsO5PbAG|Q(B6ZsUTK3OMhH2n0X~_ zqb7mN%gg7cGG;b*Ad_&mz?*jZW|bczGJfX)%fWlBa93AXwzEuGM2ekQ$asc2ma|nU z{TwSP3&aI1adJfTw%_k>Oj=NNiU8?QYrSmy zF4vkru2!pk1@N2YmL?JX?z-*|3kwU~Fbw~(+56tq>-BZlbq@g;$F+z*E-o&NLluxB zVao_X)giupMSUiO==OR&^}T!I($Z2(Yb~Q_@)t-KWvZgyW^H?-aDO?Ida4X{ib7_n zV~oHYCUuIS8HfuG9miQso4YAhj?6F&!-a)~BOyeZ4=5%PrL}(Q`~G>_3aOKehG7^6 zL2%%@?jnFEnVMHlI$G(a80B|gGi00000NkvXXu0mjf D#OXiT literal 2237 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 LNkvXXu0mjfu*?+( literal 0 HcmV?d00001 diff --git a/components/navbar/index.js b/components/navbar/index.js index d721c55..edef0b9 100644 --- a/components/navbar/index.js +++ b/components/navbar/index.js @@ -28,15 +28,25 @@ Component({ */ data: { statusBarHeight:0, - navBarHeight:44 + navBarHeight:44, + canBack:true }, lifetimes:{ attached(){ const windowInfo = wx.getWindowInfo(); - this.setData({ statusBarHeight:windowInfo.statusBarHeight - }) + }); + const pages = getCurrentPages(); + if(pages.length>1){ + this.setData({ + canBack:true + }) + }else{ + this.setData({ + canBack:false + }) + } } }, /** @@ -46,6 +56,11 @@ Component({ back(){ wx.navigateBack(); }, + backHome(){ + wx.reLaunch({ + url: '/pages/help/index/index', + }) + }, share(){ }, getHeight(){ diff --git a/components/navbar/index.wxml b/components/navbar/index.wxml index 1c1d7a6..fbd66c3 100644 --- a/components/navbar/index.wxml +++ b/components/navbar/index.wxml @@ -2,7 +2,10 @@ - + + + + diff --git a/components/navbar/index.wxss b/components/navbar/index.wxss index 66008ad..3e64b7a 100644 --- a/components/navbar/index.wxss +++ b/components/navbar/index.wxss @@ -31,6 +31,9 @@ width:40rpx;height:40rpx; padding:12rpx 14rpx 12rpx 0; } +.nav-bar-content .back.home{ + width:56rpx;height:56rpx; +} .nav-bar-content .left .btns.border{ border: 1.2px solid #D8D8D8; } diff --git a/pages/help/index/index.js b/pages/help/index/index.js index 5c95f7c..76e219e 100644 --- a/pages/help/index/index.js +++ b/pages/help/index/index.js @@ -39,7 +39,6 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - console.log('page onload',new Date().getTime()); let height = this.selectComponent("#navBar").getHeight(); this.setData({ navBarHeight:height @@ -65,14 +64,11 @@ Page({ * 生命周期函数--监听页面初次渲染完成 */ onReady() { - - console.log('page onReady',new Date().getTime()); }, /** * 生命周期函数--监听页面显示 */ onShow() { - console.log('page onShow',new Date().getTime()); wx.getStorage({ key:'pre-order', success:(res)=>{ @@ -324,5 +320,17 @@ Page({ }else{ app.navToLogin(); } + }, + navToWXGroup(){ + if(this.data.currentCommunity&&this.data.currentCommunity.id){ + wx.navigateTo({ + url: `/pages/my/promation/wx-group/index?communityId=${this.data.currentCommunity.id}`, + }) + }else{ + wx.showToast({ + icon:'error', + title: '请先选择小区', + }) + } } }) \ No newline at end of file diff --git a/pages/help/index/index.wxml b/pages/help/index/index.wxml index 7917a0b..dee35b1 100644 --- a/pages/help/index/index.wxml +++ b/pages/help/index/index.wxml @@ -77,16 +77,15 @@ 新手指南 使用流程 - + - 加福利群 - 领优惠券 - + {{appConfig.join_group_title}} + {{appConfig.join_group_desc}} +