diff --git a/pages.json b/pages.json
index fd09af9..4bd0e80 100644
--- a/pages.json
+++ b/pages.json
@@ -260,6 +260,30 @@
"navigationBarTitleText": "核销码"
}
},
+ {
+ "path": "haveFeeling/list",
+ "style": {
+ "navigationBarTitleText": "有感商品订单"
+ }
+ },
+ {
+ "path": "haveFeeling/detail",
+ "style": {
+ "navigationBarTitleText": "订单详情"
+ }
+ },
+ {
+ "path": "haveFeeling/logistics",
+ "style": {
+ "navigationBarTitleText": "物流详情"
+ }
+ },
+ {
+ "path": "haveFeeling/aftersale",
+ "style": {
+ "navigationBarTitleText": "申请售后"
+ }
+ },
{
"path": "memorialAlbum/index",
diff --git a/subPackages/haveFeeling/aftersale.vue b/subPackages/haveFeeling/aftersale.vue
new file mode 100644
index 0000000..5ff3490
--- /dev/null
+++ b/subPackages/haveFeeling/aftersale.vue
@@ -0,0 +1,878 @@
+
+
+
+
+ 订单信息
+
+
+
+ 供应商：{{ orderInfo.supplierName }}
+
+
+
+
+
+
+ 选择售后商品
+
+
+
+
+ ✓
+
+
+
+
+
+
+ {{ goods.goodsTitle }}
+ {{ goods.skuName }}
+
+ ¥{{ goods.price }}
+ ×{{ goods.num }}
+
+
+
+
+
+
+
+
+ 售后类型
+
+
+
+
+
+
+
+
+ {{ type.name }}
+ {{ type.desc }}
+
+
+
+
+
+
+
+ 售后原因
+
+
+ {{ reason.name }}
+ ✓
+
+
+
+
+
+
+ 问题描述
+
+ {{ aftersaleForm.description.length }}/500
+
+
+
+
+ 上传凭证（选填）
+
+
+
+
+ ×
+
+
+ +
+ 添加图片
+
+
+ 最多可上传6张图片，支持jpg、png格式
+
+
+
+
+
+ 联系方式
+
+
+ 联系人
+
+
+
+ 联系电话
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subPackages/haveFeeling/detail.vue b/subPackages/haveFeeling/detail.vue
new file mode 100644
index 0000000..1663eb0
--- /dev/null
+++ b/subPackages/haveFeeling/detail.vue
@@ -0,0 +1,1107 @@
+
+
+
+
+
+
+
+ 收货地址
+
+
+ {{ orderDetail.receiverProvince }}{{ orderDetail.receiverCity
+ }}{{ orderDetail.receiverArea }}{{ orderDetail.receiverAddress }}
+
+
+ {{ orderDetail.receiverName }}
+ {{ orderDetail.receiverPhone }}
+
+
+
+
+
+
+ 商品信息
+
+
+
+
+
+
+ {{ goods.goodsName || "-" }}
+
+
+ {{ goods.specValueOne }}-{{ goods.specValueTwo }}
+
+
+
+ 数量：{{ goods.quantity || 1 }}
+ ¥{{ goods.price }}
+
+
+
+
+
+
+
+
+ 运费
+ ¥{{ orderDetail.shippingFee || "0.00" }}
+
+
+ 应付金额
+ ¥{{ orderDetail.totalAmount || "0.00" }}
+
+
+ 积分抵扣
+ -¥{{ orderDetail.pointsDeductAmount || "0.00" }}
+
+
+ 实付金额
+ ¥{{ orderDetail.payAmount || "0.00" }}
+
+
+
+
+
+
+ 物流信息
+
+
+
+ {{
+ orderDetail.expressCompany || "待发货"
+ }}
+ {{
+ orderDetail.expressNo
+ }}
+
+
+ {{ getLogisticsStatusText(orderDetail.logisticsStatus) }}
+
+
+
+
+
+
+
+
+
+
+ 订单信息
+
+ 订单编号
+ {{
+ orderDetail.orderNo
+ }}
+
+
+ 下单时间
+ {{ orderDetail.createTime }}
+
+
+ 支付时间
+ {{ orderDetail.payTime }}
+
+
+ 发货时间
+ {{ orderDetail.shippingTime }}
+
+
+ 完成时间
+ {{ orderDetail.completeTime }}
+
+
+ 支付方式
+ {{
+ orderDetail.payMethod || "在线支付"
+ }}
+
+
+ 订单备注
+ {{ orderDetail.remark }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/subPackages/haveFeeling/list.vue b/subPackages/haveFeeling/list.vue
new file mode 100644
index 0000000..5a20dae
--- /dev/null
+++ b/subPackages/haveFeeling/list.vue
@@ -0,0 +1,810 @@
+
+
+
+
+
+ {{ tab.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ goods.goodsName }}
+
+
+ {{ goods.specValueOne }}-{{ goods.specValueTwo }}
+
+
+
+ ¥{{ goods.price }}
+ ×{{ goods.quantity || 1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无订单
+
+
+
+
+ {{
+ loading ? "加载中..." : "上拉加载更多"
+ }}
+
+
+
+
+ 没有更多数据了
+
+
+
+
+
+
+
+
diff --git a/subPackages/haveFeeling/logistics.vue b/subPackages/haveFeeling/logistics.vue
new file mode 100644
index 0000000..eb51d72
--- /dev/null
+++ b/subPackages/haveFeeling/logistics.vue
@@ -0,0 +1,592 @@
+
+
+
+
+
+
+
+ 快递信息
+
+
+ 快递公司
+ {{ logisticsInfo.expressCompany || '--' }}
+
+
+ 快递单号
+ {{ logisticsInfo.expressNo || '--' }}
+
+
+ 发货时间
+ {{ logisticsInfo.shippingTime || '--' }}
+
+
+ 预计送达
+ {{ logisticsInfo.estimatedTime || '--' }}
+
+
+
+
+
+
+ 收货地址
+
+
+
+ {{ addressInfo.linkName }}
+ {{ addressInfo.phone }}
+
+
+ {{ addressInfo.province }}{{ addressInfo.city }}{{ addressInfo.area }}{{ addressInfo.address }}
+
+
+
+
+
+
+
+ 物流轨迹
+
+
+ {{ trace.time }}
+
+ {{ trace.status }}
+ {{ trace.location }}
+
+
+
+
+
+
+
+
+ 暂无物流轨迹信息
+
+
+
+
+
+ 联系供应商
+
+
+ {{ supplierInfo.name || '默认供应商' }}
+ 联系电话：{{ supplierInfo.phone || '暂无' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subPackages/techan/order.vue b/subPackages/techan/order.vue
index 73b9337..162f69b 100644
--- a/subPackages/techan/order.vue
+++ b/subPackages/techan/order.vue
@@ -964,6 +964,7 @@ export default {
interval: 2000,
onSuccess: (data) => {
this.isOrderLoading = false; // 结束加载
+ this.getTotalPoints();
// 处理成功逻辑
// uni.showToast({
// title: "订单创建成功",
@@ -1011,23 +1012,24 @@ export default {
orderNo:token,
fromType:1,
payAmount:this.allprice,
- userId:124
},
"/framework/wxPay/submitShopPurOrder",
"DES"
).then(res =>{
uni.requestPayment({
- nonceStr: res.data.nonceStr,
- package: res.data.package,
- paySign: res.data.paySign,
- signType: res.data.signType,
- timeStamp: res.data.timeStamp,
+ nonceStr: res.data.wxInfo.nonceStr,
+ package: res.data.wxInfo.package,
+ paySign: res.data.wxInfo.paySign,
+ signType: res.data.wxInfo.signType,
+ timeStamp: res.data.wxInfo.timeStamp,
success: () => {
- this.getSubscribeMessage()
+ uni.redirectTo({
+ url:'/subPackages/haveFeeling/list'
+ })
},
fail() {
- uni.navigateTo({
- url: '/subPackages/order/trades'
+ uni.redirectTo({
+ url:'/subPackages/haveFeeling/list'
})
}
});