From 99c82fb2a2e133a2fdc19d660cf97ed24157139d Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Fri, 7 Jun 2024 16:43:09 +0800
Subject: [PATCH] bug fix
---
app.js | 4 +-
app.json | 3 +-
pages/my/after_sales/after_sales.wxml | 2 +
pages/my/applyAfter_sales/applyAfter_sales.js | 2 +-
.../my/apply_after_sales/apply_after_sales.js | 131 ++++++++++++++++++
.../apply_after_sales/apply_after_sales.json | 3 +
.../apply_after_sales/apply_after_sales.wxml | 16 +++
.../apply_after_sales/apply_after_sales.wxss | 46 ++++++
pages/my/my_order/my_order.js | 1 +
pages/my/my_order/my_order.wxml | 7 +-
pages/order_details/order_details.js | 14 +-
pages/order_details/order_details.wxml | 3 +-
12 files changed, 223 insertions(+), 9 deletions(-)
create mode 100644 pages/my/apply_after_sales/apply_after_sales.js
create mode 100644 pages/my/apply_after_sales/apply_after_sales.json
create mode 100644 pages/my/apply_after_sales/apply_after_sales.wxml
create mode 100644 pages/my/apply_after_sales/apply_after_sales.wxss
diff --git a/app.js b/app.js
index 2f31552..22508e5 100644
--- a/app.js
+++ b/app.js
@@ -146,8 +146,8 @@ App({
bgImg: 'https://sanpinhuicai.com/wisdommining/static/icon/bg/',//背景图片地址
// ip: 'http://106.54.198.47/', //接口地址
- // ip: 'https://sanpinhuicai.com/', //接口地址
- ip: 'http://192.168.0.112:9000/', //接口地址/
+ ip: 'https://sanpinhuicai.com/', //接口地址
+ // ip: 'http://192.168.0.112:9000/', //接口地址/
// ip: 'http://127.0.0.1:9000/', //接口地址/
//appId wx65c9560afc9cbaa7
diff --git a/app.json b/app.json
index 80ff32e..93fc91e 100644
--- a/app.json
+++ b/app.json
@@ -46,7 +46,8 @@
"pages/my/after_sales_next/after_sales_next",
"pages/my/after_jilu/after_jilu",
"pages/logistics_details/logistics_details",
- "pages/rate/rate"
+ "pages/rate/rate",
+ "pages/my/apply_after_sales/apply_after_sales"
],
"entryPagePath": "pages/index/index",
"window": {
diff --git a/pages/my/after_sales/after_sales.wxml b/pages/my/after_sales/after_sales.wxml
index 8608e6c..8514020 100644
--- a/pages/my/after_sales/after_sales.wxml
+++ b/pages/my/after_sales/after_sales.wxml
@@ -85,5 +85,7 @@
+
+
diff --git a/pages/my/applyAfter_sales/applyAfter_sales.js b/pages/my/applyAfter_sales/applyAfter_sales.js
index b3fb735..77075b1 100644
--- a/pages/my/applyAfter_sales/applyAfter_sales.js
+++ b/pages/my/applyAfter_sales/applyAfter_sales.js
@@ -20,7 +20,7 @@ Page({
*/
onLoad: function (options) {
this.setData({
- packageId: options.packageId,
+ packageId: options.packageId !== "undefined" ? options.packageId : null,
orderId: options.id,
num: options.num,
sq: options.sq,
diff --git a/pages/my/apply_after_sales/apply_after_sales.js b/pages/my/apply_after_sales/apply_after_sales.js
new file mode 100644
index 0000000..12f4511
--- /dev/null
+++ b/pages/my/apply_after_sales/apply_after_sales.js
@@ -0,0 +1,131 @@
+// pages/my/apply_after_sales/apply_after_sales.js
+const app = getApp();
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ order: null,
+ orderId: null,
+ goodsNames: [],
+ packages: [{
+ id: 1,
+ goods: [],
+ logisticsNumber: "YT7460149632645"
+ }]
+ },
+ addPackage() {
+ const _packages = this.data.packages
+ _packages.push({
+ id: Date.now(),
+ goods: [],
+ logisticsNumber: ""
+ })
+ this.setData({
+ packages: _packages
+ })
+ },
+ deletePackage(e) {
+ const { id } = e.currentTarget.dataset
+ console.log(id);
+ this.setData({
+ packages: this.data.packages.filter(el => el.id !== id)
+ })
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ const { id, sq, num } = options
+ console.log(options);
+ this.setData({
+ orderId: id
+ })
+
+ wx.setNavigationBarTitle({
+ title: sq == 1 ? '退货申请' : '换货申请'
+ })
+
+ wx.showLoading({
+ title: '加载中..',
+ })
+ wx.request({
+ url: app.globalData.ip + '/wisdommining/api/order/getOrderDetail',
+ method: 'GET',
+ header: {
+ "content-type": "application/x-www-form-urlencoded",
+ },
+ data: {
+ userId: app.globalData.userId,
+ orderNumber: num,
+ },
+ success: res => {
+ wx.hideLoading()
+ if (res.data.code == 1) {
+ let order = res.data.value;
+ this.setData({
+ order,
+ goodsNames: order.goodsList.map(el => `${el.goodsName} - ${el.wisdGoodsSpec.specName} × ${el.goodsNum}`)
+ // package: goods.logistics ? JSON.parse(goods.logistics).find(el => el.id == this.data.packageId) : null
+ })
+ } else {
+ wx.showModal({
+ title: '提示!',
+ content: res.data.message,
+ showCancel: false,
+ })
+ }
+ }
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/my/apply_after_sales/apply_after_sales.json b/pages/my/apply_after_sales/apply_after_sales.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/my/apply_after_sales/apply_after_sales.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/my/apply_after_sales/apply_after_sales.wxml b/pages/my/apply_after_sales/apply_after_sales.wxml
new file mode 100644
index 0000000..d2af9d0
--- /dev/null
+++ b/pages/my/apply_after_sales/apply_after_sales.wxml
@@ -0,0 +1,16 @@
+
+
+
+ ×
+ 包裹{{index+1}}
+ 快递单号
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/my/apply_after_sales/apply_after_sales.wxss b/pages/my/apply_after_sales/apply_after_sales.wxss
new file mode 100644
index 0000000..22df9c8
--- /dev/null
+++ b/pages/my/apply_after_sales/apply_after_sales.wxss
@@ -0,0 +1,46 @@
+/* pages/my/apply_after_sales/apply_after_sales.wxss */
+page {
+ background-color: rgb(245, 245, 245);
+}
+.package-card {
+ background-color: #fff;
+ position: relative;
+ box-sizing: border-box;
+ /* border: 1rpx solid rgb(151, 151, 151); */
+ margin: 20rpx 20rpx 0;
+ border-radius: 12rpx;
+ box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
+ padding: 20rpx;
+}
+.package-card:not(:first-of-type) {
+ margin-top: 30rpx;
+}
+
+.package-card .add-goods {
+ margin-top: 24rpx;
+ text-align: center;
+}
+
+.package-card .package-index {
+ position: absolute;
+ top: -16rpx;
+ left: 40rpx;
+ font-size: 24rpx;
+ padding: 0 8rpx;
+ background-color: linear-gradient(
+ to bottom,
+ rgba(255, 255, 255, 0) 50%,
+ rgba(255, 255, 255, 1) 50%
+ );
+}
+.package-card .form-label {
+ font-size: 28rpx;
+ color: gray;
+}
+.package-card .package-input {
+ margin-top: 6rpx;
+ border: 1rpx solid rgb(225, 225, 225);
+ height: 50rpx;
+ padding: 0 12rpx;
+ border-radius: 8rpx;
+}
diff --git a/pages/my/my_order/my_order.js b/pages/my/my_order/my_order.js
index 843d592..c9bc64f 100644
--- a/pages/my/my_order/my_order.js
+++ b/pages/my/my_order/my_order.js
@@ -256,6 +256,7 @@ Page({
let sq = e.currentTarget.dataset.sq;
wx.navigateTo({
url: '/pages/my/applyAfter_sales/applyAfter_sales?id=' + id + '&num=' + num + '&sq=' + sq,
+ // url: '/pages/my/apply_after_sales/apply_after_sales?id=' + id + '&num=' + num + '&sq=' + sq,
})
},
//支付订单
diff --git a/pages/my/my_order/my_order.wxml b/pages/my/my_order/my_order.wxml
index c07477c..9afb044 100644
--- a/pages/my/my_order/my_order.wxml
+++ b/pages/my/my_order/my_order.wxml
@@ -29,7 +29,7 @@
-
+
{{item.status==5?'已取消'
:item.status==1?'待支付'
:item.status==2?'待发货'
@@ -51,6 +51,7 @@
:item.afterSalesStatus==66&&item.orderRefundType==1?'换货失败'
:item.afterSalesStatus==66&&item.orderRefundType==2?'退货失败'
:item.afterSalesStatus==66&&item.orderRefundType==3?'退款失败'
+ :item.afterSalesStatus==67?"已撤销售后申请"
:''
}}
@@ -93,8 +94,8 @@
申请退款
- 申请退货
- 申请换货
+ 申请退货
+ 申请换货
查看进度
diff --git a/pages/order_details/order_details.js b/pages/order_details/order_details.js
index 8579308..fcc6466 100644
--- a/pages/order_details/order_details.js
+++ b/pages/order_details/order_details.js
@@ -12,6 +12,7 @@ Page({
ticker: '--:--',
leftoverDay: "",
shops: false,//商铺进入
+ refundLogistics: null
},
//商品详情
@@ -77,6 +78,16 @@ Page({
numAll: numAll,
logistics: goods.logistics ? JSON.parse(goods.logistics) : null
})
+ // 用户已提交退货物流信息
+ if (goods.afterSalesStatus == 64) {
+ this.setData({
+ refundLogistics: JSON.stringify([{
+ id: Date.now(),
+ goods: [],
+ logisticsNumber: goods.orderRefundNumber
+ }])
+ })
+ }
if (goods.status == 1) {
this.setData({
setIntervalTime: setInterval((t) => {
@@ -113,7 +124,7 @@ Page({
// 获取发货时间
let orderDeliverTime = goods.orderDeliverTime
console.log("=======")
- let orderDeliverTimeMillisecond = (new Date(orderDeliverTime.replace(/-/g, '/'))).getTime() + 15 * 24 * 60 * 60 * 1000; //得到毫秒数
+ let orderDeliverTimeMillisecond = (new Date(orderDeliverTime.replace(/-/g, '/'))).getTime() + 15 * 24 * 60 * 60 * 1000; // 得到毫秒数
// 获取现在的毫秒值
console.log(orderDeliverTimeMillisecond)
let nowTime = new Date().getTime()
@@ -158,6 +169,7 @@ Page({
wx.navigateTo({
url: '/pages/my/applyAfter_sales/applyAfter_sales?id=' + id + '&num=' + num + '&sq=' + sq + "&packageId=" + packageId,
})
+
},
countDown() {
let leftoverDayI = this.data.leftoverDayI;
diff --git a/pages/order_details/order_details.wxml b/pages/order_details/order_details.wxml
index 673b73a..dff4492 100644
--- a/pages/order_details/order_details.wxml
+++ b/pages/order_details/order_details.wxml
@@ -44,7 +44,7 @@
-
+
@@ -206,6 +206,7 @@
删除订单
物流查询
+ 全部换货
确认收货
评价