From 42f5eda6597b1940fad8db12e983d6787efcb0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87?= Date: Wed, 5 Mar 2025 19:46:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E6=97=B6=E6=AE=B5=E9=80=82?= =?UTF-8?q?=E9=85=8D=EF=BC=8C=E8=8B=A5=E5=B9=B2=E7=BB=86=E8=8A=82=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/common.js | 5 + app.js | 27 +++-- app.json | 7 +- assets/icon/eyes-close.png | Bin 0 -> 1906 bytes assets/icon/eyes-open.png | Bin 0 -> 2061 bytes assets/icon/fengkuai.png | Bin 0 -> 7385 bytes assets/icon/logo.png | Bin 0 -> 8469 bytes components/background-notice/index.js | 2 +- components/listView/index.js | 10 +- components/modalView/index.js | 5 +- components/modalView/index.wxml | 2 +- pages/browser/index.js | 75 ++++++++++++++ pages/{test/audio.json => browser/index.json} | 0 pages/browser/index.wxml | 1 + pages/browser/index.wxss | 1 + pages/index/index.js | 10 +- pages/index/index.wxml | 8 +- pages/index/index.wxss | 62 +++++++----- pages/login/index.js | 42 +++++++- pages/login/index.wxml | 30 ++++-- pages/login/index.wxss | 56 +++++++++-- pages/order-detail/index.wxml | 8 +- pages/order-detail/index.wxss | 20 ++++ pages/test/audio.js | 94 ------------------ pages/test/audio.wxml | 1 - pages/test/audio.wxss | 1 - pages/user/password/index.js | 16 +-- pages/user/password/index.wxml | 6 +- 28 files changed, 313 insertions(+), 176 deletions(-) create mode 100644 api/common.js create mode 100644 assets/icon/eyes-close.png create mode 100644 assets/icon/eyes-open.png create mode 100644 assets/icon/fengkuai.png create mode 100644 assets/icon/logo.png create mode 100644 pages/browser/index.js rename pages/{test/audio.json => browser/index.json} (100%) create mode 100644 pages/browser/index.wxml create mode 100644 pages/browser/index.wxss delete mode 100644 pages/test/audio.js delete mode 100644 pages/test/audio.wxml delete mode 100644 pages/test/audio.wxss diff --git a/api/common.js b/api/common.js new file mode 100644 index 0000000..e7c58b9 --- /dev/null +++ b/api/common.js @@ -0,0 +1,5 @@ +import request from './request'; + +export default { + getConfig:()=>request.get('/api/config') +} \ No newline at end of file diff --git a/app.js b/app.js index a78cc8e..53e28e7 100644 --- a/app.js +++ b/app.js @@ -1,7 +1,7 @@ import userApi from './api/user'; +import commonApi from './api/common'; const token = wx.getStorageSync('accessToken'); -// console.log() -const date = new Date(); +console.log(1) App({ verifyCodeWaitingTime:60, onLaunch() { @@ -14,9 +14,6 @@ App({ }) } }, - onHide(){ - console.log('app on hide'); - }, resetUserInfoUpdateTag(){ this.globalData.userInfoGetTime = null; }, @@ -36,6 +33,16 @@ App({ return data; }, + async getAppConfig(){ + if(!this.globalData.appConfig){ + const data = await commonApi.getConfig(); + this.globalData.appConfig = {}; + data.map((item)=>{ + this.globalData.appConfig[item.key] = item.value; + }) + } + return this.globalData.appConfig; + }, forceGetSummary(){ this.globalData.summaryGetTime = null; @@ -57,7 +64,7 @@ App({ for(var key in rules){ ((rules[key] instanceof Array)?rules[key]:[rules[key]]).map((item)=>{ let valid = true; - let value = page.data[key].trim(); + let value = (page.data[key]||'').trim(); //非空 if(item.required){ if(value==''){ @@ -82,9 +89,11 @@ App({ [`${key}Message`]:'' }); }else{ - page.setData({ - [`${key}Message`]:item.message - }); + if(item.message){ + page.setData({ + [`${key}Message`]:item.message + }); + } result.push({ [key]:item.message,autoFocus:item.autoFocus,key:key,shake:item.shake }) diff --git a/app.json b/app.json index 4c5da5e..0d9b1ba 100644 --- a/app.json +++ b/app.json @@ -1,8 +1,8 @@ { "pages": [ "pages/index/index", - "pages/order-detail/index", "pages/login/index", + "pages/order-detail/index", "pages/user/info/index", "pages/withdraw/index/index", "pages/withdraw/success/index", @@ -11,11 +11,12 @@ "pages/user/bank/index/index", "pages/user/bank/editor/index", "pages/user/password/index", - "pages/withdraw/list/index" + "pages/withdraw/list/index", + "pages/browser/index" ], "window": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "Weixin", + "navigationBarTitleText": "", "navigationBarBackgroundColor": "#ffffff" }, "style": "v2", diff --git a/assets/icon/eyes-close.png b/assets/icon/eyes-close.png new file mode 100644 index 0000000000000000000000000000000000000000..e93a573a777527128a88376c9ec57c1f2bd66c29 GIT binary patch literal 1906 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 J#5T;>{{W=um74$n literal 0 HcmV?d00001 diff --git a/assets/icon/fengkuai.png b/assets/icon/fengkuai.png new file mode 100644 index 0000000000000000000000000000000000000000..68874d45dd2ed17ec2fc3dfa430747e72d1272ed GIT binary patch literal 7385 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 LNkvXXu0mjf_l77w literal 0 HcmV?d00001 diff --git a/assets/icon/logo.png b/assets/icon/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..2c6ee827192658157c1b33e6f4cc84d8f73e1c76 GIT binary patch literal 8469 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 this.bgam.src = this.data.emptyAudio; }); diff --git a/components/listView/index.js b/components/listView/index.js index 91f3222..23b2149 100644 --- a/components/listView/index.js +++ b/components/listView/index.js @@ -5,14 +5,14 @@ Component({ * 组件的属性列表 */ properties: { - "bindrefresherrefresh":{ - type:Function - }, - "refresherTriggered":{ + refresherTriggered:{ type:Boolean, value:false }, - height:0, + height:{ + type:Number, + value:0 + }, loadMoreText:{ type:String, value:'已经到底了' diff --git a/components/modalView/index.js b/components/modalView/index.js index da6537a..dc04c14 100644 --- a/components/modalView/index.js +++ b/components/modalView/index.js @@ -34,7 +34,10 @@ Component({ type:String, value:'请输入内容' }, - isShowCancel:true, + isShowCancel:{ + type:Boolean, + value:true + }, cancelButtonText:{ type:String, value:'取消' diff --git a/components/modalView/index.wxml b/components/modalView/index.wxml index 88e54ea..13ebb74 100644 --- a/components/modalView/index.wxml +++ b/components/modalView/index.wxml @@ -9,7 +9,7 @@ {{content}} - + diff --git a/pages/browser/index.js b/pages/browser/index.js new file mode 100644 index 0000000..dd5b56d --- /dev/null +++ b/pages/browser/index.js @@ -0,0 +1,75 @@ +// pages/browser/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + webUrl:'' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let url = decodeURIComponent(options.url); + if(url.indexOf('?')>-1){ + url = `${url}&random=${Math.random()}` + }else{ + url = `${url}?random=${Math.random()}` + } + console.log(url); + this.setData({ + webUrl:decodeURIComponent(options.url) + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/test/audio.json b/pages/browser/index.json similarity index 100% rename from pages/test/audio.json rename to pages/browser/index.json diff --git a/pages/browser/index.wxml b/pages/browser/index.wxml new file mode 100644 index 0000000..87168c3 --- /dev/null +++ b/pages/browser/index.wxml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pages/browser/index.wxss b/pages/browser/index.wxss new file mode 100644 index 0000000..e10bd99 --- /dev/null +++ b/pages/browser/index.wxss @@ -0,0 +1 @@ +/* pages/browser/index.wxss */ \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 51da2ed..a399510 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -72,17 +72,17 @@ Page({ }); this.getUserInfo().then(()=>{ + app.getSummary().then((data)=>{ + this.setData({ + summary:data + }); + }); return this.loadStatusDetail(); }).then((data)=>{ return this.loadBuilding(); }).then((data)=>{ this.loadList(); }); - app.getSummary().then((data)=>{ - this.setData({ - summary:data - }); - }); }, findNewOrder(){ // app.forceGetUserInfo().then((data)=>{ diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 71922ed..d7dd5dd 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -39,7 +39,13 @@ loading="{{pager.loading}}" load-all="{{pager.loadAll}}"> + class="item {{item.status==orderStatus.unpaid||item.status==orderStatus.completed?'no-btns':''}} {{item.is_first_order?'is-new-order':''}}"> + + 代取快递 + + 送达时间（） + + {{pItem.station_name}} {{pItem.pickup_codes.length}} 件 diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 8e90934..1b11fe4 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -42,11 +42,12 @@ gap: 14rpx; font-size: 28rpx; } +.nav-bar .loop-order-switch .switch{ + width:84rpx; +} .nav-bar .loop-order-switch .switch .wx-switch-input{ width:84rpx; height: 48rpx; - --switch-checked-color:red; - --switch-node-size: 16rpx; } .head{ display: flex; @@ -112,16 +113,34 @@ } -.package-list{ -} .package-list .item{ margin:30rpx 16rpx; background-color: #ffffff; border-radius: 18rpx; color: #555555; - padding:56rpx 20rpx 20rpx; + padding:20rpx; position: relative; } +.package-list .item .item-head{ + display: flex; + align-items: center; + justify-content: space-between; + padding-bottom:50rpx; +} +.package-list .item .item-head .tag{ + background-color: rgba(153, 153, 153, 0.1); + border-radius: 12rpx; + padding:16rpx 20rpx; + font-weight: 500; + color:#555555; +} +.package-list .item .item-head .deliver-time{ + color:#222222; +} +.package-list .item .item-head .time{ + color:#ff0000; + font-weight: 500; +} .package-list .item:first-child{ margin-top:0; } @@ -130,27 +149,9 @@ position: absolute; width:1.2rpx; background-color: rgba(85, 85, 85, 0.5); - left:38.5rpx;top:90rpx; + left:38.5rpx;top:160rpx; bottom:250rpx; } -.package-list .item.is-new-order::before{ - top:145rpx; -} -.package-list .item.is-new-order{ - padding-top:110rpx; -} -.package-list .item.is-new-order::after{ - content:'新'; - position: absolute; - right:24rpx;top:0; - width:58rpx;height:58rpx; - line-height: 52rpx; - background-color: #FF0000; - border-radius: 0px 0px 40rpx 40rpx; - text-align: center; - color: #fff; - font-weight: 500; -} .package-list .item.no-btns::before{ bottom:100rpx; } @@ -228,7 +229,18 @@ } .package-list .item .address .sub-title{ font-size: 32rpx; - margin-top:24rpx + margin-top:24rpx; + display:flex; + align-items: center; +} +.package-list .item.is-new-order .address .sub-title::before{ + content:'新'; + background-color:#ff0000; + color:#fff; + font-size: 24rpx; + margin-right: 12rpx; + border-radius: 8rpx; + padding:6rpx 8rpx; } .package-list .item .btns{ diff --git a/pages/login/index.js b/pages/login/index.js index e647044..a4a22f7 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -9,7 +9,10 @@ Page({ data: { phone:'', password:'', - isAgree:false + logining:false, + isAgree:false, + isEyesOpen:false, + appConfig:{} }, /** * 生命周期函数--监听页面加载 @@ -17,15 +20,26 @@ Page({ onLoad(options) { this.validator = { phone:{type:'phone',message:'请输入正确的手机号',shake:true,autoFocus:true}, - password:{required:true,message:'请输入密码',shake:true,autoFocus:true} + password:{minLength:6,message:'请输入 6 位数密码',shake:true,autoFocus:true} } + app.getAppConfig().then((data)=>{ + this.setData({ + appConfig:data + }) + }) }, login(){ if(this.data.isAgree){ const valid = app.validateForm(this.validator,this); console.log(valid,this.validator); if(valid.length==0){ + this.setData({ + logining:true + }) userApi.login(this.data.phone,this.data.password).then((data)=>{ + this.setData({ + logining:false + }) app.globalData.userInfo = data.user; app.globalData.accessToken = data.access_token; wx.setStorage({ @@ -37,10 +51,17 @@ Page({ }) } }) + }).catch(()=>{ + console.log('catch'); + this.setData({ + logining:false + }) }) } }else{ - + app.validateForm({ + shake:{required:true,shake:true} + },this); } }, handleAgreeChange(event){ @@ -48,6 +69,21 @@ Page({ isAgree:!!event.detail }) }, + toggleEyes(){ + this.setData({ + isEyesOpen:!this.data.isEyesOpen + }) + }, + navToAgreement(){ + wx.navigateTo({ + url: `/pages/browser/index?url=${this.data.appConfig.url_user_agreement}`, + }) + }, + navToPrivacy(){ + wx.navigateTo({ + url: `/pages/browser/index?url=${this.data.appConfig.url_user_privacy}`, + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/login/index.wxml b/pages/login/index.wxml index 367d41a..f5b35fa 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -1,19 +1,35 @@