diff --git a/src/pages.json b/src/pages.json
index 22a97b4..60de566 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1072,6 +1072,48 @@
"style" : {
"navigationBarTitleText": "评价"
}
+ },
+ {
+ "path": "pages/goods_search",
+ "style" : {
+ "navigationBarTitleText": "搜索"
+ }
+ },
+ {
+ "path": "pages/appraise_list",
+ "style" : {
+ "navigationBarTitleText": "商品详情"
+ }
+ },
+ {
+ "path": "pages/order/order_share",
+ "style" : {
+ "navigationBarTitleText": "分享我的订单"
+ }
+ },
+ {
+ "path": "pages/order/order_search",
+ "style" : {
+ "navigationBarTitleText": "我的订单"
+ }
+ },
+ {
+ "path": "pages/order/refund_list",
+ "style" : {
+ "navigationBarTitleText": "售后订单"
+ }
+ },
+ {
+ "path": "pages/order/refund_details",
+ "style" : {
+ "navigationBarTitleText": "退款详情"
+ }
+ },
+ {
+ "path": "pages/order/refund_logs",
+ "style" : {
+ "navigationBarTitleText": "协商记录"
+ }
}
]
}
diff --git a/src/subpackage/mall/components/index_search_bar.vue b/src/subpackage/mall/components/index_search_bar.vue
index 9f44ad1..f377ca7 100644
--- a/src/subpackage/mall/components/index_search_bar.vue
+++ b/src/subpackage/mall/components/index_search_bar.vue
@@ -1,8 +1,8 @@
-
+
-
+
搜索
diff --git a/src/subpackage/mall/js/api.js b/src/subpackage/mall/js/api.js
index 7fab14b..320cd64 100644
--- a/src/subpackage/mall/js/api.js
+++ b/src/subpackage/mall/js/api.js
@@ -42,6 +42,18 @@ export const MALL_API = {
goodsComment:`${ORIGIN}/shop2/goodsComment`, //商品评价列表
goodsCommentPublish:`${ORIGIN}/shop2/goodsCommentPublish`, //商品评价
+
+ feedbackList:`${ORIGIN}/stadium/order/feedback/list`, //售后反馈-信息列表 OrderType="product_order"
+ feedbackDetail:`${ORIGIN}/stadium/order/feedback/get/`, //售后反馈-信息详情
+ feedbackCancel:`${ORIGIN}/stadium/order/feedback/cancel/`, //售后反馈-信息撤销
+ feedbackDelete:`${ORIGIN}/stadium/order/feedback/del/`, //售后反馈-信息删除
+
+ goodsOrdeRefund:`${ORIGIN}/shop2/goodsOrdeRefund`, //订单 - 售后 - 申请退款
+ goodsOrdeRefundCancel:`${ORIGIN}/shop2/goodsOrdeRefundCancel`, //订单 - 售后 - 撤销退款申请
+
+ feedbackExpress:`${ORIGIN}/stadium/order/feedback/express`, //售后反馈-商城快递
+ feedbackRecords:`${ORIGIN}/stadium/order/feedback/records`, //售后反馈-协商信息
+ expressList:`${ORIGIN}/stadium/order/express/list`, // 物流公司列表
}
export default { ORIGIN, MALL_API };
\ No newline at end of file
diff --git a/src/subpackage/mall/pages/appraise_list.vue b/src/subpackage/mall/pages/appraise_list.vue
new file mode 100644
index 0000000..53af717
--- /dev/null
+++ b/src/subpackage/mall/pages/appraise_list.vue
@@ -0,0 +1,93 @@
+
+
+ {{ optionsQuery.product_name || '-' }}
+
+ 评价({{commentList.length}})
+
+
+
+
+
+ 没有更多了~
+
+
+
+
+
+
diff --git a/src/subpackage/mall/pages/goods_info.vue b/src/subpackage/mall/pages/goods_info.vue
index 0cb7d25..e440b8f 100644
--- a/src/subpackage/mall/pages/goods_info.vue
+++ b/src/subpackage/mall/pages/goods_info.vue
@@ -8,7 +8,7 @@
-
@@ -75,7 +81,7 @@
import indexSearchBar from "../components/index_search_bar.vue";
import indexClassifyBar from "../components/index_classify_bar.vue";
import goodsItem from "../components/goods_item.vue";
-import spacificationModal from "../components/specification_modal.vue";
+import specificationModal from "../components/specification_modal.vue";
import { routeTo, showLoad, hideLoad, showModal, tsRoute, jsonStr } from "@/utils/util.js";
import { MALL_API } from "../js/api";
import server from "../js/server";
@@ -84,7 +90,7 @@ export default {
indexSearchBar,
indexClassifyBar,
goodsItem,
- spacificationModal
+ specificationModal
},
computed: {
banner(){
@@ -119,10 +125,26 @@ export default {
this.getHomeData({ brand_id: _bid });
},
methods: {
+ toSearch(){
+ let { brand_id } = this;
+ routeTo(`/subpackage/mall/pages/goods_search?brand_id=${brand_id}`, 'nT');
+ },
+ // 购物车
+ toShoppingCart(){
+ let { brand_id } = this;
+ routeTo(`/subpackage/mall/pages/shopping_cart?brand_id=${brand_id}`,'nT');
+ },
+ // 订单列表
+ toOrderLs(){
+ let { brand_id } = this;
+ routeTo(`/subpackage/mall/pages/order/order_list?brand_id=${brand_id}`,'nT');
+ },
+ // 分类列表
toClassify(){
let { brand_id } = this;
routeTo(`/subpackage/mall/pages/classify?brand_id=${brand_id}`,'nT');
},
+ // 根据key获取grid_setting
getGridLsFor(key){
let { showdata } = this;
return showdata?.[key]?.grid_setting ?? [];
@@ -154,7 +176,7 @@ export default {
// 如果商品是多个规格属性的,则出现弹窗给用户选择规格加入购物车,如果是单规格的则直接加入购物车
// 根据product_spec_multi字段做判断 等于1则是多规格
if(e.product_spec_multi == 1){
- this.$refs.spacificationModal.alert({
+ this.$refs.specificationModal.alert({
id: e?.id ?? '',
brand_id: brand_id,
poster: e?.product_imgs?.[0] ?? '',
@@ -164,8 +186,7 @@ export default {
});
return
}
-
- this.$refs?.spacificationModal?.goodsCartAdd({ brand_id, id: e?.id, });
+ this.$refs?.specificationModal?.goodsCartAdd({ brand_id, id: e?.id, });
},
// 是否展示模块
isShow(val) {
@@ -304,4 +325,26 @@ export default {
}
}
}
+ .mi-fix-btn{
+ position: fixed;
+ left: 0rpx;
+ bottom: 50upx;
+ bottom: calc(50upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+ bottom: calc(50upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+ padding: 14rpx 15rpx;
+ border-radius: 14rpx;
+ background: rgba($color: #000000, $alpha: .8);
+ @include ctf(center);
+ .mfb-img{
+ width: 48rpx;
+ height: 48rpx;
+ margin: 0rpx 9rpx;
+ }
+ .mfb-line{
+ width: 2rpx;
+ height: 48rpx;
+ margin: 0rpx 9rpx;
+ background-color: #979797;
+ }
+ }
\ No newline at end of file
diff --git a/src/subpackage/mall/pages/modules/order/order_list_item.vue b/src/subpackage/mall/pages/modules/order/order_list_item.vue
index b265cdd..16f4fac 100644
--- a/src/subpackage/mall/pages/modules/order/order_list_item.vue
+++ b/src/subpackage/mall/pages/modules/order/order_list_item.vue
@@ -54,11 +54,9 @@ import server from "../../../js/server";
export default {
props:{
orderInfo: {
- type: Object,
default: ()=>({})
},
brandId: {
- type: Number,
default: 0
}
},
@@ -108,7 +106,7 @@ export default {
if(status == 1 || status == 2 || status == 3){
let _query = {}
_query['goodsList'] = this.orderInfo.goods || []
- return util.routeTo(`/subpackage/mall/pages/order/order_share/order_share?query=${util.jsonStr(_query)}`,'nT');
+ return util.routeTo(`/subpackage/mall/pages/order/order_share?query=${util.jsonStr(_query)}&brand_id=${brandId}`,'nT');
}
if(status == 4 || status == 5 || status == 7 || status == 8) return this.determineOperate(1);
if(status == 6 ) return console.log("退款详情");
diff --git a/src/subpackage/mall/pages/modules/order/product_info.vue b/src/subpackage/mall/pages/modules/order/product_info.vue
index 0e484f4..b12430b 100644
--- a/src/subpackage/mall/pages/modules/order/product_info.vue
+++ b/src/subpackage/mall/pages/modules/order/product_info.vue
@@ -38,7 +38,6 @@ export default {
}
},
goodsNums: { // 商品数量
- type: Number,
default: 0,
},
isRefund: {
diff --git a/src/subpackage/mall/pages/order/order_details.vue b/src/subpackage/mall/pages/order/order_details.vue
index 55a1aee..c99d632 100644
--- a/src/subpackage/mall/pages/order/order_details.vue
+++ b/src/subpackage/mall/pages/order/order_details.vue
@@ -458,6 +458,7 @@ export default {
});
},
phoneCall() {
+ return util.showNone('暂未开放');
let { orderInfo } = this;
let _phoneStr = orderInfo.contact_mobile || '';
let _phoneArr = _phoneStr.split(',') || [];
diff --git a/src/subpackage/mall/pages/order/order_list.vue b/src/subpackage/mall/pages/order/order_list.vue
index a90d3ab..797f49c 100644
--- a/src/subpackage/mall/pages/order/order_list.vue
+++ b/src/subpackage/mall/pages/order/order_list.vue
@@ -94,10 +94,12 @@ export default {
},
methods: {
toOrderSearch(){
- util.routeTo(`../order_search/order_search`,'nT')
+ let { brand_id } = this;
+ util.routeTo(`/subpackage/mall/pages/order/order_search?brand_id=${brand_id}`,'nT');
},
toRefundList(){
- util.routeTo(`../refund_list/refund_list`,'nT')
+ let { brand_id } = this;
+ util.routeTo(`/subpackage/mall/pages/order/refund_list?brand_id=${brand_id}`,'nT')
},
defineChange(e){
let { brand_id } = this;
diff --git a/src/subpackage/mall/pages/order/order_search.vue b/src/subpackage/mall/pages/order/order_search.vue
new file mode 100644
index 0000000..eeefb6d
--- /dev/null
+++ b/src/subpackage/mall/pages/order/order_search.vue
@@ -0,0 +1,203 @@
+
+
+
+
+
+
+
+
+
+
+
+ 历史搜索
+
+
+ {{e}}
+
+
+
+
+ 您还没有相关的订单~
+
+
+
+
+
+
diff --git a/src/subpackage/mall/pages/order/order_share.vue b/src/subpackage/mall/pages/order/order_share.vue
new file mode 100644
index 0000000..1d20e61
--- /dev/null
+++ b/src/subpackage/mall/pages/order/order_share.vue
@@ -0,0 +1,143 @@
+
+
+ {{pageInfo.product_name || '-'}}
+
+
+ 请选择一件要分享的好货:
+
+
+
+
+
+
+
+ 分享给好友
+
+
+
+
+
+
+
+
+
diff --git a/src/subpackage/mall/pages/order/refund_details.vue b/src/subpackage/mall/pages/order/refund_details.vue
new file mode 100644
index 0000000..0910018
--- /dev/null
+++ b/src/subpackage/mall/pages/order/refund_details.vue
@@ -0,0 +1,729 @@
+
+
+
+
+ {{pageInfo.extension.header || '-'}}
+ {{pageInfo.extension.title || '-'}}请在{{pageInfo.extension.time || '-'}}内响应
+
+
+
+
+
+
+ 退货地址
+ 复制
+
+
+ {{pageInfo.feedback_express.contacts || '-'}}
+ {{pageInfo.feedback_express.mobile || '-'}}
+
+ {{pageInfo.feedback_express.addr || '-'}}
+
+
+ 查看协商记录
+
+
+
+
+
+ 退款金额
+
+ ¥{{pageInfo.refund_amount || 0}}
+
+
+
+
+ 退款商品
+ 共{{productNums}}件
+
+
+
+
+
+ {{e.product_name || '-'}}
+
+ {{setSpecText(e)}}
+ ×{{e.product_nums || 0}}
+
+
+ 实付:¥
+ {{e.refundable_amount || 0}}
+
+
+
+
+
+
+
+
+ 退款类型
+ {{ feedbackType }}
+
+
+ 退款原因
+ {{pageInfo.question_type || '-'}}
+
+
+ 退款金额
+ ¥{{pageInfo.refund_amount || 0}}(含运费¥0)
+
+
+ 退款积分
+ {{pageInfo.refund_deduction_integral || 0}}积分
+
+
+ 售后单号
+
+ {{pageInfo.feedback_no || '-'}}
+ 复制
+
+
+
+ 申请时间
+ {{pageInfo.apply_time || '-'}}
+
+
+
+ 联系商家
+ 撤销退款
+ 填写物流
+
+
+
+
+
+
+
+
+ 填写物流信息
+
+ *物流公司
+
+
+
+
+
+
+
+
+
+ *物流单号
+
+
+
+
+
+ 备注
+
+
+
+
+ 确认
+
+
+
+
+
+
+
diff --git a/src/subpackage/mall/pages/order/refund_list.vue b/src/subpackage/mall/pages/order/refund_list.vue
new file mode 100644
index 0000000..82bc71e
--- /dev/null
+++ b/src/subpackage/mall/pages/order/refund_list.vue
@@ -0,0 +1,324 @@
+
+
+
+
+
+
+
+ {{e.name || '-'}}
+
+ 【退款】
+ {{e.apply_time || '-'}}
+ 申请
+
+
+
+ {{setFeedbackStatus(e)}}
+
+
+
+ 退款:
+ ¥
+ {{e.refund_amount || 0}}
+
+
+ 删除记录
+ 一键撤销退款
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/subpackage/mall/pages/order/refund_logs.vue b/src/subpackage/mall/pages/order/refund_logs.vue
new file mode 100644
index 0000000..003248f
--- /dev/null
+++ b/src/subpackage/mall/pages/order/refund_logs.vue
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+
+ {{pageInfo.sellerRefund.name || '-'}}
+ {{pageInfo.sellerRefund.record_time || '-'}}
+
+
+ {{pageInfo.sellerRefund.title || '-'}}
+
+ 退款金额
+ ¥{{pageInfo.sellerRefund.refund_amount || 0}}(含运费¥0)
+
+
+ 退积分
+ {{pageInfo.sellerRefund.refund_integral || 0}}积分
+
+
+ 备注
+ {{pageInfo.sellerRefund.reply_content || ''}}
+
+
+
+
+
+
+
+ {{pageInfo.sellerRefuse.name || '-'}}
+ {{pageInfo.sellerRefuse.record_time || '-'}}
+
+
+ {{pageInfo.sellerRefuse.title || '-'}}
+
+ 退款金额
+ ¥{{pageInfo.sellerRefuse.refund_amount || 0}}(含运费¥0)
+
+
+ 退积分
+ {{pageInfo.sellerRefuse.refund_integral || 0}}积分
+
+
+ 备注
+ {{pageInfo.sellerRefuse.reply_content || ''}}
+
+
+
+
+
+
+
+ {{pageInfo.buyerReturn.name || '-'}}
+ {{pageInfo.buyerReturn.record_time || '-'}}
+
+
+ {{pageInfo.buyerReturn.title || '-'}}
+
+ 物流公司
+ {{pageInfo.buyerReturn.express.name || '-'}}
+
+
+ 物流单号
+ {{pageInfo.buyerReturn.express.no || '-'}}
+
+
+ 备注
+ {{pageInfo.buyerReturn.express.mark || ''}}
+
+
+
+
+
+
+
+ {{pageInfo.sellerReturn.name || '-'}}
+ {{pageInfo.sellerReturn.record_time || '-'}}
+
+
+ {{pageInfo.sellerReturn.title || '-'}}
+
+ 退货地址
+
+
+ {{pageInfo.sellerReturn.express.contacts || '-'}}
+ {{pageInfo.sellerReturn.express.mobile || '-'}}
+
+ {{pageInfo.sellerReturn.express.addr || '-'}}
+
+ 备注
+ {{pageInfo.sellerReturn.reply_content || ''}}
+
+
+
+
+
+
+
+ {{pageInfo.buyerApply.name || '-'}}
+ {{pageInfo.buyerApply.record_time || '-'}}
+
+
+ {{pageInfo.buyerApply.title || '-'}}
+
+ 退款类型
+ {{pageInfo.buyerApply.feedback_type == 0? '仅退款':'退货退款'}}
+
+
+ 退款金额
+ ¥{{pageInfo.buyerApply.refund_amount || 0}}(含运费¥0)
+
+
+ 退积分
+ {{pageInfo.buyerApply.refund_integral || 0}}积分
+
+
+ 退款原因
+ {{pageInfo.buyerApply.question_type || '-'}}
+
+
+ 退款描述
+ {{pageInfo.buyerApply.question_desc || '-'}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/subpackage/mall/static/images/cancel.png b/src/subpackage/mall/static/images/cancel.png
new file mode 100644
index 0000000..4c9dbe0
Binary files /dev/null and b/src/subpackage/mall/static/images/cancel.png differ
diff --git a/src/subpackage/mall/static/images/close_c97_2.png b/src/subpackage/mall/static/images/close_c97_2.png
new file mode 100644
index 0000000..d8cc22a
Binary files /dev/null and b/src/subpackage/mall/static/images/close_c97_2.png differ
diff --git a/src/subpackage/mall/static/images/del.png b/src/subpackage/mall/static/images/del.png
new file mode 100644
index 0000000..11c9871
Binary files /dev/null and b/src/subpackage/mall/static/images/del.png differ
diff --git a/src/subpackage/mall/static/images/index/menu_1.png b/src/subpackage/mall/static/images/index/menu_1.png
new file mode 100644
index 0000000..eefb0f3
Binary files /dev/null and b/src/subpackage/mall/static/images/index/menu_1.png differ
diff --git a/src/subpackage/mall/static/images/index/menu_2.png b/src/subpackage/mall/static/images/index/menu_2.png
new file mode 100644
index 0000000..9101fa5
Binary files /dev/null and b/src/subpackage/mall/static/images/index/menu_2.png differ
diff --git a/src/subpackage/mall/static/images/index/menu_3.png b/src/subpackage/mall/static/images/index/menu_3.png
new file mode 100644
index 0000000..7cc7dcd
Binary files /dev/null and b/src/subpackage/mall/static/images/index/menu_3.png differ
diff --git a/src/subpackage/mall/static/images/price.png b/src/subpackage/mall/static/images/price.png
new file mode 100644
index 0000000..a8e47cf
Binary files /dev/null and b/src/subpackage/mall/static/images/price.png differ