冲突

pages/news/recycling/confirm1.vue

@@ -183,11 +183,10 @@
 				storeInfo: {},
 				region: [],
 				header: {
-					'Storeid': uni.getStorageSync('Store').storeInfo.store_id
-					'AccessToken': uni.getStorageSync('AccessToken')
+					'Storeid': uni.getStorageSync('Store').storeInfo.store_id,
+					'AccessToken': uni.getStorageSync('AccessToken'),
 					'platform': "MP-WEIXIN",
 				},
-				
 				url: Config.get('apiUrl')+'user/upload'
 			}
 		},
@@ -202,30 +201,7 @@
 			success(e) {
 				console.log(e)
 			},
-			beforeUpload(e,list){
-				console.log(list)
-				for(i = 0; i<list.length;i++){
-					uni.uploadFile({
-						name: 'file',
-						header: {
-							
-						},
-						url: ,
-						filePath: list[i].url,
-						success: (upRes) => {
-							let end = JSON.parse(upRes.data);
-							console.log(end)
-							// that.userInfo.avatar = end.data.path
-							// that.userInfo.avatar1 = end.data.url
-						},
-						fail: (err) => {
-							console.log("toUpload err",err)
-							console.log(err)
-						}
-					});
-				}
 			
-			},
 			uploadImage() {
 				const that = this
 				uni.chooseImage({

pages/order/refund/refundDetail.vue

@@ -92,13 +92,12 @@
 			this.getRefundDetails(op.orderRefundId)
 		},
 		methods: {
-			let app = this
 			getRefundDetails(orderRefundId) {
-				refundApi.detail(orderRefundId)
-					.then(result => {
-						app.refundDetails = result.data.detail
-					})
-			},
+				let app = this
+				refundApi.detail(orderRefundId).then(result => {
+					app.refundDetails = result.data.detail
+				})
+			}
 		}
 	}
 </script>

pages/order/refund/refundDetail1.vue

@@ -63,8 +63,8 @@
 			this.getRefundDetails(op.orderRefundId)
 		},
 		methods: {
-			let app=this
 			getRefundDetails(orderRefundId) {
+			let app=this
 				refundApi.detail(orderRefundId)
 					.then(result => {
 						app.refundDetails = result.data.detail