From 2918155f6fc7ea60a8562ca2a20587cfcab51e80 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Tue, 11 Feb 2025 18:26:18 +0800
Subject: [PATCH] add mall logic for tid1878

---
 src/pages.json                                     |  42 ++
 .../mall/components/index_search_bar.vue           |   4 +-
 src/subpackage/mall/js/api.js                      |  12 +
 src/subpackage/mall/pages/appraise_list.vue        |  93 +++
 src/subpackage/mall/pages/goods_info.vue           |  51 +-
 src/subpackage/mall/pages/goods_search.vue         | 260 ++++++++
 src/subpackage/mall/pages/index.vue                |  59 +-
 .../mall/pages/modules/order/order_list_item.vue   |   4 +-
 .../mall/pages/modules/order/product_info.vue      |   1 -
 src/subpackage/mall/pages/order/order_details.vue  |   1 +
 src/subpackage/mall/pages/order/order_list.vue     |   6 +-
 src/subpackage/mall/pages/order/order_search.vue   | 203 ++++++
 src/subpackage/mall/pages/order/order_share.vue    | 143 ++++
 src/subpackage/mall/pages/order/refund_details.vue | 729 +++++++++++++++++++++
 src/subpackage/mall/pages/order/refund_list.vue    | 324 +++++++++
 src/subpackage/mall/pages/order/refund_logs.vue    | 287 ++++++++
 src/subpackage/mall/static/images/cancel.png       | Bin 0 -> 356 bytes
 src/subpackage/mall/static/images/close_c97_2.png  | Bin 0 -> 233 bytes
 src/subpackage/mall/static/images/del.png          | Bin 0 -> 498 bytes
 src/subpackage/mall/static/images/index/menu_1.png | Bin 0 -> 311 bytes
 src/subpackage/mall/static/images/index/menu_2.png | Bin 0 -> 684 bytes
 src/subpackage/mall/static/images/index/menu_3.png | Bin 0 -> 851 bytes
 src/subpackage/mall/static/images/price.png        | Bin 0 -> 1378 bytes
 23 files changed, 2199 insertions(+), 20 deletions(-)
 create mode 100644 src/subpackage/mall/pages/appraise_list.vue
 create mode 100644 src/subpackage/mall/pages/goods_search.vue
 create mode 100644 src/subpackage/mall/pages/order/order_search.vue
 create mode 100644 src/subpackage/mall/pages/order/order_share.vue
 create mode 100644 src/subpackage/mall/pages/order/refund_details.vue
 create mode 100644 src/subpackage/mall/pages/order/refund_list.vue
 create mode 100644 src/subpackage/mall/pages/order/refund_logs.vue
 create mode 100644 src/subpackage/mall/static/images/cancel.png
 create mode 100644 src/subpackage/mall/static/images/close_c97_2.png
 create mode 100644 src/subpackage/mall/static/images/del.png
 create mode 100644 src/subpackage/mall/static/images/index/menu_1.png
 create mode 100644 src/subpackage/mall/static/images/index/menu_2.png
 create mode 100644 src/subpackage/mall/static/images/index/menu_3.png
 create mode 100644 src/subpackage/mall/static/images/price.png

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 @@
 <template>
     <view class="index-search-bar">
-        <view class="isb-frame">
+        <view class="isb-frame" @click="$emit('click:search')">
             <image class="if-icon" mode="aspectFit" src="/subpackage/mall/static/images/search.png"></image>
-            <input class="if-ipt" />
+            <input class="if-ipt" disabled />
             <view class="if-btn">搜索</view>
         </view>
         <view class="isb-box" v-if="shoppingCart" @click="$emit('click:scart')">
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 @@
+<template>
+	<view class="appraise-list">
+		<view class="al-name">{{ optionsQuery.product_name || '-' }}</view>
+		<view class="al-desc">
+			<view class="ad-tit">评价({{commentList.length}})</view>
+			<block v-for="(e,i) in commentList" :key="i">
+				<appraise-item
+					:name="e.sys_optuname"
+					:avater="e.sys_optuimgs"
+					:time="e.created_at"
+					:appraise="e.product_comment_text"
+					:level-num="e.product_comment_level"
+					:img-list="e.product_comment_imgs"
+				></appraise-item>
+			</block>
+			
+		</view>
+		<view class="al-end">没有更多了～</view>
+	</view>
+</template>
+
+<script>
+	import { jsonPar, showLoad, hideLoad } from '@/utils/util';
+	import { MALL_API } from "../js/api";
+	import server from "../js/server";
+	import appraiseItem from "../components/appraise_item.vue";
+	export default {
+		components: { appraiseItem },
+		data() {
+			return {
+				optionsQuery: {},
+				commentList: [],
+			}
+		},
+		onLoad(options) {
+			let _query = jsonPar(options.query);
+			this.optionsQuery = _query
+			this.getCommentList({
+				proid: _query.product_id,
+				brand_id: options?.brand_id ?? ''
+			});
+		},
+		methods: {
+			// 商品评价列表
+			getCommentList({ brand_id, proid }) {
+				showLoad();
+				server.post({
+					url: MALL_API.goodsComment,
+					data: { brand_id, proid },
+					failMsg: '加载数据失败！'
+				})
+				.then(res => {
+					hideLoad();
+					console.log('商品评价列表: ', res);
+					this.commentList = res.list || []
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.appraise-list{
+		.al-name{
+			padding: 22rpx 24rpx;
+			margin-bottom: 24rpx;
+			background-color: #fff;
+			display: flex;
+			flex-grow: 1;
+			color: #333;
+			font-size: 32rpx;
+			font-weight: 700;
+			// @include textHide(1);
+		}
+		.al-desc{
+			padding: 40rpx 0;
+			background-color: #fff;
+			.ad-tit{
+				color: #333;
+				font-size: 28rpx;
+				margin-left: 28rpx;
+			}
+		}
+		.al-end{
+			padding: 46rpx 0;
+			flex-grow: 1;
+			color: #9A9A9D;
+			font-size: 28rpx;
+			text-align: center;
+		}
+			
+	}
+</style>
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 @@
                         <image class="gb-img" mode="aspectFill" :src="e"></image>
                     </swiper-item>
                 </swiper>
-                <button class="gb-share">
+                <button class="gb-share" open-type="share">
                     <image class="gs-img" mode="aspectFit" src="/subpackage/mall/static/images/share.png"></image>
                 </button>
                 <view class="gb-num" v-if="bannerNumStr">{{ bannerNumStr }}</view>
@@ -76,7 +76,7 @@
         <view class="gi-appraise-info">
             <view class="gai-title-bar">
                 <view class="gtb-tit">评价({{ appraiseList.length || 0 }})</view>
-                <view class="gtb-link">
+                <view class="gtb-link" @click="toAllAppraise">
                     <text>查看全部</text>
                     <image class="gl-icon" mode="aspectFit" src="/subpackage/mall/static/images/arrow_874.png"></image>
                 </view>
@@ -107,11 +107,11 @@
         <!-- 底部悬浮按钮 -->
         <view class="gd-fixed-bar">
             <view class="gfb-left">
-                <view class="gl-box">
+                <view class="gl-box" @click="toIndex">
                     <image class="gb-icon" mode="aspectFit" src="/subpackage/mall/static/images/home.png"></image>
                     <view class="gb-txt">首页</view>
                 </view>
-                <view class="gl-box">
+                <view class="gl-box" @click="toShoppingCart">
                     <image class="gb-icon" mode="aspectFit" src="/subpackage/mall/static/images/shopping_cart.png"></image>
                     <view class="gb-txt">购物车</view>
                     <view class="gb-num" v-if="goodsCartNum>0">{{ goodsCartNum }}</view>
@@ -217,6 +217,15 @@ export default {
             return ''
         }
     },
+    onShareAppMessage(res) {
+		let { goodsInfo } = this;
+		let url = `/subpackage/mall/pages/goods_info?id=${goodsInfo?.id ?? ''}&brand_id=${goodsInfo?.brand_id ?? ''}`;
+		return {
+		  title: goodsInfo.product_name ?? '',
+		  path: url,
+		  imageUrl: goodsInfo?.product_imgs?.[0] ?? ''
+		}
+	},
     onLoad(options){
         let _bid = options?.brand_id ?? '';
         this.getGoodsInfo({
@@ -230,6 +239,40 @@ export default {
         });
     },
     methods: {
+        // 全部评论
+        toAllAppraise(){
+            let { goodsInfo } = this;
+            let _query = {};
+			_query['product_name'] = goodsInfo.product_name;
+			_query['product_id'] = goodsInfo.id;
+			routeTo(`/subpackage/mall/pages/appraise_list?query=${jsonStr(_query)}&brand_id=${goodsInfo?.brand_id ?? ''}`, 'nT');
+        },
+        toIndex(){
+            let { goodsInfo } = this;
+            this.checkPagesForNavigate({ path: 'subpackage/mall/pages/index', qryStr: `brand_id=${goodsInfo?.brand_id}` });
+        },
+        toShoppingCart(){
+            let { goodsInfo } = this;
+            this.checkPagesForNavigate({ path: 'subpackage/mall/pages/shopping_cart', qryStr: `brand_id=${goodsInfo?.brand_id}` });
+        },
+        // 检查页面栈，判断跳转zhang
+        /**
+         * @param {String} path 路由路径
+         * @param {String} qryStr 路由参数
+         * @param {String} methods 路由跳转方式
+         * */ 
+        checkPagesForNavigate({ path, qryStr = '', methods = 'nT' }){
+            let _pageLs = getCurrentPages();
+            let _pathLs = _pageLs.map(e=>e.route);
+            let _pathIdx = _pathLs.indexOf(path);
+            if(_pathIdx >= 0){
+                uni.navigateBack({ delta: _pageLs.length - (_pathIdx + 1) });
+            }else{
+                let _path = '/' + path + (qryStr ? '?' + qryStr : '');
+                routeTo(_path, methods);
+            }
+        },
+        // 规格弹窗
         specificationLineClick(){
             let { goodsInfo, getQueryForSpecificationModal } = this;
             let _sModalRef = this.$refs.specificationModal;
diff --git a/src/subpackage/mall/pages/goods_search.vue b/src/subpackage/mall/pages/goods_search.vue
new file mode 100644
index 0000000..5e37b76
--- /dev/null
+++ b/src/subpackage/mall/pages/goods_search.vue
@@ -0,0 +1,260 @@
+<template>
+	<view class="goods-search" :class="{bgChange: searchText!=''}">
+		<view class="gs-head">
+			<view class="gh-ipt">
+				<image v-if="searchText==''" class="m-right" mode="aspectFit" src="/subpackage/mall/static/images/search.png"></image>
+				<input placeholder="请输入商品名称" type="text" confirm-type="search" @confirm="onSearch" v-model="searchText" @focus="inputFocus" @change="inputChange"/>
+				<image v-if="searchText!=''" mode="aspectFit" src="/subpackage/mall/static/images/cancel.png" @click.stop="clearChange()"></image>
+			</view>
+		</view>
+		<view class="gs-history" v-if="searchText==''">
+			<view class="gh-line">
+				<view>历史搜索</view>
+				<image src="/subpackage/mall/static/images/del.png" @click="delHistory"></image>
+			</view>
+			<view class="gh-item" v-for="(e, i) in historyList" :key="i" @click="onHistroy(e)">{{e}}</view>
+		</view>
+		<view class="gs-list" v-if="goodsList.length > 0 && searchText!=''">
+			<view class="gl-item" v-for="(e, i) in goodsList" :key="i" v-if="goodsList.length > 0 && searchText!=''">
+				<goods-item
+					:poster="(e.product_imgs&&e.product_imgs[0]) || ''"
+					:name="e.product_name"
+					:price="e.product_price"
+					:product-id="e.id"
+					:brand-id="brand_id"
+					:is-del-price="e.product_spec_multi === 0&&e.product_price_show != 0"
+					:del-price="e.product_price_show || 0"
+					@click:add="goodsItemAddBtn(e)"
+				></goods-item>
+			</view>
+		</view>
+		<view class="gs-on-list" v-if="goodsList.length == 0 && searchText!=''&&isFocus">没有找到相关的商品~</view>
+		<!-- 分类 -->
+        <specification-modal ref="spacificationModal" button-txt="加入购物车"></specification-modal>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import { MALL_API } from "../js/api";
+import server from "../js/server";
+import goodsItem from "../components/goods_item.vue";
+import specificationModal from "../components/specification_modal.vue";
+export default {
+	components: {
+		goodsItem,
+		specificationModal
+	},
+	data() {
+		return {
+			page: 1,
+			searchText: '',
+			historyList: [],
+			goodsList: [],
+			isFocus: false,
+			brand_id: '',
+		}
+	},
+	onLoad(options) {
+		this.brand_id = options?.brand_id ?? '';
+		this.historyList = uni.getStorageSync("mallGoodsSearch") || [];
+		
+	},
+	onReachBottom(){
+		let { page, brand_id } = this;
+		this.getGoodsList({
+			brand_id,
+			page: ++page
+		})
+	},
+	methods: {
+		goodsItemAddBtn(e){
+            let { brand_id } = this;
+            // 如果商品是多个规格属性的，则出现弹窗给用户选择规格加入购物车，如果是单规格的则直接加入购物车
+			// 根据product_spec_multi字段做判断 等于1则是多规格
+            if(e.product_spec_multi == 1){
+                this.$refs.spacificationModal.alert({
+                    id: e?.id ?? '',
+                    brand_id: brand_id,
+                    poster: e?.product_imgs?.[0] ?? '',
+                    name: e?.product_name ?? '',
+                    price: e?.product_price ?? '',
+                    specArr: e?.product_spec ?? [],
+                });
+                return 
+            }
+            this.$refs?.spacificationModal?.goodsCartAdd({ brand_id, id: e?.id, });
+        },
+		// 商品列表
+		getGoodsList({ brand_id, key='', page = 1, page_size = 20}){
+			let _query = {
+				brand_id,
+				key,
+				page,
+				page_size,
+			}
+			util.showLoad();
+			server.get({
+				url: MALL_API.goodsList,
+				data: _query,
+				failMsg: '加载数据失败！'
+			})
+			.then(res => {
+				util.hideLoad();
+				console.log('商品列表: ', res);
+				// this.goodsList = res.list || []
+				this.getHistory(key)
+				let _list = res.list || [];
+				if(_list.length == 0) this.isFocus  = true;
+				if(page == 1){
+					this.goodsList = _list;
+					return
+				}
+				if(_list.length<=0)return;// util.showNone('没有更多！');
+				this.page = page;
+				this.goodsList = [...this.goodsList, ...res.list];
+				
+				
+			});
+		},
+		getHistory(key){
+			if(!key)return;
+			let _arr = [...new Set([key, ...this.historyList])].slice(0,6);
+			this.historyList = _arr;
+			uni.setStorageSync("mallGoodsSearch", _arr)
+		},
+		
+		// 搜索
+		onSearch(){
+			let { brand_id } = this;
+			this.getGoodsList({
+				brand_id,
+				key: this.searchText,
+			})
+		},
+		// 历史关键字搜索
+		onHistroy(e){
+			let { brand_id } = this;
+			this.searchText = e
+			this.isFocus = true
+			this.getGoodsList({
+				brand_id,
+				key: this.searchText,
+			})
+		},
+		// 清空搜索框
+		clearChange(){
+			this.searchText = ''
+			this.setPageInfo()
+		},
+		// 删除历史记录
+		delHistory(){
+			this.historyList = []
+			uni.removeStorageSync('mallGoodsSearch')
+		},
+		inputChange(e){
+			let { brand_id } = this;
+			if(e.detail.value == '')return this.goodsList = [];
+			this.getGoodsList({
+				brand_id,
+				key: e.detail.value,
+			})
+		},
+		inputFocus(e){
+			this.setPageInfo()
+		},
+		setPageInfo(){
+			this.isFocus  = false;
+			this.goodsList = []
+		},
+		
+	}
+}
+</script>
+<style lang="scss">
+.goods-search{
+	position: relative;
+	padding-top: 156rpx;
+	min-height: 100vh;
+	background-color: #fff;
+	.gs-head{
+		position: fixed;
+		top: 0;
+		z-index: 2;
+		width: 100%;
+		padding: 32rpx 24rpx;
+		background-color: #fff;
+		.gh-ipt{
+			flex-grow: 1;
+			padding: 0 28rpx;
+			height: 72rpx;
+			border-radius: 36rpx;
+			border: 2rpx solid $mColor;
+			@include ctf(flex-start);
+			>image{
+				flex-shrink: 0;
+				width: 30rpx;
+				height: 30rpx;
+			}
+			& input{
+				flex-grow: 1;
+				height: 100%;
+				font-size: 28rpx;
+				color: #333;
+				// background-color: #007AFF;
+				margin-right: 20rpx;
+			}
+			.m-right{
+				margin-right: 24rpx;
+			}
+		}
+	}
+	.gs-history{
+		background-color: #fff;
+		padding: 0 40rpx;
+		.gh-line{
+			padding: 26rpx 0;
+			@include ctf(space-between);
+			>view{
+				color: #181818;
+				font-size: 32rpx;
+			}
+			>image{
+				width: 34rpx;
+				height: 34rpx;
+			}
+		}
+		.gh-item{
+			display: inline-block;
+			background-color: #F2F2F7;
+			border-radius: 32rpx;
+			color: #C1C1C7;
+			font-size: 28rpx;
+			padding: 12rpx 44rpx;
+			margin: 0 20rpx 20rpx 0;
+		}
+			
+	}
+	.gs-list{
+		padding: 0 24rpx;
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		.gl-item {
+			flex-shrink: 0;
+			margin-bottom: 24rpx;
+		}
+	}
+	.gs-on-list{
+		margin-top: 200rpx;
+		width: 750rpx;
+		color: #9A9A9D;
+		font-size: 28rpx;
+		text-align: center;
+	}
+	
+}
+.bgChange{
+	background-color: #F2F2F7;
+}
+</style>
diff --git a/src/subpackage/mall/pages/index.vue b/src/subpackage/mall/pages/index.vue
index 443b3f8..239c5d1 100644
--- a/src/subpackage/mall/pages/index.vue
+++ b/src/subpackage/mall/pages/index.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="mall-index">
         <view class="mi-header">
-            <index-search-bar v-if="isShow('搜索栏')"></index-search-bar>
+            <index-search-bar v-if="isShow('搜索栏')" @click:search="toSearch"></index-search-bar>
             <block v-if="isShow('轮播图')&&banner.length">
                 <view class="mh-graph"></view>
                 <swiper class="mh-swiper" autoplay indicator-dots indicator-active-color='#009874'>
@@ -65,9 +65,15 @@
                 </view>
             </view>
         </block>
-
+        <view class="mi-fix-btn">
+            <image class="mfb-img" src="/subpackage/mall/static/images/index/menu_1.png" @click="toClassify"></image>
+            <view class="mfb-line"></view>
+            <image class="mfb-img" src="/subpackage/mall/static/images/index/menu_2.png" @click="toOrderLs"></image>
+            <view class="mfb-line"></view>
+            <image class="mfb-img" src="/subpackage/mall/static/images/index/menu_3.png" @click="toShoppingCart"></image>
+        </view>
         <!-- 分类 -->
-        <spacification-modal ref="spacificationModal" button-txt="加入购物车"></spacification-modal>
+        <specification-modal ref="specificationModal" button-txt="加入购物车"></specification-modal>
     </view>
 </template>
 
@@ -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;
+        }
+    }
 </style>
\ 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 @@
+<template>
+	<view class="order-search" :class="{bgChange: searchText!=''}">
+		<view class="os-head">
+			<view class="oh-ipt">
+				<image v-if="searchText==''" class="m-right" mode="aspectFit" src="/subpackage/mall/static/images/search.png"></image>
+				<input placeholder="搜索我的订单" type="text" confirm-type="search" @confirm="onSearch" v-model="searchText" @focus="inputFocus" @change="inputChange"/>
+				<image v-if="searchText!=''" mode="aspectFit" src="/subpackage/mall/static/images/cancel.png" @click.stop="clearChange()"></image>
+			</view>
+		</view>
+		<view class="os-history" v-if="searchText==''">
+			<view class="oh-line">
+				<view>历史搜索</view>
+				<image src="/subpackage/mall/static/images/del.png" @click="delHistory"></image>
+			</view>
+			<view class="oh-item" v-for="(e, i) in historyList" :key="i" @click="onHistroy(e)">{{e}}</view>
+		</view>
+		<block v-for="(e, i) in orderList" :key="i" v-if="orderList.length > 0 && searchText!=''">
+			<order-list-item 
+				:brand-id="brand_id"
+				:orderInfo="e" 
+				@defineChange="defineChange"
+			></order-list-item>
+		</block>
+		<view class="gs-on-list" v-if="orderList.length == 0 && searchText!=''&&isFocus">您还没有相关的订单~</view>
+	</view>
+</template>
+
+<script>
+
+import util from '@/utils/util';
+import { MALL_API } from "../../js/api";
+import server from "../../js/server";
+import orderListItem from '../modules/order/order_list_item.vue';
+export default {
+	components: { orderListItem },
+	data() {
+		return {
+			page: 1,
+			orderList: [],
+			searchText: '',
+			historyList: [],
+			isFocus: false,
+			brand_id: '',
+		}
+	},
+	onLoad(options) {
+		this.brand_id = options?.brand_id ?? '';
+		this.historyList = uni.getStorageSync("mallOrderHistorySearch") || [];
+	},
+	methods: {
+		defineChange(e){
+			let { brand_id } = this;
+			if(e == true) this.getOrderList({ brand_id, key: this.searchText });
+		},
+		getOrderList({ brand_id, key }){  //page = 1, page_size = 20,
+			let _query = {
+				brand_id,
+				key,
+			}
+			util.showLoad();
+			server.get({
+				url: MALL_API.goodsOrderList,
+				data: _query,
+				failMsg: '加载数据失败！'
+			})
+			.then(res => {
+				util.hideLoad();
+				console.log('订单列表: ', res);
+				this.orderList = res.list || [];
+				if(this.orderList.length == 0) this.isFocus  = true;
+				if(!key)return;
+				let _arr = [...new Set([key, ...this.historyList])].slice(0,6);
+				this.historyList = _arr;
+				uni.setStorageSync("mallOrderHistorySearch", _arr)
+			});
+		},
+		
+		// 搜索
+		onSearch(){
+			let { brand_id } = this;
+			this.getOrderList({
+				key: this.searchText,
+				brand_id
+			})
+		},
+		// 历史关键字搜索
+		onHistroy(e){
+			let { brand_id } = this;
+			this.searchText = e
+			this.isFocus = true
+			this.getOrderList({
+				key: this.searchText,
+				brand_id
+			})
+		},
+		// 清空搜索框
+		clearChange(){
+			this.searchText = ''
+			this.setPageInfo()
+		},
+		// 删除历史记录
+		delHistory(){
+			this.historyList = []
+			uni.removeStorageSync('mallOrderHistorySearch')
+		},
+		inputChange(e){
+			let { brand_id } = this;
+			console.log("搜索999： ",e.detail.value)
+			if(e.detail.value == '')return this.orderList = [];
+			this.getOrderList({
+				key: e.detail.value,
+				brand_id
+			})
+		},
+		inputFocus(e){
+			this.setPageInfo()
+		},
+		setPageInfo(){
+			this.isFocus  = false;
+			this.orderList = []
+		},
+	}
+}
+</script>
+
+<style lang="scss">
+
+.order-search{
+	position: relative;
+	padding-top: 156rpx;
+	min-height: 100vh;
+	background-color: #fff;
+	.os-head{
+		position: fixed;
+		top: 0;
+		z-index: 2;
+		width: 100%;
+		padding: 32rpx 24rpx;
+		background-color: #fff;
+		.oh-ipt{
+			flex-grow: 1;
+			padding: 0 28rpx;
+			height: 72rpx;
+			border-radius: 36rpx;
+			border: 2rpx solid $mColor;
+			@include ctf(flex-start);
+			>image{
+				flex-shrink: 0;
+				width: 30rpx;
+				height: 30rpx;
+			}
+			& input{
+				flex-grow: 1;
+				height: 100%;
+				font-size: 28rpx;
+				color: #333;
+				// background-color: #007AFF;
+				margin-right: 20rpx;
+			}
+			.m-right{
+				margin-right: 24rpx;
+			}
+		}
+	}
+	.os-history{
+		background-color: #fff;
+		padding: 0 40rpx;
+		.oh-line{
+			padding: 26rpx 0;
+			@include ctf(space-between);
+			>view{
+				color: #181818;
+				font-size: 32rpx;
+			}
+			>image{
+				width: 34rpx;
+				height: 34rpx;
+			}
+		}
+		.oh-item{
+			display: inline-block;
+			background-color: #F2F2F7;
+			border-radius: 32rpx;
+			color: #C1C1C7;
+			font-size: 28rpx;
+			padding: 12rpx 44rpx;
+			margin: 0 20rpx 20rpx 0;
+		}
+			
+	}
+	.gs-on-list{
+		margin-top: 200rpx;
+		width: 750rpx;
+		color: #9A9A9D;
+		font-size: 28rpx;
+		text-align: center;
+	}
+	
+}
+.bgChange{
+	background-color: #F2F2F7;
+}
+</style>
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 @@
+<template>
+	<view class="order-share">
+		<view class="os-title">{{pageInfo.product_name || '-'}}</view>
+		<image class="os-img" mode="aspectFill" :src="pageInfo.product_imgs || ''"></image>
+		<view class="os-box">
+			<view class="ob-txt">请选择一件要分享的好货：</view>
+			<view class="ob-item"  v-for="(e,i) in goodsList" :key="i" @click="onClickItem(e)">
+				<image class="oi-img" :class="{itemChange: e.product_id == pageInfo.product_id}" :src="e.product_imgs || ''"></image>
+				<image class="oi-icon" src="/subpackage/mall/static/images/selected2.png" v-if="e.product_id == pageInfo.product_id"></image>
+			</view>
+		</view>
+		<view class="os-btn">
+			<button class="ob-share" hover-class='hover-active' type="" open-type="share" >
+			分享给好友
+			</button>
+			<!-- 	<view>分享给好友</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import util from '@/utils/util';
+	export default {
+		data() {
+			return {
+				goodsList: [],
+				pageInfo: {},
+				brand_id: '',
+			}
+		},
+		async onLoad(options) {
+			this.brand_id = options?.brand_id ?? '';
+			try{
+				let _query = util.jsonPar(options.query);
+				this.goodsList = _query.goodsList
+				this.pageInfo = this.goodsList[0]
+			}catch(err){
+				console.error('init-share-error',err);
+			}
+		},
+		onShareAppMessage(res) {
+			let { pageInfo, brand_id } = this;
+			let url = `/subpackage/mall/pages/goods_info?id=${pageInfo.product_id}&brand_id=${brand_id}`
+			return {
+			  title: pageInfo.product_name ?? '',
+			  path: url,
+			  imageUrl: pageInfo?.product_imgs ?? ''
+			}
+		},
+		methods: {
+			onClickItem(item){
+				console.warn(item)
+				this.pageInfo = item
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+page{
+	background-color: #fff;
+}
+.order-share{
+	position: relative;
+	@include isPd(110upx);
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	.os-title{
+		color: #000;
+		font-size: 32rpx;
+		max-width: 480rpx;
+		text-align: center;
+		line-height: 44rpx;
+		margin: 44rpx 0;
+	}
+	.os-img{
+		width: 528rpx;
+		height: 528rpx;
+		border-radius: 10rpx;
+	}
+	.os-box{
+		width: 100%;
+		padding: 10rpx 0 0 40rpx;
+		.ob-txt{
+			color: #000;
+			font-size: 28rpx;
+			margin: 34rpx 20rpx;
+		}
+		.ob-item{
+			position: relative;
+			display: inline-block;
+			width: 208rpx;
+			height: 208rpx;
+			margin: 0rpx 0rpx 20rpx 20rpx;
+			.oi-img{
+				width: 200rpx;
+				height: 200rpx;
+				border-radius: 10rpx;
+			}
+			.oi-icon{
+				position: absolute;
+				top: 8rpx;
+				right: 16rpx;
+				width: 32rpx;
+				height: 32rpx;
+			}
+			.itemChange{
+				width: 196rpx;
+				height: 196rpx;
+				border: 4rpx solid $mColor;
+			}
+		}
+	}
+	.os-btn{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		padding: 18rpx 0;
+		@include isPd(18rpx);
+		background-color: #fff;
+		button::after{
+			border: none;
+			background-color: none;
+		}
+	
+		.ob-share {
+			margin: 0 24rpx;
+			flex-grow: 1;
+			border: none;
+			background: linear-gradient(90deg, #44D7B6 0%, $mColor 100%);
+			border-radius: 36rpx;
+			padding: 2rpx 0;
+			text-align: center;
+			color: #FFF;
+			font-size: 28rpx;
+		}
+		
+	}
+}
+</style>
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 @@
+<template>
+	<view class="refund-details">
+		<view class="rd-head">
+			<view class="rh-view">
+				<view>{{pageInfo.extension.header || '-'}}</view>
+				<view>{{pageInfo.extension.title || '-'}}<view v-if="pageInfo.express_status == 1">请在<text>{{pageInfo.extension.time || '-'}}</text>内响应</view></view>
+			</view>
+			<image src="/subpackage/mall/static/images/order/status_5.png"></image>
+		</view>
+		<!-- 退货地址 -->
+		<view class="rd-addr" v-if="pageInfo.feedback_type==1 && pageInfo.express_status == 1">
+			<view class="ra-line">
+				<view>退货地址</view>
+				<view @click="copyOrder(shipInfo)">复制</view>
+			</view>
+			<view class="ra-name">
+				<text>{{pageInfo.feedback_express.contacts || '-'}}</text>
+				<text>{{pageInfo.feedback_express.mobile || '-'}}</text>
+			</view>
+			<view class="ra-position">{{pageInfo.feedback_express.addr || '-'}}</view>
+		</view>
+		<view class="rd-annal" @click="toRrefundLogs">
+			<view>查看协商记录</view>
+			<image src="/subpackage/mall/static/images/arrow_9ad.png"></image>
+		</view>
+		<view class="rd-price">
+			<view>
+				<image src="/subpackage/mall/static/images/price.png"></image>
+				<text>退款金额</text>
+			</view>
+			<view>￥{{pageInfo.refund_amount || 0}}</view>
+		</view>
+		<!-- 退款商品 -->
+		<view class="rd-goods">
+			<view class="rg-tit">
+				<text>退款商品</text>
+				<text>共{{productNums}}件</text>
+			</view>
+			<view class="rg-list" v-for="(e, i) in pageInfo.goods" :key="i">
+				<view class="rl-item">
+					<image mode="aspectFill" :src="e.product_imgs || ''"></image>
+					<view class="ri-section">
+						<view class="rs-name">{{e.product_name || '-'}}</view>
+						<view class="rs-line">
+							<view>{{setSpecText(e)}}</view>
+							<view>×{{e.product_nums || 0}}</view>
+						</view>
+						<view class="rs-price">
+							<text>实付：¥</text>
+							<text>{{e.refundable_amount || 0}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 退款信息 -->
+		<view class="rd-info">
+			<view class="ri-line">
+				<view>退款类型</view>
+				<view>{{ feedbackType }}</view>
+			</view>
+			<view class="ri-line">
+				<view>退款原因</view>
+				<view>{{pageInfo.question_type || '-'}}</view>
+			</view>
+			<view class="ri-line">
+				<view>退款金额</view>
+				<view>￥{{pageInfo.refund_amount || 0}}（含运费¥0）</view>
+			</view>
+			<view class="ri-line">
+				<view>退款积分</view>
+				<view>{{pageInfo.refund_deduction_integral || 0}}积分</view>
+			</view>
+			<view class="ri-line">
+				<view>售后单号</view>
+				<view>
+					{{pageInfo.feedback_no || '-'}}
+					<text @click="copyOrder(pageInfo.feedback_no)">复制</text>
+				</view>
+			</view>
+			<view class="ri-line">
+				<view>申请时间</view>
+				<view>{{pageInfo.apply_time || '-'}}</view>
+			</view>
+		</view>
+		<view class="rd-btn">
+			<view class="rb-btn1" hover-class="hover-active" @click="btnChange(1)">联系商家</view>
+			<view v-if="isFeedbackBtn" class="rb-btn2" hover-class="hover-active" @click="btnChange(2)">撤销退款</view>
+			<view v-if="pageInfo.feedback_type==1 && pageInfo.express_status == 1" class="rb-btn3" hover-class="hover-active" @click="isShowLogistics = !isShowLogistics">填写物流</view>
+		</view>
+		
+		<!-- 填写物流信息 -->
+		<view class="fixed-mask" v-if="isShowLogistics" @touchmove.stop.prevent="moveHandle">
+			<view class="rd-logistics-modal">
+				<view class="rlm-close">
+					<image src="/subpackage/mall/static/images/close_c97_2.png" @click="isShowLogistics = !isShowLogistics"></image>
+				</view>
+				<view class="rlm-tit">填写物流信息</view>
+				<view class="rlm-box">
+					<view><text>*</text>物流公司</view>
+					<picker class="rb-picker" :range="expressList" @change="pickerChange">
+						<view class="rp-view">
+							<input v-model="expressInfo.express_name" disabled="true"/>
+							<image src="/subpackage/mall/static/images/arrow_9ad.png" style="transform: rotateZ(90deg)"></image>
+						</view>
+					</picker>
+					
+				</view>
+				<view class="rlm-box">
+					<view><text>*</text>物流单号</view>
+					<view>
+						<input type="text" v-model="expressInfo.express_no" @change="iptNoChange"/>
+					</view>
+				</view>
+				<view class="rlm-box">
+					<view>备注</view>
+					<view>
+						<input placeholder="选填" type="text" v-model="expressInfo.express_mark" @change="iptMarkChange"/>
+					</view>
+				</view>
+				<view class="rlm-btn" hover-class="hover-active" @click="expressBtn">确认</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import util from '@/utils/util';
+	import { MALL_API } from "../../js/api";
+	import server from "../../js/server";
+	export default {
+		computed: {
+			feedbackType(){
+				let status = this.pageInfo.feedback_type
+				let arr = ['仅退款','退货退款']
+				return arr[status] || '-';
+			},
+			isFeedbackBtn(){
+				// 组合状态
+				// feedback_status = 0 & reply_status = 0 --> 退款中
+				// feedback_status = 1 & reply_status = 0 ---> 关闭退款
+				// feedback_status = 1 & reply_status = 1 ---> 退款完成
+				// feedback_status = 2 & reply_status = 0 --> 退款撤回
+				let { pageInfo } = this
+				if(pageInfo.feedback_type==0){
+					if(pageInfo.feedback_status == 0 && pageInfo.reply_status == 0) return true;
+					else return false;
+				}
+				if(pageInfo.feedback_type==1){
+					if(pageInfo.express_status == 0 || pageInfo.express_status == 1) return true;
+					else return false;
+				}
+			},
+			productNums(){
+				let { pageInfo } = this
+				let _list = this.pageInfo.goods
+				let num = 0
+				for(var i in _list){
+					num = _list[i].product_nums + num
+				}
+				return num;
+			},
+			productCartIds(){
+				let list = this.pageInfo.goods
+				let _arr = []
+				for(var i in list){
+					_arr.push(list[i].product_cart_id)
+				}
+				return _arr;
+			},
+		},
+		data() {
+			return {
+				isShowLogistics: false,
+				pageInfo: {},
+				expressInfo: {
+					express_name: '',
+					express_no: '',
+					express_mark: '',
+				},
+				expressList: [],
+				shipInfo: '',  // 商家收货地址
+				brand_id: '',
+			}
+		},
+		onLoad(options) {
+			let _bid = options?.brand_id ?? '';
+			this.brand_id = _bid;
+			this.getFeedbackDetail({
+				brand_id: _bid,
+				id: options.id,
+			})
+			this.getExpressList()
+		},
+		methods: {
+			moveHandle(){},
+			toRrefundLogs(){
+				let{ brand_id, pageInfo } = this;
+				util.routeTo(`/subpackage/mall/pages/order/refund_logs?id=${pageInfo?.id ?? ''}&brand_id=${brand_id}`,'nT')
+			},
+			// 复制
+			copyOrder(data) {
+				uni.setClipboardData({ data });
+			},
+			setSpecText(info){
+				if(info.product_spec_multi == 1){
+					let specStr = (info.product_spec_multi_info.spec_info).join("；")
+					return specStr;
+				}
+				return '';
+			},
+			
+			getFeedbackDetail({ brand_id, id }){
+				let _query = { brand_id, id }
+				util.showLoad();
+				server.get({
+					url: MALL_API.feedbackDetail + id,
+					data: _query,
+					failMsg: '加载数据失败！'
+				})
+				.then(res => {
+					util.hideLoad();
+					console.log('售后详情: ', res);
+					this.pageInfo = res
+					this.shipInfo =  "收货人：" + res.feedback_express.contacts + "\n手机号码：" + res.feedback_express.mobile + "\n收货地址：" + res.feedback_express.addr;
+				});
+			},
+			
+			btnChange(type){  // type  1联系商家  2撤销退款
+				if(type == 1){
+					return util.showNone('暂未开放');
+					let _phoneStr = ''
+					let _phoneArr =  _phoneStr.split(',') || [];
+					uni.showActionSheet({
+					    itemList: _phoneArr,
+					    success: res =>{
+					        uni.makePhoneCall({
+					            phoneNumber:　_phoneArr[res.tapIndex]
+					        })
+					    }
+					})
+					return;
+				}
+				if(type == 2) return this.feedBachOperate({info: this.pageInfo, type: 0});
+				
+			},
+			
+			feedBachOperate: util.debounce(function({info, type}){
+				util.showModal({
+				    title: '',
+				    content: type == 0?'确认撤销退款吗？':'确认删除记录吗？',
+				    showCancel: true,
+				    success: modalRes=>{
+				        if(modalRes.confirm){
+							let _API;
+							if(type == 0)_API = MALL_API.feedbackCancel; // 撤销
+							if(type == 1)_API = MALL_API.feedbackDelete; // 删除
+							util.showLoad();
+							server.get({
+								url: _API + info.id,
+								data: { 
+									id: info.id,
+									brand_id: info.brand_id
+								},
+								isDefaultGet: false
+							})
+							.then(res=>{
+								util.hideLoad();
+								console.log('撤销/删除: ', res);
+								if(res.data.code == 0){
+									util.showNone(res.data.message || '操作成功！');
+									if(type == 0){
+										this.getOrdeRefundCancel({
+											brand_id: info.brand_id,
+											order_no: info.order_no,
+											product_cart_ids: this.productCartIds,
+										})
+									}
+									setTimeout(_=>this.refreshList(), 1200);
+									
+								}else{
+									util.showNone(res.data.message || '操作失败！');   
+								}
+							})
+							.catch(util.hideLoad)
+						}
+				    }
+				})
+			}, 300, 300),
+			refreshList(){
+				let { brand_id } = this;
+				this.getFeedbackDetail({
+					brand_id,
+					id: this.pageInfo.id,
+				})
+			},
+			
+			getOrdeRefundCancel({ brand_id, order_no, product_cart_ids }){
+				server.post({
+					url: MALL_API.goodsOrdeRefundCancel,
+					data: {
+						brand_id,
+						order_no,
+						product_cart_ids,
+					},
+					failMsg: '加载数据失败！'
+				})
+				.then(res => {
+					console.log('getOrdeRefundCancel: ', res);
+				});
+			},
+			
+			// 获取快递公司
+			getExpressList(){
+				server.post({
+					url: MALL_API.expressList,
+					data: {},
+					failMsg: '加载数据失败！'
+				})
+				.then(res => {
+					console.log('getExpressList: ', res);
+					for(var i in res){
+						this.expressList.push(res[i].name)
+					}
+					
+				});
+			},
+			
+			// 提交快递物流
+			getFeedbackExpress({ brand_id, id, express_name, express_no, express_mark }){
+				server.post({
+					url: MALL_API.feedbackExpress,
+					data: {
+						brand_id,
+						id,  
+						express_name, //快递公司
+						express_no,   //单号
+						express_mark, //备注
+					},
+					failMsg: '加载数据失败！'
+				})
+				.then(res => {
+					console.log('getFeedbackExpress: ', res);
+					this.isShowLogistics = false
+					util.showNone("操作成功！");   
+				});
+			},
+			pickerChange(e){
+			    console.log(e);
+			    let _questionList =  this.expressList || [];
+			    this.expressInfo.express_name = _questionList[e.detail.value] || ''
+			},
+			// 单号
+			iptNoChange: util.debounce(function(e) {
+				this.expressInfo.express_no = e.detail.value || '';
+			},300,300),
+			// 备注
+			iptMarkChange: util.debounce(function(e) {
+				this.expressInfo.express_mark = e.detail.value || '';
+			},300,300),
+			expressBtn(){
+				let { expressInfo, pageInfo, brand_id } = this
+				if(expressInfo.express_name=='' || expressInfo.express_no=='')return util.showNone("请填写完整物流信息！");   
+				this.getFeedbackExpress({
+					brand_id,
+					id: pageInfo.id,
+					express_name: expressInfo.express_name,
+					express_no: expressInfo.express_no,
+					express_mark: expressInfo.express_mark,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+.refund-details{
+	position: relative;
+	width: 100%;
+	@include isPd(128upx);
+	.rd-head{
+		position: relative;
+		width: 100%;
+		height: 160rpx;
+		background-color: $mColor;
+		@include ctf(flex-end);
+		>image{
+			width: 266rpx;
+			height: 160rpx;
+		}
+		.rh-view{
+			position: absolute;
+			left: 44rpx;
+			top: 22rpx;
+			margin-right: 44rpx;
+			>view{
+				&:first-child{
+					color: #FFF;
+					font-size: 36rpx;
+					font-weight: 700;
+					@include tHide(1);
+				}
+				&:nth-child(2){
+					font-size: 24rpx;
+					color: rgba($color: #fff, $alpha: 0.6);
+					margin-top: 2rpx;
+					@include tHide(2);
+					@include ctf(flex-start);
+					>view{
+						font-size: 24rpx;
+						color: rgba($color: #fff, $alpha: 0.6);
+						>text{
+							color: #FFBA2C;
+						}
+					}
+				}
+			}
+		}
+	}
+	.rd-addr{
+		margin: 24rpx 24rpx 0rpx;
+		padding: 30rpx 20rpx;
+		border-radius: 10rpx;
+		background-color: #fff;
+		.ra-line{
+			@include ctf(space-between);
+			>view{
+				&:first-child{
+					color: #333;
+					font-size: 32rpx;
+					font-weight: 700;
+				}
+				&:nth-child(2){
+					font-size: 28rpx;
+					color: $mColor;
+					margin-right: 10rpx;
+				}
+			}
+		}
+		.ra-name{
+			margin: 30rpx 0rpx 10rpx;
+			>text{
+				color: #333;
+				font-size: 32rpx;
+				font-weight: 700;
+				&:first-child{
+				}
+				&:nth-child(2){
+					margin-left: 52rpx;
+				}
+			}
+		}
+		.ra-position{
+			color: #9A9A9D;
+			font-size: 28rpx;
+		}
+	}
+	.rd-annal{
+		margin: 24rpx;
+		padding: 24rpx 20rpx;
+		border-radius: 10rpx;
+		background-color: #fff;
+		@include ctf(space-between);
+		>view{
+			flex-grow: 1;
+			color: #333;
+			font-size: 28rpx;
+		}
+		>image{
+			flex-shrink: 0;
+			width: 30rpx;
+			height: 30rpx;
+		}
+	}
+	.rd-price{
+		margin: 0rpx 24rpx 24rpx;
+		padding: 24rpx 20rpx;
+		border-radius: 10rpx;
+		background-color: #fff;
+		@include ctf(space-between);
+		>view{
+			&:first-child{
+				flex-grow: 1;
+				@include ctf(flex-start);
+				>image{
+					flex-shrink: 0;
+					width: 34rpx;
+					height: 34rpx;
+					margin-right: 20rpx;
+				}
+				>text{
+					flex-grow: 1;
+					color: #FF873D;
+					font-size: 28rpx;
+				}
+			}
+			&:nth-child(2){
+				flex-shrink: 0;
+				color: #FF873D;
+				font-size: 28rpx;
+			}
+		}
+	}
+	.rd-goods{
+		margin: 0 24rpx;
+		padding: 0 20rpx;
+		border-radius: 10rpx;
+		background-color: #fff;
+		.rg-tit{
+			padding: 22rpx 0;
+			>text{
+				font-size: 28rpx;
+				&:first-child{
+					color: #333;
+				}
+				&:nth-child(2){
+					color: #9A9A9D;
+					margin-left: 28rpx;
+				}
+			}
+		}
+		.rg-list{
+			flex-grow: 1;
+			.rl-item{
+				flex-grow: 1;
+				padding: 30rpx 0 34rpx;
+				border-top: 2rpx solid #D8D8D8;
+				@include ctf(flex-start);
+				>image{
+					flex-shrink: 0;
+					margin-right: 20rpx;
+					width: 180rpx;
+					height: 180rpx;
+					border-radius: 10rpx;
+				}
+				.ri-section{
+					flex-grow: 1;
+					.rs-name{					
+						flex-grow: 1;
+						color: #333;
+						font-size: 28rpx;
+						margin-right: 120rpx;
+						@include tHide(2);
+					}
+					.rs-line{
+						margin: 12rpx 0 14rpx;
+						@include ctf(space-between);
+						>view{
+							color: #9A9A9D;
+							&:first-child{
+								flex-grow: 1;
+								font-size: 24rpx;
+							}
+							&:nth-child(2){
+								flex-shrink: 0;
+								font-size: 28rpx;
+								margin-left: 20rpx;
+							}
+						}
+					}
+					.rs-price{
+						>text{
+							color: #FF873D;
+							&:first-child{
+								font-size: 28rpx;
+							}
+							&:nth-child(2){
+								font-size: 36rpx;
+								font-weight: 700;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	.rd-info{
+		margin: 24rpx;
+		padding: 30rpx 28rpx;
+		border-radius: 10rpx;
+		background-color: #fff;
+		.ri-line{
+			@include ctf(flex-start);
+			>view{
+				font-size: 28rpx;
+				line-height: 60rpx;
+				&:first-child{
+					color: #9A9A9D;
+				}
+				&:nth-child(2){
+					color: #333;
+					margin-left: 40rpx;
+					>text{
+						color: $mColor;
+						margin-left: 40rpx;
+					}
+				}
+			}
+		}
+	}
+	.rd-btn{
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		padding: 20rpx 18rpx 20rpx 0rpx;
+		@include isPd(20upx);
+		background-color: #fff;
+		border-top: 2rpx solid #f2f2f7;
+		@include ctf(flex-end);
+		>view{
+			width: 192rpx;
+			padding: 24rpx 0;
+			margin-right: 20rpx;
+			border-radius: 44rpx;
+			text-align: center;
+			font-size: 28rpx;
+		}
+		.rb-btn1{
+			color: #9A9A9D;
+			border: 2rpx solid #D8D8D8;
+		}
+		.rb-btn2{
+			color: $mColor;
+			border: 2rpx solid $mColor;
+		}
+		.rb-btn3{
+			color: #fff;
+			background: linear-gradient(90deg, #44D7B6 0%, $mColor 100%);
+		}
+	}
+	.rd-logistics-modal{
+		position: absolute;
+		left: 65rpx;
+		top: 20%;
+		background-color: #fff;
+		width: 620rpx;
+		padding: 30rpx;
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		.rlm-close{
+			width: 100%;
+			@include ctf(flex-end);
+			>image{
+				width: 32rpx;
+				height: 32rpx;
+			}
+		}
+		.rlm-tit{
+			margin: 16rpx 0 60rpx;
+			color: #333;
+			font-size: 32rpx;
+			font-weight: 700;
+		}
+		.rlm-box{
+			margin-bottom: 20rpx;
+			@include ctf(flex-start);
+			>view{
+				&:first-child{
+					position: relative;
+					color: #333;
+					font-size: 28rpx;
+					margin-right: 22rpx;
+					width: 112rpx;
+					>text{
+						position: absolute;
+						left: -18rpx;
+						top: 8rpx;
+						color: #FF873D;
+						font-size: 28rpx;
+					}
+				}
+				&:nth-child(2){
+					width: 398rpx;
+					height: 88rpx;
+					border-radius: 10rpx;
+					border: 2rpx solid #979797;
+					@include ctf(space-between);
+					>input{
+						flex-grow: 1;
+						margin: 0 20rpx;
+						font-size: 28rpx;
+						color: #333;
+					}
+					// >image{
+					// 	flex-shrink: 0;
+					// 	width: 30rpx;
+					// 	height: 30rpx;
+					// 	margin-right: 20rpx;
+					// }
+				}
+			}
+			.rb-picker{
+				width: 398rpx;
+				.rp-view{
+					width: 398rpx;
+					height: 88rpx;
+					border-radius: 10rpx;
+					border: 2rpx solid #979797;
+					@include ctf(space-between);
+					& input{
+						flex-grow: 1;
+						margin: 0 20rpx;
+						font-size: 28rpx;
+						color: #333;
+					}
+					>image{
+						flex-shrink: 0;
+						width: 30rpx;
+						height: 30rpx;
+						margin-right: 20rpx;
+					}
+				}
+			}
+		}
+		.rlm-btn{
+			width: 240rpx;
+			margin: 40rpx 0rpx 50rpx;
+			padding: 22rpx 0;
+			color: #fff;
+			font-size: 32rpx;
+			text-align: center;
+			border-radius: 44rpx;
+			background-color: $mColor;
+		}
+	}	
+}
+</style>
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 @@
+<template>
+	<view class="refund-list" :class="[refundLen? 'bgChange':'']">
+		<view class="rl-list" v-for="(e,i) in refundList" :key="i" @click="toDetailChange(e.id)" v-if="refundList.length > 0">
+			<view class="rl-line">
+				<view class="rl-address">
+					<image mode="aspectFit" :src="e.image || ''"></image>
+					<view class="ra-view">
+						<view>{{e.name || '-'}}</view>
+						<view>
+							<text>【退款】</text>
+							<text>{{e.apply_time || '-'}}</text>
+							<text>申请</text>
+						</view>
+					</view>
+				</view>
+				<view class="rl-status">{{setFeedbackStatus(e)}}</view>
+			</view>
+			<product-info :goodsInfo="e.goods" :goodsNums="e.goods.length" :isRefund="true"></product-info>
+			<view class="rl-price">
+				<text>退款：</text>
+				<text>¥</text>
+				<text>{{e.refund_amount || 0}}</text>
+			</view>
+			<view class="rl-btn">
+				<view v-if="isBtnDel(e)" class="rb1" hover-class="hover-active" @click.stop="feedBachOperate({info: e, type: 1})">删除记录</view>
+				<view v-if="isBtnCancel(e)" class="rb2" hover-class="hover-active" @click.stop="feedBachOperate({info: e, type: 0})">一键撤销退款</view>
+			</view>
+		</view>
+		<view class="rl-no-list" v-if="refundList.length == 0">
+			<image src="/subpackage/mall/static/images/no_venue_order.png"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+
+	import util from '@/utils/util';
+	import { MALL_API } from "../../js/api";
+	import server from "../../js/server";
+	import productInfo from '../modules/order/product_info.vue';
+
+	export default {
+		components: { productInfo },
+		computed: {
+			refundLen(){
+				if(this.refundList.length > 0)return true;
+				else return false;
+				
+			},
+		},
+		data() {
+			return {
+				page: 1,
+				refundList: [],
+				brand_id: '',
+			}
+		},
+		onLoad(options) {
+			this.brand_id = options?.brand_id ?? '';
+		},
+		onShow() {
+			let { brand_id } = this;
+			this.getFeedbackList({ brand_id });
+		},
+		onReachBottom(){
+			let { page, brand_id } = this;
+			this.getFeedbackList({ brand_id, page: ++page });
+		},
+		methods: {
+			setFeedbackStatus(e){
+				// 组合状态
+				// feedback_status = 0 & reply_status = 0 --> 退款中
+				// feedback_status = 1 & reply_status = 0 ---> 关闭退款
+				// feedback_status = 1 & reply_status = 1 ---> 退款完成
+				// feedback_status = 2 & reply_status = 0 --> 退款撤回
+				let status = 0
+				if(e.feedback_status == 0 && e.reply_status == 0) status = 0;
+				if(e.feedback_status == 1 && e.reply_status == 0) status = 2;
+				if(e.feedback_status == 1 && e.reply_status == 1) status = 1;
+				if(e.feedback_status == 2 && e.reply_status == 0) status = 2;
+				let arr = ['退款中','退款完成','退款关闭']
+				return arr[status] || '-'
+			},
+			isBtnDel(e){
+				// true删除订单
+				if(e.feedback_status == 0 && e.reply_status == 0)return false;
+				if(e.feedback_status == 1 && e.reply_status == 0)return true;
+				if(e.feedback_status == 1 && e.reply_status == 1)return true;
+				if(e.feedback_status == 2 && e.reply_status == 0)return true;
+			},
+			isBtnCancel(e){
+				// true一键撤销
+				if(e.feedback_type == 0){
+					if(e.feedback_status == 0 && e.reply_status == 0)return true;
+					else return false;
+				}
+				if(e.feedback_type == 1){
+					if(e.express_status == 0 || e.express_status == 1) return true;
+					else return false;
+				}
+			},
+			
+			getFeedbackList({ brand_id, page = 1, page_size = 20,}){
+				let _query = {
+					brand_id,
+					order_type: 'product_order',
+					page,
+					page_size,
+				}
+				util.showLoad();
+				server.get({
+					url: MALL_API.feedbackList,
+					data: _query,
+					failMsg: '加载数据失败！'
+				})
+				.then(res => {
+					util.hideLoad();
+					console.log('售后列表: ', res);
+					
+					let _list = res.list || [];
+					if(page == 1){
+						this.refundList = _list;
+						return
+					}
+					if(_list.length<=0)return util.showNone('没有更多！');// util.showNone('没有更多！');
+					this.page = page;
+					this.refundList = [...this.refundList, ...res.list];
+					console.log(res);
+				});
+			},
+			getOrdeRefundCancel({ brand_id, order_no, product_cart_ids}){
+				server.post({
+					url: MALL_API.goodsOrdeRefundCancel,
+					data: {
+						brand_id,
+						order_no,
+						product_cart_ids,
+					},
+					failMsg: '加载数据失败！'
+				})
+				.then(res => {
+					console.log('getOrdeRefundCancel: ', res);
+				});
+			},
+			productCartIds(list){
+				let _arr = []
+				for(var i in list){
+					_arr.push(list[i].product_cart_id)
+				}
+				return _arr;
+			},
+			feedBachOperate: util.debounce(function({info, type}){
+				util.showModal({
+				    title: '',
+				    content: type == 0?'确认撤销退款吗？':'确认删除记录吗？',
+				    showCancel: true,
+				    success: modalRes=>{
+				        if(modalRes.confirm){
+							let _API;
+							if(type == 0)_API = MALL_API.feedbackCancel; // 撤销
+							if(type == 1)_API = MALL_API.feedbackDelete; // 删除
+							util.showLoad();
+							server.get({
+								url: _API + info.id,
+								data: { 
+									id: info.id,
+									brand_id: info.brand_id
+								},
+								isDefaultGet: false
+							})
+							.then(res=>{
+								util.hideLoad();
+								console.log('撤销/删除: ', res);
+								if(res.data.code == 0){
+									util.showNone(res.data.message || '操作成功！');
+									if(type == 0){
+										this.getOrdeRefundCancel({
+											brand_id: info?.brand_id ?? '',
+											order_no: info.order_no,
+											product_cart_ids: this.productCartIds(info.goods),
+										})
+									}
+									setTimeout(_=>this.refreshList(), 1200);
+									
+								}else{
+									util.showNone(res.data.message || '操作失败！');   
+								}
+							})
+							.catch(util.hideLoad)
+						}
+				    }
+				})
+			}, 300, 300),
+			refreshList(){
+				let { brand_id  } = this;
+				this.refundList = null;
+				this.getFeedbackList({ brand_id });
+			},
+			toDetailChange(id){
+				let { brand_id } = this;
+				util.routeTo(`/subpackage/mall/pages/order/refund_details?id=${id}&brand_id=${brand_id}`,'nT')
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+@import '~style/public.scss';
+.refund-list{
+	padding-top: 24rpx;
+	min-height: 100vh;
+	background-color: #fff;
+	.rl-no-list{
+		width: 750rpx;
+		margin-top: 200rpx;
+		@include ctf(center);
+		>image{
+			width: 346rpx;
+			height: 346rpx;
+		}
+	}
+	.rl-list{
+		margin: 0 24rpx 24rpx;
+		padding: 22rpx 20rpx 30rpx;
+		background-color: #fff;
+		border-radius: 10rpx;
+		.rl-line{
+			display: flex;
+			flex-direction: row;	
+			justify-content: space-between;
+			padding-bottom: 24rpx;
+			margin-bottom: 32rpx;
+			border-bottom: 2rpx solid #D8D8D8;
+			.rl-address{
+				flex-grow: 1;	
+				display: flex;
+				flex-direction: row;	
+				justify-content: flex-start;
+				>image{
+					flex-shrink: 0;
+					margin-right: 14rpx;
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 10rpx;
+				}
+				.ra-view{
+					flex-grow: 1;
+					>view{
+						&:first-child{
+							color: #333;
+							font-size: 28rpx;
+							@include tHide(1);
+						}
+						&:nth-child(2){
+							color: #9A9A9D;
+							font-size: 24rpx;
+							margin-top: 12rpx;
+							>text{
+								&:first-child{
+									color: #E60213;
+								}
+								&:nth-child(2){
+								}
+								&:nth-child(3){
+									margin-left: 30rpx;
+								}
+							}
+						}
+					}
+				}
+			}
+			.rl-status{
+				flex-shrink: 0;
+				color: $mColor;
+				font-size: 28rpx;
+			}
+		}
+		.rl-price{
+			margin: 36rpx 0 10rpx;
+			flex-grow: 1;
+			text-align: right;
+			>text{
+				line-height: 40rpx;
+				color: #333;
+				&:first-child{
+					font-size: 28rpx;
+				}
+				&:nth-child(2){
+					font-size: 24rpx;
+				}
+				&:nth-child(3){
+					font-size: 32rpx;
+				}
+			}
+		}
+		
+		.rl-btn{
+			flex-grow: 1;
+			margin-top: 26rpx;
+			@include ctf(flex-end);
+			>view{
+				padding: 16rpx 34rpx;
+				font-size: 28rpx;
+				text-align: center;
+				border-radius: 36rpx;
+				margin-right: 16rpx;
+			}
+			.rb1{
+				color: #9A9A9D;
+				border: 2rpx solid #D8D8D8;
+			}
+			.rb2{
+				color: $mColor;
+				border: 2rpx solid $mColor;
+			}
+			
+		}
+	}
+}
+.bgChange{
+	background-color: #F2F2F7;
+}
+
+</style>
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 @@
+<template>
+	<!-- 协商记录 -->
+	<view class="refund-logs">
+		<!-- 商家同意退款申请 -->
+		<view class="rl-box" v-if="pageInfo.sellerRefund">
+			<view class="rb-store">
+				<image mode="aspectFill" :src="pageInfo.sellerRefund.image || ''"></image>
+				<view class="rs-name">
+					<view>{{pageInfo.sellerRefund.name || '-'}}</view>
+					<view>{{pageInfo.sellerRefund.record_time || '-'}}</view>
+				</view>
+			</view>
+			<view class="rb-tit">{{pageInfo.sellerRefund.title || '-'}}</view>
+			<view class="rb-line">
+				<view>退款金额</view>
+				<view>¥{{pageInfo.sellerRefund.refund_amount || 0}}（含运费¥0）</view>
+			</view>
+			<view class="rb-line">
+				<view>退积分</view>
+				<view>{{pageInfo.sellerRefund.refund_integral || 0}}积分</view>
+			</view>
+			<view class="rb-line">
+				<view>备注</view>
+				<view>{{pageInfo.sellerRefund.reply_content || ''}}</view>
+			</view>
+		</view>
+		<!-- 商家拒绝退款 -->
+		<view class="rl-box" v-if="pageInfo.sellerRefuse">
+			<view class="rb-store">
+				<image mode="aspectFill" :src="pageInfo.sellerRefuse.image || ''"></image>
+				<view class="rs-name">
+					<view>{{pageInfo.sellerRefuse.name || '-'}}</view>
+					<view>{{pageInfo.sellerRefuse.record_time || '-'}}</view>
+				</view>
+			</view>
+			<view class="rb-tit">{{pageInfo.sellerRefuse.title || '-'}}</view>
+			<view class="rb-line">
+				<view>退款金额</view>
+				<view>¥{{pageInfo.sellerRefuse.refund_amount || 0}}（含运费¥0）</view>
+			</view>
+			<view class="rb-line">
+				<view>退积分</view>
+				<view>{{pageInfo.sellerRefuse.refund_integral || 0}}积分</view>
+			</view>
+			<view class="rb-line">
+				<view>备注</view>
+				<view>{{pageInfo.sellerRefuse.reply_content || ''}}</view>
+			</view>
+		</view>
+		<!-- 买家已退货 -->
+		<view class="rl-box" v-if="pageInfo.buyerReturn">
+			<view class="rb-store">
+				<image mode="aspectFill" :src="pageInfo.buyerReturn.image || ''"></image>
+				<view class="rs-name">
+					<view>{{pageInfo.buyerReturn.name || '-'}}</view>
+					<view>{{pageInfo.buyerReturn.record_time || '-'}}</view>
+				</view>
+			</view>
+			<view class="rb-tit">{{pageInfo.buyerReturn.title || '-'}}</view>
+			<view class="rb-line">
+				<view>物流公司</view>
+				<view>{{pageInfo.buyerReturn.express.name || '-'}}</view>
+			</view>
+			<view class="rb-line">
+				<view>物流单号</view>
+				<view>{{pageInfo.buyerReturn.express.no || '-'}}</view>
+			</view>
+			<view class="rb-line">
+				<view>备注</view>
+				<view>{{pageInfo.buyerReturn.express.mark || ''}}</view>
+			</view>
+		</view>
+		<!-- 商家同意退货 -->
+		<view class="rl-box" v-if="pageInfo.sellerReturn">
+			<view class="rb-store">
+				<image mode="aspectFill" :src="pageInfo.sellerReturn.image"></image>
+				<view class="rs-name">
+					<view>{{pageInfo.sellerReturn.name || '-'}}</view>
+					<view>{{pageInfo.sellerReturn.record_time || '-'}}</view>
+				</view>
+			</view>
+			<view class="rb-tit">{{pageInfo.sellerReturn.title || '-'}}</view>
+			<view class="rb-line">
+				<view>退货地址</view>
+			</view>
+			<view class="rb-user">
+				<text>{{pageInfo.sellerReturn.express.contacts || '-'}}</text>
+				<text>{{pageInfo.sellerReturn.express.mobile || '-'}}</text>
+			</view>
+			<view class="rb-addr">{{pageInfo.sellerReturn.express.addr || '-'}}</view>
+			<view class="rb-line">
+				<view>备注</view>
+				<view>{{pageInfo.sellerReturn.reply_content || ''}}</view>
+			</view>
+		</view>
+		<!-- 买家发起退款申请 -->
+		<view class="rl-box" v-if="pageInfo.buyerApply">
+			<view class="rb-store">
+				<image mode="aspectFill" :src="pageInfo.buyerApply.image || ''"></image>
+				<view class="rs-name">
+					<view>{{pageInfo.buyerApply.name || '-'}}</view>
+					<view>{{pageInfo.buyerApply.record_time || '-'}}</view>
+				</view>
+			</view>
+			<view class="rb-tit">{{pageInfo.buyerApply.title || '-'}}</view>
+			<view class="rb-line">
+				<view>退款类型</view>
+				<view>{{pageInfo.buyerApply.feedback_type == 0? '仅退款':'退货退款'}}</view>
+			</view>
+			<view class="rb-line">
+				<view>退款金额</view>
+				<view>¥{{pageInfo.buyerApply.refund_amount || 0}}（含运费¥0）</view>
+			</view>
+			<view class="rb-line">
+				<view>退积分</view>
+				<view>{{pageInfo.buyerApply.refund_integral || 0}}积分</view>
+			</view>
+			<view class="rb-line">
+				<view>退款原因</view>
+				<view>{{pageInfo.buyerApply.question_type || '-'}}</view>
+			</view>
+			<view class="rb-line">
+				<view>退款描述</view>
+				<view>{{pageInfo.buyerApply.question_desc || '-'}}</view>
+			</view>
+			<view class="rb-img">
+				<image mode="aspectFill" v-for="(e,i) in pageInfo.buyerApply.question_img" :key="i" :src="e"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import util from '@/utils/util';
+	import { MALL_API } from "../../js/api";
+	import server from "../../js/server";
+	export default {
+		data() {
+			return {
+				recordsList: [],
+				buyerApply: {},    //买家申请退款
+				sellerRefund: {},  //商家同意退款
+				sellerReturn: {},  //商家同意退货
+				buyerReturn: {},   //买家已退货
+				sellerRefuse: {},  //商家拒绝退款
+				pageInfo: {},
+			}
+		},
+		onLoad(options) {
+			this.getFeedbackRecords({
+				brand_id: options?.brand_id ?? '',
+				id: options.id,
+			})
+		},
+		methods: {
+			// 协商记录
+			getFeedbackRecords({ brand_id, id }){
+				util.showLoad();
+				server.get({
+					url: MALL_API.feedbackRecords,
+					data: {
+						brand_id,
+						id,
+					},
+					failMsg: '加载数据失败！'
+				})
+				.then(res => {
+					util.hideLoad();
+					console.log('getFeedbackRecords: ', res);
+					this.recordsList = res || []
+					let list = res || []
+					//record_status： 记录状态
+					// 0 买家申请退款
+					// 1 商家同意退款申请, 请留意退款到账信息
+					// 2 商家同意退货
+					// 3 买家已退货
+					// 4 商家同意退款申请，请留意退款到账信息
+					// 5 商家拒绝退款
+					let { recordsList } = this
+					if(list.length == 0)return -1;
+					for(var i in list){
+						if(list[i].record_status == 0){
+							this.pageInfo.buyerApply = list[i];
+							this.pageInfo.buyerApply.question_img = this.pageInfo.buyerApply.question_img.split(",")
+						}
+						if(list[i].record_status == 1)this.pageInfo.sellerRefund = list[i];
+						if(list[i].record_status == 2)this.pageInfo.sellerReturn = list[i];
+						if(list[i].record_status == 3)this.pageInfo.buyerReturn = list[i];
+						if(list[i].record_status == 4)this.pageInfo.sellerRefund = list[i];
+						if(list[i].record_status == 5)this.pageInfo.sellerRefuse = list[i];
+						
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+.refund-logs{
+	width: 100%;
+	.rl-box{
+		margin: 0rpx 24rpx 24rpx;
+		padding: 0 20rpx 30rpx;
+		border-radius: 10rpx;
+		background-color: #fff;
+		.rb-store{
+			padding: 20rpx 0;
+			border-bottom: 2rpx solid #D8D8D8;
+			@include ctf(flex-start);
+			>image{
+				flex-shrink: 0;
+				width: 88rpx;
+				height: 88rpx;
+				border-radius: 50%;
+				margin-right: 20rpx;
+			}
+			.rs-name{
+				>view{
+					&:first-child{
+						color: #333;
+						font-size: 28rpx;
+						font-weight: 700;
+					}
+					&:nth-child(2){
+						color: #9A9A9D;
+						font-size: 24rpx;
+						margin-top: 8rpx;
+					}
+				}
+			}
+		}
+		.rb-tit{
+			color: #333;
+			font-size: 28rpx;
+			padding: 16rpx 0;
+		}
+		.rb-line{
+			display: flex;
+			flex-direction: row;	
+			justify-content: flex-start;
+			>view{
+				font-size: 28rpx;
+				line-height: 52rpx;
+				&:first-child{
+					flex-shrink: 0;
+					color: #9A9A9D;
+					width: 112rpx;
+					margin-right: 40rpx;
+				}
+				&:nth-child(2){
+					flex-grow: 1;
+					color: #333333;
+				}
+			}
+		}
+		.rb-user{
+			margin: 8rpx 0 12rpx;
+			>text{
+				font-size: 28rpx;
+				color: #333;
+				&:first-child{
+					
+				}
+				&:nth-child(2){
+					margin-left: 30rpx;
+				}
+			}
+		}
+		.rb-addr{
+			color: #333;
+			font-size: 28rpx;
+			margin-bottom: 20rpx;
+		}
+		.rb-img{
+			margin-top: 32rpx;
+			>image{
+				display: inline-block;
+				width: 200rpx;
+				height: 200rpx;
+				border-radius: 10rpx;
+				margin-right: 20rpx;
+			}
+		}
+	}
+}
+</style>
diff --git a/src/subpackage/mall/static/images/cancel.png b/src/subpackage/mall/static/images/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c9dbe0ebebad3709063a291beaf9e345423e6e7
GIT binary patch
literal 356
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy#sNMdu0VSJ{8jVkubww=)q(|3
zv~b~ipy0xVAi+6vfU+PoZ{Es9i$IL{z(cJ-Z2~1he!&bUmrLB6)yerfIb20|hl~Ad
z^NDsqxeJ~yjv*GOTZ5zdSQI&&%L7W{?)={}J5n@tW=q}7EnzDdgm)$>q;W+UN4z<~
zUBKQu=Lf&%&Kf4^mh(^gd*e6A7VZD+cG0%z`*x1Cd@Ii@{rx5VNyTqUlD+NSr00wZ
zecO+UF@Aa_wshNUX`>LacK3^wnroU=WM(h==xWq{Aj+`9Q0*GmSz|{1jzj(jytf5%
zp7`M9C?JwA!Wi&bHH+0N;L4A{mzs_%S9E_V^1RZp`Djw#j+*jasRrj(e|c7xpKxd5
o=eBFI)%Ascu6~|=J@&u;lwBIK|F}#R1O3L}>FVdQ&MBb@00{t^V*mgE

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..d8cc22ac24bacbd5c363934c456e089a4ddd74d1
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^N+8U_3?xrvihTr9q5(c3u0VR$thuvi&jX@av*yj2
zvta)G`J67RB!Cj^B|(0{4FAGcH9K=WdFr_gC{*L=;uxZFe(t1`ybT6CEV}FdFJpSq
zz|N|0(ZOrMe=UcuN3OHv|J~TA-hRDv{<fH_-9L9ItBIzY%@tg{<=YX3xB42Q%B#+<
z?VQqIzLqu8=uMZivaa8e0C%2J5TTlMg2U*>(aDw8@h9|dXkJ~A6f*TxvDF-f<!9zI
aR5Ntv2!&33?otJG2ZN`ppUXO@geCyEcUXS_

literal 0
HcmV?d00001

diff --git a/src/subpackage/mall/static/images/del.png b/src/subpackage/mall/static/images/del.png
new file mode 100644
index 0000000000000000000000000000000000000000..11c9871aa00d1273cad64253455b0a2a316043dd
GIT binary patch
literal 498
zcmV<O0S*3%P)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0005GNkl<ZSV!%b
zu};H442Er8gxUdK0LlwwXcQv>BW$4Z1nhKyg%M^LSzswUPe275jDW;N>5vy7@B(yb
zg%TM>YNRM_a=o;ukx0h7v;FzE&$=L#<inD1Kw%Kqbz5N=o&vzeD4BO5#Fb@P-6F{q
z0+CW)0Ki#Bz)K=J*M-pr87Xm}7f1+kpsS2Fh?MdP0Cp4^KNHcejw<Ll&K@&&0HC2`
zILEU-BDPUV`LRHVI3K?}Af+iyy4F%kPOcG=c0*6<AC=#+AS#2RO{(%+fuu{Wtw^G|
zA-eyzZ9hik%36<0Irq|}=8jK9>rt?*^}hs}c&k(ytM;`^ljTqqNVQ*q%zSIA(xfG<
z6q%q%@*%ajfmWIk|1X~b-vF>2XKolqquFeJ7F8m$>-BnTK@j)}AAKTPN%|Zc@s8uX
zF!NS?2oWEI5bdHc5kwe<9cJE7_<Xf(dpj3IN_h+b*Rv=vh3yFu-Q<FJp0_j@4BimY
zn!=&>5oUJl_4=l1nm@T9(WdLVt3eQS=M57<7>3cZEbA+sLFTVQq|9(QJVL}nW;T-z
otSLhu5j|$UtJP|^X(eJ`za_(lDkO7{jQ{`u07*qoM6N<$g2S8BzyJUM

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..eefb0f32afe448416a60972dd16ea48c218140de
GIT binary patch
literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0002~Nkl<ZXhZFm
zyA1*{5JYEU0s=xZ$mxPU5arMV0Tqx#FHiy^AU1M<gwTDo+O@em&86P&n>~Apk$)U{
z{ZIq{R!|B^0Ve^CkQ1QWT?)7nIs-H+kWyLzH~`oHgL>>9xh|5|Pv30~90BZ|a7wwq
z04zy9bAq-8E&#TrDhP<XB6;s>AQyiIFbhZ)9pXfC*EvG@Fr_pHupZh!K=SrYMAvBa
zd|2a20V}a+dnpi2)EaM^3TPLy&VkKdyO51nytQ_rc&3hs)4WC<K&rb+f$GSA5=wzV
zDxh7ctSs7v%JS`xu3e~~QAG>A0~KL6rji0uz)3(O<OJw;e*@8!Q87N3v|s=L002ov
JPDHLkV1lG=cpU%$

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..9101fa550811c2e23395b28e0f41db948bb709a1
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0007WNkl<ZXhZFp
zJ&a936vu!61PKa4h-^zF8jYn8A6cP6!zzhHqfrS85se^0qEHi!ViU3*34&syv76|K
zM5oj!d<4mnliVlQ?7MI7edg}FcXLlWGv}V){LkDuGb37VYI*#00HaoLaVlVDYk?cU
zR!E*^27CuT1Mh(u;Dw|g!>HL;0W-S`oEpaAkYm08_ke4X9IUhz0lWdmOM6Mz(Lt^P
zw<NhzQ7ZzN1-3;;*VkbhI3ek4>=R`Hj%WEA^H;Wg4KN1m0S*J}`wW}|_QoK}0*p&?
zhsn*%mI9}N%fPze1Fpp6pmZ8JKrdi3b45Jh9Rb7zNjHmTt}y@}pqVWPUIh@ous0R`
zof-v@LAVlcgLJwr>1;n08V8U;oB{6S0(KQP^xN#33g8R-Q}A~>B<XReLL&h(6~b!Z
zx}=M30yqiW&jma!>1dk(4ggPc0nbR<-6jApWxS;6*{r1PZ3dW=G_SyH@*)luNCRMI
ztAQzCAF!lCar6y%;B`-#QrXOE1GofSsStSB^`N9DvGE;1aG?2HPPaaVV$!E-uPudA
z1sL<w0Tiu)*vzGB?-UrMfSGLuc2(TS28r|AZ|Ed_$eodE+sJkTFM(yL(k1ir6PS?n
zIy(>42H-aY=Mo3sbLTg5=j#TT1RmA|a7@ypS^+ZW4lx1v*)@gz^0e#)UpqjGh+{sw
z-)Ogy#d0Ll-lb5GLhk@S5-y~z0Jh{l_+Mw@g$%stTa^Hw0sET}buNbIlKiskA1k_6
z@s9r3u(BZ#{#JHGl22?LAlnI70UK+0C$2gt{#yA_l3%gUv&H#RUv-K`+5ZnyZLmPR
S$VO@a0000<MNUMnLSTYhXDgfl

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..7cc7dcdf4c0f6a86394c0d38710118d42855b762
GIT binary patch
literal 851
zcmV-Z1FZasP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009TNkl<ZXhZFo
zO^8il7{`DAd?XTzwP_Yg*x8UwGG#$1<s%~5kfJm!l)`3YnkW`nXrx3*ji%TPk!&nQ
zNn(`9XGtRR=pE-wuQT`Dd(S!dJu|oN+1z`(=Y5|4?>z7Of1mS;Cco6=`e^}-bp=}$
zXjP!#6BwRCW;PF4226B6fp@^5r0)ge2OlmoTMFC-CMU9e0(MF253Zs>0te6obfv`j
z4Xl-Pt3ZyRLmj{d;ChuT?|}u9J_c2iGkClP9K;G>5-<hW3QX`~o{_XKXO5u5D((Yj
zb_6)?W&Q!QOL`krO^)Dc0B%7)1KPZpM<pH0kt67k)ScMO_5x?U>~Dbek<A7bRVDam
zNiY5Xs{u?0oM`tso~}MgJ7Ymrdm%IH19prj^^uk~Nki^?Er4yn<#7lwSJLZx0Gy?|
z9eJt;@f`SCB9t?fMF~foCh1R20C$6#4FIdX09}%L%K|X7#lRyk-xEm->skX5K+=s|
zlh;`yz!u<&m#<%vbHm}Q<_nFPwF57_06&4*lD?GzQDIZ<l{C`3)dYyD;5Ieaa>v&?
zNjFOZxCCtXa_yFMzU~S{0H=ZdUXXK=_LKzh5Ln{n>XbB?6<`%`+Y2%z$!{})v6$Hh
zH)Xv9BNkfM8i*=T$xdC1{WO^Je-1bk_~PYoP34G%)(sFrly0ZBEHo=X>2_*nRV_3t
zK<Rc`%R(~&jD?+=Syc<o15m1+npsr~%>$6MQ}@2$zj`*>luiJ%(kwI&KqWhEwCJ>W
zqbxKtK#HA~1@K=NnrSEY6`I*b;96O#y*%BL4kz>0)yyRaMGzg)S!!q&cUJotxFG3Q
zLjXc6&JsUY1+pXveQ#j^Gg}U<iG&VFx}R6Hnau|_0j`OA0NjY*ebZtV0x+|az`;cD
z9!ZC?LYSF50l65R&&I=D3-3<HN6r1*E))-pp8UNOp&eN&VP<oHSBcY)IP?KYry5>?
zl&2r($y5b1bJON(ipV>XR<-~t>;-P|Ht!UQ+KT2~#EHe+NE_V@%qYc1vsz_{`wQ&@
dAp~WO`4_CwH9+VAyLA8n002ovPDHLkV1i(Ec9j4C

literal 0
HcmV?d00001

diff --git a/src/subpackage/mall/static/images/price.png b/src/subpackage/mall/static/images/price.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8e47cfb2d9d2a257ad27cbb76add0d13372ea48
GIT binary patch
literal 1378
zcmV-o1)chdP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_000FkNkl<ZSVzs6
zdu&r>6u^JywlIb$3MgzbD1pht2vL+d*4q*J1B1j62{E8(3}{F|Kmu-^VwRY-1r&*K
zL?T9sK`@XQV*m{%Z0#PrWd;$9Bql14sYp;@h4mhDZ@1cxcDt>T`2E?QbG~2C>pQ2y
z|Kvz696EcphX>A8AUYM~Ayi9%AwVH;8Pzs~?-ALD$JoQlhJ6C+<_=dN8Z>XmU@^)I
zz%Vz4J7s=Eqz;L1l**<*d(!I>L~AhU=Uax#Yrw#SAw2=cXQ<VP*ZK|_aFzoD+j;PG
zf1sE+_afp4nF-w0sdEm)sFcdc=4>!oLA2H^!oxNczoRVd#3Cfs(Iz(@QClPIn}N#f
zz=Ten&BQzlrKY~UyN!$>y1INcmholhFZvZRo|USG-EIK7%cvr(_RmB09pGl*FoyNG
zR5qPXmAwu`*G|5JxMv^A2t*Fi!4vXo<fnWfQgt+FjzjnqxCc0n#{5!!;P)<>G!R`^
zR!Gdd7brz&rrk5OyBl?_IUY~P&$7Jbd^R}8PP=!6R7a1e!K^DA#8q!I%4py#V$o?*
zgO!MU%F(d-7RoY&Q+PcO%ZmEn(!cjjK;;n7%8_WPY$u)xMnmQfU?#{@5{P_~W@F9d
zk&efmvX>PSh`gBwqGA7isD2H2fUT$<U73IqqhE(lmbYBd+Nnb^uATxd#E_*@8MWh{
zb~NOB6xfM~qFO3}#={w9M0TNE#-c=CiJnP%M8m!<sLZ|o7it@^Yb8>%|Dsd8VSg2B
z)gp2MPkgMbY;Nn)(Tx-PaK7*xL`I{$FM;UuS;Lp`+AM_iQWbsaACQpm4UlJ?L_%7@
zYIQ<z)7fLP<cC=LW&Mu=cJh5FRng~?--XPTHYy_LY4?nkn)J}7g~-meI7d+~QqWQ4
zs<U42TK^-Udz|hqS|L?UjZWVYP9Qn}WRV1-@Ag({8Zzx%DMhVWd4V_~3Yi}PPdi>4
zIcy@Q&U^qe&nfx#NNHC!^aP_JGXMlZHslPV!3q<@8ieXlkUCHUjIChJNnC1#5Iu<M
zC5{yBmF?RzR#s=e`B7~ET5<x>uzxaWJxZV6+>Q`Ot%VY3+LSe6*Gw5kJbngf%MB#)
z{_H?gUSQQBh};7FWgARhDsmCE7Gx^lWOCPx>r264yAWbIfn;o6Vc#ZH=7a8*K;!gY
zJ(b!(^96Cnf<ES4JTf?GPxVQl4D?&XcrWGiOB8f$u^ZukADW<9fx#YEIfB}g*<uMa
zZpaD}_UD<bHD!b7=dA;7OEEqcWjN?LMC?Y_b*^yDs*+VrC$oaAHUn7Q$~RFFAXSm(
zoZ|d%awJnj)3EsmN&y8OC9=Hb7q>8)Cy3UX<1uJOxIo{I;*__>{1}*nN}W_k7P|%s
znRbFM0Cq_r`dAKnSsuOMlrc#B7}$e~Q7(aogKms!*tZmw^&oFcAhOhzjy)=58v_z8
z*IbLT0ys(R>ZGoxzc=GrH)Vh<s<#_juSY{=qrlsebue;3UK~|GanXKf>K55cyD>e}
z#NF#{Sp?MWsF?6d`Eb;*SB5)*CSsnMJ<Szvp>i6YlW#z<Yz*SH*N3}-(|A1d<>mS>
z++Lb0m-jl6gs~qugKf~YV99QX2kjxq4Nzjis+fUV`7c;Wn68x*S%q?I;&XfDl+O_(
zigE2YDs3DpzI?-0&NTN1Ck@6ZSb{qJqS%c`I%WQwCA|BES~JB<|9ClZrUCZ@V*vXl
kwioal|F=XA9>`ntZyB*vmC>Qy@c;k-07*qoM6N<$f@-3MlmGw#

literal 0
HcmV?d00001