解决冲突

commont/messages.js

@@ -151,7 +151,77 @@ export default {
 			Addlist: '添加到包裹列表',
 			Addparcel: '添加包裹',
 			Packlist: '拼包列表',
-			classification:'商品分类'
+			classification:'商品分类',
+			password:'修改密码/手机号',
+			switch:'切换语言',
+			user:"用户协议",
+			privacy:"隐私政策",
+			platform:"平台规则",
+			merchant:"商户入驻申请协议",
+			layout:"退出登录",
+			setup:"账号设置",
+			information:"个人信息",
+			headerImg:"头像",
+			nickname:"昵称",
+			prompt:"限4-24个字符（1汉字=2字符，1英文活数字=1字符）",
+			editNextname:'编辑昵称',
+			inland:"中国内地",
+			international:"国际",
+			initial:"默认地址",
+			edit:"编辑",
+			delete:"删除",
+			wx:"微信导入",
+			add:"新增地址",
+			contacts:"联系人信息",
+			wxAddress:"微信地址薄",
+			newAddress:"新建地址",
+			name:"姓名",
+			phone:"手机号",
+			city:"省市区",
+			detailed:"详细地址",
+			goods:"请填写收货人信息",
+			pleasePhoneNumber:"请填写收货人手机号",
+			township:"省市区县、乡镇等",
+			sect:"请输入详细地址精确到门牌号",
+			company:"公司名称（选填）",
+			preserve:"保存",
+			empty:"清空",
+			country:"国家",
+			postalCode:"邮编",
+			email:"电子邮箱",
+			companyName:"公司名称",
+			selection:"请选择",
+			PleacePostalCode:"请输入邮编",
+			addressBook:"保存到地址薄",
+			pleaseEmail:"请输入电子邮箱（选填）",
+			editPassword:"修改登录密码",
+			editPhone:"修改手机号",
+			accountCancellation:"账号注销",
+			setPassword:"设置密码",
+			cancellation:"注销后无法恢复，请谨慎操作",
+			myDeposit:"我的保证金",
+			balance:"余额",
+			mineFollow:"我的关注",
+			myPackage:"我的包裹",
+			mallOrders:"商城订单",
+			whole:"全部",
+			pendingPayment:"待付款",
+			joiningGroups:"拼团中",
+			toBeShipped:"待发货",
+			toBeReceived:"待收货",
+			refund:"退款/售后",
+			leaderunction:"团长功能",
+			platform:"平台商品库",
+			productManagement:"商品管理",
+			orderManagement:"订单管理",
+			afterSales:"售后管理",
+			supplyChain:"供应链商品",
+			PCEnd:"PC端",
+			pontact:"联系客服",
+			accountSettings:"账号设置",
+			accountBalance:"账户余额",
+			myBalance:"我的余额",
+			withdrawal:"提现",
 		}
 	},
 	"en-US": {
@@ -623,7 +693,76 @@ export default {
 			Addlist: 'Aggiunta all’elenco dei colli',
 			Addparcel: 'Aggiunta di pacchi',
 			Packlist: 'Elenco degli statuti',
-			classification:'Classificazione delle merci'
+			classification:'Classificazione delle merci',
+			password:'Change password/Phone Number',
+			switch:'Switch Language',
+			user:"User Agreement",
+			privacy:"Privacy Policy",
+			platform:"Platform rules",
+			merchant:"Merchant Entry Application Agreement",
+			layout:"Log out and log in",
+			setup:"Account Settings",
+			information:"Personal Information",
+			headerImg:"Avatar",
+			nickname:"Nickname",
+			prompt:"Limited to 4-24 characters (1 Chinese character=2 characters, 1 English live number=1 character)",
+			editNextname:'Edit Nickname',
+			inland:"Mainland China",
+			international:"International",
+			initial:"Default Address",
+			edit:'Edit',
+			delete:"Delete",
+			wx:"WeChat import",
+			add:"Add Address",
+			contacts:"Contact Information ",
+			wxAddress:"WeChat Address Book",
+			newAddress:"New Address",
+			name:"Name",
+			phone:"Mobile phone number",
+			city:"Provinces, cities, and districts",
+			detailed:"Detailed address",
+			goods:"Please fill in the recipient information",
+			pleasePhoneNumber:"Please fill in the recipient's mobile phone number",
+			township:"Provinces, cities, counties, townships, etc",
+			sect:"Please enter a detailed address accurate to the house number",
+			company:"Company name (optional)",
+			preserve:"Preserve",
+			empty:"Empty",
+			country:"Country",
+			postalCode:"Postal code",
+			email:"E-mail",
+			companyName:"Company Name",
+			selection:"Please Select",
+			PleacePostalCode:"Please enter your postal code",
+			addressBook:"Save to Address Book",
+			pleaseEmail:"Please enter your email address (optional)",
+			cancellation:"Unable to recover after logging out, please operate with caution",
+			editPassword:"Change login password",
+			editPhone:"Change phone number",
+			accountCancellation:"Account Cancellation",
+			setPassword:"Set password",
+			myDeposit:"My deposit",
+			balance:"Balance",
+			mineFollow:"My following",
+			myPackage:"My Package",
+			mallOrders:"Mall orders",
+			whole:"Whole",
+			pendingPayment:"Pending payment",
+			joiningGroups:"Joining groups",
+			toBeShipped:"To be shipped",
+			toBeReceived:"To be received",
+			refund:"Refund/After sales",
+			leaderunction:"Leader function",
+			platform:"Platform product library",
+			productManagement:"Product Management",
+			orderManagement:"order management",
+			afterSales:"After sales",
+			supplyChain:"Supply chain goods",
+			PCEnd:"PC end",
+			pontact:"Contact customer service",
+			accountSettings:"Account Settings",
+			accountBalance:"Account Balance",
+			myBalance:"My Balance",
 		}
 	}
 }

pageC/accountBalance/accountBalance.vue

@@ -7,11 +7,11 @@
 
 		<view class="mine-balance">
 			<view class="title">
-				我的余额（元）
+				{{i18n.myBalance}}（元）
 			</view>
 			<view class="money"> 500.00 </view>
 			<view class="btn-list">
-				<button class="withdrawal" @click="toWithdrawal">提现</button>
+				<button class="withdrawal" @click="toWithdrawal">{{i18n.withdrawal}}</button>
 				<button class="recharge" @click="toRecharge">充值</button>
 			</view>
 		</view>
@@ -58,11 +58,19 @@
 				]
 			};
 		},
+		computed:{
+			i18n(){
+				return this.$t("index")
+			}
+		},
 		created() {
 			uni.setNavigationBarColor({
 				frontColor: '#ffffff',
 				backgroundColor: '#f74639'
 			})
+			uni.setNavigationBarTitle({
+				title:this.i18n.accountBalance
+			})
 		},
 		methods: {
 			//跳转明细页面

pageC/orderForm/component/refundCard.vue

@@ -0,0 +1,229 @@
+<template>
+	<view class="detail" @click="$emit('toDetail')">
+		<view class="title">
+			<view class="title-left">
+				<image class="header-img"
+					src="https://tse4-mm.cn.bing.net/th/id/OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA?rs=1&pid=ImgDetMain"
+					mode=""></image>
+				<text>张三</text>
+				<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
+			</view>
+			<text class="order-status" v-if="refundDetail.status == 1">退款中</text>
+			<text class="order-status" v-if="refundDetail.status == 2">退款成功</text>
+			<text class="order-status" v-if="refundDetail.status == 3">拒绝退款</text>
+		</view>
+		<view class="commodity-information">
+			<view class="commodity-1">
+				<image class="commodity-img"
+					src="https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/156939/24/43697/126104/6619de23F69802006/8432635baed61875.jpg.webp"
+					mode=""></image>
+				<view class="information-right">
+					<view class="commodity-2">
+						<view class="commodity-title">
+							OATLY 噢麦力 醇香燕麦奶植物蛋白
+						</view>
+					</view>
+
+					<view class="commodity-3">
+						<view class="specifications">
+							【醇香】250ml*3
+						</view>
+					</view>
+					<view class="commodity-price">
+						<text style="color: #222;font-size: 26rpx;">退款</text>
+						<text style="font-size: 20rpx;">￥</text>
+						<text>133</text>.
+						<text style="font-size: 20rpx;">22</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="result" v-if="refundDetail.status == 1">
+			<view class="result-left">
+				申请中
+			</view>
+			<view class="result-right">
+				等待卖家同意退款
+			</view>
+		</view>
+		<view class="result" v-if="refundDetail.status == 2">
+			<view class="result-left">
+				退款成功
+			</view>
+			<view class="result-right">
+				退款成功¥29.90
+			</view>
+		</view>
+		<view class="result" v-if="refundDetail.status == 3">
+			<view class="result-left">
+				退款失败
+			</view>
+			<view class="result-right">
+				卖家拒绝退款
+			</view>
+		</view>
+		<view class="btn-list">
+			<button class="status-1">删除记录</button><button class="status-2" @click="$emit('toRefundDetail')">售后详情</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			refundDetail:{
+				typeof:Object,
+				default:{}
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.detail {
+		padding: 28rpx 20rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-top: 28rpx;
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+
+			.title-left {
+				display: flex;
+				font-size: 32rpx;
+				align-items: center;
+
+				.header-img {
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+
+				.right-325 {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+
+			.order-status {
+				color: #f83224;
+				font-size: 26rpx;
+			}
+		}
+
+		.commodity-information {
+			margin-top: 28rpx;
+
+			.information-right {
+				width: 70%;
+			}
+
+			.commodity-1 {
+				display: flex;
+
+				.commodity-img {
+					width: 180rpx;
+					height: 180rpx;
+					margin-right: 20rpx;
+					border-radius: 10rpx;
+				}
+
+				.commodity-2 {
+					display: flex;
+					justify-content: space-between;
+
+					.commodity-title {
+						width: 100%;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						margin-right: 38rpx;
+					}
+				}
+
+				.commodity-3 {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 20rpx;
+					color: #777;
+
+					.specifications {
+						font-size: 28rpx;
+						color: #777;
+					}
+				}
+
+				.commodity-price {
+					margin-top: 40rpx;
+				}
+			}
+		}
+
+		.price {
+			display: flex;
+			justify-content: flex-end;
+			font-size: 28rpx;
+			align-items: flex-end;
+		}
+
+		.result {
+			background-color: #f4f4f4;
+			border-radius: 16rpx;
+			height: 76rpx;
+			display: flex;
+			align-items: center;
+			margin-top: 20rpx;
+			padding-left: 24rpx;
+
+			.result-left {
+				margin-right: 32rpx;
+				color: #222;
+				font-size: 28rpx;
+			}
+
+			.result-right {
+				color: #333;
+				font-size: 28rpx;
+			}
+		}
+
+		.btn-list {
+			display: flex;
+			justify-content: flex-end;
+			margin-top: 34rpx;
+
+			.status-1 {
+				background-color: #fff;
+				border-radius: 34rpx;
+				margin: 0;
+				padding: 0;
+				font-size: 28rpx;
+				color: #222;
+				width: 168rpx;
+				height: 68rpx;
+				margin-right: 20rpx;
+				border: 2rpx solid #979797;
+			}
+
+			.status-2 {
+				background-color: #ffffff;
+				border-radius: 34rpx;
+				margin: 0;
+				padding: 0;
+				font-size: 28rpx;
+				color: #f83224;
+				width: 168rpx;
+				height: 68rpx;
+				border: 2rpx solid #f83224;
+			}
+		}
+	}
+</style>

pageC/orderForm/orderForm.vue

@@ -31,20 +31,32 @@
 					退款/售后
 				</view>
 			</view>
-			<OrderInofrmation @toDetail="toDetail" />
+			<view v-if="follow!=7">
+				<OrderInofrmation @toDetail="toDetail" />
+			</view>
+			<view v-else>
+				<RefundCard :refundDetail="refundDetail" @toRefundDetail="toRefundDetail" />
+			</view>
+
 		</view>
 	</view>
 </template>
 
 <script>
 	import OrderInofrmation from './component/orderInofrmation.vue'
+	import RefundCard from './component/refundCard.vue'
 	export default {
 		components: {
-			OrderInofrmation
+			OrderInofrmation,
+			RefundCard
+
 		},
 		data() {
 			return {
-				follow: 1
+				follow: 7,
+				refundDetail: {
+					status: 1
+				}
 			}
 		},
 		computed: {
@@ -64,6 +76,11 @@
 					url: "/pageC/orderFormDetail/orderFormDetail"
 				})
 			},
+			toRefundDetail() {
+				uni.navigateTo({
+					url: "/pageC/refundDetail/refundDetail"
+				})
+			}
 		},
 		mounted() {
 

pageC/refundDetail/component/moneyDestination.vue

@@ -0,0 +1,99 @@
+<template>
+	<view class="">
+		<u-popup :show="show" @close="$emit('close')" round="16rpx" @open="open" closeable closeOnClickOverlay>
+			<view class="title">
+				钱款去向
+			</view>
+			<view class="radio-list">
+				<view class="refund">
+					<view class="money">
+						退款金额
+					</view>
+					<view class="commodity-price" style="color: #f83224;">
+						<text style="font-size: 20rpx;">￥</text>
+						<text>133</text>.
+						<text style="font-size: 20rpx;">22</text>
+					</view>
+				</view>
+				<view class="refund">
+					<view class="money">
+						退款账户
+					</view>
+					<view class="commodity-price" style="color: #222;">
+						微信余额
+					</view>
+				</view>
+				<u-steps direction="column" dot activeColor="#D8D8D8" inactiveColor="#D8D8D8">
+						<u-steps-item title="退款成功" desc="退款已原路退回到您的余额，到账时间以平台处理时间为准">
+						</u-steps-item>
+						<u-steps-item title="申请受理中" desc="您的退款申请团长已受理，请耐心等待">
+						</u-steps-item>
+						<u-steps-item title="买家发起退款" desc="系统将会在1-2天提交处理，请耐心等待"></u-steps-item>
+					</u-steps>
+			</view>
+			<button class="btn">我知道了</button>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			show: {
+				typeof: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				value: '',
+
+			}
+		},
+		methods: {
+			open() {},
+			handleChange(name) {
+				console.log(this.value)
+				this.$emit('close', name)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.title {
+		text-align: center;
+		font-size: 36rpx;
+		color: #222;
+		font-weight: 500;
+		margin-top: 20rpx;
+	}
+
+	.radio-list {
+		padding: 0 28rpx;
+		margin-top: 40rpx;
+		.refund{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 38rpx;
+			.money{
+				color: #555;
+				font-size: 30rpx;
+			}
+		}
+	}
+
+	.radio {
+		margin-bottom: 48rpx;
+	}
+	.btn{
+		width: 94%;
+		background-color: #fff;
+		border: 2rpx solid #979797;
+		border-radius: 44rpx;
+	}
+	::v-deep .u-steps-item__content{
+		margin-bottom: 70rpx;
+	}
+</style>

pageC/refundDetail/component/refundInProgress.vue

@@ -0,0 +1,65 @@
+<template>
+	<view class="top-direction">
+		<view class="direction-frist">
+			<view class="">
+				退款成功
+			</view>
+			<view class="commodity-price">
+				<text style="font-size: 20rpx;">￥</text>
+				<text>133</text>.
+				<text style="font-size: 20rpx;">22</text>
+			</view>
+		</view>
+		<view class="time">
+			剩余2天12时34分，若超时处理，退款申请将自动通过
+		</view>
+
+	</view>
+</template>
+
+<script>
+</script>
+
+<style scoped lang="scss">
+	.top-direction {
+		padding: 36rpx 24rpx;
+		border-radius: 16rpx;
+		background-color: #fff;
+	
+		.direction-frist {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 36rpx;
+			font-weight: 500;
+			.commodity-price{
+				color: #F83224;
+			}
+		}
+	
+		.time {
+			color: rgba(34, 34, 34, .6);
+			font-size: 24rpx;
+			margin-top: 20rpx;
+		}
+		
+		.direction-last{
+			margin-top: 32rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 28rpx;
+			color: #333;
+		}
+		.check{
+			margin-top: 44rpx;
+			border-radius: 38rpx;
+			background-color: #fff;
+			padding: 0;
+			border: 2rpx solid rgba(151, 151, 151, .2);
+			color: #333;
+			font-size: 28rpx;
+			height: 76rpx;
+		}
+	}
+</style>

pageC/refundDetail/component/refundInformation.vue

@@ -0,0 +1,250 @@
+<template>
+	<view class="detail">
+		<view class="title">
+			<view class="title-left">
+				<image class="header-img"
+					src="https://tse4-mm.cn.bing.net/th/id/OIP-C.uMf5AX3a6yYpIhpEkyDxiQAAAA?rs=1&pid=ImgDetMain"
+					mode=""></image>
+				<text>张三</text>
+				<image class="right-325" src="../../../static/mine/325.png" mode=""></image>
+			</view>
+			<view class="title-right">
+				<u-icon name="chat" color="#f83224" size="28"></u-icon>
+				<text>联系团长</text>
+			</view>
+		</view>
+		<view class="commodity-information">
+			<view class="commodity-1">
+				<image class="commodity-img"
+					src="https://img11.360buyimg.com/jdcms/s460x460_jfs/t1/156939/24/43697/126104/6619de23F69802006/8432635baed61875.jpg.webp"
+					mode=""></image>
+				<view class="">
+					<view class="commodity-2">
+						<view class="commodity-title">
+							OATLY 噢麦力 醇香燕麦…
+						</view>
+					</view>
+
+					<view class="commodity-3">
+						<view class="specifications">
+							【醇香】250ml*3
+						</view>
+						<view style="font-size: 24rpx;">
+							x1
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">订单编号</text>
+			<view style="color: #222;">
+				<text style="color: rgba(34, 34, 34, .6);">29819301003001313456</text>
+				<text @click="cope('111')" style="color: #f83224;">{{'&nbsp;' + "|" + "&nbsp;" + "复制"}}</text>
+
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">退款原因</text>
+			<view class="_title-right">
+				商品问题
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">退款金额</text>
+			<view class="_title-right">
+				¥134.80
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">申请件数</text>
+			<view class="_title-right">1
+			</view>
+		</view>
+		<view class="information">
+			<text class="_label">申请时间</text>
+			<view class="_title-right">2023-12-02 18:37
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import textRight from '../../accountSecurity/component/textRight.vue'
+	export default {
+		components: {
+			textRight
+		},
+		props: {
+			status: {
+				typeof: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			application() {
+				uni.navigateTo({
+					url: "/pageC/applicationRefund/applicationRefund"
+				})
+			},
+			
+			//复制
+			cope(e) {
+				uni.setClipboardData({
+					data: e,
+					success() {
+						uni.showToast({
+							title: "复制成功",
+							icon: "none"
+						})
+					}
+				})
+			},
+		},
+
+	}
+</script>
+
+<style scoped lang="scss">
+	.detail {
+		padding: 28rpx 20rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-top: 28rpx;
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 2rpx solid rgba(151, 151, 151, .1);
+			padding-bottom: 20rpx;
+
+			.title-left {
+				display: flex;
+				font-size: 32rpx;
+				align-items: center;
+
+				.header-img {
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+
+				.right-325 {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+
+			.title-right {
+				color: #333;
+				display: flex;
+				align-items: center;
+				font-size: 28rpx;
+			}
+
+			.order-status {
+				color: #f83224;
+				font-size: 26rpx;
+			}
+		}
+
+		.commodity-information {
+			margin-top: 28rpx;
+
+			.commodity-1 {
+				display: flex;
+
+				.commodity-img {
+					width: 180rpx;
+					height: 180rpx;
+					margin-right: 20rpx;
+					border-radius: 10rpx;
+				}
+
+				.commodity-2 {
+					display: flex;
+					justify-content: space-between;
+
+					.commodity-title {
+						width: 472rpx;
+						max-height: 80rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						margin-right: 38rpx;
+					}
+				}
+
+				.commodity-3 {
+					display: flex;
+					justify-content: space-between;
+					margin-top: 20rpx;
+					color: #777;
+
+					.specifications {
+						font-size: 28rpx;
+						color: #777;
+					}
+				}
+			}
+		}
+
+		.last {
+			border-bottom: 2rpx solid rgba(151, 151, 151, .1);
+			padding-bottom: 20rpx;
+		}
+
+		.btn-list {
+			display: flex;
+			justify-content: flex-end;
+
+			button {
+				width: 152rpx;
+				height: 58rpx;
+				border: 2rpx solid #979797;
+				color: #444;
+				margin: 0;
+				padding: 0;
+				font-size: 24rpx;
+				background-color: #fff;
+				border-radius: 34rpx;
+				margin-top: 20rpx;
+				margin-left: 20rpx;
+			}
+		}
+
+		.information {
+			display: flex;
+			justify-content: space-between;
+			font-size: 28rpx;
+			align-items: flex-end;
+			margin: 34rpx 0;
+
+			._label {
+				font-size: 28rpx;
+				color: #333;
+			}
+
+			._title-right {
+				font-size: 28rpx;
+				color: rgba(34, 34, 34, .6);
+			}
+		}
+
+		._bottom {
+			display: flex;
+			justify-content: flex-end;
+			font-size: 28rpx;
+			align-items: flex-end;
+			margin-top: 34rpx;
+		}
+
+	}
+</style>

pageC/refundDetail/component/refundSuccessful.vue

@@ -0,0 +1,77 @@
+<template>
+	<view class="top-direction">
+		<view class="direction-frist">
+			<view class="">
+				退款成功
+			</view>
+			<view class="commodity-price">
+				<text style="font-size: 20rpx;">￥</text>
+				<text>133</text>.
+				<text style="font-size: 20rpx;">22</text>
+			</view>
+		</view>
+		<view class="time">
+			2023年12月4号 18:23
+		</view>
+	
+		<view class="direction-last">
+			<view class="">
+				退款余额
+			</view>
+			<view class="commodity-price">
+				<text style="font-size: 20rpx;">￥</text>
+				<text>133</text>.
+				<text style="font-size: 20rpx;">22</text>
+			</view>
+		</view>
+		
+		<button class="check"  @click="$emit('checkMoney')">查看钱款去向</button>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style scoped lang="scss">
+	.top-direction {
+		padding: 36rpx 24rpx;
+		border-radius: 16rpx;
+		background-color: #fff;
+	
+		.direction-frist {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 36rpx;
+			font-weight: 500;
+			.commodity-price{
+				color: #F83224;
+			}
+		}
+	
+		.time {
+			color: rgba(34, 34, 34, .6);
+			font-size: 24rpx;
+			margin-top: 20rpx;
+		}
+		
+		.direction-last{
+			margin-top: 32rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 28rpx;
+			color: #333;
+		}
+		.check{
+			margin-top: 44rpx;
+			border-radius: 38rpx;
+			background-color: #fff;
+			padding: 0;
+			border: 2rpx solid rgba(151, 151, 151, .2);
+			color: #333;
+			font-size: 28rpx;
+			height: 76rpx;
+		}
+	}
+</style>

pageC/refundDetail/component/refusalToRefund.vue

@@ -0,0 +1,90 @@
+<template> 
+<view >
+		<view class="top-direction">
+			<view class="direction-frist">
+				<view class="">
+					卖家拒绝了您的退款申请
+				</view>
+			</view>
+			<view class="time">
+				拒绝理由拒绝理由拒绝理由拒绝理由拒绝理由
+			</view>
+			<view class="time">
+				2023-12-08 12:45
+			</view>
+		</view>
+		<view class="direction-frist1">
+			<view class="">
+				退款成功
+			</view>
+			<view class="commodity-price">
+				<text style="font-size: 20rpx;">￥</text>
+				<text>133</text>.
+				<text style="font-size: 20rpx;">22</text>
+			</view>
+		</view>
+</view>
+</template>
+
+<script>
+</script>
+
+<style scoped lang="scss">
+	.top-direction {
+		padding: 36rpx 24rpx;
+		border-radius: 16rpx;
+		background-color: #fff;
+	
+		.direction-frist {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 36rpx;
+			font-weight: 500;
+			.commodity-price{
+				color: #F83224;
+			}
+		}
+	
+		.time {
+			color: rgba(34, 34, 34, .6);
+			font-size: 24rpx;
+			margin-top: 20rpx;
+		}
+		
+		.direction-last{
+			margin-top: 32rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 28rpx;
+			color: #333;
+		}
+		.check{
+			margin-top: 44rpx;
+			border-radius: 38rpx;
+			background-color: #fff;
+			padding: 0;
+			border: 2rpx solid rgba(151, 151, 151, .2);
+			color: #333;
+			font-size: 28rpx;
+			height: 76rpx;
+		}
+	}
+	
+		.direction-frist1 {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 36rpx;
+			font-weight: 500;
+			margin-top: 20rpx;
+			background-color: #fff;
+			height: 100rpx;
+			border-radius: 16rpx;
+			padding: 0 24rpx;
+			.commodity-price{
+				color: #F83224;
+			}
+		}
+</style>

pageC/refundDetail/refundDetail.vue

@@ -0,0 +1,56 @@
+<template>
+	<view class="page">
+		<RefundSuccessful v-if="status==1" @checkMoney="checkMoney"  />
+		
+		<RefundInProgress v-if="status == 2" />
+		
+		<RefusalToRefund v-if="status == 3" />
+		
+		<RefundInformation />
+		<MoneyDestination :show="show" @close="close" />
+	</view>
+</template>
+
+<script>
+	import RefundSuccessful from './component/refundSuccessful.vue';
+	import RefundInProgress from './component/refundInProgress.vue';
+	import RefusalToRefund from './component/refusalToRefund.vue';
+	import RefundInformation from './component/refundInformation.vue';
+	import MoneyDestination from './component/moneyDestination.vue';
+	export default {
+		components: {
+			RefundInformation,
+			MoneyDestination,
+			RefundSuccessful,
+			RefundInProgress,
+			RefusalToRefund
+		},
+		data() {
+			return {
+				show: false,
+				status:3
+			};
+		},
+		methods: {
+			checkMoney() {
+				this.show = true
+			},
+			close() {
+				this.show = false
+			}
+		},
+		created() {
+			uni.setNavigationBarTitle({
+				title: "退款详情"
+			})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		padding: 20rpx 24rpx;
+
+
+	}
+</style>

pageD/components/goodsInformation.vue

@@ -0,0 +1,140 @@
+<template>
+	<view class="detail" @click="$emit('toDetail')">
+		<view class="content">
+			<image
+				src="https://img14.360buyimg.com/jdcms/s460x460_jfs/t1/229465/15/14432/86913/6631bc7cF31d5200b/63dd6b0e1dc4e73c.jpg.webp"
+				mode="" class="content-img"></image>
+				<view class="mask" v-if="status!=1">
+					<view class="text-1" v-if="status == 2">
+						审核中
+					</view>
+					<view class="text-1" v-if="status == 3">
+						审核失败
+					</view>
+					<view class="text-1" v-if="status == 4">
+						已下架
+					</view>
+				</view>
+			<view class="content-right">
+				<view class="goods-title">
+					La Chapelle Sport拉夏贝尔高级感收…
+				</view>
+				<view class="inventory">
+					<text>库存：</text>
+					<text>222</text>
+				</view>
+
+				<view class="commodity-price">
+					<text style="font-size: 20rpx;">￥</text>
+					<text>133</text>.
+					<text style="font-size: 20rpx;">22</text>
+				</view>
+			</view>
+		</view>
+		<view class="btn-list">
+			<button class="btn-1" v-if="status == 1">下架商品</button>
+			<button class="btn-1" v-if="status == 2">查看详情</button>
+			<button class="btn-2" v-if="status == 3">重新提交</button>
+			<button class="btn-1" v-if="status == 4">编辑</button>
+			<button class="btn-1" v-if="status == 4">上架商品</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			status:{
+				typeof:String,
+				default:""
+			}
+		},
+		data() {
+			return {}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.detail{
+		padding: 24rpx 20rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		.content{
+			display: flex;
+			position: relative;
+			.content-img{
+				width: 164rpx;
+				height: 164rpx;
+				border-radius: 12rpx;
+				margin-right: 20rpx;
+			}
+			.mask{
+				width: 164rpx;
+				height: 164rpx;
+				border-radius: 12rpx;
+				position: absolute;
+				background-color: rgba(255, 255, 255, .3);
+				z-index: 100;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				.text-1{
+					width: 108rpx;
+					height: 44rpx;
+					text-align: center;
+					line-height: 44rpx;
+					color: #fff;
+					background-color: rgba(0, 0, 0, .4);
+					border-radius: 22rpx;
+					font-size: 20rpx;
+				}
+			}
+			.content-right{
+				.goods-title{
+					color: #333;
+					margin-bottom: 20rpx;
+				}
+				.inventory{
+					color: rgba(54,54,54,.5);
+					font-size: 24rpx;
+					margin-bottom: 30rpx;
+				}
+				.commodity-price{
+					color: #f83224;
+					font-size: 32rpx;
+					font-weight: 600;
+				}
+			}
+		}
+		.btn-list{
+			display: flex;
+			justify-content: flex-end;
+			.btn-1{
+				width: 152rpx;
+				height: 60rpx;
+				margin: 0;
+				padding: 0;
+				font-size: 26rpx;
+				color: #333;
+				border: 2rpx solid rgba(151,151,151,.3);
+				border-radius: 30rpx;
+				background-color: #fff;
+				line-height: 60rpx;
+				margin-left: 20rpx;
+			}
+			.btn-2{
+				width: 152rpx;
+				height: 60rpx;
+				margin: 0;
+				padding: 0;
+				font-size: 26rpx;
+				color: #f83224;
+				border: 2rpx solid #f83224;
+				border-radius: 30rpx;
+				background-color: #fff;
+				line-height: 60rpx;
+			}
+		}
+	}
+</style>

pageD/productDetails/productDetails.vue

@@ -0,0 +1,148 @@
+<template>
+	<view class="page">
+		<view class="top-fail" v-if="status != 2">
+			<image src="../../static/mine/332.png" class="fail-icon" mode=""></image>
+			<text v-if="status == 1">涉及敏感文字，您发布的商品审核未通过</text>
+			<text v-if="status == 3">该商品已下架，如有需要请重新上架</text>
+		</view>
+		<view class="fail" v-else>
+			<image src="../../static/mine/333.png" class="fail-icon" mode=""></image>
+			<text>商品还在审核中，请耐心等待</text>
+		</view>
+		<image class="goods-img"
+			src="https://img13.360buyimg.com/jdcms/s460x460_jfs/t1/156379/25/41552/79748/65f821bfF15d37e55/217e9735cdeaac5a.jpg.webp"
+			mode=""></image>
+		<view class="price">
+			<text style="font-size: 20rpx;">折扣价</text>
+			<text style="font-size: 18rpx;">￥</text>
+			<text style="font-size: 36rpx; font-weight: 600;">123</text>.
+			<text style="font-size: 18rpx;">11</text>
+		</view>
+		<view class="goods-title">
+			布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼猫
+			干粮 乌骨鸡配方 1kg一袋
+		</view>
+
+		<view class="goods-detail">
+			商品详情
+		</view>
+		<view class="detail">
+			<image class="detail-img"
+				src="https://img13.360buyimg.com/jdcms/s460x460_jfs/t1/156379/25/41552/79748/65f821bfF15d37e55/217e9735cdeaac5a.jpg.webp"
+				mode=""></image>
+		</view>
+
+		<view class="footer">
+			<button class="btn">编辑商品</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				status: 3
+			}
+		},
+		methods: {
+
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title: "商品详情"
+			})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		background-color: #fff;
+
+		.top-fail {
+			height: 60rpx;
+			background-color: #fff1ee;
+			padding-left: 24rpx;
+			display: flex;
+			align-items: center;
+			font-size: 24rpx;
+			color: #333;
+
+			.fail-icon {
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 10rpx;
+			}
+		}
+
+		.fail {
+			height: 60rpx;
+			background-color: #FFF1D7;
+			padding-left: 24rpx;
+			display: flex;
+			align-items: center;
+			font-size: 24rpx;
+			color: #333;
+
+			.fail-icon {
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 10rpx;
+			}
+		}
+
+		.goods-img {
+			width: 100%;
+			height: 750rpx;
+		}
+
+		.price {
+			color: #f83224;
+			margin-top: 36rpx;
+			padding-left: 40rpx;
+			font-weight: 600;
+		}
+
+		.goods-title {
+			padding: 0 40rpx;
+			font-size: 32rpx;
+			margin-top: 20rpx;
+		}
+
+		.goods-detail {
+			font-size: 28rpx;
+			margin-top: 84rpx;
+			padding-left: 40rpx;
+		}
+
+		.detail {
+			padding: 24rpx 20rpx;
+
+			.detail-img {
+				width: 100%;
+			}
+		}
+
+		.footer {
+			position: fixed;
+			bottom: 0;
+			width: 100%;
+			padding-bottom: 84rpx;
+			padding-top: 20rpx;
+			background-color: #fff;
+
+			.btn {
+				border-radius: 52rpx;
+				background-color: #f83224;
+				color: #fff;
+				border: none;
+				padding: 0;
+				margin: 0;
+				width: 94%;
+				font-size: 30rpx;
+				margin: 0 auto;
+			}
+		}
+	}
+</style>

pageD/supplyChainGoods/supplyChainGoods.vue

@@ -0,0 +1,132 @@
+<template>
+	<view>
+		<view class="top-tab-search">
+			<u--input placeholder="搜索商品名称" shape="circle" prefixIcon="search"
+				prefixIconStyle="font-size: 22px;color: #909399"></u--input>
+			<view class="tab">
+				<view class="top-tab">
+					<view :class="{commodity:follow==1}" class="tab" @click="tabSwitch(1)">
+						全部
+					</view>
+					<view :class="{commodity:follow==2}" class="tab" @click="tabSwitch(2)">
+						已上架
+					</view>
+					<view :class="{commodity:follow==3}" class="tab" @click="tabSwitch(3)">
+						审核中
+					</view>
+					<view :class="{commodity:follow==4}" class="tab" @click="tabSwitch(4)">
+						审核失败
+					</view>
+					<view :class="{commodity:follow==5}" class="tab" @click="tabSwitch(5)">
+						已下架
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="page">
+			<GoodsInformation :status="status" @toDetail="toDetail" />
+		</view>
+		<view class="footer">
+			<button class="btn">添加供应链商品</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import GoodsInformation from '../components/goodsInformation.vue'
+	export default {
+		components: {
+			GoodsInformation
+		},
+		data() {
+			return {
+				follow: 1,
+				status: "1",
+			}
+		},
+		computed: {
+			i18n() {
+				return this.$t("index")
+			},
+		},
+		methods: {
+			tabSwitch(num) {
+				this.follow = num
+			},
+			toDetail(){
+				uni.navigateTo({
+					url:"/pageD/productDetails/productDetails"
+				})
+			},
+		},
+		mounted() {
+			uni.setNavigationBarTitle({
+				title: "我的供应链商品"
+			})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.top-tab-search {
+		background-color: #fff;
+		padding: 10rpx 24rpx;
+
+		.top-tab {
+			margin-top: 10rpx;
+			padding: 0 20rpx;
+			display: flex;
+			justify-content: space-between;
+
+			.tab {
+				font-size: 26rpx;
+				color: rgba(34, 34, 34, .8);
+				flex-shrink: 0;
+				height: 44rpx;
+				display: flex;
+				align-items: flex-end;
+				padding-bottom: 12rpx;
+			}
+
+			.commodity {
+				position: relative;
+				font-weight: 600;
+			}
+
+			.commodity::before {
+				content: '';
+				display: block;
+				height: 4rpx;
+				width: 50%;
+				background: #f83224;
+				position: absolute;
+				bottom: -10rpx;
+				opacity: 0.8;
+				left: 50%;
+				transform: translate(-50%, 50%);
+			}
+		}
+	}
+
+	.page {
+		padding: 20rpx 24rpx;
+	}
+	.footer{
+		position: fixed;
+		bottom: 0;
+		background-color: #fff;
+		width: 100%;
+		padding:16rpx 24rpx 70rpx 24rpx;
+		.btn{
+			border-radius: 52rpx;
+			background-color: #f83224;
+			color: #fff;
+			border: none;
+			padding: 0;
+			margin: 0;
+			width: 94%;
+			font-size: 30rpx;
+		}
+	}
+</style>

pages.json

@@ -475,6 +475,13 @@
 					{
 						"navigationBarTitleText" : ""
 					}
+				},
+				{
+					"path" : "refundDetail/refundDetail",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
 				}
 			]
 		}, {
@@ -485,6 +492,20 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
+				},
+				{
+					"path" : "supplyChainGoods/supplyChainGoods",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "productDetails/productDetails",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
 				}
 
 			]

pages/mine/component/teamFunction.vue

@@ -19,7 +19,7 @@
 				<image class="form-icon" src="../../../static/mine/320.png" mode=""></image>
 				<view class="characters">{{i18n.afterSales}}</view>
 			</view>
-			<view class="icon-center">
+			<view class="icon-center" @click="toNextPage('/pageD/supplyChainGoods/supplyChainGoods')">
 				<image class="form-icon" src="../../../static/mine/316.png" mode=""></image>
 				<view class="characters">{{i18n.supplyChain}}</view>
 			</view>
@@ -32,7 +32,7 @@
 				<view class="characters">{{i18n.pontact}}</view>
 			</view>
 			<view class="icon-center">
-				<image class="form-icon" src="../../../static/mine/321.png" mode="" @click="toSetup"></image>
+				<image class="form-icon" src="../../../static/mine/321.png" mode="" @click="toNextPage('/pageC/accountSetup/accountSetup')"></image>
 				<view class="characters">{{i18n.accountSettings}}</view>
 			</view>
 		</view>
@@ -52,11 +52,12 @@
 			},
 		},
 		methods:{
-			toSetup(){
+			toNextPage(url){
 				uni.navigateTo({
-					url:"/pageC/accountSetup/accountSetup"
+					url:url
 				})
-			}
+			},
+			
 		}
 	}
 </script>
@@ -99,6 +100,7 @@
 			.characters{
 				color: #202020;
 				font-size: 12px;
+				text-align: center;
 				margin-top: 10px;
 			}
 		}

unpackage/dist/dev/mp-weixin/app.json

@@ -72,13 +72,16 @@
         "privacyPolicy/privacyPolicy",
         "orderFormDetail/orderFormDetail",
         "myPackage/myPackage",
-        "applicationRefund/applicationRefund"
+        "applicationRefund/applicationRefund",
+        "refundDetail/refundDetail"
       ]
     },
     {
       "root": "pageD",
       "pages": [
-        "index"
+        "index",
+        "supplyChainGoods/supplyChainGoods",
+        "productDetails/productDetails"
       ]
     }
   ],

uview-ui/components/u-steps-item/u-steps-item.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="u-steps-item" ref="u-steps-item" :class="[`u-steps-item--${parentData.direction}`]">
+	<view class="u-steps-item" ref="u-steps-item" style="padding-bottom: 60rpx;" :class="[`u-steps-item--${parentData.direction}`]">
 		<view class="u-steps-item__line" v-if="index + 1 < childLength"
 			:class="[`u-steps-item__line--${parentData.direction}`]" :style="[lineStyle]"></view>
 		<view class="u-steps-item__wrapper"
@@ -33,6 +33,9 @@
 			:style="[contentStyle]">
 			<u--text :text="title" :type="parentData.current == index ? 'main' : 'content'" lineHeight="20px"
 				:size="parentData.current == index ? 14 : 13"></u--text>
+				<view style="margin-top: 10rpx;">
+					
+				</view>
 			<slot name="desc">
 				<u--text :text="desc" type="tips" size="12"></u--text>
 			</slot>
@@ -85,8 +88,7 @@
 			}
 		},
 		watch: {
-			'parentData'(newValue, oldValue) {
-			}
+			'parentData'(newValue, oldValue) {}
 		},
 		created() {
 			this.init()
@@ -313,4 +315,4 @@
 			}
 		}
 	}
-</style>
+</style>