From 67cdb9e667f47d8177f5870ccdd530c1be650f78 Mon Sep 17 00:00:00 2001 From: quantulr <35954003+quantulr@users.noreply.github.com> Date: Fri, 10 May 2024 15:18:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/express.js | 4 +- app.json | 6 - icon/arrows-exchange-alt-v.svg | 16 +++ icon/发现.svg | 1 + pages/logistics_details/logistics_details.js | 107 ++++++++++++++---- .../logistics_details/logistics_details.wxml | 22 +++- .../logistics_details/logistics_details.wxss | 2 +- pages/my/my_address/my_address.js | 9 +- pages/my/my_address/my_address.wxml | 59 ++++++---- pages/my/my_order/my_order.js | 23 ++-- pages/my/my_order/my_order.wxml | 4 +- pages/order_details/order_details.js | 4 +- pages/order_details/order_details.wxml | 2 +- wxParse/arrmap.js | 8 ++ 14 files changed, 194 insertions(+), 73 deletions(-) create mode 100644 icon/arrows-exchange-alt-v.svg create mode 100644 icon/发现.svg create mode 100644 wxParse/arrmap.js diff --git a/api/express.js b/api/express.js index b08c503..cc9e096 100644 --- a/api/express.js +++ b/api/express.js @@ -11,8 +11,8 @@ const guessExpressCom = ({ num, key, success, fail }) => { }) } -const getExpressDetail = ({ num, success, fail }) => { - const param = JSON.stringify({ com: "yuantong", num, phone: "", from: "", to: "", resultv2: "0", show: "0", order: "desc" }) +const getExpressDetail = ({ num, com, success, fail }) => { + const param = JSON.stringify({ com, num, phone: "", from: "", to: "", resultv2: "0", show: "0", order: "desc" }) console.log(param); wx.request({ url: `https://poll.kuaidi100.com/poll/query.do`, diff --git a/app.json b/app.json index 8629730..7b01cbc 100644 --- a/app.json +++ b/app.json @@ -97,11 +97,5 @@ "scope.userLocation": { "desc": "你的位置信息将方便您查看附近自提点" } - }, - "plugins": { - "kdPlugin": { - "version": "1.1.2", - "provider": "wx6885acbedba59c14" - } } } \ No newline at end of file diff --git a/icon/arrows-exchange-alt-v.svg b/icon/arrows-exchange-alt-v.svg new file mode 100644 index 0000000..c38f19c --- /dev/null +++ b/icon/arrows-exchange-alt-v.svg @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/icon/发现.svg b/icon/发现.svg new file mode 100644 index 0000000..615f575 --- /dev/null +++ b/icon/发现.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pages/logistics_details/logistics_details.js b/pages/logistics_details/logistics_details.js index 313ebcf..ad3736b 100644 --- a/pages/logistics_details/logistics_details.js +++ b/pages/logistics_details/logistics_details.js @@ -7,35 +7,102 @@ Page({ */ data: { records: [], + expressComName: [ + "圆通速递", + "申通快递", + "极兔速递", + "中通快递", + "韵达快递", + "邮政快递包裹", + "顺丰速运", + "京东物流", + "EMS", + "邮政电商标快", + "邮政标准快递", + "德邦快递", + "菜鸟速递", + "德邦", + "中通快运", + "安能快运", + "顺丰快运", + "韵达快运", + "跨越速运", + "京东快运", + "百世快运", + "菜鸟速递", + ], + currentExpressComIndex: 0, + expressComs: [ + { name: "圆通速递", code: "yuantong" }, + { name: "申通快递", code: "shentong" }, + { name: "极兔速递", code: "jtexpress" }, + { name: "中通快递", code: "zhongtong" }, + { name: "韵达快递", code: "yunda" }, + { name: "邮政快递包裹", code: "youzhengguonei" }, + { name: "顺丰速运", code: "shunfeng" }, + { name: "京东物流", code: "jd" }, + { name: "EMS", code: "ems" }, + { name: "邮政电商标快", code: "youzhengdsbk" }, + { name: "邮政标准快递", code: "youzhengbk" }, + { name: "德邦快递", code: "debangkuaidi" }, + { name: "菜鸟速递", code: "danniao" }, + { name: "德邦", code: "debangwuliu" }, + { name: "中通快运", code: "zhongtongkuaiyun" }, + { name: "安能快运", code: "annengwuliu" }, + { name: "顺丰快运", code: "shunfengkuaiyun" }, + { name: "韵达快运", code: "yundakuaiyun" }, + { name: "跨越速运", code: "kuayue" }, + { name: "京东快运", code: "jingdongkuaiyun" }, + { name: "百世快运", code: "baishiwuliu" }, + { name: "菜鸟速递", code: "cainiaozhisong" }, + ], num: "" }, + expressComNames() { + return this.data.expressComs.map(el => el.name) + }, + pickExpressCom(e) { + this.setData({ + currentExpressComIndex: e.detail.value + }) + this.getExpressData() + }, + + // 获取物流信息 + getExpressData() { + getExpressDetail({ + num: this.data.num, + com: this.data.expressComs[this.data.currentExpressComIndex].code, + success: (res) => { + if (res.data.status === "200") { + console.log(res.data.data); + this.setData({ + records: res.data.data + }) + } else { + this.setData({ + records: [] + }), + wx.showToast({ + icon: "error", + title: res.data.message, + }) + } + } + }) + }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - // guessExpressCom({ - // num: "YT7460149632645", - // key: "AjjPbmMP4727", - // success(resp) { - // console.log(resp); - // } - // }) + const { logisticsNum, logisticsName } = options + const index = this.data.expressComs.findIndex(el => el.name === logisticsName) this.setData({ - num: "YT7460149632645" - }) - getExpressDetail({ - num: this.data.num, - success: (res) => { - console.log(res); - if (res.data.status === "200") { - console.log(res.data.data); - this.setData({ - records: res.data.data - }) - } - } + num: logisticsNum, + currentExpressComIndex: index < 0 ? 0 : index }) + this.getExpressData() }, /** diff --git a/pages/logistics_details/logistics_details.wxml b/pages/logistics_details/logistics_details.wxml index e32be4c..50d43cd 100644 --- a/pages/logistics_details/logistics_details.wxml +++ b/pages/logistics_details/logistics_details.wxml @@ -1,10 +1,20 @@ - 圆通快递：{{num}} - - - - {{item.time}} - {{item.context}} + + + + + {{expressComs[currentExpressComIndex].name}} + + ：{{num}} + + + + + {{item.time}} + {{item.context}} + + + 暂无物流信息，请检查快递单号或者快递公司是否正确，可以点击左上方快递公司名称选择正确的快递公司。 \ No newline at end of file diff --git a/pages/logistics_details/logistics_details.wxss b/pages/logistics_details/logistics_details.wxss index 1b9aadb..d5ad864 100644 --- a/pages/logistics_details/logistics_details.wxss +++ b/pages/logistics_details/logistics_details.wxss @@ -27,7 +27,7 @@ z-index: 999; } -.record-item:nth-child(2) .dot { +.record-item:nth-child(1) .dot { background-color: red; opacity: 1; width: 24rpx; diff --git a/pages/my/my_address/my_address.js b/pages/my/my_address/my_address.js index 7a7aef6..7a1d85f 100644 --- a/pages/my/my_address/my_address.js +++ b/pages/my/my_address/my_address.js @@ -9,7 +9,9 @@ Page({ select: false, dataList: [], orderAddress: false, + updateAddress: false, addressIdXz: '', + oriAddr: "" }, /** @@ -63,7 +65,12 @@ Page({ addressIdXz: options.addressId }) } - + if (options.updateAddress) { + this.setData({ + updateAddress: options.updateAddress, + oriAddr: options.oriAddr + }) + } }, //选择地址 diff --git a/pages/my/my_address/my_address.wxml b/pages/my/my_address/my_address.wxml index 0f4ade9..3241200 100644 --- a/pages/my/my_address/my_address.wxml +++ b/pages/my/my_address/my_address.wxml @@ -1,31 +1,40 @@ + + 修改收货地址 + + + 从地址列表中选择一个地址，将其作为此订单的收货地址，选择后，如果已发货，将向后台发送修改地址申请，待客服同意申请后，才能完成地址修改。如果未发货，则无需客服处理直接修改。 + + 原地址 + {{oriAddr}} + - 收货人信息 - - - {{item.addressDetailed}} - 默认 - - {{item.addressProvince}} {{item.addressCity}} {{item.addressArea}} - 姓名：{{item.addressName}}手机号码：{{item.addressPhone}} - - - - - - - - - 编 辑 - 删 除 - - - - 编 辑 - + 收货人信息 + + + {{item.addressDetailed}} + 默认 + + {{item.addressProvince}} {{item.addressCity}} {{item.addressArea}} + 姓名：{{item.addressName}}手机号码：{{item.addressPhone}} + + + + + + + + + 编 辑 + 删 除 + + + + 编 辑 + - - 暂无收货地址请添加~ + + 暂无收货地址请添加~ diff --git a/pages/my/my_order/my_order.js b/pages/my/my_order/my_order.js index 95bd83f..4012a7e 100644 --- a/pages/my/my_order/my_order.js +++ b/pages/my/my_order/my_order.js @@ -163,19 +163,19 @@ Page({ }) }, viewLogisticsDetails(e) { - const { logisticsNum } = e.currentTarget.dataset + const { logisticsNum, logisticsName } = e.currentTarget.dataset wx.navigateTo({ - url: `/pages/logistics_details/logistics_details`, + url: `/pages/logistics_details/logistics_details?logisticsNum=${logisticsNum}&logisticsName=${logisticsName}`, }) }, updateAddress(e) { - const { addressId, id: orderId } = e.currentTarget.dataset + const { id: orderId, orderAddress } = e.currentTarget.dataset this.setData({ currentOrder: orderId }) wx.navigateTo({ - url: '/pages/my/my_address/my_address?orderAddress=true&addressId=' + addressId, + url: '/pages/my/my_address/my_address?orderAddress=true&updateAddress=true' + "&oriAddr=" + orderAddress, }) }, //查看进度 @@ -383,9 +383,18 @@ Page({ addressId, orderId: currentOrder }, success: (result) => { - wx.showToast({ - title: result.data.message, - }) + setTimeout(() => { + if (result.data.code == 1) { + wx.showToast({ + title: result.data.message, + }) + } else { + wx.showToast({ + title: "服务器内部错误", + icon: "error" + }) + } + }, 1500); } }) }, diff --git a/pages/my/my_order/my_order.wxml b/pages/my/my_order/my_order.wxml index d852203..2a6d740 100644 --- a/pages/my/my_order/my_order.wxml +++ b/pages/my/my_order/my_order.wxml @@ -75,7 +75,7 @@ 您需要在{{item.timeStr}}内处理 - 物流查询 + 物流查询 确认收货 立即支付 删除订单 @@ -97,7 +97,7 @@ - + 修改地址 diff --git a/pages/order_details/order_details.js b/pages/order_details/order_details.js index 641f64e..9620a66 100644 --- a/pages/order_details/order_details.js +++ b/pages/order_details/order_details.js @@ -336,9 +336,9 @@ Page({ }) }, viewLogisticsDetails(e) { - const { logisticsNum } = e.currentTarget.dataset + const { logisticsNum, logisticsName } = e.currentTarget.dataset wx.navigateTo({ - url: `/pages/logistics_details/logistics_details`, + url: `/pages/logistics_details/logistics_details?logisticsNum=${logisticsNum}&logisticsName=${logisticsName}`, }) }, /** diff --git a/pages/order_details/order_details.wxml b/pages/order_details/order_details.wxml index 9f9009d..c403821 100644 --- a/pages/order_details/order_details.wxml +++ b/pages/order_details/order_details.wxml @@ -146,7 +146,7 @@ 删除订单 - 物流查询 + 物流查询 确认收货 diff --git a/wxParse/arrmap.js b/wxParse/arrmap.js new file mode 100644 index 0000000..7053621 --- /dev/null +++ b/wxParse/arrmap.js @@ -0,0 +1,8 @@ +function arrMap(arr, field) { + return arr.map(el => el[field]) +} + + +module.exports = { + arrMap +} \ No newline at end of file