From fe6d62071fe506bb3ea0957b8462f4d0a467f2ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87?= Date: Tue, 28 Jan 2025 00:20:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95=E6=88=90?= =?UTF-8?q?=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/user.js | 3 ++- pages/help/index/index.js | 42 ++++++++++++++++++++++++++++++- pages/help/index/index.wxml | 33 ++++++++++++++++++++++-- pages/help/index/index.wxss | 47 ++++++++++++++++++++++++++++++++++- pages/help/package/index.js | 24 ++++++++++++++++-- pages/help/package/index.json | 3 ++- pages/help/package/index.wxml | 6 ++--- pages/help/package/index.wxss | 19 -------------- 8 files changed, 147 insertions(+), 30 deletions(-) diff --git a/api/user.js b/api/user.js index 408b23b..7e5e23b 100644 --- a/api/user.js +++ b/api/user.js @@ -20,6 +20,7 @@ export default { return request.get('/api/user/info'); }, order:{ - pre:(data)=>request.post('/api/order/pre-order',data) + pre:(data)=>request.post('/api/order/pre-order',data), + real:(data)=>request.post('/api/order',data) } } \ No newline at end of file diff --git a/pages/help/index/index.js b/pages/help/index/index.js index 55d88fe..ca03f4c 100644 --- a/pages/help/index/index.js +++ b/pages/help/index/index.js @@ -1,5 +1,7 @@ const app = getApp(); import commonApi from '../../../api/common'; +import user from '../../../api/user'; +import userApi from '../../../api/user'; Page({ @@ -17,7 +19,10 @@ Page({ package:{ name:'', count:0 - } + }, + + isShowOrderConfirm:false, + preOrder:{} // addressList:[], // addressIndex:0 @@ -95,6 +100,41 @@ Page({ currentAddress:address }) }, + preOrder(){ + wx.getStorage({ + key:'pre-order', + success:(res)=>{ + userApi.order.pre({ + packages:res.data.price_request.package + }).then((data)=>{ + this.setData({ + isShowOrderConfirm:true, + preOrder:data + }); + }) + } + }) + }, + getOrder(){ + wx.getStorage({ + key:'pre-order', + success:(res)=>{ + // let packages = []; + // res.data.price_request.package.map((item)=>{ + // packages.push({ + // station_id:item.station_id, + // pickup_codes:item.pickup_codes + // }); + // }); + res.data.addressid = this.data.currentAddress.id; + userApi.order.real(res.data).then((data)=>{ + wx.navigateTo({ + url: '/pages/help/success', + }) + }); + } + }); + }, /** * 生命周期函数--监听页面隐藏 diff --git a/pages/help/index/index.wxml b/pages/help/index/index.wxml index 60d41c3..f216afd 100644 --- a/pages/help/index/index.wxml +++ b/pages/help/index/index.wxml @@ -57,7 +57,7 @@ - + 登录后享跑腿服务 @@ -72,4 +72,33 @@ - \ No newline at end of file + + + + + + + 送达地址 + + {{currentAddress.community_name+currentAddress.address_detail}} + + + + 取件数量 + {{preOrder.price_info.package_count}}个包裹 + + + + + 跑腿券 + 0张 + + + 跑腿费 + ¥3.5 + + *基础费3元 (含5件包裹) 超出部分0.5元/件 + + + + \ No newline at end of file diff --git a/pages/help/index/index.wxss b/pages/help/index/index.wxss index d092d02..95eba37 100644 --- a/pages/help/index/index.wxss +++ b/pages/help/index/index.wxss @@ -155,4 +155,49 @@ line-height: 1; padding:16rpx 22rpx; border-radius: 60rpx; -} \ No newline at end of file +} + +.pc-content{ + padding:30rpx; +} + +.pc-content .kv-item{ + display:flex; + margin:12rpx 0 50rpx 0; +} +.pc-content .kv-item .key{ + font-size: 30rpx; +} +.pc-content .kv-item .value{ + font-weight: 500; +} +.pc-content .kv-item .yellow{ + color: #FF8400; +} +.pc-content .kv-item .red{ + color: #EB0000; +} +.pc-content .kv-item .key{ + flex:1 +} +.pc-content .head .kv-item{ + margin:40rpx 0; +} +.pc-content .head .key{ + flex:none; +} +.pc-content .head .value{ + margin-left:24rpx; + font-size: 30rpx; + font-weight: 500; +} +.pc-content .spliter{ + margin-bottom:40rpx; +} +.pc-content .tips{ + font-size:26rpx; + color:#888888; +} +.pc-content .button{ + margin:60rpx 0 40rpx 0; +} diff --git a/pages/help/package/index.js b/pages/help/package/index.js index 81bb93e..589bb27 100644 --- a/pages/help/package/index.js +++ b/pages/help/package/index.js @@ -9,7 +9,8 @@ Page({ data: { package:[], stationList:[], - sendType:'' + sendType:'', + preOrder:{} }, bottomBarButtonTap(){ @@ -62,6 +63,23 @@ Page({ }); console.log(this.data.stationList); }, + preOrder(){ + console.log(this.data.stationList); + const data = []; + this.data.stationList.map((item)=>{ + data.push({ + station_id:item.id, + pickup_codes:item.package.join(',') + }); + }) + userApi.order.pre({ + packages:data + }).then((data)=>{ + this.setData({ + preOrder:data + }) + }); + }, /** * 生命周期函数--监听页面加载 @@ -76,7 +94,9 @@ Page({ const __item = res.data.price_request.package.find((_item)=>_item.station_id==item.id); item.package = __item.pickup_codes.split(','); }); - console.log(data.items); + if(res.data.price_request){ + this.preOrder(); + } this.setData({ stationList:data.items }) diff --git a/pages/help/package/index.json b/pages/help/package/index.json index 0fcd408..e2cb8c4 100644 --- a/pages/help/package/index.json +++ b/pages/help/package/index.json @@ -2,5 +2,6 @@ "usingComponents": { "bottomBar":"/components/bottomBar" }, - "navigationStyle": "default" + "navigationStyle": "default", + "navigationBarTitleText": "添加快递信息" } \ No newline at end of file diff --git a/pages/help/package/index.wxml b/pages/help/package/index.wxml index 752a189..41650ba 100644 --- a/pages/help/package/index.wxml +++ b/pages/help/package/index.wxml @@ -34,10 +34,10 @@ - + \ No newline at end of file diff --git a/pages/help/package/index.wxss b/pages/help/package/index.wxss index 05e06ed..18b383f 100644 --- a/pages/help/package/index.wxss +++ b/pages/help/package/index.wxss @@ -30,25 +30,6 @@ justify-content: space-around; } -.page-container .kv-item{ - display:flex; - margin:12rpx 0 50rpx 0; -} -.page-container .kv-item .key{ - font-size: 30rpx; -} -.page-container .kv-item .value{ - font-weight: 500; -} -.page-container .kv-item .yellow{ - color: #FF8400; -} -.page-container .kv-item .red{ - color: #EB0000; -} -.page-container .kv-item .key{ - flex:1 -} .page-container .tips{ font-size: 26rpx;