From a51eef85fa320f58afeed7f7b6986e9f658e0e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Thu, 28 Aug 2025 17:17:42 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=90=88?=
 =?UTF-8?q?=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/rwa_package/dongjian/check.vue | 184 ++++++++++++++++-----------
 1 file changed, 107 insertions(+), 77 deletions(-)

diff --git a/pages/rwa_package/dongjian/check.vue b/pages/rwa_package/dongjian/check.vue
index 3532b08..8508b4a 100644
--- a/pages/rwa_package/dongjian/check.vue
+++ b/pages/rwa_package/dongjian/check.vue
@@ -8,11 +8,10 @@
 				<view class="right-view">
 					<text class="text-36 text-zu">消费型合伙人协议</text>
 					<view class="bottom-panel">
-						<view class="flex-r-lr mt-24" v-for="(item,index) in dataList" :key="dataList.value">
-							<text class="text-fu text-24">{{item.text}}</text>
+						<view class="flex-r-lr mt-24" v-for="(item, index) in dataList" :key="dataList.value">
+							<text class="text-fu text-24">{{ item.text }}</text>
 							<view class="list-right">
-								<text class="text-24" 
-								:class="{'text-lu':index == 0,'text-zu':index != 0}">{{item.value}}</text>
+								<text class="text-24" :class="{ 'text-lu': index == 0, 'text-zu': index != 0 }">{{ item.value }}</text>
 							</view>
 						</view>
 					</view>
@@ -20,13 +19,13 @@
 			</view>
 			<text class="text-zu text-32 mt-32" style="margin-left:38rpx">合同签约人信息</text>
 			<view class="bottom">
-				<view class="bottom-lsit" v-for="(item,index) in bottomList" :key="item.value"> 
-					<text class="text-24 text-fu" style="min-width:184rpx;display: inline-block;">{{item.text}}</text>
-					<text class="text-24 text-zu">{{item.value}}</text>
+				<view class="bottom-lsit" v-for="(item, index) in bottomList" :key="item.value">
+					<text class="text-24 text-fu" style="min-width:184rpx;display: inline-block;">{{ item.text }}</text>
+					<text class="text-24 text-zu">{{ item.value }}</text>
 				</view>
 			</view>
 			<view class="bottom-btn">
-				
+
 				<view class="right-btn flex-c" @click="onOpen">
 					<text class="text-white text-32">下载合同</text>
 				</view>
@@ -41,45 +40,45 @@ import { getUserInfo } from '@/api/auth.js';
 import Header from '@/components/common/header.vue';
 import TopSafe from '@/components/common/top-safe.nvue'
 import ContractItem from './components/contract-item.vue'
-import { getContractList,fileUrls } from '@/api/contract.js'
+import { getContractList, fileUrls } from '@/api/contract.js'
 import func from '@/utils/func.js';
 
 export default {
-	components: { Header,TopSafe,ContractItem },
+	components: { Header, TopSafe, ContractItem },
 	data() {
 		return {
-			dataList:[
-				{text:'合同状态',value:'签约完成'},
-				{text:'合同编号',value:'69485222011627525'},
-				{text:'发起方',value:'信任桥（深圳）网络科技有限公司'},
-				{text:'发起时间',value:'2025-08-11 12:00:00'},
-				{text:'完成结束时间',value:'2025-08-11 12:00:00'},
+			dataList: [
+				{ text: '合同状态', value: '' },
+				{ text: '合同编号', value: '' },
+				{ text: '发起方', value: '信任桥（深圳）网络科技有限公司' },
+				{ text: '发起时间', value: '' },
+				{ text: '完成结束时间', value: '' },
 			],
-			bottomList:[
-				{text:'签约人',value:'信任桥会员 章三'},
-				{text:'状态',value:'已签署'},
-				{text:'时间',value:'2025-08-11 12:00:00'},
+			bottomList: [
+				{ text: '签约人', value: '信任桥会员 章三' },
+				{ text: '状态', value: '已签署' },
+				{ text: '时间', value: '2025-08-11 12:00:00' },
 			],
-			obj:null,
-			url:''
+			obj: null,
+			url: ''
 		};
 	},
 	onLoad(option) {
-			this.init();
+		this.init();
 	},
 	methods: {
-		init(){
+		init() {
 			this.isSignContract()
 		},
-		getfileUrls(){
+		getfileUrls() {
 			let params = {
-					businessType:'FLOW',
-					businessIds:[this.obj.flowId]
+				businessType: 'FLOW',
+				businessIds: [this.obj.flowId]
 			}
-			fileUrls(params).then(res=>{
-				if(res.bizcode == 100){
+			fileUrls(params).then(res => {
+				if (res.bizcode == 100) {
 					this.url = res.data.fileUrls[0].url;
-				}else{
+				} else {
 					this.$refs.uToastRef.show({
 						type: 'error',
 						message: res.msg,
@@ -87,21 +86,21 @@ export default {
 				}
 			})
 		},
-		isSignContract(){
-			
-			getContractList().then(res=>{
-				if(res.bizcode == 100){
+		isSignContract() {
+
+			getContractList().then(res => {
+				if (res.bizcode == 100) {
 					this.obj = JSON.parse(JSON.stringify(res.data[0]));
-					this.obj.time = func.formatDate(new Date(res.data[0].signatureTime),2);
-					this.obj.details.startTime = func.formatDate(new Date(res.data[0].details.startTime),2);
-					this.obj.details.endTime = func.formatDate(new Date(res.data[0].details.endTime),2);
-					this.dataList[2].value = this.obj.flowId;
+					this.obj.time = func.formatDate(new Date(res.data[0].signatureTime), 2);
+					this.obj.details.startTime = func.formatDate(new Date(res.data[0].details.startTime), 2);
+					this.obj.details.endTime = func.formatDate(new Date(res.data[0].details.endTime), 2);
+					// this.dataList[2].value = this.obj.flowId;
 					this.dataList[3].value = this.obj.details.startTime;
 					this.dataList[4].value = this.obj.details.endTime;
 					this.bottomList[0].value = this.obj.signatureName;
 					this.bottomList[2].value = this.obj.time;
 					this.getfileUrls();
-				}else{
+				} else {
 					this.$refs.uToastRef.show({
 						type: 'error',
 						message: res.msg,
@@ -109,84 +108,115 @@ export default {
 				}
 			})
 		},
-		onOpen(){
-			// window.open(this.obj.contractName,'_blank')
-			window.open(this.url,'_blank')
-		}
+		onOpen() {
+			// #ifdef APP-PLUS
+			uni.downloadFile({
+				url: this.url,
+				success: (res) => {
+					if (res.statusCode === 200) {
+						uni.saveFile({
+							tempFilePath: res.tempFilePath,
+							success: (res) => {
+								uni.openDocument({
+									filePath: res.savedFilePath,
+									success: (res) => {
+										console.log('打开文档成功')
+									}
+								})
+							}
+						})
+					}
+				}
+			})
+			// #endif
+			// #ifdef H5
+			window.open(this.url, '_blank')
+			// #endif
+		},
+
 	}
 }
 </script>
 
 <style lang="scss" scoped>
-.contract-view{
-	width:100%;
-	height:calc(100% - 88rpx - var(--status-bar-height));
+.contract-view {
+	width: 100%;
+	height: calc(100% - 88rpx - var(--status-bar-height));
 	display: flex;
 	flex-direction: column;
 	overflow-y: auto;
 	// padding: 0 32rpx;
 	box-sizing: border-box;
 	position: relative;
-	.bottom-btn{
-		width:100%;
+
+	.bottom-btn {
+		width: 100%;
 		display: flex;
 		position: absolute;
-		bottom:80rpx;
+		bottom: 80rpx;
 		flex-direction: row;
 		justify-content: center;
-		.left-btn{
-			width:48%;
+
+		.left-btn {
+			width: 48%;
 			background: #E4D6FD;
 			border-radius: 8rpx;
 		}
-		.right-btn{
-			width:calc(100% - 60rpx);
-			height:88rpx;
-			background: linear-gradient( 270deg, #B164FB 0%, #7934F6 100%);
+
+		.right-btn {
+			width: calc(100% - 60rpx);
+			height: 88rpx;
+			background: linear-gradient(270deg, #B164FB 0%, #7934F6 100%);
 			border-radius: 8rpx;
 		}
 	}
-	.bottom{
+
+	.bottom {
 		display: flex;
 		padding: 40rpx 46rpx;
 		box-sizing: border-box;
 		flex-direction: column;
 		justify-content: space-between;
-		margin-top:24rpx;
+		margin-top: 24rpx;
 		background-color: #fff;
-		width:100%;
-		min-height:216rpx;
+		width: 100%;
+		min-height: 216rpx;
 	}
-	.top-info{
-		width:100%;
-		min-height:440rpx;
+
+	.top-info {
+		width: 100%;
+		min-height: 440rpx;
 		padding: 68rpx 32rpx 64rpx;
 		box-sizing: border-box;
 		background-color: #fff;
-		.right-view{
-			height:100%;
-			flex:1;
+
+		.right-view {
+			height: 100%;
+			flex: 1;
 			flex-direction: column;
 			display: flex;
-			margin-left:46rpx;
-			.bottom-panel{
-				width:100%;
-				flex:1;
+			margin-left: 46rpx;
+
+			.bottom-panel {
+				width: 100%;
+				flex: 1;
 				display: flex;
 				flex-direction: column;
-				.list-right{
-					width:238rpx;
-					margin-left:40rpx;
-					word-break:break-all;
+
+				.list-right {
+					width: 238rpx;
+					margin-left: 40rpx;
+					word-break: break-all;
 					display: flex;
 				}
 			}
 		}
-		image{
-			width:200rpx;
-			height:260rpx;
+
+		image {
+			width: 200rpx;
+			height: 260rpx;
 		}
-		
+
 	}
 }
 </style>

From 596d63d68c888341cbf3eff4fad629b41fd5d411 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Thu, 28 Aug 2025 17:21:50 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=96=87?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/rwa_package/rwa/rwa.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/rwa_package/rwa/rwa.vue b/pages/rwa_package/rwa/rwa.vue
index 5003e5b..6eaba12 100644
--- a/pages/rwa_package/rwa/rwa.vue
+++ b/pages/rwa_package/rwa/rwa.vue
@@ -20,7 +20,7 @@
 					<view style="margin-top: 10rpx;">
 						<up-image src="/static/rwa/tx.png" width="18" height="18" bgColor="#f1f6ff00" />
 					</view>
-					<view class="but-item-msg">提现</view>
+					<view class="but-item-msg">行权兑换</view>
 				</view>
 				<view class="but-item jl-warp" @click="jumpWithdrawalLog">
 					<view style="margin-top: 10rpx;">

From 28732b1b48784cd7923babd949bd8aa6498fc8d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Thu, 28 Aug 2025 20:19:37 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=E7=AD=BE=E7=BD=B2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/rwa_package/dongjian/check.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/rwa_package/dongjian/check.vue b/pages/rwa_package/dongjian/check.vue
index 8508b4a..e4383d7 100644
--- a/pages/rwa_package/dongjian/check.vue
+++ b/pages/rwa_package/dongjian/check.vue
@@ -6,7 +6,7 @@
 			<view class="top-info flex-r-lr">
 				<image src="@/static/new/he.png"></image>
 				<view class="right-view">
-					<text class="text-36 text-zu">消费型合伙人协议</text>
+					<text class="text-36 text-zu">{{ obj.contractName }}</text>
 					<view class="bottom-panel">
 						<view class="flex-r-lr mt-24" v-for="(item, index) in dataList" :key="dataList.value">
 							<text class="text-fu text-24">{{ item.text }}</text>
@@ -48,7 +48,7 @@ export default {
 	data() {
 		return {
 			dataList: [
-				{ text: '合同状态', value: '' },
+				{ text: '合同状态', value: '签约完成' },
 				{ text: '合同编号', value: '' },
 				{ text: '发起方', value: '信任桥（深圳）网络科技有限公司' },
 				{ text: '发起时间', value: '' },
@@ -95,6 +95,9 @@ export default {
 					this.obj.details.startTime = func.formatDate(new Date(res.data[0].details.startTime), 2);
 					this.obj.details.endTime = func.formatDate(new Date(res.data[0].details.endTime), 2);
 					// this.dataList[2].value = this.obj.flowId;
+
+					this.dataList[0].value = this.obj.state ? '已签署' : '未签署';
+					this.dataList[1].value = this.obj.flowid;
 					this.dataList[3].value = this.obj.details.startTime;
 					this.dataList[4].value = this.obj.details.endTime;
 					this.bottomList[0].value = this.obj.signatureName;

From 9e87dfee1bda7c28c5e8c751675cbc50d3ad6c90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Fri, 29 Aug 2025 00:04:57 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E6=94=B9=E5=8F=98=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/mine.vue | 82 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 63 insertions(+), 19 deletions(-)

diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index efa2885..262f39d 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -70,34 +70,47 @@
 				</view>
 			</view>
 			<!-- 入驻 -->
-			<view class="mine_top_comm_warp enter_list">
-				<view class="enter_item" @click="jumpEnter('merchant')">
-					<view>
-						<view class="enter_title">商家入驻</view>
+			<view class="mine_content_comm_warp mine_top_comm_warp mine_tool_warp">
+				<view class="mine_tool_title">入驻信任桥</view>
+				<view class="settled_list">
+					<view class="enter_item" @click="jumpEnter('merchant')">
+						<view class="enter_item_cell">
+							<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/enter_sj.png" width="36" height="36"
+								bgColor="#f1f6ff00"></up-image>
+							<view class="enter_item_text">
+								<view class="enter_title">商家入驻</view>
+								<view class="enter_remark">获取更多客户与订单机会</view>
+							</view>
+						</view>
 						<view class="enter_apply">
 							<text class="enter_apply_title">申请</text>
 							<view style="margin-top: 10rpx;">
-								<up-image src="/static/common/right_y.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
+								<up-image src="/static/common/right.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
 							</view>
+
 						</view>
 					</view>
-					<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/enter_sj.png" width="50" height="50"
-						bgColor="#f1f6ff00"></up-image>
-				</view>
-				<view class="enter_item" @click="jumpEnter('brand')">
-					<view>
-						<view class="enter_title">企业/品牌入驻</view>
+
+					<view class="enter_item" @click="jumpEnter('brand')">
+						<view class="enter_item_cell">
+							<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/enter_pp.png" width="36" height="36"
+								bgColor="#f1f6ff00"></up-image>
+							<view class="enter_item_text">
+								<view class="enter_title">企业/品牌入驻</view>
+								<view class="enter_remark">助您打造专属品牌馆</view>
+							</view>
+						</view>
+
 						<view class="enter_apply">
 							<text class="enter_apply_title">申请</text>
 							<view style="margin-top: 10rpx;">
-								<up-image src="/static/common/right_y.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
+								<up-image src="/static/common/right.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
 							</view>
 						</view>
 					</view>
-					<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/enter_pp.png" width="50" height="50"
-						bgColor="#f1f6ff00"></up-image>
 				</view>
 			</view>
+
 			<!-- 服务工具 -->
 			<view class="mine_content_comm_warp mine_top_comm_warp mine_tool_warp">
 				<view class="mine_tool_title">服务工具</view>
@@ -395,14 +408,14 @@ export default {
 		jumpEnter(type) {
 			// 商家入驻
 			if (type === "merchant") {
-				uni.navigateTo({
-					url: '/pages/merchant_settlement/merchant_settlement',
-				})
-				// this.openShow = true;
+				// uni.navigateTo({
+				// 	url: '/pages/rwa_package/merchant_settlement/merchant_settlement.vue',
+				// })
+				this.openShow = true;
 			} else if (type === "brand") {
 				// 企业/品牌入驻
 				// uni.navigateTo({
-				// 	url:'/pages/brand_settlement/brand_settlement',
+				// 	url: '/pages/brand_settlement/brand_settlement',
 				// })
 				this.brandShow = true;
 			}
@@ -565,6 +578,37 @@ export default {
 
 .mine_top_comm_warp {
 	margin-top: 30rpx;
+
+	.settled_list {
+		width: 100%;
+		box-sizing: border-box;
+
+		.enter_item {
+			width: 100%;
+			margin-top: 10rpx;
+			padding: 12rpx 0;
+			box-sizing: border-box;
+
+			.enter_item_cell {
+				display: flex;
+
+				.u-transition {
+					margin-top: 5rpx;
+				}
+
+				.enter_item_text {
+					margin-left: 10rpx;
+
+					.enter_remark {
+						font-size: 24rpx;
+						color: #999999;
+						margin-top: 10rpx;
+					}
+				}
+
+			}
+		}
+	}
 }
 
 /* 内容公共 end */

From eb2b24ebaca9da9c12c64a1b72bbac480cfa7ddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Sun, 31 Aug 2025 23:59:51 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E5=94=AE=E5=90=8E=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/order.js                                  |   36 +
 .../mine_order/after-sales/index.vue          |  101 +-
 .../mine_order/after-sales/refund-popu.vue    |  411 ++++
 .../mine_order/components/salesStatus.vue     |   56 +
 pages/mine_package/mine_order/emun/index.js   |   33 +
 pages/mine_package/mine_order/mine_order.vue  | 2019 +++++++++--------
 pages/rwa_package/dongjian/check.vue          |    6 +-
 utils/request.js                              |    2 +-
 8 files changed, 1741 insertions(+), 923 deletions(-)
 create mode 100644 pages/mine_package/mine_order/after-sales/refund-popu.vue
 create mode 100644 pages/mine_package/mine_order/components/salesStatus.vue
 create mode 100644 pages/mine_package/mine_order/emun/index.js

diff --git a/api/order.js b/api/order.js
index 825e27c..cd9933d 100644
--- a/api/order.js
+++ b/api/order.js
@@ -103,3 +103,39 @@ export function getMiniProgramSignUrl(data) {
 		data,
 	});
 }
+
+// 售后申请
+export function afterSaleApply(data) {
+	return request({
+		url: "/order/afterApply",
+		method: "post",
+		data,
+	});
+}
+
+// 售后订单详情
+export function afterSaleDetail(data) {
+	return request({
+		url: "/order/getAfterDetail",
+		method: "get",
+		data,
+	});
+}
+
+// 撤销售后申请
+export function cancelAfterSale(data) {
+	return request({
+		url: "/order/cancelAfterApply",
+		method: "post",		
+		data,
+	});
+}
+
+// 寄回商品反馈
+export function returnGoodsFeedback(data) {
+	return request({
+		url: "/order/sendGoodsBack",	
+		method: "post",		
+		data,
+	});
+}
diff --git a/pages/mine_package/mine_order/after-sales/index.vue b/pages/mine_package/mine_order/after-sales/index.vue
index c556e33..e943bcd 100644
--- a/pages/mine_package/mine_order/after-sales/index.vue
+++ b/pages/mine_package/mine_order/after-sales/index.vue
@@ -1,15 +1,86 @@
-<template>
-  <view>
-    售后
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      activeIndex: 0,
-    }
-  },
-}
-</script>
+<template>
+	<view class="content_">
+		<view class="content_1 ">选择退货原因</view>
+		<view class="content-radio">
+			<up-radio-group v-model="radiovalue1" iconColor="#fff" activeColor="#7934F6" placement="column" iconPlacement="right" @change="groupChange">
+				<up-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radioList" :key="index"
+					:label="item.name" :name="item.name" @change="radioChange">
+				</up-radio>
+			</up-radio-group>
+		</view>
+		<view class="button operate_but_2" @click="goNext(2)">下一步</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				activeIndex: 0,
+				radiovalue1:'外观/型号/参数与描述不符',
+				radioList: [{
+						name: '外观/型号/参数与描述不符',
+						disabled: false,
+					},
+					{
+						name: '协商一致退款',
+						disabled: false,
+					},
+					{
+						name: '质量问题',
+						disabled: false,
+					},
+					{
+						name: '少件（缺少配件）',
+						disabled: false,
+					},
+				]
+			}
+		},
+		methods:{
+			groupChange(){
+				
+			},
+			radioChange(){
+				
+			},
+			goNext(val){
+				console.log('val',val);
+				this.$emit('nextNum',val)
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.content_ {
+		margin-top: 20rpx;
+
+		.content_1 {
+			text-align: left;
+			margin-top: 20rpx;
+		}
+		.button{
+			height: 88rpx;
+			background: $app-bt-bj;
+			color: #ffffff;
+			line-height: 88rpx;
+			border-radius: 8rpx;
+			margin-bottom: 24rpx;
+		}
+		.content-radio {
+			display: flex;
+			justify-content: space-between;
+			justify-items: center;
+			padding: 34rpx 0;
+
+			.content-name {
+				font-size: 28rpx;
+			}
+
+			&:nth-of-type(1) {
+				margin-top: 32rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/mine_package/mine_order/after-sales/refund-popu.vue b/pages/mine_package/mine_order/after-sales/refund-popu.vue
new file mode 100644
index 0000000..280f066
--- /dev/null
+++ b/pages/mine_package/mine_order/after-sales/refund-popu.vue
@@ -0,0 +1,411 @@
+<template>
+  <!-- 退货退款模块 -->
+  <view>
+    <view v-if="status > 0">
+      <salesStatus
+        :topLabel="topLabel"
+        :topTitle="topTitle"
+        :status="status"
+      ></salesStatus>
+    </view>
+    <view class="refund_content">
+      <view class="content_card">
+        <image :src="product.items[0].mainGraph" class="card_img"></image>
+        <view class="card_info">
+          <view class="card_box">
+            <view class="card_title">
+              <view class="title">{{ product.items[0].title }}</view>
+              <view class="price">¥{{ product.items[0].goodsAmount }}</view>
+            </view>
+            <view class="shop_status">规格：{{ product.sumAmount }}</view>
+          </view>
+          <view class="card_total">
+            <text>共{{ product.buyNum }}件</text>
+            <text>合计{{ product.sumAmount }}元</text>
+          </view>
+        </view>
+      </view>
+      <view class="card_list">
+        <view class="list_left">退款原因</view>
+        <view> {{ RETURN_REASON_OBJ[product.afterReason] }} </view>
+      </view>
+      <view class="card_list">
+        <view class="list_left">退款金额</view>
+        <view>
+          ¥{{ product.refundAmount || product.sumAmount }}
+          <text style="font-size: 24rpx; color: #999">（退回现金余额)</text>
+        </view>
+      </view>
+
+      <view v-if="status > 1" class="card_list_box">
+        <view class="card_list">
+          <view class="list_left">邮寄地址</view>
+          <view>{{ address || "--" }}</view>
+        </view>
+        <view class="card_list">
+          <view class="list_left">填快递单号</view>
+          <input
+            class="input-express"
+            type="text"
+            :disabled="status != 2"
+            placeholder="请填写快递单号"
+            v-model="cancelForm.expressNo"
+          />
+        </view>
+        <view class="card_list">
+          <view class="list_left">填快递名称</view>
+          <input
+            class="input-express"
+            type="text"
+            :disabled="status != 2"
+            placeholder="请填写快递名称"
+            v-model="cancelForm.expressName"
+          />
+        </view>
+      </view>
+      <view
+        v-if="buttonLabel"
+        :class="[
+          'bottom_box',
+          {
+            bottom_box_disabled:
+              status == 2 && (!cancelForm.expressNo || !cancelForm.expressName),
+          },
+          { bottom_box_quash: status == 1 },
+        ]"
+      >
+        <view class="button operate_but_2" @click="submit"
+          > {{ buttonLabel }}</view
+        >
+      </view>
+    </view>
+  </view>
+  <up-toast ref="uToastRef"></up-toast>
+</template>
+<script>
+import salesStatus from "../components/salesStatus.vue";
+import {
+  afterSaleApply,
+  cancelAfterSale,
+  returnGoodsFeedback,
+} from "@/api/order.js";
+import { RETURN_REASON } from "@/pages/mine_package/mine_order/emun/index.js";
+export default {
+  components: { salesStatus },
+  props: {
+    product: {
+      type: Object,
+      default: {},
+    },
+    cancelForm: {
+      type: Object,
+      default: {},
+    },
+  },
+
+  data() {
+    return {};
+  },
+  methods: {
+    submit() {
+      // 未售后 -- 提交申请
+      if (this.status == 0) {
+        this.onAfterSaleApply();
+      }
+      //已售后-- 撤销申请
+      if (this.status == 1) {
+        this.onCancelApply();
+      }
+      if (this.status == 2) {
+        if (!this.cancelForm.expressNo || !this.cancelForm.expressName) {
+          this.$refs.uToastRef.show({
+            type: "error",
+            message: "请填写快递信息",
+          });
+          return;
+        }
+        this.onReturnGoods();
+      }
+      // 售后中--退款失败
+      if (this.status == 4) {
+        // 重新发起
+        this.onClose(true);
+      }
+      // 售后中--退款成功
+      if (this.status == 5) {
+        this.onClose();
+      }
+    },
+    // 未售后 -- 售后
+    async onAfterSaleApply() {
+      const params = {
+        reason: this.cancelForm.afterReason,
+        type: this.product.afterType, //0-未售后 1-退款不退货， 2-退货退款 3-换货
+        id: this.product.id, // 订单id
+        itemIds: this.product.items[0]?.id, // 商品id
+      };
+      console.log("确认取消", params);
+      if (!params.reason) {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "请选择取消原因",
+        });
+        return;
+      }
+      const { bizcode } = await afterSaleApply(params);
+      if (bizcode === 100) {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "申请成功，等商家审核",
+        });
+        this.onClose();
+      }
+    },
+    // 撤销申请
+    async onCancelApply() {
+      const params = {
+        afterId: this.product.afterId,
+      };
+      console.log("撤销申请", params);
+      const { bizcode } = await cancelAfterSale(params);
+      if (bizcode === 100) {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "撤销成功",
+        });
+        this.onClose();
+      }
+    },
+    // 寄回商品
+    async onReturnGoods() {
+      const params = {
+        afterId: this.product.afterId,
+        expressNo: this.cancelForm.expressNo,
+        expressName: this.cancelForm.expressName,
+      };
+      console.log("寄回商品", params);
+      const { bizcode } = await returnGoodsFeedback(params);
+      if (bizcode === 100) {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "寄回成功",
+        });
+        this.onClose();
+      }
+    },
+    // 关闭弹窗
+    onClose(item = false) {
+      this.$emit("close", item);
+    },
+  },
+  computed: {
+    status() {
+      // 未售后 -- 提交申请
+      if (this.product.afterType == 0) {
+        return 0;
+      }
+      //  已售后
+      if (this.product.afterType > 0) {
+        if (this.product.status == 0) {
+          return 1;
+        }
+        // 售后中--待买家寄回商品
+        if (this.product.status == 1) {
+          return 2;
+        }
+        // 售后中--快递已发，待卖家收货
+        if (this.product.status == 2) {
+          return 3;
+        }
+        // 售后中--卖家已收货，退款失败
+        if (this.product.status == 6) {
+          return 4;
+        }
+        // 售后中--卖家已收货，退款成功
+        if (this.product.status == 7) {
+          return 5;
+        }
+      }
+    },
+    /* 根据订单状态按钮显示不同文案 */
+    buttonLabel() {
+      if (this.status == 0) {
+        return "提交申请";
+      } else if (this.status == 1) {
+        return "撤销申请";
+      } else if (this.status == 2) {
+        return "确定退货/退款";
+      } else if (this.status == 3) {
+        return "确定退货/退款";
+      } else if (this.status == 4) {
+        return "重新发起";
+      } else if (this.status == 5) {
+        return "我知道了";
+      }
+    },
+    /* 根据订单状态显示不label */
+    topLabel() {
+      if (this.status == 1) {
+        return "您已成功发起退货/退款申请，请耐心等待审";
+      } else if (this.status == 2) {
+        return "请按照以下地址寄回商品";
+      } else if (this.status == 3) {
+        return "请按照以下地址寄回商品";
+      } else if (this.status == 4) {
+        return "您发起的退货/退款申请，未通过";
+      } else if (this.status == 5) {
+        return "您发起的退货/退款申请，已处理完成";
+      }
+    },
+    /* 根据订单状态显示不title */
+    topTitle() {
+      if (this.status == 1) {
+        return "退款/退货审核中";
+      } else if (this.status == 2) {
+        return "退款申请通过";
+      } else if (this.status == 3) {
+        return "退款申请通过";
+      } else if (this.status == 4) {
+        return "退款申请失败";
+      } else if (this.status == 5) {
+        return "退款成功";
+      }
+    },
+
+    /* 计算地址 */
+    address() {
+      return `${this.product.provinceName || ""}${this.product.cityName || ""}${
+        this.product.areaName || ""
+      }${this.product.address || ""}  ${this.product.name || ""} ${
+        this.product.phone || ""
+      }`;
+    },
+    RETURN_REASON_OBJ() {
+      return RETURN_REASON;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.refund_content {
+  width: 100%;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  overflow-y: scroll;
+  .card_list_box {
+    padding-bottom: 88rpx;
+  }
+  .content_card {
+    display: flex;
+    margin-bottom: 48rpx;
+    .card_img {
+      width: 156rpx;
+      height: 156rpx;
+      margin-right: 20rpx;
+    }
+
+    .card_info {
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      width: calc(100% - 176rpx);
+
+      .card_box {
+        .card_title {
+          font-weight: bold;
+          font-size: 30rpx;
+          width: 100%;
+          color: #000000;
+
+          box-sizing: border-box;
+          display: flex;
+          flex-wrap: nowrap;
+          justify-content: space-between;
+          text-align: left;
+          font-style: normal;
+
+          .title {
+            width: 80%;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+
+          .price {
+            width: 20%;
+            text-align: right;
+          }
+        }
+
+        .shop_status {
+          color: #999;
+          font-size: 28rpx;
+          margin-top: 15rpx;
+        }
+      }
+
+      .card_total {
+        color: #999;
+        font-size: 28rpx;
+        text-align: right;
+      }
+    }
+  }
+
+  .card_list {
+    display: flex;
+    justify-content: space-between;
+    height: 96rpx;
+    line-height: 96rpx;
+    font-size: 28rpx;
+    border-bottom: 1px solid #eaeaea;
+
+    .list_left {
+      color: #666;
+    }
+    .input-express {
+      display: flex;
+      align-items: center;
+      width: 400rpx;
+      height: 100%;
+      text-align: end;
+      font-size: 28rpx;
+    }
+  }
+  .bottom_box {
+    position: fixed;
+    bottom: 0;
+    left: 0; /* 补充 left:0，确保容器从左侧开始 */
+    right: 0; /* 补充 right:0，让容器宽度自适应屏幕/弹窗 */
+    text-align: center;
+    background: #ffffff;
+    padding: 0 48rpx 28rpx; /* 增加内边距，避免按钮贴边 */
+    z-index: 10; /* 确保整个底部区域在内容上方 */
+    .button {
+      width: 100%; /* 直接用 100%，利用父容器的 padding 控制边距 */
+      height: 88rpx;
+      background: linear-gradient(270deg, #b164fb 0%, #7934f6 100%);
+      color: #ffffff;
+      line-height: 88rpx;
+      text-align: center;
+      border-radius: 8rpx;
+      margin-top: 28rpx; /* 只保留顶部 margin，底部由父容器 padding 控制 */
+      /* 移除 margin 左右值，改用父容器 padding 控制边距 */
+    }
+    &.bottom_box_quash {
+      .button {
+        background: #ffffff;
+        color: #b164fb;
+        border: 1rpx solid #b164fb;
+      }
+    }
+    &.bottom_box_disabled {
+      .button {
+        background: #e8ebf6;
+        color: #cbced9;
+        border: 1rpx solid #e7ebf6;
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/mine_package/mine_order/components/salesStatus.vue b/pages/mine_package/mine_order/components/salesStatus.vue
new file mode 100644
index 0000000..c8a34b8
--- /dev/null
+++ b/pages/mine_package/mine_order/components/salesStatus.vue
@@ -0,0 +1,56 @@
+<template>
+    <!-- 退货退款进度icon -->
+    <view class="status_box">
+        <image class="status_img" :src="`https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine-purse/icon_arrow_black_${status == 4 ? 2 : status == 5 ? 3 : 1}.png`"></image>
+        <view class="status_name">{{ topTitle }}</view>
+        <view class="status_tip">{{ topLabel }}</view>
+        <view class="line"></view>
+    </view>
+</template>
+
+<script>
+export default {
+    name: 'salesStatus',
+    props: {
+        topLabel: {
+            type: String,
+            default: ''
+        },
+        topTitle: {
+            type: String,
+            default: ''
+        },
+        status: {
+            type: Number,
+            default: 0
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.status_box {
+
+    text-align: center;
+    .status_img {
+        width: 108rpx;
+        height: 108rpx;
+    }
+    .status_name {
+        margin-top: 20rpx;
+        font-size: 32rpx;
+        font-weight: 600;
+    }
+    .status_tip {
+        font-size: 28rpx;
+        color: #999;
+        margin: 20rpx 0;
+    }
+    .line {
+        width: 100%;
+        height: 16rpx;
+        background-color: #f5f5f7;
+        margin-bottom: 48rpx;
+    }
+}
+</style>
diff --git a/pages/mine_package/mine_order/emun/index.js b/pages/mine_package/mine_order/emun/index.js
new file mode 100644
index 0000000..071a6f0
--- /dev/null
+++ b/pages/mine_package/mine_order/emun/index.js
@@ -0,0 +1,33 @@
+export const RETURN_REASON = {
+    1: "我不想买了",
+    2: "下错单了",
+    3: "商家未发货",
+    4: "商品质量问题",
+    5: "商品实物与描述不符",
+    6: "商家发错货",
+    7: "假冒品牌",
+    8: "配件破损",
+    9: "主商品破损",
+    10: "协商一致退款",
+    11: "少件(少配件)",
+    12: "其他",
+}
+
+export const RETURN_REASON_LIST = [
+    { id: 1, name: '我不想买了' },
+    { id: 2, name: '下错单了' },
+    { id: 3, name: '商家未发货' },
+    { id: 4, name: '商品质量问题' },
+    { id: 5, name: '商品实物与描述不符' },
+    { id: 6, name: '商家发错货' },
+    { id: 7, name: '假冒品牌' },
+    { id: 8, name: '配件破损' },
+    { id: 9, name: '主商品破损' },
+    { id: 10, name: '协商一致退款' },
+    { id: 11, name: '少件(少配件)' },
+    { id: 12, name: '其他' },
+]
+    
+   
+
+ 
\ No newline at end of file
diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue
index e605bb3..d3e39b4 100644
--- a/pages/mine_package/mine_order/mine_order.vue
+++ b/pages/mine_package/mine_order/mine_order.vue
@@ -1,904 +1,1115 @@
-<template>
-	<view class="order_warp">
-		<view class="order_header">
-			<up-image src="/static/common/left.png" width="20" height="20" bgColor="#f1f6ff00" @click="jumpLeft"></up-image>
-			<up-search shape="round" bgColor="#FFFFFFFF" :showAction="false" @blur="onBlur" @search="searchFun"
-				v-model="search"></up-search>
-		</view>
-		<view class="order_type_title">
-			<view :class="form.type === item.id ? 'order_type_title_item order_type_title_item_sel' : 'order_type_title_item'"
-				v-for="(item, index) in orderTypeList" @click="checkType(item)" :key="index">
-				{{ item.title }}
-			</view>
-		</view>
-		<scroll-view scroll-y="true" @scrolltolower="loadMore" style="height: calc(100vh - 300rpx);">
-			<view v-if="orderList && orderList.length !== 0" class="order_list_warp">
-				<view class="order_item" v-for="(item, index) in orderList" :key="item.id">
-					<!-- 头部 -->
-					<view class="order_item_header">
-						<view class="order_item_header_left">
-							<up-image :src="item.shopLogo" width="22" height="22" bgColor="#f1f6ff00" shape="circle"></up-image>
-							<view class="order_product_title">{{ item.shopName }}</view>
-						</view>
-						<!-- 除开待付款 -->
-						<view v-if="item.status !== ORDER_TYPE.UNPAID" class="order_item_header_right"
-							:style="{ 'color': ORDER_STATUS_CSS[item.status] }">
-							{{ getValue(ORDER_STATUS, item.status) }}
-						</view>
-						<!-- 待付款 -->
-						<view v-else class="order_item_header_right order_right_due">
-							<view class="order_right_due_msg">等待付款</view>
-							<view class="order_right_due_time">{{ formatDate1(item.expireTime) }}前</view>
-						</view>
-					</view>
-					<!-- 产品详情 -->
-					<view class="order_item_content">
-						<view v-for="pItem in item.items" :key="pItem.id">
-							<view class="content_item" @click="jumpOrderInfo(item)">
-								<up-image :src="pItem.mainGraph" width="80" height="80" bgColor="#f1f6ff00"></up-image>
-								<view class="content_info">
-									<view class="content_info_title">{{ pItem.title }}</view>
-									<view class="content_info_tag">{{ pItem.goodsSpece }}</view>
-									<!-- <view>
-										<text class="content_info_description" v-for="dItem in pItem.description">
-											{{dItem}}
-										</text>
-									</view> -->
-								</view>
-								<view class="content_right">
-									<view class="content_right_total">￥{{ pItem.goodsAmount }}</view>
-									<view class="content_right_quantity">x{{ pItem.buyNum }}</view>
-								</view>
-							</view>
-							<view class="content_item_yd" v-if="pItem.expressNo">
-								<view>运单号：<text v-if="pItem.expressName">（{{ pItem.expressName }}）</text>{{ pItem.expressNo }}</view>
-								<view style="margin-left:10rpx;">
-									<up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00"
-										@click="copyData(pItem.expressNo)"></up-image>
-								</view>
-							</view>
-
-						</view>
-					</view>
-					<!-- 汇总 -->
-					<view class="order_item_collect">
-						<view class="collect_msg collect_msg_s" v-if="this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE">
-							<view class="content_item_yd_msg">(快递动态跟进请复制单号至[快递100官网] 查询)</view>
-							<view>共{{ item.buyNum }}件,合计￥{{ item.sumAmount }}</view>
-						</view>
-						<view class="collect_msg" v-else>
-							共{{ item.buyNum }}件,合计￥{{ item.sumAmount }}
-						</view>
-						<view class="collect_operate">
-							<!-- <view class="operate_comm operate_but_1"  v-if="item.status === ORDER_TYPE.UNSHIPPED" @click="checkCancel(true)">取消订单</view> -->
-							<view class="operate_comm operate_but_2" v-if="item.status === ORDER_TYPE.UNPAID"
-								@click="jumpOrderInfo(item)">去付款</view>
-							<!-- <view class="operate_comm operate_but_1" v-if="item.status === ORDER_TYPE.COMPLETED">申请退款</view> -->
-
-							<view class="operate_comm operate_but_2" v-if="item.status === ORDER_TYPE.NOT_RECEIVE"
-								@click="confirmReceiptOk(item)">确认收货
-							</view>
-							<view class="operate_comm operate_but_2"
-								v-if="!isCheckSigne && index == 0 && item.status === ORDER_TYPE.SUCCEED" @click="downShow = true">去签署
-							</view>
-							<!-- <view class="operate_comm operate_but_3" v-if="item.status === ORDER_TYPE.UNSHIPPED">提醒发货</view> -->
-							<view class="operate_comm operate_but_1"
-								v-if="[ORDER_TYPE.NOT_RECEIVE, ORDER_TYPE.UNSHIPPED].includes(item.status)" @click="afterShow = true;">
-								申请售后
-							</view>
-							<!-- <view class="operate_comm operate_but_1" v-if="item.status === ORDER_TYPE.AFTER_SALE">查看售后</view> -->
-							<!-- <view class="operate_comm operate_but_1" v-if="[ORDER_TYPE.COMPLETED].includes(item.status)">删除记录</view> -->
-							<!-- <view class="operate_comm operate_but_3" v-if="[ORDER_TYPE.COMPLETED,ORDER_TYPE.CANCELED].includes(item.status)">再次购买</view> -->
-						</view>
-					</view>
-				</view>
-			</view>
-			<view v-else class="not_order_warp">
-				<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/not_order.png" width="80" height="80"
-					bgColor="#f1f6ff00"></up-image>
-				<view class="not_order_msg_warp">暂无相关订单</view>
-			</view>
-			<view v-if="loading" style="text-align: center;">加载中...</view>
-		</scroll-view>
-		<up-popup v-model:show="cancelShow" :round="10" :closeOnClickOverlay="false">
-			<view class="cancel_show_warp">
-				<view class="cancel_show_title_warp">
-					<view>取消订单</view>
-					<view class="cancel_show_title_icon" @click="checkCancel(false)"><up-icon name="close-circle" color="#9e9e9e"
-							size="20"></up-icon></view>
-				</view>
-				<view class="cancel_show_msg_warp">
-					<view>温馨提示：</view>
-					<view>1.限时特价、预约资格等购买优惠可能一并取消</view>
-					<view>2.订单一旦取消，支付优惠一并取消，可能无法恢复</view>
-				</view>
-				<view class="cancel_show_reason_warp">
-					<view class="reason_title">请选择取消订单的原因（必选）：</view>
-					<up-radio-group v-model="cancelForm.reason" placement="column">
-						<up-radio :customStyle="{ marginBottom: '8px' }" v-for="(item, index) in reasonList" :key="index"
-							:label="item.name" :name="item.name">
-						</up-radio>
-					</up-radio-group>
-					<up-textarea v-model="cancelForm.remark"></up-textarea>
-				</view>
-			</view>
-			<view class="but_border_warp"></view>
-			<view class="cancel_show_but">
-				<view class="add_but" @click="cancelOk">提交</view>
-			</view>
-		</up-popup>
-		<up-toast ref="uToastRef"></up-toast>
-		<!-- 暂未开放 -->
-		<up-modal :show="openShow" :showConfirmButton="false">
-			<view class="slot-content">
-				<view class="close_warp" @click="openShow = false;">
-					<up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
-				</view>
-				<view class="content_">
-					<view class="content_1">温馨提示</view>
-					<view class="content_2">暂未开放</view>
-				</view>
-				<view class="but_">
-					<view class="but_copy" @click="openShow = false;">确定</view>
-				</view>
-			</view>
-		</up-modal>
-		<!-- 申请售后 -->
-		<up-popup v-model:show="afterShow" class="after-sales-popup" :round="10" :closeOnClickOverlay="false"
-			:closeable="true" :safeAreaInsetBottom="false" @close="afterShow = false;">
-
-			<view class="after-sales-title">
-				申请售后
-			</view>
-
-			<view class="slot-content">
-				<view class="after-sales-tabs">
-					<view :class="['after-sales-tabs-item', { 'active': activeIndex === 0 }]" @click="activeIndex = 0">联系售后
-						<text class="after-sales-tabs-text">荐</text>
-					</view>
-					<view :class="['after-sales-tabs-item', { 'active': activeIndex === 1 }]" @click="activeIndex = 1">退货退款</view>
-				</view>
-
-				<view class="content_" v-if="activeIndex === 0">
-					<view class="content_1 ">售后联系方式</view>
-					<view class="content_2">如遇退/换货等问题，请联系客服处理</view>
-					<view class="content_3">
-						<view style="margin-left: 20rpx;">
-							<up-image src="/static/common/kf_dh.png" width="40" height="40" bgColor="#f1f6ff00"></up-image>
-						</view>
-						<view class="content_info">
-							<view class="content_info_title">客服电话</view>
-							<view class="content_info_mobile">
-								{{ PHONE_NUMBER }}
-								<view style="margin-left: 20rpx;">
-									<up-image src="/static/common/copy_c.png" width="14" height="14" bgColor="#f1f6ff00"
-										@click="copyMobile(PHONE_NUMBER)"></up-image>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="content_3">
-						<view style="margin-left: 20rpx;">
-							<up-image src="/static/common/kf_wx.png" width="40" height="40" bgColor="#f1f6ff00"></up-image>
-						</view>
-						<view class="content_info">
-							<view class="content_info_title">客服微信</view>
-							<view class="content_info_mobile">
-								{{ WECHAT }}
-								<view style="margin-left: 20rpx;">
-									<up-image src="/static/common/copy_c.png" width="14" height="14" bgColor="#f1f6ff00"
-										@click="copyMobile(WECHAT)"></up-image>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-
-				<!-- 退货退款 -->
-				<after-sales v-if="activeIndex === 1" />
-			</view>
-		</up-popup>
-
-		<!-- 腾讯电子签H5 → 集成到UniApp -->
-		<web-view v-if="signUrl" :src="signUrl" @message="handleMessage"></web-view>
-		<u-modal :show="tipsShow" :showCancelButton="true" confirmText="去认证" @cancel="onTipsCancel" @confirm="onConfirm"
-			confirmColor="#7934F6" title="提示" content='签署合同需要进行实名认证，请先完成实名认证'></u-modal>
-		<DownPopup :show="downShow" @ok="onSignContract" @cancel="onCancel" />
-
-	</view>
-</template>
-
-<script>
-import { MINE_ORDER_TYPE, ORDER_TYPE, ORDER_STATUS, getValue } from '@/utils/enumUtils.js';
-import { ORDER_STATUS_CSS } from '@/utils/enumCssUtils.js';
-import DownPopup from '@/components/common/down-popup.vue'
-import { getOrderList, confirmReceipt, getSignUrl, signContract, isSignContract, getMiniProgramSignUrl } from '@/api/order.js';
-import dayjs from 'dayjs';
-import { formatDate1, copyData } from '@/utils/index.js'
-import { getUserInfo } from '@/api/auth.js'
-import { CUSTOMER_SERVICE_PHONE_NUMBER, CLOUD_SERVICE_WECHAT } from '@/utils/config.js';
-import afterSales from './after-sales/index'
-
-export default {
-	components: { DownPopup, afterSales },
-
-	computed: {
-		MINE_ORDER_TYPE() {
-			return MINE_ORDER_TYPE;
-		},
-		ORDER_STATUS() {
-			return ORDER_STATUS;
-		},
-		ORDER_STATUS_CSS() {
-			return ORDER_STATUS_CSS;
-		},
-		ORDER_TYPE() {
-			return ORDER_TYPE;
-		},
-		PHONE_NUMBER() {
-			return CUSTOMER_SERVICE_PHONE_NUMBER;
-		},
-		WECHAT() {
-			return CLOUD_SERVICE_WECHAT;
-		},
-
-	},
-	data() {
-		return {
-			orderTypeList: [
-				{
-					id: MINE_ORDER_TYPE.UNPAID,
-					title: "待支付",
-				}, {
-					id: MINE_ORDER_TYPE.UNSHIPPED,
-					title: "待发货",
-				}, {
-					id: MINE_ORDER_TYPE.NOT_RECEIVE,
-					title: "待收货",
-				}, {
-					id: MINE_ORDER_TYPE.SUCCEED,
-					title: "已完成",
-				},
-				// {
-				// 	id:MINE_ORDER_TYPE.AFTER_SALE,
-				// 	title:"售后",
-				// },
-			],
-			form: {
-				page: 1,
-				pageSize: 10,
-				type: MINE_ORDER_TYPE.UNPAID,// 选中的类型
-			},
-			hasMore: true, // 是否有更多数据可以加载
-			orderList: [],
-			cancelShow: false,// 取消订单
-			reasonList: [
-				{
-					id: 1,
-					name: '地址信息填写错误',
-				}, {
-					id: 2,
-					name: '不想要了',
-				}, {
-					id: 3,
-					name: '商品错选/多选',
-				}, {
-					id: 4,
-					name: '没用/少用/错用优惠券',
-				}, {
-					id: 5,
-					name: '商品降价',
-				}, {
-					id: 6,
-					name: '其他原因',
-				},
-			],
-			cancelForm: {
-				reason: null,
-				remark: null,
-			},
-			loading: false, // 加载状态标志
-			openShow: false,
-			afterShow: false,// 售后申请
-			isCheckSigne: false,
-			flowId: null,
-			signUrl: null,
-			downShow: false,
-			selectItem: null,
-			userInfo: null,
-			search: '',
-			activeIndex: 0
-		}
-	},
-	onLoad(options) {
-		const type = options.type;
-		this.form.type = type && type < 5 ? parseInt(type, 10) : MINE_ORDER_TYPE.UNPAID;
-		this.loadData();
-		// 待收货判断是否签署
-		if (this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE || this.form.type === MINE_ORDER_TYPE.SUCCEED) {
-			this.checkSigned();
-		}
-		this.userinfo();
-	},
-	methods: {
-		dayjs,
-		getValue,
-		formatDate1,
-		copyData,
-		onTipsCancel() {
-			this.tipsShow = false;
-		},
-		userinfo() {
-			getUserInfo().then(res => {
-				if (res.bizcode == 100) {
-					this.userInfo = res.data;
-				}
-				console.log('res', res)
-			})
-		},
-		onCancel() {
-			this.downShow = false;
-		},
-		onConfirm() {
-			this.onTipsCancel();
-			uni.navigateTo({
-				url: '/pages/mine_package/mine_authentication/mine_authentication'
-			})
-		},
-		copyMobile(mobile) {
-			copyData(mobile);
-			this.afterShow = false;
-		},
-		jumpLeft() {
-			uni.switchTab({
-				url: '/pages/mine/mine',
-			})
-		},
-		onBlur() {
-			this.loadData();
-		},
-		searchFun(val) {
-			console.log("searchFun", val);
-		},
-		checkType(item) {
-			console.log("checkType---", item);
-			this.form.page = 1;
-			this.form.type = item.id;
-			this.orderList = [];
-			// 待收货判断是否签署
-			if (this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE || this.form.type === MINE_ORDER_TYPE.SUCCEED) {
-				this.checkSigned();
-			}
-			if (item.id !== MINE_ORDER_TYPE.AFTER_SALE) {
-				this.loadData();
-			} else {
-				this.openShow = true;// 未开发的弹框
-			}
-		},
-		jumpOrderInfo(item) {
-			uni.navigateTo({
-				url: "/pages/mine_package/mine_order_info/mine_order_info?id=" + item.id,
-			})
-		},
-		// 处理到期时间
-		handleExpressTime(expressTime) {
-			let resultM = 0;
-			if (!expressTime || expressTime === 0) {
-				return resultM;
-			}
-			const currentTimestamp = dayjs().unix();
-			const time = currentTimestamp - expressTime;
-			resultM = dayjs(time).format('YYYY-MM-DD HH:MM:SS'); // 获取时分格式的字符串
-
-			// 如果需要将时分转换为分钟数（例如，'12:34'转换为754分钟），则需要额外计算：
-			// const [hours, minutes] = formattedTime.split(':').map(Number); // 分解小时和分钟为数字
-			// resultM = hours * 60 + minutes; // 计算总分钟数
-			// console.log(resultM); // 输出总分钟数，例如754
-			return resultM;
-		},
-		// 加载数据的方法
-		async loadData() {
-			if (this.loading) return; // 如果正在加载，则不重复加载
-			this.loading = true; // 设置加载状态为true
-			try {
-				// 模拟异步获取数据，实际应用中应该替换为你的数据获取逻辑，例如API调用
-				const newData = await this.fetchData(this.form.page, this.form.pageSize);
-				if (newData.entitys && newData.entitys.length !== 0) {
-					this.orderList = [...this.orderList, ...newData.entitys]; // 将新数据添加到列表中
-					this.form.page++; // 页码加1
-					console.log("this.orderList", this.orderList);
-				}
-			} catch (error) {
-				console.error('加载数据失败:', error);
-			} finally {
-				this.loading = false; // 设置加载状态为false
-			}
-		},
-		// 模拟获取数据的方法，实际应用中应该替换为你的数据获取逻辑，例如从服务器获取数据
-		async fetchData(page, pageSize) {
-			const params = {
-				...this.form,
-				page,
-				pageSize,
-			}
-			if (this.search) {
-				params['search'] = this.search;
-			}
-			const data = await getOrderList(params);
-			if (data && data.bizcode === 100) {
-				return data.data
-			} else {
-				return [];
-			}
-		},
-		// 当滚动到底部时触发的方法
-		loadMore() {
-			this.loadData(); // 加载更多数据
-		},
-
-		checkCancel(status) {
-			this.cancelShow = status;
-			if (!status) {
-				this.cancelForm = {
-					reason: null,
-					remark: null,
-				}
-			}
-		},
-		/**
-		 * 确认取消
-		 */
-		cancelOk() {
-			const params = {
-				...this.cancelForm,
-			}
-			if (!params.reason) {
-				this.$refs.uToastRef.show({
-					type: 'error',
-					message: "请选择取消原因",
-				});
-				return;
-			}
-			this.checkCancel(false);
-		},
-		/**
-		 * 确认收货
-		 */
-		confirmReceiptOk(item) {
-			const then = this;
-			uni.showModal({
-				title: '提示',
-				content: '是否确认收货？',
-				success: function (res) {
-					if (res.confirm) {
-						then.confirmReceiptFun(item);
-					}
-				}
-			});
-		},
-		async confirmReceiptFun(item) {
-			const params = {
-				id: item.id,
-			}
-			const resp = await confirmReceipt(params);
-			if (resp && resp.bizcode === 100) {
-				this.orderList = [];
-				this.form.page = 1;
-				this.loadData();
-				if (!this.isCheckSigne) {
-
-					this.selectItem = item;
-					this.downShow = true;
-					return;
-				}
-			}
-		},
-
-		// 判断是否已经签名
-		async checkSigned() {
-			const { bizcode, data } = await isSignContract();
-			if (bizcode === 100) {
-				this.isCheckSigne = data;
-			}
-		},
-
-		// 发起合同签章
-		async onSignContract() {
-			if (this.userInfo.certStatus == 0) {
-				this.downShow = false;
-				this.tipsShow = true;
-				return;
-			} else if (this.userInfo.certStatus == 1) {
-				this.downShow = false;
-				this.$refs.uToastRef.show({
-					type: 'success',
-					message: '请耐心等待审核通过',
-				});
-				return;
-			}
-
-
-			const { bizcode, data } = await signContract();
-			if (bizcode === 100) {
-				this.flowId = data.flowId;
-
-				if (this.flowId)
-					// #ifdef APP-PLUS || WEB
-					this.onGetSignUrl(this.flowId);
-				// #endif
-
-				// #ifdef MP-WEIXIN
-				// 小程序
-				this.onGetMiniProgramSignUrl(this.flowId)
-				// #endif
-			}
-		},
-
-		// 获取H5签署链接
-		async onGetSignUrl(flowId) {
-			const params = {
-				// 需要的参数
-				flowId: flowId,
-			}
-			const { bizcode, data } = await getSignUrl(params);
-			if (bizcode === 100) {
-				this.downShow = false;
-
-				this.signUrl = data.flowApproverUrlInfos[0].longUrl;
-			} else {
-				this.$refs.uToastRef.show({
-					type: 'error',
-					message: "获取签署链接失败，请稍后再试",
-				});
-				return null;
-			}
-		},
-
-		// 获取跳转至腾讯电子签小程序的签署链接
-		async onGetMiniProgramSignUrl(flowId) {
-			const params = {
-				flowId: flowId,
-				endPoint: 'HTTP_SHORT_URL'
-			}
-			const { bizcode, data } = await getMiniProgramSignUrl(params);
-			if (bizcode === 100) {
-				console.log("跳转至腾讯电子签小程序的签署链接", data);
-				this.openTencentESign(data.schemeUrl);
-			} else {
-				this.$refs.uToastRef.show({
-					type: 'error',
-					message: "获取签署链接失败，请稍后再试",
-				});
-				return null;
-			}
-		},
-
-		// 电子签的回调地址
-		handleMessage(e) {
-			const data = e.detail;
-			console.log('电子签的回调地址', e);
-		},
-
-		// 小程序签名
-		openTencentESign(signPath) {
-			// 这个链接需要后端调用腾讯电子签 API 获取
-			uni.navigateToMiniProgram({
-				appId: 'wxa023b292fd19d41d', // 腾讯电子签官方小程序的 appId
-				path: signPath,              // 跳转到的页面路径 + 参数
-				extraData: {},               // 如果需要传额外参数
-				envVersion: 'release',       // 小程序版本 release / trial / develop
-				success(res) {
-					console.log('跳转成功', res)
-				},
-				fail(err) {
-					console.error('跳转失败', err)
-				}
-			})
-		}
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.after-sales-popup {
-
-	.after-sales-title {
-		font-size: 28rpx;
-		color: #71737C;
-		text-align: center;
-		padding: 28rpx 32rpx;
-
-		.close_but {
-			color: #000;
-			font-weight: 800;
-		}
-	}
-
-	.slot-content {
-		width: calc(100% - 64rpx);
-		padding: 0 32rpx;
-
-		.after-sales-tabs {
-			width: calc(100% - 64rpx);
-			height: 80rpx;
-			background: #F5F5F7;
-			border-radius: 8rpx;
-			display: flex;
-			align-items: center;
-			padding: 0 8rpx;
-
-			.after-sales-tabs-item {
-				width: 50%;
-				height: 64rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				font-size: 28rpx;
-				color: #666666;
-
-				.after-sales-tabs-text {
-					width: 36rpx;
-					height: 30rpx;
-					text-align: center;
-					line-height: 30rpx;
-					background: #7934F6;
-					border-radius: 4rpx;
-					font-size: 20rpx;
-					color: #FFFFFF;
-					margin-left: 12rpx;
-				}
-
-				&.active {
-					color: #000000;
-					border-radius: 8rpx;
-					background-color: #fff;
-				}
-			}
-		}
-
-		.content_ {
-			margin-top: 20rpx;
-
-			.content_1,
-			.content_2 {
-				text-align: left;
-				margin-top: 20rpx;
-			}
-
-			.content_3 {
-				width: calc(100% - 32rpx);
-				height: 132rpx;
-				box-shadow: 0px 4rpx 12rpx 0px rgba(215, 215, 215, 0.5);
-				border-radius: 16rpx;
-				box-sizing: border-box;
-			}
-		}
-	}
-
-}
-
-.order_warp {
-	height: calc(100vh - 130rpx);
-	background-color: $app-bj;
-	padding: 100rpx 30rpx 30rpx;
-	overflow-y: hidden;
-	position: relative;
-}
-
-.order_header {
-	display: flex;
-	align-items: center;
-}
-
-.order_type_title {
-	display: flex;
-	margin-top: 30rpx;
-	align-items: center;
-
-	.order_type_title_item {
-		margin-right: 40rpx;
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #222222;
-	}
-
-	.order_type_title_item_sel {
-		font-weight: 800;
-		font-size: 36rpx;
-		color: $app-bt-bj;
-	}
-}
-
-.order_list_warp {
-	// height: calc(100vh - 270rpx);
-	// overflow-y: auto;
-}
-
-.order_item {
-	background: #FFFFFF;
-	border-radius: 20rpx;
-	padding: 30rpx 20rpx;
-	margin-top: 20rpx;
-
-	.order_item_header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.order_product_title {
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #1A1A1A;
-		margin-left: 10rpx;
-	}
-
-	.order_item_header_left {
-		display: flex;
-		align-items: center;
-	}
-
-	.order_item_header_right {
-		font-weight: 500;
-		font-size: 22rpx;
-	}
-
-	.order_right_due {
-		display: flex;
-		background: #FFF9F2;
-		border-radius: 19rpx 22rpx 22rpx 19rpx;
-	}
-
-	.order_right_due_msg {
-		background: $app-bt-bj;
-		border-radius: 22rpx 0rpx 12rpx 22rpx;
-		color: #FFFFFF;
-		padding: 10rpx 20rpx;
-	}
-
-	.order_right_due_time {
-		font-weight: bold;
-		font-size: 24rpx;
-		color: $app-bt-bj;
-		padding: 10rpx 20rpx;
-	}
-
-
-	.order_item_collect {
-		margin-top: 20rpx;
-
-		.collect_msg {
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #666666;
-			text-align: right;
-		}
-
-		.collect_msg_s {
-			display: flex;
-			justify-content: space-between;
-		}
-
-	}
-}
-
-.cancel_show_warp {
-	padding: 20rpx;
-
-	.cancel_show_title_warp {
-		position: relative;
-		font-weight: bold;
-		font-size: 36rpx;
-		color: #222222;
-		line-height: 48rpx;
-		text-align: center;
-	}
-
-	.cancel_show_title_icon {
-		position: absolute;
-		right: 14rpx;
-		top: 6rpx;
-	}
-
-	.cancel_show_msg_warp {
-		background: #F8F8F8;
-		padding: 30rpx;
-		font-weight: 500;
-		font-size: 26rpx;
-		color: #222222;
-		line-height: 48rpx;
-		margin-top: 20rpx;
-	}
-
-	.cancel_show_reason_warp {
-		margin-top: 20rpx;
-
-		.reason_title {
-			font-weight: bold;
-			font-size: 32rpx;
-			color: #222222;
-			line-height: 36rpx;
-			margin-bottom: 20rpx;
-		}
-	}
-}
-
-.but_border_warp {
-	border: 1rpx solid #eeeeee94;
-	margin: 30rpx 0;
-}
-
-.cancel_show_but {
-	display: flex;
-	justify-content: center;
-}
-
-.add_but {
-	position: initial;
-	width: 94%;
-}
-
-.content_info_title {
-	width: 370rpx;
-}
-
-.content_item_yd {
-	font-weight: bold;
-	font-size: 24rpx;
-	display: flex;
-	align-items: center;
-}
-
-.content_item_yd_msg {
-	font-weight: bold;
-	font-size: 18rpx;
-}
-
-.content_2 {
-	font-size: 26rpx;
-	color: rgba(0, 0, 0, 0.4);
-	margin-bottom: 40rpx;
-}
-
-.content_3 {
-	display: flex;
-	background: #FFFFFF;
-	box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0, 0, 0, 0.06);
-	border-radius: 12rpx;
-
-	.content_info {
-		display: grid;
-		margin-left: 20rpx;
-		text-align: left;
-	}
-
-	.content_info_title {
-		font-weight: 600;
-		font-size: 26rpx;
-		color: rgba(0, 0, 0, 0.9);
-		line-height: 38rpx;
-	}
-
-	.content_info_mobile {
-		font-size: 30rpx;
-		color: rgba(0, 0, 0, 0.4);
-		display: flex;
-	}
-}
-
-.but_ {
-	display: flex;
-	justify-content: center;
-	margin-top: 40rpx;
-}
-
-.but_close {
-	background: #F24A00;
-	box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(242, 74, 0, 0.5);
-	border-radius: 41rpx;
-	width: 60%;
-	padding: 20rpx 0;
-	font-size: 30rpx;
-	color: #FFFFFF;
-}
-</style>
+<template>
+  <view class="order_warp">
+    <view class="order_header">
+      <up-image
+        src="/static/common/left.png"
+        width="20"
+        height="20"
+        bgColor="#f1f6ff00"
+        @click="jumpLeft"
+      ></up-image>
+      <up-search
+        shape="round"
+        bgColor="#FFFFFFFF"
+        :showAction="false"
+        @blur="onBlur"
+        @search="searchFun"
+        v-model="search"
+      ></up-search>
+    </view>
+    <view class="order_type_title">
+      <view
+        :class="
+          form.type === item.id
+            ? 'order_type_title_item order_type_title_item_sel'
+            : 'order_type_title_item'
+        "
+        v-for="(item, index) in orderTypeList"
+        @click="checkType(item)"
+        :key="index"
+      >
+        {{ item.title }}
+      </view>
+    </view>
+
+    <scroll-view
+      scroll-y="true"
+      @scrolltolower="loadMore"
+      style="height: calc(100vh - 300rpx)"
+    >
+      <view v-if="orderList && orderList.length !== 0" class="order_list_warp">
+        <view
+          class="order_item"
+          v-for="(item, index) in orderList"
+          :key="item.id"
+        >
+          <!-- 头部 -->
+          <view class="order_item_header">
+            <view class="order_item_header_left">
+              <up-image
+                :src="item.shopLogo"
+                width="22"
+                height="22"
+                bgColor="#f1f6ff00"
+                shape="circle"
+              ></up-image>
+              <view class="order_product_title">{{ item.shopName }}</view>
+            </view>
+            <!-- 除开待付款 -->
+            <view
+              v-if="item.status !== ORDER_TYPE.UNPAID"
+              class="order_item_header_right"
+              :style="{ color: ORDER_STATUS_CSS[item.status] }"
+            >
+              {{ getValue(ORDER_STATUS, item.status) }}
+            </view>
+            <!-- 待付款 -->
+            <view v-else class="order_item_header_right order_right_due">
+              <view class="order_right_due_msg">等待付款</view>
+              <view class="order_right_due_time"
+                >{{ formatDate1(item.expireTime) }}前</view
+              >
+            </view>
+          </view>
+          <!-- 产品详情 -->
+          <view class="order_item_content">
+            <view v-for="pItem in item.items" :key="pItem.id">
+              <view class="content_item" @click="jumpOrderInfo(item)">
+                <up-image
+                  :src="pItem.mainGraph"
+                  width="80"
+                  height="80"
+                  bgColor="#f1f6ff00"
+                ></up-image>
+                <view class="content_info">
+                  <view class="content_info_title">{{ pItem.title }}</view>
+                  <view class="content_info_tag">{{ pItem.goodsSpece }}</view>
+                  <!-- <view>
+										<text class="content_info_description" v-for="dItem in pItem.description">
+											{{dItem}}
+										</text>
+									</view> -->
+                </view>
+                <view class="content_right">
+                  <view class="content_right_total"
+                    >￥{{ pItem.goodsAmount }}</view
+                  >
+                  <view class="content_right_quantity"
+                    >x{{ pItem.buyNum }}</view
+                  >
+                </view>
+              </view>
+              <view class="content_item_yd" v-if="pItem.expressNo">
+                <view>
+                  运单号：
+                  <text v-if="pItem.expressName"
+                    >（{{ pItem.expressName }}）</text
+                  >
+                  {{ pItem.expressNo }}
+                </view>
+                <view style="margin-left: 10rpx">
+                  <up-image
+                    src="/static/common/copy.png"
+                    width="14"
+                    height="14"
+                    bgColor="#f1f6ff00"
+                    @click="copyData(pItem.expressNo)"
+                  ></up-image>
+                </view>
+              </view>
+            </view>
+          </view>
+          <!-- 汇总 -->
+          <view class="order_item_collect">
+            <view
+              class="collect_msg collect_msg_s"
+              v-if="this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE"
+            >
+              <view class="content_item_yd_msg"
+                >(快递动态跟进请复制单号至[快递100官网] 查询)</view
+              >
+              <view>共{{ item.buyNum }}件,合计￥{{ item.sumAmount }}</view>
+            </view>
+            <view class="collect_msg" v-else
+              >共{{ item.buyNum }}件,合计￥{{ item.sumAmount }}</view
+            >
+            <view class="collect_operate">
+              <!-- <view class="operate_comm operate_but_1"  v-if="item.status === ORDER_TYPE.UNSHIPPED" @click="checkCancel(true)">取消订单</view> -->
+              <view
+                class="operate_comm operate_but_2"
+                v-if="item.status === ORDER_TYPE.UNPAID"
+                @click="jumpOrderInfo(item)"
+                >去付款</view
+              >
+              <!-- <view class="operate_comm operate_but_1" v-if="item.status === ORDER_TYPE.COMPLETED">申请退款</view> -->
+
+              <view
+                class="operate_comm operate_but_2"
+                v-if="item.status === ORDER_TYPE.NOT_RECEIVE"
+                @click="confirmReceiptOk(item)"
+                >确认收货</view
+              >
+              <view
+                class="operate_comm operate_but_2"
+                v-if="
+                  !isCheckSigne &&
+                  index == 0 &&
+                  item.status === ORDER_TYPE.SUCCEED
+                "
+                @click="downShow = true"
+                >去签署</view
+              >
+              <!-- <view class="operate_comm operate_but_3" v-if="item.status === ORDER_TYPE.UNSHIPPED">提醒发货</view> -->
+              <view
+                class="operate_comm operate_but_1"
+                v-if="
+                  [ORDER_TYPE.NOT_RECEIVE, ORDER_TYPE.UNSHIPPED].includes(
+                    item.status
+                  )
+                "
+                @click="onSaleAfter(item)"
+              >
+                售后
+              </view>
+              <!-- <view class="operate_comm operate_but_1" v-if="item.status === ORDER_TYPE.AFTER_SALE">查看售后</view> -->
+              <!-- <view class="operate_comm operate_but_1" v-if="[ORDER_TYPE.COMPLETED].includes(item.status)">删除记录</view> -->
+              <!-- <view class="operate_comm operate_but_3" v-if="[ORDER_TYPE.COMPLETED,ORDER_TYPE.CANCELED].includes(item.status)">再次购买</view> -->
+            </view>
+          </view>
+        </view>
+      </view>
+      <view v-else class="not_order_warp">
+        <up-image
+          src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/not_order.png"
+          width="80"
+          height="80"
+          bgColor="#f1f6ff00"
+        ></up-image>
+        <view class="not_order_msg_warp">暂无相关订单</view>
+      </view>
+      <view v-if="loading" style="text-align: center">加载中...</view>
+    </scroll-view>
+
+    <up-toast ref="uToastRef"></up-toast>
+    <!-- 暂未开放 -->
+    <up-modal :show="openShow" :showConfirmButton="false">
+      <view class="slot-content">
+        <view class="close_warp" @click="openShow = false">
+          <up-image
+            src="/static/common/close.png"
+            width="20"
+            height="20"
+            bgColor="#f1f6ff00"
+          ></up-image>
+        </view>
+        <view class="content_">
+          <view class="content_1">温馨提示</view>
+          <view class="content_2">暂未开放</view>
+        </view>
+        <view class="but_">
+          <view class="but_copy" @click="openShow = false">确定</view>
+        </view>
+      </view>
+    </up-modal>
+
+    <!-- 申请售后 -->
+    <up-popup
+      v-model:show="afterShow"
+      class="after-sales-popup"
+      :customStyle="{
+        height: '1000rpx',
+        overflow: 'scroll',
+        position: 'relative',
+        paddingBottom: '80rpx',
+      }"
+      :round="10"
+      :closeOnClickOverlay="false"
+      :closeable="true"
+      :safeAreaInsetBottom="false"
+      @close="afterShow = false"
+    >
+      <view class="after-sales-title">
+        {{
+          salesServer === 1
+            ? "申请售后"
+            : salesServer === 2
+            ? "确认退货/退款信息"
+            : "退货/退款进度"
+        }}
+      </view>
+      <!-- 申请售后 -->
+      <view class="slot-content" v-if="salesServer == 1">
+        <view class="after-sales-tabs">
+          <view
+            :class="['after-sales-tabs-item', { active: activeIndex === 0 }]"
+            @click="activeIndex = 0"
+          >
+            联系售后
+            <text class="after-sales-tabs-text">荐</text>
+          </view>
+          <view
+            :class="['after-sales-tabs-item', { active: activeIndex === 1 }]"
+            @click="activeIndex = 1"
+            >退货退款</view
+          >
+        </view>
+
+        <view class="content_" v-if="activeIndex === 0">
+          <view class="content_1">售后联系方式</view>
+          <view class="content_2">如遇退/换货等问题，请联系客服处理</view>
+          <view class="content_3">
+            <view style="margin-left: 20rpx">
+              <up-image
+                src="/static/common/kf_dh.png"
+                width="40"
+                height="40"
+                bgColor="#f1f6ff00"
+              ></up-image>
+            </view>
+            <view class="content_info">
+              <view class="content_info_title">客服电话</view>
+              <view class="content_info_mobile">
+                {{ PHONE_NUMBER }}
+                <view style="margin-left: 20rpx">
+                  <up-image
+                    src="/static/common/copy_c.png"
+                    width="14"
+                    height="14"
+                    bgColor="#f1f6ff00"
+                    @click="copyMobile(PHONE_NUMBER)"
+                  ></up-image>
+                </view>
+              </view>
+            </view>
+          </view>
+          <view class="content_3">
+            <view style="margin-left: 20rpx">
+              <up-image
+                src="/static/common/kf_wx.png"
+                width="40"
+                height="40"
+                bgColor="#f1f6ff00"
+              ></up-image>
+            </view>
+            <view class="content_info">
+              <view class="content_info_title">客服微信</view>
+              <view class="content_info_mobile">
+                {{ WECHAT }}
+                <view style="margin-left: 20rpx">
+                  <up-image
+                    src="/static/common/copy_c.png"
+                    width="14"
+                    height="14"
+                    bgColor="#f1f6ff00"
+                    @click="copyMobile(WECHAT)"
+                  ></up-image>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <!-- 退货退款 -->
+        <!-- <after-sales v-if="activeIndex === 1" @nextNum="getNextNum" /> -->
+        <view v-if="activeIndex === 1">
+          <view class="cancel_show_warp">
+            <view class="cancel_show_reason_warp">
+              <view class="reason_title">选择退货原因 </view>
+              <up-radio-group
+                v-model="cancelForm.afterReason"
+                placement="column"
+              >
+                <up-radio
+                  :customStyle="{ marginBottom: '8px' }"
+                  v-for="(item, index) in RETURN_REASON"
+                  :key="index"
+                  :label="item.name"
+                  :name="item.id"
+                  activeColor="#7934F6"
+                ></up-radio>
+              </up-radio-group>
+            </view>
+          </view>
+          <view class="cancel_show_but">
+            <view class="cancel_show_button" @click="onNextRefund">下一步</view>
+          </view>
+        </view>
+      </view>
+      <!-- 确认退货退款 -->
+      <view v-if="salesServer == 2">
+        <refund-popup
+          :product="aftterSalesProduct"
+          :cancelForm="cancelForm"
+          @close="onCloseAfterShow"
+        />
+      </view>
+    </up-popup>
+
+    <!-- 腾讯电子签H5 → 集成到UniApp -->
+    <web-view v-if="signUrl" :src="signUrl" @message="handleMessage"></web-view>
+    <u-modal
+      :show="tipsShow"
+      :showCancelButton="true"
+      confirmText="去认证"
+      @cancel="onTipsCancel"
+      @confirm="onConfirm"
+      confirmColor="#7934F6"
+      title="提示"
+      content="签署合同需要进行实名认证，请先完成实名认证"
+    ></u-modal>
+    <DownPopup :show="downShow" @ok="onSignContract" @cancel="onCancel" />
+  </view>
+</template>
+
+<script>
+import {
+  MINE_ORDER_TYPE,
+  ORDER_TYPE,
+  ORDER_STATUS,
+  getValue,
+} from "@/utils/enumUtils.js";
+import { ORDER_STATUS_CSS } from "@/utils/enumCssUtils.js";
+import DownPopup from "@/components/common/down-popup.vue";
+import {
+  getOrderList,
+  confirmReceipt,
+  getSignUrl,
+  signContract,
+  isSignContract,
+  getMiniProgramSignUrl,
+  afterSaleDetail,
+} from "@/api/order.js";
+import dayjs from "dayjs";
+import { formatDate1, copyData } from "@/utils/index.js";
+import { getUserInfo } from "@/api/auth.js";
+import { CUSTOMER_SERVICE_PHONE_NUMBER } from "@/utils/config.js";
+import afterSales from "./after-sales/index";
+import refundPopup from "@/pages/mine_package/mine_order/after-sales/refund-popu.vue";
+import { RETURN_REASON_LIST } from "@/pages/mine_package/mine_order/emun/index.js";
+export default {
+  components: { DownPopup, afterSales, refundPopup },
+
+  computed: {
+    MINE_ORDER_TYPE() {
+      return MINE_ORDER_TYPE;
+    },
+    ORDER_STATUS() {
+      return ORDER_STATUS;
+    },
+    ORDER_STATUS_CSS() {
+      return ORDER_STATUS_CSS;
+    },
+    ORDER_TYPE() {
+      return ORDER_TYPE;
+    },
+    PHONE_NUMBER() {
+      return CUSTOMER_SERVICE_PHONE_NUMBER;
+    },
+    // WECHAT() {
+    // 	return CLOUD_SERVICE_WECHAT;
+    // },
+    RETURN_REASON() {
+      return RETURN_REASON_LIST;
+    },
+  },
+  data() {
+    return {
+      salesServer: 1, //为1展示申请售后 2:选择退货原因 3.退货退款申请
+      orderTypeList: [
+        {
+          id: MINE_ORDER_TYPE.UNPAID,
+          title: "待支付",
+        },
+        {
+          id: MINE_ORDER_TYPE.UNSHIPPED,
+          title: "待发货",
+        },
+        {
+          id: MINE_ORDER_TYPE.NOT_RECEIVE,
+          title: "待收货",
+        },
+        {
+          id: MINE_ORDER_TYPE.SUCCEED,
+          title: "已完成",
+        },
+        // {
+        // 	id:MINE_ORDER_TYPE.AFTER_SALE,
+        // 	title:"售后",
+        // },
+      ],
+      form: {
+        page: 1,
+        pageSize: 10,
+        type: MINE_ORDER_TYPE.UNPAID, // 选中的类型
+      },
+      hasMore: true, // 是否有更多数据可以加载
+      orderList: [],
+      cancelShow: false, // 取消订单
+      cancelForm: {
+        afterReason: null,
+        remark: null,
+      },
+      loading: false, // 加载状态标志
+      openShow: false,
+      afterShow: false, // 售后申请
+      isCheckSigne: false,
+      flowId: null,
+      signUrl: null,
+      downShow: false,
+      selectItem: null,
+      userInfo: null,
+      search: "",
+      activeIndex: 0,
+      aftterSalesProduct: {}, //售后商品信息
+    };
+  },
+  onLoad(options) {
+    const type = options.type;
+    this.form.type =
+      type && type < 5 ? parseInt(type, 10) : MINE_ORDER_TYPE.UNPAID;
+    this.loadData();
+    // 待收货判断是否签署
+    if (
+      this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE ||
+      this.form.type === MINE_ORDER_TYPE.SUCCEED
+    ) {
+      this.checkSigned();
+    }
+    this.userinfo();
+  },
+  methods: {
+    dayjs,
+    getValue,
+    formatDate1,
+    copyData,
+    onNextRefund() {
+      this.salesServer = 2;
+      if (this.aftterSalesProduct.afterType == 0) {
+        this.aftterSalesProduct = {
+          ...this.aftterSalesProduct,
+          ...{ afterReason: this.cancelForm.afterReason },
+        };
+      }
+    },
+    // 售后
+    onSaleAfter(item) {
+      console.log("售后---1", item);
+      // 未售后
+      if (item.afterType == 0) {
+        this.cancelForm.afterReason = "";
+        this.salesServer = 1;
+        this.activeIndex = 0;
+        this.aftterSalesProduct = item;
+        this.afterShow = true;
+      }
+      // 已开始售后
+      if (item.afterType > 0) {
+        this.onAfterSaleDetail(item);
+      }
+    },
+    // 售后订单详情
+    async onAfterSaleDetail(item) {
+      const { bizcode, data } = await afterSaleDetail({ id: item.afterId });
+      if (bizcode == 100) {
+        this.aftterSalesProduct = { ...data, ...{ afterId: item.afterId } };
+        this.salesServer = 2;
+        this.afterShow = true;
+      }
+    },
+    // 关闭售后申请
+    onCloseAfterShow(item) {
+      // 重新发起
+      if (item) {
+        this.salesServer = 1;
+        this.activeIndex = 0;
+        return;
+      }
+      console.log("关闭售后申请");
+      this.form.page = 1;
+      this.orderList = [];
+      this.loadData();
+      this.afterShow = false;
+    },
+
+    onTipsCancel() {
+      this.tipsShow = false;
+    },
+    userinfo() {
+      getUserInfo().then((res) => {
+        if (res.bizcode == 100) {
+          this.userInfo = res.data;
+        }
+        console.log("res", res);
+      });
+    },
+    onCancel() {
+      this.downShow = false;
+    },
+    onConfirm() {
+      this.onTipsCancel();
+      uni.navigateTo({
+        url: "/pages/mine_package/mine_authentication/mine_authentication",
+      });
+    },
+    copyMobile(mobile) {
+      copyData(mobile);
+      this.afterShow = false;
+    },
+
+    jumpLeft() {
+      uni.switchTab({
+        url: "/pages/mine/mine",
+      });
+    },
+    onBlur() {
+      this.loadData();
+    },
+    searchFun(val) {
+      console.log("searchFun", val);
+    },
+    checkType(item) {
+      console.log("checkType---", item);
+      this.form.page = 1;
+      this.form.type = item.id;
+      this.orderList = [];
+      // 待收货判断是否签署
+      if (
+        this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE ||
+        this.form.type === MINE_ORDER_TYPE.SUCCEED
+      ) {
+        this.checkSigned();
+      }
+      if (item.id !== MINE_ORDER_TYPE.AFTER_SALE) {
+        this.loadData();
+      } else {
+        this.openShow = true; // 未开发的弹框
+      }
+    },
+    jumpOrderInfo(item) {
+      uni.navigateTo({
+        url:
+          "/pages/mine_package/mine_order_info/mine_order_info?id=" + item.id,
+      });
+    },
+    // 处理到期时间
+    handleExpressTime(expressTime) {
+      let resultM = 0;
+      if (!expressTime || expressTime === 0) {
+        return resultM;
+      }
+      const currentTimestamp = dayjs().unix();
+      const time = currentTimestamp - expressTime;
+      resultM = dayjs(time).format("YYYY-MM-DD HH:MM:SS"); // 获取时分格式的字符串
+
+      // 如果需要将时分转换为分钟数（例如，'12:34'转换为754分钟），则需要额外计算：
+      // const [hours, minutes] = formattedTime.split(':').map(Number); // 分解小时和分钟为数字
+      // resultM = hours * 60 + minutes; // 计算总分钟数
+      // console.log(resultM); // 输出总分钟数，例如754
+      return resultM;
+    },
+    // 加载数据的方法
+    async loadData() {
+      console.log("加载数据的方法");
+      if (this.loading) return; // 如果正在加载，则不重复加载
+      this.loading = true; // 设置加载状态为true
+      try {
+        // 模拟异步获取数据，实际应用中应该替换为你的数据获取逻辑，例如API调用
+        const newData = await this.fetchData(
+          this.form.page,
+          this.form.pageSize
+        );
+        if (newData.entitys && newData.entitys.length !== 0) {
+          this.orderList = [...this.orderList, ...newData.entitys]; // 将新数据添加到列表中
+          this.form.page++; // 页码加1
+          console.log("this.orderList", this.orderList);
+        }
+      } catch (error) {
+        console.error("加载数据失败:", error);
+      } finally {
+        this.loading = false; // 设置加载状态为false
+      }
+    },
+    // 模拟获取数据的方法，实际应用中应该替换为你的数据获取逻辑，例如从服务器获取数据
+    async fetchData(page, pageSize) {
+      const params = {
+        ...this.form,
+        page,
+        pageSize,
+      };
+      if (this.search) {
+        params["search"] = this.search;
+      }
+      const data = await getOrderList(params);
+      if (data && data.bizcode === 100) {
+        return data.data;
+      } else {
+        return [];
+      }
+    },
+    // 当滚动到底部时触发的方法
+    loadMore() {
+      this.loadData(); // 加载更多数据
+    },
+
+    checkCancel(status) {
+      this.cancelShow = status;
+      if (!status) {
+        this.cancelForm = {
+          reason: null,
+          remark: null,
+        };
+      }
+    },
+
+    /**
+     * 确认收货
+     */
+    confirmReceiptOk(item) {
+      const then = this;
+      uni.showModal({
+        title: "提示",
+        content: "是否确认收货？",
+        success: function (res) {
+          if (res.confirm) {
+            then.confirmReceiptFun(item);
+          }
+        },
+      });
+    },
+    async confirmReceiptFun(item) {
+      const params = {
+        id: item.id,
+      };
+      const resp = await confirmReceipt(params);
+      if (resp && resp.bizcode === 100) {
+        this.orderList = [];
+        this.form.page = 1;
+        this.loadData();
+        if (!this.isCheckSigne) {
+          this.selectItem = item;
+          this.downShow = true;
+          return;
+        }
+      }
+    },
+
+    // 判断是否已经签名
+    async checkSigned() {
+      const { bizcode, data } = await isSignContract();
+      if (bizcode === 100) {
+        this.isCheckSigne = data;
+      }
+    },
+
+    // 发起合同签章
+    async onSignContract() {
+      if (this.userInfo.certStatus == 0) {
+        this.downShow = false;
+        this.tipsShow = true;
+        return;
+      } else if (this.userInfo.certStatus == 1) {
+        this.downShow = false;
+        this.$refs.uToastRef.show({
+          type: "success",
+          message: "请耐心等待审核通过",
+        });
+        return;
+      }
+
+      const { bizcode, data } = await signContract();
+      if (bizcode === 100) {
+        this.flowId = data.flowId;
+
+        if (this.flowId)
+          // #ifdef APP-PLUS || WEB
+          this.onGetSignUrl(this.flowId);
+        // #endif
+
+        // #ifdef MP-WEIXIN
+        // 小程序
+        this.onGetMiniProgramSignUrl(this.flowId);
+        // #endif
+      }
+    },
+
+    // 获取H5签署链接
+    async onGetSignUrl(flowId) {
+      const params = {
+        // 需要的参数
+        flowId: flowId,
+      };
+      const { bizcode, data } = await getSignUrl(params);
+      if (bizcode === 100) {
+        this.downShow = false;
+
+        this.signUrl = data.flowApproverUrlInfos[0].longUrl;
+      } else {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "获取签署链接失败，请稍后再试",
+        });
+        return null;
+      }
+    },
+
+    // 获取跳转至腾讯电子签小程序的签署链接
+    async onGetMiniProgramSignUrl(flowId) {
+      const params = {
+        flowId: flowId,
+        endPoint: "HTTP_SHORT_URL",
+      };
+      const { bizcode, data } = await getMiniProgramSignUrl(params);
+      if (bizcode === 100) {
+        console.log("跳转至腾讯电子签小程序的签署链接", data);
+        this.openTencentESign(data.schemeUrl);
+      } else {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "获取签署链接失败，请稍后再试",
+        });
+        return null;
+      }
+    },
+
+    // 电子签的回调地址
+    handleMessage(e) {
+      const data = e.detail;
+      console.log("电子签的回调地址", e);
+    },
+
+    // 小程序签名
+    openTencentESign(signPath) {
+      // 这个链接需要后端调用腾讯电子签 API 获取
+      uni.navigateToMiniProgram({
+        appId: "wxa023b292fd19d41d", // 腾讯电子签官方小程序的 appId
+        path: signPath, // 跳转到的页面路径 + 参数
+        extraData: {}, // 如果需要传额外参数
+        envVersion: "release", // 小程序版本 release / trial / develop
+        success(res) {
+          console.log("跳转成功", res);
+        },
+        fail(err) {
+          console.error("跳转失败", err);
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.after-sales-popup {
+  height: 400px !important;
+  .after-sales-title {
+    font-size: 28rpx;
+    color: #71737c;
+    text-align: center;
+    padding: 28rpx 32rpx;
+
+    .close_but {
+      color: #000;
+      font-weight: 800;
+    }
+  }
+
+  .slot-content {
+    width: calc(100% - 64rpx);
+    padding: 0 32rpx;
+
+    .after-sales-tabs {
+      width: calc(100% - 64rpx);
+      height: 80rpx;
+      background: #f5f5f7;
+      border-radius: 8rpx;
+      display: flex;
+      align-items: center;
+      padding: 0 8rpx;
+
+      .after-sales-tabs-item {
+        width: 50%;
+        height: 64rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 28rpx;
+        color: #666666;
+
+        .after-sales-tabs-text {
+          width: 36rpx;
+          height: 30rpx;
+          text-align: center;
+          line-height: 30rpx;
+          background: #7934f6;
+          border-radius: 4rpx;
+          font-size: 20rpx;
+          color: #ffffff;
+          margin-left: 12rpx;
+        }
+
+        &.active {
+          color: #000000;
+          border-radius: 8rpx;
+          background-color: #fff;
+        }
+      }
+    }
+
+    .content_ {
+      margin-top: 20rpx;
+
+      .content_1,
+      .content_2 {
+        text-align: left;
+        margin-top: 20rpx;
+      }
+
+      .content_3 {
+        width: calc(100% - 32rpx);
+        height: 132rpx;
+        box-shadow: 0px 4rpx 12rpx 0px rgba(215, 215, 215, 0.5);
+        border-radius: 16rpx;
+        box-sizing: border-box;
+      }
+    }
+  }
+}
+
+.order_warp {
+  height: calc(100vh - 130rpx);
+  background-color: $app-bj;
+  padding: 100rpx 30rpx 30rpx;
+  overflow-y: hidden;
+  position: relative;
+}
+
+.order_header {
+  display: flex;
+  align-items: center;
+}
+
+.order_type_title {
+  display: flex;
+  margin-top: 30rpx;
+  align-items: center;
+
+  .order_type_title_item {
+    margin-right: 40rpx;
+    font-weight: 500;
+    font-size: 30rpx;
+    color: #222222;
+  }
+
+  .order_type_title_item_sel {
+    font-weight: 800;
+    font-size: 36rpx;
+    color: $app-bt-bj;
+  }
+}
+
+.order_list_warp {
+  // height: calc(100vh - 270rpx);
+  // overflow-y: auto;
+}
+
+.order_item {
+  background: #ffffff;
+  border-radius: 20rpx;
+  padding: 30rpx 20rpx;
+  margin-top: 20rpx;
+
+  .order_item_header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .order_product_title {
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #1a1a1a;
+    margin-left: 10rpx;
+  }
+
+  .order_item_header_left {
+    display: flex;
+    align-items: center;
+  }
+
+  .order_item_header_right {
+    font-weight: 500;
+    font-size: 22rpx;
+  }
+
+  .order_right_due {
+    display: flex;
+    background: #fff9f2;
+    border-radius: 19rpx 22rpx 22rpx 19rpx;
+  }
+
+  .order_right_due_msg {
+    background: $app-bt-bj;
+    border-radius: 22rpx 0rpx 12rpx 22rpx;
+    color: #ffffff;
+    padding: 10rpx 20rpx;
+  }
+
+  .order_right_due_time {
+    font-weight: bold;
+    font-size: 24rpx;
+    color: $app-bt-bj;
+    padding: 10rpx 20rpx;
+  }
+
+  .order_item_collect {
+    margin-top: 20rpx;
+
+    .collect_msg {
+      font-weight: 500;
+      font-size: 24rpx;
+      color: #666666;
+      text-align: right;
+    }
+
+    .collect_msg_s {
+      display: flex;
+      justify-content: space-between;
+    }
+  }
+}
+
+.cancel_show_warp {
+  padding: 20rpx;
+
+  .cancel_show_title_warp {
+    position: relative;
+    font-weight: bold;
+    font-size: 36rpx;
+    color: #222222;
+    line-height: 48rpx;
+    text-align: center;
+  }
+
+  .cancel_show_title_icon {
+    position: absolute;
+    right: 14rpx;
+    top: 6rpx;
+  }
+
+  .cancel_show_msg_warp {
+    background: #f8f8f8;
+    padding: 30rpx;
+    font-weight: 500;
+    font-size: 26rpx;
+    color: #222222;
+    line-height: 48rpx;
+    margin-top: 20rpx;
+  }
+
+  .cancel_show_reason_warp {
+    margin-top: 20rpx;
+
+    .reason_title {
+      font-weight: bold;
+      font-size: 32rpx;
+      color: #222222;
+      line-height: 36rpx;
+      margin-bottom: 20rpx;
+    }
+  }
+}
+
+.but_border_warp {
+  border: 1rpx solid #eeeeee94;
+  margin: 30rpx 0;
+}
+
+.cancel_show_but {
+  display: flex;
+  justify-content: center;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 98rpx;
+  background: transparent;
+  z-index: 100;
+  box-shadow: 0rpx -4rpx 12rpx 0rpx rgba(0, 0, 0, 0.06);
+  .cancel_show_button {
+    position: initial;
+    width: 94%;
+    background: linear-gradient(270deg, #b164fb 0%, #7934f6 100%);
+    border-radius: 8rpx;
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: bold;
+    font-size: 28rpx;
+    color: #ffffff;
+  }
+}
+
+.content_info_title {
+  width: 370rpx;
+}
+
+.content_item_yd {
+  font-weight: bold;
+  font-size: 24rpx;
+  display: flex;
+  align-items: center;
+}
+
+.content_item_yd_msg {
+  font-weight: bold;
+  font-size: 18rpx;
+}
+
+.content_2 {
+  font-size: 26rpx;
+  color: rgba(0, 0, 0, 0.4);
+  margin-bottom: 40rpx;
+}
+
+.content_3 {
+  display: flex;
+  background: #ffffff;
+  box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0, 0, 0, 0.06);
+  border-radius: 12rpx;
+
+  .content_info {
+    display: grid;
+    margin-left: 20rpx;
+    text-align: left;
+  }
+
+  .content_info_title {
+    font-weight: 600;
+    font-size: 26rpx;
+    color: rgba(0, 0, 0, 0.9);
+    line-height: 38rpx;
+  }
+
+  .content_info_mobile {
+    font-size: 30rpx;
+    color: rgba(0, 0, 0, 0.4);
+    display: flex;
+  }
+}
+
+.but_ {
+  display: flex;
+  justify-content: center;
+  margin-top: 40rpx;
+}
+
+.but_close {
+  background: #f24a00;
+  box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(242, 74, 0, 0.5);
+  border-radius: 41rpx;
+  width: 60%;
+  padding: 20rpx 0;
+  font-size: 30rpx;
+  color: #ffffff;
+}
+</style>
diff --git a/pages/rwa_package/dongjian/check.vue b/pages/rwa_package/dongjian/check.vue
index e4383d7..149c969 100644
--- a/pages/rwa_package/dongjian/check.vue
+++ b/pages/rwa_package/dongjian/check.vue
@@ -97,7 +97,7 @@ export default {
 					// this.dataList[2].value = this.obj.flowId;
 
 					this.dataList[0].value = this.obj.state ? '已签署' : '未签署';
-					this.dataList[1].value = this.obj.flowid;
+					this.dataList[1].value = this.obj.flowId;
 					this.dataList[3].value = this.obj.details.startTime;
 					this.dataList[4].value = this.obj.details.endTime;
 					this.bottomList[0].value = this.obj.signatureName;
@@ -207,8 +207,8 @@ export default {
 				flex-direction: column;
 
 				.list-right {
-					width: 238rpx;
-					margin-left: 40rpx;
+					width: 255rpx;
+					margin-left: 25rpx;
 					word-break: break-all;
 					display: flex;
 				}
diff --git a/utils/request.js b/utils/request.js
index c0445f3..867215b 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -87,7 +87,7 @@ function request(options) {
 					}
 				} else {
 					uni.showToast({
-						title: data.msg,
+						title: data.msg || "系统错误，请稍后再试",
 						icon: 'none', // 可选 success/loading/none
 						duration: 2000, // 持续时长，单位ms
 					});

From bfc24592199e23c8cc4f53f6cbb2754214fedacd Mon Sep 17 00:00:00 2001
From: dongjian <315328220@qq.com>
Date: Sat, 30 Aug 2025 20:03:57 +0800
Subject: [PATCH 6/6] no message

---
 api/auth.js                                   |  13 ++
 components/common_card.vue                    |  16 +-
 manifest.json                                 |  17 +-
 pages.json                                    |   5 +
 pages/login_package/login/forgotPass.vue      | 174 ++++++++++++++++++
 pages/login_package/login/login.vue           |   6 +
 pages/mine/mine.vue                           |   7 +-
 .../mine_authentication.vue                   |  48 ++++-
 utils/config.js                               |   6 +-
 utils/enumUtils.js                            |   9 +-
 10 files changed, 282 insertions(+), 19 deletions(-)
 create mode 100644 pages/login_package/login/forgotPass.vue

diff --git a/api/auth.js b/api/auth.js
index 498d369..8fa9009 100644
--- a/api/auth.js
+++ b/api/auth.js
@@ -27,6 +27,19 @@ export function register(params) {
 	});
 }
 
+/**
+ * 注册
+ * @param {Object} params
+ */
+export function forgotPassword(params) {
+	// params.appId = APPID;
+	return request({
+		url: "/user/forgotPassword",
+		method: "post",
+		data: params,
+	});
+}
+
 /**
  * 密码登录
  * @param {Object} params
diff --git a/components/common_card.vue b/components/common_card.vue
index 246b3af..b686efd 100644
--- a/components/common_card.vue
+++ b/components/common_card.vue
@@ -41,6 +41,7 @@ import { getStorageFun, TOKEN_NAME } from '@/utils/auth.js';
 
 export default {
 	name: "common_card",
+	props:['Fimg','Bimg'],
 	data() {
 		return {
 			uploadTemplList: [
@@ -70,12 +71,25 @@ export default {
 			fileListF: {},// 身份反面照片
 		};
 	},
+	watch:{
+		Fimg(p,r){
+			if(p){
+				this.fileListZ = {accessUrl:p};
+			}
+		},
+		Bimg(p,r){
+			if(p){
+				this.fileListF = {accessUrl:p};
+			}
+		},
+	},
 	methods: {
 		deletePic(event) {
 			this.fileListZ.splice(event.index, 1);
 		},
 		phoneFun(type) {
 			let that = this;
+			console.log('aaaaaaa')
 			/*#ifdef MP*/
 			uni.chooseMedia({
 				count: 1, // 默认为1，摄像头拍照为1，录像为10，录音为1
@@ -93,7 +107,7 @@ export default {
 				}
 			});
 			/*#endif*/
-			/*#ifdef APP-PLUS*/
+			/*#ifndef MP*/
 			uni.chooseImage({
 				count: 1, // 默认9，设置图片的数量
 				sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
diff --git a/manifest.json b/manifest.json
index eedfbbc..971d435 100644
--- a/manifest.json
+++ b/manifest.json
@@ -139,5 +139,20 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "3"
+    "vueVersion" : "3",
+	"h5": {
+	    "devServer": {
+	        "disableHostCheck": true, // 禁止访问本地host文件
+	        "port": 8085, // 修改项目端口
+	        "proxy": {
+	            "/api": { // 配置服务器路径
+	                "target": "http://api.outer.tbmall.xin:6880", // 目标服务器
+	                "changeOrigin": true, // 重写路径
+	                "pathRewrite": {
+	                    "^/api": "" // 将/api替换为空
+	                }
+	            }
+	        }
+	    }
+	}
 }
diff --git a/pages.json b/pages.json
index 2c2f7e8..027619f 100644
--- a/pages.json
+++ b/pages.json
@@ -339,6 +339,11 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		}, {
+			"path": "login/forgotPass",
+			"style": {
+				"navigationStyle": "custom"
+			}
 		}, {
 			"path": "register/register",
 			"style": {
diff --git a/pages/login_package/login/forgotPass.vue b/pages/login_package/login/forgotPass.vue
new file mode 100644
index 0000000..b8d052c
--- /dev/null
+++ b/pages/login_package/login/forgotPass.vue
@@ -0,0 +1,174 @@
+<template>
+	<view class="content">
+		<TopSafe></TopSafe>
+		<Header title="忘记密码" />
+		<view class="contract-view">
+			<view class="input-view">
+				<up-input placeholder="请输入手机号" border="surround" v-model="form.mobile" :customStyle="inputCss"></up-input>
+			</view>
+			<view class="input-view">
+				<up-input placeholder="请输入验证码" border="surround" v-model="form.smsCode" :customStyle="inputCss">
+					<template #suffix style="margin-right: 10rpx;">
+						<view v-if="countdown" class="code-warp">
+							<up-count-down :time="60 * 1000" format="ss" @finish="countdown = false"></up-count-down>
+							<text style="margin-left: 10rpx;">s</text>
+						</view>
+						<view v-else @click="getMobileCode" class="code_msg">
+							获取验证码
+						</view>
+					</template>
+				</up-input>
+			</view>
+			<view class="input-view">
+				<up-input placeholder="请输入登录密码" border="surround" v-model="form.pass" :customStyle="inputCss"
+					:type="loginPasswordIsShow ? 'text' : 'password'">
+					<template #suffix style="margin-right: 10rpx;">
+						<up-image v-if="loginPasswordIsShow" src="/static/login/show.png" width="20" height="20" bgColor="#f1f6ff00"
+							@click="loginPasswordIsShow = false;"></up-image>
+						<up-image v-else src="/static/login/hidden.png" width="20" height="20" bgColor="#f1f6ff00"
+							@click="loginPasswordIsShow = true;"></up-image>
+					</template>
+				</up-input>
+			</view>
+			<view class="input-view">
+				<up-input placeholder="请输入登录密码" border="surround" v-model="form.passOne" :customStyle="inputCss"
+					:type="loginPassword2IsShow ? 'text' : 'password'">
+					<template #suffix style="margin-right: 10rpx;">
+						<up-image v-if="loginPassword2IsShow" src="/static/login/show.png" width="20" height="20" bgColor="#f1f6ff00"
+							@click="loginPassword2IsShow = false;"></up-image>
+						<up-image v-else src="/static/login/hidden.png" width="20" height="20" bgColor="#f1f6ff00"
+							@click="loginPassword2IsShow = true;"></up-image>
+					</template>
+				</up-input>
+			</view>
+			<view class="login_comm_but login_comm_but_yes" style="margin-top:48rpx" @click="registerFun" >
+				确认修改
+			</view>
+		</view>
+		
+		<up-toast ref="uToastRef"></up-toast>
+	</view>
+</template>
+
+<script>
+import { getUserList } from '@/api/common.js';
+import { forgotPassword } from '@/api/auth.js';
+import Header from '@/components/common/header.vue';
+import TopSafe from '@/components/common/top-safe.nvue'
+import CryptoJS from 'crypto-js';
+
+export default {
+	components: { Header, TopSafe },
+	data() {
+		return {
+			form:{
+				mobile:'',
+				smsCode:'',
+				pass:'',
+				passOne:''
+				
+			},
+			loginPasswordIsShow:false,
+			loginPassword2IsShow:false,
+			countdown: false,// 清空倒计时
+			inputCss: {
+				"height": '80rpx',
+				"background": "#F3F3F3FF",
+				"border-radius": "30rpx",
+				"border": "0rpx",
+				"padding-left": "16px",
+			},
+		};
+	},
+	onShow() {
+	},
+	onLoad() {
+	},
+	methods: {
+		async getMobileCode() {
+			const form = this.form;
+			if (!form.mobile) {
+				this.$refs.uToastRef.show({
+					type: 'error',
+					message: "请输入手机号码",
+				});
+				return;
+			}
+			this.countdown = true;
+		
+			const params = {
+				mobile: form.mobile,
+				type: 'passwd',
+			}
+			const response = await getUserList(params);
+			if (response && response.bizcode === 100) {
+				this.$refs.uToastRef.show({
+					type: 'success',
+					message: response.msg,
+				});
+			} else {
+				this.countdown = false;
+			}
+		},
+		registerFun(){
+			if (!this.form.mobile) {
+				this.$refs.uToastRef.show({
+					type: 'error',
+					message: "请输入手机号码",
+				});
+				return;
+			}
+			if (!this.form.smsCode) {
+				this.$refs.uToastRef.show({
+					type: 'error',
+					message: "请输入验证码",
+				});
+				return;
+			}
+			if (!this.form.pass || !this.form.passOne) {
+				this.$refs.uToastRef.show({
+					type: 'error',
+					message: "请输入密码",
+				});
+				return;
+			}
+			if (this.form.pass !== this.form.passOne) {
+				this.$refs.uToastRef.show({
+					type: 'error',
+					message: "两次输入的登录密码不一致",
+				});
+				return;
+			}
+			let params = {
+				verificationCode:this.form.smsCode,
+				newPassword:CryptoJS.MD5(this.form.pass).toString()
+			}
+			forgotPassword(params).then(res=>{
+				console.log('params',res)
+			})
+		},
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.contract-view {
+	width: 100%;
+	height: calc(100% - 88rpx - var(--status-bar-height));
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	overflow-y: auto;
+	padding: 0 32rpx;
+	box-sizing: border-box;
+	background-color: #fff;
+	.input-view{
+		width:100%;
+		height:100rpx;
+		background-color: #f3f3f3;
+		border-radius: 16rpx;
+		margin-top:48rpx;
+
+	}
+}
+</style>
diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue
index b1294e7..629e306 100644
--- a/pages/login_package/login/login.vue
+++ b/pages/login_package/login/login.vue
@@ -46,6 +46,7 @@
 			<view class="cut_way_warp">
 				<view v-if="loginWay === 'password'" @click="loginWay = 'code'">验证码登录</view>
 				<view v-if="loginWay === 'code'" @click="loginWay = 'password'">密码登录登录</view>
+				<!-- <view @click="jumpForgot">忘记密码</view> -->
 				<view @click="jumpRegister">注册</view>
 			</view>
 		</view>
@@ -193,6 +194,11 @@ export default {
 				this.countdown = false;
 			}
 		},
+		jumpForgot(){
+			uni.navigateTo({
+				url: "/pages/login_package/login/forgotPass",
+			})
+		},
 		jumpRegister() {
 			uni.navigateTo({
 				url: "/pages/login_package/register/register",
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 262f39d..f20f964 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -375,10 +375,11 @@ export default {
 				this.serviceShow = true;
 			} else if (item.id === 9) {// 实名认证
 				const currentUserData = this.currentUserData;
+				console.log('currentUserData',this.currentUserData)
 				let path = "/pages/mine_package/mine_authentication/mine_authentication"
-				if (currentUserData && Object.keys(currentUserData).length !== 0 && currentUserData.certStatus && currentUserData.certStatus !== 0) {
-					path = "/pages/mine_package/mine_authentication_ok/mine_authentication_ok"
-				}
+				// if (currentUserData && Object.keys(currentUserData).length !== 0 && currentUserData.certStatus && currentUserData.certStatus !== 0) {
+				// 	path = "/pages/mine_package/mine_authentication_ok/mine_authentication_ok"
+				// }
 				uni.navigateTo({
 					url: path,
 				})
diff --git a/pages/mine_package/mine_authentication/mine_authentication.vue b/pages/mine_package/mine_authentication/mine_authentication.vue
index a28c470..f42db43 100644
--- a/pages/mine_package/mine_authentication/mine_authentication.vue
+++ b/pages/mine_package/mine_authentication/mine_authentication.vue
@@ -18,7 +18,7 @@
 			</view>
 		</view>
 		<!-- 证件照 -->
-		<CommonCard @valueFunc="getValue" />
+		<CommonCard @valueFunc="getValue" :Fimg="form.certFimg" :Bimg="form.certBimg" />
 		<view class="add_but" @click="addAuthentication">
 			提交
 		</view>
@@ -31,7 +31,7 @@
 <script>
 import CommonCard from '@/components/common_card.vue';
 import Header from '@/components/header.vue';
-import { realNameAuthentication } from '@/api/auth.js';
+import { realNameAuthentication,getUserInfo } from '@/api/auth.js';
 import { CERT_OPTION } from '@/utils/enumUtils.js';
 
 export default {
@@ -96,10 +96,34 @@ export default {
 			],
 			certShow: false,
 			certOption: [],
+			userInfo:null
 
 		}
 	},
+	onLoad(){
+		this.init();
+	},
 	methods: {
+		init(){
+			this.getUserInfo();
+		},
+		async getUserInfo() {
+			const result = await getUserInfo();
+			if (result && result.bizcode === 100) {
+				const data = result.data;
+				this.userInfo = result.data || {};
+				
+				this.form = {
+					name:this.userInfo.name,
+					certNo:this.userInfo.certNo,
+					certType:this.userInfo.certType,
+					certName: this.userInfo.certType == 1?'居民身份证' : '护照',
+					certFimg:this.userInfo.certFimg,
+					certBimg:this.userInfo.certBimg,
+				} 
+				
+			}
+		},
 		async addAuthentication() {
 			const params = {
 				...this.form
@@ -111,6 +135,7 @@ export default {
 				});
 				return;
 			}
+			
 			if (!params.certType) {
 				this.$refs.uToastRef.show({
 					type: 'error',
@@ -125,6 +150,13 @@ export default {
 				});
 				return;
 			}
+			if(!/(^\d{15}$)|(^\d{17}(\d|X|x)$)/.test(params.certNo)){
+				this.$refs.uToastRef.show({
+					type: 'error',
+					message: "请输入正确的证件号码",
+				});
+				return;
+			}
 			if (params.certFimg.length === 0) {
 				this.$refs.uToastRef.show({
 					type: 'error',
@@ -140,12 +172,12 @@ export default {
 				return;
 			}
 			console.log("params", params);
-			const resp = await realNameAuthentication(params);
-			if (resp && resp.bizcode === 100) {
-				uni.navigateTo({
-					url: '/pages/mine_package/mine_authentication_ok/mine_authentication_ok',
-				})
-			}
+			// const resp = await realNameAuthentication(params);
+			// if (resp && resp.bizcode === 100) {
+			// 	uni.navigateTo({
+			// 		url: '/pages/mine_package/mine_authentication_ok/mine_authentication_ok',
+			// 	})
+			// }
 		},
 		// 提交地址
 		certConfirm(e) {
diff --git a/utils/config.js b/utils/config.js
index 5c9e92a..3772f06 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -2,8 +2,10 @@
 // export const BASE_URL="https://frontend.jdns360.com/api"; // 正式环境
 // export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
 
-export const BASE_URL = "https://api.tbmall.xin"; //生产
-// export const BASE_URL ='http://api.hm.a-d.work' // 测试
+// export const BASE_URL = "https://api.tbmall.xin"; //生产
+// export const BASE_URL ='http://api.hm.a-d.work:6880/api' // 测试
+export const BASE_URL ='http://api.outer.tbmall.xin:6880' // 测试
+
 
 
 
diff --git a/utils/enumUtils.js b/utils/enumUtils.js
index 17496c7..6f6304c 100644
--- a/utils/enumUtils.js
+++ b/utils/enumUtils.js
@@ -267,10 +267,11 @@ export const CERT_OPTION = [
 	{
 		key: 1,
 		value: "居民身份证"
-	}, {
-		key: 2,
-		value: "护照"
-	},
+	}
+	// , {
+	// 	key: 2,
+	// 	value: "护照"
+	// },
 ]
 
 /**