Merge branch 'master' into xbx

App.vue

@@ -18,10 +18,10 @@
 <style lang="scss">
 	/* #ifndef APP-PLUS-NVUE */
 	@import "/static/css/normalize";
-	/* #endif */
     /* 顶部自定义导航留白 */
     .status_bar {
     	width: 100%;
     	height: var(--status-bar-height);
     }
+	/* #endif */
 </style>

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 });

components/index/video-item/index.vue

@@ -105,12 +105,12 @@
 		.action {
 			z-index: 19;
 			position: absolute;
-			right: 0rpx;
+			right: -10rpx;
-			bottom: 55rpx;
+			bottom: 60rpx;
 			// width: 234rpx;
+			border-radius: 6rpx;
 			background: rgba(255,255,255,1);
 			box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
-			border-radius: 6rpx;
 			.bubble {
 				position: relative;
 				background-color: #fff;
@@ -128,9 +128,10 @@
 					box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
 				}
 				> view {
-					padding: 9rpx 12rpx;
 					display: flex;
 					align-items: center;
+                    height: 52rpx;
+					padding: 10rpx 20rpx;
 					&:not(:last-child) {
 						border-bottom: 2rpx #ECECEC solid;
 					}

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: [
+			list: [],
-				{
-					id: 1,
-					show: false
-				},
-				{
-					id: 2,
-					show: false
-				},
-				{
-					id: 3,
-					show: false,
-				}
-			],
 			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);
 				}
 			})
 		},

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({

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>

pageA/login/login.vue

@@ -38,7 +38,8 @@
 			</view>
 			<!-- denglu QQ weixin -->
 			<view class="buttones">
-				<view @click="loginOn">{{login}}</view>
+				<view @click="loginOn" class="btn">{{login}}</view>
+                <view class="a-go" @click="goIndex">暂不登录</view>
 			</view>
 			<u-mask :show="show" @click="show = false">
 				<view class="warp">
@@ -302,6 +303,11 @@
 			},
 			tochange() {
 
+			},
+            goIndex() {
+                uni.switchTab({
+                    url: "/pages/index/index"
+                })
             }
 		},
 		components: {
@@ -446,7 +452,8 @@
 		height: 22rpx;
 	}
 
-	.buttones>view {
+	.buttones {
+        .btn {
             width: 628rpx;
             height: 98rpx;
             background: rgba(255, 120, 15, 1) !important;
@@ -460,6 +467,13 @@
             border-color: rgba(255, 120, 15, 1) !important;
             text-align: center;
         }
+        .a-go {
+            margin-top: 24rpx;
+            text-align: center;
+            font-size: 26rpx;
+            color: #f2f2f2;
+        }
+    }
 
 	.warp {
 		display: flex;

pageB/photo/index.vue

@@ -37,15 +37,21 @@
 							<text>{{ item.member_nickname }}</text>
 							<text class="time">{{ item.create_time }}</text>
 						</view>
-						<text class="reply" @click="openKeyInput(item)">回复</text>
+						<text class="reply" @click="openKeyInput(item,index)">回复</text>
 					</view>
 					<view class="content">
 						{{ item.content }}
 					</view>
+                    <view class="child-content">
+                        <view>
+                            
+                        </view>
+                        <view class="more-reply" v-if="item.reply_count">展开更多回复<u-icon name="arrow-down"></u-icon></view>
+                    </view>
 				</block>
 				<view class="no-data" v-else>111</view>
 			</scroll-view>
-			<view class="editing" @click="openKeyInput()">
+			<view class="editing" @click="openKeyInput">
 				<input type="text" value="" :placeholder="edit_text" disabled="disabled" />
 				<text>发送</text>
 			</view>
@@ -53,7 +59,7 @@
 		<!-- 评论box -->
 		<u-popup v-model="is_edit" mode="bottom" border-radius="10" height="100rpx">
 			<view class="edit-box">
-				<input type="text" :placeholder="edit_text" :focus="is_focus" @focus="focus" v-model="send_value">
+				<input type="text" :placeholder="edit_text_other" :focus="is_focus" @focus="focus" v-model="send_value">
 				<text @click="sendComment">发送</text>
 			</view>
 		</u-popup>
@@ -218,7 +224,13 @@
 			}
 			.content {
 				padding: 0 20rpx 10rpx 90rpx;
-				border-bottom: 1px solid #ececec;
+			}
+            .child-content {
+                margin: 6rpx 90rpx 6rpx;
+                .more-reply {
+                    font-size: 22rpx;
+                    color: #999;
+                }
             }
 		}
 		.no-data {
@@ -372,13 +384,28 @@ export default {
 			cartList: [],
 			cart_len: 0,
 			edit_text: "有爱评论，说点好听的 ~",
+			edit_text_other: "有爱评论，说点好听的 ~",
 			commentList: [], // 评论
+            allList: {}, // 全部子评论
         }
     },
 	onLoad(option){
 	    this.article_id = option.id;
 	    this.articleInfo(this.article_id);
 	},
+    // 监听返回按钮
+    onBackPress() {
+        if (this.cart_type) {
+            this.cart_type = !this.cart_type;
+        } else if (this.is_comment) {
+            this.is_comment = !this.is_comment;
+        } else if (this.is_edit) {
+            this.is_edit = !this.is_edit;
+        } else {
+            return false;
+        }
+        return true;
+    },
     methods:{
 		// 发现详情
         articleInfo(article_id){
@@ -414,22 +441,39 @@ export default {
 			})
 		},
 		// 打开评论输入
-		openKeyInput(data) {
+		openKeyInput(data,index) {
 			console.log(data);
 			this.is_edit = true;
 			this.is_focus = true;
+            this.comment_id = index;
+            if (data.id) {
+                this.edit_text_other = "回复@" + data.member_nickname;
+                this.pid = data.id;
+                this.reply_id = data.member_id;
+            } else {
+                this.edit_text_other = "有爱评论，说点好听的 ~";
+                this.pid = "";
+                this.reply_id = "";
+            }
+            // console.log(this.pid, this.edit_text_other);
 		},
 		// 发布评论
-		sendComment(data) {
+		sendComment() {
 			this.$u.post("article/articleAddComment",{
 				article_id: this.article_id,
 				content: this.send_value,
-				pid: data.id,
+				pid: this.pid,
-				reply_id: data.member_id,
+				reply_id: this.reply_id,
 			}).then(res => {
-				console.log(res);
+				// console.log(res.data.data);
 				if (res.errCode == 0) {
 					this.is_edit = false;
+                    if (res.data.data.pid) {
+                        this.commentList[this.comment_id].reply_count = true;
+                        this.allList[this.comment_id].unshift(res.data.data);
+                    } else {
+                        this.commentList.unshift(res.data.data);
+                    }
 				} else {
 					this.$u.toast(res.message);
 				}

pageB/sdetails/index.vue

@@ -372,7 +372,7 @@ export default {
 				if(type == 'involvement') {
 					Object.assign(params, {
 						pintuan_id: this.id, 
-						pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id 
+						pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id,
 					})
 				} else {
 					const userId = uni.getStorageSync('user_info').member.member_id;

pageC/cart/ConfirmOrder.vue

@@ -258,8 +258,10 @@ export default {
 						type: 'redirect',
 						url: '/pageC/cart/cashier',
 						params: {
+                            ifcart: params.ifcart,
 							pay_sn: res.data.pay_sn,
 							price: res.data.order_total_amount,
+                            order_id: res.data.order_list[0].order_id,
 						}
 					})
 				} else {

pageC/cart/cashier.vue

@@ -11,8 +11,8 @@
 						<image :src="item.icon"></image>
 						<text class="name">{{ item.pay_way }}</text>
 					</view>
-					<view class="radio-view" :class="pay_way == item.name ? 'active' : 'default'">
+					<view class="" :class="pay_way == item.name ? 'active' : 'default'">
-						<u-radio :name="item.name" active-color="#FF780F" :disabled="item.disabled"></u-radio>
+                        <u-radio class="radio-view" shape="circle" :name="item.name" active-color="#FF780F" :disabled="item.disabled"></u-radio>
 					</view>
 				</view>
 			</u-radio-group>
@@ -39,13 +39,18 @@ export default {
 				}
 			],
 			pay_way: 'wxpay_app',
-			pay_sn: '',
 			price: '',
+			pay_sn: '',
+            ifcart: '',
+            order_id: '',
 		}
 	},
 	onLoad(option) {
-		this.pay_sn = option.pay_sn;
+        console.log(option);
+        this.ifcart = option.ifcart;
 		this.price = option.price;
+		this.pay_sn = option.pay_sn;
+        this.order_id = option.order_id;
 	},
 	methods: {
 		radioGroupChange(e) {
@@ -55,14 +60,43 @@ export default {
 		// 	uni.getProvider({service: 'payment'})
 		// },
 		payOrder(provider, orderInfo) {
+            let me = this;
 			uni.requestPayment({
 				provider: provider,
 				orderInfo: orderInfo, //订单数据
-				success: function (res) {
+				success: (res) => {
 					console.log('success:' + JSON.stringify(res));
+                    this.$u.toast("支付成功！");
+                    setTimeout(function(){
+                        if (Boolean(parseInt(me.ifcart))) {
+                            me.$u.route({
+                                type: 'redirect',
+                                url: '/pageE/order/Index',
+                            })
+                        } else {
+                            me.$u.route({
+                                type: 'redirect',
+                                url: '/pageE/order/Details?oid=' + me.order_id,
+                            })
+                        }
+                    },2000)
 				},
-				fail: function (err) {
+				fail: (err) => {
 					console.log('fail:' + JSON.stringify(err));
+                    this.$u.toast("支付失败，支付已取消！");
+                    setTimeout(function(){
+                        if (Boolean(parseInt(me.ifcart))) {
+                            me.$u.route({
+                                type: 'redirect',
+                                url: '/pageE/order/Index',
+                            })
+                        } else {
+                            me.$u.route({
+                                type: 'redirect',
+                                url: '/pageE/order/Details?oid=' + me.order_id,
+                            })
+                        }
+                    },2000)
 				}
 			});
 		},
@@ -115,15 +149,18 @@ export default {
 		/deep/ .u-radio-group {
 			width: 100%;
 			flex-direction: column;
-			.radio-view {
+            .u-radio__icon-wrap {
-				padding: 6rpx;
+                width: 30rpx !important;
-				border-radius: 50%;
+                height: 30rpx !important;
+                padding: 4rpx;
+                border: 1px solid #FF780F;
             }
             .active {
-				border: 2rpx solid rgba(255,120,15,1);
             }
             .default {
-				border: 2rpx solid rgba(219,219,219,1);
+            }
+			.radio-view {
+                
 			}
 			.u-radio {
 				.u-icon {
@@ -135,13 +172,13 @@ export default {
 				}
 			}
 			.pay-item {
-				height: 98rpx;
-				background: rgba(255,255,255,1);
-				padding: 24rpx 30rpx;
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
+				height: 98rpx;
+				padding: 24rpx 30rpx;
 				margin-bottom: 2rpx;
+				background: rgba(255,255,255,1);
 				.pay-way {
 					display: flex;
 					align-items: center;

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);
 				}
 			})
 		},

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>
+					<image class="head" :src="info.friend_tomavatar"></image>
-					<text class="name">{{ info.member_nickname }}</text>
+					<text class="name">{{ info.friend_tomname }}</text>
-					<text class="zhuangtai">状态: {{ info.live_status == 1 ? '正在直播' : '未开播' }}</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" @click="changeType(info.friend_frommid)" v-if="info.friend_followstate == 1">关注</view>
-					<view class="guanzhu action" @click="changeType(info.member_id)" v-else >未关注</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,21 +18,32 @@
 export default {
 	data() {
 		return {
-			list: [
+			list: []
-				{
-					member_avatar: '',
-					member_nickname: '111',
-					live_status: 0,
-					member_id: 1,
-					is_attention: 1,
 		}
-			]
+	},
+	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 {
+	.concerns-container {
+		padding: 30rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
 		.daren-item{
 			width: 215rpx;
 			height: 282rpx;
@@ -74,5 +86,6 @@ export default {
 				background: #f3f3f3;
 			}
 		}
+	}
 }
 </style>

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);
 				}
 			})
 		},

pageE/order/Details.vue

@@ -235,9 +235,9 @@ export default {
 					title = "订单详情"
 					break;
 			}
-			uni.setNavigationBarTitle({
+			// uni.setNavigationBarTitle({
-				title: title
+			// 	title: title
-			});
+			// });
 		},
 		payNow() {
 			this.$u.route('/pageC/cart/cashier', {

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) {

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.current = 0;
-		this.swiperCurrent = 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;
 						}

pages/index/index.vue

@@ -2,7 +2,6 @@
 	<view>
 		<view class="status_bar"></view>
 		<view class="index">
-			<navigator url="/pageB/photo/index?id=28">bbb</navigator>
 			<view class="top">
 				<view class="sosuo"></view>
 				<view class="tabs">
@@ -83,7 +82,6 @@
 								</view>
 							</view>
 						</view>
-
 					</scroll-view>
 				</swiper-item>
 			</swiper>

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')">