From 1bc7895ca583d9d716d04c07a997d0aafcc4bcdd Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sun, 25 Feb 2024 21:36:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news/recycling/order.vue     |  2 +-
 pages/news/recycling/orderList.vue | 20 ++++++------
 pages/news3/ManualEntry.vue        |  1 -
 pages/order/detail.vue             | 20 ++++++++----
 pages/order/index.vue              | 49 ++++++++++++------------------
 pages/order/refund/refund.vue      | 33 +++++++++++++-------
 pages/user/index.vue               | 14 ++-------
 7 files changed, 71 insertions(+), 68 deletions(-)

diff --git a/pages/news/recycling/order.vue b/pages/news/recycling/order.vue
index dbbaaac..fabdd3b 100644
--- a/pages/news/recycling/order.vue
+++ b/pages/news/recycling/order.vue
@@ -129,7 +129,7 @@
 			<view class="a">
 				联系商家
 			</view>
-			<view class="b" @click="reservation">
+			<view  class="b" @click="reservation">
 				立即预约
 			</view>
 		</view>
diff --git a/pages/news/recycling/orderList.vue b/pages/news/recycling/orderList.vue
index 7aca16f..be8186f 100644
--- a/pages/news/recycling/orderList.vue
+++ b/pages/news/recycling/orderList.vue
@@ -31,7 +31,7 @@
 					<image :src="item.recovery_image"></image>
 					<view class="priceCon">
 						<view class="a">名称：{{item.recovery_name}}</view>
-							<view class="a" v-if="item.brand">品牌：{{item.brand}}</view>
+						<view class="a" v-if="item.brand">品牌：{{item.brand}}</view>
 						<view class="b">
 							<text class="num"></text>
 							<view class="priceText">
@@ -54,8 +54,8 @@
 						@click.stop="openPage(3,index,item)">修改订单</view>
 					<view class="btn info" v-if="item.is_cancel==1 && (item.order_status == 10)"
 						@click.stop="openPage(1,index,item)">取消订单</view>
-						<view class="btn info" v-if="item.is_success==1 && (item.order_status == 20)"
-							@click.stop="openPage(4,index,item)">完成</view>
+					<view class="btn info" v-if="item.is_success==1 && (item.order_status == 20)"
+						@click.stop="openPage(4,index,item)">完成</view>
 				</view>
 			</view>
 		</view>
@@ -123,12 +123,13 @@
 				}
 				if (i == 2) {
 					uni.navigateTo({
-						url: '/pages/news/recycling/order?recovery_id=' + a.recovery_id+'&order_id='+a.order_id
+						url: '/pages/news/recycling/order?recovery_id=' + a.recovery_id + '&order_id=' + a.order_id
 					})
 				}
 				if (i == 3) {
 					uni.navigateTo({
-						url: '/pages/news/recycling/confirm1?order_id=' + a.order_id+'&tabIndex='+(a.recovery_type==10?1:a.recovery_type==20?0:2)+'&source=2'
+						url: '/pages/news/recycling/confirm1?order_id=' + a.order_id + '&tabIndex=' + (a
+							.recovery_type == 10 ? 1 : a.recovery_type == 20 ? 0 : 2) + '&source=2'
 					})
 				}
 				if (i == 4) {
@@ -173,7 +174,7 @@
 					uni.showToast({
 						title: "取消成功"
 					})
-					this.classifyShow=2
+					this.classifyShow = 2
 					this.getOrderList(1)
 				}
 			},
@@ -209,7 +210,7 @@
 				} = await newFunApi.orderList({
 					order_no: this.order_no,
 					page: this.pageNum,
-					order_status: this.classList.length > 0 ? (this.classifyShow >= 0 ? this.classList[this
+					order_status: (this.classList.length > 0) ? (this.classifyShow >= 0 ? this.classList[this
 						.classifyShow].value : '') : ""
 				});
 				if (status == 200) {
@@ -270,7 +271,7 @@
 			border-radius: 80rpx;
 
 			::v-deep .uni-input-placeholder {
-				margin-left: 90upx;
+				margin-left: 20upx;
 				z-index: 10;
 			}
 
@@ -297,7 +298,7 @@
 				background: #FFFFFF;
 				border-radius: 30px 30px 30px 30px;
 				opacity: 1;
-				padding-left: 80upx;
+				padding-left: 20upx;
 				width: calc(100% - 80upx);
 
 			}
@@ -379,6 +380,7 @@
 	.shopContent {
 
 		overflow: hidden;
+
 		.shopItem {
 			margin-bottom: 14upx;
 			padding: 36upx;
diff --git a/pages/news3/ManualEntry.vue b/pages/news3/ManualEntry.vue
index 2a8a998..39631d0 100644
--- a/pages/news3/ManualEntry.vue
+++ b/pages/news3/ManualEntry.vue
@@ -298,7 +298,6 @@
 			},
 			//接受上传返回的数据
 			transferSuccess(list) {
-				console.log(list)
 				if (list.length > 0) {
 					const {
 						response
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index a0d5025..d94e42d 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -118,11 +118,15 @@
 					<view class="goodsNum">
 						x{{ goods.total_num }}
 					</view>
-					<view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_id,goods,order)"
+					<view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_goods_id,goods,order)"
+						v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
+						退款
+					</view>
+					<view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_goods_id,goods,order)"
 						v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value && order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
 						退款
 					</view>
-					<view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_id,goods,order)"
+					<view class="up2" style="margin-top: 20rpx;" @tap.stop="onRefund(goods.order_goods_id,goods,order)"
 						v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.receipt_status == ReceiptStatusEnum.RECEIVED.value && order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
 						换货
 					</view>
@@ -142,7 +146,7 @@
 		<view class="orderTips">
 			<view class="orderTitle">
 				<view class="total">
-					订单编号:
+					订单编号：
 				</view>
 				<view class="price">
 					{{ order.order_no }}
@@ -274,7 +278,7 @@
 				</view>
 				<view class="buyAgain" @click="onPay(order.order_id)"
 					v-if="order.pay_status == PayStatusEnum.PENDING.value &&order.order_status == OrderStatusEnum.NORMAL.value">
-					继续付款
+					立即支付
 				</view>
 				<view class="buyAgain" @click="onExtractQRCode(order.order_id)" v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_type == DeliveryTypeEnum.EXTRACT.value
 					&& order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
@@ -293,10 +297,10 @@
 					v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
 					催发货
 				</view>
-				<view class="buyAgain" @click="onCancel(order.order_id)"
+			<!-- 	<view class="buyAgain" @click="onCancel(order.order_id)"
 					v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
 					取消订单
-				</view>
+				</view> -->
 				<!-- <view class="buyAgain"
 					v-if="order.order_status == OrderStatusEnum.COMPLETED.value && order.is_comment == 0"
 					@click="handleTargetComment(order.order_id)">
@@ -606,11 +610,15 @@
 </script>
 
 <style lang="scss" scoped>
+	page{
+		height: 100%;
+	}
 	.detail {
 		width: 750rpx;
 		padding-bottom: 150rpx;
 		background-image: url('https://www.royaum.com.cn/static/home/homeback.png');
 		background-size: 100% 100%;
+		height: 100%;
 	}
 
 	.menuarea {
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 3b17830..998c1a6 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -68,25 +68,21 @@
                  && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
 							@click="onExtractQRCode(item.order_id)">核销码
 						</view>
-						<view class="n" v-if="item.pay_status == PayStatusEnum.PENDING.value && item.order_status == OrderStatusEnum.NORMAL.value"
-							@click="onPay(item.order_id)">继续付款</view>
+						<view class="n"
+							v-if="item.pay_status == PayStatusEnum.PENDING.value && item.order_status == OrderStatusEnum.NORMAL.value"
+							@click="onPay(item.order_id)">立即支付</view>
 						<view class="n" v-if="item.delivery_status == DeliveryStatusEnum.DELIVERED.value"
 							@click="onLogistics(item.order_id)">查看物流
 						</view>
 						<view class="n n-1"
 							v-if="item.delivery_status == DeliveryStatusEnum.DELIVERED.value && item.receipt_status == ReceiptStatusEnum.NOT_RECEIVED.value"
 							@click="onReceipt(item.order_id)">确认收货</view>
-							<view class="n"
-								v-if="(item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == ReceiptStatusEnum.NOT_RECEIVED.value)||item.order_status == OrderStatusEnum.CANCELLED.value"
-								@click="handleTargetGoods(item.goods[0].goods_id)">再次购买</view>
 						<view class="n"
-							v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
-							@click="onCdDia(item.goods_id)">催发货</view>
+							v-if="(item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == ReceiptStatusEnum.NOT_RECEIVED.value)||item.order_status == OrderStatusEnum.CANCELLED.value"
+							@click="handleTargetGoods(item.goods[0].goods_id)">再次购买</view>
 						<view class="n"
 							v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
-							@click="onCancel(item.order_id)">
-							取消订单
-						</view>
+							@click="onCdDia(item.goods_id)">催发货</view>
 						<!-- 		<view class="n"
 										v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
 										@click="onAdress(order.goods_id)">修改地址</view> -->
@@ -228,6 +224,7 @@
 		onShow() {
 			// 注册全局事件订阅: 是否刷新订单列表
 			uni.$on('syncRefresh', canReset => {
+				this.list=[]
 				this.getOrderList()
 			})
 		},
@@ -248,9 +245,14 @@
 		methods: {
 			confirm() {
 				// 刷新订单列表
+				this.list=[]
 				app.getOrderList()
 			},
 			changeMenu(index) {
+				this.list.forEach(item => {
+					item.menushow=false;
+					idList.push(item.response.data.fileInfo.file_id)
+				});
 				this.list[index].menushow = !this.list[index].menushow
 			},
 			toggleImage() {
@@ -265,7 +267,7 @@
 				}
 			},
 
-		/**
+			/**
 			 * 获取列表
 			 */
 			async getOrderList() {
@@ -296,7 +298,7 @@
 			// 切换标签项
 			onChangeTab(index) {
 				const app = this
-				app.list=[]
+				app.list = []
 				// 设置当前选中的标签
 				app.curTab = index
 				if (index == 6) {
@@ -595,23 +597,10 @@
 							height: 40rpx;
 							margin-right: 24rpx;
 						}
-
-						&::after {
-							content: "";
-							width: 16rpx;
-							height: 16rpx;
-							border-top: 1px solid #818181;
-							border-left: 1px solid #818181;
-							position: absolute;
-							right: 0;
-							top: 14rpx;
-							z-index: 1;
-							transform: rotate(135deg);
-						}
 					}
 
 					.b {
-						font-size: 24rpx;
+						font-size: 28rpx;
 						font-weight: 400;
 						color: #F21A1C;
 					}
@@ -624,9 +613,10 @@
 					margin-bottom: 30rpx;
 
 					.pic {
-						width: 145rpx;
-						height: 135rpx;
-						margin-right: 20rpx;
+						width: 162rpx;
+						height: 148rpx;
+						border-radius: 0px 0px 0px 0px;
+						margin-right: 30rpx;
 
 						image {
 							width: 100%;
@@ -656,6 +646,7 @@
 								font-weight: 600;
 							}
 
+							margin-top: 12rpx;
 							font-size: 24rpx;
 							color: #F21A1C;
 						}
diff --git a/pages/order/refund/refund.vue b/pages/order/refund/refund.vue
index a3f32a9..e103fc5 100644
--- a/pages/order/refund/refund.vue
+++ b/pages/order/refund/refund.vue
@@ -66,8 +66,8 @@
 			</view>
 			<view class="c"
 				v-if="(deliveryStatus == DeliveryStatusEnum.DELIVERED.value) && (receiptStatus == ReceiptStatusEnum.RECEIVED.value)">
-				<u-upload :action="action" :header="header" @on-uploaded="onSuccess" @on-remove="onRemove"
-					width="180" height="180" :file-list="transferList" :custom-btn="true" max-count="6">
+				<u-upload :action="action" :header="header" @on-uploaded="onSuccess" @on-remove="onRemove" width="180"
+					height="180" :file-list="transferList" :custom-btn="true" max-count="6">
 					<template v-slot:addBtn>
 						<view class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
 							<image :src="$picUrl+'/static/news/icon-upload.png'"></image>
@@ -77,9 +77,9 @@
 				</u-upload>
 			</view>
 		</view>
-		<view class="invoice-phone">
+		<!-- 	<view class="invoice-phone">
 			联系电话<input type="number" placeholder="" v-model="phone" />
-		</view>
+		</view> -->
 		<view class="goods-fd">
 			<view class="btn" @click="toDetail">提交申请</view>
 		</view>
@@ -165,7 +165,7 @@
 						uni.showToast({
 							title: "上传成功"
 						})
-					this.imagesId = this.handleRemove('', list);
+						this.imagesId = this.handleRemove('', list);
 					}
 				}
 			},
@@ -178,7 +178,7 @@
 					idList.push(item.response.data.fileInfo.file_id)
 				});
 				return idList.join(',')
-			
+
 			},
 			onValue(e) {
 				if ((Number(e.detail.value) > Number(this.value)) == false) {
@@ -220,6 +220,15 @@
 					})
 					return
 				}
+				if (!app.imagesId && ((app.deliveryStatus == DeliveryStatusEnum.DELIVERED.value) && (app.receiptStatus ==
+						ReceiptStatusEnum.RECEIVED.value))) {
+					uni.showToast({
+						title: '请上传图片',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
 				app.isLoading = true;
 				let obj = {
 					type: (app.deliveryStatus == DeliveryStatusEnum.DELIVERED.value) && (app.receiptStatus ==
@@ -472,6 +481,7 @@
 
 			}
 		}
+
 		&-money {
 			width: 100%;
 			background: #FFFFFF;
@@ -537,7 +547,8 @@
 			margin-top: 20rpx;
 			padding: 26rpx 26rpx 26rpx 48rpx;
 			box-sizing: border-box;
-             margin-bottom: 200rpx;
+			margin-bottom: 200rpx;
+
 			.a {
 				display: flex;
 				align-items: center;
@@ -569,8 +580,8 @@
 				overflow: hidden;
 
 				.slot-btn {
-					width: 80px;
-					height: 80px;
+					width: 180rpx;
+					height: 180rpx;
 					background: #FFFFFF;
 					border-radius: 10rpx;
 					border: 1px solid #C0C0C0;
@@ -582,7 +593,7 @@
 					image {
 						width: 50rpx;
 						height: 50rpx;
-						margin-top: 20rpx;
+						margin-top: 35rpx;
 					}
 				}
 			}
@@ -619,7 +630,7 @@
 		z-index: 99;
 		background-color: #fafafa;
 		box-sizing: border-box;
-	
+
 		.btn {
 			width: 630rpx;
 			line-height: 88rpx;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index b6b2ec2..d9347ec 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -135,7 +135,7 @@
 							预约记录
 						</view>
 					</view>
-					<view class="listItem" @click="goJump('pages/news/park/browsingHistory')">
+					<view class="listItem" @click="goJump('/pages/news/park/browsingHistory')">
 						<view class="num">
 							{{actionCountsInfo.view_number?actionCountsInfo.view_number:0}}
 						</view>
@@ -153,7 +153,7 @@
 					</view>
 					<view class="listItem" @click="goJump('pages/news/coupon/list')">
 						<view class="num">
-							{{actionCountsInfo.view_number?actionCountsInfo.view_number:0}}
+							{{actionCountsInfo.coupon_number?actionCountsInfo.coupon_number:0}}
 						</view>
 						<view class="info">
 							优惠券
@@ -400,20 +400,12 @@
 							邀请朋友
 						</view>
 					</view>
-					<!-- <view class="serveIcon" @click="goJump('/pages/invite/index')">
+					<view class="serveIcon" @click="goJump('/pages/invite/index')">
 						<image :src="$picUrl+'/static/user/invites.png'" class="icons"></image>
 						<view class="serveInfo">
 							<text v-if="userInfo.user_type >=30">邀请分销</text>
 							<text v-else >加入分销</text>
 						</view>
-					</view> -->
-					<view class="serveIcon" @click="goJump('/pages/news3/JoinDistribution')">
-					<!-- <view class="serveIcon" @click="goJump('/pages/dealer/index')"> -->
-						<image :src="$picUrl+'/static/user/invites.png'" class="icons"></image>
-						<view class="serveInfo">
-							<!-- <text v-if="userInfo.user_type >=30">邀请分销</text> -->
-							<text>加入分销</text>
-						</view>
 					</view>
 					
 					<view class="serveIcon" @click="goJump('/pages/news1/help',1)">