Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

pages/order/refund/refund.vue

@@ -41,7 +41,7 @@
 
 			</view>
 		</view>
-		<view class="invoice-money">
+		<view class="invoice-money" v-if="type==1||type==2">
 			<view class="a">申请金额</view>
 			<view class="b">
 				<view class="l">￥
@@ -139,7 +139,8 @@
 				imagesId: '',
 				action: '',
 				header: '',
-				type: 1,
+				type: 1,
+				title:'申请退款',
 			}
 		},
 		onReady() {
@@ -150,13 +151,24 @@
 				'platform': "MP-WEIXIN",
 			}
 		},
-		onLoad(op) {
+		onLoad(op) {
+			console.log(op)
 			this.deliveryStatus = op.deliveryStatus;
 			this.type = op.type;
 			this.receiptStatus = op.receiptStatus;
 			this.orderId = op.orderId
 			this.order = op.order ? JSON.parse(op.order) : '';
-			this.value = this.order.is_user_grade ? this.order.grade_goods_price : this.order.goods_price;
+			this.value = this.order.is_user_grade ? this.order.grade_goods_price : this.order.goods_price;
+			this.title = op.type==1?"申请退货退款":(op.type==2?"申请退款":"申请换货");
+			if(op.type==3){
+				this.array=['已收到货', '未收到货'];
+				this.array1=[ "外观、型号、参数与描述不符", '货物与描述不符', '商品有划痕或破损', '配件、部件、屏幕问题', '质量问题', '收到商品少件（含少配件）',
+					'商品破损或污渍', '商家发错货'
+				];
+			}
+			uni.setNavigationBarTitle({
+				 title: this.title
+			})
 		},
 		methods: {
 			//接受上传返回的数据

pages/refund/detail.vue

@@ -152,7 +152,7 @@
 
 		<!-- 填写物流信息 -->
 		<form
-			v-if="detail.type == RefundTypeEnum.RETURN.value && detail.audit_status == AuditStatusEnum.REVIEWED.value && !detail.is_user_send"
+			v-if="(detail.type == RefundTypeEnum.RETURN.value || detail.type == RefundTypeEnum.EXCHANGE.value) && detail.audit_status == AuditStatusEnum.REVIEWED.value && !detail.is_user_send"
 			@submit="onSubmit()">
 			<view class="detail-express b-f m-top20">
 				<view class="form-group dis-flex flex-y-center">