From 04a4ed523f3372285bda02de3d43cd75b265ade6 Mon Sep 17 00:00:00 2001
From: cmxdd <86407334@qq.com>
Date: Thu, 6 Aug 2020 11:48:45 +0800
Subject: [PATCH] update bug

---
 pages/index/details.vue       |  82 +++++++++++++++++++++++++++-------
 pages/user/contentDetails.vue |   4 +-
 static/image/home/chat.png    | Bin 0 -> 723 bytes
 3 files changed, 70 insertions(+), 16 deletions(-)
 create mode 100644 static/image/home/chat.png

diff --git a/pages/index/details.vue b/pages/index/details.vue
index a73bfca..d7fcbf9 100644
--- a/pages/index/details.vue
+++ b/pages/index/details.vue
@@ -1,18 +1,37 @@
 <template>
 	<view class="details">
-		<view class="goods-info">
-			<image :src="info.extend_order_goods[0].goods_image"></image>
-			<view class="info-right">
-				<view class="name u-line-1">{{ info.extend_order_goods[0].goods_name }}</view>
-				<view class="info">
-					<view class="num">共{{ info.extend_order_goods[0].goods_num }}件商品</view>
-					<view class="price">
-						实付
-						<span>￥{{ info.extend_order_goods[0].goods_pay_price }}</span>
+		<view class="box" v-if="type<4">
+			<view class="goods-info" v-for="list in info.extend_order_goods">
+				<image :src="list.goods_image"></image>
+				<view class="info-right">
+					<view class="name u-line-1">{{ list.goods_name }}</view>
+					<view class="info">
+						<view class="num">共{{ list.goods_num }}件商品</view>
+						<view class="price">
+							实付
+							<span>￥{{ list.goods_pay_price }}</span>
+						</view>
 					</view>
 				</view>
-			</view>
+			</view>	
 		</view>
+		<u-radio-group class="box" v-model="value" v-if="type>3">
+			<view class="goods-info" v-for="list in info.refund_list">
+				<image :src="list.goods_image"></image>
+				<view class="info-right">
+					<view class="name u-line-1">{{ list.goods_name }}</view>
+					<view class="info">
+						<view class="num">共{{ list.goods_num }}件商品</view>
+						<view class="price">
+							实付
+							<span>￥{{ list.refund_amount }}</span>
+						</view>
+					</view>
+				</view>
+				<u-radio :name="list.refund_id" shape="circle" @change="radioGroupChange">
+				</u-radio>
+			</view>
+		</u-radio-group>
 		<!-- 待处理 -->
 		<view class="user-info" v-if="type == 1">
 			<view class="info-title">收件人信息</view>
@@ -32,10 +51,12 @@
 			</view>
 		</view>
 		<!-- 待处理之后的 -->
+		<view class="refunds-title" v-if="type!=1">收件人信息</view>
 		<view class="refunds-user" v-if="type == 2 || type == 3 || type == 4 || type == 5 || type == 6">
 			<view>
 				<image src="/static/image/home/2.png"></image>
 				<view>{{ info.extend_order_common.reciver_name }}</view>
+				<image src="/static/image/home/chat.png" @click="tochat(info.buyer_id)"></image>
 			</view>
 			<view>
 				<image src="/static/image/home/3.png"></image>
@@ -135,29 +156,51 @@ export default {
 			express: '',
 			type: '',
 			orderid: 0,
-			info: {},
+			info: {
+				extend_order_goods:[{}],
+				extend_order_common:{
+					reciver_info:{
+						mob_phone:"",
+						address:""
+					},
+					receive_name:""
+				}
+			},
 			list: [],
 			pushid: null,
 			pushstate: false, //显示物流单号
 			selctcar: null, //骑手信息
 			companyidA: null, //物流派送公司id
-			companyidB: null //骑手派送公司id
+			companyidB: null, //骑手派送公司id
+			value:"",
+			refundid:null
 		};
 	},
 	onLoad(option) {
 		this.type = option.type;
+		console.log(this.type)
 		this.orderid = option.id;
 		this.resetinfo();
 		if (this.type == 1) {
+			// 获取快递公司
 			this.getcompanyinfo();
 		}
 		if (this.type == 2) {
+			// 获取物流信息
 			this.getcarinfo();
 		}
-
 		// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
 	},
 	methods: {
+		// 跳转详情页面
+		tochat(ID){
+			console.log(ID)
+		},
+		// 退款单选
+		radioGroupChange(e) {
+			this.refundid = e
+			console.log(e);
+		},
 		// 人工配送
 		pushstyleA() {
 			this.cur = 0;
@@ -189,7 +232,7 @@ export default {
 			if (this.cur == 0) {
 				// 确定退款
 				this.$u.api.refund({
-					refund_id: this.orderid,
+					refund_id: this.refundid,
 					seller_state:2,
 					seller_message:""
 				}).then(res => {
@@ -212,7 +255,7 @@ export default {
 			} else {
 				// 不进行退款
 				this.$u.api.refund({
-					refund_id: this.orderid,
+					refund_id: this.refundid,
 					seller_state:3,
 					seller_message:""
 				}).then(res => {
@@ -395,6 +438,13 @@ export default {
 			}
 		}
 	}
+	.refunds-title{
+		padding: 25rpx 30rpx;
+		font-weight: 500;
+		color: #333333;
+		background-color: #ffffff;
+		border-bottom: 2rpx solid #ececec;
+	}
 	.refunds-user {
 		padding: 25rpx 30rpx;
 		background-color: #ffffff;
@@ -402,6 +452,7 @@ export default {
 		> view {
 			display: flex;
 			align-items: center;
+			justify-content: space-between;
 			margin-bottom: 30rpx;
 			@mixin image-class($width, $right) {
 				> image {
@@ -423,6 +474,7 @@ export default {
 				@include image-class($width: 36rpx, $right: 22rpx);
 			}
 			> view {
+				flex: 1;
 				font-size: 26rpx;
 				color: rgba(51, 51, 51, 1);
 			}
diff --git a/pages/user/contentDetails.vue b/pages/user/contentDetails.vue
index 8a63c24..530b757 100644
--- a/pages/user/contentDetails.vue
+++ b/pages/user/contentDetails.vue
@@ -33,7 +33,7 @@
 				<view class="info">
 					<image></image>
 					<view class="center">
-						<view class="name">{{item.member_nickname}}</view>
+						<view class="name">{{item.member_nickname}}回复了{{info.reply_member_nickname}}</view>
 						<view class="time">{{item.create_time}}</view>
 					</view>
 					<view class="btn" @click="showreply(item.id)">回复</view>
@@ -101,6 +101,8 @@ export default {
 				} else {
 					this.pid = "";
 					this.content = "";
+					this.getdetail();
+					this.showChat = false
 					this.$refs.uToast.show({
 						title: res.message,
 						type: 'success'
diff --git a/static/image/home/chat.png b/static/image/home/chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..15e0ca68d913e3b0976a56c76e4bb54ac6b17ce8
GIT binary patch
literal 723
zcmV;^0xbQBP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0007-Nkl<ZI8T+7
zPiRzE6vltweeb^UPb?xR5iC?K6iTs+1XNT|M6k6WA|f;hDpH9ENt<M5;%as=F)^SZ
z?ktEDaZz<4RIpuCN(r@#x=?Jjf(jy-jhJNKoA-{q37KRdh`GCS?{|Kjd(Zujm}glZ
ztvJ6Iv<c}`$Q;sRQX8X|+~6$F1vWQTa|1g;3(LZjICmTrVD>lIGYrGoYH)2B1>h2j
zM>W9fnfwOG`dJD73g~mpMyMrMXklCxYPr}B5U`$)Nd107mBGeIl7kxN|NOiTvR;<r
z{S8d3Fgi3C-=FWwGkey{T72O$mPOQ(Z#2xSX;3LVh1^MM?ACDn&-)+^*bjV6A-YXw
zcX*O?ss6BG^cR^8YA`wfA&>^F9P9^o5ow#O<U4UHG8MOJl<|hBg5xQXeq^d%bsj^c
z%5+@c`;H~7@OMGCWT&Fbm__`Te5-4u4N)oBOAs94O?*)2samP92ibAn#s~6vR_D**
z+y+^{A0y*;4JJKJU!hd!#L+`i{ZhlcwX#17>Sa;ft_l;gps<MC(HwM-l;1Rz^frOY
ztRo9Huq3^y3YnGp1cEjmr`MY*FNS>t?wG7UyasNPLVP$+Sjb~fcifNQ*eolDeaIan
zjoUTEn}vYvFpFsQcQEd${<%W`C#YMe<DV7;Du%lVbd{8^Rd4I0A3^$xYP?gUy!a59
zb+eqs(QV)fuj4~A7FmUleyRJXmUQS0FW+mC?SyRf7jSL|RQG6rN3*6a7Cs}etGUlH
z^%GZr)hLtm0j)v{Q_%xtKQoYY<s+qej1*aee16$|z`tbt0rnhe0&{b;nZxOOu;s+s
zs*(6%6R0sR*7+}xI>5FdwPHj_O@l1&JlGVe9nw%T_73E`1$V`Dh@Sue002ovPDHLk
FV1flsPX_=1

literal 0
HcmV?d00001