Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/117

.gitignore

@@ -2,3 +2,4 @@
 /node_modules/*
 unpackage
 manifest.json
+deming.keystore

App.vue

@@ -1,6 +1,27 @@
 <script>
-	export default {}
+	import { mapMutations } from 'vuex';
+	export default {
+		onLaunch() {
+			// 缓存token
+			uni.getStorage({
+				key: "token",
+				success: (res) => {
+					this.loginIn(res.data);
+				}
+			})
+		},
+		methods: {
+			...mapMutations(['loginIn'])
+		}
+	}
 </script>
 <style lang="scss">
-@import "/static/css/normalize";
+	/* #ifndef APP-PLUS-NVUE */
+	@import "/static/css/normalize";
+    /* 顶部自定义导航留白 */
+    .status_bar {
+    	width: 100%;
+    	height: var(--status-bar-height);
+    }
+	/* #endif */
 </style>

common/api/shop.js

@@ -81,6 +81,14 @@ export default {
 			getGoodsClassRecommend() {
 				return vm.$u.post('Goods/getGoodsClassRecommend');
 			},
+			// goodsListByClassId
+			goodsListByClassId({ gc_id, page, order }) {
+				return vm.$u.post('goods/goodsListByClassId', {
+					gc_id: gc_id,
+					page: page,
+					order: order,
+				});
+			},
 			// 商品推荐
             getGoodsRecommend({page, gc_id}){
                 return vm.$u.post('Goods/getGoodsRecommend', {
@@ -253,12 +261,51 @@ export default {
 			tabLiveList(){
 				return vm.$u.post('Specialci/tabLiveList')
 			},
+			// 商城-活动广告
+			getStoreActivity() {
+				return vm.$u.post('adv/storeActivity')
+			},
 			// 获取图文视频详情
 			articleInfo({article_id}){
 				return vm.$u.post('article/articleInfo',{article_id})
 			},
 			getStoreInfo({id}){
 				return vm.$u.post('Store/getStoreInfo',{id})
+			},
+			// 评论标签+数量
+			getEvaluateSpec({ id }) {
+				return vm.$u.post('Specialci/getEvaluateSpec', {
+					goods_id: id,
+				})
+			},
+			// 获取商品评论
+			getAllEvalue({ goods_id, page, type }) {
+				return vm.$u.post('Specialci/getAllEvalue', {
+					goods_id: goods_id,
+					page: page,
+					type: type,
+				})
+			},
+			// 搜索发现列表
+			searchwordlist() {
+				return vm.$u.post('ShopSearch/searchwordlist')
+			},
+			// 提交试穿订单
+			saveGoodsTry({ member_name, member_mobile, area_info, address_detail, goods_id, num, store_id, appointment_time }) {
+				return vm.$u.post('Order/saveGoodsTry', {
+					member_name: member_name,
+					member_mobile: member_mobile,
+					area_info: area_info,
+					address_detail: address_detail,
+					goods_id: goods_id,
+					num: num,
+					store_id: store_id,
+					appointment_time: appointment_time,
+				})
+			},
+			//  达人上架商品
+			goodsShelves({live_id}){
+				return vm.$u.post('Specialci/goodsShelves',{live_id})
 			}
         }
     }

common/api/user.js

@@ -230,15 +230,22 @@ export default {
 				});
 			},
 			// 订单列表
-			getOrderList({ page, type, refund_state }) {
+			getOrderList({ page, type }) {
 				let params = { page: page };
-				if(type >= 0 || typeof type == 'string') Object.assign(params, {state_type: type});
-				if(refund_state) Object.assign(params, {refund_state: refund_state});
+				if(type > 0) Object.assign(params, {type: type});
 				return vm.$u.post('Order/orderList', params);
 			},
 			// 售后列表
-			getAfterSaleList({ page }) {
-				return vm.$u.post('order/afterSaleList', { page: page });
+			// getAfterSaleList({ page }) {
+			// 	return vm.$u.post('order/afterSaleList', { page: page });
+			// },
+			// 试穿列表
+			goodsTryOrderList() {
+				return vm.$u.post('order/goodsTryOrderList');
+			},
+			// 试穿订单确认完成
+			goodsTryConfirm({ id }) {
+				return vm.$u.post('order/goodsTryConfirm', { id: id });
 			},
 			// 订单详情
 			getOrderInfo({ order_id }) {
@@ -250,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 });
@@ -262,6 +278,9 @@ export default {
 			getOrderEvaluateInfo({ id }) {
 				return vm.$u.post('Order/getOrderEvaluateInfo', { id: id });
 			},
+			orderLogistics({ id }) {
+				return vm.$u.post('Order/orderLogistics', { order_id: id });
+			},
 			// 订单评价/修改评价
 			updateOrderEvaluate({ id, content, scores_one, scores_two, scores_three, file }) {
 				let params = {
@@ -326,6 +345,70 @@ export default {
 					code: code,
 				});
 			},
+			// 送洗列表-平台订单 实体店订单
+			sendLaundryOrderList({ type, page }) {
+				return vm.$u.post('member/sendLaundryOrderList', {
+					type: type,
+					page: page,
+				});
+			},
+			// 送洗-获取衣服类型
+			getClothesTypeList() {
+				return vm.$u.post('member/getClothesTypeList');
+			},
+			// 送洗评价
+			sendOrderComment({ id, comment }) {
+				return vm.$u.post('member/sendOrderComment', {
+					id: id,
+					comment: comment,
+				});
+			},
+			// 送洗确认完成
+			sendLaundryOrderConfirm({ id }) {
+				return vm.$u.post('member/sendOrderConfirm', {
+					id: id,
+				});
+			},
+			// 提交送洗
+			sendLaundrySave({ 
+				type, 
+				tid, 
+				condition, 
+				member_name, 
+				member_phone, 
+				area_info, 
+				address_info,
+				goods_name,
+				order_id,
+				goods_id,
+				goods_images,
+			}) {
+				return vm.$u.post('member/sendLaundrySave', {
+					type: type,
+					tid: tid,
+					condition: condition,
+					member_name: member_name,
+					member_phone: member_phone,
+					area_info: area_info,
+					address_info: address_info,
+					goods_name: goods_name,
+					order_id: order_id,
+					goods_id: goods_id,
+					goods_images: goods_images,
+				});
+			},
+			// 送洗评论列表
+			sendCommentList() {
+				return vm.$u.post('member/sendCommentList');
+			},
+			// 发现收藏列表
+			articleCollectList() {
+				return vm.$u.post('article/articleCollectList');
+			},
+			// 关注用户列表
+			attentionMemberList() {
+				return vm.$u.post('member/attentionMemberList');
+			},
         }
     }
 }

common/store/index.js

@@ -1,5 +1,9 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
+import {
+	mapMutations
+} from 'vuex';
+
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
@@ -12,10 +16,12 @@ const store = new Vuex.Store({
 		pintuangroup_headid: '', // 拼团团长id 有为开团 无为参团
 		groupbuyInfo: {}, // 秒杀详情
 		loadmore: {}, // 下拉加载返回的数据
+		hasLogin: false, // 登录状态
+		token: "" // 储存token
 	},
 	getters: {
 		getOrderAddress(state) {
-			return state.orderAddress;
+			return state.orderAddress || {};
 		},
 		getGoodsType(state) {
 			return state.goodsDetails.type;
@@ -25,6 +31,26 @@ const store = new Vuex.Store({
 		}
 	},
 	mutations: {
+		// 登录
+		loginIn(state, token) {
+			state.hasLogin = true;
+			state.token = token;
+			uni.setStorage({
+				key: "token",
+				data: token
+			})
+		},
+		// 退出登录
+		logout(state) {
+			state.hasLogin = false;
+			state.token = "";
+			uni.removeStorage({
+				key: "token"
+			})
+			uni.removeStorage({
+				key: "user_info"
+			})
+		},
 		setOrderType(state, type) {
 			state.orderType = type;
 		},
@@ -48,7 +74,7 @@ const store = new Vuex.Store({
 		},
 		setLoadMore(state, info) {
 			state.loadmore = info;
-		},
+		}
 	}
 })
 export default store;

components/comment/index.vue

@@ -0,0 +1,115 @@
+<template>
+	<view class="comment-item">
+		<view class="user">
+			<u-avatar :src="content.member_avatar" class="avatar" size="60"></u-avatar>
+			<text class="name">{{ content.geval_frommembername }}</text>
+			<u-rate v-if="reply" :disabled='true' :count="count" v-model="rate" size="23" active-color="#FF780F" inactive-color="#F0EDF1" gutter="10"></u-rate>
+		</view>
+		<view class="content">
+			<view class="text">{{ content.geval_content }}</view>
+		</view>
+		<view class="image-container">
+			<image :src="src" v-for="(src, index) in content.geval_image" :key="index"></image>
+		</view>
+		<view class="reply" v-if="reply && content.geval_explain">
+			<view class="title">掌柜回复：</view>
+			<view class="content u-line-4">{{ content.geval_explain }}</view>
+		</view>
+		<view class="time" v-if="reply">
+			<image src="/static/image/common/20.png"></image>
+			<view class="value">{{ content.geval_addtime }}</view>
+		</view>
+	</view>
+</template>
+<script>
+/*
+* @description 显示评价
+* @property {Boolean} reply 是否显示回复/时间/评分
+**/
+export default {
+	data() {
+		return {
+			count: 5,
+			rate: 0,
+		}
+	},
+	props: {
+		content: Object,
+		reply: Boolean,
+	},
+	created() {
+		if(this.content.hasOwnProperty('scores_two')) this.rate = this.content.scores_two;
+	}
+};
+</script>
+<style lang="scss" scoped>
+.comment-item {
+	background-color: #ffffff;
+	.user {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+		.name {
+			margin: 0 20rpx;
+			font-size: 26rpx;
+			color: rgba(153,153,153,1);
+		}
+	}
+	.content {
+		margin-bottom: 20rpx;
+		.text {
+			font-size: 26rpx;
+			color: rgba(51,51,51,1);
+			line-height: 40rpx;
+			margin-bottom: 20rpx;
+		}
+		> image {
+			width: 210rpx;
+			height: 210rpx;
+			border-radius: 10px;
+			&:not(:nth-child(3n)) {
+				margin-right: 30rpx;
+			}
+		}
+	}
+	.image-container {
+		margin: 20rpx 0;
+		> image {
+			width: 210rpx;
+			height: 210rpx;
+			border-radius: 10rpx;
+			margin-bottom: 20rpx;
+			&:not(:nth-child(3n)) {
+				margin-right: 30rpx;
+			}
+		}
+	}
+	.reply {
+		padding: 30rpx;
+		background: rgba(240,238,238,1);
+		border-radius: 10rpx;
+		font-size: 24rpx;
+		color: rgba(102,102,102,1);
+		margin-bottom: 20rpx;
+		.title {
+			margin-bottom: 16rpx;
+		}
+		.content {
+			line-height: 36rpx;
+		}
+	}
+	.time {
+		display: flex;
+		align-items: center;
+		> image {
+			width: 28rpx;
+			height: 28rpx;
+			margin-right: 12rpx;
+		}
+		.value {
+			font-size: 24rpx;
+			color: rgba(153,153,153,1);
+		}
+	}
+}
+</style>

components/index/daren-item/index.vue

@@ -3,8 +3,8 @@
         <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"  @tap="changeType(info.member_id)" v-if="info.is_attention == 1">关注</view>
-        <view class="guanzhu action" @tap="changeType(info.member_id)" v-else >未关注</view>
+        <view class="guanzhu action"  @tap="changeType(info.member_id)" v-if="info.is_attention == 1">已关注</view>
+        <view class="guanzhu" @tap="changeType(info.member_id)" v-else >未关注</view>
     </view>
 </template>
 <script>
@@ -80,6 +80,7 @@ export default {
     }
 	.action{
 		background: #f3f3f3;
+		color: #FF780F;
 	}
 }
 </style>

components/index/video-item/index.vue

@@ -50,10 +50,10 @@
     .title{
         margin:0 auto;
         margin-top: 20rpx;
-        font-size: 22rpx;
+        font-size: 28rpx;
         color: #333;
         font-weight: 500;
-        line-height: 30rpx;
+        line-height: 48rpx;
         width: 300rpx;
         overflow:hidden; 
         text-overflow:ellipsis;
@@ -105,14 +105,15 @@
 		.action {
 			z-index: 19;
 			position: absolute;
-			right: 0rpx;
-			bottom: 55rpx;
+			right: -10rpx;
+			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;
+                border-radius: 20rpx;
 				background-color: #fff;
 				&::after {
 					position: absolute;
@@ -128,9 +129,9 @@
 					box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
 				}
 				> view {
-					padding: 9rpx 12rpx;
 					display: flex;
 					align-items: center;
+					padding: 20rpx 30rpx;
 					&:not(:last-child) {
 						border-bottom: 2rpx #ECECEC solid;
 					}
@@ -141,17 +142,17 @@
 					}
 					> image {
 						&:first-child {
-							@include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx);
+							@include image-class($width: 30rpx, $height: 30rpx, $right: 12rpx);
 						}
 						&:nth-child(2) {
-							@include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx);
+							@include image-class($width: 30rpx, $height: 30rpx, $right: 12rpx);
 						}
 						&:last-child {
-							@include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx);
+							@include image-class($width: 30rpx, $height: 30rpx, $right: 9rpx);
 						}
 					}
 					> text {
-						font-size: 20rpx;
+						font-size: 24rpx;
 						color: rgba(51,51,51,1);
 					}
 				}
@@ -204,6 +205,7 @@ export default {
 			}).then(res => {
 				console.log(res)
 				if(res.errCode == 0) {
+                    this.$u.toast(res.message);
 					this.$emit("getArticlelist");
 				}
 			})
@@ -212,8 +214,9 @@ export default {
 			this.$u.api.articleCollect({
 				article_id: this.item.article_id,
 			}).then(res => {
-				console.log(res)
+				console.log(res);
 				if(res.errCode == 0) {
+                    this.$u.toast(res.message);
 					this.$emit("getArticlelist");
 				}
 			})
@@ -225,6 +228,7 @@ export default {
 			}).then(res => {
 				// console.log(res)
 				if(res.errCode == 0) {
+                    this.$u.toast(res.message);
 					this.$emit("getArticlelist");
 				}
 			})
@@ -233,7 +237,6 @@ export default {
 			 uni.navigateTo({
 				url: '/pageB/photo/index?id=' + id
 			});
-
 		},
 	},
 }

components/index/zhibo-item/index.vue

@@ -1,14 +1,14 @@
 <template>
-    <view class="zhibo">
-        <image class="head"></image>
+    <view class="zhibo" @click="zhibo">
+        <image class="head" :src="image"></image>
         <view class="user">
             <view class="name">
                 <image></image>
-                <text>这是名字</text>
+                <text class="u-line-1" style="width:130rpx">{{name}}</text>
             </view>
             <view class="pingbi">
                 <image></image>
-                <text>屏蔽用户</text>
+                <text>1屏蔽用户</text>
             </view>
         </view>
     </view>    
@@ -70,6 +70,19 @@ export default {
         return {
 
         }
+    },
+    methods:{
+        zhibo(){
+            this.$u.route({
+                url:"/pages/zhibo/index",
+               params:{
+                   url:this.url,
+                   id:this.zid,
+                   rid:this.rid
                } 
+            })
+        }
+    },
+    props:['name','image','url','zid','rid']
 }
 </script>

components/informations/notice/notice.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="notice">
-		<view v-for="(item,index) in notice">
+		<view v-for="(item,index) in notice" :key="index">
 			<view class="time_notice">2020-05-14 20:11</view>
 			<view class="notice_view">
 				<image :src="item.url" mode="aspectFill" ></image>
 				<view class="text_view">{{item.content}}</view>
 				<view class="notice_list">
 					<text>查看详情</text>
-					<view> > </view>
+					<u-icon name="arrow-right" color="#666"></u-icon>
 				</view>
 			</view>
 		</view>
@@ -15,7 +15,6 @@
 </template>
 <style lang="scss" scoped>
 	.notice {
-		background: #ECECEC;
 		.notice_view{
 			width: 690rpx;
 			height: 489rpx;

components/loadmore/index.vue

@@ -42,17 +42,6 @@ export default {
 			// 	this.loadStatus = "nomore";
 			// 	this.tpage--;
 			// })
-			// this.$parent.callback({ page: this.tpage }).then(length => {
-			// 	if(length == 0) {
-			// 		this.tpage--;
-			// 		this.status = 'nomore';
-			// 	} else {
-			// 		this.status = 'loading';
-			// 	}
-			// }).catch(() => {
-			// 	this.loadStatus = "nomore";
-			// 	this.tpage--;
-			// })
 		}
 	}
 };

components/logininput/identifying.vue

@@ -68,7 +68,8 @@
 							this.$refs.uCode.start();
 						}, 2000);
 					} else {
-						this.$u.toast('倒计时结束后再发送');
+						// this.$u.toast('倒计时结束后再发送');
+                        console.log("倒计时结束后再发送");
 					}
 				}
 

components/mine/address-active/index.vue

@@ -7,12 +7,12 @@
 			<view>
 				<input type="text" placeholder="手机号" maxlength="11" v-model="phone" />
 			</view>
-			<view class="area" @click="show=true">
-				<input type="text" placeholder="省市区" v-model="address" disabled />
-				<view>
+			<view class="area">
+				<input type="text" placeholder="省市区" v-model="address" disabled @click="show=true" />
+				<!-- <view @click="chooseArea">
 					<image src="/static/image/mine/24.png"></image>
 					<text>定位</text>
-				</view>
+				</view> -->
 			</view>
 			<view>
 				<input type="text" placeholder="详细地址" v-model="area" />
@@ -49,6 +49,7 @@ export default {
 			area: '', // 详细地址
 			area_id: '', // 地区id 省
 			city_id: '', // 城市id
+			debounce: true,
 		}
 	},
 	props: {
@@ -78,8 +79,20 @@ export default {
 		},
 		//　判断是不是编辑页面 调用接口
 		confirmBtn() {
+			if(!this.debounce) return;
+			this.debounce = false;
 			this.info ? this.editAddress() : this.addAddress();
 		},
+		// chooseArea() {
+		// 	uni.chooseLocation({
+		// 		success: function (res) {
+		// 			console.log('位置名称：' + res.name);
+		// 			console.log('详细地址：' + res.address);
+		// 			console.log('纬度：' + res.latitude);
+		// 			console.log('经度：' + res.longitude);
+		// 		}
+		// 	});
+		// },
 		// 验证
 		validateValue() {
 			if(this.$u.test.isEmpty(this.name)) {
@@ -118,20 +131,13 @@ export default {
 				// latitude,
 			}).then((res)=>{
 				if (res.errCode == 0) {
-					uni.redirectTo({
-						url: '/pageE/more/Address'
-					});
-					// this.$refs.uToast.show({
-					// 	title: res.message,
-					// 	type: 'success',
-					// 	// url: '/pageE/more/Address',
-					// 	callback() {
-					// 		uni.redirectTo({
-					// 			url: '/pageE/more/Address'
-					// 		});
-					// 	}
-					// })
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success',
+						back: true,
+					})
 				} else {
+					this.debounce = true;
 					this.showToast(res.message, 'warning');
 				}
 			})
@@ -151,20 +157,13 @@ export default {
 				// latitude,
 			}).then((res)=>{
 				if (res.errCode == 0) {
-					uni.redirectTo({
-						url: '/pageE/more/Address'
-					});
-					// this.$refs.uToast.show({
-					// 	title: res.message,
-					// 	type: 'success',
-					// 	// url: '/pageE/more/Address',
-					// 	callback() {
-					// 		uni.redirectTo({
-					// 			url: '/pageE/more/Address'
-					// 		});
-					// 	}
-					// })
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success',
+						back: true,
+					})
 				} else {
+					this.debounce = true;
 					this.showToast(res.message, 'warning');
 				}
 			})

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

components/mine/comment/index.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="comment">
 		<view class="user-info">
-			<image src="@/pageE/static/mine/23.png" class="user-avatar"></image>
-			<view class="user-name">***雪</view>
+			<image :src="info.member_avatar" class="user-avatar"></image>
+			<view class="user-name">{{ info.member_nickname }}</view>
 		</view>
 		<view class="user-comment">
-			<view class="text u-line-2">宝贝收到了和卖家描述的一样,质量不错,很漂亮一直想买这样的杯子，这个蓝色的稍微有点小瑕疵，不过自己用没问题没问题没问题</view>
+			<view class="text u-line-2">{{ info.comment }}</view>
 			<view class="image">
-				<image v-for="(src, index) in ImageList" :key="index" :src="src" mode="aspectFit"></image>
+				<image v-for="(src, index) in info.images" :key="index" :src="src" mode="aspectFit"></image>
 			</view>
 		</view>
 	</view>
@@ -15,14 +15,10 @@
 <script>
 export default {
 	data() {
-		return {
-			ImageList: [
-				require('@/pageE/static/mine/23.png'),
-				require('@/pageE/static/mine/23.png'),
-				require('@/pageE/static/mine/23.png'),
-				require('@/pageE/static/mine/23.png')
-			]
-		}
+		return {}
+	},
+	props: {
+		info: Object,
 	}
 };
 </script>

components/mine/order-item/index.vue

@@ -12,32 +12,37 @@
 				<image :src="goods.goods_image"></image>
 				<view class="goods-text">
 					<view class="goods-name u-line-2">{{ goods.goods_name }}</view>
-					<view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40">XL;红色条纹XL;红色条纹XL;红色条纹</view>
-					<view class="goods-time u-line-1" v-if="order.order_state == 10 || order.order_state == 10">距离结束：23:23:38</view>
-					<view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价：￥99.00，实付款￥99</view>
+					<view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40 && goods.goods_spec">
+						<text v-for="(spec, index) in goods.goods_spec" :key="index">{{ spec + ';' }}</text>
+					</view>
+					<view class="goods-time u-line-1" v-if="order.view_type == 1">结束时间：{{ order.end_time | date('yyyy-mm-dd hh:MM') }}</view>
+					<view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价：￥{{ goods.goods_price }}，实付款￥{{ goods.goods_pay_price }}</view>
 					<view class="goods-date" v-if="order.order_state == 20 || order.order_state == 40">
 						<image src="@/pageE/static/mine/26.png"></image>
-						<view>{{ order.add_time | date }}</view>
+						<view>{{ order.add_time | date('yyyy-mm-dd hh:MM') }}</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		<view class="order-btn" v-if="[10, 30, 20, 40].indexOf(order.order_state) >= 0">
-			<view class="logistics" v-if="order.order_state == 30">确认收货</view>
-			<view class="logistics" v-if="order.order_state == 30" @click="toOtherPage('Logistics')">查看物流</view>
-			<view class="comment" v-if="order.order_state == 40 && order.evaluation_state == 0" @click="toOtherPage('Comment')">立即评价</view>
-			<view class="calcel" v-if="order.order_state == 10" @click="cancelOrder">取消支付</view>
-			<view class="payment" v-if="order.order_state == 10">立即支付</view>
-			<view class="service" v-if="order.order_state == 20">联系官方客服</view>
-			<view class="submit" v-if="order.order_state == 20">提交官方审核</view>
+		<view class="order-btn" v-if="[1, 2, 3, 4, 8].indexOf(order.view_type) >= 0">
+			<!-- @click="toOtherPage('RefundOrder')" -->
+			<view class="cancel" v-if="order.view_type == 3 || order.view_type == 2">申请退款</view>
+			<view class="cancel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</view>
+			<view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>
+			<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
+			<view class="cancel" v-if="order.view_type == 1" @click="cancelOrder">取消支付</view>
+			<view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount,order.order_id)">立即支付</view>
+			<view class="service" v-if="order.view_type == 8">联系官方客服</view>
+			<view class="submit" v-if="order.view_type == 8">提交官方审核</view>
 		</view>
 	</view>
 </template>
 <script>
+import common from '@/static/js/common.js';
 export default {
 	data() {
 		return {
-			state: '', // 1: 待收货 2: 待评价 3: 交易成功 4: 已取消 5: 已退款 6: 待支付, 7: 售后
+			state: '',
 		}
 	},
 	props: {
@@ -49,33 +54,34 @@ export default {
 	methods: {
 		viewState() {
 			let state;
-			switch (this.order.order_state) {
-				case 0: // 已取消
-					state = '已取消';
-					break;
-				case 10: // 未付款
+			switch (this.order.view_type) {
+				case 1:
 					state = '待支付';
 					break;
-				case 20: // 已付款
-					state = '交易成功';
+				case 2:
+					state = '待发货';
 					break;
-				case 30: // 已发货
+				case 3:
 					state = '待收货';
 					break;
-				case 40: // 已收货
-					if(this.order.evaluation_state == 0) state = '待评价';
-					else state = '交易成功'
+				case 4:
+					state = '待评价';
+					break;
+				case 5:
+					state = '交易成功';
+					break;
+				case 6:
+					state = '待退款';
+					break;
+				case 7:
+					state = '已退款';
+					break;
+				case 9:
+					state = '拼团中';
 					break;
 				default:
 					break;
 			}
-			if(this.order.refund_state) state = '已退款';
-			// 申请退款
-			if(this.order.refund_data) {
-				if([1, 2].indexOf(this.order.refund_data.refund_state) >= 0) state = '待退款';
-				if(this.order.refund_data.refund_state == 3) state = '已退款';
-			}
-				
 			this.state = state;
 		},
 		cancelOrder() {
@@ -83,8 +89,19 @@ export default {
 				order_id: this.order.order_id,
 			}).then(res => {
 				if(res.errCode == 0) {
-					this.$emit("refreshOrderList", { reload: 'again' });
+					this.$emit("refreshOrderList");
 				}
+				this.$u.toast(res.message);
+			})
+		},
+		confirmReceive() {
+			this.$u.api.confirmReceive({
+				order_id: this.order.order_id,
+			}).then(res => {
+				if(res.errCode == 0) {
+					this.$emit("refreshOrderList");
+				}
+				this.$u.toast(res.message);
 			})
 		},
 		toOtherPage(url) {
@@ -92,6 +109,13 @@ export default {
 				oid: this.order.order_id,
 			});
 		},
+		payNow(pay_sn, order_amount, id) {
+			this.$u.route('/pageC/cart/cashier', {
+				pay_sn: pay_sn,
+				price: order_amount,
+                order_id: id
+			});
+		},
 	},
 };
 </script>
@@ -114,6 +138,7 @@ export default {
 				height: 50rpx;
 				border-radius: 50%;
 				margin-right: 15rpx;
+				background-color: aquamarine;
 			}
 			.store-name {
 				font-size: 26rpx;
@@ -146,6 +171,7 @@ export default {
 					line-height: 38rpx;
 				}
 				.goods-sku {
+					display: inline-block;
 					max-width: 230rpx;
 					background: rgba(236,236,236,1);
 					border-radius: 6rpx;
@@ -193,7 +219,7 @@ export default {
 		.logistics, .comment, .payment {
 			@include btn-class($width: 160rpx, $color: rgba(255,119,15,1));
 		}
-		.calcel {
+		.cancel {
 			@include btn-class($width: 160rpx, $color: rgba(155,153,153,1));
 		}
 		.service {

components/mine/order-item/try.vue

@@ -0,0 +1,192 @@
+<template>
+	<view class="order-item">
+		<view class="order-title">
+			<view class="store-info">
+				<image :src="order.store_avatar"></image>
+				<view class="store-name">{{ order.store_name }}</view>
+			</view>
+			<view class="order-status">{{ state }}</view>
+		</view>
+		<view class="goods-info">
+			<view class="goods-item">
+				<image :src="order.goods_image"></image>
+				<view class="goods-text">
+					<view class="goods-name u-line-2">{{ order.goods_name }}</view>
+					<!-- <view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40 && goods.goods_spec">
+						<text v-for="(spec, index) in goods.goods_spec" :key="index">{{ spec + ';' }}</text>
+					</view> -->
+					<!-- <view class="goods-time u-line-1" v-if="order.order_state == 10 || order.order_state == 10">结束时间：{{ order.add_time * 1000 | date('yyyy-mm-dd hh:MM') }}</view> -->
+				</view>
+			</view>
+		</view>
+		<view class="order-btn" v-if="order.goods_try_order_status == 20">
+			<view class="logistics" @click="confirmOrder">确认完成</view>
+		</view>
+	</view>
+</template>
+<script>
+import common from '@/static/js/common.js';
+export default {
+	data() {
+		return {
+			state: '', 
+		}
+	},
+	props: {
+		order: Object
+	},
+	created() {
+		this.viewState();
+	},
+	filters: {},
+	methods: {
+		// "goods_try_order_status": 0,    试穿订单状态 0:待处理订单 20:同意 40:拒绝此订单 50:完成
+		viewState() {
+			let state;
+			switch (this.order.goods_try_order_status) {
+				case 0: 
+					state = '等待商家回复';
+					break;
+				case 20: 
+					state = '商家已接单';
+					break;
+				case 40:
+					state = '商家已拒绝';
+					break;
+				case 50:
+					state = '订单已结束';
+					break;
+				default:
+					break;
+			}
+			this.state = state;
+		},
+		confirmOrder() {
+			this.$u.api.goodsTryConfirm({
+				id: this.order.goods_try_id,
+			}).then(res => {
+				if(res.errCode == 0) {
+					this.$emit("refreshOrderList");
+				}
+				this.$u.toast(res.message);
+			})
+		},
+		toOtherPage(url) {
+			this.$u.route('/pageE/order/' + url, {
+				oid: this.order.order_id,
+			});
+		},
+	},
+};
+</script>
+<style lang="scss" scoped>
+.order-item {
+	width: 690rpx;
+	background: rgba(255,255,255,1);
+	border-radius: 20rpx;
+	padding: 30rpx;
+	.order-title {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+		.store-info {
+			display: flex;
+			align-items: center;
+			> image {
+				width: 50rpx;
+				height: 50rpx;
+				border-radius: 50%;
+				margin-right: 15rpx;
+				background-color: aquamarine;
+			}
+			.store-name {
+				font-size: 26rpx;
+				color: rgba(51,51,51,1);
+			}
+		}
+		.order-status {
+			font-size: 28rpx;
+			color: rgba(255,120,15,1);
+		}
+	}
+	.goods-info {
+		.goods-item {
+			display: flex;
+			margin-bottom: 28rpx;
+			> image {
+				flex-shrink: 0;
+				width: 180rpx;
+				height: 160rpx;
+				border-radius: 10rpx;
+				margin-right: 30rpx;
+			}
+			.goods-text {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				.goods-name {
+					font-size: 28rpx;
+					color: rgba(51,51,51,1);
+					line-height: 38rpx;
+				}
+				.goods-sku {
+					max-width: 230rpx;
+					background: rgba(236,236,236,1);
+					border-radius: 6rpx;
+					padding: 10rpx 15rpx;
+					font-size: 24rpx;
+					color: rgba(153,153,153,1);
+				}
+				.goods-time {
+					font-size: 24rpx;
+					color: rgba(255,49,49,1);
+				}
+				.goods-price {
+					font-size: 24rpx;
+					color: rgba(253,211,96,1);
+				}
+				.goods-date {
+					display: flex;
+					align-items: center;
+					font-size: 24rpx;
+					color: rgba(153,153,153,1);
+					> image {
+						width: 24rpx;
+						height: 24rpx;
+						margin-right: 21rpx;
+					}
+				}
+			}
+		}
+	}
+	.order-btn {
+		display: flex;
+		justify-content: flex-end;
+		@mixin btn-class($width, $color) {
+			width: $width;
+			height: 60rpx;
+			border: 2rpx solid $color;
+			color: $color;
+			border-radius: 30rpx;
+			padding: 15rpx 23rpx;
+			font-size: 28rpx;
+			&:not(:last-child) {
+				margin-right: 30rpx;
+			}
+		}
+		.logistics, .comment, .payment {
+			@include btn-class($width: 160rpx, $color: rgba(255,119,15,1));
+		}
+		.calcel {
+			@include btn-class($width: 160rpx, $color: rgba(155,153,153,1));
+		}
+		.service {
+			@include btn-class($width: 216rpx, $color: rgba(155,153,153,1));
+		}
+		.submit {
+			@include btn-class($width: 216rpx, $color: rgba(255,119,15,1));
+		}
+	}
+}
+</style>

components/remaining/remaining.vue

@@ -4,7 +4,7 @@
 		<view v-if="type" id="video_mp4">
 			<view class="page-body">
 				<view class="page-section">
-					<video id="myVideo" :src=" 'https://' + vide0_url" :controls="controls" :autoplay="autoplayes" :loop="loop" @error="videoErrorCallback"
+					<video id="myVideo" enable-progress-gesture="false" :src=" 'https://' + vide0_url" autoplay controls="false" @error="videoErrorCallback" @timeupdate="timeupdate"
 					 enable-danmu danmu-btn></video>
 				</view>
 			</view>
@@ -17,11 +17,12 @@
 				<view class="uni-padding-wrap">
 					<view class="page-section swiper">
 						<view class="page-section-spacing">
-							<swiper class="swiper" :indicator-dots="true" :style="{height:heightOut+'px'}" :autoplay="false" :interval="3000" :duration="1000">
-								<swiper-item v-for="item in list" >
+							<swiper class="swiper" :indicator-dots="true" :style="{height:heightOut+'px'}" :autoplay="false" :interval="3000" :duration="1000" @animationfinish="">
+								<swiper-item v-for="(item,index) in list" :key="index">
 									<view class="swiper-item uni-bg-red">
 										<image :src=" 'https://' + item.launch_path"></image>
 									</view>
+                                    <view class="btn-init" v-if="parseInt(index) == 2" @click="goNext">立即体验</view>
 								</swiper-item> 
 							</swiper>
 						</view>
@@ -48,13 +49,12 @@
 	export default {
 		data() {
 			return {
-				remaining: 4,
+				remaining: 7,
 				type: true,
 				banner: false,
 				protocol: false,
 				heightOut: '',
 				imgurl: [],
-				loop: 'true',
 				vide0_url: '',
 				agreement: { // 用户协议内容
 					document_title: "",
@@ -67,28 +67,16 @@
 				src: '',
 				inputValue: '',
 				controls: false,
-				autoplayes: true,
 				list: [],
-				danmuList: [{
-						text: '第 1s 出现的弹幕',
-						color: '#ff0000',
-						time: 1
-					},
-					{
-						text: '第 3s 出现的弹幕',
-						color: '#ff00ff',
-						time: 3
-					}
-				],
 				background: ['color1', 'color2', 'color3'],
 				indicatorDots: true,
-				autoplay: true,
 				interval: 2000,
-				duration: 500
+				duration: 500,
+                swiper_index: "",
 			};
 		},
 		onReady: function(res) {
-			this.videoContext = uni.createVideoContext('myVideo')
+			this.videoContext = uni.createVideoContext('myVideo');
 		},
 		methods: {
 			apiwelcome() {
@@ -110,7 +98,6 @@
 					let vide0_url = res.data.start_page[0].launch_path
 					this.list = data_image;
 					this.vide0_url = vide0_url;
-					console.log(this.list)
 				})
 			},
 			// 3秒倒计时
@@ -120,7 +107,7 @@
 					if (this.remaining <= 0) {
 						clearInterval(this.timer);
 						console.log("完了")
-						this.type = !this.type
+						this.type = !this.type;
 						this.banner = !this.banner;
 					}
 				}, 1000);
@@ -142,19 +129,32 @@
 				uni.getSystemInfo({
 					success: function(res) {
 						that.heightOut = res.windowHeight;
-						console.log('666666666666666' + that.heightOut)
+						console.log(that.heightOut)
 					}
 				});
 			},
+            // 立即体验
+            goNext() {
+                this.protocol = true;
+                this.banner = false;
+            },
 			// 我同意
 			to_agree() {
+				uni.setStorage({
+					key: 'launchFlag',
+					data: true,
+					success: function() {
+						console.log('点击存储launchFlag');
+					}
+				});
 				uni.navigateTo({
 					url: '/pageA/login/login'
 				});
 			},
 			// 视频引入
 			bindInputBlur: function(e) {
-				this.inputValue = e.target.value
+				this.inputValue = e.target.value;
+                console.log(e.target.value);
 			},
 			bindButtonTap: function() {
 				var that = this
@@ -174,8 +174,10 @@
 				})
 			},
 			videoErrorCallback: function(e) {
-				console.log('视频错误信息:')
-				console.log(e.target.errMsg)
+				console.log('视频错误信息:',e);
+			},
+            timeupdate(e) {
+              console.log(e);  
             },
 			getRandomColor: function() {
 				const rgb = []
@@ -186,18 +188,6 @@
 				}
 				return '#' + rgb.join('')
 			},
-			changeIndicatorDots(e) {
-				this.indicatorDots = !this.indicatorDots
-			},
-			changeAutoplay(e) {
-				this.autoplay = !this.autoplay
-			},
-			intervalChange(e) {
-				this.interval = e.target.value
-			},
-			durationChange(e) {
-				this.duration = e.target.value
-			},
 			refreshToken_function(){
 				this.$u.api.refreshToken({}).then((res) => {
 					console.log(res)
@@ -209,10 +199,10 @@
 			}
 	},
 	mounted() {
-		this.refreshToken_function()
+		this.refreshToken_function();
 		// 3秒倒计时调用
-		this.remaining_time()
-		this.apiwelcome()
+		this.remaining_time();
+		this.apiwelcome();
 	}
 	}
 </script>
@@ -221,34 +211,41 @@
 	.uni-padding-wrap{
 		// height: 400rpx;
 	}
-	.welcome_jumpes {
-		width: 94rpx;
-		height: 36rpx;
-		opacity: 0.5;
-		border-radius: 18rpx;
+    .btn-init {
+        z-index: 1000;
         position: absolute;
-		right: 37rpx;
-		top: 66rpx;
+        bottom: 100rpx;
+        right: 30%;
+        width: 300rpx;
+        height: 80rpx;
+        line-height: 80rpx;
+        text-align: center;
+        color: #fff;
+        border-radius: 40rpx;
+        background-color: #007AFF;
+    }
+	.welcome_jumpes {
+		z-index: 100;
+		position: absolute;
+		top: 80rpx;
+		right: 60rpx;
+		width: 100rpx;
+		height: 40rpx;
+		border-radius: 20rpx;
 		font-size: 22rpx;
 		text-align: center;
-		line-height: 35rpx;
+		line-height: 40rpx;
 		color: #fff;
-		background: #C4CAC6;
-		z-index: 10;
+		background-color: rgba(0,0,0,0.5);
 	}
 
 	#myVideo {
-		position: absolute;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		top: 0;
-		margin: auto;
+        width: 100%;
 	}
 
 	uni-video {
 		width: 100%;
-		height: auto;
+		height: 100%;
 	}
 
 	.uni-video-container {
@@ -257,8 +254,8 @@
 
 	.welcome_images {
 		width: 100%;
+		height: 100vh;
 		position: fixed;
-		height: 100%
 	}
 
 	uni-swiper,
@@ -266,7 +263,7 @@
 	uni-image {
 		width: 100%;
 		// position: fixed;
-		height: 100%
+		height: 100vh;
 	}
 
 	uni-image {

components/shop/group/index.vue

@@ -11,7 +11,7 @@
 			<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
 				<!-- 最多显示3个 -->
 				<sitem :info="info" v-for="(info, index) in groupList.slice(0, 3)" :key="index"></sitem>
-				<u-empty text="暂无拼团商品" mode="list" color="#000" v-if="!groupList.length"></u-empty>
+				<u-empty text="暂无拼团商品" mode="list" color="#000" v-if="!groupList.length" style="margin: 0 auto;"></u-empty>
 			</swiper-item>
 		</swiper>
     </view>
@@ -23,17 +23,41 @@ export default {
     components:{
         sitem
 	},
-	props: {
-		groupList: Array,
-		classifyList: Array,
-	},
     data(){
         return {
-			current: 0,
+			current: -1,
 			swiperCurrent: 0,
+			groupList: [], // 拼团商品
+			classifyList: [],
         }
 	},
+	watch: {
+		current(value) {
+			this.getPinTuanList(this.classifyList[value].gc_id);
+		}
+	},
+	created() {
+		this.getGoodsClass();
+	},
 	methods: {
+		// 获取优惠券拼团分类
+		getGoodsClass() {
+			this.$u.api.getGoodsClass().then(res => {
+				if(res.errCode == 0) {
+					this.classifyList = res.data;
+					this.current = 0;
+				}
+			})
+		},
+		// 拼团列表
+		getPinTuanList(id) {
+			this.$u.api.getPinTuanList({
+				page: 0,
+				gc_id: id,
+			}).then(res => {
+				this.groupList = res.data;
+			})
+		},
 		tabsChange(index) {
 			this.swiperCurrent = index;
 		},
@@ -52,7 +76,9 @@ export default {
 </script>
 <style lang="scss" scoped>
 .group{
-    .top{
+	background-color: #ffffff;
+    .top {
+		padding: 0 30rpx;
         height: 90rpx;
         width: 100%;
         display: flex;
@@ -67,18 +93,15 @@ export default {
             color: #999;
         }
     }
-    // .label{
-    //     display: flex; 
-    //     font-size: 24rpx;
-    //     color: #999;
-    //     >text{
-    //         margin-right: 34rpx;
-    //     }
-    // }
-    .list{
+    .list {
+		box-sizing: border-box;
+		padding: 0 30rpx;
         display: flex;
-        justify-content: space-between;
-        margin-top: 21rpx;
+		&:not(:nth-child(3n)) {
+			> view {
+				margin-right: 20rpx;
+			}
+		}
     }
 }
 </style>

components/shop/group/item.vue

@@ -16,19 +16,26 @@ export default {
 	},
 	methods: {
 		toDetailsPage() {
-			this.$u.api.getPinTuanDetails({
-				pintuan_id: this.info.pintuan_id,
-			}).then(res => {
-				if(res.errCode == 0) {
-					const goods = {
-						goods: res.data.data,
-						type: 2,
-					}
-					this.$store.commit('setGoodsDetails', goods);
-					this.$store.commit('setGoodsId', this.info.pintuan_id);
+			// this.$u.api.getPinTuanDetails({
+			// 	pintuan_id: this.info.pintuan_id,
+			// }).then(res => {
+			// 	if(res.errCode == 0) {
+			// 		const goods = {
+			// 			goods: res.data.data,
+			// 			type: 2,
+			// 		}
+			// 		this.$store.commit('setGoodsDetails', goods);
+			// 		this.$store.commit('setGoodsId', this.info.pintuan_id);
+			// 		this.$u.route({
+			// 			url: 'pageB/sdetails/index',
+			// 		})
+			// 	}
+			// })
 			this.$u.route({
 				url: 'pageB/sdetails/index',
-					})
+				params: {
+					id: this.info.pintuan_id,
+					type: 2,
 				}
 			})
 		}

components/shop/list/index.vue

@@ -1,33 +1,28 @@
 <template>
     <view class="list">
-        <view class="top">
-            商品推荐
-        </view>
+        <view class="top">商品推荐</view>
 		<view>
 			<u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60" ></u-tabs-swiper>
 		</view>
-		<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
+		<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
-				<!-- <scroll-view scroll-y style="height: 800rpx;width: 100%;"> -->
 				<view class="goods-item">
 					<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
 				</view>
 				<u-empty text="暂无商品" mode="list" color="#000" v-if="!goodsList.length"></u-empty>
-				<!-- </scroll-view> -->
 			</swiper-item>
 		</swiper>
 		<!-- 加载更多 -->
-		<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20"></u-loadmore>
-		<!-- <loadmore ref="loadmore" @callback="getGoodsRecommend" bgColor="#FFF" :page="page"></loadmore> -->
+		<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" @loadmore="loadMore" v-if="goodsList.length>=pageSize"></u-loadmore>
     </view>
 </template>
 <script>
 import item from "./item";
-import loadmore from "@/components/loadmore/index";
 export default {
 	name:"list",
 	data() {
 		return {
+			pageSize: 12,
 			current: -1,
 			swiperCurrent: 0,
 			goodsList: [],
@@ -40,10 +35,10 @@ export default {
 	},
     components: {
 		item,
-		loadmore
 	},
 	watch: {
 		current(index) {
+			this.page = 1;
 			const id = this.classifyList[index].gc_id;
 			this.getGoodsRecommend({gc_id: id});
 		}
@@ -61,19 +56,17 @@ export default {
 				page: this.page, 
 				reload: false,
 			}).then(length => {
-				console.log(length);
+				// console.log(length);
 				if(length == 0) {
 					this.page--;
 					this.loadStatus = 'nomore';
 				} else {
-					this.loadStatus = 'loading';
+					this.loadStatus = 'loadmore';
 				}
 			}).catch(() => {
 				this.loadStatus = "nomore";
 				this.page--;
 			})
-			// this.$refs.loadmore.reachBottom();
-			// this.getGoodsRecommend(this.classifyList[this.current].gc_id);
 		},
 		getGoodsClassRecommend(gc_id) {
 			this.$u.api.getGoodsClassRecommend().then(res => {
@@ -81,7 +74,6 @@ export default {
 					// 初始化 current
 					this.current = 0;
 					this.classifyList = res.data.gc_recommend;
-					// this.getGoodsRecommend(this.classifyList[0].gc_id);
 				}
 			})
 		},
@@ -91,6 +83,7 @@ export default {
 				gc_id: gc_id,
 			})
 			if (res.errCode == 0) {
+				this.timer = true;
 				if(reload) this.goodsList = res.data.goodsList;
 				else this.goodsList.push(...res.data.goodsList);
 				// console.log(this.goodsList);
@@ -100,7 +93,9 @@ export default {
 		},
 		setSwiperHeight() {
 			// height: 230px, margin-bottom: 13
-			this.swiperHeight = Math.ceil(this.goodsList.length / 2) * (230 + 13) + 'px';
+			// const height = Math.ceil(this.goodsList.length / 2) * (510 + 26);
+			// this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
+			this.swiperHeight = Math.ceil(this.goodsList.length / 2) * (270 + 13) + 'px';
 		},
 		// tabs通知swiper切换
 		tabsChange(index) {
@@ -124,34 +119,31 @@ export default {
 </script>
 <style lang="scss" scoped>
 .list{
-    .top{
+	background-color: #ffffff;
+	padding: 30rpx {
+		top: 0;
+	};
+    .top {
         font-size: 30rpx;
         height: 90rpx;
         line-height: 90rpx;
         text-align: center;
         color: #333;
     }
-    // .label{
-    //     display: flex;
-    //     color: #999;
-	// 	flex-wrap: wrap;
-    //     >text{
-    //         margin-right: 34rpx;
-	// 		margin-bottom: 10rpx;
-    //     }
-    // }
-    // .item{
-    //     display: flex;
-    //     flex-wrap: wrap;
-    //     justify-content: space-between;
-    //     margin-top: 20rpx;
-
-    // }
+    .swiper-box {
+        height: 100%;
+        margin-bottom: 10rpx;
+        .swiper-item {
+            height: 100%;
             .goods-item {
             	display: flex;
             	flex-wrap: wrap;
             	justify-content: space-between;
-		margin-top: 20rpx;
+                width: 100%;
+                height: 100%;
+                overflow-y: scroll;
+            }
+        }
     }
 }
 </style>

components/shop/list/item.vue

@@ -1,9 +1,9 @@
 <template>
     <view class="item" @click="toDetailsPage">
-        <image :src="info.goods_image" class="img"></image>
+        <image :src="info.goods_image" mode="aspectFill" class="img"></image>
         <view class="info">
-            <text class="title u-line-1">{{ info.goods_name }}</text>
-            <text class="jianjie u-line-2">{{ info.goods_advword }}</text>
+            <text class="title u-line-2">{{ info.goods_name }}</text>
+            <text class="jianjie u-line-1">{{ info.goods_advword }}</text>
             <text class="price">￥{{ info.goods_price }}</text>
         </view>
     </view>
@@ -16,18 +16,25 @@ export default {
 	},
 	methods: {
 		toDetailsPage() {
-			this.$u.api.getGoodsDetails({ id: this.info.goods_id }).then(res => {
-				if (res.errCode == 0) {
-					const goods = {
-						goods: res.data,
-						type: 1,
-					}
-					this.$store.commit('setGoodsDetails', goods);
-					this.$store.commit('setGoodsId', this.info.goods_id);
+			// this.$u.api.getGoodsDetails({ id: this.info.goods_id }).then(res => {
+			// 	if (res.errCode == 0) {
+			// 		const goods = {
+			// 			goods: res.data,
+			// 			type: 1,
+			// 		}
+			// 		this.$store.commit('setGoodsDetails', goods);
+			// 		this.$store.commit('setGoodsId', this.info.goods_id);
+			// 		this.$u.route({
+			// 			url: 'pageB/sdetails/index',
+			// 		})
+			// 		// console.log(this.goodsInfo.mobile_body);
+			// 	}
+			// })
 			this.$u.route({
 				url: 'pageB/sdetails/index',
-					})
-					// console.log(this.goodsInfo.mobile_body);
+				params: {
+					id: this.info.goods_id,
+					type: 1,
 				}
 			})
 		}
@@ -37,13 +44,13 @@ export default {
 <style lang="scss" scoped>
 .item{
     width: 330rpx;
-	height: 460rpx;
+	height: 510rpx;
     margin-bottom: 26rpx;
     background-color: #f8f8f8;
     border-radius: 10rpx 10rpx 0rpx 0rpx;
     .img{
 		width: 330rpx;
-		height: 272rpx;
+		height: 300rpx;
 		background: rgba(245,245,245,1);
 		border-radius: 10rpx 10rpx 0rpx 0rpx;
 		margin-bottom: 24rpx;
@@ -55,6 +62,7 @@ export default {
         flex-direction: column;
         justify-content: space-around;
         .title{
+			line-height: 40rpx;
             font-size: 30rpx;
             color: #333;
 			margin-bottom: 13rpx;
@@ -63,6 +71,7 @@ export default {
             font-size: 26rpx;
             color: #666;
 			margin-bottom: 20rpx;
+			line-height: 38rpx;
         }
         .price{
             color: #FF3131;

components/shop/recommend/index.vue

@@ -32,7 +32,7 @@ export default {
 	props: ['recommendData', 'type'],
 	created() {
 		this.info = this.recommendData;
-		console.log(this.recommendData);
+		// console.log(this.recommendData);
 	}
 }
 </script>

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" @click="toDetailsPage"></image>
         </view>
     </view>
 </template>
@@ -35,23 +35,30 @@ export default {
 	props: ['recommendData', 'type'],
 	created() {
 		this.info = this.recommendData;
-		console.log(this.recommendData);
+		// console.log(this.recommendData);
 	},
 	methods: {
 		toDetailsPage() {
-			this.$u.api.getPinTuanDetails({
-				pintuan_id: this.recommendData.pintuan_id
-			}).then(res => {
-				if(res.errCode == 0) {
-					const goods = {
-						goods: res.data.data,
-						type: 2,
-					}
-					this.$store.commit('setGoodsDetails', goods);
-					this.$store.commit('setGoodsId', this.recommendData.pintuan_id);
+			// this.$u.api.getPinTuanDetails({
+			// 	pintuan_id: this.recommendData.pintuan_id
+			// }).then(res => {
+			// 	if(res.errCode == 0) {
+			// 		const goods = {
+			// 			goods: res.data.data,
+			// 			type: 2,
+			// 		}
+			// 		this.$store.commit('setGoodsDetails', goods);
+			// 		this.$store.commit('setGoodsId', this.recommendData.pintuan_id);
+			// 		this.$u.route({
+			// 			url: 'pageB/sdetails/index',
+			// 		})
+			// 	}
+			// })
 			this.$u.route({
 				url: 'pageB/sdetails/index',
-					})
+				params: {
+					id: this.recommendData.pintuan_id,
+					type: 2,
 				}
 			})
 		}
@@ -60,7 +67,10 @@ export default {
 </script>
 <style lang="scss" scoped>
 .recommend{
-    .top{
+	margin-bottom: 20rpx;
+	padding: 0 30rpx;
+	background-color: #ffffff;
+    .top {
         height: 90rpx;
         display: flex;
         align-items: center;
@@ -75,6 +85,7 @@ export default {
         }
     }
     .connect{
+		padding: 30rpx;
         display: flex;
 		align-items: center;
         .user {

components/shop/seckill/index.vue

@@ -45,6 +45,9 @@ export default {
 </script>
 <style lang="scss" scoped>
 .seckill{
+	background-color: #fff;
+	padding: 30rpx;
+	margin-bottom: 20rpx;
     .top{
         height: 60rpx;
         display: flex;

components/shop/seckill/item.vue

@@ -26,20 +26,27 @@ export default {
 	methods: {
 		spikeGoods() {
 			// console.log(this.item.groupbuy_id);
-			this.$u.api.getSpikeInfo({
-				groupbuy_id: this.item.groupbuy_id
-			}).then(res => {
-				if(res.errCode == 0) {
-					const goods = {
-						goods: res.data.goodsInfo,
-						type: 3, // 商品详情 1普通 2拼团 3秒杀 4优惠券
-					}
-					this.$store.commit('setGoodsDetails', goods);
-					this.$store.commit('setGroupbuyInfo', res.data.groupbuyInfo);
-					this.$store.commit('setGoodsId', this.item.groupbuy_id);
+			// this.$u.api.getSpikeInfo({
+			// 	groupbuy_id: this.item.groupbuy_id
+			// }).then(res => {
+			// 	if(res.errCode == 0) {
+			// 		const goods = {
+			// 			goods: res.data.goodsInfo,
+			// 			type: 3, // 商品详情 1普通 2拼团 3秒杀 4优惠券
+			// 		}
+			// 		this.$store.commit('setGoodsDetails', goods);
+			// 		this.$store.commit('setGroupbuyInfo', res.data.groupbuyInfo);
+			// 		this.$store.commit('setGoodsId', this.item.groupbuy_id);
+			// 		this.$u.route({
+			// 			url: 'pageB/sdetails/index',
+			// 		})
+			// 	}
+			// })
 			this.$u.route({
 				url: 'pageB/sdetails/index',
-					})
+				params: {
+					id: this.item.groupbuy_id,
+					type: 3,
 				}
 			})
 		},

components/shop/shop-item/index.vue

@@ -1,7 +1,7 @@
 <template>
-    <view class="shop-item">
+    <view class="shop-item" @click="toClassifyPage">
         <image :src="info.goodscn_pic"></image>
-        <text class="u-line-1">{{ info.gc_name }}</text>
+        <text class="">{{ info.gc_name }}</text>
     </view>    
 </template>
 <script>
@@ -9,24 +9,34 @@ export default {
 	name:"shopItem",
 	props: {
 		info: Object,
+	},
+	methods: {
+		toClassifyPage() {
+			this.$u.route('pageC/classify/goods', {
+				cid: this.info.gc_id,
+				cname: this.info.gc_name,
+			});
+		}
 	}
 }
 </script>
 <style lang="scss" scoped>
 .shop-item{
     display: flex;
-    flex-direction: column;
     align-items: center;
+    flex-direction: column;
+    width: 20%;
+    margin-bottom: 20rpx;
     >image{
         width: 80rpx;
         height: 80rpx;
         border-radius: 50%;
     }
     >text{
-		width: 80rpx;
+		width: 100rpx;
+        margin-top: 14rpx;
         font-size: 24rpx;
         color: #333;
-        margin-top: 14rpx;
     }
 }
 </style>

components/shop/special-shop/index.vue

@@ -42,37 +42,51 @@ export default {
 	methods: {
 		spikeGoods() {
 			// console.log(this.item.groupbuy_id);
-			this.$u.api.getSpikeInfo({
-				groupbuy_id: this.item.groupbuy_id
-			}).then(res => {
-				if(res.errCode == 0) {
-					const goods = {
-						goods: res.data.goodsInfo,
-						type: 3, // 商品详情 1普通 2拼团 3秒杀 4优惠券
-					}
-					this.$store.commit('setGoodsDetails', goods);
-					this.$store.commit('setGroupbuyInfo', res.data.groupbuyInfo);
-					this.$store.commit('setGoodsId', this.item.groupbuy_id);
+			// this.$u.api.getSpikeInfo({
+			// 	groupbuy_id: this.item.groupbuy_id
+			// }).then(res => {
+			// 	if(res.errCode == 0) {
+			// 		const goods = {
+			// 			goods: res.data.goodsInfo,
+			// 			type: 3, // 商品详情 1普通 2拼团 3秒杀 4优惠券
+			// 		}
+			// 		this.$store.commit('setGoodsDetails', goods);
+			// 		this.$store.commit('setGroupbuyInfo', res.data.groupbuyInfo);
+			// 		this.$store.commit('setGoodsId', this.item.groupbuy_id);
+			// 		this.$u.route({
+			// 			url: 'pageB/sdetails/index',
+			// 		})
+			// 	}
+			// })
 			this.$u.route({
 				url: 'pageB/sdetails/index',
-					})
+				params: {
+					id: this.item.groupbuy_id,
+					type: 3,
 				}
 			})
 		},
 		toDetailsPage() {
-			this.$u.api.getPinTuanDetails({
-				pintuan_id: this.item.pintuan_id
-			}).then(res => {
-				if(res.errCode == 0) {
-					const goods = {
-						goods: res.data.data,
-						type: 2,
-					}
-					this.$store.commit('setGoodsDetails', goods);
-					this.$store.commit('setGoodsId', this.item.pintuan_id);
+			// this.$u.api.getPinTuanDetails({
+			// 	pintuan_id: this.item.pintuan_id
+			// }).then(res => {
+			// 	if(res.errCode == 0) {
+			// 		const goods = {
+			// 			goods: res.data.data,
+			// 			type: 2,
+			// 		}
+			// 		this.$store.commit('setGoodsDetails', goods);
+			// 		this.$store.commit('setGoodsId', this.item.pintuan_id);
+			// 		this.$u.route({
+			// 			url: 'pageB/sdetails/index',
+			// 		})
+			// 	}
+			// })
 			this.$u.route({
 				url: 'pageB/sdetails/index',
-					})
+				params: {
+					id: this.item.pintuan_id,
+					type: 2,
 				}
 			})
 		}

components/shop/youhq/index.vue

@@ -78,7 +78,7 @@ export default {
 			num = this.couponList.length 
 				? this.couponList.length > 4 ? 4 : this.couponList.length
 				: 1
-			this.swiperHeight = (97 + 10) * num - 10 + 'px';
+			this.swiperHeight = (200 + 20) * num + 'rpx';
 		},
 		toCouponPage() {
 			this.$u.route({
@@ -93,8 +93,11 @@ export default {
 </script>
 <style lang="scss" scoped>
 .coupon-swiper {
+	background-color: #ffffff;
+	margin-bottom: 40rpx;
 	.top {
-		padding-top: 30rpx;
+		padding: 0 30rpx;
+		height: 90rpx;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
@@ -109,12 +112,11 @@ export default {
 		}
 	}
 	.swiper-coupon-item {
+		padding: 0 30rpx;
 		box-sizing: border-box;
 		background-color: #ffffff;
-		// padding: 30rpx {
-		// 	top: 0;
-		// };
 		.coupon-item {
+            height: 200rpx;
 			margin-bottom: 20rpx;
 		}
 	}

main.js

@@ -1,11 +1,12 @@
 import Vue from 'vue'
 import App from './App'
-
+import IMService from './static/imservice.js'
 import uView from "uview-ui";
 Vue.config.productionTip = false
 Vue.use(uView);
 App.mpType = 'app'
-
+Vue.prototype.imService = new IMService();
+Vue.prototype.a = 1;
 import store from '@/common/store/index.js'
 
 Vue.prototype.$store = store;

manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "deming",
-    "appid" : "__UNI__62A680B",
+    "name" : "德铭阳光",
+    "appid" : "__UNI__EBFF00A",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -18,7 +18,14 @@
         },
         /* 模块配置 */
         "modules" : {
-            "OAuth" : {}
+            "OAuth" : {},
+            "Share" : {},
+            "Push" : {},
+            "Maps" : {},
+            "LivePusher" : {},
+            "Payment" : {},
+            "VideoPlayer" : {},
+            "Speech" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -37,6 +44,7 @@
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
@@ -46,8 +54,10 @@
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "abiFilters" : [ "armeabi-v7a", "x86" ]
             },
             /* ios打包配置 */
             "ios" : {},
@@ -57,6 +67,78 @@
                 "oauth" : {
                     "qq" : {
                         "appid" : "101884160"
+                    },
+                    "apple" : {},
+                    "weixin" : {
+                        "appid" : "wx556db1531ec35dc7",
+                        "appsecret" : "f441fc15dd21543871a818f40ce92016",
+                        "UniversalLinks" : "https://demo.dcloud.net.cn/ulink/"
+                    }
+                },
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "eafe430aa31fa033dcf45a0e87032653",
+                        "appkey_android" : "8045e8a4cd6d544690c786265b248f91"
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx556db1531ec35dc7",
+                        "UniversalLinks" : "https://demo.dcloud.net.cn/ulink/"
+                    }
+                },
+                "speech" : {
+                    "ifly" : {}
+                },
+                "payment" : {
+                    "alipay" : {},
+                    "weixin" : {
+                        "appid" : "wx556db1531ec35dc7",
+                        "UniversalLinks" : "https://demo.dcloud.net.cn/ulink/"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "static/app/start/480x762.png",
+                    "xhdpi" : "static/app/start/720x1242.png",
+                    "xxhdpi" : "static/app/start/1080x1882.png"
+                },
+                "iosStyle" : "storyboard",
+                "ios" : {
+                    "storyboard" : "static/CustomStoryboard.zip"
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "static/app/icon/72x72.png",
+                    "xhdpi" : "static/app/icon/96x96.png",
+                    "xxhdpi" : "static/app/icon/144x144.png",
+                    "xxxhdpi" : "static/app/icon/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png"
+                    },
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     }
                 }
             }

pageA/login/login.vue

@@ -8,11 +8,11 @@
 				<view class="title">手机登录</view>
 				<view class="labales">
 					<!-- <text></text> -->
-					<input type="tel" placeholder="请输入您的手机号" v-model="member_mobile" />
+					<input type="tel" placeholder="请输入您的手机号" maxlength="11" v-model="member_mobile" />
 				</view>
 				<view class="labales">
 					<!-- <text></text> -->
-					<input type="tel" placeholder="请输入验证码" v-model="sms_code" />
+					<input type="number" placeholder="请输入验证码" maxlength="6" v-model="sms_code" />
 					<!-- <text class="identifying" @click="getCode">{{text}}</text> -->
 					<identifying @tochange="tochange" :smslog_type="smslog_type" :member_mobile="member_mobile"></identifying>
 				</view>
@@ -22,7 +22,8 @@
 					<view>
 						<view></view>
 						<text>我已详细阅读并同意</text>
-						<text class="pact_text" v-for="(item,index) in pact_text" :key="index" @click="pact_click(index)"> {{item.text}} </text>
+						<text class="pact_text" v-for="(item,index) in pact_text" :key="index" @click="pact_click(index)"> {{item.text}}
+						</text>
 					</view>
 					<u-checkbox-group @change="checkboxGroupChange" size="27">
 						<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name"
@@ -37,16 +38,17 @@
 			</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">
 					<view class="rect" @tap.stop>
-						<view class="rect_view" @click="rect_qq()">
+						<view class="rect_view" @click="loginOther(1)">
 							<image src="../../static/pageA/qq.png" class="image"></image>
 							<view>QQ登录</view>
 						</view>
-						<view class="rect_view">
+						<view class="rect_view" @click="loginOther(2)">
 							<image src="../../static/pageA/weixin.png" class="image"></image>
 							<view>微信登录</view>
 						</view>
@@ -60,6 +62,9 @@
 </template>
 <script>
 	import identifying from '@/components/logininput/identifying'
+	import {
+		mapMutations
+	} from 'vuex';
 	export default {
 		data() {
 			return {
@@ -89,25 +94,40 @@
 				}, {
 					"id": '3',
 					"text": "《使用协议》"
-					},
-
-				]
+				}, ],
+				temp_url: "", // 上个页面路径
+				pagesArr: ["pages/mine/index"], // 特殊路径
 			};
 		},
 		onLoad() {
 			// 数据的请求
-			this.apiwelcome()	
+			this.apiwelcome();
+		},
+		onShow() {
+			let pages = getCurrentPages();
+			let prePage = pages[pages.length - 2];
+			this.temp_url = prePage.route;
+			// console.log(this.temp_url);
+		},
+		// 切断正常返回
+		onBackPress(e) {
+			console.log(1, e);
+			if (this.pagesArr.includes(this.temp_url) && !this.hasLogin) {
+				uni.switchTab({
+					url: '../../pages/index/index'
+				})
+				return true;
+			}
 		},
 		methods: {
+			...mapMutations(['loginIn']),
 			apiwelcome() {
-				this.$u.api.sendSmsCode({
-
-				}).then((res) => {
+				this.$u.api.sendSmsCode({}).then((res) => {
 					console.log(res)
 				})
 			},
 			// 协议跳转
-			pact_click(index){
+			pact_click(index) {
 				console.log(index)
 				uni.navigateTo({
 					url: '/pageA/pactList/pactList?index=' + index
@@ -115,6 +135,7 @@
 			},
 			// 用户登录
 			loginOn() {
+				let me = this;
 				// uni.navigateTo({
 				//     url: '/pageE/zhibo/index'
 				// });
@@ -123,8 +144,8 @@
 				// console.log(this.sms_code)
 				// 判断手机号是否为空
 				// 校验手机号
-				let type_phone = this.$u.test.mobile( this.member_mobile)
-				if( this.member_mobile == ''){
+				let type_phone = this.$u.test.mobile(this.member_mobile)
+				if (this.member_mobile == '') {
 					this.$refs.uToast.show({
 						title: '手机号不能为空',
 						type: 'error'
@@ -138,7 +159,7 @@
 					});
 					return false;
 				}
-				if( this.sms_code == ''){
+				if (this.sms_code == '') {
 					this.$refs.uToast.show({
 						title: '验证码不能为空',
 						type: 'error'
@@ -152,41 +173,36 @@
 					console.log(res)
 					// console.log(res)
 					if (res.errCode == 0) {
-						if(res.data == ''){
+						if (res.data == '') {
 							this.$refs.uToast.show({
 								title: res.message,
 								type: 'error'
 							})
 							return false
-						}else{
-							uni.setStorageSync('token', res.data.token);//存储一个字符传值
-							uni.navigateTo({
-								url : '/pageA/topick/topick'
-							})
+						} else {
+							me.loginIn(res.data.token); //存储一个字符传值
 							// 缓存用户的信息
-							// uni.setStorageSync({ 
-							// 	key: 'user_info',
-							// 	data: res.data,
-							// 	success: function() {
-							// 		console.log('success');
-							// 		// 跳转首页
-							// 		uni.navigateTo({
-							// 			url : '/pageA/topick/topick'
-							// 		})
-							// 	}
-							// });
+							uni.setStorageSync('user_info',res.data);
+							
+							if (res.data.member.has_labels) {
+								uni.switchTab({
+									url: '/pages/index/index'
+								})
+							} else {
+								uni.navigateTo({
+									url: '/pageA/topick/topick'
+								})
+							}
 						}
 
 						// 存储接口请求所需token
-						uni.setStorageSync('token', res.data.token);//存储一个字符传值
 						// // 注册返回参数
 						// this.$refs.uToast.show({
 						// 	title: res.message,
 						// 	type: 'success',
 						// 	url: '/pageA/topick/topick'
 						// })
-					}
-					if (res.errCode == 1) {
+					} else {
 						this.$refs.uToast.show({
 							title: res.message,
 							type: 'error'
@@ -195,40 +211,75 @@
 				})
 			},
 			// qq授权登录
-			rect_qq() {
-				console.log("授权Q")
-				var vm = this;
+			loginOther(type) {
+				var me = this;
 				uni.getProvider({
 					service: 'oauth',
-					success: function(res) {
-						console.log('qq', res) //weixin
-						if (~res.provider.indexOf('qq')) {
+					success: (res) => {
+						if (type == 1) {
 							uni.login({
 								provider: 'qq',
-								success: function(loginRes) {
-									console.log(loginRes)
-									this.getApplogin(loginRes)
-									vm.$HTTP({
-										method: 'GET',
-										baseURL: 'https://graph.qq.com/user/get_user_info',
-										url: '',
-										data: {
-											openid: loginRes.authResult.openid,
-											access_token: loginRes.authResult.access_token,
-											appid: '101884160'
+								success: (qqres) => {
+									console.log(qqres);
+									uni.getUserInfo({
+										provider: 'qq',
+										success: (data) => {
+											console.log(data);
+											this.$u.api.qqLogin({
+												member_qqopenid: data.userInfo.openId,
+												member_nickname: data.userInfo.nickName,
+												member_avatar: data.userInfo.avatarUrl,
+											}).then(res => {
+												console.log(res.errCode);
+												if (res.errCode == 0) {
+													this.loginIn(res.data.token);
+													this.show = false;
+													uni.switchTab({
+														url: "../../pages/index/index"
+													})
+												}
+											})
+										}
+									})
 								},
-										load: true
-									}).then((data) => {
-										console.log(data)
-
-									}, (err) => {
-										console.log(err)
-									});
+								fail: (e) => {
+									console.log(e);
 								}
 							});
 						} else {
-							console.log("错误")
+							uni.login({
+								provider: 'weixin',
+								success: (wxres) => {
+									console.log(wxres);
+									uni.getUserInfo({
+										provider: 'weixin',
+										success: (data) => {
+											console.log(data);
+											this.$u.api.wechatLogin({
+												member_wxopenid: data.userInfo.openId,
+												member_nickname: data.userInfo.nickName,
+												member_avatar: data.userInfo.avatarUrl,
+											}).then(res => {
+												console.log(res);
+												if (res.errCode == 0) {
+													this.loginIn(res.data.token);
+													this.show = false;
+													uni.switchTab({
+														url: "../../pages/index/index"
+													})
 												}
+											})
+										}
+									})
+								},
+								fail: (e) => {
+									console.log(e);
+								}
+							});
+						}
+					},
+					fail: (e) => {
+						console.log(e);
 					}
 				});
 			},
@@ -238,10 +289,6 @@
 					url: '/pageA/register/register'
 				});
 			},
-			// 授权登录
-			getApplogin() {
-				console.log("11")
-			},
 			// 选中某个复选框时，由checkbox时触发
 			checkboxChange(e) {
 				//console.log(e);
@@ -255,6 +302,11 @@
 			},
 			tochange() {
 
+			},
+            goIndex() {
+                uni.switchTab({
+                    url: "/pages/index/index"
+                })
             }
 		},
 		components: {
@@ -296,10 +348,12 @@
 			width: 630rpx;
 			margin: 0 auto;
 		}
-		.u-checkbox__icon-wrap .u-icon{
-			width: 26rpx!important;
+
+		.u-checkbox__icon-wrap .u-icon {
+			width: 26rpx !important;
 			height: 26rpx;
 		}
+
 		.more_Login text {
 			display: inline-block;
 			width: 50%;
@@ -397,7 +451,8 @@
 		height: 22rpx;
 	}
 
-	.buttones > view {
+	.buttones {
+        .btn {
             width: 628rpx;
             height: 98rpx;
             background: rgba(255, 120, 15, 1) !important;
@@ -411,6 +466,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;

pageA/pactList/pactList.vue

@@ -62,10 +62,14 @@ export default {
 <style lang="scss" scoped>
 	.packlist{}
 	.packlist > view{
-		width:676px;
-		font-size:26rpx;
-		color: #333;
 		width: 90%;
 		margin: 0 auto;
+		padding: 16upx 0;
+		font-size: 26upx;
+		color: #333;
+	}
+	.rict_type {
+		text-indent: 1rem;
+		line-height: 1.2;
 	}
 </style>

pageA/register/register.vue

@@ -8,11 +8,11 @@
 				<view class="title">手机注册</view>
 				<view class="labales phones">
 					<!-- <text></text> -->
-					<input type="tel" placeholder="请输入您的手机号" v-model="member_mobile" />
+					<input type="tel" placeholder="请输入您的手机号" maxlength="11" v-model="member_mobile" />
 				</view>
 				<view class="labales">
 					<!-- <text></text> -->
-					<input type="tel" placeholder="请输入验证码" v-model="sms_code" />
+					<input type="tel" placeholder="请输入验证码" maxlength="6" v-model="sms_code" />
 					<!-- <text class="identifying" @click="apiwelcome()">获取验证码</text> -->
 					<!-- 验证码接口的引入 -->
 					<identifying @tochange="tochange" :smslog_type="smslog_type" :member_mobile="member_mobile" ></identifying>
@@ -24,17 +24,18 @@
 					<text class="pact_text" v-for="(item,index) in pact_text" :key="index" @click="pact_click(index)"> {{item.text}} </text>
 					<u-checkbox-group @change="checkboxGroupChange" size="27">
 						<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name"
-						 shape="circle" size="14" active-color="#19BE6B" ></u-checkbox>
+						 shape="circle" size="30" active-color="#19BE6B" ></u-checkbox>
 					</u-checkbox-group>
 				</view>
 			</view>
 			<!-- 注册 -->
 			<view class="more_Login">
 				<text></text>
-				<text class="other" @click="mask_u">其他方式登录</text>
+				<!-- <text class="other" @click="mask_u">其他方式登录</text> -->
 			</view>
 			<!-- denglu QQ weixin -->
-			<view class="u-btn" @click="loginIn">{{login}}</view>
+			<view class="u-btn" @click="loginIns">{{login}}</view>
+            <view class="go-login" @click="goLogin">已有账号，立即登录</view>
 			<u-mask :show="show" @click="show = false">
 				<view class="warp">
 					<view class="rect" @tap.stop>
@@ -56,7 +57,10 @@
 	</view>
 </template>
 <script>
-	import identifying from '@/components/logininput/identifying'
+	import identifying from '@/components/logininput/identifying';
+    import {
+    	mapMutations
+    } from 'vuex';
 	export default {
 		data() {
 			return {
@@ -67,6 +71,7 @@
 				value: '',
 				login: '注册',
 				show: false,
+                is_check: null,
 				member_mobile: '', //手机号
 				smslog_type : '1',//状态
 				sms_code : '', //验证码
@@ -89,6 +94,7 @@
 
 		},
 		methods: {
+            ...mapMutations(['loginIn']),
 			// 协议跳转
 			pact_click(index){
 				console.log(index)
@@ -97,25 +103,33 @@
 				});
 			},
 			// 用户注册
-			loginIn(){
+			loginIns(){
+                let me = this;
 				let type_phone = this.$u.test.mobile( this.member_mobile)
 				if( this.member_mobile == ''){
 					this.$refs.uToast.show({
-						title: '手机号不能为空',
+						title: '手机号不能为空！',
 						type: 'error'
 					})
 					return false;
 				}
 				if (type_phone == false) {
 					this.$refs.uToast.show({
-						title: '手机号格式不正确',
+						title: '手机号格式不正确！',
 						type: 'error'
 					});
 					return false;
 				}
 				if( this.sms_code == ''){
 					this.$refs.uToast.show({
-						title: '验证码不能为空',
+						title: '验证码不能为空！',
+						type: 'error'
+					})
+					return false;
+				}
+                if (this.is_check) {
+                    this.$refs.uToast.show({
+                    	title: '请同意协议！',
                     	type: 'error'
                     })
                     return false;
@@ -129,18 +143,16 @@
 					
 					// console.log(res)
 					if(res.errCode == 0){
+                        //存储一个字符传值
+                        me.loginIn(res.data.token);
                         // 缓存用户的信息
-						uni.setStorage({
-						    key: 'token',
-						    data: res.data.token,
-						    success: function () {
-						        console.log('success');
+                        uni.setStorageSync('user_info',res.data);
                         // 跳转选择页面
+                        if (uni.getStorageSync("token")) {
                             uni.navigateTo({
-									url : '/pageA/topick/topick'
+                            	url: '/pageA/topick/topick'
                             })
                         }
-						});
 						// 注册返回参数
 						// this.$refs.uToast.show({
 						// 	title: res.message,
@@ -165,20 +177,25 @@
 			},
 			// 选中某个复选框时，由checkbox时触发
 			checkboxChange(e) {
-				//console.log(e);
+				// console.log(e,1);
+                this.is_check = e.value;
+                console.log(this.is_check);
 			},
 			// 选中任一checkbox时，由checkbox-group触发
 			checkboxGroupChange(e) {
-				// console.log(e);
+				// console.log(e,2);
 			},
 			mask_u() {
 				this.show = !this.show
 			},
+            goLogin() {
+                this.$u.route("/pageA/login/login");
+            },
 			// 注册接口
 			tochange() {
 				// console.log("调用父组件的方法")
 				// console.log('2222',this._data.member_mobile)
-				let member_mobile = this._data.member_mobile
+				let member_mobile = this._data.member_mobile;
 				
 			}
 		},
@@ -314,6 +331,12 @@
 		border-color: rgba(255, 120, 15, 1) !important;
 		text-align: center;
 	}
+    .go-login {
+        margin-top: 26rpx;
+        text-align: center;
+        font-size: 26rpx;
+        color: #fff;
+    }
 
 	.warp {
 		display: flex;

pageA/topick/topick.vue

@@ -10,7 +10,7 @@
 			</view>
 			<!-- 标签 -->
 			<view class="tab_lable">
-				<view :class="{'cur': rSelect.indexOf(index)!=-1}" v-for="(item,index) in tab_lables" :key="index" @click="tapClick(index)">{{item.name}}</view>
+				<view :class="{'cur': rSelect.indexOf(index)!=-1}" v-for="(item,index) in tab_lables" :key="index" @click="tapClick(index,item.id)">{{item.name}}</view>
 			</view>
 			<!-- 提交按钮 -->
 			<view class="submites" @click="toHomePage">{{submites}}</view>
@@ -30,12 +30,12 @@
 				show: false,
 				tab_lables: [],
 				submites: '选好了进入首页',
-				rSelect:[]
+				rSelect: [],
+				list: [],
 			};
 		},
-		onLoad(){
+		onLoad() {
 			// 标签的列表展示
-				console.log("11111222")
 			this.$u.api.labelList({
 
 			}).then((res) => {
@@ -44,8 +44,7 @@
 			})
 		},
 
-		mounted(){
-		},
+		mounted() {},
 		methods: {
 			// 选中某个复选框时，由checkbox时触发
 			checkboxChange(e) {
@@ -59,19 +58,36 @@
 				this.show = !this.show
 			},
 			// 点击切换颜色
-			tapClick(index) {
-				console.log(index)
+			tapClick(index, id) {
+				// console.log(index);
 				if (this.rSelect.indexOf(index) == -1) {
-					console.log(index) //打印下标
-					this.rSelect.push(index); //选中添加到数组里
+					if (this.rSelect.length > 9) {
+						this.$u.toast("只能选择10个标签！");
+						return false;
+					}
+					this.rSelect.push(index); // 选中状态
+					this.list.push(id); //选中添加到数组里
 				} else {
 					this.rSelect.splice(this.rSelect.indexOf(index), 1); //取消
+					this.list.splice(this.rSelect.indexOf(id), 1); //取消
 				}
+				// console.log(this.rSelect);
+				console.log(this.list);
 			},
 			toHomePage() {
+				this.$u.post("StartUp/addLabel", {
+					label_ids: this.list
+				}).then(res => {
+					// console.log(res);
+					if (res.errCode == 0) {
+						// this.$u.toast(res.message);
 						uni.switchTab({
 							url: '/pages/index/index'
 						});
+					} else {
+						this.$u.toast(res.message);
+					}
+				})
 			},
 
 		}
@@ -360,9 +376,10 @@
 		bottom: 0;
 		left: 0;
 	}
+
 	// 选中的样式
 	.cur {
-			background-color: #ff5d00!important;
-			color: #fff!important;
+		background-color: #ff5d00 !important;
+		color: #fff !important;
 	}
 </style>

pageA/welcome/welcome.vue

@@ -1,45 +1,76 @@
 <template>
 	<view class="welcome">
 		<!-- 倒计时（跳过） -->
-		<remaining></remaining>
+		<remaining v-if="guidePages"></remaining>
 	</view>
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	import remaining from '@/components/remaining/remaining';
 	export default {
+		computed: {
+			...mapState(['hasLogin', 'token'])
+		},
 		data() {
 			return {
-				
+				guidePages: true
 			}
 		},
 		onLoad() {
+			this.loadExecution();
 		},
 		methods: {
-			
-		},
-		mounted(){
-		},
-		components:{}
+			loadExecution() {
+				/**
+				 * 获取本地存储中launchFlag的值
+				 * 若存在，说明不是首次启动，直接进入首页；
+				 * 若不存在，说明是首次启动，进入引导页；
+				 */
+				// 获取本地存储中launchFlag标识
+				const value = uni.getStorageSync('launchFlag') || "";
+				// console.log(value, this.hasLogin);
+				if (value) {
+					this.guidePages = false;
+					if (this.hasLogin) {
+						uni.switchTab({
+							url: '../../pages/index/index'
+						});
+					} else {
+						// launchFlag=true直接跳转到首页
+						uni.navigateTo({
+							url: '../../pageA/login/login'
+						});
+					}
+				} else {
+					// launchFlag!=true显示引导页
+					this.guidePages = true;
+				}
+			}
+		}
 	}
 </script>
 
 <style>
 	.welcome {}
-	.welcome_jumpes{
+
+	.welcome_jumpes {
 		width: 90rpx;
 		height: 35rpx;
-		opacity:0.5;
-		border-radius:18rpx;
+		opacity: 0.5;
+		border-radius: 18rpx;
 		position: absolute;
 		right: 37rpx;
 		top: 34rpx;
-		font-size:20rpx;
+		font-size: 20rpx;
 		text-align: center;
 		line-height: 35rpx;
 		color: #fff;
 		background: #C4CAC6;
 	}
+
 	.welcome_images {
 		width: 100%;
 		position: fixed;

pageB/comment/index.vue

@@ -0,0 +1,126 @@
+<template>
+	<scroll-view scroll-y class="comment" @scrolltolower="loadMore">
+		<view class="label-list">
+			<view v-for="(label, index) in evaluateSpec" :key="index" :class="{'active': current == index}" @click="current=index">{{ index + '(' + label + ')' }}</view>
+		</view>
+		<view class="comment-container">
+			<view v-for="(item, index) in evalueList" :key="index" class="itme">
+				<comment :reply="true" :content="item"></comment>
+			</view>
+			<u-empty text="暂无评论" mode="list" v-if="!evalueList.length" margin-top="120" color="#333"></u-empty>
+		</view>
+		<!-- 加载更多 -->
+		<u-loadmore :status="loadStatus" bgColor="#EEEBEE" margin-top="20" margin-bottom="20" v-if="evalueList.length >= 12"></u-loadmore>
+	</scroll-view>
+</template>
+<script>
+import comment from "@/components/comment/index";
+export default {
+	data() {
+		return {
+			id: Number,
+			current: '全部',
+			page: 0,
+			evalueList: [],
+			evaluateSpec: {},
+			loadStatus: 'loadmore',
+			timer: true,
+		}
+	},
+	components: {
+		comment
+	},
+	onLoad(option) {
+		this.id = option.id;
+		// this.getAllEvalue();
+		this.getEvaluateSpec();
+	},
+	onNavigationBarButtonTap(e) {
+		if(e.index == 0) this.$u.route('/pageC/cart/index');
+	},
+	watch: {
+		current(value) {
+			this.page = 0;
+			this.getAllEvalue({ type: value });
+		}
+	},
+	methods: {
+		loadMore() {
+			if(this.evalueList.length < 12) return false;
+			if(!this.timer) return false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.getAllEvalue({ type: this.current, load: 'more' }).then(length => {
+				if(length == 0) {
+					this.page--;
+					this.loadStatus = 'nomore';
+				} else {
+					this.loadStatus = 'loading';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
+			})
+		},
+		getEvaluateSpec() {
+			this.$u.api.getEvaluateSpec({
+				id: this.id,
+			}).then(res => {
+				if(res.errCode == 0) {
+					this.evaluateSpec = res.data;
+					this.getAllEvalue();
+				}
+			})
+		},
+		async getAllEvalue({ type, load } = {}) {
+			let params = {
+				goods_id: this.id, 
+				page: this.page,
+			}
+			if(type) Object.assign(params, { type: type });
+			const res = await this.$u.api.getAllEvalue(params);
+			if (res.errCode == 0) {
+				if(load) this.evalueList.push(...res.data);
+				else this.evalueList = res.data;
+			} else {
+				this.evalueList = [];
+			}
+			return res.data.length;
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.comment {
+	height: calc(100vh - var(--window-top));
+	background-color: #EEEBEE;
+	padding-bottom: 30rpx;
+	.label-list {
+		padding: 30rpx;
+		background-color: #ffffff;
+		margin-bottom: 14rpx;
+		display: flex;
+		flex-wrap: wrap;
+		> view {
+			box-sizing: content-box;
+			padding: 16rpx 20rpx;
+			border-radius: 30rpx;
+			margin: 0 20rpx 20rpx 0;
+			background: rgba(236,236,236,1);
+			font-size: 26rpx;
+			color: rgba(153,153,153,1);
+		}
+		.active {
+			background: rgba(255,120,15,1);
+			color: #ffffff;
+		}
+	}
+	.comment-container {
+		.itme {
+			padding: 30rpx;
+			background-color: #ffffff;
+			margin-bottom: 10rpx;
+		}
+	}
+}
+</style>

pageB/components/sdetails/guige.vue

@@ -50,7 +50,7 @@ export default {
     name:"guige",
     data(){
         return {
-            select:0
+            select: 0
         }
     },
     props:['item','title'],

pageB/components/sdetails/tloos.vue

@@ -1,6 +1,7 @@
 <template>
     <view>
-        <view class="tloos">
+		<!-- 普通商品 tool -->
+        <view class="tloos" v-if="type == 1">
             <view class="navs">
                 <image src="/static/image/common/18.png"></image>
                 店铺
@@ -13,6 +14,28 @@
             <view class="button" style="background:rgba(253,211,96,1);" @click="buy(2)">加入购物车</view>
             <view class="button" style="background:rgba(255,120,15,1);" @click="buy(1)">立即购买</view>
         </view>
+		<!-- 拼团 tool -->
+		<view class="group-tool" v-if="type==2">
+			<view class="launch" @click="settlementOrder">发起拼团</view>
+			<view class="involvement" @click="showGroupUser=true">参与拼团</view>
+		</view>
+		<!-- 秒杀 tool -->
+		<view class="spike-tool" v-if="type==3">
+			<view class="left">
+				<view>
+					<image src="/static/image/common/18.png"></image>
+					<text>店铺</text>
+				</view>
+				<view>
+					<image src="/static/image/common/19.png"></image>
+					<text>客服</text>
+				</view>
+			</view>
+			<view class="btn" v-if="groupbuyInfo.groupbuy_state == 20 && groupbuyInfo.inventory > groupbuyInfo.groupbuy_buy_quantity" @click="spikeGoods">立即秒杀</view>
+			<view class="btn" :class="{'cannot': groupbuyInfo.groupbuy_state == 32 || groupbuyInfo.inventory == groupbuyInfo.groupbuy_buy_quantity}" v-else>
+				{{ groupbuyInfo.groupbuy_state == 32 ? '时间已结束' : (groupbuyInfo.inventory > groupbuyInfo.groupbuy_buy_quantity ? '立即秒杀' : '已售空') }}
+			</view>
+		</view>
         <u-popup v-model="show" mode="bottom">
 			<scroll-view scroll-y="true" class="popup">
 				<view>
@@ -40,9 +63,9 @@
 import guige from "./guige"
 export default {
 	name:"tloos",
-	props: ['id', 'info'],
+	props: ['id', 'info', 'type'],
     components:{
-        guige
+		guige,
     },
     data(){
         return {
@@ -107,6 +130,69 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.group-tool {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: 98rpx;
+	display: flex;
+	font-size: 32rpx;
+	color: rgba(255,255,255,1);
+	z-index: 99;
+	.launch {
+		flex: 1;
+		background: rgba(253,211,96,1);
+		line-height: 98rpx;
+		text-align: center;
+	}
+	.involvement {
+		flex: 1;
+		background: rgba(255,120,15,1);
+		line-height: 98rpx;
+		text-align: center;
+	}
+}
+.spike-tool {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: 98rpx;
+	display: flex;
+	z-index: 99;
+	.left {
+		width: 190rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		> view {
+			text-align: center;
+			> image {
+				width: 35rpx;
+				height: 35rpx;
+				margin-bottom: 15rpx;
+			}
+			> text {
+				display: block;
+				font-size: 24rpx;
+				color: rgba(102,102,102,1);
+			}
+		}
+	}
+	.btn {
+		flex: 1;
+		height: 98rpx;
+		line-height: 98rpx;
+		text-align: center;
+		font-size: 32rpx;
+		color: rgba(255,255,255,1);
+		background: rgba(255,120,15,1);
+	}
+	.cannot {
+		background: rgba(221,221,221,1);
+	}
+}
 .tloos{
 	background-color: #fff;
     display: flex;
@@ -143,7 +229,7 @@ export default {
     }
   
 }
-  .popup{
+.popup{
 	padding: 30rpx;
 	box-sizing: border-box;
 	max-height: 750rpx;
@@ -184,5 +270,5 @@ export default {
 			color: #666;
 		}
 	}
-    }
+}
 </style>

pageB/components/shoplist/index.vue

@@ -2,10 +2,17 @@
     <u-popup v-model="show" mode="bottom" length="782" border-radius="20">
 		<view class="top">
 			<text>全部商品</text>
-            <image></image>
+            <u-icon name="close" color="#999999" :size="30" @click="toggerList"></u-icon>
+		</view>
+        <scroll-view :scroll-y="true" class="scroll-box">
+            <view v-for="(item,index) in cartList" :key="index" class="item">
+				<image :src="item.goods_image" mode="aspectFill"></image>
+				<view>
+					<text class="title">{{ item.goods_advword }}</text>
+					<text class="name">{{ item.goods_name }}{{ item.goods_name }}{{ item.goods_name }}{{ item.goods_name }}{{ item.goods_name }}</text>
+					<text class="price">{{ item.goods_promotion_price }}</text>
+				</view>
 			</view>
-        <scroll-view :scroll-y="true" style="padding:0 30rpx;height:692rpx">
-            <sitem v-for="i in 10"></sitem>
         </scroll-view>
 	</u-popup>
 </template>
@@ -13,20 +20,24 @@
 import sitem from "./item"
 export default {
     name:'shoplist',
+	props: ['list'],
     components:{
         sitem
     },
     data(){
         return {
-            show: true
+            show: true,
+			cartList: [],
+        }
+    },
+	methods: {
+		toggerList() {
+			this.show = false;
 		}
 	}
 }
 </script>
 <style lang="scss" scoped>
-image{
-    background-color: #0f0;
-}
 .top{
     height: 88rpx;
     width: 100%;
@@ -39,9 +50,41 @@ image{
         font-size: 30rpx;
         color: #333;
     }
-    >image{
-        width: 33rpx;
-        height: 33rpx;
+}
+.scroll-box {
+	.item {
+		display: flex;
+		padding: 20rpx;
+		border-bottom: 1px solid #ECECEC;
+		& > image {
+			flex-shrink: 0;
+			width: 160rpx;
+			height: 160rpx;
+			margin-right: 14rpx;
+			border-radius: 10rpx;
+		}
+		& > view {
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			color: #333;
+			font-size: 28rpx;
+			.title {
+			}
+			.name {
+				width: 500rpx;
+				height: 80rpx;
+				font-size: 24rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 2;
+			}
+			.price {
+				color: #FF3131;
+			}
+		}
 	}
 }
 </style>

pageB/components/shpoone/index.vue

@@ -1,51 +1,89 @@
 <template>
-    <view class="shopone">
-        <image></image>
     <view>
-            <text>sadas</text>
-            <text>dasadas</text>
-            <text>dsadas</text>
+		<u-popup v-model="is_comment" mode="bottom" border-radius="10" height="700rpx">
+			<view class="top">
+				<text>评论</text>
+				<u-icon name="arrow-down" color="#333" size="28" @click="close"></u-icon>
 			</view>
+			<scroll-view class="scroll-box" scroll-y="true" >
+				<view></view>
+			</scroll-view>
+			<view class="editing">
+				<input type="text" value="" />
+				<text>发送</text>
+			</view>
+		</u-popup>
 	</view>
 </template>
-<style lang="scss" scoped>
-image{
-    background-color: #0f0;
-}
-.shopone{
-    width: 442rpx;
-    height: 200rpx;
-    background:rgba(0,0,0,0.4);
-    padding: 20rpx;
-    display: flex;
-    border-radius: 10rpx;
-    >image{
-        width: 160rpx;
-        height: 160rpx;
-    }
-    >view{
-        margin-left: 20rpx;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        >text{
-            font-size: 24rpx;
-            color: #fff;
-            line-height: 36rpx;
-        }
-        >text:first-child{
-            font-size: 28rpx;
-
-        }
-        >text:last-child{
-            font-size: 28rpx;
-            color: #FF3131;
-        }
-    }
-} 
-</style>
 <script>
 export default {
-    name:"shopone"
+    name: "shopone",
+	props: ['comment'],
+	data() {
+		return {
+			is_comment: true
+		}
+	},
+	onReady() {
+		this.getComment(); // 获取评论
+	},
+	watch: {
+		comment(newValue,old) {
+			console.log(newValue,old);
+		},
+		deep: true
+	},
+	methods: {
+		getComment() {
+			this.$u.post("Specialci/getAllEvalue", {
+				goods_id: goods_id,
+				page: 1
+			}).then(res => {
+				console.log(res);
+			})
+		},
+		close() {
+			this.is_comment = false;
+		}
+	}
 }
 </script>
+<style lang="scss" scoped>
+	.top {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 88rpx;
+		padding: 0 20rpx;
+		line-height: 88rpx;
+		background-color: #ECECEC;
+		& > text {
+			margin-right: 280rpx;
+			color: #333;
+			font-size: 30rpx;
+			font-weight: 500;
+		}
+	}
+	.scroll-box {
+		margin: 88rpx 0 100rpx 0;
+		height: 100%;
+	}
+	.editing {
+		position: fixed;
+		bottom: 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		height: 90rpx;
+		padding: 0 30rpx;
+		background-color: #ECECEC;
+		& > input {
+			width: 80%;
+			height: 60rpx;
+			padding: 0 20rpx;
+			border-radius: 30rpx;
+			background-color: #fff;
+		}
+	}
+</style>

pageB/components/userinfo/index.vue

@@ -1,30 +1,32 @@
 <template>
     <view class="userinfo">
         <view class="userhead">
-            <image :src="list.member_avatar"></image>
-            <text>+</text>
+            <image :src="item.member_avatar"></image>
+            <text class="follow" v-if="!is_follow" @click="following(item.member_id)">+</text>
+			<u-icon v-else name="checkmark" color="#ffffff" :size="28" class="follow"  @click="following(item.member_id)"></u-icon>
         </view>
-        <view class="zan">
-            <image></image>
-            <text>{{list.like_num}}</text>
+		<!-- 点赞 -->
+        <view class="operat zan">
+            <u-icon name="thumb-up-fill" :color=" is_like ? '#FF7807' : '#ffffff' " :size="50" @click="likeType(item.article_id)"></u-icon>
+            <text>{{item.like_num}}</text>
         </view>
-        <view class="shoucang">
-            <image></image>
-            <text>{{list.collect_num}}</text>
+		<!-- 收藏 -->
+        <view class="operat shoucang">
+            <u-icon name="star-fill" :color=" is_collect ? '#FF7807' : '#ffffff' " :size="50" @click="collecting(item.article_id)"></u-icon>
+            <text>{{item.collect_num}}</text>
         </view>
-        <view class="pinglun">
-            <image></image>
-            <text>{{list.comment_num}}</text>
+		<!-- 评论 -->
+        <view class="operat pinglun">
+            <u-icon name="more-circle-fill" :color=" is_content ? '#FF7807' : '#ffffff' " :size="50" @click="editing()"></u-icon>
+            <text>{{item.comment_num}}</text>
         </view>
-        <view class="gouwu">
-            <image></image>
+		<!-- 购物车 -->
+        <view class="operat gouwu">
+           <u-icon name="shopping-cart-fill" :color=" is_cart ? '#FF7807' : '#ffffff' " :size="50" @click="carting()"></u-icon>
         </view>
     </view>
 </template>
 <style lang="scss" scoped>
-image{
-    background-color: #0f0;
-}
 .userinfo{
     width: 110rpx;
     height: 570rpx;
@@ -32,41 +34,39 @@ image{
     flex-direction: column;
     justify-content: space-between;
     align-items: center;
-    >view{
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        font-size: 28rpx;
-        color: #fff;
-        >text{
-            margin-top: 17rpx;
-        }
-        >image{
-            width: 50rpx;
-            height: 50rpx;
-        }
-    }
-    >view:first-child{
+    .userhead{
+		position: relative;
         display: flex;
         position: relative;
         align-items: center;
-        >image{
+		&>image{
 		    width: 110rpx;
 		    height: 110rpx;
 		    border-radius: 50%;
 		    border: 2rpx solid #fff;
-
 		}
-        >text{
+		.follow {
+			position: absolute;
+			top: 90rpx;
+			left: 35%;
 			width: 36rpx;
 			height: 36rpx;
-            font-size: 36rpx;
-            background-color: #FF780F;
-            position: absolute;
-            top: 75rpx;
-            border-radius: 50%;
-            line-height: 36rpx;
 			text-align: center;
+			line-height: 36rpx;
+			font-size: 36rpx;
+			border-radius: 50%;
+			color: #fff;
+			background-color: #FF780F;
+		}
+    }
+	.operat {
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		& > text {
+			margin-top: 10rpx;
+			font-size: 28rpx;
+			color: #fff;
 		}
 	}
 }
@@ -74,11 +74,82 @@ image{
 <script>
 export default {
     name:'userinfo',
+	props:['list','cart','comment'],
     data(){
         return {
-
+			is_follow: this.list.is_attention || false,
+			is_like: this.list.is_like || false,
+			is_collect: this.list.is_collect || false,
+			is_content: false,
+			is_cart: false,
+			item: this.list || {}
         }
     },
-    props:['list']
+	watch: {
+		list(newValue,old) {
+			// console.log(newValue,old);
+			this.item = newValue || {};
+			this.is_follow = this.list.is_attention || false;
+			this.is_like = this.list.is_like || false;
+			this.is_collect = this.list.is_collect || false;
+		},
+		cart(newValue,old) {
+			// console.log(newValue,old);
+			this.is_cart = newValue;
+		},
+		comment(newValue,old) {
+			// console.log(newValue,old);
+			this.is_content = newValue;
+		},
+		deep: true
+	},
+	methods: {
+		// 关注
+		following(id) {
+			this.is_follow = !this.is_follow;
+			this.$u.api.attentionMember({member_id: id}).then(res => {
+				if (res.errCode == 0) {
+					this.$u.toast(res.message);
+				}
+			})
+		},
+		// 点赞
+		likeType(id) {
+			// console.log(id);
+			this.is_like = !this.is_like;
+			this.$u.post("article/articleLike",{article_id: id}).then(res => {
+				if (res.errCode == 0) {
+					// console.log(res);
+					this.list.like_num = res.data.num;
+				} else {
+					this.$u.toast(res.message);
+				}
+			})
+		},
+		// 收藏
+		collecting(id) {
+			this.is_collect = !this.is_collect;
+			this.$u.post("article/articleCollect",{article_id: id}).then(res => {
+				if (res.errCode == 0) {
+					// console.log(res);
+					this.list.collect_num = res.data.num;
+				} else {
+					this.$u.toast(res.message);
+				}
+			})
+		},
+		// 评论
+		editing() {
+			this.is_content = !this.is_content;
+			// console.log(this.is_content);
+			this.$emit("openCart",{ comment: this.is_content, cart: this.is_cart});
+		},
+		// 购物车
+		carting() {
+			this.is_cart = !this.is_cart;
+			// console.log(this.is_cart);
+			this.$emit("openCart",{ comment: this.is_content, cart: this.is_cart});
+		},
+	}
 }
 </script>

pageB/details/index.vue

@@ -20,10 +20,10 @@
                     <view class="box">
                         <view class="list">
                             <view >
-                                <videoItem v-for="item in 10"></videoItem>
+                                <videoItem v-for="item in 10" :key="index"></videoItem>
                             </view>
                             <view style="margin-left:20rpx">
-                                <videoItem v-for="item in 10"></videoItem>
+                                <videoItem v-for="item in 10" :key="index"></videoItem>
                             </view>
                         </view>
                     </view>
@@ -35,10 +35,10 @@
                     <view class="box">
                         <view class="list">
                             <view >
-                                <zhiboItem v-for="item in 10"></zhiboItem>
+                                <zhiboItem v-for="item in 10" :key="index"></zhiboItem>
                             </view>
                             <view style="margin-left:20rpx">
-                                <zhiboItem v-for="item in 10"></zhiboItem>
+                                <zhiboItem v-for="item in 10" :key="index"></zhiboItem>
                             </view>
                         </view>
                     </view>

pageB/photo/index.vue

@@ -1,72 +1,130 @@
 <template>
     <view class="photo">
+		<view class="status_bar"></view>
         <view class="back">
-            <image></image>
+            <u-icon name="close" color="#999999" :size="30" @click="goBack"></u-icon>
         </view>
-        <swiper class="swiper">
-            <swiper-item>
-                <image :src="list.article_pic"></image>
+        <swiper class="swiper" circular autoplay @change="changeSwiper">
+            <swiper-item v-for="(simg,sindex) in list.photo" :key="sindex">
+                <image :src="simg.url" mode="widthFix" @tap="viewImage" :data-url="simg.url"></image>
             </swiper-item>
-            <!-- <swiper-item>
-                <image></image>
-            </swiper-item> -->
-            
         </swiper>
         <view class="bottom">
-            <view class="item">
+            <view class="item" :style="{ width: photo_len * 20 + 100 + 'rpx' }">
                 <text>图片</text>
-                <view v-for="(item,index) in 4" :key="index" :style="{'background-color':index == 2 ? '#fff' : '#ede8e8'}"></view>
+                <view v-for="(item,index) in list.photo" :key="index" :style="{'background-color':index == swiper_id ? '#fff' : '#ede8e8'}"></view>
             </view>
-            <view class="username">自己黑的哈万岁哦划u将</view>
-            <view class="title">hasjdhajskhj</view>
-            <view class="info u-line-2">asdjhasjdkasljdklasjkl</view>
+            <view class="username">{{ list.member_nickname }}</view>
+            <view class="title">{{ list.article_title }}</view>
+            <view class="info">{{ list.article_content }}</view>
+			<view class="box">
+				<view class="label" v-for="(label,id) in list.label" :key="id">{{ label.name }}</view>
 			</view>
-        <userinfo class="userinfo" :list="list"></userinfo>
-        <shpoone class="shpoone"></shpoone>
-        <shoplist></shoplist>
+        </view>
+		<!-- 用户操作 -->
+        <userinfo class="userinfo" :list="list" :cart="cart_type" :comment="is_comment" @openCart="openPopup"></userinfo>
+		<!-- 评论 -->
+		<u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" height="700rpx">
+			<view class="top">
+				<text>评论</text>
+				<u-icon name="arrow-down" color="#333" size="28" @click="is_comment=false"></u-icon>
+			</view>
+			<scroll-view class="scroll-box" scroll-y="true" >
+				<block v-for="(item,index) in commentList" :key="index" v-if="commentList.length">
+					<view class="box">
+						<image :src="item.member_avatar" mode="aspectFill"></image>
+						<view class="info">
+							<text>{{ item.member_nickname }}</text>
+							<text class="time">{{ item.create_time }}</text>
+						</view>
+						<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">
+				<input type="text" value="" :placeholder="edit_text" disabled="disabled" />
+				<text>发送</text>
+			</view>
+		</u-popup>
+		<!-- 评论box -->
+		<u-popup v-model="is_edit" mode="bottom" border-radius="10" height="100rpx">
+			<view class="edit-box">
+				<input type="text" :placeholder="edit_text_other" :focus="is_focus" @focus="focus" v-model="send_value" autofocus>
+				<text @click="sendComment">发送</text>
+			</view>
+		</u-popup>
+		<!-- 购物车 -->
+		<u-popup v-if="cart_len > 1" class="cart" v-model="cart_type" mode="bottom" length="782" border-radius="20">
+			<view class="top">
+				<text>全部商品</text>
+		        <u-icon name="close" color="#999999" :size="30" @click="cart_type = false"></u-icon>
+			</view>
+		    <scroll-view :scroll-y="true" class="scroll-box">
+		        <view v-for="(item,index) in list.goods" :key="index" class="item" @click="gotoInfo(item.goods_id)">
+					<image :src="item.goods_image" mode="aspectFill"></image>
+					<view>
+						<text class="title">{{ item.goods_advword }}</text>
+						<text class="name">{{ item.goods_name }}</text>
+						<text class="price">{{ item.goods_promotion_price }}</text>
+					</view>
+				</view>
+		    </scroll-view>
+		</u-popup>
+		<!-- 单个 -->
+		<view class="good-one" v-else v-show="cart_type">
+			<view class="box" v-for="(item,index) in list.goods" :key="index" @click="gotoInfo(item.goods_id)">
+				<image :src="item.goods_image" mode="aspectFill"></image>
+				<view>
+					<view class="title u-line-1">{{ item.goods_advword }}</view>
+					<view class="content u-line-2">{{ item.goods_name }}</view>
+					<view class="price">￥{{ item.goods_promotion_price }}</view>
+				</view>
+			</view>
+		</view>
+        <!-- <shoplist :list="list.goods" v-show="list.goods.length > 1 && cart_type" @hideCart="hideCart"></shoplist> -->
     </view>
 </template>
 <style lang="scss" scoped>
 .photo{
-    height: 100vh;
-    background-color: #ececec;
     width: 100%;
+    height: 100%;
+    background-color: #000000;
     .back{
         padding-top: 28rpx;
         padding-right: 31rpx;
-        >image{
-            width: 31rpx;
-            height: 31rpx;
-            float: right;
-        }
+        text-align: right;
     }
     .swiper{
-        width: 100%;
-        height: 702rpx;
-        margin-top: 102rpx;
+        width: 750rpx;
+        height: 700rpx;
+        margin-top: 140rpx;
         image{
             width: 100%;
             height: 100%;
         }
     }
     .bottom{
-        width: 100%;
-        height: 270rpx;
-        background-color: #fff;
-        position: fixed;
-        bottom: 0;
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
+		margin-top: 180rpx;
         padding: 20rpx 30rpx;
+        background-color: #fff;
         .item{
+            display: flex;
+            align-items: center;
             padding: 8rpx 16rpx;
             font-size: 24rpx;
             color: #fff;
-            background-color: #999;
-            display: flex;
-            align-items: center;
             border-radius: 10rpx;
+            background:rgba(153,153,153,.5);
             >view{
                 width: 12rpx;
                 height: 12rpx;
@@ -75,68 +133,379 @@
             }
         }
         .username{
+			margin: 20rpx 0;
             font-size: 36rpx;
             color: #333;
-            margin-top: 20rpx;
 
         }
         .title{
-            font-size: 26rpx;
+            font-size: 28rpx;
             color: #333;
-            margin-top: 23rpx;
+			line-height: 46rpx;
         }
         .info{
+			margin: 20rpx 0;
+            line-height: 1.2;
             font-size: 28rpx;
-            line-height: 42rpx;
-            margin-top: 20rpx;
+        }
+		.box {
+			display: flex;
+			flex-wrap: wrap;
+			.label {
+				padding: 6rpx 10rpx;
+				margin: 0 10rpx 10rpx 0;
+				font-size: 24rpx;
+				color: #fff;
+				border-radius: 6rpx;
+				background-color: #000000;
+				opacity: 0.5;
+			}
 		}
     }
     .userinfo{
         position: absolute;
+        right: 30rpx;
         top: 50%;
         transform: translateY(-285rpx);
-        right: 30rpx;
     }
-    .shpoone{
-        position: absolute;
-        top: 50%;
+	.pl {
+		.top {
+			z-index: 1000;
+			position: fixed;
+			top: 0;
+			width: 100%;
+			height: 88rpx;
+			padding: 0 20rpx;
+			line-height: 88rpx;
+			background-color: #ECECEC;
+			& > text {
+				margin-right: 280rpx;
+				color: #333;
+				font-size: 30rpx;
+				font-weight: 500;
+			}
+		}
+		.scroll-box {
+			z-index: 99;
+			margin: 88rpx 0 150rpx 0;
+			height: 100%;
+			.box {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 20rpx;
+				& > image {
+					width: 60rpx;
+					height: 60rpx;
+					border-radius: 50%;
+					margin-right: 10rpx;
+				}
+				.info {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					height: 60rpx;
+					font-size: 26rpx;
+					color: #333;
+					.time {
+						font-size: 22rpx;
+						color: #999;
+					}
+				}
+				.reply {
+					font-size: 26rpx;
+					color: #333;
+				}
+			}
+			.content {
+				padding: 0 20rpx 10rpx 90rpx;
+			}
+            .child-content {
+                margin: 6rpx 90rpx 6rpx;
+                .more-reply {
+                    font-size: 22rpx;
+                    color: #999;
+                }
+            }
+		}
+		.no-data {
+			margin-top: 100rpx;
+		}
+		.editing {
+			position: fixed;
+			bottom: 0;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			width: 100%;
+			height: 88rpx;
+			padding: 0 30rpx;
+			border-top: 1px solid #ececec;
+			background-color: #fff;
+			& > input {
+				width: 80%;
+				height: 50rpx;
+				padding: 0 20rpx;
+				border-radius: 20rpx;
+				background-color: #fff;
+			}
+		}
+	}
+	// 弹出输入框
+	.edit-box {
+		display: flex;
+		align-items: center;
+		height: 90rpx;
+		& > input {
+			width: 80%;
+			padding: 4rpx 20rpx;
+			border-radius: 20rpx;
+		}
+	}
+	.cart {
+		.top{
+			z-index: 1000;
+			position: fixed;
+			top: 0;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			width: 100%;
+			height: 88rpx;
+			padding: 0 30rpx;
+			border-bottom: 1rpx solid #ececec;
+			background-color: #fff;
+			>text{
+				font-size: 30rpx;
+				color: #333;
+			}
+		}
+		.scroll-box {
+			margin-top: 88rpx;
+			.item {
+				display: flex;
+				padding: 20rpx;
+				border-bottom: 1px solid #ECECEC;
+				& > image {
+					flex-shrink: 0;
+					width: 160rpx;
+					height: 160rpx;
+					margin-right: 14rpx;
+					border-radius: 10rpx;
+				}
+				& > view {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					color: #333;
+					font-size: 28rpx;
+					.title {
+					}
+					.name {
+						width: 500rpx;
+						height: 80rpx;
+						font-size: 24rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+					}
+					.price {
+						color: #FF3131;
+					}
+				}
+			}
+		}
+	}
+    .good-one{
         z-index: 999;
+        position: absolute;
         right: 139rpx;
+        top: 54%;
         transform: translateY(100rpx);
+		.box {
+			display: flex;
+			align-items: center;
+			width: 440rpx;
+			height: 200rpx;
+			padding: 20rpx;
+			font-size: 28rpx;
+			color: #fff;
+			border-radius: 10rpx;
+			background-color: rgba(0,0,0,0.5);
+			& > image {
+				flex-shrink: 0;
+				width: 160rpx;
+				height: 100%;
+				margin-right: 10rpx;
+				border-radius: 10rpx;
+			}
+			& > view {
+				width: 200rpx;
+			}
+			.title {}
+			.content {
+				height: 60rpx;
+				margin: 10rpx 0;
+                line-height: 30rpx;
+				font-size: 24rpx;
+			}
+			.price {
+				color: #FF3131;
+			}
+		}
     }
 }
 </style>
 <script>
-import userinfo from "../components/userinfo/index"
-import shpoone from "../components/shpoone/index"
-import shoplist from "../components/shoplist/index"
+import userinfo from "../components/userinfo/index" // 点赞组件
+import contentBox from "../components/shpoone/index" // 评论
+// import shoplist from "../components/shoplist/index" // 商品列表
 
 export default {
     name:"photo",
-	onLoad(e) {
-		console.log('dhdhdhdhd',e)
-	},
     components:{
-        userinfo,
-        shpoone,
-        shoplist
+        userinfo
     },
     data(){
         return {
-            list:{}
+            list:{},
+			swiper_id: "",
+			cart_type: false, // 显示购物车
+			is_comment: false, // 显示评论
+			is_focus: false, // 聚焦
+			is_edit: false, // 输入框
+			send_value: "", // 输入的值
+			cartList: [],
+			cart_len: 0,
+			photo_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){
             this.$u.api.articleInfo({article_id}).then((res)=>{
-                console.log(res)
-                this.list = res.data.info
+                this.list = res.data.info;
+				this.cart_len = res.data.info.goods.length;
+                this.photo_len = res.data.info.photo.length;
             })
+        },
+		// 改变swiper
+		changeSwiper(e) {
+			// console.log(e.detail.current);
+			this.swiper_id = e.detail.current; // 储存swiper id
+		},
+		// 更改购物车状态
+		openPopup(data) {
+			// console.log(data);
+			this.cart_type = data.cart;
+			this.is_comment = data.comment;
+			if (this.is_comment) {
+				this.getComment(this.article_id,0);
 			}
 		},
-    onLoad(o){
-        this.id = o.id
-        this.articleInfo(this.id)
+		// 获取评论
+		getComment(id,page) {
+			this.$u.post("article/articleCommentList",{
+				article_id: id,
+				page: page,
+			}).then(res => {
+				console.log(res);
+				if (res.errCode == 0) {
+					this.commentList = res.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() {
+			this.$u.post("article/articleAddComment",{
+				article_id: this.article_id,
+				content: this.send_value,
+				pid: this.pid,
+				reply_id: this.reply_id,
+			}).then(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);
+				}
+			})
+		},
+		// 预览图片
+		viewImage(e) {
+			let arr = [];
+			this.list.photo.forEach(item => {
+				arr.push(item.url);
+			})
+			uni.previewImage({
+				urls: arr,
+				current: e.currentTarget.dataset.url,
+			})
+		},
+		// 跳转到商品
+		gotoInfo(id) {
+			console.log(id);
+			uni.navigateTo({
+				url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
+			})
+		},
+		goBack() {
+			uni.navigateBack({
+				delta: 1
+			})
+		},
+		focus() {
+			setTimeout(function(){
+				uni.showSoftKeybord;
+			}, 200)
+		}
+    },
 }
 </script>

pageB/sdetails/index.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="sdetails">
         <u-swiper :list="list" height="500" border-radius="0" mode="dot"></u-swiper>
-		<view class="spike-view" v-if="type==3">
+		<view class="spike-view" v-if="type == 3">
 			<view class="left">
 				<view class="price">
 					<view class="now-price">￥{{ groupbuyInfo.groupbuy_price }}</view>
@@ -9,14 +9,18 @@
 				</view>
 				<view class="num">剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity }}件</view>
 			</view>
-			<view class="right">
+			<view class="right" v-if="!isSpike">
 				<view class="title">秒杀倒计时</view>
 				<view class="time">{{ spikeTime }}</view>
 			</view>
+			<view class="right" v-else>
+				<view class="title">时间已结束</view>
+			</view>
 		</view>
         <view class="info">
             <view class="title u-line-2">
-                <text>{{ goodsInfo.store_name }}</text>{{ goodsInfo.goods_name }}
+                <text class="store-name">{{ goodsInfo.store_name }}</text>
+				<text class="goods-name">{{ goodsInfo.goods_name }}</text>
             </view>
             <view class="pic">
                 <text>￥{{ goodsInfo.goods_price }}</text>
@@ -25,10 +29,20 @@
         </view>
         <view class="hr"></view>
 		<!-- <navs :value="领券"></navs> -->
-        <navs :value="'产品规格'"></navs>
+        <navs :value="'产品规格'" @click.native="showSpec=true"></navs>
 		<!-- <navs :value="'产品颜色'"></navs> -->
 		<!-- <navs :value="'选择尺码'"></navs> -->
-		<!-- <navs v-for="(value, index) in goodsInfo.spec_name" :value="value" :key="index"></navs> -->
+		<view class="comment">
+			<view class="title">
+				<view class="left">商品评价（{{ evaluate.evaluate_num }}）</view>
+				<view class="right" @click="viewComment">
+					<text>查看全部</text>
+					<image src="/static/image/common/1.png"></image>
+				</view>
+			</view>
+			<comment :reply="false" :content="evaluate" v-if="evaluate.evaluate_num"></comment>
+			<view class="comment-none" v-else>暂无评价</view>
+		</view>
 		<view class="hr"></view>
 		<view class="group-user" v-if="groupUser.length">
 			<view class="top">
@@ -39,7 +53,7 @@
 				</view>
 			</view>
 			<view class="bottom">
-				<view class="left" @click="showGroupUser=true">
+				<view class="left" @click="showGroupUser=true" v-if="user_suc.length">
 					<view class="avatar">
 						<image v-for="(user, i) in user_suc" :src="user[0].member_avatar" :key="i"></image>
 					</view>
@@ -62,7 +76,7 @@
 				</view>
 			</view>
 		</view>
-		<u-popup v-model="showGroupUser" mode="center">
+		<u-popup v-model="showGroupUser" mode="center" z-index="10078">
 			<view class="launch-container">
 				<view class="title u-line-1">正在拼团</view>
 				<scroll-view class="launch-view">
@@ -71,6 +85,7 @@
 							<image class="avatar" :src="user[0].member_avatar"></image>
 							<view class="name u-line-1">{{ user[0].member_nickname }}</view>
 						</view>
+						<view class="pintuan-none" v-if="!groupUser.length">暂无拼团</view>
 					</view>
 				</scroll-view>
 				<image class="close" src="/static/image/common/17.png" @click="showGroupUser=false"></image>
@@ -96,13 +111,48 @@
         </view>
 		<view class="rich">
 			<rich-text :nodes="goodsInfo.mobile_body"></rich-text>
+		</view>
+		<!-- 选择规格数量 -->
+		<u-popup v-model="showSpec" mode="bottom">
+			<scroll-view scroll-y="true" class="spec-popup">
+				<view>
+					<view class="head">
+						<image class="image" :src="goodsInfo.goods_image"></image>
+						<view class="info">
+							<text class="u-line-2">{{goodsInfo.goods_name}}</text>
+							<text>￥{{goodsInfo.goods_price}}</text>
+						</view>
+					</view>
+					<guige @sel="self" ref="guige" v-for="(item,index) in goodsInfo.spec_value" :key="index" :title="goodsInfo.spec_name[index]" :item="item"></guige>
+					<view class="num">
+						<text>购买数量</text>
+						<u-number-box v-model="goodsNumber" @change="valChange"></u-number-box>
+					</view>
+					<view style="height:100rpx"></view>
+				</view>
+				<u-toast ref="uToast" />
+			</scroll-view>
+        </u-popup>
+		<!-- 普通商品 tool -->
+        <view class="tloos" v-if="type == 1">
+            <view class="navs">
+                <image src="/static/image/common/18.png"></image>
+                店铺
+            </view>
+            <view class="navs" style="margin-right:30rpx">
+                <image src="/static/image/common/19.png"></image>
+                客服
+            </view>
+            <view class="button" style="background:rgba(253,211,96,0.6);" v-if="goodsInfo.goods_try == 1" @click="tryDress">试穿试送</view>
+            <view class="button" style="background:rgba(253,211,96,1);" @click="addCart">加入购物车</view>
+            <view class="button" style="background:rgba(255,120,15,1);" @click="settlementOrder">立即购买</view>
         </view>
 		<!-- 拼团 tool -->
 		<view class="group-tool" v-if="type==2">
 			<view class="launch" @click="settlementOrder">发起拼团</view>
 			<view class="involvement" @click="showGroupUser=true">参与拼团</view>
 		</view>
-		<!-- 秒杀 -->
+		<!-- 秒杀 tool -->
 		<view class="spike-tool" v-if="type==3">
 			<view class="left">
 				<view>
@@ -119,99 +169,92 @@
 				{{ groupbuyInfo.groupbuy_state == 32 ? '时间已结束' : (groupbuyInfo.inventory > groupbuyInfo.groupbuy_buy_quantity ? '立即秒杀' : '已售空') }}
 			</view>
 		</view>
-		<!-- 普通商品 tool -->
-        <tloos @buy="buy" @xuanze="xuanze" :id="goodsInfo.goods_commonid" :info="goodsInfo" v-if="type==1"></tloos>
+        <!-- <tloos @buy="buy" @xuanze="xuanze" :id="id" :info="goodsInfo" :type="type"></tloos> -->
         <u-toast ref="uToast" />
     </view>
 </template>
 <script>
-/*
-* 详情是请求完存在store的，在这里从store取值
-**/
-import navs from "../components/sdetails/navs"
-import tloos from "../components/sdetails/tloos"
+import comment from "@/components/comment/index";
+import navs from "../components/sdetails/navs";
+import guige from "../components/sdetails/guige"
+import tloos from "../components/sdetails/tloos";
 export default {
-    name:"sdetails",
+    name: "sdetails",
     data() {
         return {
             list: [],　// 轮播图列表
-            goodsInfo: {},
-            info:{},
-            glist:[],
-			id:0, // 商品id
+            goodsInfo: {}, // 商品信息
+            glist: [], // 规格列表
+			id: 0, // 商品id/秒杀id/拼团 id
 			type: '', // 商品类型 商品详情 1普通 2拼团 3秒杀 4优惠券
 			groupUser: [], // 拼团用户
 			user_suc: [], // 拼团成功用户
-			avatarWidth: '',
-			pintuan_id: '', // 拼团id
 			showGroupUser: false, // 拼团
 			showInvolvementUser: false, // 参团
 			involvemenGroupInfo: [], // 参团的人
 			groupbuyInfo: {}, // 秒杀详情
 			spikeTime: '',
-			timer: '', // 时间定时器
+			isSpike: false, // 是否超过秒杀时间
+			timer: '', // 秒杀时间定时器
+			spec_id: '', // 规格 id, 下单用的
+			evaluate: {}, // 评价内容
+			showSpec: false, // 是否显示选择规格
+			goodsNumber: 1,
+			sel: "", // 拼接的规格
+			quanxuan: false, // 规格是否选择
+			debounce: true,
         }
 	},
-    components:{
+    components: {
+		comment,
         navs,
-        tloos
+		tloos,
+		guige,
+	},
+	watch: {
+		sel(value){
+			this.xuanze(value);
+		},
+	},
+	onLoad(option) {
+		// this.init();
+		// console.log(option);
+		this.type = Number(option.type);
+		this.id = option.id;
+		this.getGoodsDetails(this.id);
+		this.setTitle();
 	},
 	onShow() {
-		// if(this.pintuan_id) {
-		// 	this.$u.api.getPinTuanDetails({
-		// 		pintuan_id: this.pintuan_id
-		// 	}).then(res => {
-		// 		if(res.errCode == 0) {
-		// 			const goods = {
-		// 				goods: res.data.data,
-		// 				type: 2,
-		// 			}
-		// 			this.$store.commit('setGoodsDetails', goods);
-		// 			this.$store.commit('setGoodsId', this.pintuan_id);
-		// 		}
-		// 	})
-		// }
+		this.debounce = true;
+		this.showSpec = false;
+		this.showGroupUser = false;
+		this.showInvolvementUser = false;
 	},
-	onLoad() {
-		this.init();
+	onNavigationBarButtonTap(e) {
+		if(e.index == 0) this.$u.route('/pageC/cart/index');
 	},
 	beforeDestroy() {
 		clearInterval(this.timer);
 	},
 	methods: {
-		init() {
-			this.id = this.$store.state.goods_id;
-			this.type = this.$store.getters.getGoodsType;
-			const info = this.$store.getters.getGoodsInfo;
-			if(this.type == 2) {
-				this.user_suc = info.user_suc;
-				this.groupUser = info.user;
-				this.pintuan_id = info.pintuan_id;
-			}
-			if (this.type == 3) {
-				this.groupbuyInfo = this.$store.state.groupbuyInfo;
-				this.setSpikeTime();
-			}
-			// console.log(this.groupbuyInfo);
-			this.goodsInfo = info.goods;
-			// 设置轮播图
-			let list = [];
-			info.goods_image[0].forEach(item => {
+		setSwiperList(list) {
+			let img = [];
+			list.forEach(item => {
 				let temp = {
-					image: item
+					image: item[1]
 				}
-				list.push(temp);
+				img.push(temp);
 			})
-			this.list = list;
-			this.setTitle();
+			this.list = img;
 		},
 		spikeGoods() {
 			this.settlementOrder()
 		},
-		setSpikeTime() {
-			const time = this.groupbuyInfo.groupbuy_endtime;
+		setSpikeTime(time) {
+			// const time = this.groupbuyInfo.groupbuy_endtime;
 			this.timer = setInterval(() => {
 				let spikeTime = time * 1000 - new Date().getTime();
+				if(spikeTime <= 0) this.isSpike = true;
 				// 计算天数
 				const days = Math.floor(spikeTime/(24*3600*1000));
 				//计算出小时数
@@ -229,61 +272,113 @@ export default {
 				// console.log(this.spikeTime);
 			}, 1000)
 		},
-        buy(info){
-            if(info.type == 2){ // 加入购物车
+		addCart() {
 			this.$u.api.addCart({
 				goods_id: this.id,
-                    quantity: info.value,
+				quantity: this.goodsNumber,
 			}).then(res => {
 				this.$refs.uToast.show({
 					title: res.message,
 					type: res.errCode == 0 ? 'success' : 'warning',
 				})
 			})
-            } else if (info.type == 1) { // 支付
-				this.settlementOrder({num: info.value});
-			}
+		},
+		purchase() {
+			this.settlementOrder();
 		},
 		getGoodsDetails(id) {
-			this.id = id;
+			switch (this.type) {
+				case 1:
+					this.ordinaryDetails(id);
+					break;
+				case 2:
+					this.pinTuanDetails(id);
+					break;
+				case 3:
+					this.spikeGoodsDetails(id);
+					break;
+				case 4:
+					
+					break;
+			
+				default:
+					break;
+			}
+		},
+		// 普通商品详情
+		ordinaryDetails(id) {
 			this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
 				if (res.errCode == 0) {
+					this.evaluate = res.data.goods_evaluate_info;
 					this.goodsInfo = res.data.goods;
-					let list = [];
-					res.data.goods_image[0].forEach(item => {
-						let temp = {
-							image: item
-						}
-						list.push(temp);
-					})
-					this.list = list;
-					this.info = res.data.goods;
+					this.setSwiperList(res.data.goods_image);
 					this.glist = res.data.spec_list;
 					// console.log(this.goodsInfo.mobile_body);
 				}
 			})
 		},
-		// 下单
+		// 拼团详情
+		pinTuanDetails(id) {
+			this.$u.api.getPinTuanDetails({
+				pintuan_id: id
+			}).then(res => {
+				if(res.errCode == 0) {
+					this.evaluate = res.data.data.goods_evaluate_info;
+					this.goodsInfo = res.data.data.goods;
+					this.setSwiperList(res.data.data.goods_image);
+					this.glist = res.data.data.spec_list;
+					this.user_suc = res.data.data.user_suc;
+					this.groupUser =res.data.data.user;
+				}
+			})
+		},
+		// 秒杀详情
+		spikeGoodsDetails(id) {
+			this.$u.api.getSpikeInfo({
+				groupbuy_id: id
+			}).then(res => {
+				if(res.errCode == 0) {
+					this.groupbuyInfo = res.data.groupbuyInfo;
+					this.evaluate = res.data.goodsInfo.goods_evaluate_info;
+					this.goodsInfo = res.data.goodsInfo.goods;
+					this.setSwiperList(res.data.goodsInfo.goods_image);
+					this.setSpikeTime(res.data.groupbuyInfo.groupbuy_endtime);
+				}
+			})
+		},
+		// 试穿
+		tryDress() {
+			this.$u.route({
+				url: '/pageB/triedDress/index',
+				params: {
+					id: this.id,
+				}
+			})
+		},
 		/*
-		* @params {Number} type 拼团或者开团
+		* @description 下单 订单步骤1：展示结算数据
+		* @params {Number} type involvement 拼团或者 默认开团
+		* @params {Number} num 数量
+		* @params {Number} ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
 		**/
-		settlementOrder({type, num = 1} = {}) {
-			// ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
+		settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) {
+			if(!this.debounce) return;
+			this.debounce = false;
 			let params = {
-				ifcart: 0, 
+				ifcart: ifcart, 
 				cart_id: [this.goodsInfo.goods_id + '|' + num],
 			}
 			if(this.type == 2) {
 				if(type == 'involvement') {
 					Object.assign(params, {
-						pintuan_id: this.pintuan_id, 
-						pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id 
+						pintuan_id: this.id, 
+						pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id,
 					})
 				} else {
 					const userId = uni.getStorageSync('user_info').member.member_id;
 					this.$store.commit('setGroupHeadId', userId);
 					Object.assign(params, {
-						pintuan_id: this.pintuan_id,
+						pintuan_id: this.id,
 					})
 				}
 			}
@@ -294,19 +389,47 @@ export default {
 					this.$u.route({
 						url: '/pageC/cart/ConfirmOrder'
 					})
+				} else {
+					this.debounce = true;
 				}
 			})
 		},
+		// 参团
 		involvemenGroup(user) {
 			this.involvemenGroupInfo = user;
 			this.showGroupUser = false;
 			this.showInvolvementUser = true;
 			// console.log(this.involvemenGroupInfo);
 		},
-        xuanze(id){
-            console.log(id)
-            // this.getGoodsDetails(this.glist[id])
+		valChange(e) {
+            // console.log(this.value)
         },
+        self(){
+            // console.log(this.$refs.guige)
+            let index = 0;
+            let arr = [];
+            for(let i in this.goodsInfo.spec_value){
+                // console.log(i)
+                // console.log(this.$refs.guige[index++].select)
+                // index++;
+                let sel = this.$refs.guige[index++].select
+                if(sel != 0){
+                    arr.push(sel)
+                }
+            }
+            // console.log(arr.length)
+            if(arr.length == index){
+                this.sel = arr.join("|")
+                this.quanxuan = true
+                // console.log(this.sel)
+            }
+        },
+        xuanze(id){
+			// console.log(id)
+            this.getGoodsDetails(this.glist[id])
+			this.id = this.glist[id];
+		},
+		// 设置页面标题
 		setTitle() {
 			let title = '';
 			switch (this.type) {
@@ -329,6 +452,14 @@ export default {
 				title: title
 			});
 		},
+		viewComment() {
+			this.$u.route({
+				url: 'pageB/comment/index',
+				params: {
+					id: this.goodsInfo.goods_id
+				}
+			})
+		}
 	},
 }
 </script>
@@ -336,6 +467,7 @@ export default {
 .sdetails {
 	padding-bottom: 98rpx;
 	position: relative;
+	background-color: #EEEBEE;
 	.spike-view {
 		position: absolute;
 		top: 396rpx;
@@ -397,18 +529,25 @@ export default {
 		}
 	}
     .info {
+		background:rgba(255,255,255,1);
         padding: 30rpx;
+		margin-bottom: 20rpx;
         .title{
             flex-wrap: wrap;
 			margin-bottom: 30rpx;
-            >text{
-                padding: 13rpx;
-                font-size: 24rpx;
-                color:#fff;
-                margin-right: 13rpx;
-                background-color: #FF780F;
+			.store-name {
 				display: inline-block;
-                border-radius: 25rpx;
+                padding: 8rpx 10rpx;
+                margin: 0 10rpx 4rpx 0;
+				vertical-align: middle;
+                font-size: 20rpx;
+                color: #fff;
+                border-radius: 30rpx;
+				background-color: #FF780F;
+				margin-bottom: 10rpx;
+			}
+			.goods-name {
+				line-height: 1.5;
 			}
         }
         .pic{
@@ -424,12 +563,42 @@ export default {
             }
         }
     }
+	.comment {
+		margin-top: 20rpx;
+		background:rgba(255,255,255,1);
+		padding: 30rpx;
+		.title {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			margin-bottom: 30rpx;
+			.left {
+				font-size: 30rpx;
+				color: rgba(51,51,51,1);
+			}
+			.right {
+				font-size: 24rpx;
+				color: rgba(153,153,153,1);
+				> image {
+					width: 8rpx;
+					height: 16rpx;
+					margin-left: 10rpx;
+				}
+			}
+		}
+		.comment-none {
+			font-size: 26rpx;
+			text-align: center;
+			margin-top: 30rpx;
+		}
+	}
     .hr {
         width: 100%;
         height: 20rpx;
         background-color: #ececec;
     }
 	.group-user {
+		background: rgba(255,255,255,1);
 		padding: 30rpx;
 		.top {
 			margin-bottom: 28rpx;
@@ -580,6 +749,11 @@ export default {
 						margin-right: 80rpx;
 					}
 				}
+				.pintuan-none {
+					font-size: 36rpx;
+					color: #333;
+					margin: 100rpx auto 0;
+				}
 			}
 			
 		}
@@ -685,7 +859,7 @@ export default {
 		display: flex;
 		font-size: 32rpx;
 		color: rgba(255,255,255,1);
-		z-index: 99;
+		z-index: 10076;
 		.launch {
 			flex: 1;
 			background: rgba(253,211,96,1);
@@ -706,7 +880,7 @@ export default {
 		width: 100%;
 		height: 98rpx;
 		display: flex;
-		z-index: 99;
+		z-index: 10076;
 		.left {
 			width: 190rpx;
 			display: flex;
@@ -739,5 +913,82 @@ export default {
 			background: rgba(221,221,221,1);
 		}
 	}
+	.tloos{
+		background-color: #fff;
+		display: flex;
+		position: fixed;
+		height: 98rpx;
+		width: 100%;
+		bottom:0;
+		border-top: 1rpx solid #ececec;
+		z-index: 10076;
+		.navs{
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			font-size: 24rpx;
+			color: #666;
+			flex-shrink: 0;
+			margin-left: 30rpx;
+			>image{
+				width: 35rpx;
+				height: 35rpx;
+				margin-bottom: 15rpx;
+			}
+			
+
+		}
+		.button{
+			width: 100%;
+			height: 100%;
+			line-height: 98rpx;
+			text-align: center;
+			color: #fff;
+
+		}
+	}
+	.spec-popup {
+		padding: 30rpx;
+		box-sizing: border-box;
+		max-height: 750rpx;
+		.head{
+			display: flex;
+			margin-bottom: 30rpx;
+			.image{
+				width: 195rpx;
+				height: 195rpx;
+				border-radius: 10rpx;
+				flex-shrink: 0;
+			}
+			.info{
+				display: flex;
+				padding: 21rpx 0;
+				justify-content: space-between;
+				margin-left: 27rpx;
+				flex-direction: column;
+				>text:first-child{
+					font-size: 28rpx;
+					color: #333;
+				}
+				>text:last-child{
+					font-size: 30rpx;
+					color: #ff3131;
+				}
+			}
+		}
+
+		.num{
+			height: 84rpx;
+			display: flex;
+			border-bottom: #ececec solid 2rpx;
+			justify-content: space-between;
+			align-items: center;
+			>text{
+				font-size: 26rpx;
+				color: #666;
+			}
+		}
+	}
 }
 </style>

pageB/search/index.vue

@@ -1,19 +1,9 @@
 <template>
     <view class="search">
-        <view class="sosuo">
-            <image></image>
-            <u-search placeholder="搜索您需要的商品" v-model="keyword" height="60" :action-style="{
-                'font-size':'32rpx',
-                'color':'#FF780F',
-                'overflow':'unset'
-            }"
-            @search="search"
-            ></u-search>
-        </view>
         <view class="list">
             <view class="title">搜索发现</view>
             <view class="label">
-                <text>这是标签</text>
+                <text v-for="(label, index) in searchwordlist" :key="index" @click="search(label.word)">{{ label.word }}</text>
             </view>
         </view>
     </view>
@@ -23,17 +13,43 @@ export default {
     name:"search",
     data(){
         return{
-            keyword:""
+			keyword: "",
+			searchwordlist: [],
         }
 	},
+	created() {
+		this.getWordList();
+	},
+	// 点击搜索按钮
+	onNavigationBarButtonTap(e) {
+		if(e.index == 0) this.search(this.keyword);
+	},
+	// 输入框文本变化
+	onNavigationBarSearchInputChanged(e) {
+		this.keyword = e.text;
+	},
+	// 点击键盘搜索按钮
+	onNavigationBarSearchInputConfirmed(value) {
+		this.search(this.keyword);
+	},
     methods:{
+		getWordList() {
+			this.$u.api.searchwordlist().then(res => {
+				this.searchwordlist = res.data;
+			})
+		},
         search(value){
 			// console.log(value)
+			if(!value) {
+				this.$u.toast('搜索内容不可为空');
+				return false;
+			}
             this.$u.route({
-                url:"/pageB/search/out",
-                params:{
-                    value,
-                    type:"shop"
+                url: "/pageB/search/out",
+                params: {
+                    value: value,
+					type: "shop",
+					order: 'goods_salenum'
                 }
             })
         }
@@ -67,7 +83,8 @@ export default {
         }
         .label{
             display: flex;
-            >text{
+			flex-wrap: wrap;
+            > text {
                 margin-top: 20rpx;
                 margin-right: 30rpx;
                 font-size: 26rpx;

pageB/search/out.vue

@@ -1,11 +1,10 @@
 <template>
     <view class="out">
-        <view class="sosuo">
-            <image></image>
-            <u-search placeholder="搜索您需要的商品" v-model="keyword" height="60" :show-action="false"></u-search>
-        </view>
-        <u-tabs-swiper v-if="type == 'dianpu'" @change="tabsChange" :show-bar="false" :bold="false" :font-size="32" active-color="#FF780F" ref="uTabs" :list="list" :is-scroll="false" style="border-bottom: 1px solid #ececec;flex-shrink:0" height="88"></u-tabs-swiper>
-        <swiper  v-if="type == 'dianpu'" class="swiper"  :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
+        <u-tabs-swiper v-if="type == 'dianpu'" @change="tabsChange" :show-bar="false" :bold="false" :font-size="32"
+            active-color="#FF780F" ref="uTabs" :list="list" :is-scroll="false" style="border-bottom: 1px solid #ececec;flex-shrink:0"
+            height="88"></u-tabs-swiper>
+        <swiper v-if="type == 'dianpu'" class="swiper" :current="swiperCurrent" @transition="transition"
+            @animationfinish="animationfinish">
             <swiper-item>
                 <scroll-view :scroll-y="true" style="height:100%">
                     <view style="padding-top:30rpx">
@@ -16,56 +15,41 @@
             <swiper-item>
                 <scroll-view :scroll-y="true" style="height:100%">
                     <view class="list">
-                        <darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0rpx 3rpx 7rpx 0rpx rgba(153, 153, 153, 0.35);" v-for="item in 50"></darenItem>
+                        <!-- <darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0rpx 3rpx 7rpx 0rpx rgba(153, 153, 153, 0.35);" v-for="item in 50"></darenItem> -->
                     </view>
                 </scroll-view>
             </swiper-item>
         </swiper>
         <view v-else style=" display: flex;flex-direction: column;height: calc(100vh - 88rpx);">
             <view class="select">
-                <view  @click="sx(0)" data-type="xl">销量</view>
+                <view @click="sx(0)" class="xz" data-type="xl">销量</view>
                 <view class="xz" @click="sx(1)">
                     <text>价格</text>
                     <view class="jiage">
-                        <view class="top"></view>
+                        <view class="top topxz"></view>
                         <view class="bottom bottomxz"></view>
                     </view>
                 </view>
                 <view data-type="hp" @click="sx(2)">好评</view>
             </view>
-              <swiper class="swiper"  :current="swiperCurrent" @change="huadong">
-                <swiper-item>
+            <view class="swiper" :current="swiperCurrent" @change="huadong">
                 <scroll-view :scroll-y="true" style="height:100%">
                     <view style="padding-top:30rpx">
-                            <shop v-for="(i,j) in shoplist[0]" :key="j" :name="i.goods_name" :id="i.goods_id" :commonid="i.goods_commonid" :image="i.goods_image"></shop>
-                         
+                        <shop v-for="(i,j) in shoplist" :key="j" :name="i.goods_name" :id="i.goods_id" :commonid="i.goods_commonid"
+                            :image="i.goods_image"></shop>
                     </view>
                 </scroll-view>
-                </swiper-item> 
-                <swiper-item> 
-                    <scroll-view :scroll-y="true" style="height:100%">
-                        <view class="list">
-                            <!-- <darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0rpx 3rpx 7rpx 0rpx rgba(153, 153, 153, 0.35);" v-for="item in 50"></darenItem> -->
             </view>
-                    </scroll-view>
-                </swiper-item>
-                <swiper-item> 
-                    <scroll-view :scroll-y="true" style="height:100%">
-                       D
-                    </scroll-view>
-                </swiper-item>
-            </swiper>
         </view>
-      
-
     </view>
 </template>
 <style lang="scss" scoped>
-.out{
+    .out {
         display: flex;
         flex-direction: column;
         height: 100vh;
-    .sosuo{
+
+        .sosuo {
             width: 100%;
             height: 88rpx;
             border-bottom: 1rpx solid #ececec;
@@ -74,25 +58,29 @@
             padding: 0 30rpx;
             flex-shrink: 0;
 
-        >image{
+            >image {
                 width: 18rpx;
                 height: 32rpx;
                 margin-right: 24rpx;
                 flex-shrink: 0;
             }
+
             align-items: center;
         }
-    .swiper{
+
+        .swiper {
             width: 100%;
             height: 100%;
-        .list{
+
+            .list {
                 display: flex;
                 flex-wrap: wrap;
                 width: 100%;
                 padding-left: 30rpx;
             }
         }
-    .select{
+
+        .select {
             width: 100%;
             height: 89rpx;
             border-bottom: 1rpx solid #ececec;
@@ -101,67 +89,77 @@
             padding: 0 40rpx;
             flex-shrink: 0;
             justify-content: space-between;
-        >view{
+
+            >view {
                 font-size: 32rpx;
                 color: #333;
                 display: flex;
-            font-weight:400;
-            .jiage{
+                font-weight: 400;
+
+                .jiage {
                     display: flex;
                     flex-direction: column;
-                .top{ 
+
+                    .top {
                         width: 12rpx;
                         border-bottom: 12rpx solid #707070;
-                    border-left: 11rpx solid #fff ;
-                    border-right: 11rpx solid #fff ;
+                        border-left: 11rpx solid #fff;
+                        border-right: 11rpx solid #fff;
                         margin-bottom: 2rpx;
                     }
-                .bottom{
+
+                    .bottom {
                         width: 12rpx;
                         border-top: 12rpx solid #707070;
-                    border-left: 11rpx solid #fff ;
-                    border-right: 11rpx solid #fff ;
+                        border-left: 11rpx solid #fff;
+                        border-right: 11rpx solid #fff;
                     }
-                .topxz{
+
+                    .topxz {
                         border-bottom: 12rpx solid #FF780F;
                     }
-                .bottomxz{
+
+                    .bottomxz {
                         border-top: 12rpx solid #FF780F;
                     }
                 }
             }
-        .xz{
-            color:#FF780F;
+
+            .xz {
+                color: #FF780F;
             }
 
         }
-}
+    }
 </style>
 <script>
-import shop from "../components/search/shop"
-import darenItem from "@/components/index/daren-item/index" 
-export default {
-    name:"out",
-    components:{
+    import shop from "../components/search/shop"
+    import darenItem from "@/components/index/daren-item/index"
+    export default {
+        name: "out",
+        components: {
             shop,
             darenItem
         },
-    data(){
+        data() {
             return {
-            list:[
-                {
-                    name:"店铺"
-                },{
-                    name:"达人"
-                }
-            ],
+                list: [{
+                    name: "店铺"
+                }, {
+                    name: "达人"
+                }],
                 current: 0,
                 swiperCurrent: 0,
-            keyword:"",
-            type:"",
-            shoplist:[]
+                keyword: "",
+                type: "",
+                shoplist: []
             }
         },
+        onLoad(o) {
+            this.type = o.type
+            this.keyword = o.value
+            this.search()
+        },
         methods: {
             tabsChange(index) {
                 this.swiperCurrent = index;
@@ -176,23 +174,20 @@ export default {
                 this.swiperCurrent = current;
                 this.current = current;
             },
-        sx(type){
+            sx(type) {
                 console.log(type)
 
             },
-        huadong(e){
+            huadong(e) {
                 console.log(e.detail.current)
             },
-        search(){
-            this.$u.api.ShopSearch({keyword:this.keyword}).then((res)=>{
-                this.shoplist[0] = res.data.data
+            search() {
+                this.$u.api.ShopSearch({
+                    keyword: this.keyword
+                }).then((res) => {
+                    this.shoplist = res.data.data
                 })
             }
         },
-    onLoad(o){
-        this.type = o.type
-        this.keyword = o.value
-        this.search()
     }
-}
 </script>

pageB/triedDress/index.vue

@@ -0,0 +1,298 @@
+<template>
+	<view class="tried">
+		<view class="user-info">
+			<view>
+				<label for="name">试穿人:</label>
+				<input type="text" id="name" placeholder="" v-model="name" />
+			</view>
+			<view>
+				<label for="phone">手机号:</label>
+				<input type="text" id="phone" placeholder="" maxlength="11" v-model="phone" />
+			</view>
+			<view class="area" @click="show=true">
+				<label for="address">省市区:</label>
+				<input type="text" id="address" placeholder="" v-model="address" disabled />
+				<!-- <view>
+					<image src="/static/image/mine/24.png"></image>
+					<text>定位</text>
+				</view> -->
+			</view>
+			<view>
+				<label for="area">详细地址:</label>
+				<input type="text" id="area" placeholder="" v-model="area" />
+			</view>
+			<view @click="showTime=true">
+				<label for="time">预约时间:</label>
+				<input type="text" id="time" placeholder="" disabled v-model="time" />
+			</view>
+		</view>
+		<u-picker mode="time" v-model="showTime" :params="params" @confirm="chooseDate"></u-picker>
+		<view class="goods-container">
+			<view class="store">
+				<image :src="store.store_avatar"></image>
+				<text>{{ store.store_name }}</text>
+			</view>
+			<view class="goods">
+				<image :src="goodsInfo.goods_image"></image>
+				<view class="right">
+					<view class="name u-line-2">{{ goodsInfo.goods_name }}</view>
+					<u-number-box v-model="number" bg-color="#FFFFFF" :min="1" :input-width="38" :input-height="38" color="#FF780F"></u-number-box>
+				</view>
+			</view>
+		</view>
+		<view class="edit-btn" @click="confirmBtn">确认试穿</view>
+		<u-select v-model="show" 
+				mode="mutil-column-auto" 
+				:list="areaList" 
+				value-name="area_id" 
+				label-name="area_name" 
+				child-name="_child" 
+				@confirm="setArea">
+		</u-select>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			show: false,
+			areaList: [],
+			checked: false, // 是否设为默认地址
+			name: '',
+			phone: '',
+			address: '', // 选择地址
+			area: '', // 详细地址
+			time: '',
+			showTime: false,
+			number: 1, // 商品数量
+			area_id: '', // 地区id 省
+			city_id: '', // 城市id
+			goodsInfo: {},
+			store: {},
+			params: {
+				year: true,
+				month: true,
+				day: true,
+				hour: true,
+				minute: true,
+				second: false
+			},
+			debounce: true,
+		}
+	},
+	mounted() {
+		this.getAreaData();
+	},
+	onLoad(option) {
+		this.ordinaryDetails(option.id);
+	},
+	methods: {
+		verification() {
+			if(this.$u.test.isEmpty(this.name)) {
+				this.$u.toast('姓名不可为空');
+				return false;
+			}
+			if(this.$u.test.isEmpty(this.phone)) {
+				this.$u.toast('手机号不可为空');
+				return false;
+			}
+			if(!this.$u.test.mobile(this.phone)) {
+				this.$u.toast('请正确填写手机号');
+				return false;
+			}
+			if(this.$u.test.isEmpty(this.address)) {
+				this.$u.toast('地址不可为空');
+				return false;
+			}
+			if(this.$u.test.isEmpty(this.area)) {
+				this.$u.toast('详细地址不可为空');
+				return false;
+			}
+			if(this.$u.test.isEmpty(this.time)) {
+				this.$u.toast('预约时间不可为空');
+				return false;
+			}
+			if(new Date(this.time) < new Date()) {
+				this.$u.toast('预约时间错误');
+				return false;
+			}
+			if(this.number > this.goodsInfo.goods_storage) {
+				this.$u.toast('库存不足');
+				return false;
+			}
+			return true;
+		},
+		chooseDate(e) {
+			let time = e.year + '/' + e.month + '/' + e.day + ' ' + e.hour + ':' + e.minute;
+			this.time = time;
+		},
+		confirmBtn() {
+			if(!this.debounce) return;
+			if(!this.verification()) return false;
+			this.debounce = false;
+			this.$u.api.saveGoodsTry({
+				member_name: this.name,
+				member_mobile: this.phone,
+				area_info: this.address,
+				address_detail: this.area,
+				goods_id: this.goodsInfo.goods_id,
+				num: this.number,
+				store_id: this.store.store_id,
+				appointment_time: new Date(this.time),
+			}).then(res => {
+				if (res.errCode == 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						back: true,
+					})
+				} else {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'error',
+					})
+					this.debounce = true;
+				}
+			})
+		},
+		getAreaData() {
+			this.$u.api.getArea().then((res)=>{
+				if (res.errCode == 0) {
+					this.areaList = res.data;
+				}
+			})
+		},
+		setArea(area) {
+			// console.log(area);
+			this.area_id = area[0].value;
+			this.city_id = area[1].value;
+			let temp = '';
+			area.forEach(e => {
+				temp += e.label + ' ';
+			});
+			this.address = temp;
+		},
+		ordinaryDetails(id) {
+			this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
+				if (res.errCode == 0) {
+					this.goodsInfo = res.data.goods;
+					this.store = res.data.store;
+				}
+			})
+		},
+	}
+};
+</script>
+<style lang="scss" scoped>
+.tried {
+	.user-info {
+		border-top: 1rpx solid rgba(235,235,235,1);
+		> view {
+			display: flex;
+			align-items: center;
+			height: 98rpx;
+			padding: 30rpx;
+			border-bottom: 2rpx solid rgba(235,235,235,1);
+			font-size: 30rpx;
+			> label {
+				width: 150rpx;
+				margin-right: 20rpx;
+			}
+			> input {
+				flex: 1;
+				outline: none;
+			}
+		}
+		.area {
+			padding: 0 30rpx;
+			display: flex;
+			> input {
+				padding: 30rpx 0;
+				flex: 1;
+			}
+			> view {
+				margin-left: 30rpx;
+				width: 50rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				font-size: 22rpx;
+				color: rgba(255,120,15,1);
+				> image {
+					width: 26rpx;
+					height: 32rpx;
+					margin-bottom: 10rpx;
+				}
+			}
+		}
+	}
+	.goods-container {
+		padding: 30rpx;
+		.store {
+			display: flex;
+			align-items: center;
+			margin-bottom: 20rpx;
+			> image {
+				width: 60rpx;
+				height: 60rpx;
+				border-radius: 50%;
+				margin-right: 16rpx;
+				background-color: antiquewhite;
+			}
+			> text {
+				font-size: 28rpx;
+				color: rgba(51,51,51,1);
+			}
+		}
+		.goods {
+			display: flex;
+			> image {
+				width: 180rpx;
+				height: 160rpx;
+				border-radius: 10rpx;
+				margin-right: 30rpx;
+				background-color: aquamarine;
+			}
+			.right {
+				flex: 1;
+				.name {
+					font-size: 30rpx;
+					color: rgba(51,51,51,1);
+					line-height: 44rpx;
+					margin-bottom: 30rpx;
+				}
+				/deep/ .u-numberbox {
+					border: 1rpx solid rgba(217,215,215,1);
+					.u-icon-minus, .u-icon-plus {
+						width: 38rpx;
+						.u-icon {
+							.u-icon__icon {
+								font-size: 11rpx;
+							}
+						}
+					}
+					.u-number-input {
+						margin: 0;
+						border: 1rpx solid rgba(229,229,229,1) {
+							top: 0;
+							bottom: 0;
+						};
+					}
+				}
+			}
+		}
+	}
+	.edit-btn {
+		margin: 122rpx auto 0;
+		width: 690rpx;
+		height: 98rpx;
+		background: rgba(255,119,15,1);
+		border-radius: 49rpx;
+		font-size: 36rpx;
+		color:rgba(255,255,255,1);
+		line-height: 98rpx;
+		text-align: center;
+	}
+}
+</style>

pageC/cart/ConfirmOrder.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="order">
-		<view class="info-address" @click="changeAddress">
+		<view class="info-address" @click="changeAddress" v-if="JSON.stringify(addressInfo) != '{}'">
 			<image src="../static/image/2.png" class="address-icon"></image>
 			<view class="address">
 				<view class="user-info">
@@ -11,11 +11,12 @@
 			</view>
 			<image src="../static/image/1.png" class="right"></image>
 		</view>
+		<view v-else class="address-none" @click="changeAddress">请选择地址</view>
 		<view class="main">
 			<view v-for="(item, index) in orderInfo.store_cart_list" :key="index">
 				<view class="goods-info">
 					<view class="store">
-						<image class="avatar" :src="item[0].store_avatar"></image>
+						<image class="avatar" :src="orderInfo.store_list[index].store_avatar"></image>
 						<view>{{ item[0].store_name }}</view>
 						<image src="../static/image/1.png" class="right"></image>
 					</view>
@@ -68,13 +69,13 @@
 		<u-popup v-model="couponStatus" mode="bottom">
 			<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 1">
 				<view class="title">优惠券详情</view>
-				<view class="text">店铺优惠券</view>
+				<view class="text">平台优惠券</view>
 				<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_all_list" :key="index"></Coupon>
 				<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_all_list.length"></u-empty>
 			</scroll-view>
 			<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 2">
 				<view class="title">优惠券详情</view>
-				<view class="text">平台优惠券</view>
+				<view class="text">店铺优惠券</view>
 				<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_list[this.couponType.store_id]" :key="index"></Coupon>
 				<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_list[this.couponType.store_id].length"></u-empty>
 			</scroll-view>
@@ -121,7 +122,7 @@ export default {
 			choiceCoupon: {}, // 使用的平台优惠券
 			goodsClass: [],
 			orderType: '', // 订单类型 1 普通订单  2 拼团订单 3 秒杀订单 4 优惠券 5 购物车订单
-
+			debounce: true,
 		}
 	},
 	components: {
@@ -147,16 +148,20 @@ export default {
 	onLoad(option) {
 		this.orderType = this.$store.state.orderType;
 		this.orderInfo = this.$store.state.orderInfo;
-		console.log(this.orderType);
-		console.log(this.orderInfo);
+		// console.log(this.orderType);
+		// console.log(this.orderInfo);
 		this.getGoodsClass();
+		this.setTotalPrice();
 	},
 	onShow() {
+		this.debounce = true;
+		this.storeCoupon = {};
+		this.choiceCoupon = {};
 		// 判断是不是从选择地址页面返回
 		if(JSON.stringify(this.$store.state.orderAddress) == '{}') {
-			this.$store.commit('updateAddress', this.orderInfo.address_info);
+			if(this.orderInfo.address_info) this.$store.commit('updateAddress', this.orderInfo.address_info);
 		} else {
-			this.addressInfo = this.$store.state.orderAddress;
+			if(this.$store.getters.getOrderAddress) this.addressInfo = this.$store.state.orderAddress;
 		}
 	},
 	beforeDestroy() {
@@ -165,22 +170,8 @@ export default {
 	watch: {
 		'$store.state.orderAddress'(value) {
 			this.addressInfo = value;
-			this.getFreight();
+			if(JSON.stringify(value) != '{}') this.getFreight();
 		},
-		// storeCoupon: {
-		// 	deep: true,
-		// 	handler() {
-		// 		console.log(222);
-		// 		this.setTotalPrice(); // 计算总价
-		// 	}
-		// },
-		// choiceCoupon: {
-		// 	deep: true,
-		// 	handler() {
-		// 		console.log(111);
-		// 		this.setTotalPrice(); // 计算总价
-		// 	}
-		// },
 	},
 	methods: {
 		// 如果有pintuangroup_headid为参团不然为开团
@@ -200,14 +191,22 @@ export default {
 				if(res.errCode == 0) {
 					this.sendOrder(0);
 				} else {
+					this.debounce = true;
 					this.$u.toast(res.message);
 				}
 			})
 		},
 		intermediate() {
-			if(this.orderType == 2) this.withImmediate();
+			if(!this.debounce) return;
+			this.debounce = false;
+			if(this.orderType == 2) {
+				this.withImmediate();
+			} else if(this.orderType == 1) {
+				this.sendOrder(0);
+			}
 			else this.sendOrder(1);
 		},
+		// @params {Number} ifcart 是否是购物车商品
 		sendOrder(ifcart) {
 			// 拼接后端需要的数据形式
 			let id = [], temp = '';
@@ -236,28 +235,37 @@ export default {
 			if(JSON.stringify(this.choiceCoupon) != '{}') {
 				coupon.push(0 + '|' + this.choiceCoupon.voucher_id)
 			}
+			// 验证是否选择地址
+			if(!this.addressInfo || JSON.stringify(this.addressInfo) == '{}') {
+				this.$u.toast('收货地址不能为空');
+				return false;
+			}
 			let params = {
 				ifcart: ifcart,
 				cart_id: id,
 				address_id: this.addressInfo.address_id,
 				buy_city_id: this.addressInfo.city_id,
-				voucher_id: coupon,
 			}
+			if(coupon.length) Object.assign(params, { voucher_id: coupon });
 			if(this.orderType == 2) {
-				Object.assign(params, { pintuan_id: this.orderInfo.pintuan_id })
-				if(this.orderInfo.pintuangroup_id) Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id })
+				Object.assign(params, { pintuan_id: this.orderInfo.pintuan_id });
+				if(this.orderInfo.pintuangroup_id) Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id });
 			}
 			// console.log(params);
 			this.$u.api.sendOrder(params).then(res => {
 				if(res.errCode == 0) {
 					this.$u.route({
+						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 {
+					this.debounce = true;
 					this.$u.toast(res.message);
 				}
 			})
@@ -297,6 +305,7 @@ export default {
 		},
 		setTotalPrice() {
 			const goods = this.orderInfo.store_goods_total;
+			// console.log(this.freight);
 			const freight = this.freight;
 			let price = 0;
 			// 商品价格加上运费
@@ -391,6 +400,14 @@ export default {
 			height: 22rpx;
 		}
 	}
+	.address-none {
+		height: 150rpx;
+		line-height: 150rpx;
+		margin-bottom: 10rpx;
+		background:rgba(255,255,255,1);
+		text-align: center;
+		color: #333;
+	}
 	.main {
 		margin-bottom: 50rpx;
 		> view {
@@ -407,8 +424,8 @@ export default {
 						width: 60rpx;
 						height: 60rpx;
 						border-radius: 50%;
-						border: 1rpx solid #000;
 						margin-right: 15rpx;
+						background-color: aquamarine;
 					}
 					> view {
 						font-size: 28rpx;

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'">
-						<u-radio :name="item.name" active-color="#FF780F" :disabled="item.disabled"></u-radio>
+					<view class="" :class="pay_way == item.name ? 'active' : 'default'">
+                        <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) {
@@ -54,29 +59,44 @@ export default {
 		// getProvider() {
 		// 	uni.getProvider({service: 'payment'})
 		// },
-		// 支付宝支付
-		payByAlipay (orderInfo) {
+		payOrder(provider, orderInfo) {
+            let me = this;
 			uni.requestPayment({
-				provider: 'alipay',
-				orderInfo: orderInfo, //支付宝订单数据
-				success: function (res) {
+				provider: provider,
+				orderInfo: orderInfo, //订单数据
+				success: (res) => {
 					console.log('success:' + JSON.stringify(res));
-				},
-				fail: function (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)
 				},
-		// 微信支付
-		payByWxpay (orderInfo) {
-			uni.requestPayment({
-				provider: 'wxpay',
-				orderInfo: orderInfo, //微信订单数据
-				success: function (res) {
-					console.log('success:' + JSON.stringify(res));
-				},
-				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)
 				}
 			});
 		},
@@ -86,11 +106,15 @@ export default {
 				payment_code: this.pay_way,
 			}).then(res => {
 				if(res.errCode == 0) {
-					// this.$u.toast(res.message);
-					// uni.navigateBack();
-					const orderInfo = JSON.parse(res.data.content);
-					console.log(orderInfo);
-					this.pay_way == 'wxpay_app' ? this.payByWxpay(orderInfo) : this.payByAlipay(orderInfo);
+					let orderInfo, provider;
+					if(res.data.payment_code == 'wxpay_app') {
+						provider = 'wxpay';
+						orderInfo = JSON.parse(res.data.content);
+					} else if(res.data.payment_code == 'alipay_app') {
+						provider = 'alipay';
+						orderInfo = res.data.content;
+					}
+					this.payOrder(provider, orderInfo);
 				}
 			})
 		}
@@ -125,15 +149,18 @@ export default {
 		/deep/ .u-radio-group {
 			width: 100%;
 			flex-direction: column;
-			.radio-view {
-				padding: 6rpx;
-				border-radius: 50%;
+            .u-radio__icon-wrap {
+                width: 30rpx !important;
+                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 {
@@ -145,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;

pageC/cart/index.vue

@@ -54,6 +54,7 @@ export default {
 			checkedAll: false,
 			checkedGoods: [],
 			totalPrice: '0.00',
+			debounce: true,
 		}
 	},
 	watch: {
@@ -73,7 +74,12 @@ export default {
 			deep: true
 		}
 	},
+	onPullDownRefresh() {
+		this.debounce = true;
+		this.getCartList();
+	},
 	onShow() {
+		this.debounce = true;
 		this.getCartList();
 	},
 	methods: {
@@ -88,6 +94,8 @@ export default {
 		},
 		// 结算
 		settlementOrder() {
+			if(!this.debounce) return;
+			this.debounce = false;
 			if(!this.checkedGoods.length) return false;
 			// 拼接后端需要的数据形式
 			let id = [], temp = '';
@@ -105,12 +113,16 @@ export default {
 					this.$u.route({
 						url: '/pageC/cart/ConfirmOrder'
 					})
+				} else {
+					this.$u.toast(res.message);
+					this.debounce = true;
 				}
 			})
 		},
 		getCartList() {
 			this.$u.api.getCartTreeList().then(res => {
 				if (res.errCode == 0) {
+					uni.stopPullDownRefresh();
 					let list = res.data.store_cart_list;
 					list.forEach((item, l_index) => {
 						// 判断有无 checked 属性,如果有取值再赋值, 没有给默认值 false

pageC/classify/goods.vue

@@ -0,0 +1,193 @@
+<template>
+	<view class="classify-goods">
+		<view class="tab-container">
+			<view class="salenum" :class="{ 'current' : current == 0 }" @click="switchCurrent(0)">销量</view>
+			<view class="price" :class="{ 'current' : current == 1 }" @click="switchCurrent(1)">
+				<view class="text">价格</view>
+				<view class="icon">
+					<u-icon name="arrow-up-fill" :color="(current == 1 && priceOrderAsc) ? '#FF780F' : '#333333'" size="22"></u-icon>
+					<u-icon name="arrow-down-fill" :color="(current == 1 && !priceOrderAsc) ? '#FF780F' : '#333333'" size="22"></u-icon>
+				</view>
+			</view>
+			<view class="evaluation" :class="{ 'current' : current == 2 }" @click="switchCurrent(2)">好评</view>
+		</view>
+		<scroll-view scroll-y class="goods-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
+			<view v-for="goods in goodsList" :key="goods.goods_id" class="goods-item" @click="toDetailsPage(goods.goods_id)">
+				<image :src="goods.goods_image"></image>
+				<view class="right">
+					<view class="name u-line-1">{{ goods.goods_name }}</view>
+					<view class="briefing u-line-2">{{ goods.goods_advword }}</view>
+				</view>
+			</view>
+			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
+			<u-empty mode="list" v-if="!goodsList.length"></u-empty>
+		</scroll-view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			pageSize: 12,
+			cid: '',
+			page: 1,
+			current: 0,
+			priceOrderAsc: true,　// 是否升序
+			goodsList: [],
+			scrollHeight: '',
+			loadStatus: 'loadmore',
+			timer: true, // 防止上拉加载短时间内多次调用
+		}
+	},
+	watch: {
+		current(value) {
+			this.page = 1;
+			this.goodsListByClassId({ laod: 'reload' });
+		},
+		priceOrderAsc(value) {
+			this.page = 1;
+			this.goodsListByClassId({ laod: 'reload' });
+		}
+	},
+	onLoad(option) {
+		this.cid = option.cid;
+		this.goodsListByClassId({ load: 'reload' });
+		this.setViewHeight();
+		this.setTitle(option.cname);
+	},
+	methods: {
+		setOrderSort() {
+			let sort = '';
+			if(this.current == 0) {
+				sort = 'goods_salenum';
+			} else if (this.current == 1) {
+				if(this.priceOrderAsc) sort = 'goods_price_asc';
+				else sort = 'goods_price_desc';
+			} else if (this.current == 2) {
+				sort = 'evaluation_count';
+			}
+			return sort;
+		},
+		// 排序方式 goods_salenum：销量　evaluation_count：评价　goods_price_asc：价格从低到高　goods_price_desc：价格从高到低
+		async goodsListByClassId({ load = 'reload' } = {}) {
+			const sort = this.setOrderSort();
+			const res = await this.$u.api.goodsListByClassId({ 
+				gc_id: this.cid, 
+				page: this.page,
+				order: sort,
+			})
+			this.timer = true;
+			if(res.errCode == 0) {
+				if(load == 'reload') this.goodsList = res.data.data;
+				else if(load == 'loadmore') this.goodsList.push(...res.data.data);
+			}
+			return res.data.data.length;
+		},
+		loadMore() {
+			if(this.goodsList.length < this.pageSize) return false;
+			if(!this.timer) return false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.goodsListByClassId({  load: 'loadmore' }).then(length => {
+				if(length == 0) {
+					this.page--;
+					this.loadStatus = 'nomore';
+				} else {
+					this.loadStatus = 'loading';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
+			})
+		},
+		switchCurrent(current) {
+			if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
+			this.current = current;
+		},
+		setViewHeight() {
+			const res = uni.getSystemInfoSync();
+			this.scrollHeight = res.windowHeight - (90 / 2) + 'px';
+		},
+		setTitle(title) {
+			uni.setNavigationBarTitle({
+				title: title
+			});
+		},
+		toDetailsPage(id) {
+			this.$u.route('/pageB/sdetails/index', {
+				id: id,
+				type: 1 // 商品详情 商品类型 1普通 2拼团 3秒杀 4优惠券
+			});
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.classify-goods {
+	.tab-container {
+		box-sizing: border-box;
+		padding: 30rpx 40rpx;
+		display: flex;
+		margin-bottom: 30rpx;
+		> view {
+			height: 30rpx;
+			line-height: 30rpx;
+			flex: 1;
+			font-size: 32rpx;
+			color: rgba(51,51,51,1);
+		}
+		.salenum {
+			text-align: left;
+		}
+		.price {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			.text {
+				margin-right: 5rpx;
+			}
+			.icon {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+		.evaluation {
+			text-align: right;
+		}
+		.current {
+			color: rgba(255,120,15,1);
+		}
+	}
+	.goods-container {
+		.goods-item {
+			margin: 0 auto;
+			width: 690rpx;
+			display: flex;
+			background-color: #F5F5F5;
+			margin-bottom: 30rpx;
+			align-items: center;
+			> image {
+				width: 220rpx;
+				height: 170rpx;
+				flex-shrink: 0;
+				margin-right: 30rpx;
+			}
+			.right {
+				width: 418rpx;
+				.name {
+					font-size: 30rpx;
+					color: rgba(51,51,51,1);
+					margin-bottom: 20rpx;
+				}
+				.briefing {
+					font-size: 28rpx;
+					color: rgba(102,102,102,1);
+					line-height: 36rpx;
+				}
+			}
+		}
+	}
+}
+</style>

pageC/classify/index.vue

@@ -15,7 +15,7 @@
 							<text>{{item.gc_name}}</text>
 						</view>
 						<view class="item-container">
-							<view class="thumb-box" v-for="(item1, index1) in item._child" :key="index1">
+							<view class="thumb-box" v-for="(item1, index1) in item._child" :key="index1" @click="toClassifyPage(item1.gc_id, item1.gc_name)">
 								<image class="item-menu-image" :src="item1.img" mode=""></image>
 								<view class="item-menu-name">{{item1.gc_name}}</view>
 							</view>
@@ -49,7 +49,18 @@
 		onReady() {
 			this.getMenuItemTop()
 		},
+		onNavigationBarButtonTap(e) {
+			if(e.index == 0) this.$u.route('/pageB/search/index');
+		},
+		onNavigationBarSearchInputClicked() {
+			this.$u.route('/pageB/search/index');
+		},
 		methods: {
+			toSearchPage() {
+				this.$u.route({
+					url: "pageB/search/index"
+				})
+			},
 			// 获取分类列表
 			getClassifyList() {
 				this.$u.api.getGoodsClassifyList().then(res => {
@@ -161,6 +172,12 @@
 						}
 					}
 				}, 10)
+			},
+			toClassifyPage(id, name) {
+				this.$u.route('pageC/classify/goods', {
+					cid: id,
+					cname: name,
+				});
 			}
 		}
 	}

pageC/groupBuy/index.vue

@@ -5,9 +5,9 @@
 		</view>
 		<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-item" v-for="(_, index) in tabList" :key="index">
-				<scroll-view scroll-y style="height: 800rpx;width: 100%;" @scrolltolower="onreachBottom">
+				<scroll-view scroll-y style="width: 100%;" @scrolltolower="onreachBottom">
 					<SpecialGoods v-for="(item, index) in pinTuanList" :key="index" :item="item" type='group'></SpecialGoods>
-					<!-- <loadmore ref="loadmore" @callback="getPinTuanList" bgColor="#FFF"></loadmore> -->
+					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="pinTuanList.length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
 					<u-empty text="暂无商品" mode="list" color="#000" v-if="!pinTuanList.length"></u-empty>
 				</scroll-view>
 			</swiper-item>
@@ -15,22 +15,22 @@
 	</view>
 </template>
 <script>
-import loadmore from "@/components/loadmore/index";
 import SpecialGoods from "../../components/shop/special-shop/index";
 export default {
 	data() {
 		return {
+			pageSize: 12,
 			tabList: [],
 			current: -1,
 			swiperCurrent: 0,
 			page: 0,
 			pinTuanList: [],
 			swiperHeight: '',
-			timer: '', // 限制下拉刷新
+			timer: true, // 限制下拉刷新
+			loadStatus: 'loadmore',
 		}
 	},
 	components: {
-		loadmore,
 		SpecialGoods,
 	},
 	onLoad() {
@@ -39,8 +39,7 @@ export default {
 	},
 	watch: {
 		current(index) {
-			// console.log(this.tabList);
-			this.getPinTuanList({id: this.tabList[index].gc_id });
+			this.getPinTuanList({ id: this.tabList[index].gc_id, load: 'reload' });
 		}
 	},
 	methods: {
@@ -54,14 +53,39 @@ export default {
 			})
 		},
 		// 拼团列表
-		async getPinTuanList({ id, page }) {
+		async getPinTuanList({ id, page, load }) {
 			const res = await this.$u.api.getPinTuanList({
 				page: this.page,
 				gc_id: id,
 			})
-			this.pinTuanList = res.data;
+			this.timer = true;
+			if (res.errCode == 0) {
+				if(load == 'reload') this.pinTuanList = res.data;
+				else if(load == 'loadmore') this.pinTuanList.push(...res.data);
+			}
 			return res.data.length;
 		},
+		// scroll-view到底部加载更多
+		onreachBottom() {
+			if(!this.timer) return false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.getPinTuanList({
+				id: this.tabList[this.current].gc_id,
+				load: 'loadmore',
+			}).then(length => {
+				console.log(length);
+				if(length == 0) {
+					this.page--;
+					this.loadStatus = 'nomore';
+				} else {
+					this.loadStatus = 'loadmore';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
+			})
+		},
 		// tabs通知swiper切换
 		tabsChange(index) {
 			this.swiperCurrent = index;
@@ -78,24 +102,6 @@ export default {
 			this.swiperCurrent = current;
 			this.current = current;
 		},
-		// scroll-view到底部加载更多
-		onreachBottom() {
-			this.$$refs.loadmore.reachBottom();
-			// if(!this.timer) return false;
-			// this.loadStatus = "loading";
-			// this.page++;
-			// this.getPinTuanList().then(length => {
-			// 	if(length == 0) {
-			// 		this.page--;
-			// 		this.status = 'nomore';
-			// 	} else {
-			// 		this.status = 'loading';
-			// 	}
-			// }).catch(() => {
-			// 	this.loadStatus = "nomore";
-			// 	this.page--;
-			// })
-		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
 			this.swiperHeight = res.windowHeight - (88 / 2) + 'px';

pageD/notice/notice.vue

@@ -32,6 +32,9 @@
 </script>
 
 <style lang="scss" scoped>
+    page {
+        background-color: #ECECEC;
+    }
 	.sousuo {
 		height: 113rpx;
 		border: 1px #f00 solid;

pageE/mine/EditUserInfo.vue

@@ -67,6 +67,34 @@ export default {
 	onLoad() {
 		this.getUserInfo();
 	},
+	// 监听头像裁剪
+	created() {
+		// uni.$on('uAvatarCropper', path => {
+		// 	const url = this.$u.http.config.baseUrl + '/Upload/uploadfile';
+		// 	this.avatar = path;
+		// 	// 可以在此上传到服务端
+		// 	// uni.uploadFile({
+		// 	// 	url: 'http://www.example.com/upload',
+		// 	// 	filePath: path,
+		// 	// 	name: 'file',
+		// 	// 	complete: (res) => {
+		// 	// 		console.log(res);
+		// 	// 	}
+		// 	// });
+		// 	common.uploadFile({ 
+		// 		url: url,
+		// 		name: 'avatar',
+		// 		filePath: path
+		// 	}).then(result => {
+		// 		// console.log(result);
+		// 		this.$set(this, 'avatar', result.file_path);
+		// 		// this.avatar = result.file_path;
+		// 		this.uploadPath = result.file_name;
+		// 	}, error => {
+		// 		this.$u.toast(error);
+		// 	})
+		// })
+	},
 	onNavigationBarButtonTap(e) {
 		if( e.index == 0 ) uni.navigateBack();
 	},
@@ -85,7 +113,7 @@ export default {
 						filePath: res.tempFilePaths[0]
 					}).then(result => {
 						// console.log(result);
-						this.$set(this, 'avatar', result.file_path);
+						// this.$set(this, 'avatar', result.file_path);
 						// this.avatar = result.file_path;
 						this.uploadPath = result.file_name;
 					}, error => {
@@ -94,6 +122,17 @@ export default {
 				}
 			});
 		},
+		// 头像裁剪
+		// chooseAvatar() {
+		// 	this.$u.route({
+		// 		url: '/uview-ui/components/u-avatar-cropper/u-avatar-cropper',
+		// 		params: {
+		// 			destWidth: 300,
+		// 			rectWidth: 200,
+		// 			fileType: 'jpg',
+		// 		}
+		// 	})
+		// },
 		getUserInfo() {
 			this.$u.api.getMemberInfo().then(res => {
 				if (res.errCode == 0) {
@@ -103,7 +142,7 @@ export default {
 						userInfo.member_mobile,
 						userInfo.member_birthday,
 						userInfo.member_sex,
-						userInfo.member_avatar,
+						userInfo.member_avatar + '?' + new Date().getTime(),
 					];
 				}
 			})
@@ -117,6 +156,7 @@ export default {
 			}).then(res => {
 				if (res.errCode == 0) {
 					this.getUserInfo();
+					// this.$u.toast(res.message);
 				}
 			})
 		},

pageE/mine/ImageTextCollection.vue

@@ -1,23 +1,89 @@
 <template>
 	<view class="collection">
-		<view class="item-box" v-for="(item, index) in 5" :key="index">
-			<videoItem></videoItem>
+		<view class="container">
+			<view class="item-box" v-for="(item, index) in articleList" :key="index" @click="toDetailsPage(item.article_id)">
+				<view class="video-item" v-if="item">
+					<image class="head" :src="item.article_pic" v-if="item.type == 1"></image>
+					<view class="header_fist" v-else>
+						<view class="backes"></view>
+						<image class="head" :src="item.article_pic"></image>
 					</view>
+					<view class="title u-line-1">{{ item.article_title }}</view>
+					<view class="jianjie u-line-1">{{ item.article_content }}</view>
+					<view class="user">
+						<view class="info">
+							<image :src="item.member_avatar"></image>
+							<text>{{ item.member_nickname }}</text>
+						</view>
+						<view @click.stop="delArticle(item.article_id)">
+							<u-icon name="trash" color="#333" size="36"></u-icon>
+						</view>
+						<!-- <image src="/static/image/common/4.png" @click.stop="showAction(item)"></image> -->
+						<!-- <view class="action" v-if="show == item.article_id">
+							<view class="bubble">
+								<view @click.stop="delArticle(item.article_id)">
+									<image src="/static/image/common/8.png"></image>
+									<text>删除</text>
+								</view>
+							</view>
+						</view> -->
+						<view class="layer" v-if="show == item.article_id" @click.stop="show=-1"></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-empty mode="list" v-if="!articleList.length" color="#000" img-width="200" font-size="30" margin-top="120"></u-empty>
 	</view>
 </template>
 <script>
-import videoItem from "@/components/index/video-item/index" 
 export default {
 	data() {
-		return {}
+		return {
+			show: -1,
+			articleList: [],
+		}
+	},
+	onShow() {
+		this.articleCollectList();
+	},
+	// 下拉刷新
+	onPullDownRefresh() {
+       this.articleCollectList();
+    },
+	methods: {
+		showAction(item) {
+			this.show = this.show > 0 ? -1 : item.article_id;
+		},
+		articleCollectList() {
+			this.$u.api.articleCollectList().then(res => {
+				uni.stopPullDownRefresh();
+				if(res.errCode == 0) {
+					this.articleList = res.data;
+				} else {
+					this.articleList = [];
+				}
+			})
+		},
+		delArticle(id) {
+			this.$u.api.articleCollect({ article_id: id }).then(res => {
+				if(res.errCode == 0) {
+					this.articleCollectList();
+				} else {
+					this.$u.toast(res.message);
+				}
+			})
+		},
+		toDetailsPage(id) {
+			 uni.navigateTo({
+				url: '/pageB/photo/index?id=' + id
+			});
 		},
-	components: {
-		videoItem
 	}
 };
 </script>
 <style lang="scss" scoped>
 .collection {
+	.container {
 		border-top: 1rpx solid #ECECEC;
 		padding: 21rpx 30rpx 0;
 		display: flex;
@@ -26,6 +92,143 @@ export default {
 			&:not(:nth-child(2n)) {
 				margin-right: 20rpx;
 			}
+			.video-item{
+				height: 540rpx;
+				margin-top: 20rpx;
+				width: 335rpx;
+				box-shadow:0 3rpx 7rpx 0 rgba(153, 153, 153, 0.35);
+				padding-bottom: 20rpx;
+				border-radius: 20rpx;
+				overflow: hidden;
+				.head{
+					width: 100%;
+					height: 334rpx;
+				}
+				.title{
+					margin:0 auto;
+					margin-top: 20rpx;
+					font-size: 22rpx;
+					color: #333;
+					font-weight: 500;
+					line-height: 30rpx;
+					width: 300rpx;
+				}
+				.jianjie{
+					// height: 60rpx;
+					margin:0 auto;
+					margin-top: 20rpx;
+					font-size: 22rpx;
+					color: #666;
+					line-height: 30rpx;
+					width: 300rpx;
+					margin-left: 18rpx;
+				}
+				.user{
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin:0 auto;
+					margin-top: 20rpx;
+					width: 300rpx;
+					position: relative;
+					.info {
+						display: flex;
+						align-items: center;
+						>image{
+							width: 38rpx;
+							height: 38rpx;
+							border-radius: 50%;
+
+						}
+						>text{
+							font-size: 20rpx;
+							color:#333;
+							margin-left: 9rpx;
+						}
+					}
+					>image{
+						width: 37rpx;
+						height: 8rpx;
+					}
+					.action {
+						z-index: 19;
+						position: absolute;
+						right: 0rpx;
+						bottom: 55rpx;
+						// width: 234rpx;
+						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;
+							&::after {
+								position: absolute;
+								right: 10rpx;
+								bottom: 0;
+								content: '';
+								width: 60rpx; 
+								height: 40rpx;
+								background-color: inherit;
+								transform: rotate(45deg);
+								margin-top: -10rpx;
+								z-index: -1;
+								box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
+							}
+							> view {
+								padding: 9rpx 12rpx;
+								display: flex;
+								align-items: center;
+								&:not(:last-child) {
+									border-bottom: 2rpx #ECECEC solid;
+								}
+								@mixin image-class($width, $height, $right) {
+									width: $width;
+									height: $height;
+									margin-right: $right;
+								}
+								> image {
+									&:first-child {
+										@include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx);
+									}
+									&:nth-child(2) {
+										@include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx);
+									}
+									&:last-child {
+										@include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx);
+									}
+								}
+								> text {
+									font-size: 20rpx;
+									color: rgba(51,51,51,1);
+								}
+							}
+						}
+					}
+					.layer {
+						position: fixed;
+						top: 0;
+						left: 0;
+						width: 100%;
+						height: 100%;
+						z-index: 9;
+						background-color: transparent;
+					}
+				}
+				.header_fist{
+					position: relative;
+					.backes{
+						position: absolute;
+						top: 0;
+						background: rgba(0,0,0,0.6);
+						width: 100%;
+						height: 100%;
+						color: #fff;
+					}
+					
+				}
+			}
+		}
 	}
 }
 </style>

pageE/mine/Integral.vue

@@ -3,11 +3,11 @@
 		<view class="integral-top">
 			<view>
 				<view class="title">总积分</view>
-				<view class="value">{{ memberInfo.member_points }}</view>
+				<view class="value">{{ memberInfo.member_points || 0 }}</view>
 			</view>
 			<view>
 				<view class="title">经验值</view>
-				<view class="value">{{ memberInfo.member_exppoints }}</view>
+				<view class="value">{{ memberInfo.member_exppoints || 0 }}</view>
 			</view>
 			<view @click="viewProgress">
 				<view class="title">预计进度</view>

pageE/mine/MedalIntroduction.vue

@@ -13,11 +13,25 @@
 	</view>
 </template>
 <script>
+import common from '@/static/js/common.js';
 export default {
 	data() {
 		return {
-			nodes: '<h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1>'
+			nodes: '',
 		}
+	}, 
+	created() {
+		this.getMemberPointsStat();
+	},
+	methods: {
+		getMemberPointsStat() {
+			this.$u.api.getMemberPointsStat().then((res)=>{
+				if (res.errCode == 0) {
+					const nodes = res.data.grade_rule;
+					this.nodes = common.unescapeHTML(nodes);
+				}
+			})
+		},
 	}
 };
 </script>

pageE/mine/MemberServeCoupon.vue

@@ -3,20 +3,11 @@
 		<u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="88" ></u-tabs-swiper>
 		<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{ height: swiperHeight }">
 			<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
-				<scroll-view scroll-y style="height: 100%;">
+				<scroll-view scroll-y style="height: 100%;" @scrolltolower="onreachBottom">
 					<view v-for="(coupon, index) in couponList" :key="index" class="coupon-item">
-						<!-- <img src="../static/mine/23.png" />
-						<view class="coupon-main">
-							<view class="coupon-title">萌店十元优惠券</view>
-							<view class="coupon-date">
-								<img src="../static/mine/26.png" />
-								<view>2020.05.17-2020.06.17</view>
-							</view>
-							<view class="coupon-integral">299积分</view>
-						</view>
-						<view class="coupon-btn">兑换</view> -->
 						<Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon>
 					</view>
+					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="couponList.length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
 					<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList.length"></u-empty>
 				</scroll-view>
 			</swiper-item>
@@ -28,12 +19,15 @@ import Coupon from "@/components/mine/coupon/index";
 export default {
 	data() {
 		return {
+			pageSize: 12,
 			swiperHeight: '',
 			couponCurrent: 0,
 			swiperCouponCurrent: 0,
 			couponGroupList: [],
 			couponList: [],
 			page: 0,
+			loadStatus: 'loadmore',
+			timer: true,
 		}
 	},
 	components: {
@@ -46,32 +40,51 @@ export default {
 	watch: {
 		couponCurrent(index) {
 			const id = this.couponGroupList[index].gc_id;
-			this.getCouponList({ gc_id: id });
+			this.getCouponList({ gc_id: id, load: 'reload' });
 		}
 	},
 	methods: {
+		onreachBottom() {
+			if(!this.timer) return false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.getCouponList({
+				gc_id: this.couponGroupList[this.couponCurrent].gc_id,
+				load: 'loadmore',
+			}).then(length => {
+				if(length == 0) {
+					this.page--;
+					this.loadStatus = 'nomore';
+				} else {
+					this.loadStatus = 'loading';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
+			})
+		},
 		getGoodsClass() {
 			this.$u.api.getGoodsClass().then(res => {
 				if(res.errCode == 0) {
 					this.couponGroupList = res.data;
-					this.getCouponList(this.couponGroupList[0].gc_id);
+					this.getCouponList({ gc_id: this.couponGroupList[0].gc_id, load: 'reload' });
 				}
 			})
 		},
-		getCouponList({ gc_id }) {
-			this.$u.api.getCouponList({
+		async getCouponList({ gc_id, load }) {
+			const res = await this.$u.api.getCouponList({
 				page: this.page,
 				gc_id: gc_id,
-			}).then(res => {
-				if(res.errCode == 0) {
-					this.couponList = res.data;
-				} else {
-					this.couponList = [];
-				}
 			})
+			this.timer = true;
+			if(res.errCode == 0) {
+				if(load == 'reload') this.couponList = res.data;
+				else if(load == 'loadmore') this.couponList.push(...res.data);
+			}
+			return res.data.length;
 		},
 		exchangeCoupon(id) {
-			console.log(id);
+			// console.log(id);
 			
 		},
 		couponTabsChange(index) {

pageE/mine/MineConcerns.vue

@@ -1,58 +1,104 @@
 <template>
 	<view class="concerns">
-		<u-index-list :scrollTop="scrollTop">
-			<view v-for="(item, index) in indexList" :key="index">
-				<u-index-anchor :index="item" class="anchor-class" />
-				<view class="list-cell">
-					<image src="../static/mine/23.png"></image>
-					<view>阿迪达斯</view>
-				</view>
-				<view class="list-cell">
-					列表2
-				</view>
-				<view class="list-cell">
-					列表3
+		<view class="concerns-container">
+			<view v-for="(info, index) in list" :key="index">
+				<view class="daren-item">
+					<image class="head" :src="info.friend_tomavatar"></image>
+					<text class="name">{{ info.friend_tomname || '' }}</text>
+					<view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view>
 				</view>
 			</view>
-		</u-index-list>
+		</view>
+		<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="120"></u-empty>
 	</view>
 </template>
 <script>
 export default {
 	data() {
 		return {
-			scrollTop: 0,
-			indexList: ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]
+			list: []
 		}
 	},
-	onPageScroll(e) {
-		this.scrollTop = e.scrollTop;
+	onShow() {
+		this.attentionMemberList();
+	},
+	// 下拉刷新
+	onPullDownRefresh() {
+        this.attentionMemberList();
+    },
+	methods: {
+		attentionMemberList() {
+			this.$u.api.attentionMemberList().then(res => {
+				uni.stopPullDownRefresh();
+				if(res.errCode == 0) {
+					this.list = res.data;
+				} else {
+					this.list = [];
 				}
+			})
+		},
+		changeType(id) {
+				console.log(id);
+				this.$u.api.attentionMember({
+					member_id: id
+				}).then(res => {
+					this.$u.toast(res.message);
+					this.attentionMemberList();
+				})
+			},
+	},
 };
 </script>
 <style lang="scss" scoped>
 .concerns {
-	// padding: 35rpx 30rpx 0;
-	// .u-index-anchor {
-	// 	background-color: #ffffff !important;
-	// }
-	.list-cell {
+	.concerns-container {
+		padding: 30rpx;
 		display: flex;
-		box-sizing: border-box;
-		align-items: center;
-		width: 100%;
-		overflow: hidden;
-		margin: 50rpx 0;
-		padding: 0 30rpx;
-		> image {
-			width: 70rpx;
-			height: 70rpx;
-			border-radius: 10rpx;
-			margin-right: 30rpx;
+		flex-wrap: wrap;
+		&:not(:nth-child(3n)) {
+			margin-right: 20rpx;
+		}
+		.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: #EDEDED;
+				font-size: 26rpx;
+				line-height: 50rpx;
+				color: #fff;
+				text-align: center;
+				margin-top: 19rpx;
+				border-radius: 25rpx;
+			}
+			.action{
+				background: #f3f3f3;
 			}
-		> view {
-			font-size: 30rpx;
-			color: rgba(102,102,102,1);
 		}
 	}
 }

pageE/mine/MineInfo.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="information">
 		<view class="info-avatar">
-			<u-avatar :src="userInfo.member_avatar" :size="120"></u-avatar>
+			<u-avatar :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="120"></u-avatar>
 		</view>
 		<view class="info-item">
 			<view class="title">昵称</view>

pageE/mine/MineProgress.vue

@@ -1,73 +1,65 @@
 <template>
-	<view class="progress">
+	<view class="progress" v-if="memberInfo">
 		<view class="header">
 			<view class="line-progress">
-				<view class="rank-value">lv1</view>
+				<view class="rank-value">lv{{ memberInfo.member_level }}</view>
 				<view class="line-box">
-					<u-line-progress :percent="70" :show-percent="false" inactive-color="#FFFFFF" active-color="#F1A36B" height="30"></u-line-progress>
-					<text>78/99</text>
+					<u-line-progress :percent="percent" :show-percent="false" inactive-color="#FFFFFF" active-color="#F1A36B" height="30" :striped="true" :striped-active="true"></u-line-progress>
+					<text>{{ memberInfo.member_exppoints }}</text>
 				</view>
-				<view class="rank-value">lv2</view>
+				<view class="rank-value">lv{{ memberInfo.member_level + 1 }}</view>
 			</view>
-			<view class="exp-value">经验值<span>78</span></view>
-			<view class="distance">距离下一级还需要21经验值</view>
+			<view class="exp-value">经验值<span>{{ memberInfo.member_exppoints }}</span></view>
+			<view class="distance">距离下一级还需要{{ memberInfo.next_grade_exppoints_diff }}经验值</view>
 		</view>
 		<view class="body">
 			<view class="title">
 				<image src="/static/image/mine/34.png"></image>
 				<text>等级定义</text>
 			</view>
-			<view class="rank-list">
+			<!-- <view class="rank-list">
 				<view v-for="(rank, index) in rank" :key="index" class="list-item">
 					<view class="rank-value">lv{{ rank.level }}</view>
 					<view class="rank-interval"><span>经验值:</span>{{ rank.max == '--' ? rank.min + '及以上' : rank.min + '~' + rank.max }}</view>
 				</view>
+			</view> -->
+			<view class="rich">
+				<rich-text :nodes="nodes"></rich-text>
 			</view>
 		</view>
 	</view>
 </template>
 <script>
+import common from '@/static/js/common.js';
 export default {
 	data() {
 		return {
-			rank: [
-				{
-					level: 1,
-					min: 50,
-					max: 99,
-				},
-				{
-					level: 2,
-					min: 100,
-					max: 199,
-				},
-				{
-					level: 3,
-					min: 200,
-					max: 399,
-				},
-				{
-					level: 4,
-					min: 400,
-					max: 999,
-				},
-				{
-					level: 5,
-					min: 1000,
-					max: 1999,
-				},
-				{
-					level: 6,
-					min: 2000,
-					max: 4999,
-				},
-				{
-					level: 7,
-					min: 5000,
-					max: '--',
+			percent: 0,
+			memberInfo: {},
+			nodes: '',
 		}
-			]
+	},
+	filters: {
+		percentExp(value, rank) {
+			// console.log(rank);
+			let result = '0/0';
+			if(rank) result = value + '/' + rank.max;
+			return result;
+		},
+	},
+	onShow() {
+		this.getMemberPointsStat();
+	},
+	methods: {
+		getMemberPointsStat() {
+			this.$u.api.getMemberPointsStat().then((res)=>{
+				if (res.errCode == 0) {
+					this.memberInfo = res.data;
+					this.nodes = common.unescapeHTML(res.data.points_rule);
+					// console.log(this.percent);
 				}
+			})
+		},
 	}
 };
 </script>
@@ -126,6 +118,7 @@ export default {
 		}
 	}
 	.body {
+		margin-top: 60rpx;
 		.title {
 			height: 88rpx;
 			display: flex;
@@ -134,39 +127,43 @@ export default {
 			font-size: 30rpx;
 			font-weight: 500;
 			color: rgba(51,51,51,1);
-			border-bottom: #ECECEC 1rpx solid;
+			// border-bottom: #ECECEC 1rpx solid;
+			margin-bottom: 30rpx;
 			> image {
 				width: 29rpx;
 				height: 36rpx;
 				margin-right: 20rpx;
 			}
 		}
-		.rank-list {
-			padding: 30rpx;
-			.list-item {
-				margin-bottom: 40rpx;
-				display: flex;
-				align-items: center;
-				.rank-value {
-					color: #FFF;
-					height: 30rpx;
-					line-height: 30rpx;
-					box-sizing: content-box;
-					background:rgba(255,213,101,1);
-					border-radius: 6rpx;
-					padding: 0 10rpx;
-					margin-right: 15rpx;
-				}
-				.rank-interval {
-					font-size: 28rpx;
-					color: #999999;
-					> span {
-						margin-right: 10rpx;
-						color: rgba(51,51,51,1);
-					}
-				}
-			}
+		.rich {
+			padding: 0 60rpx;
 		}
+		// .rank-list {
+		// 	padding: 30rpx;
+		// 	.list-item {
+		// 		margin-bottom: 40rpx;
+		// 		display: flex;
+		// 		align-items: center;
+		// 		.rank-value {
+		// 			color: #FFF;
+		// 			height: 30rpx;
+		// 			line-height: 30rpx;
+		// 			box-sizing: content-box;
+		// 			background:rgba(255,213,101,1);
+		// 			border-radius: 6rpx;
+		// 			padding: 0 10rpx;
+		// 			margin-right: 15rpx;
+		// 		}
+		// 		.rank-interval {
+		// 			font-size: 28rpx;
+		// 			color: #999999;
+		// 			> span {
+		// 				margin-right: 10rpx;
+		// 				color: rgba(51,51,51,1);
+		// 			}
+		// 		}
+		// 	}
+		// }
 	}
 }
 </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/more/AfterSalesHelp.vue

@@ -17,6 +17,9 @@ export default {
 	},
 	onLoad() {
 		this.getPolicyList();
+	},
+	onPullDownRefresh() {
+        this.getPolicyList();
     },
 	methods: {
 		getPolicyList () {
@@ -24,6 +27,7 @@ export default {
 			    page: this.page,
 			    tid: 2 // 1:使用帮助列表 2: 售后政策列表
 			}).then((res)=>{
+				uni.stopPullDownRefresh();
 				if (res.errCode == 0) {
 					this.policyList = res.data.helpList;
 				}

pageE/more/WriteComments.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="write-complaints">
 		<view class="main-container">
-			<textarea auto-height placeholder="发表您的意见吧，我们会做得更好." maxlength="200" v-model="text" />
+			<textarea auto-height placeholder="发表您的意见吧，我们会做得更好" maxlength="200" v-model="text" />
 			<u-upload 
 				ref="uUpload"
 				:custom-btn="true" 
@@ -12,9 +12,10 @@
 				:form-data="formData"
 				:name="name"
 				@on-uploaded="setImageList"
+				@on-error="uploadError"
 			>
 				<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
-					<img src="../static/mine/27.png" />
+					<image src="../static/mine/27.png"></image>
 				</view>
 			</u-upload>
 		</view>
@@ -37,12 +38,21 @@ export default {
 				name: 'common', // 其他图片
 			},
 			imageList: [],
+			debounce: true,
 		}
 	},
+	onShow() {
+		this.debounce = true;
+	},
 	methods: {
 		submit() {
+			if(!this.debounce) return;
+			this.debounce = false;
 			this.$refs.uUpload.upload();
 		},
+		uploadError() {
+			this.debounce = true;
+		},
 		setImageList(lists) {
 			// console.log(lists);
 			let imageList = [];
@@ -78,6 +88,7 @@ export default {
 						}
 					})
 				} else {
+					this.debounce = true;
 					this.$u.toast(res.message);
 				}
 			})
@@ -102,7 +113,7 @@ export default {
 			background: rgba(236,236,236,1);
 			border-radius: 10rpx;
 			text-align: center;
-			> img {
+			> image {
 				margin-top: 48rpx;
 				width: 54rpx;
 				height: 49rpx;

pageE/order/Comment.vue

@@ -1,78 +1,173 @@
 <template>
 	<view class="comment">
 		<view class="main-container">
-			<textarea @blur="bindTextAreaBlur" auto-height placeholder="发表你的评价吧，收货时心情如何？" maxlength="200" />
-			<u-upload 
-				ref="uUpload" 
-				@on-uploaded="onUploaded" 
-				:custom-btn="true" 
-				:max-count="count" 
-				:auto-upload="false"
-			>
-				<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
-					<img src="../static/mine/27.png" />
+			<view class="goods-comment" v-for="(goods, index) in goodsList" :key="index">
+				<CommentView :goods="goods" :index="index" @setLocalImage="setLocalImage" @setContent="setContent" @setDescribe="setDescribe"></CommentView>
 			</view>
-			</u-upload>
 		</view>
+		<view class="order-rate">
 			<view class="rate">
-			<view>
 				<view class="title">物流评分</view>
 				<u-rate :count="5" active-color="#FF780F" inactive-color="#CCCCCC" v-model="logistics" gutter="20" size="32"></u-rate>
 			</view>
-			<view>
+			<view class="rate">
 				<view class="title">服务态度</view>
 				<u-rate :count="5" v-model="service" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
 			</view>
-			<view>
-				<view class="title">描述相符</view>
-				<u-rate :count="5" v-model="describe" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
 		</view>
-		</view>
-		<view class="write-btn" @click="addOrderEvaluate">发表意见</view>
+		<view class="write-btn" @click="submitComment">发表意见</view>
 	</view>
 </template>
 <script>
+import CommentView from './commentItem';
+import common from '@/static/js/common.js'
 export default {
 	data() {
 		return {
 			orderId: '',
-			count: 4, // 最大图片数量
-			logistics: 5,
-			service: 5,
-			describe: 5,
-			content: '',
+			count: 3, // 最大图片数量
+			logistics: 0, // 物流服务
+			service: 0, // 服务态度
+			describe: [],
+			content: [],
+			imageList: [], // 本地图片路径
+			goodsList: [],
+			uploadImageList: [], // 线上图片名字
 		}
 	},
+	components: {
+		CommentView
+	},
 	onLoad(option) {
 		this.orderId = option.oid;
+		this.getOrderInfo(option.oid);
 	},
 	methods: {
+		setLocalImage({ list, index }) {
+			this.imageList[index] = list;
+		},
+		setContent({ content, index }) {
+			this.content[index] = content;
+		},
+		setDescribe({ describe, index }) {
+			this.describe[index] = describe;
+		},
+		uploadImage() {
+			let allPromise = [];
+			this.imageList.forEach((img, index) => {
+				this.uploadImageList[index] = [];
+				img.forEach(filePath => {
+					let promise = common.uploadFile({
+						url: this.$u.http.config.baseUrl + '/Upload/uploadfile',
+						name: 'common',
+						filePath: filePath,
+					})
+					promise.then(result => {
+						this.uploadImageList[index].push(result.file_name);
+					})
+					allPromise.push(promise);
+				})
+			})
+			Promise.all(allPromise).then(() => {
+				this.addOrderEvaluate();
+			})
+		},
+		// 设初始值
+		setModelKey(data) {
+			data.forEach(() => {
+				this.content.push('');
+				this.describe.push(0);
+				this.imageList.push([]);
+			})
+		},
+		getOrderInfo(id) {
+			this.$u.api.getOrderInfo({
+				order_id: id,
+			}).then(res => {
+				if(res.errCode == 0) {
+					this.goodsList = res.data.extend_order_goods;
+					// this.goodsList = [{
+					// 	"rec_id": 14,
+					// 	"order_id": 13,
+					// 	"goods_id": 39,
+					// 	"goods_name": "自然堂 水润保湿两件套 补水保湿套装",
+					// 	"goods_price": "69.40",
+					// 	"goods_num": 1,
+					// 	"goods_image": "1_2017092202443553519.jpg",
+					// 	"goods_pay_price": "43.40",
+					// 	"store_id": 1,
+					// 	"buyer_id": 3,
+					// 	"goods_type": "1",
+					// 	"promotions_id": 0,
+					// 	"commis_rate": 0,
+					// 	"gc_id": 30
+					// },
+					// {
+					// 	"rec_id": 13,
+					// 	"order_id": 13,
+					// 	"goods_id": 113,
+					// 	"goods_name": "舒思盾经络按摩仪数码家用多功能针灸穴位电子理疗腰椎颈椎电疗仪",
+					// 	"goods_price": "168.00",
+					// 	"goods_num": 1,
+					// 	"goods_image": "1_2017092901414663050.jpg",
+					// 	"goods_pay_price": "106.00",
+					// 	"store_id": 1,
+					// 	"buyer_id": 3,
+					// 	"goods_type": "1",
+					// 	"promotions_id": 0,
+					// 	"commis_rate": 0,
+					// 	"gc_id": 72
+					// }];
+					this.setModelKey(this.goodsList);
+				}
+			})
+		},
 		verifyParams() {
-			if(this.$u.test.isEmpty(this.content)) {
+			this.goodsList.forEach((_, index) => {
+				if(this.$u.test.isEmpty(this.content[index])) {
 					this.$u.toast('内容不可为空');
 					return false;
 				}
+			})
 			return true;
 		},
+		submitComment() {
+			// console.log(this.content);
+			// console.log(this.describe);
+			// console.log(this.imageList);
+			this.uploadImage();
+			// this.goodsList.forEach((_, index) => {
+				
+			// })
+		},
 		addOrderEvaluate() {
 			if(!this.verifyParams()) return false;
-			console.log(this.logistics);
-			console.log(this.service);
-			console.log(this.describe);
-			this.$u.api.updateOrderEvaluate({
+			let files = [];
+			// console.log(this.uploadImageList);
+			this.uploadImageList.forEach((item, index) => {
+				files[index] = '';
+				// console.log(item);
+				item.forEach((img, idx) => {
+					if(idx < item.length-1) {
+						files[index] += img + ',';
+					} else {
+						files[index] += img;
+					}
+				})
+			})
+			let params = {
 				id: this.orderId,
 				content: this.content,
 				scores_one: this.logistics,
 				scores_two: this.service,
 				scores_three: this.describe,
-				file: '',
-			}).then(res => {
-				
+				file: files,
+			};
+			console.log(params);
+			this.$u.api.updateOrderEvaluate(params).then(res => {
+				this.$u.toast(res.message);
 			})
 		},
-		bindTextAreaBlur(event) {
-			this.content = event.detail.value;
-		}
 	},
 };
 </script>
@@ -81,9 +176,40 @@ export default {
 	min-height: calc(100vh - var(--window-top));
 	background-color: #ECECEC;
 	.main-container {
+		margin-bottom: 10rpx;
+		.goods-comment {
 			background-color: #ffffff;
 			padding: 30rpx;
-		margin-bottom: 10rpx;
+			margin-bottom: 30rpx;
+			.goods-info {
+				display: flex;
+				margin-bottom: 40rpx;
+				> image {
+					width: 113rpx;
+					height: 106rpx;
+					border-radius: 5rpx;
+					margin-right: 20rpx;
+					background-color: antiquewhite;
+				}
+				.goods-text {
+					.goods-name {
+						width: 530rpx;
+						font-size: 28rpx;
+						color: rgba(0,0,51,1);
+						margin-bottom: 20rpx;
+					}
+					.goods-spec {
+						max-width: 300rpx;
+						box-sizing: content-box;
+						padding: 10rpx 15rpx;
+						font-size: 24rpx;
+						color: rgba(153,153,153,1);
+						background:rgba(236,236,236,1);
+						border-radius: 6rpx;
+						display: inline-block;
+					}
+				}
+			}
 			textarea {
 				width: 100% !important;
 				margin-bottom: 60rpx;
@@ -94,17 +220,18 @@ export default {
 				background: rgba(236,236,236,1);
 				border-radius: 10rpx;
 				text-align: center;
-			> img {
+				> image {
 					margin-top: 48rpx;
 					width: 54rpx;
 					height: 49rpx;
 				}
 			}
 		}
+	}
 	.rate {
-		background-color: #ffffff;
-		padding: 33rpx 30rpx;
-		> view {
+		// background-color: #ffffff;
+		// padding: 33rpx 30rpx;
+		// > view {
 			display: flex;
 			&:not(:last-child) {
 				margin-bottom: 35rpx;
@@ -114,7 +241,11 @@ export default {
 				font-size: 28rpx;
 				color: rgba(51,51,51,1);
 			}
+		// }
 	}
+	.order-rate {
+		background-color: #ffffff;
+		padding: 33rpx 30rpx;
 	}
 	.write-btn {
 		margin: 120rpx auto 0;

pageE/order/Details.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="details" v-if="orderInfo.extend_store">
-		<view class="status" v-if="state">
+		<view class="status" v-if="orderstate">
 			<view class="text">
-				<view class="status-text">{{ s_object[state].text }}</view>
-				<view class="time" v-if="state == '2'">距离结束22:22:22</view>
+				<view class="status-text">{{ s_object[orderstate].text }}</view>
+				<view class="time" v-if="orderInfo.view_type == 1 || orderInfo.view_type == 9">距离结束：{{ countdown }}</view>
 			</view>
-			<image :src="s_object[state].image"></image>
+			<image :src="s_object[orderstate].image"></image>
 		</view>
 		<view class="info">
 			<view class="info-address">
@@ -67,13 +67,16 @@
 				<view>创建时间：{{ orderInfo.add_time | date}}</view>
 			</view>
 		</view>
-		<view class="btn" v-if="['1', '2', '6'].indexOf(state) >= 0">
-			<view class="logistics" v-if="state == '1'" @click="toOtherPage('Logistics')">查看物流</view>
-			<view class="comment" v-if="state == '2'" @click="toOtherPage('Comment')">立即评价</view>
-			<view class="cancel" v-if="state == '6'" @click="cancelOrder">取消支付</view>
-			<view class="payment" v-if="state == '6'">立即支付</view>
-			<view class="service" v-if="state == '7'">联系官方客服</view>
-			<view class="submit" v-if="state == '7'">提交官方审核</view>
+		<view class="btn" v-if="['1', '2', '4', '6'].indexOf(orderstate) >= 0">
+			 <!-- @click="toOtherPage('RefundOrder')" -->
+			<view class="cancel" v-if="orderstate == '4' || orderstate == '1'">申请退款</view>
+			<view class="cancel" v-if="orderstate == '1'" @click="toOtherPage('Logistics')">查看物流</view>
+			<view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>
+			<view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view>
+			<view class="cancel" v-if="orderstate == '6'" @click="cancelOrder">取消支付</view>
+			<view class="payment" v-if="orderstate == '6'" @click="payNow">立即支付</view>
+			<view class="service" v-if="orderstate == '7'">联系官方客服</view>
+			<view class="submit" v-if="orderstate == '7'">提交官方审核</view>
 		</view>
 	</view>
 </template>
@@ -81,7 +84,7 @@
 export default {
 	data() {
 		return {
-			state: '', // 1: 待收货 2: 待评价 3: 交易成功 4: 已取消 5: 已退款 6: 待支付 7: 待退款 8: 已退款
+			orderstate: '', // 1: 待收货 2: 待评价 3: 交易成功 4: 已取消 5: 已退款 6: 待支付 7: 待退款 8: 已退款
 			s_object: {
 				'1': {
 					text: '待收货',
@@ -96,8 +99,8 @@ export default {
 					image: '../static/mine/31.png',
 				},
 				'4': {
-					text: '已取消',
-					image: '../static/mine/33.png',
+					text: '待发货',
+					image: '../static/mine/36.png',
 				},
 				'5': {
 					text: '已退款',
@@ -111,47 +114,89 @@ export default {
 					text: '待退款',
 					image: '../static/mine/34.png',
 				},
+				'8': {
+					text: '拼团中',
+					image: '../static/mine/37.png',
 				},
-			current: 0,
-			orderInfo: {}
+			},
+			orderInfo: {},
+			oid: '',
+			timer: '',
+			countdown: '', // 倒计时
+			isSpike: false, // 倒计时是否结束
 		}
 	},
 	onLoad(option) {
 		this.setTitle();
+		this.oid = option.oid;
 		this.getOrderInfo(option.oid);
 	},
+	// 下拉刷新
+	onPullDownRefresh() {
+        this.getOrderInfo(this.oid);
+	},
+	beforeDestroy() {
+		clearInterval(this.timer);
+	},
 	methods: {
 		viewState(value) {
 			let state;
 			switch (value) {
-				case 0: // 已取消
-					state = '4';
-					break;
-				case 10: // 未付款
+				case 1:
 					state = '6';
 					break;
-				case 20: // 已付款
-					state = '3';
+				case 2:
+					state = '4';
 					break;
-				case 30: // 已发货
+				case 3:
 					state = '1';
 					break;
-				case 40: // 已收货
-					if(this.orderInfo.evaluation_state == 0) state = '2';
+				case 4:
+					state = '2';
+					break;
+				case 6:
+					state = '7';
+					break;
+				case 7:
+					state = '5';
+					break;
+				case 9:
+					state = '8';
 					break;
 				default:
 					break;
 			}
-			if(this.orderInfo.refund_state) state = '5';
-			// 申请退款
-			if(this.orderInfo.refund_list) {
-				const refund = this.orderInfo.refund_list[this.orderInfo.extend_order_common.order_id];
-				if(this.orderInfo.refund_list) {
-					if([1, 2].indexOf(refund.refund_state) >= 0) state = '7';
-					if(refund.refund_state == 3) state = '8';
-				}
-			}
-			this.state = state;
+			this.orderstate = state;
+		},
+		setSpikeTime(time) {
+			// console.log(time);
+			this.timer = setInterval(() => {
+				let spikeTime = time * 1000 - new Date().getTime();
+				// console.log(spikeTime);
+				if(spikeTime <= 0) {
+					this.isSpike = true;
+					this.countdown = '00:00:00'
+					clearInterval(this.timer);
+					return false;
+				};
+				// 计算天数
+				const days = Math.floor(spikeTime/(24*3600*1000));
+				//计算出小时数
+				const leave1 = spikeTime % (24*3600*1000) // 计算天数后剩余的毫秒数
+				let hours = Math.floor(leave1/(3600*1000));
+				//计算相差分钟数
+				const leave2 = leave1 % (3600*1000) // 计算小时数后剩余的毫秒数
+				let minutes = Math.floor(leave2 / (60*1000))
+				//计算相差秒数
+				const leave3 = leave2 % (60*1000) // 计算分钟数后剩余的毫秒数
+				let seconds = Math.round(leave3 / 1000)
+				// 把天数算在小时里
+				hours = days * 24 + hours;
+				if(hours < 10) hours = '0' + hours;
+				if(minutes < 10) minutes = '0' + minutes;
+				if(seconds < 10) seconds = '0' + seconds;
+				this.countdown = hours + ':' + minutes + ':' + seconds;
+			}, 1000)
 		},
 		getOrderInfo(id) {
 			this.$u.api.getOrderInfo({
@@ -159,9 +204,16 @@ export default {
 			}).then(res => {
 				if(res.errCode == 0) {
 					this.orderInfo = res.data;
-					this.viewState(this.orderInfo.order_state);
+					this.viewState(this.orderInfo.view_type);
+					this.setTitle(this.orderInfo.view_type);
+					if(res.data.view_type == 1) this.setSpikeTime(res.data.end_time);
+					else if(res.data.view_type == 9) this.setSpikeTime(res.data.pintuangroup_endtime);
 				}
+				uni.stopPullDownRefresh(); // 结束刷新
 			})
+		},
+		applyRefund() {
+
 		},
 		cancelOrder() {
 			this.$u.api.cancelOrder({
@@ -172,18 +224,35 @@ export default {
 				}
 			})
 		},
-		setTitle(){
+		confirmReceive() {
+			this.$u.api.confirmReceive({
+				order_id: this.order.order_id,
+			}).then(res => {
+				if(res.errCode == 0) {
+					this.getOrderInfo(this.oid);
+				}
+				this.$u.toast(res.message);
+			})
+		},
+		setTitle(value){
 			let title = '';
-			switch (this.current) {
-				case '1':
+			switch (value) {
+				case 1:
 					title = "支付成功"
 					break;
 				default:
 					title = "订单详情"
 					break;
 			}
-			uni.setNavigationBarTitle({
-				title: title
+			// uni.setNavigationBarTitle({
+			// 	title: title
+			// });
+		},
+		payNow() {
+			this.$u.route('/pageC/cart/cashier', {
+				pay_sn: this.orderInfo.pay_sn,
+				price: this.orderInfo.order_amount,
+				order_id: this.orderInfo.order_id,
 			});
 		},
 		toOtherPage(url) {
@@ -286,6 +355,7 @@ export default {
 				}
 				.store-goods {
 					display: flex;
+					margin-bottom: 20rpx;
 					> image {
 						width: 180rpx;
 						height: 160rpx;
@@ -294,6 +364,7 @@ export default {
 						flex-shrink: 0;
 					}
 					.goods-info {
+						flex: 1;
 						display: flex;
 						flex-direction: column;
 						justify-content: space-between;

pageE/order/Index.vue

@@ -1,14 +1,15 @@
 <template>
 	<view class="order">
 		<view>
-			<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="26" @change="tabsChange" height="88" :gutter="30"></u-tabs-swiper>
+			<u-tabs-swiper ref="tabs" :list="list" active-color="#FF780F" :current="current" font-size="26" @change="tabsChange" height="88" :gutter="30"></u-tabs-swiper>
 		</view>
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ height: swiperHeight }">
 			<swiper-item class="swiper-item" v-for="(item, index) in list" :key="index">
 				<scroll-view scroll-y style="height: 100%;" @scrolltolower="reachBottom">
 					<view>
 						<view class="item-container" v-for="order in orderList" :key="order.order_id">
-							<OrderItem :order="order" @refreshOrderList="getOrderList"></OrderItem>
+							<OrderItem :order="order" @refreshOrderList="refreshOrderList" v-if="current != 4"></OrderItem>
+							<TryOrderItem :order="order" @refreshOrderList="refreshOrderList" v-else></TryOrderItem>
 						</view>
 					</view>
 					<u-empty text="暂无订单" mode="order" color="#000000" v-if="!orderList.length"></u-empty>
@@ -20,6 +21,7 @@
 </template>
 <script>
 import OrderItem from '@/components/mine/order-item/index'
+import TryOrderItem from '@/components/mine/order-item/try'
 export default {
 	data() {
 		return {
@@ -28,18 +30,20 @@ export default {
 			}, {
 				name: '待支付'
 			}, {
-				name: '已取消'
+				name: '待发货'
 			}, {
 				name: '待收货'
 			}, {
 				name: '试穿试送'
-			}, {
-				name: '待评价'
+			},{
+				name: '拼团中'
 			}, {
 				name: '售后'
+			}, {
+				name: '待评价'
 			}],
 			orderList: [],
-			loadStatus: ['loadmore','loadmore','loadmore','loadmore','loadmore','loadmore','loadmore'],
+			loadStatus: ['loadmore','loadmore','loadmore','loadmore','loadmore','loadmore','loadmore','loadmore'],
 			page: 0,
 			current: Number,
 			swiperCurrent: 0,
@@ -48,13 +52,21 @@ export default {
 		}
 	},
 	components: {
-		OrderItem
+		OrderItem,
+		TryOrderItem,
 	},
 	watch: {
-		current(value) {
+		current(value, origin) {
+			if((origin == 4 && value != 4) || (value == 4 && origin != 4)) {
+				this.orderList = [];
+			}
 			this.page = 0;
-			// again 重新请求列表 不然往列表里添加
-			value == 6 ? this.getAfterSaleList({ reload: 'again' }): this.getOrderList({ reload: 'again' });
+			// reload 重新请求列表 loadmore 往列表里添加
+			if(value == 4) {
+				this.goodsTryOrderList({ load: 'reload' });
+			} else {
+				this.getOrderList({ load: 'reload' });
+			}
 		},
 	},
 	onLoad(option) {
@@ -62,26 +74,35 @@ export default {
 		this.current = current;
 		this.swiperCurrent = this.current;
 		this.setViewHeight();
+	},
+	// 下拉刷新
+	onPullDownRefresh() {
+        this.refreshOrderList();
     },
 	methods: {
 		setOrderType() {
 			let type;
-			// state_type 订单状态：0:已取消 10:未付款 20:已付款 30:已发货 40:已收货
 			switch (this.current) {
 				case 1:
-					type = 10; // 待支付
+					type = 1; // 待支付
 					break;
 				case 2:
-					type = 0; // 已取消
+					type = 2; // 待发货
 					break;
 				case 3:
-					type = 30; // 待收货
+					type = 3; // 待收货
 					break;
 				case 4:
 					type = -1; // 试穿试送
 					break;
 				case 5:
-					type = 'state_noeval'; // 待评价
+					type = 9; // 拼团中
+					break;
+				case 6:
+					type = 8; // 售后
+					break;
+				case 7:
+					type = 4; // 待评价
 					break;
 				default:
 					type = -1;
@@ -89,27 +110,54 @@ export default {
 			}
 			return type;
 		},
-		async getOrderList({ reload = '' } = {}) {
+		refreshOrderList() {
+			this.page = 0;
+			// if(this.current == 6) {
+			// 	this.getAfterSaleList({ load: 'reload' });
+			// } else 
+			if(this.current == 4) {
+				this.goodsTryOrderList({ load: 'reload' });
+			} else {
+				this.getOrderList({ load: 'reload' });
+			}
+		},
+		// 普通
+		async getOrderList({ load = 'loadmore' } = {}) {
 			const type = this.setOrderType();
 			const res = await this.$u.api.getOrderList({
 				page: this.page,
 				type: type,
 			})
 			this.timer = true;
+			uni.stopPullDownRefresh(); // 结束刷新
 			if(res.errCode == 0) {
-				if(reload) this.orderList = res.data;
-				else this.orderList.push(...res.data);
+				if(load == 'reload') this.orderList = res.data;
+				else if(load == 'loadmore') this.orderList.push(...res.data);
 			}
 			return res;
 		},
-		async getAfterSaleList({ reload = '' } = {}) {
+		// 售后
+		async getAfterSaleList({ load = 'loadmore' } = {}) {
 			const res = await this.$u.api.getAfterSaleList({
 				page: this.page,
 			})
 			this.timer = true;
 			if(res.errCode == 0) {
-				if(reload) this.orderList = res.data;
-				else this.orderList.push(...res.data);
+				if(load == 'reload') this.orderList = res.data;
+				else if(load == 'loadmore') this.orderList.push(...res.data);
+			}
+			return res;
+		},
+		// 试穿
+		async goodsTryOrderList({ load = 'loadmore' } = {}) {
+			const res = await this.$u.api.goodsTryOrderList({
+				page: this.page,
+			})
+			uni.stopPullDownRefresh(); // 结束刷新
+			this.timer = true;
+			if(res.errCode == 0) {
+				if(load == 'reload') this.orderList = res.data.list;
+				else if(load == 'loadmore') this.orderList.push(...res.data.list);
 			}
 			return res;
 		},
@@ -121,7 +169,9 @@ export default {
 			this.loadStatus.splice(this.current, 1, "loading");
 			this.page++;
 			let promise;
-			if(this.current == 6) promise = this.getAfterSaleList();
+			// if(this.current == 6) promise = this.getAfterSaleList();
+			// else 
+			if(this.current == 4) promise = this.goodsTryOrderList();
 			else promise = this.getOrderList();
 			promise.then(res => {
 				this.loadStatus.splice(this.current, 1, "nomore");

pageE/order/Logistics.vue

@@ -1,20 +1,20 @@
 <template>
 	<view class="logistics">
 		<view class="logistics-info">
-			<view class="express">
+			<!-- <view class="express">
 				<image src="../static/mine/23.png"></image>
 				<view class="dispatcher-info">
 					<view>派件员：xxx</view>
 					<view>手机：123456789</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="express-status">
-				<image src="../static/mine/23.png"></image>
+				<image :src="expressInfo.goods_image"></image>
 				<view>
-					<view class="status">物流状态：已签收</view>
-					<view>承运来源：百世快递</view>
-					<view>运单编号：3253463464777</view>
-					<view>官方电话：4009-565-656</view>
+					<view class="status">物流状态：{{ expressInfo.is_check }}</view>
+					<view>承运来源：{{ expressInfo.express_name || '' }}</view>
+					<view>运单编号：{{ expressInfo.shipping_code || '' }}</view>
+					<view>官方电话：{{ expressInfo.express_phone || '' }}</view>
 				</view>
 			</view>
 		</view>
@@ -22,8 +22,8 @@
 			<view class="title">物流跟踪</view>
 			<view class="main">
 				<view v-for="(item, index) in list" :key="index" class="logistics-item">
-					<view class="info u-line-2">{{ item.address }}</view>
-					<view class="date">{{ item.date }}</view>
+					<view class="info u-line-2">{{ item.content }}</view>
+					<view class="date">{{ item.kd_time }}</view>
 				</view>
 			</view>
 		</view>
@@ -33,24 +33,24 @@
 export default {
 	data() {
 		return {
-			list: [
-				{
-					address: '[北京市]【已签收，本人签收】,感谢使用百事快递，期待再次为您服务[北京市]【已签收，本人签收】,感谢使用百事快递，期待再次为您服务[北京市]【已签收，本人签收】,感谢使用百事快递，期待再次为您服务',
-					date: '2019-12-25  09:38:21'
-				},
-				{
-					address: '[北京市]【已签收，本人签收】,感谢使用百事快递，期待再次为您服务',
-					date: '2019-12-25  09:38:21'
-				},
-				{
-					address: '[北京市]【已签收，本人签收】,感谢使用百事快递，期待再次为您服务',
-					date: '2019-12-15  09:38:20'
-				},
-				{
-					address: '卖家已发货',
-					date: '2019-12-15  09:38:20'
+			list: [],
+			expressInfo: {},
 		}
-			]
+	},
+	onLoad(option) {
+		this.getOrderLogistics(option.oid);
+	},
+	methods: {
+		getOrderLogistics(id) {
+			this.$u.api.orderLogistics({ id: id }).then(res => {
+				this.$u.toast(res.message);
+				if(res.errCode == 0) {
+					this.expressInfo = res.data.express_info;
+					this.list = res.data.express_list;
+				} else {
+					this.list = [];
+				}
+			})
 		}
 	}
 };

pageE/order/RefundOrder.vue

@@ -0,0 +1,142 @@
+<template>
+	<view class="refund">
+		<view class="radios-container">
+			<u-radio-group v-model="value" @change="radioChange">
+				<label class="radio-view" v-for="(item, index) in goodsList" :key="index">
+					<view class="radio">
+						<u-radio color="#F0AD4E" :name="item.goods_id" active-color="#FF780F" icon-size="34" shape="circle"></u-radio>
+					</view>
+					<view class="store_info">
+						<view class="info_img">
+							<image :src="item.goods_image" mode="">
+						</view>
+						<view class="info_txt">
+							<view class="content u-line-2">
+								{{ item.goods_name }}
+							</view>
+							<view class="much">
+								<text>￥{{ item.goods_pay_price }}</text>
+								<text>x{{ item.goods_num }}</text>
+							</view>
+						</view>
+					</view>
+				</label>
+			</u-radio-group>
+		</view>
+		<view class="refund-details">
+			<view class="goods-number">
+				<view>选择数量</view>
+				<view></view>
+			</view>
+			<view class="refund-price">
+				<view>
+					<view>退款金额</view>
+					<view>￥99.00</view>
+				</view>
+				<view>若退款成功，将退还给您￥99.00</view>
+			</view>
+			<view class="refund-text">
+				<view>申请说明</view>
+				<u-input v-model="refundText" type="textarea" />
+			</view>
+		</view>
+		<view class="submit-btn">提交申请</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			goodsList: [],
+			value: '',
+		}
+	},
+	onLoad(option) {
+		this.getOrderInfo(option.oid);
+	},
+	methods: {
+		radioChange(e){
+			console.log(e)
+		},
+		getOrderInfo(id) {
+			this.$u.api.getOrderInfo({
+				order_id: id,
+			}).then(res => {
+				if(res.errCode == 0) {
+					// this.orderInfo = res.data;
+					this.goodsList = res.data.extend_order_goods;
+					console.log(this.goodsList);
+				}
+				// uni.stopPullDownRefresh(); // 结束刷新
+			})
+		},
+		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) {
+
+				}
+			})
+		},
+	}
+};
+</script>
+<style lang="scss" scoped>
+.refund {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #EDEDED;
+	.radios-container {
+		margin-bottom: 20rpx;
+		.radio-view {
+			background-color: #FFFFFF;
+			padding: 26rpx;
+			display: flex;
+			align-items: center;
+			margin-bottom: 1rpx;
+			.radio {
+				margin-right: 20rpx;
+			}
+			.store_info {
+				display: flex;
+				flex-wrap: nowrap;
+				width: 100%;
+				.info_img{
+					>image{
+						width: 180rpx;
+						height: 160rpx;
+						background-color: aqua;
+						border-radius: 10rpx;
+					}
+				}
+				.info_txt{
+					padding-left: 30rpx;
+					padding-right: 30rpx;
+					display: flex;
+					flex-wrap: wrap;
+					width: 100%;
+					.content{
+						height: 74rpx;
+						line-height: 37rpx;
+						font-size: 30rpx;
+						color:rgba(51,51,51,1);
+					}
+					.much{
+						display: flex;
+						justify-content: space-between;
+						width: 100%;
+					}
+				}
+			}
+		}
+	}
+	.refund-details {
+		background-color: #FFFFFF;
+		.goods-number {}
+	}
+}
+</style>

pageE/order/commentItem.vue

@@ -0,0 +1,138 @@
+<template>
+	<view class="comment-item-view">
+		<view class="view-container">
+			<view class="goods-info">
+				<image :src="goods.goods_image"></image>
+				<view class="goods-text">
+					<view class="goods-name u-line-1">{{ goods.goods_name }}</view>
+					<!-- <view class="goods-spec u-line-1">{{  }}</view> -->
+				</view>
+			</view>
+			<view class="rate">
+				<view class="title">描述相符</view>
+				<u-rate :count="5" v-model="describe" active-color="#FF780F" inactive-color="#CCCCCC" gutter="20" size="32"></u-rate>
+			</view>
+			<u-input v-model="content" type="textarea" height="100" :auto-height="true" placeholder="发表你的评价吧，收货时心情如何？" />
+			<u-upload 
+				:ref="'upload' + index" 
+				:custom-btn="true" 
+				:max-count="count" 
+				:auto-upload="false"
+				:action="action"
+				:header="header"
+				:form-data="formData"
+				:name="fileName"
+				@on-list-change="setImageList"
+			>
+				<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
+					<image src="../static/mine/27.png"></image>
+				</view>
+			</u-upload>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			count: 3,
+			action: this.$u.http.config.baseUrl + '/Upload/uploadfile',
+			header: {
+				"authorization": 'Bearer' + " " + uni.getStorageSync('token')
+			},
+			fileName: 'common',　// 与formData name 一样
+			formData: {
+				name: 'common', // 其他图片
+			},
+			content: '',
+			describe: '',
+			imageList: [],
+		}
+	},
+	props: {
+		goods: Object,
+		index: Number
+	},
+	watch: {
+		content(value) {
+			this.$emit('setContent', { content: value, index: this.index });
+		},
+		describe(value) {
+			this.$emit('setDescribe', { describe: value, index: this.index });
+		},
+	},
+	methods: {
+		setImageList(lists) {
+			// console.log(lists);
+			this.imageList = [];
+			lists.forEach(item => {
+				this.imageList.push(item.url);
+			})
+			console.log(this.imageList);
+			this.$emit('setLocalImage', { list: this.imageList, index: this.index });
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.comment-item-view {
+	.view-container {
+		.goods-info {
+			display: flex;
+			margin-bottom: 40rpx;
+			> image {
+				width: 113rpx;
+				height: 106rpx;
+				border-radius: 5rpx;
+				margin-right: 20rpx;
+				background-color: antiquewhite;
+			}
+			.goods-text {
+				.goods-name {
+					width: 530rpx;
+					font-size: 28rpx;
+					color: rgba(0,0,51,1);
+					margin-bottom: 20rpx;
+				}
+				.goods-spec {
+					max-width: 300rpx;
+					box-sizing: content-box;
+					padding: 10rpx 15rpx;
+					font-size: 24rpx;
+					color: rgba(153,153,153,1);
+					background:rgba(236,236,236,1);
+					border-radius: 6rpx;
+					display: inline-block;
+				}
+			}
+		}
+		textarea {
+			width: 100% !important;
+			margin-bottom: 60rpx;
+		}
+		.slot-btn {
+			width: 140rpx;
+			height: 140rpx;
+			background: rgba(236,236,236,1);
+			border-radius: 10rpx;
+			text-align: center;
+			> image {
+				margin-top: 48rpx;
+				width: 54rpx;
+				height: 49rpx;
+			}
+		}
+		.rate {
+			display: flex;
+			&:not(:last-child) {
+				margin-bottom: 35rpx;
+			}
+			.title {
+				margin-right: 25rpx;
+				font-size: 28rpx;
+				color: rgba(51,51,51,1);
+			}
+		}
+	}
+}
+</style>

pageE/setting/Index.vue

@@ -14,17 +14,16 @@
 			<view>退出登录</view>
 			<image src="../static/mine/21.png"></image>
 		</view>
-		<u-action-sheet 
-				v-model="sheetStatus" 
-				:list="list" 
-				:tips="tips" 
-				:border-radius="20" 
-				@click="choiceOption">
+		<u-action-sheet v-model="sheetStatus" :list="list" :tips="tips" :border-radius="20" @click="choiceOption">
 		</u-action-sheet>
+		<u-modal v-model="show" show-confirm-button show-cancel-button :content="content" @confirm="loginOut"></u-modal>
 	</view>
 </template>
 <script>
-export default {
+	import {
+		mapMutations
+	} from 'vuex';
+	export default {
 		data() {
 			return {
 				checked: false,
@@ -34,8 +33,7 @@ export default {
 					fontSize: 24
 				},
 				sheetStatus: false,
-			list: [
-				{
+				list: [{
 						text: '换个账号登录',
 						color: '#FF780F',
 						fontSize: 28
@@ -46,8 +44,7 @@ export default {
 						fontSize: 28
 					}
 				],
-			settingList: [
-				{
+				settingList: [{
 						title: '个人信息',
 						link: '../mine/MineInfo'
 					},
@@ -71,27 +68,39 @@ export default {
 						title: '帮助与反馈',
 						link: './feedback'
 					},
-			]
+				],
+				content: "是否退出登录！",
+				show: false
 			}
 		},
 		methods: {
+			...mapMutations(['logout']),
+			// 退出登录选择 0：切换账号 | 1：退出登录
 			choiceOption(index) {
 				console.log(index);
-			
-			// console.log(`点击了第${index + 1}项，内容为：${this.list[index].text}`)
+				if (index == 1) {
+					this.show = true;
+				}
 			},
 			toNextPage(url, ...params) {
 				uni.navigateTo({
 					url: url
 				});
+			},
+			loginOut() {
+				this.logout();
+				uni.redirectTo({
+					url: "../../pageA/login/login",
+				})
 			}
 		},
-};
+	};
 </script>
 <style lang="scss" scoped>
-.setting {
+	.setting {
 		min-height: calc(100vh - var(--window-top));
 		background-color: #ECECEC;
+
 		.list-item {
 			display: flex;
 			align-items: center;
@@ -101,11 +110,12 @@ export default {
 			background-color: #ffffff;
 			padding: 0 30rpx;
 			font-size: 30rpx;
-		color: rgba(51,51,51,1);
-		> image {
+			color: rgba(51, 51, 51, 1);
+
+			>image {
 				width: 14rpx;
 				height: 24rpx;
 			}
 		}
-}
+	}
 </style>

pageE/tool/Manicure.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="manicure">
 		<view>
-			<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88" ></u-tabs-swiper>
+			<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88"></u-tabs-swiper>
 		</view>
-		<swiper :current="swiperCurrent" @animationfinish="animationfinish">
+		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ height: swiperHeight }">
 			<swiper-item class="swiper-item">
 				<scroll-view scroll-y class="order-list" @scrolltolower="reachBottom">
 					<u-empty text="暂无订单" mode="order" color="#000000" v-if="!orderList.length"></u-empty>
@@ -14,9 +14,9 @@
 								<view class="order-status">{{ item.status }}</view>
 							</view>
 							<view class="order-name">美甲人姓名：{{ item.manicure_name }}</view>
-							<view class="order-date">时间：{{ item.manicure_time | dateFormat }}</view>
+							<view class="order-date">时间：{{ item.manicure_time | date }}</view>
 						</view>
-						<u-loadmore :status="loadStatus" bgColor="#ECECEC" margin-bottom="20"></u-loadmore>
+						<u-loadmore :status="loadStatus" bgColor="#ECECEC" margin-bottom="20" v-if="orderList.length>=pageSize"></u-loadmore>
 					</view>
 				</scroll-view>
 			</swiper-item>
@@ -32,6 +32,7 @@
 export default {
 	data() {
 		return {
+			pageSize: 1,
 			list: [{
 				name: '我的订单'
 			}, {
@@ -42,56 +43,58 @@ export default {
 			page: 1,
 			orderList: [],
 			loadStatus: 'loadmore',
+			timer: true,
+			swiperHeight: '',
 		}
 	},
+	onPullDownRefresh() {
+		this.getManicureList({ load: 'reload' });
+	},
+	onLoad() {
+		this.setViewHeight();
+	},
 	onShow() {
 		this.current = 0;
 		this.swiperCurrent = 0;
-		this.getManicureList().then(order => {
-			// console.log(order);
-			
-			this.orderList = this.orderList.concat(order);
-			// console.log(this.orderList);
-			
-		});
-	},
-	filters: {
-		dateFormat(value) {
-			let date = new Date(value * 1000);
-			let year, month, day;
-			year = date.getFullYear();
-			month = date.getMonth() + 1;
-			day = date.getDate();
-			return year + "-" + month + "-" + day;     
-		}
+		this.getManicureList({ load: 'reload' });
 	},
 	methods: {
-		async getManicureList() {
-			let res = await this.$u.api.getManicureList({
+		async getManicureList({ load }) {
+			const res = await this.$u.api.getManicureList({
 				page: this.page
 			})
+			uni.stopPullDownRefresh();
+			this.timer = true;
 			if (res.errCode == 0) {
-				return res.data.list;
+				if(load == 'reload') this.orderList = res.data.list;
+				else if(load == 'loadmore') this.orderList.push(...res.data.list);
 			}
+			return res.data.list.length;
 		},
 		// 加载更多
 		reachBottom() {
-			// 修改当前的 loadStatus
+			if(!this.timer) return false;
 			this.loadStatus = "loading";
 			this.page++;
-			this.getManicureList().then(order => {
-				if (!order.length) {
-					// 如果没有数据page-1
+			this.getManicureList({ load: 'loadmore' }).then(length => {
+				if(length == 0) {
 					this.page--;
-					this.loadStatus = "nomore";
+					this.loadStatus = 'nomore';
 				} else {
-					this.orderList = this.orderList.concat(order);
+					this.loadStatus = 'loading';
 				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
 			})
 		},
+		setViewHeight() {
+			const res = uni.getSystemInfoSync();
+			this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+		},
 		tabsChange(index) {
 			this.swiperCurrent = index;
-			this.toApplyPage(index);
+			// this.toApplyPage(index);
 		},
 		animationfinish(e) {
 			let current = e.detail.current;

pageE/tool/ManicureOrder.vue

@@ -26,7 +26,7 @@ export default {
 		return {
 			name: '',
 			time: '',
-			address: '四川省攀枝花市银江镇',
+			address: '',
 			params: {
 				year: true,
 				month: true,
@@ -65,14 +65,11 @@ export default {
 				time: new Date(this.time)
 			}).then((res)=>{
 				if(res.errCode == 0) {
-					uni.redirectTo({
-						url: '/pageE/tool/Manicure'
-					});
-					// this.$refs.uToast.show({
-					// 	title: res.message,
-					// 	type: 'success',
-					// 	url: '/pageE/tool/Manicure'
-					// })
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success',
+						back: true,
+					})
 				} else {
 					this.showToast(res.message, 'error');
 				}
@@ -90,7 +87,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/MineHistory.vue

@@ -38,7 +38,7 @@ export default {
 			const res = await this.$u.api.getBrowseList({ page: this.page });
 			this.timer = false;
 			if(res.errCode == 0) {
-				this.historyList = res.data.storeInfo;
+				this.historyList.push(...res.data.storeInfo);
 			}
 			return res.data.storeInfo.length;
 		},

pageE/tool/SendWash.vue

@@ -1,28 +1,52 @@
 <template>
 	<view class="wash">
 		<view class="title">
-			<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88" ></u-tabs-swiper>
+			<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88"></u-tabs-swiper>
+			<u-icon name="arrow-down-fill" :color="current == 0 ? '#FF780F' : '#333333'" size="17" class="order-icon" :style="{ left: list[0].name == '平台历史订单' ? '236rpx' : '252rpx' }"></u-icon>
+			<view class="popup" v-if="showPopup" @click="onTap">
+				<view class="popup_cont" @click="replaces(1)">
+					实体店历史订单
 				</view>
-		<swiper :current="swiperCurrent" @animationfinish="animationfinish">
+				<view class="popup_cont" @click="replaces(2)">
+					平台历史订单
+				</view>
+			</view>
+		</view>
+		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ height: swiperHeight }">
 			<swiper-item class="swiper-item">
-				<scroll-view scroll-y class="order-list">
-					<view v-for="(item, index) in 6" :key="index" class="order-item">
+				<scroll-view scroll-y class="order-list" @scrolltolower="loadmore">
+					<view v-for="(item, index) in orderList" :key="index" class="order-item">
 						<view class="order-title">
 							<view class="order-text">订单状态</view>
-							<view class="order-status">已预约</view>
+							<view class="order-status">{{ item.order_status | viewStatus }}</view>
 						</view>
 						<view class="order-info">
-							<image src="../static/mine/23.png"></image>
-							<view>
-								<view>骑手名字：xxx</view>
-								<view>联系方式：123456789</view>
-								<view>所属公司：xx公司</view>
+							<image :src="item.goods_image"></image>
+							<view v-if="item.deliver_goods_type == 2 && item.order_status == 20">
+								<view>骑手名字：{{ item.takeawayer_name || '' }}</view>
+								<view>联系方式：{{ item.takeawayer_mobile || '' }}</view>
+								<view>所属公司：{{ item.company || '' }}</view>
+							</view>
+							<view v-if="item.order_status == 0">
+								<view>正在等待接单</view>
+							</view>
+							<view v-if="item.order_status == 40">
+								<view>商家已拒绝</view>
+							</view>
+							<view v-if="item.order_status == 50">
+								<view>交易已完成</view>
+							</view>
+							<view v-if="item.deliver_goods_type == 1 && item.order_status == 20">
+								<view>商家在正路途中，请耐心等待</view>
 							</view>
 						</view>
-						<view class="send-btn">
-							<view class="btn" v-if="btn_show">
+						<view class="send-btn" v-if="item.order_status == 20 || item.order_status == 50">
+							<view class="btn" v-if="item.order_status == 20" @click="sendLaundryOrderConfirm(item.laundry_id)">
 								确认完成
 							</view>
+							<view class="btn" v-if="item.order_status == 50" @click="toComment(item.laundry_id)">
+								去评价
+							</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -34,24 +58,16 @@
 			</swiper-item>
 			<swiper-item class="swiper-item">
 				<scroll-view scroll-y class="comment">
-					<view v-for="(item, index) in 3" :key="index" class="comment-item">
-						<Comment></Comment>
+					<view v-for="(comment, index) in commentList" :key="index" class="comment-item">
+						<Comment :info="comment"></Comment>
 					</view>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
-		<view class="popup"  v-if="showPopup" @click="onTap">
-			<view class="popup_cont" @click="replaces(1)">
-				实体店历史订单
-			</view>
-			<view class="popup_cont" @click="replaces(2)">
-				平台历史订单
-			</view>
-		</view>
 	</view>
 </template>
 <script>
-import Comment from '@/components/mine/comment/index'
+import Comment from '@/components/mine/comment/index';
 export default {
 	data() {
 		return {
@@ -65,51 +81,144 @@ export default {
 			}],
 			current: 0,
 			swiperCurrent: 0,
-			btn_show:true
+			btn_show:true,
+			page: 1,
+			orderList: [],
+			timer: true,
+			commentList: [],
+			swiperHeight: '',
 		}
 	},
 	components: {
 		Comment
+	},
+	filters: {
+		viewStatus(status) {
+			let state;
+			switch (status) {
+				case 0:
+					state = '等待接单';
+					break;
+				case 20:
+					state = '已接单';
+					break;
+				case 40:
+					state = '交易失败';
+					break;
+				case 50:
+					state = '交易成功';
+					break;
+				default:
+					break;
+			}
+			return state;
+		},
+	},
+	watch: {
+		current(index) {
+			if(index == 1) {
+				uni.navigateTo({
+					url: '/pageE/tool/WashOrder'
+				});
+				this.showPopup = false;
+			}
+		}
+	},
+	onPullDownRefresh() {
+        this.sendLaundryOrderList();
     },
 	onShow() {
 		this.current = 0;
 		this.swiperCurrent = 0;
-		this.showPopup= false
+		this.showPopup = false;
+		this.sendLaundryOrderList();
+		this.sendCommentList();
+	},
+	onLoad() {
+		this.setViewHeight();
 	},
 	methods: {
+		async sendLaundryOrderList({ load = 'reload' } = {}) {
+			let type = this.list[0].name == '平台历史订单' ? 1 : 2;
+			const res = await this.$u.api.sendLaundryOrderList({
+				type: type,
+				page: this.page,
+			})
+			uni.stopPullDownRefresh();
+			this.timer = false;
+			if(res.errCode == 0) {
+				// this.orderList = res.data.list;
+				// console.log(...res.data.list);
+				if(load == 'loadmore') this.orderList = this.orderList.concat(res.data.list);
+				else if(load == 'reload') this.orderList = res.data.list;
+			} else {
+				this.orderList = [];
+			}
+			return res.data.list.length;
+		},
+		sendLaundryOrderConfirm(id) {
+			this.$u.api.sendLaundryOrderConfirm({ id: id }).then(res => {
+				if(res.errCode == 0) {
+					this.sendLaundryOrderList();
+				}
+				this.$u.toast(res.message);
+			})
+		},
+		loadmore() {
+			if(!this.timer) return false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.sendLaundryOrderList({ load: 'loadmore' }).then(length => {
+				if(length == 0) {
+					this.page--;
+					this.status = 'nomore';
+				} else {
+					this.status = 'loading';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
+			})
+		},
+		// 送洗评论列表
+		sendCommentList() {
+			this.$u.api.sendCommentList().then(res => {
+				if(res.errCode == 0) {
+					this.commentList = res.data.list;
+				} else {
+					this.commentList = [];
+				}
+			})
+		},
+		setViewHeight() {
+			const res = uni.getSystemInfoSync();
+			this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+		},
+		toComment(id) {
+			this.$u.route('/pageE/tool/washComment', {
+				id: id
+			});
+		},
 		tabsChange(index) {
 			this.swiperCurrent = index;
-			this.toApplyPage(index);
+			if (index == 0){
+				this.showPopup = !this.showPopup;
+			} else {
+				this.showPopup = false;
+			}
 		},
 		animationfinish(e) {
 			let current = e.detail.current;
 			this.swiperCurrent = current;
 			this.current = current;
-			this.toApplyPage(current);
-		},
-		toApplyPage(index) {
-			console.log(index)
-			var that = this;
-			if(index == 1) {
-				this.showPopup = false
-				uni.navigateTo({
-					url: '/pageE/tool/WashOrder'
-				});
-			}else if(index ==0){
-				this.history();
-			}else{
-				this.showPopup = false
-			}
-		},
-		history(){
-			this.showPopup = true;
 		},
 		replaces(e){
 			if(e == 1){
 				this.$set(this.list,0,{name: '实体店历史订单'} )
-			}else{
+			} else {
 				this.$set(this.list,0,{name: '平台历史订单'} )
 			}
+			this.sendLaundryOrderList();
 		},
 		onTap(){
 			this.showPopup = false
@@ -125,10 +234,43 @@ export default {
 	flex-direction: column;
 	> uni-swiper {
 		flex: 1;
-		height: 85vh;
 	}
-	.title{
-
+	.title {
+		position: relative;
+		.order-icon {
+			position: absolute;
+			top: 50%;
+			transform: translate(0, -50%);
+			z-index: 9;
+		}
+		.popup{
+			width: 100%;
+			height: calc(calc(100vh - 88rpx) - var(--window-top));
+			position: absolute;
+			top: 88rpx;
+			left: 0;
+			z-index: 9;
+			background-color: rgba(0, 0, 0, 0.4);
+			transform: scale(1);
+			display: flex;
+			flex-direction: column;
+			justify-content: top;
+			align-items: center;
+			transition-duration: 0.3s;
+			.popup_cont{
+				border-top: 1px solid RGBA(239, 236, 240, 1);
+				background-color: #fff;
+				width: 100%;
+				height: 80rpx;
+				line-height: 80rpx;
+				font-size:28rpx;
+				font-family:PingFang SC;
+				font-weight:400;
+				color:rgba(102,102,102,1);
+				padding-left: 41rpx;
+				position: relative;
+			}
+		}
 	}
 	.swiper-item {
 		padding-top: 20rpx;
@@ -139,8 +281,8 @@ export default {
 			padding: 0 30rpx;
 			.order-item {
 				padding: 30rpx;
-				width:690rpx;
-				height: 362rpx;
+				width: 690rpx;
+				// height: 362rpx;
 				background: rgba(255,255,255,1);
 				border-radius: 10rpx;
 				margin-bottom: 20rpx;
@@ -175,7 +317,7 @@ export default {
 						}
 					}
 				}
-				.send-btn{
+				.send-btn {
 					width: 100%;
 					display: flex;
 					justify-content: flex-end;
@@ -183,7 +325,6 @@ export default {
 					.btn{
 						width: 154rpx;
 						height: 54rpx;
-						background: RGBA(255, 254, 255, 1);
 						border-radius: 49rpx;
 						transform: translate(-50%, 0);
 						font-size: 26rpx;
@@ -204,35 +345,5 @@ export default {
 			}
 		}
 	}
-	.popup{
-		width: 100%;
-		height: 100%;
-		position: fixed;
-		bottom: 0;
-		top: 88px;
-		left: 0;
-		right: 0;
-		z-index: 2;
-		background-color: rgba(0, 0, 0, 0.4);
-		transform: scale(1);
-		display: flex;
-		flex-direction: column;
-		justify-content: top;
-		align-items: center;
-		transition-duration: 0.3s;
-		
-		.popup_cont{
-			border-top: 1px solid RGBA(239, 236, 240, 1);
-			background-color: #fff;
-			width: 100%;
-			height: 80rpx;
-			line-height: 80rpx;
-			font-size:28rpx;
-			font-family:PingFang SC;
-			font-weight:400;
-			color:rgba(102,102,102,1);
-			padding-left: 41rpx;
-		}
-	}
 }
 </style>

pageE/tool/WashOrder.vue

@@ -1,14 +1,15 @@
 <template>
 	<view class="wash-order">
 		<view>
-			<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88" ></u-tabs-swiper>
+			<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88"></u-tabs-swiper>
 		</view>
-		<swiper :current="swiperCurrent" @animationfinish="animationfinish">
+		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ minHeight: swiperHeight }">
 			<swiper-item class="swiper-item">
+				<scroll-view scroll-y="true" style="height: 100%;">
 					<view class="order-info">
-					<view class="order-name" @click="order()">
+						<view class="order-name" @click="showPopup=true">
 							<view class="title titles" >
-							<text>选择订单：</text>
+								<text>选择订单:</text>
 								<image src="../../static/image/shop/2.png" mode=""></image>
 							</view>
 							<u-icon name="arrow-dwon" color="#2979ff" size="28"></u-icon>
@@ -16,308 +17,493 @@
 						<view class="choose-info" v-if="choose">
 							<view class="store">
 								<view>
-								<image src="../../static/image/mine/23.png" mode=""></image>胖胖的店
+									<image :src="checkedGoods.store.store_avatar"></image>{{ checkedGoods.store.store_name }}
 								</view>
 								<view>
-								订单编号：2222222222222
+									订单编号：{{ checkedGoods.order_sn }}
 								</view>
 							</view>
 							<view class="store_info">
 								<view class="info_img">
-								<image src="../../static/image/mine/23.png" mode="">
+									<image :src="checkedGoods.goods.goods_image" mode="">
 								</view>
 								<view class="info_txt">
-								<view class="content">
-									木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子
+									<view class="content u-line-2">
+										{{ checkedGoods.goods.goods_name }}
 									</view>
 									<view class="much">
-									<text>￥99</text>
-									<text>x1</text>
+										<text>￥{{ checkedGoods.goods.goods_pay_price }}</text>
+										<text>x{{ checkedGoods.goods.goods_num }}</text>
 									</view>
 								</view>
 							</view>
 						</view>
-					<view class="order-name">
-						<view class="title">送洗人：</view>
+						<view class="order-view order-phone">
+							<view class="title">衣服状况:</view>
+							<input type="text" v-model="goodsStatus" />
+						</view>
+						<view class="order-view order-type" @click="showClothesType=true">
+							<view class="title">商品类型:</view>
+							<input type="text" v-model="type.label" disabled />
+						</view>
+						<view class="order-view order-name">
+							<view class="title">送洗人:</view>
 							<input type="text" v-model="name" />
 						</view>
-					<view class="order-phone">
-						<view class="title">手机号：</view>
-						<input type="text" v-model="phone" />
+						<view class="order-view order-phone">
+							<view class="title">手机号:</view>
+							<input type="text" v-model="phone" maxlength="11" />
 						</view>
-					<view class="order-area">
-						<view class="title">省市区：</view>
-						<input type="text" v-model="area" />
-						<view class="location">
+						<view class="order-view order-area" @click="showAddress=true">
+							<view class="title">省市区:</view>
+							<input type="text" v-model="area" disabled />
+							<!-- <view class="location">
 								<image src="../static/mine/28.png"></image>
 								<view>定位</view>
+							</view> -->
 						</view>
-					</view>
-					<view class="order-address">
-						<view class="title">详细地址：</view>
+						<view class="order-view order-address">
+							<view class="title">详细地址:</view>
 							<input type="text" v-model="address" />
 						</view>
 					</view>
 					<view class="upload-image">
 						<view class="title">上传商品图片</view>
 						<u-upload 
-						ref="uUpload" 
-						@on-uploaded="onUploaded" 
+							ref="platform"
 							:custom-btn="true" 
 							:max-count="count"
+							:action="uaction"
 							:auto-upload="false"
+							:header="uheader"
+							:form-data="uformData"
+							:name="uname"
+							@on-uploaded="setImageList"
 						>
 							<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
-							<img src="../static/mine/27.png" />
+								<image src="../static/mine/27.png"></image>
 							</view>
 						</u-upload>
 					</view>
-				<view class="wash-btn" @click="reset()">确认送洗</view>
+					<view class="wash-btn" @click="submitImage">确认送洗</view>
+				</scroll-view>
 			</swiper-item>
 			<swiper-item class="swiper-item">
 				<view class="order-info">
-						<view class="order-name">
-							<view class="title">商品名称：</view>
+					<view class="order-view order-name">
+						<view class="title">商品名称:</view>
+						<input type="text" v-model="goodsName" />
+					</view>
+					<view class="order-view order-phone">
+						<view class="title">衣服状况:</view>
+						<input type="text" v-model="goodsStatus" />
+					</view>
+					<view class="order-view order-phone" @click="showClothesType=true">
+						<view class="title">商品类型:</view>
+						<input type="text" v-model="type.label" disabled />
+					</view>
+					<view class="order-view order-name">
+						<view class="title">送洗人:</view>
 						<input type="text" v-model="name" />
 					</view>
-						<view class="order-phone">
-							<view class="title">商品类型：</view>
-							<input type="text" v-model="name" />
+					<view class="order-view order-phone">
+						<view class="title">手机号:</view>
+						<input type="text" v-model="phone" maxlength="11" />
 					</view>
-						<view class="order-phone">
-							<view class="title">衣服状况：</view>
-							<input type="text" v-model="name" />
-						</view>
-						<view class="order-name">
-							<view class="title">送洗人：</view>
-							<input type="text" v-model="name" />
-						</view>
-						<view class="order-area">
-							<view class="title">省市区：</view>
-							<input type="text" v-model="area" />
-							<view class="location">
+					<view class="order-view order-area" @click="showAddress=true">
+						<view class="title">省市区:</view>
+						<input type="text" v-model="area" disabled />
+						<!-- <view class="location">
 							<image src="../static/mine/28.png"></image>
 							<view>定位</view>
+						</view> -->
 					</view>
-						</view>
-						<view class="order-address">
-							<view class="title">详细地址：</view>
+					<view class="order-view order-address">
+						<view class="title">详细地址:</view>
 						<input type="text" v-model="address" />
 					</view>
 				</view>
 				<view class="upload-image">
 					<view class="title">上传商品图片</view>
 					<u-upload 
-							ref="uUpload" 
-							@on-uploaded="onUploaded" 
+						ref="physical"
 						:custom-btn="true" 
 						:max-count="count"
+						:action="uaction"
 						:auto-upload="false"
+						:header="uheader"
+						:form-data="uformData"
+						:name="uname"
+						@on-uploaded="setImageList"
 					>
 						<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
-								<img src="../static/mine/27.png" />
+							<image src="../static/mine/27.png"></image>
 						</view>
 					</u-upload>
 				</view>
-					<view class="wash-btn">确认送洗</view>
+				<view class="wash-btn" @click="submitImage">确认送洗</view>
 			</swiper-item>
 		</swiper>
-		<view class="popup"  v-if="showPopup">
-			<view class="popup_cont" >
+		<u-select v-model="showClothesType" :list="typeList" value-name="id" label-name="name" @confirm="confirmType" mode="single-column"></u-select>
+		<u-select v-model="showAddress" 
+				mode="mutil-column-auto" 
+				:list="areaList" 
+				value-name="area_id" 
+				label-name="area_name" 
+				child-name="_child" 
+				@confirm="setArea"
+				:safe-area-inset-bottom="true">
+		</u-select>
+		<u-popup v-model="showPopup" mode="bottom" border-radius="20">
+			<view class="order-popup">
 				<view class="check">
 					<text>选择订单</text>
-					<image src="../../static/image/common/17.png" @click="close()"></image>
+					<u-icon name="close" color="#A29FA3" size="32"></u-icon>
 				</view>
-				<swiper  style="height: 1000px;"   vertical="true">
-					<swiper-item class="swiper-item">
 				<scroll-view scroll-y class="order-list">
-							<view v-for="(items, index) in 3" :key="items.index">
+					<u-radio-group v-model="value" @change="radioChange">
+						<view v-for="(items, index) in orderList" :key="index" class="order-item">
 							<view class="store">
-									<view>
-										<image src="../../static/image/mine/23.png" mode=""></image>胖胖的店
+								<view class="name">
+									<image :src="items.extend_store.store_avatar" mode=""></image>
+									<text>{{ items.store_name }}</text>
 								</view>
-									<view>
-										订单编号：2222222222222
+								<view class="order-sn">
+									订单编号：{{ items.order_sn }}
 								</view>
 							</view>
 							<view class="checkd">
-									<radio-group @change="er">
-										<label class="uni-list-cell uni-list-cell-pd"  v-for="(item, index) in checkLidt" :key="index">
+								<label class="radio-view" v-for="(item, index) in items.extend_order_goods" :key="index">
 									<view class="radio">
-												<radio color="#F0AD4E"   :value="item.id"  :checked="a==item.id"/>
+										<u-radio color="#F0AD4E" :name="items.order_id + ' ' + item.goods_id" active-color="#FF780F" icon-size="34" shape="circle"></u-radio>
 									</view>
 									<view class="store_info">
 										<view class="info_img">
-													<image src="../../static/image/mine/23.png" mode="">
+											<image :src="item.goods_image" mode="">
 										</view>
 										<view class="info_txt">
-													<view class="content">
-														木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子
+											<view class="content u-line-2">
+												{{ item.goods_name }}
 											</view>
 											<view class="much">
-														<text>￥99</text>
-														<text>x1</text>
+												<text>￥{{ item.goods_pay_price }}</text>
+												<text>x{{ item.goods_num }}</text>
 											</view>
 										</view>
 									</view>
 								</label>
-									</radio-group>
 							</view>
 						</view>
+					</u-radio-group>
 				</scroll-view>
-					</swiper-item>
-				</swiper>
-				<view class="bottom_btn" style="width: 100%;background-color: #fff;">
-					<view class="wash-btn" @click="confirm()">确认</view>
-				</view>
-			</view>
+				<view class="order-btn" @click="confirm">确认</view>
 			</view>
+		</u-popup>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
 export default {
 	data() {
 		return {
-			items: [],
+			// items: [],
 			count: 4, // 最大图片数量
-			name: '',
-			phone: '',
-			area: '',
-			address: '',
+			type: {}, // 商品类型
+			name: '', // 送洗人
+			phone: '', // 手机号
+			area: '', // 省市区
+			goodsStatus: '', // 衣服状况
+			address: '',　// 详细地址
+			goodsName: '', // 商品名称
 			list: [{
 				name: '平台历史订单'
 			}, {
 				name: '实体店历史订单'
 			}],
+			typeList: [], // 商品类型列表
+			orderList: [], // 商品列表
+			page: 0,
 			current: 0,
 			swiperCurrent: 0,
+			areaList: [], //　地址列表
+			showClothesType: false,
+			showAddress: false,
 			showPopup : false,
-			a:"",
-			checkLidt:[
-				{id:'1'},
-				{id:'2'},
-				{id:'3'}
-			]
+			swiperHeight: '',
+			value: '', // radio
+			checkedGoods: {}, // 选中的商品
+			choose: false, // 是否选择了商品
+			filesArr: [], // 选择的图片
+			uploadImage: [], // 图片名称(后台返回)列表
+			uaction: this.$u.http.config.baseUrl + '/Upload/uploadfile', // 下面是上传图片的参数
+			uheader: {
+				"authorization": 'Bearer' + " " + uni.getStorageSync('token')
+			},
+			uname: 'common',　// 与formData name 一样
+			uformData: {
+				name: 'common', // 其他图片
+			},
+			debounce: true,
 		}
 	},
-	methods: {
 	onShow() {
-			this.current = 0;
-			this.swiperCurrent = 0;
+		this.debounce = true;
+		// this.current = 0;
+		// this.swiperCurrent = 0;
 		this.showPopup = false;
-			this.choose = false
+		this.choose = false;
 	},
-		submit() {
-			this.$refs.uUpload.upload();
+	onLoad() {
+		this.getOrderList();
+		this.setViewHeight();
+		this.getAreaData();
+		this.getClothesTypeList();
 	},
-		onUploaded(list) {
-			console.log(list)
-		},tabsChange(index) {
+	methods: {
+		getClothesTypeList() {
+			this.$u.api.getClothesTypeList().then(res => {
+				if (res.errCode == 0) {
+					this.typeList = res.data.typeList;
+				} else {
+					this.typeList = [];
+				}
+				console.log(this.typeList);
+			})
+		},
+		confirmType(e) {
+			console.log(e);
+			this.type = e[0];
+		},
+		async getOrderList({ load = 'reload' } = {}) {
+			const res = await this.$u.api.getOrderList({
+				page: this.page,
+				// type: '40',
+			})
+			this.timer = true;
+			if(res.errCode == 0) {
+				if(load == 'reload') this.orderList = res.data;
+				else this.orderList.push(...res.data);
+			}
+			return res;
+		},
+		submitImage() {
+			if(!this.debounce) return;
+			this.debounce = false;
+			this.current == 0 ? this.$refs.platform.upload() : this.$refs.physical.upload();
+		},
+		tabsChange(index) {
 			this.swiperCurrent = index;
 		},
-		er(e){
-			console.log(e)
-			this.a =e.detail.value;
-			console.log(this.a)
+		setImageList(lists) {
+			// console.log(lists);
+			let imageList = [];
+			lists.forEach(res => {
+				if(res.response.errCode == 0) imageList.push(res.response.data.file_name);
+			})
+			// console.log(imageList);
+			this.filesArr = imageList;
+			// console.log(this.filesArr);
+			this.confirmSend();
+		},
+		validationParams() {
+			if (this.current == 1) {
+				if(this.$u.test.isEmpty(this.goodsName)) {
+					this.showToast('商品名称不能为空', 'warning');
+					return false;
+				}
+			}
+			if(this.current == 0) {
+				if(JSON.stringify(this.checkedGoods) == '{}') {
+					this.showToast('订单不能为空', 'warning');
+					return false;
+				}
+			}
+			if(this.$u.test.isEmpty(this.goodsStatus)) {
+				this.showToast('衣服状况不能为空', 'warning');
+				return false;
+			}
+			if(JSON.stringify(this.type) == '{}') {
+				this.showToast('商品类型不能为空', 'warning');
+				return false;
+			}
+			if(this.$u.test.isEmpty(this.name)) {
+				this.showToast('送洗人不能为空', 'warning');
+				return false;
+			}
+			if(this.$u.test.isEmpty(this.phone)) {
+				this.showToast('手机号不能为空', 'warning');
+				return false;
+			}
+			if(!this.$u.test.mobile(this.phone)) {
+				this.showToast('手机号错误', 'warning');
+				return false;
+			}
+			if(this.$u.test.isEmpty(this.area)) {
+				this.showToast('地址不能为空', 'warning');
+				return false;
+			}
+			if(this.$u.test.isEmpty(this.address)) {
+				this.showToast('详细地址不能为空', 'warning');
+				return false;
+			}
+			return true;
+		},
+		confirmSend() {
+			if(!this.validationParams()) return false;
+			let params = {
+				tid: this.type.value,
+				member_name: this.name,
+				area_info: this.area,
+				address_info: this.address,
+				goods_images: this.filesArr,
+				member_phone: this.phone,
+				condition: this.goodsStatus,
+			}
+			if(this.current == 0) {
+				Object.assign(params, {
+					type: 1,
+					order_id: this.checkedGoods.order_id,
+					goods_id: this.checkedGoods.goods.goods_id,
+				});
+			} else if(this.current == 1) {
+				Object.assign(params, {
+					type: 2,
+					goods_name: this.goodsName,
+				});
+			}
+			// console.log(params);
+			this.$u.api.sendLaundrySave(params).then(res => {
+				this.$u.toast(res.message);
+				if(res.errCode == 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						type: 'success',
+						back: true,
+					})
+				} else {
+					this.$u.toast(res.message);
+					this.debounce = true;
+				}
+			})
+		},
+		radioChange(e){
+			const ids = e.split(" ");
+			console.log(ids)
+			let checkedGoods = {};
+			this.orderList.forEach(order => {
+				if(order.order_id == ids[0]) {
+					Object.assign(checkedGoods, { store: order.extend_store });
+					Object.assign(checkedGoods, { order_sn: order.order_sn });
+					Object.assign(checkedGoods, { order_id: order.order_id });
+					order.extend_order_goods.forEach(goods => {
+						if(goods.goods_id == ids[1]) {
+							Object.assign(checkedGoods, { goods: goods });
+							this.checkedGoods = checkedGoods;
+						}
+					})
+				}
+			})
+		},
+		setArea(area) {
+			// console.log(area);
+			this.area_id = area[0].value;
+			this.city_id = area[1].value;
+			let temp = '';
+			area.forEach(e => {
+				temp += e.label;
+			});
+			this.area = temp;
+		},
+		getAreaData() {
+			this.$u.api.getArea().then((res)=>{
+				if (res.errCode == 0) {
+					this.areaList = res.data;
+				} else {
+					this.areaList = [];
+				}
+			})
 		},
 		animationfinish(e) {
+			// 可重新提交订单
+			this.debounce = true;
 			let current = e.detail.current;
 			this.swiperCurrent = current;
 			this.current = current;
-			this.toApplyPage(current);
 		},
-		order(){
-			this.showPopup = true;
+		setViewHeight() {
+			const res = uni.getSystemInfoSync();
+			// this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+			this.swiperHeight = res.windowHeight + 'px';
 		},
-		toApplyPage(index) {
-			console.log(index)
-			if(index == 1) {
+		confirm(e){
 			this.showPopup = false;
-				this.choose = false
-			}
-		},
-		// replaces(){
-		// 	if(this.list[0].name=='实体店历史订单'){
-		// 		this.$set(this.list,0,{name: '平台历史订单'} )
-		// 	}else{
-		// 		this.$set(this.list,0,{name: '实体店历史订单'} )
-		// 	}
-		// },
-		confirm(){
-			this.showPopup = false;
-			if(this.a ==''){
-				this.choose =false
+			if(JSON.stringify(this.checkedGoods) != '{}'){
+				this.choose = true;
 			}else{
-				this.choose = true
+				this.choose = false;
 			}
-			
 		},
 		close(){
 			this.showPopup = false
 		},
-		reset(){
-			this.choose = false
+		showToast(message, type) {
+			this.$refs.uToast.show({
+				title: message,
+				type: type,
+			})
 		},
-		radioChange: function(evt) {
-            for (let i = 0; i < this.items.length; i++) {
-                if (this.items[i].value === evt.target.value) {
-                    this.current = i;
-                }
-            }
-        }		
 	},
 };
 </script>
 <style lang="scss" scoped>
 .wash-order {
+	height: calc(100vh - 1rpx);
+	overflow: hidden;
 	border-top: 1rpx solid #ECECEC;
 	> uni-swiper {
 		flex: 1;
-		height: 95vh;
+		// height: 95vh;
 	}
-	
 	.order-info {
-		
 		.choose-info{
 			display: flex;flex-wrap: wrap;
 			height: 335rpx;
 			.store{
 				>view{
-					>image{
+					>image {
 						width:60rpx;
 						height:60rpx;
-					border-radius:50%;
+						border-radius: 50%;
 						vertical-align: middle;
-					padding-right:13rpx
+						margin-right: 12rpx;
 					}
 				}
-				
-				font-size:28rpx;
-				font-family:PingFang SC;
-				font-weight:400;
+				font-size: 28rpx;
 				color:rgba(51,51,51,1);
 				line-height: 60rpx;
-				
 			}
 			.store_info{
 				display: flex;
 				flex-wrap: nowrap;
 				width: 100%;
 				height: 150rpx;
-				.info_img{
-					>image{
+				.info_img {
+					>image {
 						width: 180rpx;
 						height: 160rpx;
+						background-color: aqua;
+						border-radius: 10rpx;
 					}
 				}
-				.info_txt{
+				.info_txt {
 					padding-left: 30rpx;
 					padding-right: 30rpx;
 					display: flex;
 					flex-wrap: wrap;
 					width: 100%;
-					.content{
-						line-height: 44rpx;
+					.content {
+						height: 74rpx;
+						line-height: 37rpx;
 						font-size: 30rpx;
 						color:rgba(51,51,51,1);
 					}
@@ -363,12 +549,10 @@ export default {
 				>image{
 					width: 27rpx;
 					height: 12rpx;
-					
 				}
 			}
 			> input {
 				flex: 1;
-				text-align: right;
 			}
 			
 		}
@@ -385,6 +569,17 @@ export default {
 				}
 			}		
 		}
+		.order-view {
+			.title {
+				width: 140rpx;
+				font-size: 30rpx;
+				color: rgba(51,51,51,1);
+				margin-right: 10rpx;
+			}
+			> input {
+				text-align: left;
+			}
+		}
 	}
 	.upload-image {
 		padding: 35rpx 30rpx;
@@ -399,7 +594,7 @@ export default {
 			background: rgba(236,236,236,1);
 			border-radius: 10rpx;
 			text-align: center;
-			> img {
+			> image {
 				width: 54rpx;
 				height: 49rpx;
 				margin-top: 48rpx;
@@ -417,119 +612,68 @@ export default {
 		height: 98rpx;
 		background: rgba(255,120,15,1);
 		border-radius: 49rpx;
-		position: absolute;
-		bottom: 40rpx;
-		left: 50%;
-		transform: translate(-50%, 0);
+		margin: 30rpx auto 30rpx;
 		font-size: 36rpx;
 		color:rgba(255,255,255,1);
 		text-align: center;
 		line-height: 98rpx;
 	}
-	.popup{
-		width: 100%;
-		height: 100%;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		z-index: 2;
-		background-color: rgba(0, 0, 0, 0.4);
-		transform: scale(1);
-		align-items: center;
-		transition-duration: 0.3s;
-		
-		.popup_cont{
-			border-top: 1px solid RGBA(239, 236, 240, 1);
-			background-color: #fff;
-			width: 100%;
-			height: 1072rpx;
-			line-height: 80rpx;
-			font-size:28rpx;
-			font-family:PingFang SC;
-			font-weight:400;
-			color:rgba(102,102,102,1);
-			transform: scale(1);
-			position: fixed;
-			display: flex;
-			flex-direction: column;
-			bottom: 0px;
-			left: 0px;
-			right: 0px;
-			/* top: 0px; */
-			transition-duration: 0.3s;
-			border-radius:20px 20px 0px 0px;
-			> uni-swiper {
-				flex: 1;
-				height: 100vh;
-				
-				.order-list{
-					height: 60vh;
-					padding-bottom: 140rpx;
-				}
-			}
+	.order-popup {
 		.check{
-				font-size:30rpx;
-				font-family:PingFang SC;
-				font-weight:500;
-				color:rgba(51,51,51,1);
-				height:88rpx;
-				width: 100%;
-				padding-left: 30rpx;
-				border-bottom: 1px solid rgba(236, 236, 236, 1);
-				
-				>image{
-					width: 32rpx;
-					height: 32rpx;
-					vertical-align: middle;
-					float: right;
-					padding-top: 30rpx;
-					padding-right:30rpx
-					
-				}
-			}
-			
-			.store{
-				>view{
-					padding-left: 30rpx;
-					padding-top: 30rpx;
-					>image{
-					width:60rpx;
-					height:60rpx;
-					border-radius:50%;
-					vertical-align: middle;
-					padding-right:13rpx
-					}
-				}
-				
-				font-size:28rpx;
-				font-family:PingFang SC;
-				font-weight:400;
-				color:rgba(51,51,51,1);
-				line-height: 60rpx;
-				
-			}
-			.checkd{
-				>radio-group .uni-list-cell{
-					display: flex;
-					flex-wrap: nowrap;
-					width: 100%;
-				}
-				
-				.radio{
+			padding: 30rpx;
+			border-bottom: 1rpx solid rgba(236, 236, 236, 1);
 			display: flex;
 			align-items: center;
-					padding-left: 30rpx;
+			justify-content: space-between;
+			> text {
+				font-size: 30rpx;
+				font-weight: 500;
+				color: rgba(51,51,51,1);
 			}
-				.store_info{
+		}
+		.order-list {
+			height: 60vh;
+			padding: 30rpx;
+			box-sizing: border-box;
+			.order-item {
+				margin-bottom: 30rpx;
+				.store {
+					.name {
+						margin-bottom: 20rpx;
+						font-size: 28rpx;
+						color:rgba(51,51,51,1);
+						> image {
+							width: 60rpx;
+							height: 60rpx;
+							border-radius: 50%;
+							vertical-align: middle;
+							margin-right: 13rpx;
+						}
+					}
+					.order-sn {
+						margin-bottom: 20rpx;
+						font-size: 24rpx;
+						color: rgba(153,153,153,1);
+					}
+				}
+				.checkd {
+					.radio-view {
+						display: flex;
+						align-items: center;
+						margin-bottom: 20rpx;
+						.radio {
+							margin-right: 20rpx;
+						}
+						.store_info {
 							display: flex;
 							flex-wrap: nowrap;
 							width: 100%;
-					
 							.info_img{
 								>image{
 									width: 180rpx;
 									height: 160rpx;
+									background-color: aqua;
+									border-radius: 10rpx;
 								}
 							}
 							.info_txt{
@@ -539,7 +683,8 @@ export default {
 								flex-wrap: wrap;
 								width: 100%;
 								.content{
-							line-height: 44rpx;
+									height: 74rpx;
+									line-height: 37rpx;
 									font-size: 30rpx;
 									color:rgba(51,51,51,1);
 								}
@@ -553,5 +698,18 @@ export default {
 					}
 				}
 			}
+		}
+		.order-btn {
+			width: 690rpx;
+			height: 98rpx;
+			background: rgba(255,120,15,1);
+			border-radius: 49rpx;
+			line-height: 98rpx;
+			text-align: center;
+			margin: 0 auto 40rpx;
+			font-size: 36rpx;
+			color: rgba(255,255,255,1);
+		}
+	}
 }
 </style>

pageE/tool/washComment.vue

@@ -0,0 +1,98 @@
+<template>
+	<view class="comment">
+		<view class="main-container">
+			<u-input v-model="content" type="textarea" height="300" maxlength="200" />
+			<!-- <u-upload 
+				ref="uUpload" 
+				@on-uploaded="onUploaded" 
+				:custom-btn="true" 
+				:max-count="count" 
+				:auto-upload="false"
+			>
+				<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
+					<image src="../static/mine/27.png"></image>
+				</view>
+			</u-upload> -->
+		</view>
+		<u-toast ref="uToast" />
+		<view class="write-btn" @click="addWashEvaluate">发表评价</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			washId: '',
+			// count: 4, // 最大图片数量
+			content: '',
+		}
+	},
+	onLoad(option) {
+		this.washId = option.id;
+	},
+	methods: {
+		verifyParams() {
+			if(this.$u.test.isEmpty(this.content)) {
+				this.$u.toast('内容不可为空');
+				return false;
+			}
+			return true;
+		},
+		addWashEvaluate() {
+			if(!this.verifyParams()) return false;
+			this.$u.api.sendOrderComment({
+				id: this.washId,
+				comment: this.content,
+			}).then(res => {
+				this.$refs.uToast.show({
+					title: res.message,
+					back: true,
+				})
+			})
+		},
+		bindTextAreaBlur(event) {
+			this.content = event.detail.value;
+		}
+	},
+};
+</script>
+<style lang="scss" scoped>
+.comment {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	border-top: 1rpx solid #ffffff;
+	.main-container {
+		background-color: #ffffff;
+		padding: 30rpx;
+		margin-bottom: 10rpx;
+		// textarea {
+		// 	width: 100% !important;
+		// 	height: 500rpx;
+		// 	margin-bottom: 60rpx;
+		// }
+		// .slot-btn {
+		// 	width: 140rpx;
+		// 	height: 140rpx;
+		// 	background: rgba(236,236,236,1);
+		// 	border-radius: 10rpx;
+		// 	text-align: center;
+		// 	> img {
+		// 		margin-top: 48rpx;
+		// 		width: 54rpx;
+		// 		height: 49rpx;
+		// 	}
+		// }
+	}
+	.write-btn {
+		margin: 120rpx auto 0;
+		width: 690rpx;
+		height: 98rpx;
+		background: rgba(255,120,15,1);
+		border-radius: 46rpx;
+		font-size: 36rpx;
+		color: rgba(255,255,255,1);
+		text-align: center;
+		line-height: 98rpx;
+	}
+}
+</style>

pages.json

@@ -80,6 +80,7 @@
 		{
 			"root": "pageB",
 			"pages": [
+				
 				{
 					"path": "follow/index",
 					"style": {
@@ -106,6 +107,26 @@
 					"path": "sdetails/index",
 					"style": {
 						"navigationBarTitleText": "商品详情",
+						"app-plus":{
+							"titleNView":{
+								"backgroundColor":"#ffffff",
+								"buttons": [
+									{
+										"type":"none",
+										"text":"\ue636",
+										"float":"right",
+										"fontSize":"18",
+										"fontSrc": "/static/fonts/cart.ttf"
+									}
+								]
+							}
+						}
+					}
+				},
+				{
+					"path": "triedDress/index",
+					"style": {
+						"navigationBarTitleText": "试穿订单",
 						"app-plus":{
 							"titleNView":{
 								"backgroundColor":"#ffffff"
@@ -113,28 +134,90 @@
 						}
 					}
 				},
+				{
+					"path": "comment/index",
+					"style": {
+						"navigationBarTitleText": "商品评价",
+						"app-plus":{
+							"titleNView":{
+								"backgroundColor":"#ffffff",
+								"buttons": [
+									{
+										"type":"none",
+										"text":"\ue636",
+										"float":"right",
+										"fontSize":"18",
+										"fontSrc": "/static/fonts/cart.ttf"
+									}
+								]
+							}
+						}
+					}
+				},
 				{
 					"path": "search/index",
 					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
-						
+						"app-plus": {
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF",
+								"buttons": [
+									{  
+										"type":"none",
+										"text":"搜索",
+										"float":"right",
+										"fontSize":"16",
+										"color": "#FF780F"
+									}
+								],
+								"searchInput": {
+									"align": "left",
+									"borderRadius": "15px",
+									"placeholder": "搜索您需要的商品",
+									"backgroundColor": "rgb(236,236,236)",
+									"placeholderColor": "#999999",
+									"disabled": false
+								}
+							}
+						}
 					}
 				},
 				{
 					"path": "search/out",
 					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
-						
+						"app-plus": {
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF",
+								"buttons": [
+									{  
+										"type":"none",
+										"text":"搜索",
+										"float":"right",
+										"fontSize":"16",
+										"color": "#FF780F"
+									}
+								],
+								"searchInput": {
+									"align": "left",
+									"borderRadius": "15px",
+									"placeholder": "搜索您需要的商品",
+									"backgroundColor": "rgb(236,236,236)",
+									"placeholderColor": "#999999",
+									"disabled": false
+								}
+							}
+						}
 					}
 				},
 				{
 					"path": "photo/index",
 					"style": {
 						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
-						
+						"navigationStyle": "custom",
+						"app-plus": {
+							"softinputMode": "adjustResize"
+						}
 					}
 				}
 			]
@@ -167,11 +250,23 @@
 							}
 						}
 					}
-				
+				},
+				{
+					"path": "classify/goods",
+					"style": {
+						"navigationBarTitleText": "分类商品列表",
+						"app-plus": {
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
 				},
 				{
 					"path": "cart/index",
 					"style": {
+						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "购物车",
 						"app-plus": {
 							"titleSize": "36px",
@@ -475,7 +570,7 @@
 								"buttons": [
 									{  
 										"type":"none",
-										"text":"写意见",
+										"text":"投诉",
 										"float":"right",
 										"fontSize":"14"
 									}
@@ -539,6 +634,7 @@
 				{
 					"path": "tool/Manicure",
 					"style": {
+						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "美甲",
 						"app-plus": {
 							"titleSize": "36px",
@@ -565,6 +661,7 @@
 				{
 					"path": "tool/SendWash",
 					"style": {
+						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "送洗",
 						"app-plus": {
 							"titleSize": "36px",
@@ -575,6 +672,19 @@
 						}
 					}
 				},
+				{
+					"path": "tool/washComment",
+					"style": {
+						"navigationBarTitleText": "送洗评价",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
 				{
 					"path": "tool/WashOrder",
 					"style": {
@@ -604,6 +714,7 @@
 				{
 					"path": "mine/ImageTextCollection",
 					"style": {
+						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "图文收藏",
 						"app-plus": {
 							"titleSize": "36px",
@@ -630,6 +741,7 @@
 				{
 					"path": "mine/MineConcerns",
 					"style": {
+						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "我的关注",
 						"app-plus": {
 							"titleSize": "36px",
@@ -767,6 +879,7 @@
 				{
 					"path": "order/Index",
 					"style": {
+						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "我的订单",
 						"app-plus": {
 							"titleSize": "36px",
@@ -780,6 +893,7 @@
 				{
 					"path": "order/Details",
 					"style": {
+						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "订单详情",
 						"app-plus": {
 							"titleSize": "36px",
@@ -818,6 +932,19 @@
 							}
 						}
 					}
+				},
+				{
+					"path": "order/RefundOrder",
+					"style": {
+						"navigationBarTitleText": "申请退款",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
 				}
 			]
 		}	
@@ -829,9 +956,17 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/zhibo/index",
+			"style": {
+				"navigationStyle": "custom"
+				
+			}
+		},
 		{
 			"path": "pages/index/index",
 			"style": {
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -855,6 +990,7 @@
 		{
 			"path": "pages/mine/index",
 			"style": {
+				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "我的",
 				"app-plus": {
 					"titleSize": "36px",

pages/index/index.vue

@@ -1,4 +1,6 @@
 <template>
+	<view>
+		<view class="status_bar"></view>
 		<view class="index">
 			<view class="top">
 				<view class="sosuo"></view>
@@ -19,7 +21,7 @@
 					<scroll-view style="width:100%;height:100%" scroll-y="true">
 						<view class="box">
 							<!-- <indexad style="width:690rpx"></indexad> -->
-						<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code"></u-swiper>
+							<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
 							<view class="list">
 								<view>
 									<videoItem v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id" :item="item"
@@ -36,24 +38,25 @@
 				<swiper-item>
 					<scroll-view style="width:100%;height:100%" scroll-y="true">
 						<view class="box">
-						<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code"></u-swiper>
+							<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
 							<view class="list">
 								<view>
-								<zhiboItem v-for="item in 10"></zhiboItem>
+									<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :zid="item.live_id" :rid="item.chatroom_id"
+									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
 								</view>
 								<view style="margin-left:20rpx">
-								<zhiboItem v-for="item in 10"></zhiboItem>
+									<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :zid="item.live_id" :rid="item.chatroom_id"
+									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
 								</view>
 							</view>
 						</view>
-
 					</scroll-view>
 				</swiper-item>
 				<swiper-item>
 					<scroll-view style="width:100%;height:100%" scroll-y="true">
 						<view class="box">
 							<view class="tuijian">
-							<view class="title" @click="toSearchPage"  >
+								<view class="title" @click="toSearchPage">
 									<view class="left">
 										<view></view>
 										<text>推荐达人</text>
@@ -63,7 +66,7 @@
 								<view class="tuijianlist">
 									<!-- <darenItem style="margin-right:23rpx"></darenItem>
                                 <darenItem style="margin-right:23rpx"></darenItem> -->
-								<darenItem v-for="item in recommendList.slice(0,3)" :key="item.id" :info="item" v-on:pChangeType="changeType" ></darenItem>
+									<darenItem v-for="item in recommendList.slice(0,3)" :key="item.id" :info="item" v-on:pChangeType="changeType"></darenItem>
 								</view>
 							</view>
 							<view class="list">
@@ -79,11 +82,11 @@
 								</view>
 							</view>
 						</view>
-
 					</scroll-view>
 				</swiper-item>
 			</swiper>
 		</view>
+	</view>
 
 </template>
 <style lang="scss" scoped>
@@ -203,6 +206,7 @@
 				recommendList: [], // 推荐达人
 				indexImageSwiper: [],
 				zhiboImageSwiper: [],
+				tabLiveLists: []
 			}
 		},
 		components: {
@@ -218,10 +222,15 @@
 			this.getZhiBoSwiper();
 			this.tabLiveList();
 		},
+		onPullDownRefresh() {
+            this.getArticlelist();
+			// this.getManicureList({ load: 'reload' });
+		},
 		methods: {
-			tabLiveList(){
-				this.$u.api.tabLiveList().then((res)=>{
+			tabLiveList() {
+				this.$u.api.tabLiveList().then((res) => {
 					console.log(res)
+					this.tabLiveLists = res.data
 				})
 			},
 			getSwiper() {
@@ -231,12 +240,12 @@
 					}
 				})
 			},
-			changeType(member_id){
+			changeType(member_id) {
 				console.log(member_id);
 				this.$emit("pChangeType")
 				this.$u.api.attentionMember({
 					member_id: member_id
-				}).then((res)=>{
+				}).then((res) => {
 					console.log(res)
 					this.getRecommendList();
 				})
@@ -261,7 +270,8 @@
 					page: this.page,
 					is_video_img: 0, // 查询视频1 图文2 都查0
 				}).then(res => {
-					console.log('37647744ghj',res)
+                    uni.stopPullDownRefresh();
+					console.log('37647744ghj', res)
 					if (res.errCode == 0) {
 						this.articleList = res.data.list;
 					}
@@ -281,6 +291,42 @@
 					url: '/pageB/follow/index'
 				});
 			},
+			clickFImage(index) {
+				const item = this.indexImageSwiper[index];
+				console.log(item);
+				this.activityLink({
+					type: item.url_type,
+					id: item.info_id
+				});
+			},
+			clickSImage(index) {
+				const item = this.zhiboImageSwiper[index];
+				console.log(item);
+				this.activityLink({
+					type: item.url_type,
+					id: item.info_id
+				});
+			},
+			activityLink({
+				type,
+				id
+			}) {
+                console.log(type,id);
+				if (type == 0) return false;
+				// type 1 商品详情页, 2 店铺详情页
+				const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';
+				let params = {
+					id: id
+				};
+				// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
+				if (type == 1) Object.assign(params, {
+					type: 1
+				});
+				this.$u.route({
+					url: url,
+					params: params
+				})
+			},
 		},
 	}
 </script>

pages/information/information.vue

@@ -9,7 +9,7 @@
 		<view class="content">
 			<!-- 正文内容 -->
 		</view>
-		<view class="sousuo"></view>
+		<!-- <view class="sousuo"></view> -->
 		<view class="backes">
 			<titles :information="information_dles"></titles>
 		</view>
@@ -42,7 +42,7 @@
 					},
 					{
 						id: 0,
-						url: '../../static/pageD/info(6).png',
+						url: '../../static/pageD/info(13).png',
 						text: '活动消息'
 					},
 					{
@@ -59,7 +59,8 @@
 
 				],
 				// 通知消息
-				information_dl: [{
+				information_dl: [
+					{
 						id: 0,
 						url: '../../static/pageD/info(11).png',
 						text: '通知消息',
@@ -90,6 +91,19 @@
 		onLoad() {
 			// /消息模块的请求
 			this.messageIndex()
+			if(this.$store.state.hasLogin){
+				const user = uni.getStorageSync('user_info');
+				console.log(user)
+				this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
+				this.imService.connectIM()
+				let that = this
+				setTimeout(function(){
+					that.imService.disconnect()
+				},1000)
+				setTimeout(function(){
+					that.imService.connectIM()
+				},2000)
+			}
 		},
 		methods: {
 			// 选中某个复选框时，由checkbox时触发

pages/mine/index.vue

@@ -2,13 +2,13 @@
     <view class="mine">
         <view class="mine-top">
             <view class="top">
-				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar" :size="110"></u-avatar>
+				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="110"></u-avatar>
 				<view class="user-info">
 					<view class="info-left">
 						<view class="user-nickname">{{ userInfo.member_nickname }}</view>
 						<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
-							<img src="/static/image/mine/13.png" />
-							<view class="rank-title">勋章</view>
+							<image src="/static/image/mine/13.png"></image>
+							<view class="rank-title">{{ userInfo.member_grade_name }}</view>
 						</view>
 					</view>
 					<view class="info-right">
@@ -19,24 +19,24 @@
 				<view class="member-service" @click="toOtherPage('/mine/MemberServe')">会员服务</view>
 			</view>
 			<view class="bottom">
-				<view @click="toOtherPage('/mine/GoodsCollection')">
+				<!-- <view @click="toOtherPage('/mine/GoodsCollection')">
 					<view>{{ userInfo.member_fav_goods_num || 0 }}</view>
 					<view>商品收藏</view>
 				</view>
 				<view @click="toOtherPage('/mine/StoreCollection')">
-					<view>{{ userInfo.member_fav_store_num }}</view>
+					<view>{{ userInfo.member_fav_store_num || 0 }}</view>
 					<view>店铺收藏</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')">
-					<view>{{ userInfo ? userInfo.member_points : 0 }}</view>
+					<view>{{ userInfo.member_points || 0 }}</view>
 					<view>积分数</view>
 				</view>
 				<view @click="toOtherPage('/mine/MineConcerns')">
-					<view>{{ userInfo.member_snsfrend_num }}</view>
+					<view>{{ userInfo.member_snsfrend_num || 0 }}</view>
 					<view>关注</view>
 				</view>
 			</view>
@@ -47,53 +47,57 @@
 					<view class="title-text">我的订单</view>
 					<view class="more" @click="toOtherPage('/order/Index')">
 						<view>查看全部订单</view>
-						<img src="/static/image/mine/21.png" />
+						<image src="/static/image/mine/21.png"></image>
 					</view>
 				</view>
 				<view class="content">
 					<view @click="toOtherPage('/order/Index?current=1')">
-						<img src="/static/image/mine/6.png" />
+						<image src="/static/image/mine/6.png"></image>
 						<view>待支付</view>
 					</view>
 					<view @click="toOtherPage('/order/Index?current=2')">
-						<img src="/static/image/mine/14.png" />
-						<view>已取消</view>
+						<image src="/static/image/mine/35.png"></image>
+						<view>待发货</view>
 					</view>
 					<view @click="toOtherPage('/order/Index?current=3')">
-						<img src="/static/image/mine/2.png" />
+						<image src="/static/image/mine/2.png"></image>
 						<view>待收货</view>
 					</view>
 					<view @click="toOtherPage('/order/Index?current=4')">
-						<img src="/static/image/mine/1.png" />
+						<image src="/static/image/mine/1.png"></image>
 						<view>试穿试送</view>
 					</view>
 					<view @click="toOtherPage('/order/Index?current=5')">
-						<img src="/static/image/mine/3.png" />
-						<view>待评价</view>
+						<image src="/static/image/mine/37.png"></image>
+						<view>拼团中</view>
 					</view>
 					<view @click="toOtherPage('/order/Index?current=6')">
-						<img src="/static/image/mine/9.png" />
+						<image src="/static/image/mine/9.png"></image>
 						<view>售后</view>
 					</view>
+					<view @click="toOtherPage('/order/Index?current=7')">
+						<image src="/static/image/mine/3.png"></image>
+						<view>待评价</view>
+					</view>
 				</view>
 			</view>
 			<view class="tool">
 				<view class="title">我的工具</view>
 				<view class="content">
 					<view @click="toOtherPage('/tool/SendWash')">
-						<img src="/static/image/mine/20.png" />
+						<image src="/static/image/mine/20.png"></image>
 						<view>送洗</view>
 					</view>
 					<view @click="toOtherPage('/tool/Manicure')">
-						<img src="/static/image/mine/19.png" />
+						<image src="/static/image/mine/19.png"></image>
 						<view>美甲</view>
 					</view>
 					<view @click="toOtherPage('/tool/MineHistory')">
-						<img src="/static/image/mine/18.png" />
+						<image src="/static/image/mine/18.png"></image>
 						<view>足迹</view>
 					</view>
 					<view @click="toOtherPage('/tool/MineCoupon')">
-						<img src="/static/image/mine/25.png" />
+						<image src="/static/image/mine/25.png"></image>
 						<view>优惠券</view>
 					</view>
 				</view>
@@ -102,19 +106,19 @@
 				<view class="title">更多工具</view>
 				<view class="content">
 					<view @click="toOtherPage('/more/Address')">
-						<img src="/static/image/mine/17.png" />
+						<image src="/static/image/mine/17.png"></image>
 						<view>收货地址</view>
 					</view>
 					<view @click="toOtherPage('/more/AfterSalesHelp')">
-						<img src="/static/image/mine/9.png" />
+						<image src="/static/image/mine/9.png"></image>
 						<view>售后政策</view>
 					</view>
 					<view @click="toOtherPage('/more/MineHelp')">
-						<img src="/static/image/mine/16.png" />
+						<image src="/static/image/mine/16.png"></image>
 						<view>使用帮助</view>
 					</view>
 					<view @click="toOtherPage('/more/Complaints')">
-						<img src="/static/image/mine/15.png" />
+						<image src="/static/image/mine/15.png"></image>
 						<view>投诉意见</view>
 					</view>
 				</view>
@@ -124,7 +128,11 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
 export default {
+	computed: {
+		...mapState(['hasLogin', 'token'])
+	},
     data() {
         return {
             userInfo: {},
@@ -136,6 +144,16 @@ export default {
 		}
 	},
 	onShow() {
+		// 尝试登录
+		if (!this.hasLogin) {
+			uni.navigateTo({
+				url: "../../pageA/login/login"
+			})
+		}
+		this.getUserInfo();
+	},
+	// 下拉刷新
+	onPullDownRefresh() {
         this.getUserInfo();
     },
 	onNavigationBarButtonTap() {
@@ -144,6 +162,7 @@ export default {
     methods: {
 		getUserInfo() {
 			this.$u.api.getMemberInfo().then(res => {
+				uni.stopPullDownRefresh();
 				if (res.errCode == 0) {
 					// this.userInfo = res.data.MemberArray;
 					this.$set(this, 'userInfo', res.data.MemberArray);
@@ -160,7 +179,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .mine {
-	min-height: calc(calc(100vh - var(--window-top)) - 50px);
+	min-height: calc(calc(100vh - var(--window-top)));
 	background: #ECECEC;
     .mine-top {
 		// width: 100%;
@@ -189,10 +208,11 @@ export default {
 						border-radius: 13rpx;
 						align-items: center;
 						padding: 0 17rpx 0 10rpx;
-						> img {
+						> image {
 							margin-right: 9rpx;
 							width: 20rpx;
 							height: 22rpx;
+							flex-shrink: 0;
 						}
 						.rank-title {
 							font-size: 16rpx;
@@ -228,8 +248,10 @@ export default {
 			box-sizing: border-box;
 			padding: 0 30rpx;
 			display: flex;
-			justify-content: space-between;
+			justify-content: space-around;
+			// justify-content: flex-start;
 			> view {
+				margin-right: 80rpx;
 				text-align: center;
 				font-size: 24rpx;
 				color:rgba(51,51,51,1);
@@ -240,7 +262,13 @@ export default {
 		}
 	}
 	.mine-container {
-		@mixin common-mine($content-padding-top, $content-padding-bottom, $image-height) {
+		@mixin image-size($image-width, $image-height) {
+			> image {
+				width: $image-width !important;
+				height: $image-height !important;
+			}
+		}
+		@mixin common-mine($content-padding-top, $content-padding-bottom, $image-width, $image-height) {
 			box-sizing: border-box;
 			width: 690rpx;
 			background: rgba(255,255,255,1);
@@ -270,9 +298,11 @@ export default {
 				display: flex;
 				> view {
 					text-align: center;
-					> img {
+					> image {
+						width: $image-width;
 						height: $image-height;
 						margin-bottom: 15rpx;
+						flex-shrink: 0;
 					}
 					> view {
 						font-size: 22rpx;
@@ -285,31 +315,50 @@ export default {
 			@include common-mine(
 				$content-padding-top: 22rpx, 
 				$content-padding-bottom: 30rpx, 
-				$image-height: 36rpx
+				$image-height: 36rpx,
+				$image-width: 36rpx
 			);
 			.title {
 				justify-content: space-between;
 				.more {
 					display: flex;
 					align-items: center;
-					> img {
+					> image {
+						width: 19rpx;
 						height: 19rpx;
 						margin-left: 10rpx;
+						flex-shrink: 0;
 					}
 				}
 			}
 			.content {
 				justify-content: space-between;
-				> view {
-					text-align: center;
-				};
+				> view:nth-child(1){
+					@include image-size($image-width: 33rpx, $image-height: 36rpx);
+				}
+				> view:nth-child(2){
+					@include image-size($image-width: 38rpx, $image-height: 32rpx);
+				}
+				> view:nth-child(3){
+					@include image-size($image-width: 41rpx, $image-height: 33rpx);
+				}
+				> view:nth-child(4){
+					@include image-size($image-width: 40rpx, $image-height: 35rpx);
+				}
+				> view:nth-child(5){
+					@include image-size($image-width: 37rpx, $image-height: 37rpx);
+				}
+				> view:nth-child(6){
+					@include image-size($image-width: 33rpx, $image-height: 35rpx);
+				}
 			}
 		} 
 		.tool {
 			@include common-mine(
 				$content-padding-top: 8rpx,
 				$content-padding-bottom: 25rpx, 
-				$image-height: 71rpx
+				$image-height: 71rpx,
+				$image-width: 71rpx
 			);
 			.content {
 				> view:not(:last-child) {
@@ -321,7 +370,8 @@ export default {
 			@include common-mine(
 				$content-padding-top: 8rpx, 
 				$content-padding-bottom: 48rpx, 
-				$image-height: 71rpx
+				$image-height: 71rpx,
+				$image-width: 71rpx
 			);
 			.content {
 				> view:not(:last-child) {

pages/shop/index.vue

@@ -1,4 +1,6 @@
 <template>
+	<view>
+		<view class="status_bar"></view>
 		<scroll-view class="shop" scroll-y @scrolltolower="onreachBottom">
 			<view class="top">
 				<image src="/static/image/shop/1.png" class="local"></image>
@@ -7,11 +9,13 @@
 					<image src="/static/image/shop/2.png"></image>
 				</view>
 				<view @click="sousuo">
-                <u-search placeholder="" v-model="keyword" :show-action="false" bg-color="#fff" border-color="#999999" :disabled="true"></u-search>
+					<u-search placeholder="输入您喜欢的宝贝" v-model="keyword" :show-action="false" bg-color="#fff" border-color="#999999" :disabled="true"></u-search>
 				</view>
 				<image src="/static/image/shop/3.png" class="mnue" @click="toClassifyPage"></image>
 			</view>
+			<view class="swiper-image">
 				<u-swiper :list="list" mode="dot" @click="clickImage"></u-swiper>
+			</view>
 			<view class="chengnuo">
 				<view>
 					<image src="/static/image/shop/4.png"></image>
@@ -31,41 +35,39 @@
 				</view>
 			</view>
 			<view class="fenlei">
-            <shopitem v-for="item in goodsClassify" :key="item.gc_id" :info="item" class="item"></shopitem>
+				<shopitem v-for="item in goodsClassify" :key="item.gc_id" :info="item"></shopitem>
 			</view>
-        <view class="hr" style="margin-top:80rpx"></view>
 			<!-- 秒杀 -->
 			<recommend v-if="JSON.stringify(recommendedSpike) != '{}'" :recommendData="recommendedSpike" type="spike"></recommend>
-        <view v-if="JSON.stringify(recommendedSpike) != '{}'" class="hr" style="margin-top:40rpx"></view>
 			<!-- 秒杀列表 -->
 			<seckill v-if="spikeList.length" :list="spikeList" :time="seckillTime"></seckill>
-        <view v-if="spikeList.length" class="hr" style="margin-top:40rpx"></view>
 			<!-- 拼团推荐 -->
 			<pintuan v-if="JSON.stringify(pinTuanPush) != '{}'" :recommendData="pinTuanPush"></pintuan>
-        <view class="hr" style="margin-top:40rpx" v-if="JSON.stringify(pinTuanPush) != '{}'"></view>
 			<!-- 拼团列表 -->
-        <group :groupList="pinTuanList" :classifyList="couponGroupList"></group>
-        <image class="lingquan"></image>
+			<group></group>
+			<view class="activity-view">
+				<image class="lingquan" :src="activityInfo.adv_code" @click="activityLink({ type: activityInfo.url_type, id: activityInfo.info_id })"></image>
+			</view>
 			<youhq></youhq>
-        <view class="hr" style="margin-top:40rpx"></view>
 			<list ref="recommendGoods"></list>
 			<view class="cart" @click="toCartPage">
 				<image src="/static/image/common/3.png"></image>
 			</view>
-		<u-picker mode="region" :params="areaParams" v-model="chooseArea" @confirm="setArea"></u-picker>
+			<u-picker mode="selector" :range="areaList" v-model="chooseArea" range-key="area_name" @confirm="setArea"></u-picker>
 		</scroll-view>
+	</view>
 </template>
 <script>
-import shopitem from "@/components/shop/shop-item/index"
-import recommend from "@/components/shop/recommend/index"
-import pintuan from "@/components/shop/recommend/pintuan"
-import seckill from "@/components/shop/seckill/index"
-import group from "@/components/shop/group/index"
-import youhq from "@/components/shop/youhq/index"
-import list from "../../components/shop/list/index"
-export default {
-    name:"shop",
-    components:{
+	import shopitem from "@/components/shop/shop-item/index";
+	import recommend from "@/components/shop/recommend/index";
+	import pintuan from "@/components/shop/recommend/pintuan";
+	import seckill from "@/components/shop/seckill/index";
+	import group from "@/components/shop/group/index";
+	import youhq from "@/components/shop/youhq/index";
+	import list from "@/components/shop/list/index";
+	export default {
+		name: "shop",
+		components: {
 			shopitem,
 			recommend,
 			seckill,
@@ -74,45 +76,65 @@ export default {
 			list,
 			pintuan
 		},
-    data(){
+		data() {
 			return {
 				area: "请选择",
 				chooseArea: false,
-			areaParams: {
-				province: true,
-				city: true,
-				area: false
-			},
-            keyword:"",
-			list:[],
+				keyword: "",
+				list: [],
 				goodsClassify: [], // 商品分类
-			classifyList: [],
+				// classifyList: [],
 				recommendedSpike: {}, // 秒杀推荐
 				spikeList: [], // 全部秒杀列表
 				seckillTime: {}, // 秒杀时间
-			couponGroupList: [], // 优惠券拼团分类
-			pinTuanList: [], // 拼团商品
+				// couponGroupList: [], // 优惠券拼团分类
 				pinTuanPush: {}, // 拼团推荐
+				activityInfo: {},
+				areaList: [], // 位置信息
 			}
 		},
 		onLoad() {
 			this.getShopTopList();
+			this.getLocation(); // 获取定位
+			this.getStoreActivity();
+			// this.area = uni.getStorageSync("address") || "请选择";
 		},
 		onShow() {
 			this.getRecommendedSpike();
 			this.getSpikeList();
-		this.getGoodsClass();
 			this.getPinTuanPush();
+			this.getAllLoaction(); // 获取位置
 		},
 		methods: {
-        sousuo(){
+			sousuo() {
 				// console.log(123)
 				this.$u.route({
-                url:"pageB/search/index"
+					url: "pageB/search/index"
+				})
+			},
+			// 获取定位
+			getLocation() {
+				uni.getLocation({
+					type: 'wgs84',
+					geocode: true,
+					success: (res) => {
+						// console.log(res.address);
+						this.area = res.address.city;
+					},
+					fail: (e) => {
+						console.log(e);
+					}
+				});
+			},
+			// 获取位置
+			getAllLoaction() {
+				this.$u.api.getAreaList({pid: 0}).then(res => {
+					// console.log(res);
+					this.areaList = res.data;
 				})
 			},
 			getShopTopList() {
-			this.$u.api.getShopTopList().then((res)=>{
+				this.$u.api.getShopTopList().then((res) => {
 					if (res.errCode == 0) {
 						let temp = [];
 						res.data.banner.forEach(item => {
@@ -129,31 +151,24 @@ export default {
 			},
 			getRecommendedSpike() {
 				this.$u.api.recommendedSpike().then(res => {
-				if(res.errCode == 0) this.recommendedSpike = res.data;
+					if (res.errCode == 0) this.recommendedSpike = res.data;
 					// console.log(this.recommendedSpike);
 				})
 			},
 			// 拼团推荐
 			getPinTuanPush() {
 				this.$u.api.getPinTuanPush().then(res => {
-				if(res.errCode == 0) {
+					if (res.errCode == 0) {
 						this.pinTuanPush = res.data;
 					}
 				})
 			},
-		// 获取优惠券拼团分类
-		getGoodsClass() {
-			this.$u.api.getGoodsClass().then(res => {
-				if(res.errCode == 0) {
-					this.couponGroupList = res.data;
-					this.getPinTuanList(this.couponGroupList[0].gc_id);
-				}
-			})
-		},
 			// 全部秒杀
 			getSpikeList() {
-			this.$u.api.getSpikeList({ page: 0 }).then(res => {
-				if(res.errCode == 0) {
+				this.$u.api.getSpikeList({
+					page: 0
+				}).then(res => {
+					if (res.errCode == 0) {
 						this.spikeList = res.data.list;
 						this.seckillTime = {
 							bigHour: res.data.bigHour,
@@ -162,15 +177,6 @@ export default {
 					}
 				})
 			},
-		// 拼团列表
-		getPinTuanList(id) {
-			this.$u.api.getPinTuanList({
-				page: 0,
-				gc_id: id,
-			}).then(res => {
-				this.pinTuanList = res.data;
-			})
-		},
 			clickImage(index) {
 				console.log(index);
 				console.log(this.list[index]);
@@ -180,8 +186,8 @@ export default {
 				this.$refs.recommendGoods.loadMore();
 			},
 			setArea(e) {
-			// console.log(e);
-			this.area = e.city.label;
+				console.log(e);
+				this.area = this.areaList[e[0]].area_name;
 			},
 			toCartPage() {
 				uni.navigateTo({
@@ -193,25 +199,55 @@ export default {
 					url: '/pageC/classify/index'
 				});
 			},
+			getStoreActivity() {
+				this.$u.api.getStoreActivity().then(res => {
+					if(res.errCode == 0) {
+						this.activityInfo = res.data;
+					}
+				})
 			},
-}
+			activityLink({ type, id }) {
+				if(type == 0 || type == 2) return false;
+				// type 1 商品详情页, 2 店铺详情页
+				const url = type == 1 ? 'pageB/sdetails/index' : '';
+				let params = { id: id };
+				// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
+				if(type == 1) Object.assign(params, { type: 1 });
+				this.$u.route({
+					url: url,
+					params: params
+				})
+			},
+		},
+	}
 </script>
 <style lang="scss" scoped>
-.shop {
+	.shop {
 		height: calc(100vh - var(--window-top));
 		box-sizing: border-box;
-    padding: 0 33rpx 100rpx;
-    .top{
+		background-color: #F0EDF1;
+
+		.top {
+			padding: 0 30rpx;
+			background-color: #ffffff;
 			width: 100%;
 			height: 88rpx;
 			display: flex;
 			align-items: center;
-        .local{
+			justify-content: space-between;
+
+			.local {
 				width: 31rpx;
 				height: 37rpx;
 			}
 		}
-    .add{
+
+		.swiper-image {
+			background-color: #ffffff;
+			padding: 0 30rpx;
+		}
+
+		.add {
 			width: 115rpx;
 			height: 25rpx;
 			display: flex;
@@ -221,63 +257,66 @@ export default {
 			align-items: center;
 			margin-left: 14rpx;
 			margin-right: 37rpx;
-		> text {
+
+			>text {
 				width: 80rpx;
 			}
-        >image{
+
+			>image {
 				width: 24rpx;
 				height: 15rpx;
 			}
 		}
-    .mnue{
+
+		.mnue {
+			background-color: #ffffff;
 			width: 35rpx;
 			height: 26rpx;
 			margin-left: 36rpx;
 		}
-    .chengnuo{
+
+		.chengnuo {
+			padding: 30rpx;
+			background-color: #ffffff;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
-        margin-top: 24rpx;
-        >view{
+
+			>view {
 				display: flex;
 				align-items: center;
-            >image{
+
+				>image {
 					width: 23rpx;
 					height: 23rpx;
 				}
-            >text{
+
+				>text {
 					font-size: 22rpx;
 					color: #999;
 					margin-left: 8rpx;
 				}
 			}
 		}
-    .fenlei{
+
+		.fenlei {
 			display: flex;
-        // justify-content: space-between;
-        margin-top: 30rpx;
 			flex-wrap: wrap;
-		> view {
-			margin-bottom: 30rpx;
-			&:not(:nth-child(5n)) {
-				margin-right: 70rpx;
+      padding: 30rpx;
+			margin-bottom: 20rpx;
+			background-color: #ffffff;
 		}
-		}
-    }
-    .hr{
-        width: 750rpx;
-        margin-left: -33rpx;
-        height: 20rpx;
+
+		.activity-view {
+			padding: 20rpx 30rpx;
+			text-align: center;
+			.lingquan {
 				background-color: #ececec;
+				width: 688rpx;
+				height: 138rpx;
 			}
-    .lingquan{
-        width: 750rpx;
-        height: 177rpx;
-        margin-left: -33rpx;
-        margin-top: 29rpx;
-        background-color: #ececec;
 		}
+
 		.cart {
 			z-index: 9;
 			position: fixed;
@@ -286,15 +325,16 @@ export default {
 			width: 100rpx;
 			height: 100rpx;
 			background: rgba(253, 211, 96, 1);
-		box-shadow: 0rpx 10rpx 6rpx 0rpx rgba(253,211,96,0.34);
+			box-shadow: 0rpx 10rpx 6rpx 0rpx rgba(253, 211, 96, 0.34);
 			border-radius: 50%;
 			display: flex;
 			align-items: center;
 			justify-content: center;
-		> image {
+
+			>image {
 				width: 56rpx;
 				height: 54rpx;
 			}
 		}
-}  
+	}
 </style>

pages/zhibo/index.nvue

@@ -0,0 +1,543 @@
+<template>
+  <view>
+    <video :src="url" class="vodio" autoplay="true" :show-fullscreen-btn="false" :show-play-btn="false" :enable-progress-gesture="false" :show-center-play-btn="false" :show-progress="false" :controls="false" :style="{'height':height}">
+
+    </video>
+    <view class="user" :style="{'top': top}">
+      <view class="back"></view>
+      <image class="head" :src="info.member_avatar"></image>
+      <view class="userinfo">
+        <text class="name">{{info.member_nickname}}</text>
+        <text class="info">{{info.live_desc}}</text>
+      </view>
+      <view class="guanzhu" @click="guanzhu"><text style="color:#fff;font-size:24rpx">{{info.is_attention == 1 ? '已关注' : '关注'}}</text></view>
+    </view>
+    <view class="userlist" :style="{'top': top + 10 * rpx}">
+        <image class="userlistitem" v-for="(i,j) in room.onlineUsers.users.slice(0,3)" :src="i.avatar" :style="{'right': (-j * 15 * rpx) + 'px'}" :key="j"></image>
+    </view>
+    <view class="hot" :style="{'top': top + 10 * rpx}">
+      <text class="hottext">{{room.onlineUsers.users.length}}</text>
+    </view>
+    <image class="cart" src="../../static/cart.png" @click="show = true">
+
+    </image>
+    <view class="danmufasongbox" @click="danmu = true">
+      <view class="danmufasongboxback"></view>
+      <image src="../../static/danmu.png" class="danmubianji"></image>
+      <text style="font-size:26rpx;color:#fff;margin-left:20rpx">想说点什么</text>
+    </view>
+    <image class="liketap" src="../../static/like.png" @click="">
+
+    <view class="danmuinputbox" v-if="danmu">
+      <input type="text" focus="true" style="width:600rpx;margin-left:30rpx;font-size:26rpx" maxlength="20" @blur="danmu=false" v-model="danmutext">
+      <view class="danmufasong" @click="sendMessage(room.MessageType.CHAT,danmutext)">
+        <text style="font-size:24rpx;color:#fff">发送</text>
+      </view>
+    </view>
+    <div class="danmulist">
+        <text class="danmuitem" v-for="(i,j) in danmulist" :key="j">{{i.senderNickname}}:{{i.content}}</text>
+        
+    </div>
+    <image class="closeimg" src="../../static/close.png" :style="{'top': top + 30 * rpx}" @click="back"></image>
+    </image>
+      <div class="bottom" :style="{'height':height + 'px'}" v-if="show" @click="show = false">
+        <div class="tanchuceng" @click="zuzhi">
+          <div class="heads">
+              <div style="flex-direction: row;align-items:center">
+                  <text class="title">全部商品</text>
+                  <text class="num">{{list.length}}件</text>
+              </div>
+              <!-- <div class="add">
+                  <text style="font-size:28rpx;color: #fff;text-align:center">添加/管理商品</text>
+              </div> -->
+          </div>
+          <list class="list">
+            <cell class="item" v-for="(i,j) in list" :key="j" @click="xuanzhong(j)">
+                <image class="shopimg" :src="i.goods_image"></image>
+                <div class="infos">
+                  <div>
+                      <text style="font-size:26rpx;colro:#333;margin-top:12rpx;lines:1;text-overflow:ellipsis">{{i.goods_name}}</text>
+                      <text style="font-size:24rpx;color:#333;margin-top:14rpx;lines:1;text-overflow:ellipsis">{{i.goods_advword}}</text>
+                  </div>
+                  <div style="flex-direction: row; align-items: flex-end;">
+                      <text style="font-size:28rpx;color:#FF3131">￥{{i.goods_price}}</text>
+                      <text style="font-size:26rpx;color:#999">￥{{i.goods_marketprice}}</text>
+                  </div>
+                </div>
+                    <!-- <image :src="'../../static/image/release/' + (i.putaway == 1 ? 'on' : 'off') + '.png'" style="width:55rpx;height:35rpx;margin-top:120rpx;margin-left:150rpx"></image> -->
+            </cell>
+          </list>
+        </div>
+        
+    </div>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+.vodio{
+  width: 750rpx;
+}
+.infos{
+    height: 160rpx;
+    justify-content: space-between;
+    margin-left: 10rpx;
+    width: 404rpx;
+}
+.shopimg{
+    width: 160rpx;
+    height: 160rpx;
+    background-color: #0f0;
+    
+
+}
+.heads{
+    width: 750rpx;
+    height: 88rpx;
+    border-bottom-width: 2rpx;
+    border-style: solid;
+    border-color: #ECECEC;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+}
+.title{
+    font-size: 30rpx;
+    color:#333;
+    margin-left: 30rpx;
+}
+.tanchuceng{
+    width: 750rpx;
+    height: 782rpx;
+    position: fixed;
+    bottom: 0;
+    border-top-left-radius:20rpx;
+    border-top-left-radius:20rpx;
+    background-color: #fff;
+    transition: bottom 0.5s;
+    z-index: 20;
+    
+}
+.item{
+    width: 690rpx;
+    height: 200rpx;
+     border-bottom-width: 2rpx;
+    border-style: solid;
+    border-color: #ECECEC;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+.list{
+    width: 750rpx;
+    height: 694rpx;
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+}
+.add{
+    width: 221rpx;
+    height: 40rpx;
+    background-color: #FF780F;
+    border-radius: 20rpx;
+    justify-content: center;
+    margin-right: 30rpx;
+}
+.num{
+    font-size: 26rpx;
+    color: #FF3131;
+    margin-left: 30rpx;
+}
+.bottom{
+    width: 750rpx;
+    position: fixed;
+    top:0;
+    z-index: 10;
+}
+.cart{
+  width: 50rpx;
+  height: 46rpx;
+  position: fixed;
+  bottom: 36rpx;
+  right: 154rpx;
+}
+.hottext{
+  font-size: 20rpx;
+  color: #fff;
+}
+.hot{
+  width: 60rpx;
+  height: 60rpx;
+  background-color: rgb(104, 104, 104);
+  position: fixed;
+  border-radius: 30rpx;
+  right: 86rpx;
+  align-items: center;
+  justify-content: center;
+}
+.userlistitem{
+    width: 60rpx;
+    height: 60rpx;
+    position: relative;
+    border-radius: 30rpx;
+}
+.userlist{
+    display: flex;
+    flex-direction: row-reverse;
+    width: 150rpx; 
+    height: 60rpx;
+    position: fixed;
+    right: 156rpx;
+
+}
+.name {
+  font-size: 24rpx;
+  color: #fff;
+  lines: 1;
+  text-overflow: ellipsis;
+}
+.info {
+  font-size: 20rpx;
+  color: #fff;
+  margin-top: 6rpx;
+  lines: 1;
+  text-overflow: ellipsis;
+}
+.userinfo {
+  display: flex;
+  flex-direction: column;
+  width: 100rpx;
+  margin-left: 20rpx;
+
+}
+.guanzhu {
+  width: 100rpx;
+  height: 50rpx;
+  background-color: #ff780f;
+  border-radius: 25rpx;
+  margin-left: 10rpx;
+  align-items: center;
+  justify-content: center;
+}
+.head {
+  width: 70rpx;
+  height: 70rpx;
+  border-radius: 35rpx;
+}
+.back {
+  position: absolute;
+  top: 0;
+  left: 0;
+  background-color: #000;
+  opacity: 0.2;
+  width: 308rpx;
+  height: 70rpx;
+  border-radius: 35rpx;
+}
+.user {
+  position: fixed;
+  left: 30rpx;
+  width: 308rpx;
+  height: 70rpx;
+  display: flex;
+  align-items: center;
+  border-radius: 35rpx;
+  overflow: hidden;
+  flex-direction: row;
+}
+.video {
+  width: 750rpx;
+}
+.liketap{
+  width: 55rpx;
+  height: 57rpx;
+  position: fixed;
+  bottom: 30rpx;
+  right: 54rpx;
+}
+.closeimg{
+  width: 31rpx;
+  height: 31rpx;
+  position: fixed;
+  right: 31rpx;
+}
+.danmufasongbox{
+  width: 308rpx;
+  height: 58rpx;
+  position: fixed;
+  left: 30rpx;
+  bottom: 30rpx;
+  flex-direction: row;
+  align-items: center;
+}
+.danmufasongboxback{
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 308rpx;
+  height: 58rpx;
+  background-color: #0f0;
+  opacity: 0.4;
+  border-radius: 29rpx;
+}
+.danmubianji{
+  width: 27rpx;
+  height: 32rpx;
+  margin-left: 20rpx;
+}
+.danmuinputbox{
+  position: fixed;
+  bottom:0;
+  height: 100rpx;
+  width: 750rpx;
+  z-index: 9999;
+  background-color: #fff;
+  flex-direction: row;
+  align-items: center;
+
+}
+.danmufasong{
+  width: 85rpx;
+  height: 51rpx;
+  background-color: #FF780F;
+  align-items: center;
+  justify-content: center;
+  border-radius: 5rpx;
+}
+.danmulist{
+    position: fixed;
+    left: 30rpx;
+    bottom: 118rpx;
+}
+.danmuitem{
+    font-size: 26rpx;
+    color: #fff;
+    flex-direction: column-reverse;
+}
+</style>
+
+<script>
+const ChatRoomService =require('../../static/chatservice');
+export default {
+  name: "zhibo",
+  data() {
+    return {
+      url: "",
+      top: 0,
+      height: 0,
+      rpx:0,
+      show:false,
+      list:[],
+      id:0,
+      info:{},
+      danmutext:"",
+      danmu:false,
+      room:{},
+      chatRoomService:{},
+      danmulist:[]
+    };
+  },
+  onLoad(a) {
+  
+    this.url = a.url;
+    this.id = a.id
+    console.log(this.url);
+    let that = this;
+   
+
+    uni.getSystemInfo({
+      success(a) {
+        console.log(a.windowHeight);
+        that.height = a.windowHeight;
+        // that.start()
+        that.top = a.statusBarHeight + 5;
+        that.rpx = (a.windowWidth / 750)
+        console.log(that.rpx)
+      },
+    });
+    // this.$u.api.goodsShelves({live_id:this.id}).then((res)=>{
+    //   console.log(res)
+    // })
+    const token = uni.getStorageSync('token');
+    console.log(token,that.id)
+    uni.request({
+      url:"https://dmmall.sdbairui.com/api/Specialci/goodsShelves",
+      data:{
+        live_id:that.id
+      },
+      method:"POST",
+      header:{
+        "Authorization" : 'Bearer' + " " + token
+      },
+      success(res){
+        console.log(res)
+        that.list= res.data.data
+      }
+    })
+    setInterval(function(){
+       uni.request({
+          url:"https://dmmall.sdbairui.com/api/Specialci/goodsShelves",
+          data:{
+            live_id:that.id
+          },
+          method:"POST",
+          header:{
+            "Authorization" : 'Bearer' + " " + token
+          },
+          success(res){
+            console.log(res)
+            that.list= res.data.data
+          }
+        })
+    },6 * 1000)
+    uni.request({
+      url:"https://dmmall.sdbairui.com/api/Specialci/livingUserInfo",
+      data:{
+        live_id:that.id
+      },
+      method:"POST",
+      header:{
+        "Authorization" : 'Bearer' + " " + token
+      },
+      success(res){
+        console.log(res)
+        that.info = res.data.data
+        // that.list= res.data.data
+      }
+    })
+    //当前用户
+    try {
+         uni.request({
+        url:"https://dmmall.sdbairui.com/api/Member/MemberInfo",
+        method:"POST",
+        header:{
+            'Authorization' : 'Bearer' + " " + token
+        },
+        success(res){
+          console.log(res,111)
+             var currentUser = {
+            id : res.data.data.MemberArray.member_mobile + "",
+            nickname : res.data.data.MemberArray.member_nickname,
+            avatar: res.data.data.MemberArray.member_avatar 
+          };
+
+          var room = {
+              id : a.rid + "",
+              name : a.rid + ""
+          };
+          console.log(room,currentUser)
+          //构造chatRoomService
+            that.chatRoomService = new ChatRoomService(room, currentUser);
+
+            that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
+            that.chatRoomService.connectGoEasyIM();
+
+			//获取当前聊天室数据
+            that.room = that.chatRoomService.room;
+            setTimeout(function() {
+              that.chatRoomService.quitRoom();
+              that.chatRoomService = {}
+               
+            }, 1000);
+            setTimeout(function(){
+              that.chatRoomService = new ChatRoomService(room, currentUser);
+
+            that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
+            that.chatRoomService.connectGoEasyIM();
+
+			//获取当前聊天室数据
+            that.room = that.chatRoomService.room;
+            console.log(that.room.onlineUsers)
+            }, 2000);
+        }
+      })
+    } catch (error) {
+      console.log("错误")
+    }
+  
+     
+  },
+  	onBackPress () {//返回取消订阅
+			//断开连接
+			this.chatRoomService.quitRoom();
+		},
+		beforeDestroy () {
+			this.chatRoomService.quitRoom();
+		},
+  methods:{
+    sendMessage (messageType, content) {//发送消息
+    console.log(123)
+				if(content == "" && messageType == 0) return;
+				var message = {
+					senderNickname : this.room.currentUser.nickname ,
+					type : messageType,
+					content : content
+				}
+				this.chatRoomService.sendMessages(this.room.id, message);
+				this.danmutext = ""
+			},
+    whenNewMessage (message) {//新消息监听
+      // if(message.type == this.room.MessageType.PROP){
+      // 	this.propAnimation(parseInt(message.content))
+      // }
+      // setTimeout(() => {
+      // 	this.contentPosition = 'message-box'+(this.room.messages.length-1);
+              // }, 300)
+      console.log(message)
+              this.danmulist.push(message)
+
+              if(this.danmulist.length > 7){
+                  this.danmulist = this.danmulist.slice(this.danmulist.length - 7)
+              }
+    },
+    back(){
+      uni.navigateBack({
+          delta: 1
+      });
+    },
+    guanzhu(){
+      const token = uni.getStorageSync('token');
+      let that = this
+      console.log(token)
+      uni.request({
+        url:"https://dmmall.sdbairui.com/api/member/attentionMember",
+        data:{
+          member_id:that.info.user_id
+        },
+        method:"POST",
+        header:{
+          "Authorization" : 'Bearer' + " " + token
+        },
+        success(res){
+          console.log(res)
+          uni.request({
+            url:"https://dmmall.sdbairui.com/api/Specialci/livingUserInfo",
+            data:{
+              live_id:that.id
+            },
+            method:"POST",
+            header:{
+              "Authorization" : 'Bearer' + " " + token
+            },
+            success(res){
+              console.log(res)
+              that.info = res.data.data
+              // that.list= res.data.data
+            }
+          })
+          // that.list= res.data.data
+        }
+      })
+    },
+    xuanzhong(i){
+      let that = this
+      uni.navigateTo({
+          url: `/pageB/sdetails/index?id=${that.list[i].goods_id}&type=1`
+      });
+
+    },
+    zuzhi(event){
+      event.stopPropagation();  
+    },
+  }
+};
+</script>

static/chatservice.js

@@ -0,0 +1,276 @@
+/*
+ * @Author: jack.lu
+ * @Date: 2020-4-21 10:10:20
+ * @Last Modified by: jack.lu
+ * @Last Modified time: 2020-4-21 15:01:41
+ */
+
+
+import GoEasyIM from './goeasy-im-1.0.9.js'
+
+//用户
+function User(id, nickname, avatar) {
+    this.id = id;
+    this.nickname = nickname;
+    this.avatar = avatar;
+}
+
+//消息
+function Message(senderUserId, senderNickname, content, type) {
+    this.senderNickname = senderNickname;
+    this.senderUserId = senderUserId;
+    this.content = content;
+    this.type = type
+}
+
+//聊天室
+function Room(id, name, currentUser) {
+
+    this.id = id;
+    this.name = name;
+    this.currentUser = currentUser;
+
+    this.onlineUsers = {
+        count: 0,
+        users: []
+    };
+
+    this.messages = [];
+
+    this.MessageType = {
+        CHAT: 0,//文字聊天
+        PROP: 1//道具
+    };
+
+    this.Prop = {
+        HEART: 0,//桃心
+        ROCKET: 1//火箭
+    };
+}
+
+function ChatRoomService(room, user) {
+    this.room = new Room(room.id, room.name, user);
+    this.whenNewMessage = function () {
+
+    };
+    this.whenOnlineUserChange = function () {
+
+    };
+
+}
+
+//获取实例
+ChatRoomService.prototype.connectGoEasyIM = function () {
+    this.im = GoEasyIM.getInstance({
+        appkey: 'BC-453aa755c4ea48148abefc55a86df283',
+        host: 'hangzhou.goeasy.io'
+    });
+
+    //监听网络连接成功
+    this.im.on(GoEasyIM.EVENT.CONNECTED, () => {
+        console.log('GoEasyIM网络连接成功');
+        //连接成功后，更新在线用户数和用户头像
+        this.initialOnlineUsers(this.room.id);
+    });
+
+    //监听网络连接断开
+    this.im.on(GoEasyIM.EVENT.DISCONNECTED, () => {
+        console.log('GoEasyIM网络断开')
+    });
+
+    //监听上下线提醒
+    this.listenerGroupPresence();
+
+    //监听新消息
+    this.listenerNewMessage();
+
+    var currentUser = this.room.currentUser;
+    //连接GoEasyIM
+    this.im.connect({
+        id: currentUser.id,
+        data: {
+            avatar: currentUser.avatar,
+            nickname: currentUser.nickname
+        }
+    }).then(() => {
+        console.log('连接成功');
+        this.initialChatHistory(this.room.id);
+
+        //订阅用户上下线事件
+        this.subscribePresence(this.room.id);
+        //订阅聊天室消息
+        this.subscribeRoomMessage(this.room.id);
+
+
+    }).catch(e => {
+        console.log(e);
+        console.log('连接失败');
+    });
+};
+
+ChatRoomService.prototype.initialWhenNewMessage = function (whenNewMessage) {
+    this.whenNewMessage = whenNewMessage;
+};
+
+ChatRoomService.prototype.initialWhenOnlineUserChange = function (whenOnlineUserChange) {
+    this.whenOnlineUserChange = whenOnlineUserChange;
+};
+
+
+//监听新消息
+ChatRoomService.prototype.listenerNewMessage = function () {
+
+    this.im.on(GoEasyIM.EVENT.GROUP_MESSAGE_RECEIVED, (message) => {
+		var content = JSON.parse(message.payload.text);
+        this.addNewMessage(message);
+        this.whenNewMessage(content);
+    })
+}
+
+ChatRoomService.prototype.addNewMessage = function (message) {
+    var content = JSON.parse(message.payload.text);
+    let messageContent = "";
+    //聊天消息
+    if (content.type == this.room.MessageType.CHAT) {
+        messageContent = content.content;
+    }
+    //道具消息
+    if (content.type == this.room.MessageType.PROP) {
+        if (content.content == this.room.Prop.ROCKET) {
+            messageContent = "送出了一枚大火箭";
+        }
+        if (content.content == this.room.Prop.HEART) {
+            messageContent = "送出了一个大大的比心";
+        }
+    }
+    //添加消息
+    let newMessage = new Message(message.senderId, content.senderNickname, messageContent);
+    this.room.messages.push(newMessage);
+};
+
+//监听用户上下线
+ChatRoomService.prototype.listenerGroupPresence = function () {
+    this.im.on(GoEasyIM.EVENT.GROUP_PRESENCE, (event) => {
+        //更新在线用户数
+        this.room.onlineUsers.count = event.groupOnlineCount;
+
+        if (event.action == 'join' || event.action == 'online') {
+            let userData = JSON.parse(event.userData);
+            //添加新用户
+            let user = new User(event.userId, userData.nickname, userData.avatar);
+
+            //添加在线用户，避免用户重复
+            if (!this.room.onlineUsers.users.find(item => item.id == event.userId)) {
+                this.room.onlineUsers.users.push(user);
+            }
+
+            //添加进入房间的消息
+            let message = new Message(event.userId, userData.nickname, " 进入房间", this.room.MessageType.CHAT);
+            this.room.messages.push(message);
+        } else {
+            let offlineUserIndex = this.room.onlineUsers.users.findIndex(item => item.id == event.userId);
+            if (offlineUserIndex > -1) {
+                //将离开的用户从onlineUsers中删掉
+                let offlineUser = Object.assign(this.room.onlineUsers.users[offlineUserIndex]);
+                this.room.onlineUsers.users.splice(offlineUserIndex, 1);
+                //添加离开消息
+                let message = new Message(offlineUser.id, offlineUser.nickname, " 离开房间", this.room.MessageType.CHAT)
+                this.room.messages.push(message);
+            }
+        }
+        this.whenOnlineUserChange(this.room.onlineUsers);
+    })
+};
+
+//查询和初始化在线用户列表和在线用户数
+ChatRoomService.prototype.initialOnlineUsers = function (roomId) {
+    let self = this;
+
+    //查询最新上线的用户列表
+    this.im.groupHereNow(roomId)
+        .then(result => {
+            if (result.code == 200) {
+                let users = [];
+                result.content && result.content.map(function (onlineUser) {
+                    let userData = JSON.parse(onlineUser.userData);
+                    let user = new User(onlineUser.userId, userData.nickname, userData.avatar);
+                    users.push(user);
+                });
+                self.room.onlineUsers = {
+                    users: users
+                };
+            }
+        }).catch(e => {
+        if (e.code == 401) {
+            console.log("您还没有开通用户在线状态提醒，登录goeasy->我的应用->查看详情->高级功能，自助开通.");
+        } else {
+            console.log(e);
+        }
+    });
+    //获取聊天室在线用户数
+    this.im.groupOnlineCount(roomId)
+        .then(result => {
+            this.room.onlineUsers.count = result.content.onlineCount;
+        }).catch(e => {
+        console.log(e)
+    })
+};
+
+//订阅聊天室成员上下线
+ChatRoomService.prototype.subscribePresence = function (roomId) {
+    this.im.subscribeGroupPresence([roomId])
+        .then(() => {
+            console.log('成员上下线订阅成功')
+        }).catch(e => {
+        console.log(e)
+    })
+}
+
+//订阅聊天室消息
+ChatRoomService.prototype.subscribeRoomMessage = function (roomId) {
+    this.im.subscribeGroup([roomId])
+        .then(result => {
+            console.log('消息订阅成功')
+        }).catch(e => {
+        console.log(e)
+    })
+}
+
+//历史消息
+ChatRoomService.prototype.initialChatHistory = function (roomId) {
+    var self = this;
+    this.im.history({
+        groupId: roomId
+    }).then(res => {
+        res.content.forEach(function (message) {
+            self.addNewMessage(message);
+        })
+    }).catch(function (error) {
+        if (error.code == 401) {
+            console.log("您还没有开通历史消息的权限，登录goeasy->我的应用->查看详情->高级功能，自助开通.");
+        } else {
+            console.log(error);
+        }
+    })
+};
+
+//发送消息
+ChatRoomService.prototype.sendMessages = function (roomId, content) {
+	var contentMessage = {
+		text: JSON.stringify(content)
+	};
+	let message = this.im.createTextMessage(contentMessage);
+    this.im.sendGroupMessage(roomId, message)
+        .then(() => {
+            console.log('消息发送成功')
+        }).catch(e => {
+        console.log(e);
+    })
+};
+
+//退出聊天室
+ChatRoomService.prototype.quitRoom = function (roomId) {
+    this.im.disconnect()
+};
+
+module.exports = ChatRoomService;