更换

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

App.vue

@@ -8,6 +8,12 @@
 				...mapState(["hasLogin"])
 		},
 		onLaunch() {
+            // 禁止旋转
+            // #ifdef APP-PLUS
+            plus.screen.lockOrientation('portrait-primary');
+            // #endif
+            
+            
 			getApp().globalData.im = this.imService
 			// 缓存token
 			uni.getStorage({
@@ -29,6 +35,12 @@
 		},
 		onShow(){
 			// this.getVersion();
+			// console.log(this.$u.os())
+			let device_type = this.$u.os()
+			console.log({appversion:this.$app_version,device_type})
+			this.$u.api.recordAppOpenTimes({appversion:this.$app_version,device_type}).then((res)=>{
+				console.log(JSON.stringify(res))
+			});
 		},
 		onLoad() {
 			

common/api/shop.js

@@ -139,17 +139,9 @@ export default {
 				});
 			},
 			// 订单步骤2：发起订单，返回订单信息
-			sendOrder({ ifcart, cart_id, address_id, buy_city_id, pintuan_id, pintuangroup_id, voucher_id, is_selfraising, invoice_id }) {
+			sendOrder({ ifcart, cart_id, address_id, buy_city_id, pintuan_id, pintuangroup_id, voucher_id, member_deliver_type, invoice_id, pay_message }) {
 				return vm.$u.post('buy/buy_step2', {
-					ifcart: ifcart,
+					ifcart, cart_id, address_id, buy_city_id, pintuan_id, pintuangroup_id, voucher_id, member_deliver_type, invoice_id, pay_message
-					cart_id: cart_id,
-					address_id: address_id,
-					buy_city_id: buy_city_id,
-					pintuan_id: pintuan_id,
-					pintuangroup_id: pintuangroup_id,
-					voucher_id: voucher_id, // 优惠券信息
-					is_selfraising: is_selfraising, // 是否自提
-					invoice_id: invoice_id,
 				});
 			},
 			// 订单步骤3：发起支付（第三方统一下单）
@@ -378,6 +370,16 @@ export default {
 			advClick({ adv_id }) {
 				return vm.$u.post('adv/advClick',{ adv_id })
 			},
+			//统计登录
+			recordAppOpenTimes({appversion,device_type}){
+				// appversion=1.0.0&device_type=android/ios
+				return vm.$u.post("Member/recordAppOpenTimes",{appversion,device_type})
+			},
+			//统计直播间浏览次数
+			// https://mall.dmygkeji.com/api/Live/countLiveBrowse?live_id=1
+			countLiveBrowse({live_id}){
+				return vm.$u.post("Live/countLiveBrowse",{live_id})
+			}
       }
     }
     

common/api/user.js

@@ -154,10 +154,11 @@ export default {
 				});
 			},
 			// 美甲-提交订单
-			addManicure({ name, time }) {
+			addManicure({ name, phone,  time }) {
 				return vm.$u.post('MemberManicure/addManicure', {
 					name: name,
-					time: time
+					phone: phone,
+					// time: time
 				});
 			},
 			// 会员服务-积分数
@@ -375,10 +376,9 @@ export default {
 				return vm.$u.post('member/getClothesTypeList');
 			},
 			// 送洗评价
-			sendOrderComment({ id, comment }) {
+			sendOrderComment({ id, comment, comment_img }) {
 				return vm.$u.post('member/sendOrderComment', {
-					id: id,
+					id, comment, comment_img
-					comment: comment,
 				});
 			},
 			// 送洗确认完成
@@ -475,9 +475,9 @@ export default {
 				return vm.$u.post("Expertapply/hobbyList")
 			},
 			// 达人申请
-			applyExpert({ name, mobile, address, industry, hobby }) {
+			applyExpert({ name, mobile, idcard, address, industry, hobby }) {
 				return vm.$u.post("Expertapply/expertApply", {
-					name, mobile, address, industry, hobby
+					name, mobile, idcard, address, industry, hobby
 				})
 			},
 			getInvoiceList() {

components/comment/index.vue

@@ -9,7 +9,7 @@
 			<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" @click="previewImage(content.geval_image, index)"></image>
+			<image :src="src" v-for="(src, index) in content.geval_image" :key="index" @click="previewImage(content.geval_image, index)" mode="aspectFit"></image>
 		</view>
 		<view class="reply" v-if="reply && content.geval_explain">
 			<view class="title">掌柜回复：</view>

components/index/zhibo-item/index.vue

@@ -73,6 +73,9 @@ export default {
     },
     methods:{
         zhibo(){
+            this.$u.api.countLiveBrowse({live_id:this.zid}).then((res)=>{
+                console.log(JSON.stringify(res),77)
+            })
             this.$u.route({
                 url:"/pages/zhibo/index",
                params:{
@@ -81,6 +84,7 @@ export default {
                    rid:this.rid
                } 
             })
+            
         },
         articleAddShield() {
             console.log(this.item)

components/mine/comment/index.vue

@@ -6,8 +6,8 @@
 		</view>
 		<view class="user-comment">
 			<view class="text u-line-2">{{ info.comment }}</view>
-			<view class="image">
+			<view class="image" v-if="info.comment_img">
-				<image v-for="(src, index) in info.images" :key="index" :src="src" mode="aspectFit"></image>
+				<image :src="info.comment_img" mode="aspectFit" @click="previewImage(info.comment_img)"></image>
 			</view>
 		</view>
 	</view>
@@ -19,6 +19,14 @@ export default {
 	},
 	props: {
 		info: Object,
+	},
+	methods: {
+		previewImage(urls) {
+			const imagesUrl = [urls];
+			uni.previewImage({
+				urls: imagesUrl,
+			});
+		},
 	}
 };
 </script>
@@ -47,12 +55,12 @@ export default {
 			font-size: 26rpx;
 			color: rgba(51,51,51,1);
 			line-height: 40rpx;
-			margin-bottom: 19rpx;
 		}
 		.image {
 			display: flex;
 			flex-wrap: wrap;
 			> image {
+				margin-top: 20rpx;
 				width: 210rpx;
 				height: 210rpx;
 				border-radius: 10rpx;

components/mine/order-item/index.vue

@@ -8,7 +8,7 @@
 			<view class="order-status">{{ state }}</view>
 		</view>
 		<view class="goods-info">
-			<view class="goods-item" @click="toOtherPage('Details')" v-for="goods in order.extend_order_goods" :key="goods.goods_id">
+			<view class="goods-item" @click="toOtherPage('Details')" v-for="(goods,index) in order.extend_order_goods" :key="index">
 				<image :src="goods.goods_image"></image>
 				<view class="goods-text">
 					<view class="goods-name u-line-2">{{ goods.goods_name }}</view>
@@ -25,7 +25,7 @@
 		<view class="order-btn" v-if="[1, 2, 3, 4, 8, 11].indexOf(order.view_type) >= 0">
 			 <!-- || order.view_type == 2 -->
 			<view class="cancel" v-if="(order.view_type == 3 || order.view_type == 2) && order.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
-			<view class="cancel" v-if="order.view_type == 3 && order.shipping_code && order.is_selfraising != 1" @click="toOtherPage('Logistics')">查看物流</view>
+			<view class="cancel" v-if="order.view_type == 3 && order.shipping_code && (order.store_deliver_type ? order.store_deliver_type != 3 : order.member_deliver_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>
@@ -67,7 +67,6 @@ export default {
 		}
 	},
 	methods: {
-		
 		cancelOrder() {
 			this.$u.api.cancelOrder({
 				order_id: this.order.order_id,

components/mine/order-item/try.vue

@@ -12,9 +12,7 @@
 				<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">
+					<view class="goods-sku u-line-1" v-if="order.goods_spec">{{ order.goods_spec | concatSpec }}</view>
-						<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>
@@ -38,7 +36,18 @@ export default {
 	created() {
 		this.viewState();
 	},
-	filters: {},
+	filters: {
+		concatSpec(value) {
+			let spec = '';
+			for (const key in value) {
+				if (value.hasOwnProperty(key)) {
+					const element = value[key];
+					spec = spec + element + ';'
+				}
+			}
+			return spec;
+		}
+	},
 	methods: {
 		// "goods_try_order_status": 0,    试穿订单状态 0:待处理订单 20:同意 40:拒绝此订单 50:完成
 		viewState() {
@@ -131,6 +140,7 @@ export default {
 					line-height: 38rpx;
 				}
 				.goods-sku {
+					align-self: baseline;
 					max-width: 230rpx;
 					background: rgba(236,236,236,1);
 					border-radius: 6rpx;

components/shop/recommend/pintuan.vue

@@ -110,7 +110,6 @@ export default {
 						left: 0;
 						top: 0;
 						z-index: 8;
-						background-color: aqua;
 					}
 					&:last-child {
 						left: 32rpx;

components/shop/shop-item/index.vue

@@ -33,7 +33,7 @@ export default {
         border-radius: 50%;
     }
     >text{
-		width: 100rpx;
+		max-width: 100rpx;
         margin-top: 14rpx;
         font-size: 24rpx;
         color: #333;

pageB/comment/index.vue

@@ -3,7 +3,7 @@
 		<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 class="comment-container" v-if="isShow">
 			<view v-for="(item, index) in evalueList" :key="index" class="itme">
 				<comment :reply="true" :content="item"></comment>
 			</view>
@@ -25,6 +25,7 @@ export default {
 			evaluateSpec: {},
 			loadStatus: 'loadmore',
 			timer: true,
+			isShow: false, // 是否显示组建
 		}
 	},
 	components: {
@@ -50,7 +51,7 @@ export default {
 			if(!this.timer) return false;
 			this.loadStatus = "loading";
 			this.page++;
-			this.getAllEvalue({ type: this.current, load: 'more' }).then(length => {
+			this.getAllEvalue({ type: this.current, load: 'loadmore' }).then(length => {
 				if(length == 0) {
 					this.page--;
 					this.loadStatus = 'nomore';
@@ -72,15 +73,17 @@ export default {
 				}
 			})
 		},
-		async getAllEvalue({ type, load } = {}) {
+		async getAllEvalue({ type, load = 'reload' } = {}) {
 			let params = {
 				goods_id: this.id, 
 				page: this.page,
 			}
 			if(type) Object.assign(params, { type: type });
+			this.isShow = false;
 			const res = await this.$u.api.getAllEvalue(params);
+			this.isShow = true;
 			if (res.errCode == 0) {
-				if(load) this.evalueList.push(...res.data);
+				if(load == 'loadmore') this.evalueList.push(...res.data);
 				else this.evalueList = res.data;
 			} else {
 				this.evalueList = [];

pageB/sdetails/index.vue

@@ -1202,9 +1202,10 @@ export default {
 		background-color: #fff;
 		display: flex;
 		position: fixed;
-		height: 98rpx;
 		width: 100%;
 		bottom: 0;
+        left: 0;
+        padding-bottom: env(safe-area-inset-bottom);
 		// border-top: 1rpx solid #ececec;
 		z-index: 10076;
 		.navs{

pageC/cart/ConfirmOrder.vue

@@ -34,24 +34,29 @@
 					</view>
 				</view>
 				<view class="order-info">
-					<view @click="showCoupon({type: 2, store_id: item[0].store_id})" v-if="orderType == 1 || orderType == 5">
+					<view class="show-view" @click="showCoupon({type: 2, store_id: item[0].store_id})" v-if="orderType == 1 || orderType == 5">
 						<view class="title">优惠券折扣</view>
 						<view class="value">
 							<view>-￥{{ storeCoupon[item[0].store_id] ? storeCoupon[item[0].store_id].voucher_price.toFixed(2) : '0.00' }}</view>
 							<image src="../static/image/1.png"></image>
 						</view>
 					</view>
-					<view>
+					<view class="show-view">
 						<view class="title">运费</view>
 						<view class="value">
 							<view v-if="freight">￥{{ freight | setFreight(index) }}</view>
 						</view>
 					</view>
+					<view class="remark">
+						<view class="title">订单备注</view>
+						<u-input v-model="remark[index]" type="textarea" style="margin-top:-5rpx" :height="88" placeholder="选填" />
 					</view>
-				<view class="pick-up" v-if="is_selfraising == 1">
+				</view>
+				<view class="pick-up" v-if="delivery.type == 3">
 					<view class="title">自提地址</view>
 					<view class="content">{{ orderInfo.store_list[index].store_address }}</view>
 				</view>
+				<view class="store-total">共{{ item | getTotalNum }}件 小计：<text>￥{{ orderInfo.store_goods_total[index] | getStorePrice(storeCoupon, index) }}</text></view>
 			</view>
 		</view>
 		<view class="common-active">
@@ -120,18 +125,22 @@ export default {
 				text: '快递',
 				value: 'express',
 				disabled: false,
+				type: 1,
 			}, {
 				text: '骑手',
 				value: 'takeawayer',
 				disabled: false,
+				type: 2,
 			}, {
 				text: '自提',
 				value: 'selfraising',
 				disabled: false,
+				type: 3,
 			}],
 			delivery: {
 				text: '快递',
 				value: 'express',
+				type: 1,
 			}, // 配送方式
 			couponList: [],
 			couponStatus: false,
@@ -141,14 +150,35 @@ export default {
 			goodsClass: [],
 			orderType: '', // 订单类型 1 普通订单  2 拼团订单 3 秒杀订单 4 优惠券 5 购物车订单
 			debounce: true,
-			is_selfraising: 0, // 是否自提：0=》否，1=》是
 			hasInvoice: 0,
+			remark: {}
 		}
 	},
 	components: {
 		Coupon
 	},
 	filters: {
+		// 店铺总数量
+		getTotalNum(data, coupon) {
+			let num = 0;
+			data.forEach(item => {
+				num += item.goods_num;
+			})
+			return num;
+		},
+		// 店铺总金额
+		getStorePrice(price, coupon, index) {
+			for (const key in coupon) {
+				if (coupon.hasOwnProperty(key)) {
+					const element = coupon[key];
+					if(index == key) {
+						price -= Number(element.voucher_price);
+					}
+				}
+			}
+			return price;
+		},
+		// 订单总数量
 		setTotalNumber(data) {
 			let num = 0;
 			for (const key in data) {
@@ -172,6 +202,7 @@ export default {
 		if(!this.orderInfo.is_selfraising) this.deliveryList[2].disabled = true;
 		// console.log('orderType' + this.orderType);
 		// console.log(this.orderInfo);
+		this.initRemark();
 		this.getGoodsClass();
 		this.setTotalPrice();
 	},
@@ -185,8 +216,9 @@ export default {
 		} else {
 			if(this.$store.getters.getOrderAddress) this.addressInfo = this.$store.state.orderAddress;
 		}
+		// 是否开发票
 		this.hasInvoice = this.$store.getters.hasInvoice;
-		console.log(this.hasInvoice);
+		// console.log(this.hasInvoice);
 	},
 	beforeDestroy() {
 		this.$store.commit('updateAddress', {});
@@ -199,6 +231,17 @@ export default {
 		},
 	},
 	methods: {
+		initRemark() {
+			// 初始化备注
+			const obj = this.orderInfo.store_cart_list;
+			for (const key in obj) {
+				if (obj.hasOwnProperty(key)) {
+					const element = obj[key];
+					this.remark[key] = '';
+				}
+			}
+			console.log(this.remark);
+		},
 		// 如果有pintuangroup_headid为参团不然为开团
 		async withImmediate(type) {
 			let params = {
@@ -225,6 +268,7 @@ export default {
 			})
 		},
 		intermediate() {
+			console.log(this.remark);
 			if(!this.debounce) return;
 			this.debounce = false;
 			if(this.orderType == 2) {
@@ -276,8 +320,9 @@ export default {
 				cart_id: id,
 				address_id: this.addressInfo.address_id,
 				buy_city_id: this.addressInfo.city_id,
-				is_selfraising: this.is_selfraising,
+				member_deliver_type: this.delivery.type,
 				invoice_id: this.$store.getters.getInvoiceId, // 发票抬头ID，不开票传0
+				pay_message: this.remark,
 			}
 			if(coupon.length) Object.assign(params, { voucher_id: coupon });
 			if(this.orderType == 2) {
@@ -285,6 +330,7 @@ export default {
 				if(this.orderInfo.pintuangroup_id) Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id });
 			}
 			// console.log(params);
+			// return;
 			this.$u.api.sendOrder(params).then(res => {
 				if(res.errCode == 0) {
 					this.$u.route({
@@ -413,7 +459,6 @@ export default {
 				this.getFreight();
 			} 
 			if(index == 2) {
-				this.is_selfraising = 1;
 				for (const key in this.freight) {
 					if (this.freight.hasOwnProperty(key)) {
 						this.freight[key] = '0.00';
@@ -421,8 +466,6 @@ export default {
 				}
 				this.setTotalPrice(); // 计算总价
 				this.delivery = this.deliveryList[index];
-			} else {
-				this.is_selfraising = 0;
 			}
 			if(index == 0) {
 				this.delivery = this.deliveryList[index];
@@ -587,7 +630,7 @@ export default {
 				}
 			}
 			.order-info {
-				> view {
+				.show-view {
 					height: 98rpx;
 					background: rgba(255,255,255,1);
 					padding: 35rpx 30rpx;
@@ -612,6 +655,24 @@ export default {
 						}
 					}
 				}
+				.remark {
+					background: rgba(255,255,255,1);
+					padding: 35rpx 30rpx;
+					display: flex;
+					justify-content: space-between;
+					margin-bottom: 2rpx;
+					.title {
+						font-size: 28rpx;
+						color: rgba(102,102,102,1);
+						margin-right: 20rpx;
+					}
+					/deep/ .u-input {
+						font-size: 28rpx;
+						.u-input__textarea {
+							padding: 0;
+						}
+					}
+				}
 			}
 			.pick-up {
 				padding: 30rpx;
@@ -627,6 +688,16 @@ export default {
 					line-height: 40rpx;
 				}
 			}
+			.store-total {
+				text-align: right;
+				padding: 34rpx 30rpx;
+				background: rgba(255,255,255,1);
+				font-size: 28rpx;
+				color: #656565;
+				> text {
+					color: #FF770F;
+				}
+			}
 		}
 	}
 	.common-active {

pageC/merchant/details.vue

@@ -25,7 +25,7 @@
 				<u-icon name="arrow-down" color="#999999" size="28"></u-icon>
 			</view>
 			<view class="image-list" v-if="info.business_licence_number_electronic">
-				<image :src="info.business_licence_number_electronic"></image>
+				<image :src="info.business_licence_number_electronic" @click="previewImage(info.business_licence_number_electronic)"></image>
 			</view>
 		</view>
 	</view>
@@ -42,6 +42,15 @@ export default {
 			// console.log(res)
 			this.info = res.data
 		})
+	},
+	methods: {
+		previewImage(urls) {
+			// console.log(urls);
+			const imageList = [urls];
+			uni.previewImage({
+				urls: imageList,
+			});
+		},
 	}
 };
 </script>

pageC/merchant/index.vue

@@ -53,7 +53,7 @@
 				<goods :sid="sid"></goods>
 			</view>
 		</view>
-		<view class="tabbar">
+		<view class="tabbar" :style="safeareaStyle">
 			<view @click="switchCurrent(0)">
 				<image src="/static/image/shop/9.png"></image>
 				<view>商品分类</view>
@@ -94,6 +94,7 @@ export default {
 			page: 1,
 			scrollHeiht: '',
             paddingTop: 0,
+            safeareaStyle: "", // 苹果底部
 		}
 	},
 	components:{
@@ -118,6 +119,21 @@ export default {
 			id:this.sid
 		});
 	},
+	onLoad(option){
+		this.sid = option.id;
+		// console.log(this.sid);
+		this.getStoreInfo();
+		this.getArticlelist();
+		this.setViewHeight();
+		// this.getStoreImgVideoList();
+        // #ifdef APP-PLUS
+        this.device = uni.getSystemInfoSync(); // 获取信息
+        console.log(this.device.safeArea);
+        // #endif
+	},
+	onShow() {
+		this.cur = 0;
+	},
 	methods: {
 		customers(){
 			console.log(this.$store.state.hasLogin)
@@ -225,17 +241,16 @@ export default {
             // console.log(this.paddingTop);
 		}
 	},
-	onLoad(option){
-		this.sid = option.id;
-		// console.log(this.sid);
-		this.getStoreInfo();
-		this.getArticlelist();
-		this.setViewHeight();
-		// this.getStoreImgVideoList();
-	}
 };
 </script>
 <style lang="scss" scoped>
+/*坑：解决iphoneX等大屏手机底部小黑条挡住tab的解决方法：安全区域距离底部边界距离env() 跟 constant() 需要同时存在，而且顺序不能换。*/
+/* #ifdef H5 */
+body {
+  padding-bottom: constant(safe-area-inset-bottom);/* 兼容 iOS < 11.2 */
+  padding-bottom: env(safe-area-inset-bottom); /* 兼容 iOS >= 11.2 */
+}
+/* #endif */
 .merchant {
 	// min-height: 100vh;
 	background-color: #ECECEC;
@@ -388,14 +403,14 @@ export default {
 	.tabbar {
 		border-top: 1rpx #DBDADA solid;
 		width: 100%;
-		height: 98rpx;
 		background: rgba(251,251,251,1);
 		display: flex;
-		padding: 10rpx 55rpx;
 		position: fixed;
 		bottom: 0;
 		left: 0;
 		z-index: 9;
+        padding: 10rpx 55rpx;
+        padding-bottom: env(safe-area-inset-bottom);
 		> view {
 			flex: 1;
 			text-align: center;

pageD/notice/info.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image :src="list.picture" class="picture" mode=""></image>
+		<image :src="list.picture" class="picture" mode="aspectFit"></image>
         <view class="box">
             <view class="info">
                 <text class="title u-line-2">{{ list.title }}</text>

pageE/mine/Contact.vue

@@ -0,0 +1,101 @@
+<template>
+  <view class="contact">
+    <view class="item-view" @click="makePhone">
+      <view class="title">联系电话</view>
+      <view class="content">{{ phoneNumber }}</view>
+      <u-icon name="arrow-right" color="#9A9A9A" size="24"></u-icon>
+    </view>
+    <view class="item-view" @click="customerService">
+      <view class="title">客服服务</view>
+      <u-icon name="arrow-right" color="#9A9A9A" size="24"></u-icon>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      phoneNumber: '',
+    }
+  },
+  created() {
+    this.getPhone();
+  },
+  methods: {
+    getPhone() {
+			this.$u.api.getConfigInfo({
+				code: 'site_tel400'
+			}).then(res => {
+				this.phoneNumber = res.data.config.value;
+			})
+    },
+    makePhone() {
+			uni.makePhoneCall({
+				phoneNumber: this.phoneNumber,
+			});
+		},
+    customerService(){
+      if(!this.$store.state.hasLogin){
+        this.$u.toast('请先登录');
+      } else {
+        function Friend(uuid, name, avatar,time = "", text = "",date = "") {
+          this.uuid = uuid;
+          this.name = name;
+          this.avatar = avatar;
+          this.online = false;
+          this.unReadMessage = 0;
+          this.text = text;
+          this.time = time;
+          this.date = date
+        }
+        const token = uni.getStorageSync('token');
+        let that = this
+        uni.request({
+          url:"https://mall.dmygkeji.com/api/Specialci/getAtwillUserInfo",
+          data:{
+            userId: 1
+          },
+          method:"POST",
+          header:{
+            "Authorization" : 'Bearer' + " " + token
+          },
+          success(res){
+            res = res.data;
+            let user = new Friend(res.data.member_id,"官方平台客服",res.data.member_avatar);
+            that.$u.route({
+              url:"/pageD/privateChat/privateChat",
+              params:{
+                id:JSON.stringify(user)
+              }
+            })
+          }
+        })
+      }
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.contact {
+  border-top: 1rpx solid #ECECEC;
+  .item-view {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 34rpx 30rpx;
+    border-bottom: 2rpx solid #ECECEC;
+    .title {
+      font-size: 30rpx;
+      color: #343434;
+    }
+    .content {
+      margin-left: auto;
+      font-size: 28rpx;
+      color: #666666;
+    }
+    .u-icon {
+      margin-left: 20rpx;
+    }
+  }
+}
+</style>

pageE/mine/MineConcerns.vue

@@ -27,7 +27,7 @@ import storeViwe from './storeConcerns'
 export default {
 	data() {
 		return {
-			list: [{ name: "商家" }, { name: "达人" }],
+			list: [{ name: "店铺" }, { name: "达人" }],
 			daren: [],
 			shangjia:[],
 			height: 0,
@@ -119,7 +119,7 @@ export default {
 		margin-left: -20rpx;
 		.daren-item {
 			width: 215rpx;
-			height: 282rpx;
+			height: 270rpx;
 			display: flex;
 			flex-direction: column;
 			align-items: center;

pageE/mine/StoreCollection.vue

@@ -16,7 +16,7 @@
 					<view class="item-name u-line-1">{{ item.store_name }}</view>
 					<view class="item-date">
 						<image src="@/pageE/static/mine/26.png"></image>
-						<view>{{ item.fav_time | date }}</view>
+						<view>{{ item.fav_time }}</view>
 					</view>
 				</view>
 			</view>

pageE/mine/storeConcerns.vue

@@ -16,7 +16,7 @@
 					<view class="item-bottom">
 						<view class="item-date">
 							<image src="@/pageE/static/mine/26.png"></image>
-							<view>{{ item.friend_tomavatar | date }}</view>
+							<view>{{ item.friend_addtime }}</view>
 						</view>
 					</view>
 				</view>

pageE/more/ApplyLive.vue

@@ -3,11 +3,15 @@
     <view class="basic-info">
       <view>
         <label for="name">姓名:</label>
-        <input type="text" id="name" v-model="name" placeholder="请输入姓名" />
+        <input type="text" id="name" @input="names" placeholder="请输入姓名" />
       </view>
       <view>
         <label for="phone">手机号:</label>
-        <input type="number" id="phone" ref='phone' maxlength="11" placeholder="请输入手机号" />
+        <input type="number" id="phone" @input="phones" maxlength="11" placeholder="请输入手机号" />
+      </view>
+      <view>
+        <label for="idCard">身份证号:</label>
+        <input type="text" id="idCard" placeholder="请输入身份证号" @input="setIdCard" />
       </view>
       <view @click="show=true">
         <label for="address">居住地址:</label>
@@ -16,7 +20,7 @@
       </view>
       <view>
         <label for="details">详细地址:</label>
-        <input type="text" id="details" v-model="details" placeholder="请填写详细地址" />
+        <input type="text" id="details" @input="detailss" placeholder="请填写详细地址" />
       </view>
     </view>
     <view class="other-info">
@@ -65,6 +69,7 @@ export default {
       areaList: [],
       name: '',
       phone: '',
+      idCard: '',
       address: '',
       details: '',
       industryList: [],
@@ -80,6 +85,20 @@ export default {
     this.getHobbyList();
   },
   methods: {
+    names(a){
+      console.log(a.detail)
+      this.name = a.detail.value
+    },
+    phones(a){
+      this.phone = a.detail.value
+    },
+    setIdCard(v) {
+      this.idCard = v.detail.value;
+    },
+    detailss(a){
+      this.details = a.detail.value
+    },
+
     getAreaData() {
 			this.$u.api.getArea().then((res)=>{
 				if (res.errCode == 0) {
@@ -121,22 +140,30 @@ export default {
         this.$u.toast('姓名不能为空');
 				return false;
 			}
-			if(this.$u.test.isEmpty(this.$refs.phone.valueSync)) {
+			if(this.$u.test.isEmpty(this.phone)) {
         this.$u.toast('手机号不能为空');
 				return false;
 			}
-			if(!this.$u.test.mobile(this.$refs.phone.valueSync)) {
+			if(!this.$u.test.mobile(this.phone)) {
         this.$u.toast('手机号错误');
 				return false;
 			}
-			if(this.$u.test.isEmpty(this.address)) {
+      if(this.$u.test.isEmpty(this.idCard)) {
-        this.$u.toast('地址不能为空');
+        this.$u.toast('身份证号不可为空');
-				return false;
-			}
-			if(this.$u.test.isEmpty(this.details)) {
-        this.$u.toast('详细地址不能为空');
         return false;
       }
+      // if(!this.$u.test.idCard(this.idCard)) {
+      //   this.$u.toast('请正确填写身份证号');
+      //   return false;
+      // }
+			// if(this.$u.test.isEmpty(this.address)) {
+      //   this.$u.toast('地址不能为空');
+			// 	return false;
+			// }
+			// if(this.$u.test.isEmpty(this.details)) {
+      //   this.$u.toast('详细地址不能为空');
+			// 	return false;
+      // }
       if(!this.checkedIndustryList.length) {
         this.$u.toast('行业领域不能为空');
 				return false;
@@ -153,7 +180,8 @@ export default {
       this.isSubmit = false;
       this.$u.api.applyExpert({
         name: this.name, 
-        mobile: this.$refs.phone.valueSync, 
+        mobile: this.phone, 
+        idcard: this.idCard,
         address: this.address + this.details, 
         industry: this.checkedIndustryList, 
         hobby: this.checkedHobbyList,

pageE/more/EditInvoice.vue

@@ -19,7 +19,7 @@
     <view class="personal" v-show="type==1">
       <view class="info-item">
         <view class="title">手机号</view>
-        <input type="number" placeholder="请输入您的手机号" maxlength="11"  v-model="personalPhone" />
+        <input type="text" placeholder="请输入您的手机号" maxlength="11"  v-model="personalPhone" />
       </view>
       <view class="info-item">
         <view class="title">身份证号</view>
@@ -37,7 +37,7 @@
       </view>
       <view class="info-item">
         <view class="title">电话号码</view>
-        <input type="number" placeholder="请输入公司电话" maxlength="11" v-model="companyPhone" />
+        <input type="text" placeholder="请输入公司电话" maxlength="11" v-model="companyPhone" />
       </view>
       <view class="info-item">
         <view class="title">开户银行</view>
@@ -91,6 +91,7 @@ export default {
       this.action == 1 ? this.invoiceAdd() : this.invoiceEdit();
     },
     verificationParams() {
+      const phone = /^0\d{2,3}-?\d{7,8}$/;
       if(this.type == 1) {
         if(this.$u.test.isEmpty(this.title)) {
           this.$u.toast('发票抬头不可为空');
@@ -100,7 +101,7 @@ export default {
           this.$u.toast('手机号不可为空');
           return false;
         }
-        if(!this.$u.test.mobile(this.personalPhone)) {
+        if(!this.$u.test.mobile(this.personalPhone) && !phone.test(this.personalPhone)) {
           this.$u.toast('请正确填写手机号');
           return false;
         }
@@ -108,6 +109,10 @@ export default {
           this.$u.toast('身份证号不可为空');
           return false;
         }
+        if(!this.$u.test.idCard(this.idCard)) {
+          this.$u.toast('请正确填写身份证号');
+          return false;
+        }
       } else {
         if(this.$u.test.isEmpty(this.title)) {
           this.$u.toast('发票抬头不可为空');
@@ -125,7 +130,7 @@ export default {
           this.$u.toast('电话号码不可为空');
           return false;
         }
-        if(!this.$u.test.mobile(this.companyPhone)) {
+        if(!this.$u.test.mobile(this.companyPhone) && !phone.test(this.companyPhone)) {
           this.$u.toast('请正确填写电话号码');
           return false;
         }

pageE/order/Details.vue

@@ -3,7 +3,7 @@
 		<view class="status" v-if="orderstate">
 			<view class="text">
 				<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 class="time" v-if="orderInfo.view_type == 1 || orderInfo.view_type == 9">距离结束：{{ countdown }}</view> -->
 			</view>
 			<image :src="s_object[orderstate].image"></image>
 		</view>
@@ -59,28 +59,29 @@
 						<view class="title">支付方式</view>
 						<view class="price">{{ orderInfo.payment_name }}</view>
 					</view>
-					<view v-if="orderInfo.is_selfraising == 1">
+					<view>
 						<view class="title">配送方式</view>
-						<view class="price">自提</view>
+						<view class="price">{{ orderInfo.member_deliver_type | getDeliverType(orderInfo.store_deliver_type) }}</view>
 					</view>
 				</view>
 			</view>
 			<view class="info-order">
+				<view v-if="orderInfo.extend_order_common.order_message">订单备注：{{ orderInfo.extend_order_common.order_message }}</view>
 				<view>订单编号：{{ orderInfo.order_sn }}</view>
 				<view>支付单号：{{ orderInfo.pay_sn }}</view>
 				<view>创建时间：{{ orderInfo.add_time | date}}</view>
-				<view v-if="orderInfo.is_selfraising == 1" class="address">自提地址：{{ orderInfo.extend_store.store_address }}</view>
+				<view v-if="orderInfo.member_deliver_type == 3" class="address">自提地址：{{ orderInfo.extend_store.store_address }}</view>
 			</view>
 		</view>
 		 <!-- '4', '8' -->
-		<view class="btn" v-if="['1', '2', '6'].indexOf(orderstate) >= 0">
+		<view class="btn" v-if="['1', '2', '4', '6'].indexOf(orderstate) >= 0">
 			<!-- orderstate == '4' ||  -->
-			<view class="cancel" v-if="(orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
+			<view class="cancel" v-if="(orderstate == '1' || orderstate == '4') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
+			<!-- <view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> -->
+			<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code && orderInfo.member_deliver_type != 3" @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="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> -->
-			<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code && orderInfo.is_selfraising != 1" @click="toOtherPage('Logistics')">查看物流</view>
 			<view class="phone" v-if="orderstate == '1' && orderInfo.takeawayer_mobile" @click="makePhone(orderInfo.takeawayer_mobile)">
 				<u-icon name="phone-fill" color="#FF780F" size="28"></u-icon>
 				<text>联系骑手</text>
@@ -157,6 +158,32 @@ export default {
 	beforeDestroy() {
 		clearInterval(this.timer);
 	},
+	filters: {
+		getDeliverType(user, store) {
+			let deliverType = '';
+			function setType(type) {
+				switch (type) {
+					case 1:
+						deliverType = '快递'
+						break;
+					case 2:
+						deliverType = '骑手'
+						break;
+					case 3:
+						deliverType = '自提'
+						break;
+					default:
+						deliverType = '-'
+						break;
+				}
+			}
+			setType(user);
+			if(store) {
+				setType(store);
+			}
+			return deliverType;
+		}
+	},
 	methods: {
 		viewStoreDetails(id) {
 			this.$u.route('pageC/merchant/index', {
@@ -205,12 +232,12 @@ export default {
 			this.$u.api.getOrderInfo({
 				order_id: id,
 			}).then(res => {
-				// console.log(res)
+				console.log(res)
 				if(res.errCode == 0) {
 					this.orderInfo = res.data;
 					this.setTitle(this.orderInfo.view_type);
-					if(res.data.view_type == 1) this.setSpikeTime(res.data.end_time);
+					// 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);
+					// else if(res.data.view_type == 9) this.setSpikeTime(res.data.pintuangroup_endtime);
 				}
 				uni.stopPullDownRefresh(); // 结束刷新
 			})
@@ -259,6 +286,7 @@ export default {
 		toOtherPage(url) {
 			this.$u.route('/pageE/order/' + url, {
 				oid: this.orderInfo.order_id,
+				type:this.orderInfo.view_type
 			});
 		},
 		makePhone(phone) {

pageE/order/Index.vue

@@ -7,7 +7,7 @@
 			<swiper-item class="swiper-item" v-for="(item, index) in list" :key="index">
 				<scroll-view scroll-y style="height: 100%;" @scrolltolower="reachBottom" class="order-scroll">
 					<view v-if="orderList[index]">
-						<view class="item-container" v-for="order in orderList[index]" :key="order.order_id">
+						<view class="item-container" v-for="(order,index) in orderList[index]" :key="index">
 							<OrderItem :order="order" @refreshOrderList="refreshOrderList" v-if="current != 4"></OrderItem>
 							<TryOrderItem :order="order" @refreshOrderList="refreshOrderList" v-else></TryOrderItem>
 						</view>
@@ -129,13 +129,29 @@ export default {
 				page: this.page,
 				type: type,
 			})
+			// res.data.forEach(element => {
+			// 	element.extend_order_goods.forEach(i=>{
+			// 		// console.log(i)
+			// 	})
+			// });
 			this.timer = true;
 			uni.stopPullDownRefresh(); // 结束刷新
 			if(res.errCode == 0) {
-				if(load == 'reload') this.orderList[this.current] = res.data;
+				if(load == 'reload'){ 
-				else if(load == 'loadmore') this.orderList[this.current].push(...res.data);
+					this.orderList[this.current] = []
+					this.orderList[this.current] = res.data;
+					
+				}else if(load == 'loadmore'){
+					this.orderList[this.current].push(...res.data);
 				}
+			}
+			// this.orderList[this.current].forEach(element => {
+			// 	element.extend_order_goods.forEach(i=>{
+			// 		// console.log(i)
+			// 	})
+			// });
 			this.$forceUpdate();
+			
 			// console.log(this.orderList);
 			return res.data.length;
 		},
@@ -156,11 +172,16 @@ export default {
 			const res = await this.$u.api.goodsTryOrderList({
 				page: this.page,
 			})
+			console.log(res)
 			uni.stopPullDownRefresh(); // 结束刷新
 			this.timer = true;
 			if(res.errCode == 0) {
-				if(load == 'reload') this.orderList[this.current] = res.data.list;
+				if(load == 'reload') {
-				else if(load == 'loadmore') this.orderList[this.current].push(...res.data.list);
+					this.orderList[this.current] = []
+					this.orderList[this.current] = res.data.list;
+				}else if(load == 'loadmore'){ 
+					this.orderList[this.current].push(...res.data.list);
+				}
 			}
 			this.$forceUpdate();
 			return res.data.list.length;

pageE/order/RefundOrder.vue

@@ -3,7 +3,6 @@
 		<view class="radios-container">
 			<view v-if="type == 2">
 				<label class="radio-view" v-for="(item, index) in goodsList" :key="index">
-				
 					<view class="store_info">
 						<view class="info_img">
 							<image :src="item.goods_image" mode="">
@@ -84,7 +83,6 @@ export default {
 	computed: {
 		totalPrice() {
 			if(this.type == 2){
-				console.log(this.goodsList)
 				let pac = 0;
 				for(let i in this.goodsList){
 					pac += parseFloat(this.goodsList[i].goods_pay_price) * 100 ;
@@ -96,7 +94,8 @@ export default {
 		}
 	},
 	onLoad(option) {
-		this.type = option.type
+		this.type = 2; // 需求更改 所有订单只能全退，不可选择商品。
+		// this.type = option.type
 		this.oid = option.oid;
 		this.getOrderInfo(option.oid);
 	},
@@ -140,17 +139,18 @@ export default {
 		applyRefund() {
 			
 			if(this.type !=2 && !this.verifyParams()) return false;
+			// addrefundall 只需要订单id 和 说明
 			let params = {
 				order_id: this.oid,
-				goods_id: this.goods.goods_id,
+				// goods_id: this.goods.goods_id,
-				refund_amount: Number(this.totalPrice),
+				// refund_amount: Number(this.totalPrice),
 				reason_info: this.refundText,
-				goods_num: this.num,
+				// goods_num: this.num,
 			}
 			console.log(params)
 			if(this.type == 2){
 				this.$u.api.addrefundall(params).then(res => {
-					console.log(JSON.stringify(res))
+					// console.log(JSON.stringify(res))
 					if(res.errCode == 0) {
 						this.$refs.uToast.show({
 							title: res.message,
@@ -189,12 +189,17 @@ export default {
 	background-color: #EDEDED;
 	.radios-container {
 		margin-bottom: 20rpx;
+		.u-radio-group {
+			width: 100%;
+		}
 		.radio-view {
+			width: 100%;
 			background-color: #FFFFFF;
 			padding: 26rpx;
 			display: flex;
 			align-items: center;
 			margin-bottom: 1rpx;
+			box-sizing: border-box;
 			.radio {
 				margin-right: 20rpx;
 			}

pageE/setting/version.vue

@@ -15,6 +15,10 @@
 				<text class="tips" v-if="version" @click="updateVersion">发现新版本: {{ version }}</text>
 				<text class="tips" v-else>已是最新版本</text>
 			</view>
+			<view>
+				<text class="title">联系我们</text>
+				<text class="tips">{{ phoneNumber }}</text>
+			</view>
 		</view>
 	</view>
 </template>
@@ -25,10 +29,12 @@ export default {
 			version: '',
 			phone_type: "",
 			status: '',
+			phoneNumber: '',
 		}
 	},
 	onLoad() {
 		this.getVersion();
+		this.getPhone();
 		this.phone_type = this.$u.os();
 	},
 	methods: {
@@ -42,6 +48,13 @@ export default {
 				}
 			})
 		},
+		getPhone() {
+			this.$u.api.getConfigInfo({
+				code: 'site_tel400'
+			}).then(res => {
+				this.phoneNumber = res.data.config.value;
+			})
+		},
 		viewAboutUs() {
 			this.$u.route('/pageE/mine/ArticleDetails', {
 				type: 2
@@ -96,7 +109,7 @@ export default {
 	}
 	.tips {
 		color: #999;
-		font-size: 22rpx;
+		font-size: 28rpx;
 	}
 	.version-view {
 		.tips {

pageE/tool/Manicure.vue

@@ -14,6 +14,7 @@
 								<view class="order-status">{{ item.status }}</view>
 							</view>
 							<view class="order-name">美甲人姓名：{{ item.manicure_name }}</view>
+							<view class="order-name">美甲人电话：{{ item.phone }}</view>
 							<view class="order-date">时间：{{ item.manicure_time | date }}</view>
 						</view>
 						<u-loadmore :status="loadStatus" bgColor="#ECECEC" margin-bottom="20" v-if="orderList.length>=pageSize"></u-loadmore>
@@ -129,7 +130,7 @@ export default {
 			.order-item {
 				padding: 30rpx;
 				width:690rpx;
-				height: 229rpx;
+				// height: 229rpx;
 				background: rgba(255,255,255,1);
 				border-radius: 10rpx;
 				margin-bottom: 20rpx;

pageE/tool/ManicureOrder.vue

@@ -5,15 +5,23 @@
 				<view>美甲人：</view>
 				<input type="text" v-model="name" />
 			</view>
-			<view class="order-date" @click="show=true">
+			<view class="order-name">
-				<view class="title">美甲时间：</view>
+				<view>美甲人电话：</view>
-				<image src="../static/mine/21.png" v-if="!time"></image>
+				<input type="text" v-model="phone" maxlength="11" />
-				<view v-else class="time">{{ time }}</view>
 			</view>
 			<view class="order-address">
 				<view class="title">美甲地址：</view>
 				<input type="text" v-model="address" disabled />
 			</view>
+			<view class="order-name">
+				<view>美甲店电话：</view>
+				<input type="text" v-model="storePhone" disabled />
+			</view>
+			<!-- <view class="order-date" @click="show=true">
+				<view class="title">美甲时间：</view>
+				<image src="../static/mine/21.png" v-if="!time"></image>
+				<view v-else class="time">{{ time }}</view>
+			</view> -->
 		</view>
 		<view class="order-btn" @click="addManicureOrder">确认订单</view>
 		<u-picker mode="time" v-model="show" :params="params" @confirm="chooseDate"></u-picker>
@@ -26,6 +34,8 @@ export default {
 		return {
 			name: '',
 			time: '',
+			phone: '',
+			storePhone: '',
 			address: '',
 			params: {
 				year: true,
@@ -41,28 +51,38 @@ export default {
 	},
 	onLoad() {
 		this.getConfigInfo();
+		this.getPhone();
 	},
 	methods: {
 		validateValue() {
 			if(this.$u.test.isEmpty(this.name)) {
-				this.showToast('姓名不能为空', 'error');
+				this.showToast('姓名不能为空');
 				return false;
 			}
-			if(this.$u.test.isEmpty(this.time)) {
+			if(this.$u.test.isEmpty(this.phone)) {
-				this.showToast('日期不能为空', 'error');
+				this.showToast('美甲人电话不能为空');
 				return false;
 			}
-			if(new Date() > new Date(this.time)) {
+			if(!this.$u.test.mobile(this.phone)) {
-				this.showToast('日期错误', 'error');	
+				this.showToast('美甲人电话错误');
 				return false;
 			}
+			// if(this.$u.test.isEmpty(this.time)) {
+			// 	this.showToast('日期不能为空', 'error');
+			// 	return false;
+			// }
+			// if(new Date() > new Date(this.time)) {
+			// 	this.showToast('日期错误', 'error');	
+			// 	return false;
+			// }
 			return true;
 		},
 		addManicureOrder() {
 			if(!this.validateValue()) return false;
 			this.$u.api.addManicure({
 				name: this.name,
-				time: new Date(this.time)
+				phone: this.phone,
+				// time: new Date(this.time)
 			}).then((res)=>{
 				if(res.errCode == 0) {
 					this.$refs.uToast.show({
@@ -85,6 +105,15 @@ export default {
 				}
 			})
 		},
+		getPhone() {
+			this.$u.api.getConfigInfo({
+				code: 'manicure_phone',
+			}).then(res => {
+				if(res.errCode == 0) {
+					this.storePhone = res.data.config.value;
+				}
+			})
+		},
 		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

pageE/tool/MineHistory.vue

@@ -1,9 +1,9 @@
 <template>
     <view class="mine-history">
-		<scroll-view scroll-y class="history-box" @scrolltolower="reachBottom">
+		<view scroll-y class="history-box">
 			<view class="item-box">
 				<!-- 需求：只显示最近五十条数据　后台未作限制 -->
-				<view v-for="(item, index) in historyList.slice(0, 50)" :key="index" class="history-item">
+				<view v-for="(item, index) in historyList" :key="index" class="history-item">
 					<view class="item-title" @click="viewStoreDetails(item.store_id)">
 						<image :src="item.store_avatar"></image>
 						<view class="u-line-1">{{ item.store_name }}</view>
@@ -20,7 +20,7 @@
 			<u-action-sheet :list="actionList" v-model="showAction" :cancel-btn="true" @click="delHistory" border-radius="20"></u-action-sheet>
 			<u-empty text="暂无足迹" mode="list" color="#000" v-if="!historyList.length"></u-empty>
 			<u-loadmore class="load-size" :status="loadStatus" bgColor="#ECECEC" margin-top="20" margin-bottom="20" v-if="historyList.length >= pageSize" @loadmore="reachBottom"></u-loadmore>
-		</scroll-view>
+		</view>
     </view>
 </template>
 
@@ -47,6 +47,9 @@ export default {
     onLoad() {
 		this.getBrowseList();
 	},
+	onReachBottom(){
+		this.reachBottom()
+	},
     methods: {
 		viewAction(id) {
 			this.showAction = true;
@@ -58,6 +61,10 @@ export default {
 			this.$u.api.delMemberBrowse({ goods_id: glist }).then(res => {
 				if(res.errCode == 0) {
 					this.getBrowseList();
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: 300
+					});
 				} else {
 					this.$u.toast(res.message);
 				}
@@ -109,13 +116,16 @@ export default {
 	}
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
+page{
+	background: #ECECEC;
+}
 .mine-history {
 	min-height: calc(100vh - var(--window-top));
 	background: #ECECEC;
 	.history-box {
 		box-sizing: border-box;
-		height: calc(100vh - var(--window-top));
+		// height: calc(100vh - var(--window-top));
 		padding: 20rpx 30rpx 0;
 		.item-box {
 			display: flex;

pageE/tool/SendWash.vue

@@ -117,6 +117,8 @@ export default {
 				uni.navigateTo({
 					url: '/pageE/tool/WashOrder'
 				});
+				this.current = 0;
+				this.swiperCurrent = 0;
 				this.showPopup = false;
 			}
 		}
@@ -125,8 +127,8 @@ export default {
         this.sendLaundryOrderList();
     },
 	onShow() {
-		this.current = 0;
+		// this.current = 0;
-		this.swiperCurrent = 0;
+		// this.swiperCurrent = 0;
 		this.showPopup = false;
 		this.sendLaundryOrderList();
 		this.sendCommentList();

pageE/tool/WashOrder.vue

@@ -57,10 +57,6 @@
 						<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 class="order-view order-address">
 							<view class="title">详细地址:</view>
@@ -113,10 +109,6 @@
 					<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 class="order-view order-address">
 						<view class="title">详细地址:</view>
@@ -254,7 +246,6 @@ export default {
 		// this.current = 0;
 		// this.swiperCurrent = 0;
 		this.showPopup = false;
-		this.choose = false;
 	},
 	onLoad() {
 		this.getOrderList();
@@ -270,6 +261,7 @@ export default {
 			this.phone = '';
 			this.area = '';
 			this.address = '';
+			this.choose = false;
 		}
 	},
 	methods: {
@@ -419,12 +411,16 @@ export default {
 		radioChange(e){
 			const ids = e.split(" ");
 			// console.log(ids)
-			let checkedGoods = {};
+			let checkedGoods;
 			this.orderList.forEach(order => {
 				if(order.order_id == ids[0]) {
-					Object.assign(checkedGoods, { store: order.extend_store });
+					checkedGoods = {
-					Object.assign(checkedGoods, { order_sn: order.order_sn });
+						store: order.extend_store,
-					Object.assign(checkedGoods, { order_id: order.order_id });
+						order_sn: order.order_sn,
+						order_id: order.order_id,
+						reciver_info: order.extend_order_common.reciver_info,
+						reciver_name: order.extend_order_common.reciver_name
+					}
 					order.extend_order_goods.forEach(goods => {
 						if(goods.goods_id == ids[1]) {
 							Object.assign(checkedGoods, { goods: goods });
@@ -433,6 +429,13 @@ export default {
 					})
 				}
 			})
+			this.setDefaultValue();
+		},
+		setDefaultValue() {
+			this.name = this.checkedGoods.reciver_name;
+			this.phone = this.checkedGoods.reciver_info.mob_phone;
+			this.area = this.checkedGoods.reciver_info.area;
+			this.address = this.checkedGoods.reciver_info.street;
 		},
 		setArea(area) {
 			// console.log(area);

pageE/tool/washComment.vue

@@ -2,20 +2,25 @@
 	<view class="comment">
 		<view class="main-container">
 			<u-input v-model="content" type="textarea" height="300" maxlength="200" />
-			<!-- <u-upload 
+			<u-upload 
 				ref="uUpload" 
-				@on-uploaded="onUploaded" 
 				:custom-btn="true" 
 				:max-count="count" 
 				:auto-upload="false"
+				:action="action"
+				:header="header"
+				:form-data="formData"
+				:name="fileName"
+				:size-type="['original']"
+				@on-uploaded="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> -->
+			</u-upload>
 		</view>
 		<u-toast ref="uToast" />
-		<view class="write-btn" @click="addWashEvaluate">发表评价</view>
+		<view class="write-btn" @click="setLoaclList">发表评价</view>
 	</view>
 </template>
 <script>
@@ -23,8 +28,17 @@ export default {
 	data() {
 		return {
 			washId: '',
-			// count: 4, // 最大图片数量
+			count: 1,
+			action: this.$u.http.config.baseUrl + '/Upload/uploadfile',
+			header: {
+				"authorization": 'Bearer' + " " + uni.getStorageSync('token')
+			},
+			fileName: 'common',　// 与formData name 一样
+			formData: {
+				name: 'common', // 其他图片
+			},
 			content: '',
+			imageList: [],
 		}
 	},
 	onLoad(option) {
@@ -38,11 +52,22 @@ export default {
 			}
 			return true;
 		},
+		setLoaclList() {
+			this.$refs.uUpload.upload();
+		},
+		setImageList(lists) {
+			// console.log(lists);
+			lists.forEach(item => {
+				this.imageList.push(item.response.data.file_name);
+			})
+			this.addWashEvaluate();
+		},
 		addWashEvaluate() {
 			if(!this.verifyParams()) return false;
 			this.$u.api.sendOrderComment({
 				id: this.washId,
 				comment: this.content,
+				comment_img: this.imageList[0]
 			}).then(res => {
 				this.$refs.uToast.show({
 					title: res.message,
@@ -65,23 +90,23 @@ export default {
 		background-color: #ffffff;
 		padding: 30rpx;
 		margin-bottom: 10rpx;
-		// textarea {
+		textarea {
-		// 	width: 100% !important;
+			width: 100% !important;
-		// 	height: 500rpx;
+			height: 500rpx;
-		// 	margin-bottom: 60rpx;
+			margin-bottom: 60rpx;
-		// }
+		}
-		// .slot-btn {
+		.slot-btn {
-		// 	width: 140rpx;
+			width: 140rpx;
-		// 	height: 140rpx;
+			height: 140rpx;
-		// 	background: rgba(236,236,236,1);
+			background: rgba(236,236,236,1);
-		// 	border-radius: 10rpx;
+			border-radius: 10rpx;
-		// 	text-align: center;
+			text-align: center;
-		// 	> img {
+			> image {
-		// 		margin-top: 48rpx;
+				margin-top: 48rpx;
-		// 		width: 54rpx;
+				width: 54rpx;
-		// 		height: 49rpx;
+				height: 49rpx;
-		// 	}
+			}
-		// }
+		}
 	}
 	.write-btn {
 		margin: 120rpx auto 0;

pages.json

@@ -780,6 +780,19 @@
 						}
 					}
 				},
+				{
+					"path": "mine/Contact",
+					"style": {
+						"navigationBarTitleText": "联系我们",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
 				{
 					"path": "mine/Integral",
 					"style": {
@@ -1198,7 +1211,6 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},

pages/index/index.vue

@@ -273,7 +273,7 @@
 			darenItem
 		},
 		onShow() {
-			console.log(this.imService.status)
+			console.log(this.imService.status,this.$store.state.hasLogin)
 			if(!this.imService.status && this.$store.state.hasLogin){
 				const user = uni.getStorageSync('user_info');
 				// console.log(user)
@@ -308,6 +308,7 @@
             if (this.$store.state.showCoupons) {
                 this.isNewmembervoucher();
 						}
+						this.getRecommendList();
 		},
 		async onLoad(){
             this.articleList = [];

pages/information/information.vue

@@ -136,7 +136,7 @@
 						success(res){
 							console.log(res)
 							res = res.data
-							let user = new Friend(res.data.member_id,res.data.store_name,res.data.member_avatar)
+							let user = new Friend(res.data.member_id,'官方平台客服',res.data.member_avatar)
 							that.$u.route({
 								url:"/pageD/privateChat/privateChat",
 								params:{

pages/mine/index.vue

@@ -16,7 +16,10 @@
 						<view class="user-rank">等级:{{ userInfo.member_level || 0 }}级</view>
 					</view>
 				</view>
+				<view class="btn">
 					<view class="member-service" @click="toOtherPage('/mine/MemberServe')">会员服务</view>
+					<view class="member-service" @click="toOtherPage('/mine/Contact')">联系我们</view>
+				</view>
 			</view>
 			<view class="bottom">
 				<view @click="toOtherPage('/mine/GoodsCollection')">
@@ -83,6 +86,10 @@
 						<image src="/static/image/mine/39.png"></image>
 						<view>试穿试送</view>
 					</view>
+					<view @click="toCartPage">
+						<image src="/static/image/common/33.png"></image>
+						<view>购物车</view>
+					</view>
 				</view>
 			</view>
 			<view class="more-tool">
@@ -166,7 +173,7 @@ export default {
 				},
 				{
 					name: 'refund',
-					title: '售后',
+					title: '退款售后',
 					img: '/static/image/mine/9.png',
 					link: '/order/Index?current=7',
 					number: '',
@@ -224,7 +231,10 @@ export default {
 			uni.navigateTo({
 				url: '/pageE' + url
 			});
-		}
+		},
+		toCartPage() {
+			this.$u.route('/pageC/cart/index');
+		},
 	}
 };
 </script>
@@ -236,6 +246,7 @@ export default {
 		// width: 100%;
 		height: 272rpx;
 		background-color: #FF7807;
+		position: relative;
 		.top {
 			padding: 40rpx 0 0 30rpx;
 			display: flex;
@@ -292,16 +303,23 @@ export default {
 					}
 				}
 			}
+			.btn {
+				position: absolute;
+				right: 0;
+				top: 43rpx;
 				.member-service {
 					height: 52rpx;
 					line-height: 52rpx;
 					box-sizing: content-box;
-				margin-left: auto;
 					padding: 0 51rpx 0 22rpx;
 					background: rgba(255,255,255,0.32);
 					border-radius: 26rpx 0 0 26rpx;
 					font-size: 26rpx;
 					color:rgba(51,51,51,1);
+					&:not(:last-child) {
+						margin-bottom: 20rpx;
+					}
+				}
 			}
 		}
 		.bottom {
@@ -437,7 +455,7 @@ export default {
 				> view:nth-child(6){
 					@include image-size($image-width: 33rpx, $image-height: 35rpx);
 					.order-num {
-						left: 24rpx;
+						left: 44rpx;
 					}
 				}
 			}

pages/shop/index.vue

@@ -351,7 +351,7 @@
 			z-index: 9;
 			position: fixed;
 			right: 30rpx;
-			bottom: 300rpx;
+			bottom: 110rpx;
 			width: 100rpx;
 			height: 100rpx;
 			background: rgba(253, 211, 96, 1);

pages/zhibo/index.nvue

@@ -312,10 +312,11 @@
     width: 690rpx;
 }
 .danmuitem{
-    font-size: 26rpx;
+    font-size: 30rpx;
     color: #fff;
     flex-direction: column-reverse;
     word-wrap:anywhere;
+    font-weight: bold;
 }
 </style>
 
@@ -418,6 +419,7 @@ export default {
         "Authorization" : 'Bearer' + " " + token
       },
       success(res){
+          
         console.log(res)
         that.info = res.data.data
         // that.list= res.data.data
@@ -461,6 +463,10 @@ export default {
       });
     },
     errors(a){
+        this.videoContext.stop();
+        setTimeout(() => {
+            this.videoContext.play()
+        },1000)
         console.log(a)
     },
     newpeople(list){
@@ -497,6 +503,11 @@ export default {
       // 	this.contentPosition = 'message-box'+(this.room.messages.length-1);
               // }, 300)
       console.log(message)
+      if(message.type == 1){
+         
+          console.log('stop')
+          return ;
+      }
               this.danmulist.push(message)
 
               if(this.danmulist.length > 7){

static/imservice.js

@@ -38,7 +38,7 @@ function CurrentUser(uuid, name, avatar) {
 function IMService() {
     this.im = GoEasyIM.getInstance({
         host:'hangzhou.goeasy.io',//qos=1
-        appkey:'BC-453aa755c4ea48148abefc55a86df283'
+        appkey:'BC-d9b5e639006b4ee2a4bc9eddc4235a6a'
     });
     this.status = false
     this.lianjie = false