From 0a52842e35b418a33193a86ef49482f1daec9373 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Mon, 3 Aug 2020 20:59:24 +0800
Subject: [PATCH] time none8.3

---
 common/api/user.js                        |   9 ++
 components/mine/collection-item/index.vue |  32 ++----
 components/mine/order-item/index.vue      |  10 ++
 components/shop/recommend/pintuan.vue     |   2 +-
 pageE/mine/EditUserInfo.vue               |   2 +-
 pageE/mine/MineConcerns.vue               | 119 ++++++++++++----------
 pageE/mine/StoreCollection.vue            |  14 +--
 pageE/tool/ManicureOrder.vue              |   2 +-
 pageE/tool/WashOrder.vue                  |  19 ++--
 pages/mine/index.vue                      |   2 +-
 10 files changed, 116 insertions(+), 95 deletions(-)

diff --git a/common/api/user.js b/common/api/user.js
index 8594ef0..2eafe9e 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -257,6 +257,15 @@ export default {
 				if(msg) Object.assign(params, {msg: msg});
 				return vm.$u.post('Order/buyer_cancel', params);
 			},
+			// add_refund
+			refundOrder({ order_id, goods_id, refund_amount, refund_type = 1 } = {}) {
+				return vm.$u.post('order/add_refund', { 
+					order_id: order_id,
+					goods_id: goods_id,
+					refund_amount: refund_amount,
+					refund_type: refund_type,
+				});
+			},
 			// 删除订单
 			deleteOrder({ order_id }) {
 				return vm.$u.post('order/order_delete', { order_id: order_id });
diff --git a/components/mine/collection-item/index.vue b/components/mine/collection-item/index.vue
index 92ce7ba..8c81c56 100644
--- a/components/mine/collection-item/index.vue
+++ b/components/mine/collection-item/index.vue
@@ -3,22 +3,22 @@
 		<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="300"></u-empty>
 		<u-swipe-action
 			v-for="(item, index) in list" :key="index" 
-			:index='index'
+			:index='item.fav_id'
 			:show="item.show"
 			:options="options"
 			@click="removeFavorite"
 			@open="open"
 		>
 			<view class="item u-border-bottom">
-				<image src="@/pageE/static/mine/23.png"></image>
+				<image :src="item.goods_image"></image>
 				<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
 				<view class="title-wrap">
-					<view class="item-top u-line-2">木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子</view>
+					<view class="item-top u-line-2">{{ item.goods_name }}</view>
 					<view class="item-bottom">
-						<view class="item-price">￥99</view>
+						<view class="item-price">￥{{ item.favlog_price }}</view>
 						<view class="item-date">
 							<image src="@/pageE/static/mine/26.png"></image>
-							<view>2020-05-17</view>
+							<view>{{ item.fav_time }}</view>
 						</view>
 					</view>
 				</view>
@@ -30,20 +30,7 @@
 export default {
 	data() {
 		return {
-			list: [
-				{
-					id: 1,
-					show: false
-				},
-				{
-					id: 2,
-					show: false
-				},
-				{
-					id: 3,
-					show: false,
-				}
-			],
+			list: [],
 			show: false,
 			options: [
 				{
@@ -61,17 +48,18 @@ export default {
 	methods: {
 		getGoodsFavoritesList() {
 			this.$u.api.getFavoritesList().then(res => {
-				if(res.errCode == 0) {}
+				if(res.errCode == 0) {
+					this.list = res.data;
+				}
 			})
 		},
 		removeFavorite(id) {
 			this.$u.api.removeFavorite({
 				id: id
 			}).then(res => {
+				this.$u.toast(res.message);
 				if(res.errCode == 0) {
 					this.getGoodsFavoritesList();
-				} else {
-					this.$u.toast(res.message);
 				}
 			})
 		},
diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue
index e167fd8..6ae95b9 100644
--- a/components/mine/order-item/index.vue
+++ b/components/mine/order-item/index.vue
@@ -82,7 +82,17 @@ export default {
 			})
 		},
 		applyRefund() {
+			let params = {
+				order_id: this.order.order_id,
+				// goods_id: goods_id,
+				// refund_amount: refund_amount,
+			}
+			this.$u.api.refundOrder(params).then(res => {
+				this.$u.toast(res.message);
+				if(res.errCode == 0) {
 
+				}
+			})
 		},
 		confirmReceive() {
 			this.$u.api.confirmReceive({
diff --git a/components/shop/recommend/pintuan.vue b/components/shop/recommend/pintuan.vue
index cfa60a9..a983347 100644
--- a/components/shop/recommend/pintuan.vue
+++ b/components/shop/recommend/pintuan.vue
@@ -20,7 +20,7 @@
                     <text>￥{{ info.goods_price }}</text>
                 </view>
             </view>
-            <image class="img" :src="info.groupbuy_image1"></image>
+            <image class="img" :src="info.pintuan_image"></image>
         </view>
     </view>
 </template>
diff --git a/pageE/mine/EditUserInfo.vue b/pageE/mine/EditUserInfo.vue
index b896a70..7f9eeb0 100644
--- a/pageE/mine/EditUserInfo.vue
+++ b/pageE/mine/EditUserInfo.vue
@@ -156,7 +156,7 @@ export default {
 			}).then(res => {
 				if (res.errCode == 0) {
 					this.getUserInfo();
-					this.$u.toast(res.message);
+					// this.$u.toast(res.message);
 				}
 			})
 		},
diff --git a/pageE/mine/MineConcerns.vue b/pageE/mine/MineConcerns.vue
index 3e7e741..fcc3b2e 100644
--- a/pageE/mine/MineConcerns.vue
+++ b/pageE/mine/MineConcerns.vue
@@ -1,15 +1,16 @@
 <template>
 	<view class="concerns">
-		<view>
+		<view class="concerns-container">
 			<view v-for="(info, index) in list" :key="index">
 				<view class="daren-item" @click="toDetailsPage">
-					<image class="head" :src="info.member_avatar"></image>
-					<text class="name">{{ info.member_nickname }}</text>
-					<text class="zhuangtai">状态: {{ info.live_status == 1 ? '正在直播' : '未开播' }}</text>
-					<view class="guanzhu" @click="changeType(info.member_id)" v-if="info.is_attention == 1">关注</view>
-					<view class="guanzhu action" @click="changeType(info.member_id)" v-else >未关注</view>
+					<image class="head" :src="info.friend_tomavatar"></image>
+					<text class="name">{{ info.friend_tomname }}</text>
+					<!-- <text class="zhuangtai">状态: {{ info.live_status == 1 ? '正在直播' : '未开播' }}</text> -->
+					<view class="guanzhu" @click="changeType(info.friend_frommid)" v-if="info.friend_followstate == 1">关注</view>
+					<view class="guanzhu action" @click="changeType(info.friend_frommid)" v-else>未关注</view>
 				</view>
 			</view>
+			<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="300"></u-empty>
 		</view>
 	</view>
 </template>
@@ -17,61 +18,73 @@
 export default {
 	data() {
 		return {
-			list: [
-				{
-					member_avatar: '',
-					member_nickname: '111',
-					live_status: 0,
-					member_id: 1,
-					is_attention: 1,
+			list: []
+		}
+	},
+	onShow() {
+		this.attentionMemberList();
+	},
+	methods: {
+		attentionMemberList() {
+			this.$u.api.attentionMemberList().then(res => {
+				if(res.errCode == 0) {
+					this.list = res.data;
+				} else {
+					this.list = [];
 				}
-			]
+			})
 		}
 	},
 };
 </script>
 <style lang="scss" scoped>
 .concerns {
-	.daren-item{
-		width: 215rpx;
-		height: 282rpx;
+	.concerns-container {
+		padding: 30rpx;
 		display: flex;
-		flex-direction: column;
-		align-items: center;
-		background-color: #fff;
-		border-radius: 10rpx;
-		overflow: hidden;
-		.head{
-			width: 80rpx;
-			height: 80rpx;
-			border-radius: 50%;
-			margin-top: 24rpx;
-			background-color: #0f0;
-		}
-		.name{
-			font-size: 26rpx;
-			color: #333;
-			font-weight: 400;
-			margin-top: 23rpx;
-		}
-		.zhuangtai{
-			font-size:22rpx;
-			color: #999;
-			margin-top: 19rpx;
-		}
-		.guanzhu{
-			width: 130rpx;
-			height: 50rpx;
-			background-color: #FF780F;
-			font-size: 26rpx;
-			line-height: 50rpx;
-			color: #fff;
-			text-align: center;
-			margin-top: 19rpx;
-			border-radius: 25rpx;
-		}
-		.action{
-			background: #f3f3f3;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		.daren-item{
+			width: 215rpx;
+			height: 282rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			background-color: #fff;
+			border-radius: 10rpx;
+			overflow: hidden;
+			.head{
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				margin-top: 24rpx;
+				background-color: #0f0;
+			}
+			.name{
+				font-size: 26rpx;
+				color: #333;
+				font-weight: 400;
+				margin-top: 23rpx;
+			}
+			.zhuangtai{
+				font-size:22rpx;
+				color: #999;
+				margin-top: 19rpx;
+			}
+			.guanzhu{
+				width: 130rpx;
+				height: 50rpx;
+				background-color: #FF780F;
+				font-size: 26rpx;
+				line-height: 50rpx;
+				color: #fff;
+				text-align: center;
+				margin-top: 19rpx;
+				border-radius: 25rpx;
+			}
+			.action{
+				background: #f3f3f3;
+			}
 		}
 	}
 }
diff --git a/pageE/mine/StoreCollection.vue b/pageE/mine/StoreCollection.vue
index 977f5ec..29818d0 100644
--- a/pageE/mine/StoreCollection.vue
+++ b/pageE/mine/StoreCollection.vue
@@ -3,20 +3,20 @@
 		<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="300"></u-empty>
 		<u-swipe-action
 			v-for="(item, index) in list" :key="index" 
-			:index='index'
+			:index='item.favlog_id'
 			:show="item.show"
 			:options="options"
 			@click="removeFavorite"
 			@open="open"
 		>
 			<view class="item u-border-bottom">
-				<image src="@/pageE/static/mine/23.png"></image>
+				<image :src="item.store_avatar"></image>
 				<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
 				<view class="title-wrap">
-					<view class="item-name u-line-1">胖胖定制此层wrap在此为必写的，否则可能会出现标题定位错误</view>
+					<view class="item-name u-line-1">{{ item.store_name }}</view>
 					<view class="item-date">
 						<image src="@/pageE/static/mine/26.png"></image>
-						<view>2020-05-17</view>
+						<view>{{ item.fav_time | date }}</view>
 					</view>
 				</view>
 			</view>
@@ -48,14 +48,14 @@ export default {
 				type: 2 // 店铺 type: 2
 			})
 		},
-		removeFavorite(id = 18) {
+		removeFavorite(id) {
+			console.log(id);
 			this.$u.api.removeFavorite({
 				id: id
 			}).then(res => {
+				this.$u.toast(res.message);
 				if(res.errCode == 0) {
 					this.getStoreFavoritesList();
-				} else {
-					this.$u.toast(res.message);
 				}
 			})
 		},
diff --git a/pageE/tool/ManicureOrder.vue b/pageE/tool/ManicureOrder.vue
index 2bc9fb3..e53cd92 100644
--- a/pageE/tool/ManicureOrder.vue
+++ b/pageE/tool/ManicureOrder.vue
@@ -90,7 +90,7 @@ export default {
 		},
 		chooseDate(e) {
 			// let time = e.year + '年' + e.month + '月' + e.day + '日' + e.hour + '时' + e.minute + '分'
-			let time = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute
+			let time = e.year + '/' + e.month + '/' + e.day + ' ' + e.hour + ':' + e.minute
 			this.time = time
 		},
 		showToast(message, type) {
diff --git a/pageE/tool/WashOrder.vue b/pageE/tool/WashOrder.vue
index 6c873d9..631580b 100644
--- a/pageE/tool/WashOrder.vue
+++ b/pageE/tool/WashOrder.vue
@@ -57,10 +57,10 @@
 						<view class="order-view order-area" @click="showAddress=true">
 							<view class="title">省市区:</view>
 							<input type="text" v-model="area" disabled />
-							<view class="location">
+							<!-- <view class="location">
 								<image src="../static/mine/28.png"></image>
 								<view>定位</view>
-							</view>
+							</view> -->
 						</view>
 						<view class="order-view order-address">
 							<view class="title">详细地址:</view>
@@ -113,10 +113,10 @@
 					<view class="order-view order-area" @click="showAddress=true">
 						<view class="title">省市区:</view>
 						<input type="text" v-model="area" disabled />
-						<view class="location">
+						<!-- <view class="location">
 							<image src="../static/mine/28.png"></image>
 							<view>定位</view>
-						</view>
+						</view> -->
 					</view>
 					<view class="order-view order-address">
 						<view class="title">详细地址:</view>
@@ -248,8 +248,8 @@ export default {
 	},
 	onShow() {
 		this.debounce = true;
-		this.current = 0;
-		this.swiperCurrent = 0;
+		// this.current = 0;
+		// this.swiperCurrent = 0;
 		this.showPopup = false;
 		this.choose = false;
 	},
@@ -313,7 +313,7 @@ export default {
 				}
 			}
 			if(this.current == 0) {
-				if(JSON.stringify(this.checkedGoods) != '{}') {
+				if(JSON.stringify(this.checkedGoods) == '{}') {
 					this.showToast('订单不能为空', 'warning');
 					return false;
 				}
@@ -322,7 +322,7 @@ export default {
 				this.showToast('衣服状况不能为空', 'warning');
 				return false;
 			}
-			if(JSON.stringify(this.type) != '{}') {
+			if(JSON.stringify(this.type) == '{}') {
 				this.showToast('商品类型不能为空', 'warning');
 				return false;
 			}
@@ -349,7 +349,7 @@ export default {
 			return true;
 		},
 		confirmSend() {
-			if(!this.validationParams) return false;
+			if(!this.validationParams()) return false;
 			let params = {
 				tid: this.type.value,
 				member_name: this.name,
@@ -655,6 +655,7 @@ export default {
 					.radio-view {
 						display: flex;
 						align-items: center;
+						margin-bottom: 20rpx;
 						.radio {
 							margin-right: 20rpx;
 						}
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 813a489..2cca45a 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -28,7 +28,7 @@
 					<view>店铺收藏</view>
 				</view>
 				<view @click="toOtherPage('/mine/ImageTextCollection')">
-					<view>9</view>
+					<view>{{ userInfo.member_fav_article_num || 0 }}</view>
 					<view>图文收藏</view>
 				</view>
 				<view @click="toOtherPage('/mine/Integral')">
-- 
2.45.2