解决样式问题

Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
1
2020-08-20 14:24:17 +08:00 · 2020-08-20 14:23:32 +08:00 · 2020-08-20 14:23:21 +08:00 · 2020-08-20 12:05:44 +08:00 · 2020-08-20 12:05:15 +08:00 · 2020-08-20 11:43:19 +08:00
75 changed files with 1355 additions and 825 deletions
--- a/App.vue
+++ b/App.vue
@@ -18,8 +18,20 @@
 			})
 			// 刷新token
 			if (this.hasLogin) {
-					this.refreshToken_function();
+                this.refreshToken_function();
 			}
+            // #ifdef APP-PLUS
+            //app关闭默认的启动 方法关闭启动图。但是这个时间不能太晚，6s 超时后依旧会主动关闭。
+            setTimeout(()=>{
+                plus.navigator.closeSplashscreen();
+             },3000)
+            // #endif
+		},
+		onShow(){
+
+		},
+		onHide(){
+
 		},
 		methods: {
 			...mapMutations(['loginIn']),
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -271,12 +271,13 @@ export default {
 				});
 			},
 			// 我的优惠券(已有的)
-			getMemberCouponList({ store_id, gc_id, type, status }) {
+			getMemberCouponList({ store_id, gc_id, type, status, page }) {
 				return vm.$u.post('Coupon/getMemberCouponList', {
 					store_id: store_id,
 					gc_id: gc_id,
 					type: type,
 					status: status,
+					page: page,
 				});
 			},
 			// 获取直播列表
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -242,6 +242,10 @@ export default {
 				if(type > 0) Object.assign(params, {type: type});
 				return vm.$u.post('Order/orderList', params);
 			},
+			// 各种订单数量
+			getOrderNumber() {
+				return vm.$u.post('order/orderNumber');
+			},
 			// 售后列表
 			// getAfterSaleList({ page }) {
 			// 	return vm.$u.post('order/afterSaleList', { page: page });
@@ -353,6 +357,12 @@ export default {
 					code: code,
 				});
 			},
+			// 获取可送洗商品
+			getSendOrderList({ page }) {
+				return vm.$u.post('member/getSendOrderList', {
+					page: page,
+				});
+			},
 			// 送洗列表-平台订单 实体店订单
 			sendLaundryOrderList({ type, page }) {
 				return vm.$u.post('member/sendLaundryOrderList', {
@@ -421,7 +431,7 @@ export default {
 			couponGoodsList({ voucher_id, page, order }) {
 				return vm.$u.post('Coupon/couponGoodsList', { 
 					page: page,
-					voucher_id: voucher_id,
+					vouchertemplate_id: voucher_id,
 					order: order,
 				});
 			},
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -2,7 +2,7 @@ var md5 = require("../static/js/md5.min.js")
 const install = (Vue, vm) => {
 	// 此为自定义配置参数，具体参数见上方说明
 	Vue.prototype.$u.http.setConfig({
-		baseUrl: 'https://dmmall.sdbairui.com/api',
+		baseUrl: 'https://mall.dmygkeji.com/api',
 		loadingText: '努力加载中~',
 		loadingTime: 800,
        originalData: true
--- a/common/store/index.js
+++ b/common/store/index.js
@@ -20,6 +20,7 @@ const store = new Vuex.Store({
 		token: "", // 储存token
 		showLoginModel: false, // 登录框
 		question: {}, // 帮助与反馈
+		showCoupons: true, // 是否显示新人领取优惠券
 	},
 	getters: {
 		getOrderAddress(state) {
@@ -79,6 +80,9 @@ const store = new Vuex.Store({
 		},
 		setQuestion(state, question) {
 			state.question = question;
+		},
+		updateShowCoupons(state, status) {
+			state.showCoupons = status;
 		}
 	}
 })
--- a/components/comment/index.vue
+++ b/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"></image>
+			<image :src="src" v-for="(src, index) in content.geval_image" :key="index" @click="previewImage(content.geval_image)"></image>
 		</view>
 		<view class="reply" v-if="reply && content.geval_explain">
 			<view class="title">掌柜回复：</view>
@@ -39,6 +39,14 @@ export default {
 	},
 	created() {
 		if(this.content.hasOwnProperty('scores_two')) this.rate = this.content.scores_two;
+	},
+	methods: {
+		previewImage(urls) {
+			console.log(urls);
+			// uni.previewImage({
+			// 	urls: urls,
+			// });
+		},
 	}
 };
 </script>
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -1,9 +1,12 @@
 <template>
    <view class="video-item" v-if="item" @click="toDetailsPage(item.article_id,item.video_path)">
        <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 class="header_fist" v-else>
+			<view class="backes">
+                <u-icon name="play-circle-fill" color="#ffffff" size="20"></u-icon>
+                <text>视频</text>
+            </view>
+			<image class="head" :src="item.article_pic"  mode="aspectFill"></image>
 		</view>
        <view class="title" v-if="">{{ item.article_title }}</view>
        <view class="jianjie">{{ item.article_content }}</view>
@@ -12,7 +15,7 @@
                <image :src="item.member_avatar"></image>
                <text>{{ item.member_nickname }}</text>
            </view>
-            <image src="/static/image/common/4.png" @click.stop="showAction"></image>
+            <image class="img-imp" src="/static/image/common/4.png" @click.stop="showAction"></image>
 			<view class="action" v-if="show == item.article_id">
 				<view class="bubble">
 					<view @click.stop="articleLike">
@@ -100,8 +103,9 @@
            }
        }
        >image{
-            width: 37rpx;
+            width: 35rpx;
            height: 8rpx;
+            padding: 20rpx;
        }
 		.action {
 			z-index: 19;
@@ -172,11 +176,22 @@
 	.header_fist{
 		position: relative;
 		.backes{
+            z-index: 99;
 			position: absolute;
-			top: 0;
-			width: 100%;
-			height: 100%;
-			color: #fff;
+            display: flex;
+            align-items: center;
+            justify-content: space-around;
+			top: 10rpx;
+            left: 10rpx;
+			width: 80rpx;
+			height: 30rpx;
+            padding: 0 10rpx;
+            border-radius: 30rpx;
+			background-color: rgba(0,0,0,0.5);
+            & > text {
+                color: #fff;
+                font-size: 18rpx;
+            }
 		}
 		
 	}
@@ -242,7 +257,9 @@ export default {
 				if(res.errCode == 0) {
                    this.$u.toast(res.message);
 					this.$emit("updateList");
-				}
+				} else {
+                    this.$u.toast(res.message);
+                }
 			})
 		},
 		toDetailsPage(id,type) {
--- a/components/informations/notice/notice.vue
+++ b/components/informations/notice/notice.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="notice">
+	<view class="notice" :style="{height : height  + 'px'}">
 		<view v-for="(item,index) in notice" :key="index"  @click="gotoInfo(index)">
 			<view class="time_notice">{{ item.addtime }}</view>
 			<view class="notice_view">
@@ -36,6 +36,7 @@
 			margin: 0 auto;
 			text-align: left;
 			line-height: 40rpx;
+			letter-spacing: 2rpx;
 		}
 		.notice_view > view:nth-child(3){
 			height: 84rpx;
@@ -77,7 +78,8 @@
        props: ['list'],
 		data() {
 			return {
-				notice : []
+				notice : [],
+				height : ''
 			};
 		},
        watch: {
@@ -86,6 +88,8 @@
                this.notice = newVal;
            }
        },
+		onLoad() {
+		},
        methods: {
            gotoInfo(index) {
                console.log(index);
--- a/components/shop/group/index.vue
+++ b/components/shop/group/index.vue
@@ -8,13 +8,12 @@
 			</view>
        </view>
        <view class="label">
-            <!-- <u-tabs-swiper ref="group" :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> -->
 			<u-tabs :list="classifyList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24"  inactive-color="#333333"></u-tabs>
        </view>
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 340rpx;">
 			<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
 				<!-- 最多显示3个 -->
-				<view v-if="groupList[i]">
+				<view v-if="groupList[i]" class="group-container">
 					<sitem :info="info" v-for="(info, index) in groupList[i].slice(0, 3)" :key="index"></sitem>
 				</view>
 				<u-empty text="暂无拼团商品" mode="list" color="#000" v-if="!groupList[i] || !groupList[i].length" style="margin: 0 auto;"></u-empty>
@@ -62,7 +61,7 @@ export default {
 				gc_id: id,
 			}).then(res => {
 				this.groupList[this.current] = res.data;
-				// console.log(this.groupList);
+				console.log(this.groupList);
 				this.$forceUpdate();
 			})
 		},
@@ -106,10 +105,12 @@ export default {
    .list {
 		box-sizing: border-box;
 		padding: 0 30rpx;
-        display: flex;
-		> view {
-			&:not(:nth-child(3n)) {
-				margin-right: 20rpx;
+		.group-container {
+			display: flex;
+			> view {
+				&:not(:nth-child(3n)) {
+					margin-right: 20rpx;
+				}
 			}
 		}
    }
--- a/components/shop/group/item.vue
+++ b/components/shop/group/item.vue
@@ -3,8 +3,8 @@
        <image class="head" :src="info.pintuan_image" mode="widthFix"></image>
        <text class="title u-line-1">{{ info.pintuan_goods_name }}</text>
        <view class="price">
-            <view>￥{{ info.pintuan_goods_price }}</view>
-           	<view>立即拼团</view>
+            <view class="value">￥{{ info.pintuan_goods_price }}</view>
+           	<view class="btn">立即拼团</view>
        </view>
    </view>
 </template>
@@ -61,18 +61,22 @@ export default {
        margin-top: 10rpx;
    }
    .price{
-        // display: flex;
+        display: flex;
        // align-items: center;
-        // justify-content: space-between;
-        margin-top: 10rpx;
-        > view:first-child{
+		// align-content: flex-end;
+        justify-content: space-between;
+        margin-top: 16rpx;
+        .value {
            font-size: 26rpx;
            color: #FF3131;
-			margin-bottom: 12rpx;
+			// margin-bottom: 12rpx;
        }
-        > view:last-child{
+        .btn {
 			font-size: 22rpx;
+			height: 22rpx;
            color: #FDD360;
+			text-align: end;
+			// margin-top:8rpx;
        }
    }
 }
--- a/components/shop/list/index.vue
+++ b/components/shop/list/index.vue
@@ -2,7 +2,6 @@
    <view class="list">
        <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="26" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper> -->
 			<u-tabs :list="classifyList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24"  inactive-color="#333333"></u-tabs>
 		</view>
 		<swiper class="swiper-box" :current="swiperCurrent" @animationfinish="animationfinish" :style="{height: swiperHeight}">
@@ -49,7 +48,7 @@ export default {
 		this.getGoodsClassRecommend();
 	},
 	methods: {
-		loadMore(page) {
+		loadMore() {
 			if(!this.timer) return false;
 			this.loadStatus = "loading";
 			this.page++;
@@ -72,6 +71,7 @@ export default {
 		},
 		getGoodsClassRecommend() {
 			this.$u.api.getGoodsClassRecommend().then(res => {
+				console.log(res)
 				if (res.errCode == 0) {
 					// 初始化 current
 					this.current = 0;
@@ -97,7 +97,7 @@ export default {
 		},
 		setSwiperHeight() {
 			// height: 480rpx, margin-bottom: 26rpx
-			const height = Math.ceil(this.goodsList[this.current].length / 2) * (480 + 26);
+			const height = Math.ceil(this.goodsList[this.current].length / 2) * (450 + 26);
 			this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
 			// console.log(this.swiperHeight);
 		},
--- a/components/shop/list/item.vue
+++ b/components/shop/list/item.vue
@@ -4,7 +4,7 @@
        <view class="info">
            <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>
+            <text class="price">￥{{ info.goods_price }}<text style="font-size:22rpx;color:#999;text-decoration:line-through;display: inline-block;margin-left:20rpx"> ￥{{info.goods_marketprice}}</text></text>
        </view>
    </view>
 </template>
@@ -44,14 +44,14 @@ export default {
 <style lang="scss" scoped>
 .item{
    width: 330rpx;
-	height: 480rpx;
+	height: 450rpx;
    margin-bottom: 26rpx;
    background-color: #f8f8f8;
    border-radius: 10rpx 10rpx 0rpx 0rpx;
    .img{
 		width: 330rpx;
 		height: 300rpx;
-		background: rgba(245,245,245,1);
+		background: rgb(114, 110, 110);
 		border-radius: 10rpx 10rpx 0rpx 0rpx;
 		margin-bottom: 24rpx;
    }
--- a/components/shop/recommend/pintuan.vue
+++ b/components/shop/recommend/pintuan.vue
@@ -10,8 +10,8 @@
        <view class="connect">
            <view class="user">
                <view class="avatar">
-					<image :src="info.member_avatar[0]"></image>
-					<image :src="info.member_avatar[1]"></image>
+					<image src="/static/image/common/32.png"></image>
+					<image src="/static/image/common/31.png"></image>
 				</view>
 				<view class="num">{{ info.pintuan_limit_number }}人团</view>
            </view>
@@ -91,7 +91,7 @@ export default {
 		}
    }
    .connect{
-		padding:10rpx 30rpx 30rpx;
+		padding:10rpx 0 30rpx;
        display: flex;
 		align-items: center;
        .user {
--- a/components/shop/seckill/index.vue
+++ b/components/shop/seckill/index.vue
@@ -19,7 +19,7 @@
            </view>
 			<view class="next" @click="viewMore">
 				<text>查看更多</text>
-				<u-icon name="arrow-right" color="#999" size="18"></u-icon>
+				<u-icon name="arrow-right" color="#999" size="22"></u-icon>
 			</view>
        </view>
        <view class="list">
@@ -82,7 +82,7 @@ export default {
                    background-color: #000;
                }
                .mah {
-                    vertical-align: text-top;
+                   color: #999999;
                }
            }
        }
--- a/components/shop/special-shop/index.vue
+++ b/components/shop/special-shop/index.vue
@@ -1,26 +1,26 @@
 <template>
 	<view class="special">
-		<view v-if="type == 'spike'">
-			<image :src="item.groupbuy_image1" @click="spikeGoods"></image>
+		<view v-if="type == 'spike'" @click="spikeGoods">
+			<image :src="item.groupbuy_image1" mode="aspectFill"></image>
 			<view class="right">
-				<view class="name u-line-1" @click="spikeGoods">{{ item.goods_name }}</view>
+				<view class="name u-line-1">{{ item.goods_name }}</view>
 				<view class="price">
 					<view class="groupbuy-price">￥{{ item.groupbuy_price }}</view>
 					<view class="goods-price">￥{{ item.goods_price }}</view>
 				</view>
 				<view class="buy">
 					<view class="num">剩余{{ item.inventory }}件</view>
-					<view class="btn" @click="spikeGoods">立即购买</view>
+					<view class="btn">立即购买</view>
 				</view>
 			</view>
 		</view>
-		<view v-if="type == 'group'">
-			<image :src="item.pintuan_image" @click="toDetailsPage"></image>
+		<view v-if="type == 'group'" @click="toDetailsPage">
+			<image :src="item.pintuan_image"></image>
 			<view class="right"> 
-				<view class="name u-line-1" @click="toDetailsPage">{{ item.pintuan_goods_name }}</view>
+				<view class="name u-line-1">{{ item.pintuan_goods_name }}</view>
 				<view class="price group">
 					<view class="groupbuy-price">￥{{ item.pintuan_goods_price }}</view>
-					<view class="btn" @click="toDetailsPage">立即拼团</view>
+					<view class="btn">立即拼团</view>
 				</view>
 			</view>
 		</view>
--- a/components/shop/youhq/index.vue
+++ b/components/shop/youhq/index.vue
@@ -2,11 +2,12 @@
 	<view class="coupon-swiper">
 		<view class="top">
 			<view class="title">全部优惠券</view>
-			<view class="view-more" @click="toCouponPage">查看更多></view>
+			<view class="view-more" @click="toCouponPage">
+				<text>查看更多</text>
+				<u-icon name="arrow-right" color="#999" size="22"></u-icon>
+			</view>
 		</view>
-		<!-- <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="60" ></u-tabs-swiper> -->
 		<u-tabs :list="couponGroupList" name="gc_name" :is-scroll="true" :current="couponCurrent" @change="couponTabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24"  inactive-color="#333333"></u-tabs>
-		 <!-- :style="{ height: swiperHeight }" -->
 		<swiper class="box" :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
 				<!-- 最多显示四个 -->
@@ -114,6 +115,8 @@ export default {
 		.view-more {
 			font-size: 20rpx;
 			color: rgba(153,153,153,1);
+			display: flex;
+			align-items: center;
 		}
 	}
    .box {
--- a/manifest.json
+++ b/manifest.json
@@ -11,8 +11,8 @@
        "nvueCompiler" : "uni-app",
        "compilerVersion" : 3,
        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
+            "alwaysShowBeforeRender" : false,
+            "waiting" : false,
            "autoclose" : true,
            "delay" : 0
        },
--- a/pageA/bindinges/bindinges.vue
+++ b/pageA/bindinges/bindinges.vue
@@ -9,7 +9,7 @@
 				</view>
 				<view class="labales flex-inp">
 					<input type="number" maxlength="6" placeholder="请输入验证码" v-model="sms_code" />
-					<button class="identifying" :class="is_sendcode ? 'sended' : ''" @click="getCode" :disabled="is_sendcode">{{ is_sendcode ? time_count + "后可以重新发送" : "发送验证码" }}</button>
+					<u-button id="btn" class="identifying" :hair-line="false" hover-class="none" :class="is_sendcode ? 'sended' : ''" @click="getCode" :disabled="is_sendcode">{{ is_sendcode ? time_count + "后可以重新发送" : "发送验证码" }}</u-button>
 				</view>
 				<!-- 服务协议 -->
 				<view class="pact">
@@ -133,8 +133,8 @@
                            title: res.message,
                            type: 'success',
                        })
-                        uni.switchTab({
-                             url: '/pages/index/index'
+                        uni.navigateTo({
+                             url: '/pageA/topick/topick'
                        });
                    } else {
                        this.$refs.uToast.show({
--- a/pageA/login/login.vue
+++ b/pageA/login/login.vue
@@ -61,6 +61,7 @@
 	</view>
 </template>
 <script>
+	import IMService from '@/static/imservice.js'
 	import identifying from '@/components/logininput/identifying'
 	import {
 		mapMutations
@@ -107,6 +108,8 @@
 			let pages = getCurrentPages();
 			let prePage = pages[pages.length - 2];
 			this.temp_url = prePage.route;
+			console.log(this.imService.lianjie)
+			this.imService.disconnect()
 			// console.log(this.temp_url);
 		},
 		// 切断正常返回
@@ -181,6 +184,7 @@
 							me.loginIn(res.data.token); //存储一个字符传值
 							// 缓存用户的信息
 							uni.setStorageSync('user_info',res.data);
+							this.imService.disconnect()
 							if (res.data.member.has_labels) {
 								uni.switchTab({
 									url: '/pages/index/index'
@@ -233,11 +237,11 @@
                                                    console.log(res.data.member.member_mobilebind);
 													if(res.data.member.member_mobilebind) {
 														uni.switchTab({
-																url: "/pages/index/index"
+															url: "/pages/index/index"
 														});
 													} else {
 														uni.navigateTo({
-															 url: '/pageA/bindinges/bindinges'
+															url: '/pageA/bindinges/bindinges'
 														});
 													}
 												}
@@ -271,11 +275,11 @@
                                                    console.log(res.data.member.member_mobilebind);
 													if(res.data.member.member_mobilebind) {
 														uni.switchTab({
-																url: "/pages/index/index"
+															url: "/pages/index/index"
 														});
 													} else {
 														uni.navigateTo({
-															 url: '/pageA/bindinges/bindinges'
+															url: '/pageA/bindinges/bindinges'
 														});
 													}
 												}
--- a/pageA/pactList/pactList.vue
+++ b/pageA/pactList/pactList.vue
@@ -73,11 +73,11 @@ export default {
 		width: 90%;
 		margin: 0 auto;
 		padding: 16upx 0;
-		font-size: 26upx;
+		font-size: 30upx;
 		color: #333;
 	}
 	.rict_type {
 		text-indent: 1rem;
-		line-height: 1.2;
+		line-height: 1.4;
 	}
 </style>
--- a/pageB/comment/index.vue
+++ b/pageB/comment/index.vue
@@ -86,7 +86,7 @@ export default {
 				this.evalueList = [];
 			}
 			return res.data.length;
-		}
+		},
 	}
 };
 </script>
--- a/pageB/components/userinfo/index.vue
+++ b/pageB/components/userinfo/index.vue
@@ -1,7 +1,7 @@
 <template>
    <view class="userinfo" @click="stopClick()">
        <view class="userhead">
-            <image class="avatar" :src="item.member_avatar"></image>
+            <image class="avatar" :src="item.member_avatar" @click="gotoInfo(item.role,item.member_id,item.store_id)"></image>
            <!-- <text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text> -->
            <image class="follow" :src=" !is_follow ? '../../static/image/userinfo/follow.png' : '../../static/image/userinfo/followed.png' " mode="" @click="following(item.member_id)"></image>
        </view>
@@ -24,7 +24,7 @@
            <text class="operat-span">{{ comment_num }}</text>
        </view>
        <!-- 购物车 -->
-        <view class="operat gouwu">
+        <view class="operat gouwu" v-if="cart_num">
            <image class="operat-img" :src=" is_cart ? '../../static/image/userinfo/gouwuche1.png' : '../../static/image/userinfo/gouwuche.png' "
                mode="" @click="carting()"></image>
        </view>
@@ -75,13 +75,14 @@
        /* #endif */
        align-items: center;
        flex-direction: column;
-        padding: 0 30rpx;
+        // padding: 0 30rpx;
    }

    .operat-span {
        margin-top: 10rpx;
        font-size: 28rpx;
        color: #fff;
+        text-shadow: 0px 0px 4rpx #999999;
    }

    .operat-img {
@@ -100,18 +101,20 @@
                is_collect: this.list.is_collect || false,
                is_content: false,
                is_cart: false,
+                cart_num: 0,
                comment_num: this.list.comment_num || 0,
-                item: this.list || {}
+                item: this.list || {},
            }
        },
        watch: {
            list(newValue, old) {
-                // console.log(newValue);
+                // console.log(newValue.goods.length);
                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;
                this.comment_num = this.list.comment_num || 0;
+                this.cart_num = newValue.goods.length;
            },
            cart(newValue, old) {
                // console.log(newValue);
@@ -132,7 +135,7 @@
            // 关注
            following(id) {
                uni.request({
-                    url: "https://dmmall.sdbairui.com/api/member/attentionMember",
+                    url: "https://mall.dmygkeji.com/api/member/attentionMember",
                    method: "POST",
                    data: {
                        member_id: id
@@ -161,7 +164,7 @@
            likeType(id) {
                // console.log(id);
                uni.request({
-                    url: "https://dmmall.sdbairui.com/api/article/articleLike",
+                    url: "https://mall.dmygkeji.com/api/article/articleLike",
                    method: "POST",
                    data: {
                        article_id: id
@@ -192,7 +195,7 @@
            // 收藏
            collecting(id) {
                uni.request({
-                    url: "https://dmmall.sdbairui.com/api/article/articleCollect",
+                    url: "https://mall.dmygkeji.com/api/article/articleCollect",
                    method: "POST",
                    data: {
                        article_id: id
@@ -238,6 +241,17 @@
                    cart: this.is_cart
                });
            },
+            gotoInfo(type,id,s_id) {
+                if (type == 2) {
+                    uni.navigateTo({
+                        url: "/pageC/merchant/index?id=" + s_id
+                    })
+                } else {
+                    uni.navigateTo({
+                        url: "/pageB/details/index?id=" + id
+                    })
+                }
+            },
            // 冒泡
            stopClick() {
            }
--- a/pageB/coupon/details.vue
+++ b/pageB/coupon/details.vue
@@ -45,6 +45,7 @@
 				<view>我们有万能穿搭公式</view>
 			</view>
 		</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
@@ -60,8 +61,14 @@ export default {
 	methods: {
 		exchangeCoupon() {
 			this.$u.api.getCoupon({ id: 1 }).then(res => {
-				this.$u.toast(res.message);
-				if(res.errCode == 0) {}
+				if(res.errCode == 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						url: '/pageE/tool/MineCoupon'
+					})
+				} else {
+					this.$u.toast(res.message);
+				}
 			})
 		},
 	}
--- a/pageB/details/index.vue
+++ b/pageB/details/index.vue
@@ -19,7 +19,8 @@
            <view class="box">
            	<videoItem v-for="item in listInfo" :key="item.article_id" :item="item"
            	 @getArticlelist="getArticlelist"></videoItem>
-                 <view class="no-data" v-show="!listInfo && page">暂无数据</view>
+                 <view class="no-data" v-if="!listInfo && page">暂无数据</view>
+                 <u-loadmore v-else class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
            </view>
        </scroll-view>
    </view>
@@ -75,6 +76,13 @@ export default {
            listInfo: [], // 列表详情
            member_id: 0,
            page: 1,
+            status: 'loadmore',
+            iconType: 'circle',
+            loadText: {
+                loadmore: '轻轻上拉',
+                loading: '努力加载中',
+                nomore: '实在没有了'
+            },
        }
    },
    onLoad(option) {
@@ -84,6 +92,10 @@ export default {
        this.getArticlelist();

    },
+    onReachBottom() {
+        // this.page++;
+        this.getArticlelist();
+    },
    methods:{
        // 获取信息
        getUserInfo(id) {
@@ -107,13 +119,23 @@ export default {
            }).then(res => {
                if (res.errCode == 0) {
                    // console.log(res);
-                    this.listInfo = res.data.list;
+                    // this.listInfo = res.data.list;
                    // console.log(this.listInfo);
+                    if (this.page == 1) {
+                    	this.listInfo = res.data.list;
+                        this.status = "loadmore";
+                    } else if (res.data.length == 0) {
+                        this.status = "nomore";
+                    } else {
+                    	this.listInfo  = this.listInfo.concat(res.data.list);
+                    }
+                    this.page++;
                } else {
                    console.log(res.message);
                }
            })
        },
+
        dianji(a){
            console.log(a);
            if(typeof a == "object"){
@@ -121,7 +143,13 @@ export default {
            }else{
                this.num = a
            }
-            this.getArticlelist();
+            if (a == 0) {
+                this.page = 1;
+                this.getArticlelist();
+            } else if (a == 1) {
+                this.page = 1;
+                this.getArticlelist();
+            }
        }
    }
 }
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -158,17 +158,21 @@
 			display: flex;
 			flex-wrap: wrap;
 			.label {
-				padding: 6rpx 10rpx;
-				margin: 0 10rpx 10rpx 0;
-				font-size: 24rpx;
+				height: 40rpx;
+				padding: 4rpx 14rpx;
+				margin-right: 10rpx;
+				margin-bottom: 10rpx;
+				font-size: 26rpx;
+				text-align: center;
+				line-height: 38rpx;
 				color: #fff;
-				border-radius: 6rpx;
-				background-color: #000000;
-				opacity: 0.5;
+				border-radius: 10rpx;
+				background-color: rgba(0, 0, 0, .6);
 			}
 		}
    }
    .userinfo{
+        z-index: 9999;
        position: absolute;
        right: 30rpx;
        top: 50%;
@@ -335,6 +339,7 @@
 					color: #333;
 					font-size: 28rpx;
 					.title {
+						line-height: 40rpx;
 					}
 					.name {
 						width: 500rpx;
@@ -345,6 +350,8 @@
 						display: -webkit-box;
 						-webkit-box-orient: vertical;
 						-webkit-line-clamp: 2;
+						margin:8rpx 0;
+						line-height:36rpx;
 					}
 					.price {
 						color: #FF3131;
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -29,6 +29,7 @@
 				</view>
 				<view class="pic" v-else-if="type == 1">
 					<text>￥{{ goodsInfo.goods_price || '0.00' }}</text>
+					<s>￥{{ goodsInfo.goods_marketprice || '0.00' }}</s>
 				</view>
 				<view class="collect" @click="switchCollect(goodsInfo.is_collect)">
 					<u-icon name="star-fill" color="#FF7807" size="28" v-if="goodsInfo.is_collect == 1"></u-icon>
@@ -129,7 +130,7 @@
 					<view class="head">
 						<image class="image" :src="goodsInfo.goods_image"></image>
 						<view class="info">
-							<text class="u-line-2">{{goodsInfo.goods_name}}</text>
+							<view class="goods-name u-line-2">{{goodsInfo.goods_name}}</view>
 							<text v-if="type == 1">￥{{ goodsInfo.goods_price }}</text>
 							<text v-else-if="type == 2">￥{{ goodsInfo.pintuan_price }}</text>
 							<text v-else-if="type == 3">￥{{ groupbuyInfo.groupbuy_price }}</text>
@@ -1206,11 +1207,13 @@ export default {
 				justify-content: space-between;
 				margin-left: 27rpx;
 				flex-direction: column;
-				>text:first-child{
+				.goods-name {
+					height: 76rpx;
+					line-height: 38rpx;
 					font-size: 28rpx;
 					color: #333;
 				}
-				>text:last-child{
+				> text:last-child {
 					font-size: 30rpx;
 					color: #ff3131;
 				}
--- a/pageB/search/searchGoods.vue
+++ b/pageB/search/searchGoods.vue
@@ -17,7 +17,9 @@
 				<view class="right">
 					<view class="name u-line-1">{{ goods.goods_name }}</view>
 					<view class="briefing u-line-1">{{ goods.goods_advword }}</view>
-					<view class="price">￥{{ goods.goods_price }}</view>
+					<view class="price">￥{{ goods.goods_price }} 
+						<text style="font-size:22rpx;color:#999;text-decoration:line-through;display: inline-block;margin-left:20rpx"> ￥{{goods.goods_marketprice}}</text>
+					</view>
 				</view>
 			</view>
 			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
@@ -122,6 +124,7 @@ export default {
 				if(load == 'reload') this.goodsList = res.data.data;
 				else if(load == 'loadmore') this.goodsList.push(...res.data.data);
 			}
+			console.log(res)
 			return res.data.data.length;
 		},
 		loadMore() {
@@ -164,6 +167,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
 .classify-goods {
 	.tab-container {
 		box-sizing: border-box;
--- a/pageB/video/video.nvue
+++ b/pageB/video/video.nvue
@@ -1,28 +1,28 @@
 <template>
    <view class="container">
        <video id="videoId" :style="videoSize" :src="src" autoplay="true" :show-fullscreen-btn="false" @play="playing"
-            @pause="pausing" @ended="videoEnd" @timeupdate="timeupdate" :show-play-btn="false" controls="false" @click="stoping"
+            @pause="pausing" @ended="videoEnd" @timeupdate="timeupdate" :show-play-btn="false" :controls="false" @click="stoping"
            :enable-progress-gesture="false" :show-center-play-btn="false"></video>
        <!-- 用户操作 -->
        <userinfo class="user-info" :style="{ top: fixTop }" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num"
            @openCart="openPopup"></userinfo>
        <!-- 视频信息 -->
-        <cover-view class="info-box" @click="stopClick">
+        <cover-view class="info-box">
            <view class="video-info-box" :style="{ width: time_count > 99 ? '180rpx' : '160rpx' }">
                <image class="image-play" src="../../static/videoIcon.png" mode=""></image>
                <text class="video-slip">视频</text>
                <text class="time">{{ time_count }}s</text>
            </view>
            <view>
-                <text class="name">@{{ list.member_nickname }}</text>
+                <text class="name" @click="gotoInfo(list)">@{{ list.member_nickname }}</text>
            </view>
-            <view>
+            <view @click="stopClick">
                <text class="title">{{ list.article_title }}</text>
            </view>
-            <view>
+            <view @click="stopClick">
                <text class="centent">{{ list.article_content }}</text>
            </view>
-            <view class="label-box">
+            <view class="label-box" @click="stopClick">
                <block v-for="(item,index) in list.label" :key="index">
                    <text class="label" :style="{ width: labelLen[index] * 40 + 'rpx' }">{{ item.name }}</text>
                </block>
@@ -52,7 +52,7 @@
                        <view class="comment-list-box">
                            <view class="comment-list-header">
                                <image class="avatar" :src="item.member_avatar" mode=""></image>
-                                <view>
+                                <view class="comment-title-info">
                                    <text class="comment-title">{{ item.member_nickname }}</text>
                                    <text class="comment-time">{{ item.create_time }}</text>
                                </view>
@@ -133,7 +133,7 @@

 <script>
    import userinfo from "../components/userinfo/index" // 点赞组件
-    const temp_url = "https://dmmall.sdbairui.com/api/";
+    const temp_url = "https://mall.dmygkeji.com/api/";
    export default {
        components: {
            userinfo
@@ -177,6 +177,9 @@
        onReady() {
            this.videoBox = uni.createVideoContext("videoId", this);
        },
+        onHide() {
+            this.videoBox.pause();
+        },
        onBackPress() {
            if (this.cart_type) {
                this.cart_type = !this.cart_type;
@@ -344,11 +347,7 @@
                            width: "750rpx",
                            height: res.screenHeight + "px",
                        }
-                        this.fixTop = "400rpx";
                        this.fixTop = res.screenHeight / 3;
-                        // #ifdef H5
-                        this.fixTop = 400 + 'rpx'
-                        // #endif
                    }
                })
            },
@@ -460,6 +459,9 @@
                    url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
                })
            },
+            gotoInfo(id) {
+                console.log(id);
+            },
            // 收起键盘
            hideEdit() {},
            // stop
@@ -476,8 +478,10 @@
 </script>

 <style>
+    
    .container {
        position: relative;
+        background-color: #FF0000 !important;
    }

    /* 关闭 */
@@ -497,6 +501,9 @@
        left: 330rpx;
        width: 100rpx;
        height: 100rpx;
+        /* #ifdef H5 */
+        top: 500rpx;
+        /* #endif */
    }
    
    .pause-img {
@@ -507,7 +514,10 @@
    /* 用户操作 */
    .user-info {
        position: fixed;
-        right: 30rpx;
+        right: 26rpx;
+        /* #ifdef H5 */
+        top: 400rpx;
+        /* #endif */
    }

    /* 底部信息 */
@@ -621,6 +631,7 @@
        font-size: 28rpx;
        color: #333;
        lines: 2;
+		letter-spacing: 2rpx;	
    }

    .more-content-box {
@@ -670,6 +681,10 @@
        border-radius: 50%;
    }
    
+    .comment-title-info {
+        justify-content: space-between;
+    }
+
    .comment-title {
        font-size: 26rpx;
        color: #333;
@@ -839,13 +854,17 @@
    }

    .title {
+        width: 700rpx;
        color: #fff;
        font-size: 26rpx;
        margin-bottom: 20rpx;
+        lines: 1;
+        text-overflow: ellipsis;
+		letter-spacing: 2rpx;
    }

    .centent {
-        width: 500rpx;
+        width: 600rpx;
        color: #fff;
        font-size: 28rpx;
        margin-bottom: 20rpx;
--- a/pageC/cart/ConfirmOrder.vue
+++ b/pageC/cart/ConfirmOrder.vue
@@ -26,7 +26,7 @@
 							<view class="info">
 								<view class="name u-line-2">{{ goods.goods_name }}</view>
 								<view class="cart-info">
-									<view class="price">￥{{ goods.goods_total }}</view>
+									<view class="price">￥{{ goods.goods_price }}</view>
 									<view>×{{ goods.goods_num }}</view>
 								</view>
 							</view>
@@ -309,32 +309,47 @@ export default {
 		},
 		setTotalPrice() {
 			const goods = this.orderInfo.store_goods_total;
-			// console.log(this.freight);
-			const freight = this.freight;
-			let price = 0;
-			// 商品价格加上运费
-			[goods, freight].forEach(object => {
-				for (const key in object) {
-					if (object.hasOwnProperty(key)) {
-						const element = object[key];
-						price += Number(element);
-					}
-				}
-			})
-			// 减去优惠券
-			// 平台
-			if(JSON.stringify(this.choiceCoupon) != '{}') price -= Number(this.choiceCoupon.voucher_price);
-			// 店铺
-			if(JSON.stringify(this.storeCoupon) != '{}') {
-				for (const key in this.storeCoupon) {
-					if (this.storeCoupon.hasOwnProperty(key)) {
-						const element = this.storeCoupon[key];
-						price -= element.voucher_price;
-					}
+			let [freight, price, minPrice] = [0, 0, 0];
+			// 运费
+			for (const key in this.freight) {
+				if (this.freight.hasOwnProperty(key)) {
+					const element = this.freight[key];
+					freight += Number(element);
 				}
 			}
-			// console.log(price);
-			this.totalPrice = price.toFixed(2);
+			// 商品价格减去优惠券
+			// 店铺
+			for (const gid in goods) {
+				if (goods.hasOwnProperty(gid)) {
+					// 计算最小价格
+					minPrice += 0.01;
+					// 每个店铺所有商品的价格
+					let sprice = Number(goods[gid]);
+					if(JSON.stringify(this.storeCoupon) != '{}') {
+						for (const cid in this.storeCoupon) {
+							if (this.storeCoupon.hasOwnProperty(cid)) {
+								const cprice = this.storeCoupon[cid];
+								// 商品减去优惠券价格
+								if(gid == cid) {
+									sprice -= cprice.voucher_price;
+									// 每个店铺最低付款 0.01
+									if(sprice <= 0) sprice = 0.01;
+								}
+							}
+						}
+					}
+					// 所有商品总价
+					price += sprice;
+				}
+			}
+			// 平台
+			if(JSON.stringify(this.choiceCoupon) != '{}') price -= Number(this.choiceCoupon.voucher_price);
+			// 每个店铺最低付款 0.01
+			if(price <= minPrice) price = minPrice;
+			// console.log("minPrice" + minPrice);
+			// console.log("freight:" + freight);
+			// console.log("price:" + price);
+			this.totalPrice = (price + freight).toFixed(2);
 		},
 		setDelivery(index) {
 			if(index == 1) {
--- a/pageC/classify/goods.vue
+++ b/pageC/classify/goods.vue
@@ -17,7 +17,11 @@
 				<view class="right">
 					<view class="name u-line-1">{{ goods.goods_name }}</view>
 					<view class="briefing u-line-1">{{ goods.goods_advword }}</view>
-					<view class="price">￥{{ goods.goods_price }}</view>
+					<!-- <view class="price">￥{{ goods.goods_price }}</view> -->
+					<view class="price">
+						<view class="present">￥{{ goods.goods_price }}</view>
+						<view class="origin">￥{{ goods.goods_marketprice }}</view>
+					</view>
 				</view>
 			</view>
 			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
@@ -189,9 +193,23 @@ export default {
 					font-size: 28rpx;
 					color: rgba(102,102,102,1);
 				}
+				// .price {
+				// 	font-size: 26rpx;
+				// 	color: rgba(255,49,49,1);
+				// }
 				.price {
-					font-size: 26rpx;
-					color: rgba(255,49,49,1);
+					display: flex;
+					align-items: center;
+					.present {
+						font-size: 26rpx;
+						color: rgba(255,49,49,1);
+						margin-right: 20rpx;
+					}
+					.origin {
+						text-decoration: line-through;
+						font-size: 24rpx;
+   						color: #999;
+					}
 				}
 			}
 		}
--- a/pageC/merchant/classifyGoods.vue
+++ b/pageC/merchant/classifyGoods.vue
@@ -14,7 +14,7 @@
 		</view>
 		<scroll-view scroll-y class="scroll-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
 			<view class="goods-container">
-				<view v-for="goods in goodsList" :key="goods.goods_id" class="goods-view" @click="toDetailsPage(goods.goods_id)">
+				<view v-for="goods in goodsList" :key="goods.goods_id" class="goods-view">
 					<goodsItem :info="goods"></goodsItem>
 				</view>
 			</view>
@@ -128,12 +128,6 @@ export default {
 			this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * 90 + 'px';
 			// console.log(this.scrollHeight);
 		},
-		toDetailsPage(id) {
-			this.$u.route('/pageB/sdetails/index', {
-				id: id,
-				type: 1 // 商品详情 商品类型 1普通 2拼团 3秒杀 4优惠券
-			});
-		},
 		setTitle(title){
 			uni.setNavigationBarTitle({
 				title: title
--- a/pageC/merchant/goods.vue
+++ b/pageC/merchant/goods.vue
@@ -18,7 +18,7 @@
 					<goodsItem :info="goods"></goodsItem>
 				</view>
 			</view>
-			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
+			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-bottom="120" v-if="goodsList.length >= pageSize"></u-loadmore>
 			<u-empty mode="list" v-if="!goodsList.length"></u-empty>
 		</scroll-view>
 	</view>
--- a/pageC/merchant/index.vue
+++ b/pageC/merchant/index.vue
@@ -220,7 +220,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.scrollHeiht = res.windowHeight - (73 + 20 + 170) + 'px';
+			this.scrollHeiht = res.windowHeight - res.windowWidth / 750 * (350 + 140 + 20) + 'px';
            this.paddingTop = res.windowWidth / 750 * (90 + 50) + 'px';
            // console.log(this.paddingTop);
 		}
@@ -240,6 +240,7 @@ export default {
 	// min-height: 100vh;
 	background-color: #ECECEC;
 	padding-top: calc(350rpx - var(--window-top));
+	overflow: hidden;
 	.top {
 		position: fixed;
 		top: 0;
@@ -312,6 +313,7 @@ export default {
 		}
 	}
 	.follow {
+		height: 140rpx;
 		background-color: #ffffff;
 		width: 100%;
 		margin-bottom: 20rpx;
@@ -365,7 +367,8 @@ export default {
 	}
 	.main{
 		.video-image {
-			padding-bottom: 98rpx;
+			box-sizing: border-box;
+			padding-bottom: 100rpx;
 		}
 		.container-top {
 			> view {
@@ -381,9 +384,6 @@ export default {
 				margin-bottom: 10rpx;
 			}
 		}
-		// > view {
-		// 	margin-top: 20rpx;
-		// }
 	}
 	.tabbar {
 		border-top: 1rpx #DBDADA solid;
--- a/pageC/spike/index.vue
+++ b/pageC/spike/index.vue
@@ -23,7 +23,7 @@
 	</view>
 </template>
 <script>
-import SpecialGoods from "../../components/shop/special-shop/index"
+import SpecialGoods from "@/components/shop/special-shop/index"
 export default {
 	data() {
 		return {
@@ -81,10 +81,14 @@ export default {
 				// box-sizing: content-box;
 				width: 26rpx;
 				// height: 25rpx;
-				background-color: #bfbfbf;
+				background-color: #000;
+				color: #ffffff;
 				margin: 0 10rpx;
 				padding: 2rpx;
 			}
+			.mah {
+				color: #999999;
+			}
 		}
 	}
 }
--- a/pageD/activity/activity.vue
+++ b/pageD/activity/activity.vue
@@ -1,5 +1,5 @@
 <template>
-	<view id="actives">
+	<view id="actives" :style="{height : height  + 'px'}">
 		<!-- 活动消息推送 -->
        <block v-for="(item, index) in actives" :key="index">
            <view class="time">{{ item.addtime }}</view>
@@ -22,13 +22,21 @@
 	export default {
 		data() {
 			return {
+				height:'600',
 				actives: [
 					
 				]
 			};
 		},
 		onLoad(){
-			this.messageactivityList()
+			var _that = this
+			_that.messageactivityList();
+			uni.getSystemInfo({
+			    success: function (res) {
+			        console.log(res.windowHeight);
+					_that.height = res.windowHeight
+			    }
+			});
 		},
 		methods: {
 			titletext(){
@@ -47,7 +55,7 @@
 	};
 </script>

-<style lang="scss" scoped>
+<style lang="scss">
    page {
        background-color: #ECECEC;
    }
@@ -55,7 +63,7 @@
 		height: 100%;
 	}
 	#actives{
-			height: 100%;
+			background: #ECECEC;
            .time {
                padding: 30rpx 0;
                color: #666;
@@ -73,7 +81,7 @@
 		padding: 39rpx 0 30rpx;
 	}
 	.content{
-		width:630rpx;
+		width:94%;
 		padding: 30rpx;
 		background:rgba(255,255,255,1);
 		border-radius:20rpx;
@@ -97,6 +105,7 @@
                justify-content: center;
 				width: 100%;
 				height: 140rpx;
+				line-height: 36rpx;
                padding: 20rpx;
 				background: rgba(241,241,241,1);
                & > text {
--- a/pageD/logistics/logistics.vue
+++ b/pageD/logistics/logistics.vue
@@ -2,18 +2,18 @@
 	<view id="actives">
 		<!-- 活动消息推送 -->
 		<view class="activity" v-for="(item, index) in actives" :key="index">
-			<view class="times">{{item.type}}</view>
+			<view class="times">{{item.kd_time}}</view>
 			<view class="content">
 				<view class="store_name">
-					<image src="../../pageE/static/mine/1.png"></image>
-					<view>小时代</view>
+					<image :src="item.store_avatar"></image>
+					<view>{{item.store_name}}</view>
 				</view>
 				<view class="xiantiao"></view>
-				<view class="title">{{item.name}}</view>
+				<view class="title">{{item.title}}</view>
 				<view class="images_about">
-					<image :src="item.url"></image>
+					<image :src="item.picture"></image>
 					<view>
-						<text>{{item.about}}</text>
+						<text>{{item.summary}}</text>
 					</view>
 				</view>
 			</view>
@@ -35,8 +35,9 @@
 		methods: {
            getCartList() {
                this.$u.post("message/orderDeliveryList",{page: this.page}).then(res => {
+					console.log(res.data.data)
                    if (res.errCode == 0) {
-                        this.actives == res.data;
+                        this.actives = res.data.data;
                    }
                })
            }
@@ -46,7 +47,10 @@
 	};
 </script>

-<style lang="scss" scoped>
+<style lang="scss" >
+page{
+	background-color: #ECECEC;
+}
 	#actives{
 			height: 100%;
 	}
--- a/pageD/notice/notice.vue
+++ b/pageD/notice/notice.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view id="viewes" :style="{height : height  + 'px'}">
 		<!-- 公告咨询 -->
 		<notice :list="list"></notice>
 	</view>
@@ -10,33 +10,42 @@
 	export default {
 		data() {
 			return {
-                list: [],
+				list: [],
 			};
 		},
-		onLoad(){
+		onLoad() {
 			this.informationList();
+			var _that = this
+			uni.getSystemInfo({
+			    success: function (res) {
+			        console.log(res.windowHeight);
+					_that.height = res.windowHeight
+			    }
+			});
 		},
 		methods: {
-			titletext(){
-			},
-			informationList(){
-				this.$u.api.informationList({}).then((res)=>{
-                    if (res.errCode == 0) {
-                        this.list = res.data;
-                    }
+			titletext() {},
+			informationList() {
+				this.$u.api.informationList({}).then((res) => {
+					if (res.errCode == 0) {
+						this.list = res.data;
+					}
 				})
 			}
 		},
-		components:{
+		components: {
 			notice,
 		}
 	};
 </script>

 <style lang="scss" scoped>
-    page {
-        background-color: #ECECEC;
-    }
+	page {
+		background-color: #ECECEC;
+	}
+	#viewes{
+		background: #ECECEC;
+	}
 	.sousuo {
 		height: 113rpx;
 		border: 1px #f00 solid;
--- a/pageD/privateChat/privateChat.vue
+++ b/pageD/privateChat/privateChat.vue
@@ -59,7 +59,7 @@
 				<div :class="[audio.visible ? 'record-icon record-open':'record-icon']" @click="switchAudioKeyboard"></div>
 				<div class="record-input" @longpress="onRecordStart" @touchend="onRecordEnd" v-if="audio.visible" >{{audio.recording ? '松开发送' : '按住录音'}}</div>
 				<div class="message-input" v-else>
-					<input type="text" placeholder="发送消息" v-model="content">
+					<input type="text" placeholder="发送消息" v-model="content" @click="bindtapInput">
 				</div>
 				<div class="file-icon img-video" @click="sendImage"></div>
 				<div class="file-icon" @click="sendVideo"></div>
@@ -84,6 +84,7 @@
 			return {
 				//聊天文本框
 				content: '',
+				bottom : '',
 				friend: null,
 				currentUser: null,
 				//已经接收到的消息
@@ -154,6 +155,11 @@
 			this.imService.resetFriendUnReadMessage(this.friend);
 		},
 		methods: {
+			bindtapInput(){
+				console.log("222")
+				var _that = this;
+				_that.bottom = 14
+			},
 			initialListeners () {
 				//传入监听器，收到一条私聊消息总是滚到到页面底部
 				this.imService.onNewPrivateMessageReceive =  (friendId, message)=> {
--- a/pageE/mine/ArticleDetails.vue
+++ b/pageE/mine/ArticleDetails.vue
@@ -8,7 +8,7 @@ import common from '@/static/js/common.js'
 export default {
 	data() {
 		return {
-			nodes: '',
+			nodes: "",
 		}
 	},
 	onLoad(option) {
@@ -18,6 +18,9 @@ export default {
 		if(option.type == 1) this.certificateInfo();
 		if(option.type == 2) this.getAboutUsInfo();
 	},
+	onNavigationBarButtonTap(e) {
+		console.log(e);
+	},
 	methods: {
 		setTitle(title){
 			uni.setNavigationBarTitle({
@@ -54,10 +57,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+// page {
+// 	background-color: #ECECEC;
+// }
 .article-details {
 	min-height: calc(100vh - var(--window-top));
 	background: #ECECEC;
 	padding: 20rpx 35rpx 0;
-	line-height: 45rpx;
 }
 </style>
--- a/pageE/mine/MedalIntroduction.vue
+++ b/pageE/mine/MedalIntroduction.vue
@@ -27,9 +27,10 @@ export default {
 	methods: {
 		getMemberPointsStat() {
 			this.$u.api.getMemberPointsStat().then((res)=>{
+				console.log(res)
 				if (res.errCode == 0) {
-					this.title = res.data.grade_rule.document_title;
-					const nodes = res.data.grade_rule.document_content;
+					this.title = res.data.xunzhang_rule.document_title;
+					const nodes = res.data.xunzhang_rule.document_content;
 					this.nodes = common.unescapeHTML(nodes);
 				}
 			})
--- a/pageE/mine/MineConcerns.vue
+++ b/pageE/mine/MineConcerns.vue
@@ -117,7 +117,7 @@ export default {
 		display: flex;
 		flex-wrap: wrap;
 		margin-left: -20rpx;
-		.daren-item{
+		.daren-item {
 			width: 215rpx;
 			height: 282rpx;
 			display: flex;
@@ -128,6 +128,7 @@ export default {
 			overflow: hidden;
 			margin-left: 20rpx;
 			margin-bottom: 20rpx;
+			box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
 			.head{
 				width: 80rpx;
 				height: 80rpx;
--- a/pageE/mine/storeConcerns.vue
+++ b/pageE/mine/storeConcerns.vue
@@ -133,8 +133,10 @@ export default {
 </script>
 <style lang="scss" scoped>
 .collection-item {
+	width: 100%;
 	background-color: #ffffff;
 	.item {
+		width: 750rpx;
 		padding: 30rpx;
 		display: flex;
 		> image {
@@ -145,14 +147,17 @@ export default {
 			flex-shrink: 0;
 		}
 		.title-wrap {
+			overflow: hidden;
 			flex: 1;
 			.item-top {
+				width: 100%;
 				font-size: 30rpx;
 				color: rgba(51,51,51,1);
 				line-height: 44rpx;
 				margin-bottom: 54rpx;
 			}
 			.item-bottom {
+				width: 100%;
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
--- a/pageE/more/Complaints.vue
+++ b/pageE/more/Complaints.vue
@@ -5,7 +5,7 @@
 				<view class="suggestions">
 					<view class="text">{{ item.fb_content }}</view>
 					<view class="image">
-						<image v-for="(url, index) in item.fb_images" :key="index" :src="url"></image>
+						<image v-for="(url, index) in item.fb_images" :key="index" :src="url" mode="aspectFit" @click="previewImage(item.fb_images)"></image>
 					</view>
 				</view>
 				<view class="reply" v-if="item.is_reply">
@@ -13,7 +13,7 @@
 					<view class="reply-content u-line-4">{{ item.reply_content }}</view>
 				</view>
 				<view class="date">
-					<image src="../static/mine/26.png"></image>
+					<image src="../static/mine/26.png" mode="aspectFit"></image>
 					<view>{{ item.fb_time }}</view>
 				</view>
 			</view>
@@ -45,6 +45,12 @@ export default {
 				}
 			})
 		},
+		previewImage(urls) {
+			// console.log(urls);
+			uni.previewImage({
+				urls: urls,
+			});
+		},
 	},
 }
 </script>
--- a/pageE/order/Logistics.vue
+++ b/pageE/order/Logistics.vue
@@ -25,6 +25,7 @@
 					<view class="info u-line-2">{{ item.content }}</view>
 					<view class="date">{{ item.kd_time }}</view>
 				</view>
+				<u-empty text="暂无物流信息" mode="data" icon-size="88" margin-top="60"></u-empty>
 			</view>
 		</view>
 	</view>
--- a/pageE/setting/Index.vue
+++ b/pageE/setting/Index.vue
@@ -23,6 +23,7 @@
 	import {
 		mapMutations
 	} from 'vuex';
+	import IMService from '@/static/imservice.js'
 	export default {
 		data() {
 			return {
@@ -63,7 +64,8 @@
 					},
 					{
 						title: '关于我们',
-						link: '../mine/ArticleDetails?type=2'
+						// link: '../mine/ArticleDetails?type=2'
+						link: '/pageE/setting/version'
 					},
 					{
 						title: '帮助与反馈',
@@ -88,7 +90,10 @@
 					url: url
 				});
 			},
-			loginOut() {
+			async loginOut() {
+				// 显示新人领取优惠券
+				this.$store.commit('updateShowCoupons', true);
+				let im = this.imService
 				this.logout();
 				uni.redirectTo({
 					url: "../../pageA/login/login",
--- a/pageE/setting/ShieldUsers.vue
+++ b/pageE/setting/ShieldUsers.vue
@@ -14,7 +14,7 @@
 export default {
 	data() {
 		return {
-			src: 'https://dmmall.sdbairui.com/uploads/home/avatar/avatar_19.jpg',
+			src: 'https://mall.dmygkeji.com/uploads/home/avatar/avatar_19.jpg',
 			userList: [],
 		}
 	},
--- a/pageE/setting/feedback.vue
+++ b/pageE/setting/feedback.vue
@@ -3,8 +3,8 @@
 		<view class="feedback-box">
 			<view class="feedback-title">人工服务</view>
 			<view class="feedback-itme">
-				<view class="manual">
-					<view class="service-phone">拨打官方客服电话：400-100-100</view>
+				<view class="manual" @click="makePhone">
+					<view class="service-phone">拨打官方客服电话：{{ tel400 }}</view>
 					<view class="manual-time">{{ wkTime }}</view>
 				</view>
 				<view class="suggestions" @click="writeComments">意见反馈</view>
@@ -31,6 +31,11 @@ export default {
 		this.getHelpList();
 	},
 	methods: {
+		makePhone() {
+			uni.makePhoneCall({
+				phoneNumber: this.tel400,
+			});
+		},
 		viewAnswer(item) {
 			this.$store.commit('setQuestion', item);
 			this.$u.route('pageE/setting/question');
--- a/pageE/setting/updateVersion.vue
+++ b/pageE/setting/updateVersion.vue
@@ -0,0 +1,58 @@
+<template>
+	<u-modal v-model="show" :show-cancel-button="true" confirm-text="升级" title="发现新版本" @cancel="cancel" @confirm="confirm">
+		<view class="u-update-content">
+			<rich-text :nodes="content"></rich-text>
+		</view>
+	</u-modal>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: true,
+				// 传递给uni-app"rich-text"组件的内容，可以使用"<br>"进行换行
+				content: `
+					1. 新增几个bug<br>
+					2. 新增Modal模态框组件<br>
+					3. 新增压窗屏组件，可以在APP上以弹窗的形式遮盖导航栏和底部tabbar<br>
+				`,
+			}
+		},
+		onReady() {
+			this.show = true;
+		},
+		methods: {
+			cancel() {
+				this.closeModal();
+			},
+			confirm() {
+				this.closeModal();
+			},
+			closeModal() {
+				uni.navigateBack();
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		background-color: rgba(0, 0, 0, 0);
+	}
+	/deep/ .u-mode-center-box {
+		background-color: transparent;
+	}
+	// .u-full-content {
+	// 	background-color: #00C777;
+	// }
+	.u-update-content {
+		font-size: 26rpx;
+		color: $u-content-color;
+		line-height: 1.7;
+		padding: 30rpx;
+	}
+    ::v-deep.u-mode-center-box {
+        background-color: transparent;
+    }
+</style>
--- a/pageE/setting/version.vue
+++ b/pageE/setting/version.vue
@@ -0,0 +1,108 @@
+<template>
+	<view class="version">
+		<view class="header">
+			<image src="../../pageD/images/file.png" class="tit-img" mode=""></image>
+			<view class="title">德铭阳光</view>
+			<view class="tit-info">版本:{{ version }} for {{ phone_type }}</view>
+		</view>
+		<view class="main">
+			<view @click="viewAboutUs">
+				<text class="title">产品介绍</text>
+				<u-icon name="arrow-right" color="#999"></u-icon>
+			</view>
+			<view class="version-view">
+				<text class="title">版本更新</text>
+				<text class="tips" v-if="1">已是最新版本</text>
+				<text class="tips" v-else @click="updateVersion">发现新版本</text>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			version: "",
+			phone_type: "",
+		}
+	},
+	onLoad() {
+		this.getVersion();
+		this.phone_type = this.$u.os();
+	},
+	methods: {
+		// 检查版本号
+		getVersion() {
+			this.$u.post("Specialci/checkVersion",{ app_version: 1 }).then(res => {
+				// console.log(res);
+				this.version = res.data.app_version;
+			})
+		},
+		viewAboutUs() {
+			this.$u.route('/pageE/mine/ArticleDetails', {
+				type: 2
+			});
+		},
+		updateVersion() {
+			this.$u.route('/pageE/setting/updateVersion');
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.header {
+	width: 500rpx;
+	margin: 0 auto;
+	padding: 30rpx;
+	text-align: center;
+    .tit-img {
+			width: 200rpx;
+			height: 200rpx;
+		}
+		.title {
+			margin: 18rpx 0;
+			font-weight: bold;
+			font-size: 26rpx;
+			letter-spacing: 2rpx;
+		}
+		.tit-info {
+			font-size: 22rpx;
+			color: #666;
+		}
+}
+.main {
+	margin: 20rpx 0;
+	& > view {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		height: 100rpx;
+		padding: 0 20rpx;
+		line-height: 100rpx;
+		color: #333;
+		font-size: 30rpx;
+		background-color: #fff;
+		border-bottom: 1px solid #f2f2f2;
+		.title {
+			width: 200rpx;
+		}
+	}
+	.tips {
+		color: #999;
+		font-size: 22rpx;
+	}
+	.version-view {
+		.tips {
+			flex: 1;
+			text-align: right;
+		}
+	}
+}
+.u-content {
+    padding: 20rpx;
+    font-size: 30rpx;
+    text-indent: 1rem;
+    line-height: 1.2;
+}
+</style>
--- a/pageE/tool/MineCoupon.vue
+++ b/pageE/tool/MineCoupon.vue
@@ -3,13 +3,14 @@
 		<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>
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ height: swiperHeight }">
 			<swiper-item class="swiper-item" v-for="(_, index) in list" :key="index">
-				<scroll-view scroll-y class="scroll-coupon">
+				<scroll-view scroll-y class="scroll-coupon" @scrolltolower="onreachBottom">
 					<view v-if="couponList[index]">
 						<view class="coupon-item" v-for="(coupon, c_index) in couponList[index]" :key="c_index">
 							<Coupon :couponInfo="coupon" :status='index' @use="useCoupon($event)" :goodsClass="goodsClass"></Coupon>
 						</view>
 					</view>
 					<u-empty text="暂无优惠券" mode="coupon" v-if="!couponList[index] || !couponList[index].length"></u-empty>
+					<u-loadmore :status="loadStatus[current]" bgColor="#FFFFFF" font-size="14" margin-top="20" margin-bottom="20" @loadmore="onreachBottom" v-if="!couponList[index] || couponList[index].length>=pageSize"></u-loadmore>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
@@ -32,6 +33,10 @@ export default {
 			swiperHeight: '',
 			couponList: [],
 			goodsClass: [],
+			pageSize: 6,
+			page: 0,
+			timer: true,
+			loadStatus: ['loadmore', 'loadmore', 'loadmore'],
 		}
 	},
 	components: {
@@ -46,8 +51,7 @@ export default {
 	},
 	watch: {
 		current(value) {
-			let status = value + 1;
-			this.getMemberCouponList(status);
+			this.getMemberCouponList(value);
 		}
 	},
 	methods: {
@@ -56,20 +60,35 @@ export default {
 				this.goodsClass = res.data;
 			})
 		},
-		getMemberCouponList(current) {
-			this.$u.api.getMemberCouponList({
-				status: current
-			}).then(res => {
-				if(res.errCode == 0) {
-					this.couponList[this.current] = res.data;
-				} else {
-					this.couponList[this.current] = [];
-				}
-				this.$forceUpdate();
+		async getMemberCouponList({ load = 'reload' }) {
+			if(load == 'reload') this.page = 0;
+			const res = await this.$u.api.getMemberCouponList({
+				status: this.current + 1, // 代金券状态 1:未用 2:已用 3:过期 4:收回
+				page: this.page,
+			})
+			this.timer = true;
+			if(load == 'reload') this.couponList[this.current] = res.data;
+			else if(load == 'loadmore') this.couponList[this.current].push(...res.data);
+			this.$forceUpdate();
+			// console.log(this.couponList);
+			return res.data.length;
+		},
+		onreachBottom() {
+			if(!this.timer) return false;
+			this.timer = false;
+			this.loadStatus.splice(this.current, 1, "loading");
+			this.page++;
+			this.getMemberCouponList({ load: 'loadmore' }).then(length => {
+				this.loadStatus.splice(this.current, 1, "nomore");
+				if(length == 0) this.page--;
+			}).catch(() => {
+				this.loadStatus.splice(this.current, 1, "nomore");
+				console.log(this.loadStatus[this.current]);
+				this.page--;
 			})
 		},
 		useCoupon(coupon) {
-			console.log(coupon);
+			// console.log(coupon);
 			// if(coupon.type == 1) {
 			// 	this.$u.route({
 			// 		type: 'switchTab',
@@ -81,7 +100,7 @@ export default {
 			// 	});
 			// }
 			this.$u.route('pageE/useCoupon/index', {
-				cid: coupon.voucher_id,
+				cid: coupon.vouchertemplate_id,
 			});
 		},
 		setViewHeight() {
--- a/pageE/tool/MineHistory.vue
+++ b/pageE/tool/MineHistory.vue
@@ -19,7 +19,7 @@
 			</view>
 			<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 :status="loadStatus" bgColor="#ECECEC" margin-top="20" margin-bottom="20" v-if="historyList.length > pageSize" @loadmore="reachBottom"></u-loadmore>
+			<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>
 </template>
--- a/pageE/tool/SendWash.vue
+++ b/pageE/tool/SendWash.vue
@@ -21,7 +21,7 @@
 							<view class="order-status">{{ item.order_status | viewStatus }}</view>
 						</view>
 						<view class="order-info">
-							<image :src="type == 1 ? item.goods_image : item.images[0]"></image>
+							<image :src="type == 1 ? item.goods_image : item.images[0]" mode="aspectFit"></image>
 							<view v-if="item.deliver_goods_type == 2 && item.order_status == 20">
 								<view>骑手名字：{{ item.takeawayer_name || '' }}</view>
 								<view>联系方式：{{ item.takeawayer_mobile || '' }}</view>
--- a/pageE/tool/WashOrder.vue
+++ b/pageE/tool/WashOrder.vue
@@ -85,7 +85,7 @@
 							</view>
 						</u-upload>
 					</view>
-					<view class="wash-btn" @click="submitImage">确认送洗</view>
+					<view class="wash-btn" @click="$u.throttle(submitImage, 2000)">确认送洗</view>
 				</scroll-view>
 			</swiper-item>
 			<swiper-item class="swiper-item">
@@ -141,7 +141,7 @@
 						</view>
 					</u-upload>
 				</view>
-				<view class="wash-btn" @click="submitImage">确认送洗</view>
+				<view class="wash-btn" @click="$u.throttle(submitImage, 2000)">确认送洗</view>
 			</swiper-item>
 		</swiper>
 		<u-select v-model="showClothesType" :list="typeList" value-name="id" label-name="name" @confirm="confirmType" mode="single-column"></u-select>
@@ -160,7 +160,7 @@
 					<text>选择订单</text>
 					<u-icon name="close" color="#A29FA3" size="32" @click="showPopup=false"></u-icon>
 				</view>
-				<scroll-view scroll-y class="order-list">
+				<scroll-view scroll-y class="order-list" @scrolltolower="onreachBottom">
 					<u-radio-group v-model="value" @change="radioChange">
 						<view v-for="(items, index) in orderList" :key="index" class="order-item">
 							<view class="store">
@@ -195,6 +195,7 @@
 							</view>
 						</view>
 					</u-radio-group>
+					<u-loadmore :status="loadStatu" bgColor="#FFFFFF" font-size="14" margin-top="20" margin-bottom="20"></u-loadmore>
 				</scroll-view>
 				<view class="order-btn" @click="confirm">确认</view>
 			</view>
@@ -222,7 +223,7 @@ export default {
 			}],
 			typeList: [], // 商品类型列表
 			orderList: [], // 商品列表
-			page: 0,
+			page: 1,
 			current: 0,
 			swiperCurrent: 0,
 			areaList: [], //　地址列表
@@ -244,6 +245,8 @@ export default {
 				name: 'common', // 其他图片
 			},
 			debounce: true,
+			timer: true,
+			loadStatu: 'loadmore'
 		}
 	},
 	onShow() {
@@ -284,20 +287,38 @@ export default {
 			// console.log(e);
 			this.type = e[0];
 		},
+		onreachBottom() {
+			if(!this.timer) return false;
+			this.timer = false;
+			this.loadStatu = "loading";
+			this.page++;
+			this.getOrderList({ load: 'loadmore' }).then(length => {
+				if(length == 0) {
+					this.page--;
+					this.loadStatu = "nomore";
+				} else {
+					this.loadStatu = "loadmore";
+				}
+			}).catch(() => {
+				this.loadStatu = "nomore";
+				this.page--;
+			})
+		},
 		async getOrderList({ load = 'reload' } = {}) {
-			const res = await this.$u.api.getOrderList({
+			const res = await this.$u.api.getSendOrderList({
 				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;
+			return res.data.length;
 		},
 		submitImage() {
-			if(!this.debounce) return;
+			// console.log(222);
+			if(!this.debounce) return false;
+			// console.log(111);
 			this.debounce = false;
 			this.current == 0 ? this.$refs.platform.upload() : this.$refs.physical.upload();
 		},
@@ -318,42 +339,42 @@ export default {
 		validationParams() {
 			if (this.current == 1) {
 				if(this.$u.test.isEmpty(this.goodsName)) {
-					this.showToast('商品名称不能为空', 'warning');
+					this.$u.toast('商品名称不能为空');
 					return false;
 				}
 			}
 			if(this.current == 0) {
 				if(JSON.stringify(this.checkedGoods) == '{}') {
-					this.showToast('订单不能为空', 'warning');
+					this.$u.toast('订单不能为空');
 					return false;
 				}
 			}
 			if(this.$u.test.isEmpty(this.goodsStatus)) {
-				this.showToast('衣服状况不能为空', 'warning');
+				this.$u.toast('衣服状况不能为空');
 				return false;
 			}
 			if(JSON.stringify(this.type) == '{}') {
-				this.showToast('商品类型不能为空', 'warning');
+				this.$u.toast('商品类型不能为空');
 				return false;
 			}
 			if(this.$u.test.isEmpty(this.name)) {
-				this.showToast('送洗人不能为空', 'warning');
+				this.$u.toast('送洗人不能为空');
 				return false;
 			}
 			if(this.$u.test.isEmpty(this.phone)) {
-				this.showToast('手机号不能为空', 'warning');
+				this.$u.toast('手机号不能为空');
 				return false;
 			}
 			if(!this.$u.test.mobile(this.phone)) {
-				this.showToast('手机号错误', 'warning');
+				this.$u.toast('手机号错误');
 				return false;
 			}
 			if(this.$u.test.isEmpty(this.area)) {
-				this.showToast('地址不能为空', 'warning');
+				this.$u.toast('地址不能为空');
 				return false;
 			}
 			if(this.$u.test.isEmpty(this.address)) {
-				this.showToast('详细地址不能为空', 'warning');
+				this.$u.toast('详细地址不能为空');
 				return false;
 			}
 			return true;
@@ -383,11 +404,10 @@ export default {
 			}
 			// console.log(params);
 			this.$u.api.sendLaundrySave(params).then(res => {
-				this.$u.toast(res.message);
+				// this.$u.toast(res.message);
 				if(res.errCode == 0) {
 					this.$refs.uToast.show({
 						title: res.message,
-						type: 'success',
 						back: true,
 					})
 				} else {
@@ -452,12 +472,6 @@ export default {
 				this.choose = false;
 			}
 		},
-		showToast(message, type) {
-			this.$refs.uToast.show({
-				title: message,
-				type: type,
-			})
-		},
 	},
 };
 </script>
--- a/pageE/useCoupon/index.vue
+++ b/pageE/useCoupon/index.vue
@@ -78,10 +78,10 @@ export default {
 			})
 			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);
+				if(load == 'reload') this.goodsList = res.data;
+				else if(load == 'loadmore') this.goodsList.push(...res.data);
 			}
-			return res.data.data.length;
+			return res.data.length;
 		},
 		loadMore() {
 			if(this.goodsList.length < this.pageSize) return false;
@@ -106,7 +106,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * 90 + 'px';
+			this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * (90 + 30) + 'px';
 		},
 		toDetailsPage(id) {
 			this.$u.route('/pageB/sdetails/index', {
--- a/pages.json
+++ b/pages.json
@@ -370,7 +370,7 @@
 								"searchInput": {
 									"align": "left",
 									"borderRadius": "15px",
-									"placeholder": "搜索您需要的商品",
+									"placeholder": "搜索您需要的本店铺商品",
 									"backgroundColor": "rgb(236,236,236)",
 									"disabled": true
 								}
@@ -862,8 +862,9 @@
 						"app-plus": {
 							"titleSize": "36px",
 							"titleNView": {
-								"type": "transparent",
-								"titleColor": "#ffffff"
+								"type": "default",
+								"titleColor": "#ffffff",
+								"backgroundColor":"#F09C6A"
 							}
 						}
 					}
@@ -992,6 +993,31 @@
 						}
 					}
 				},
+				{
+					"path": "setting/version",
+					"style": {
+						"navigationBarTitleText": "关于我们",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
+				{
+					"path": "setting/updateVersion",
+					"style": {
+						"navigationStyle": "custom",  // 取消本页面的导航栏
+						"app-plus": {
+							"animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型
+							"background": "transparent", // 背景透明
+							"backgroundColor": "rgba(0,0,0,0)", // 背景透明
+							"popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能
+						}
+					}
+				},
 				{
 					"path": "order/Index",
 					"style": {
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -39,7 +39,8 @@
 					</scroll-view>
 				</swiper-item>
 				<swiper-item>
-					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="swiperBottom">
+					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="swiperBottomLive(e)" :refresher-enabled="true" @refresherrefresh="dianji(1)" :refresher-triggered="refresher"  @refresherpulling="onPulling"
+            @refresherrestore="onRestore" @refresherabort="onAbort">
 						<view class="box">
 							<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
 							<view class="list">
@@ -52,8 +53,12 @@
 									 :key="item.live_id" :name="item.room_name" :image="item.cover_img" :url="item.url"  :item="item" @updateList="updateList"></zhiboItem>
 								</view>
 							</view>
-							<u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
+							<view style="height:600rpx" v-if="tabLiveLists.length == 0">
+								<u-empty text="暂无直播信息" mode="list"></u-empty>
+							</view>
+							<u-loadmore class="load-size" color="#999999" :status="status" v-if="tabLiveLists.length !=0" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
 						</view>
+						
 					</scroll-view>
 				</swiper-item>
 				<swiper-item>
@@ -217,6 +222,7 @@
    
 </style>
 <script>
+	import common from '@/static/js/common.js';
    import { mapState } from 'vuex'
 	import videoItem from "@/components/index/video-item/index"
 	import zhiboItem from "@/components/index/zhibo-item/index"
@@ -240,6 +246,7 @@
 				num: 0,
 				page: 1, // 0即第一页
                follow_page: 0, //
+                live_page: 1, // 
 				articleList: [],
 				recommendList: [], // 推荐达人
 				indexImageSwiper: [],
@@ -248,12 +255,14 @@
                fansList: [], // 关注的发现列表
                status: 'loadmore',
                status_1: 'loadmore',
+                status_live: 'loadmore',
                iconType: 'circle',
                loadText: {
                    loadmore: '轻轻上拉',
                    loading: '努力加载中',
                    nomore: '实在没有了'
 				},
+				refresher:true
 			}
 		},
 		components: {
@@ -263,46 +272,74 @@
 			darenItem
 		},
 		onShow() {
-            this.page = 1;
-            if (this.page != 1) {
+			console.log(this.imService.status)
+			if(!this.imService.status && 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()
+				
+			}else if(!this.imService.status){
+				 this.$u.api.getDefaultAvatar().then((res)=>{
+					console.log(res)
+					uni.setStorageSync("morenimg",res.data.avatar)
+					this.imService.login(new Date().getTime(),"123",res.data.avatar)
+					this.imService.connectIM()
+					console.log("用户信息")
+				})
+				console.log("链接")
+			}
+		
+			// if(!this.imService.status && !this.imService.lianjie){
+			// 	console.log("1212")
+			// 	this.imService.lianjie = true
+			// 	let that = this
+			// 	setTimeout(function(){
+			// 		that.imService.disconnect()
+			// 		console.log("guanbi")
+			// 	},1000)
+			// 	setTimeout(function(){
+			// 		console.log("lianjie")
+			// 		that.imService.connectIM()
+			// 	},2000)
+			// }
+			// 新人优惠券
+            if (this.$store.state.showCoupons) {
+                this.isNewmembervoucher();
            }
-            // if (this.hasLogin) {
-            //     this.isNewmembervoucher();
-            // }
 		},
 		async onLoad(){
            this.articleList = [];
            this.getArticlelist();
-            this.getSwiper();
+			this.getSwiper();
            // 优惠券
-			if(this.$store.state.hasLogin){
-				this.isNewmembervoucher();
-				const user = uni.getStorageSync('user_info');
-				// console.log(user)
-				this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
-				await this.imService.connectIM()
+			// 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)
+			// 	await this.imService.connectIM()
 				
-			}else{
-				await this.$u.api.getDefaultAvatar().then((res)=>{
-					console.log(res)
-					uni.setStorageSync("morenimg",res.data.avatar)
-					this.imService.login(new Date().getTime(),"123",res.data.avatar)
-					console.log("用户信息")
-				})
-				console.log("链接")
-				await this.imService.connectIM()
+			// }else{
+			// 	await this.$u.api.getDefaultAvatar().then((res)=>{
+			// 		console.log(res)
+			// 		uni.setStorageSync("morenimg",res.data.avatar)
+			// 		this.imService.login(new Date().getTime(),"123",res.data.avatar)
+			// 		console.log("用户信息")
+			// 	})
+			// 	console.log("链接")
+			// 	await this.imService.connectIM()

-			}
-			console.log("1212")
-			let that = this
-			setTimeout(function(){
-				that.imService.disconnect()
-				console.log("guanbi")
-			},1000)
-			setTimeout(function(){
-				console.log("lianjie")
-				that.imService.connectIM()
-			},2000)
+			// }
+			// console.log("1212")
+			// let that = this
+			// setTimeout(function(){
+			// 	that.imService.disconnect()
+			// 	console.log("guanbi")
+			// },1000)
+			// setTimeout(function(){
+			// 	console.log("lianjie")
+			// 	that.imService.connectIM()
+			// },2000)
 		},
 		onPullDownRefresh() {
            this.page = 1;
@@ -318,27 +355,31 @@
 				uni.showLoading({
                    title: "loading..."
                })
-				this.$u.api.tabLiveList({page:this.page}).then((res) => {
+				this.$u.api.tabLiveList({page:this.live_page}).then((res) => {
 					 // uni.stopPullDownRefresh();
-					this.status = "loading";
+					this.status_live = "loading";
+					this.refresher = false;
 					console.log(res)
                    if (res.errCode == 0) {
                        uni.hideLoading();
-                        if (this.page == 1) {
+                        if (this.live_page == 1) {
                        	this.tabLiveLists = res.data.data;
-                            this.status = "loadmore";
-                        } else if (res.data.data.length == 0 && this.page > 1) {
-                            this.status = "nomore";
+                            this.status_live = "loadmore";
+                            if (res.data.data.length < 4) {
+                                this.status_live = "nomore";
+                            }
+                        } else if (res.data.data.length == 0 && this.live_page > 1) {
+                            this.status_live = "nomore";
                        } else {
 							this.tabLiveLists  = this.tabLiveLists.concat(res.data.data);
 							console.log(this.tabLiveLists)
                        }
-                        if (res.data.data.length == 0 && this.page > 1) {
+                        if (res.data.data.length == 0 && this.live_page > 1) {
                        } else {
-                            this.page++;
+                            this.live_page++;
                        }
                    } else {
-                        this.status = "nomore"
+                        this.status_live = "nomore"
 					}
 					
 				})
@@ -372,28 +413,31 @@
 			},
            // 切换导航
 			dianji(a) {
-                // console.log(a);
+				console.log(a);
+
                if (a.type == "change") {
-                    this.num = a.detail.current
+                    this.num = a.detail.current;
                } else {
                    this.num = a;
                }
                // console.log(this.num);
                // 状态请求
-                if (a.type == "change") { // 强制请求一次
+                if (a.type == "change" || this.num == 1) { // 强制请求一次
                    if (this.num == 0) {
                        this.page = 1;
                        this.articleList = [];
-                        this.status = "loadmore";
+                        this.status = "nomore";
                        this.getArticlelist();
                        this.getSwiper();
                    } else if (this.num == 1) {
-                        this.page = 1;
+                        this.live_page = 1;
+                        this.status_live = "nomore";
                        this.getZhiBoSwiper(); // 直播轮播
-                        this.tabLiveList();
+						this.tabLiveList();
                    } else if (this.num == 2) {
                        this.follow_page = 0;
                        this.fansList = [];
+                        this.status_1 = "nomore";
                        if (this.hasLogin) {
                            this.getFollowList(); // 关注列表
                        }
@@ -403,11 +447,6 @@
 			},
            // 发现列表
 			getArticlelist() {
-                if (this.page > 1) {
-                    uni.showLoading({
-                        title: "loading..."
-                    })
-                }
 				this.$u.api.getArticlelist({
 					page: this.page,
 					is_video_img: 0, // 查询视频1 图文2 都查0
@@ -415,40 +454,34 @@
                    uni.stopPullDownRefresh();
                    this.status = "loading";
                    if (res.errCode == 0) {
-                        uni.hideLoading();
                        if (this.page == 1) {
-                        	this.articleList = res.data.list;
-                            this.status = "loadmore";
-                        } else if (res.data.length == 0 && this.page > 1) {
+                            this.articleList = res.data.list;
+                            if (!res.data.length) {
+                                this.status = "nomore";
+                            }
+                        } else if (res.data.length == 0) {
                            this.status = "nomore";
                        } else {
                            this.articleList = this.articleList.concat(res.data.list);
                        }
-                        if (res.data.length == 0 && this.page > 1) {
-                        } else {
-                            this.page++;
-                        }
-                    } else {
-                        this.status = "nomore"
                    }
 				})
+                console.log(this.page);
 			},
            // 屏蔽更新列表
            updateList() {
                this.page = 1;
+                this.articleList = [];
 				this.getArticlelist();
-				this.tabLiveList()
+				this.tabLiveList();
            },
            // 发现下拉加载
            swiperBottom(e) {
-				if(this.num == 0 ){
-	                this.getArticlelist();
-
-				}else if(this.num == 1){
-					console.log(123)
-					this.tabLiveList()
-				}
-                // console.log(e);
+                this.page++;
+	            this.getArticlelist();
+            },
+            swiperBottomLive() {
+                this.tabLiveList();
            },
            swiperTop() {
                // uni.startPullDownRefresh();
@@ -500,40 +533,20 @@
 			},
 			clickFImage(index) {
 				const item = this.indexImageSwiper[index];
-				console.log(item);
-				this.activityLink({
+				// console.log(item);
+				this.jumpPage({ 
 					type: item.url_type,
-					id: item.info_id
+                	id: item.info_id,
 				});
 			},
 			clickSImage(index) {
 				const item = this.zhiboImageSwiper[index];
-				console.log(item);
-				this.activityLink({
+				// console.log(item);
+				this.jumpPage({ 
 					type: item.url_type,
-					id: item.info_id
+                	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
-				})
-			},
            goSearch() {
                this.$u.route("/pageB/search/index", {
 					type: 2,
@@ -542,12 +555,27 @@
 			},
 			// 是否显示新人优惠券
 			isNewmembervoucher() {
+				this.$store.commit('updateShowCoupons', false);
 				this.$u.api.isNewmembervoucher().then(res => {
 					if(res.errCode == 0) {
 						this.$u.route('/pageB/coupon/index');
 					}
 				})
 			},
+			onPulling(e) {
+                console.log("onpulling", e);
+            },
+            onRestore() {
+                this.refresher = 'restore'; // 需要重置
+                console.log("onRestore");
+            },
+            onAbort() {
+                console.log("onAbort");
+            },
+			jumpPage(uri) {
+				// console.log(uri);
+				common.jumpPage({ type: uri.type, id: uri.id });
+			}
 		},
 	}
 </script>
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -125,7 +125,7 @@
 					const token = uni.getStorageSync('token');
 					let that = this
 					uni.request({
-						url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+						url:"https://mall.dmygkeji.com/api/Specialci/getAtwillUserInfo",
 						data:{
 							userId: 1
 						},
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -4,17 +4,6 @@
            <view class="top">
 				<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 u-line-1">{{ userInfo.member_nickname }}</view>
-						<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
-							<image src="/static/image/mine/13.png"></image>
-							<view class="rank-title">{{ userInfo.member_grade_name }}</view>
-						</view>
-					</view>
-					<view class="info-right">
-						<view class="info-phone">{{ userInfo.member_mobile | phoneFormat }}</view>
-						<view class="user-rank">等级:{{ userInfo.member_level || 0 }}级</view>
-					</view> -->
 					<view class="info-top">
 						<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
 						<view class="info-phone">{{ userInfo.member_mobile | phoneFormat }}</view>
@@ -62,9 +51,17 @@
 					</view>
 				</view>
 				<view class="content">
-					<view @click="toOtherPage('/order/Index?current=1')">
+					<view v-for="(item, index) in orderList" :key="index" @click="toOtherPage(item.link)">
+						<image :src="item.img"></image>
+						<view>{{ item.title }}</view>
+						<view class="order-num" v-if="item.number">
+							<text>{{ item.number }}</text>
+						</view>
+					</view>
+					<!-- <view @click="toOtherPage('/order/Index?current=1')">
 						<image src="/static/image/mine/6.png"></image>
 						<view>待支付</view>
+						<view class="order-num">{{ 99 }}</view>
 					</view>
 					<view @click="toOtherPage('/order/Index?current=2')">
 						<image src="/static/image/mine/35.png"></image>
@@ -89,7 +86,7 @@
                    <view @click="toOtherPage('/order/Index?current=7')">
                    	<image src="/static/image/mine/9.png"></image>
                    	<view>售后</view>
-                    </view>
+                    </view> -->
 				</view>
 			</view>
 			<view class="tool">
@@ -111,6 +108,10 @@
 						<image src="/static/image/mine/25.png"></image>
 						<view>优惠券</view>
 					</view>
+					<view @click="toOtherPage('/order/Index?current=4')">
+						<image src="/static/image/mine/39.png"></image>
+						<view>试穿试送</view>
+					</view>
 				</view>
 			</view>
 			<view class="more-tool">
@@ -132,6 +133,7 @@
 						<image src="/static/image/mine/15.png"></image>
 						<view>投诉意见</view>
 					</view>
+					<!-- <view></view> -->
 				</view>
 			</view>
 		</view>
@@ -146,7 +148,51 @@ export default {
 	},
    data() {
        return {
-            userInfo: {},
+			userInfo: {},
+			orderList: [
+				{
+					name: 'wait_pay',
+					title: '待支付',
+					img: '/static/image/mine/6.png',
+					link: '/order/Index?current=1',
+					number: '',
+				},
+				{
+					name: 'already_pay',
+					title: '待发货',
+					img: '/static/image/mine/35.png',
+					link: '/order/Index?current=2',
+					number: '',
+				},
+				{
+					name: 'wait_receipt',
+					title: '待收货',
+					img: '/static/image/mine/2.png',
+					link: '/order/Index?current=3',
+					number: '',
+				},
+				{
+					name: 'pintuan',
+					title: '拼团中',
+					img: '/static/image/mine/37.png',
+					link: '/order/Index?current=5',
+					number: '',
+				},
+				{
+					name: 'wait_evaluation',
+					title: '待评价',
+					img: '/static/image/mine/3.png',
+					link: '/order/Index?current=6',
+					number: '',
+				},
+				{
+					name: 'refund',
+					title: '售后',
+					img: '/static/image/mine/9.png',
+					link: '/order/Index?current=7',
+					number: '',
+				},
+			]
        };
 	},
 	filters: {
@@ -162,9 +208,11 @@ export default {
 			})
 		}
 		this.getUserInfo();
+		this.getOrderNumber();
 	},
-	onNavigationBarButtonTap() {
-		this.toOtherPage("/setting/Index");
+	onNavigationBarButtonTap(e) {
+		// console.log(e);
+		if(e.index == 0) this.$u.route('/pageE/setting/Index');
 	},
    methods: {
 		getUserInfo() {
@@ -176,7 +224,22 @@ export default {
 				}
 			})
 		},
+		getOrderNumber() {
+			this.$u.api.getOrderNumber().then(res => {
+				const object = res.data;
+				for (const key in object) {
+					if (object.hasOwnProperty(key)) {
+						let element = object[key];
+						const order = this.orderList.filter(item => item.name == key);
+						if(element > 99) element = "99+";
+						this.$set(order[0], 'number', element);
+					}
+				}
+				// console.log(this.orderList);
+			})
+		},
 		toOtherPage(url) {
+			// console.log(url);
 			uni.navigateTo({
 				url: '/pageE' + url
 			});
@@ -200,45 +263,6 @@ export default {
 			.user-info {
 				margin-left: 30rpx;
 				// display: flex;
-				.info-left {
-					margin-right: 15rpx;
-					.user-nickname {
-						max-width: 200rpx;
-						font-size: 30rpx;
-						color: rgba(51,51,51,1);
-						margin-bottom: 19rpx;
-					}
-					.user-medal {
-						display: flex;
-						width: 110rpx;
-						// height: 25rpx;
-						background: linear-gradient(269deg,rgba(175,175,175,1) 0%,rgba(224,224,224,1) 100%);
-						border-radius: 13rpx;
-						align-items: center;
-						padding: 0 17rpx 0 10rpx;
-						> image {
-							margin-right: 9rpx;
-							width: 20rpx;
-							height: 22rpx;
-							flex-shrink: 0;
-						}
-						.rank-title {
-							font-size: 16rpx;
-							color: rgba(51,51,51,1);
-						}
-					}
-				}
-				.info-right {
-					.info-phone {
-						font-size: 24rpx;
-						color: rgba(51,51,51,1);
-						margin-bottom: 26rpx;
-					}
-					.user-rank {
-						font-size: 24rpx;
-						color: rgba(51,51,51,1);
-					}
-				}
 				.info-top {
 					height: 30rpx;
 					display: flex;
@@ -336,16 +360,6 @@ export default {
 				font-size: 28rpx;
 				color: #666;
                border-bottom: 1px solid #ececec;
-				// &::after {
-				// 	content: "";
-				// 	position: absolute;
-				// 	width: 650rpx;
-				// 	height: 1rpx;
-				// 	background: rgba(234,234,234,1);
-				// 	bottom: 0;
-				// 	left: 50%;
-    // 				transform: translate(-50%,0);
-				// }
 			}
            .title-text-more {	
                font-size: 24rpx;
@@ -397,24 +411,46 @@ export default {
 					flex-direction: column;
 					align-items: center;
 					justify-content: space-between;
+					position: relative;
+					.order-num{
+						position: absolute;
+						top: -12rpx;
+						right: -38rpx;
+						width: 50rpx;
+					}
+					.order-num > text {
+						z-index: 9;
+						float: left;
+						border: 1rpx solid #FF7807;
+						height: 24rpx;
+						border-radius: 12rpx;
+						padding: 6rpx 8rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						color: #FF7807;
+						background-color: #ffffff;
+						font-size: 18rpx;
+						color:rgba(255,120,15,1);
+					}
 				}
 				> view:nth-child(1){
-					@include image-size($image-width: 36rpx, $image-height: 34rpx);
+					@include image-size($image-width: 33rpx, $image-height: 36rpx);
 				}
 				> view:nth-child(2){
-					@include image-size($image-width: 38rpx, $image-height: 36rpx);
+					@include image-size($image-width: 38rpx, $image-height: 32rpx);
 				}
 				> view:nth-child(3){
-					@include image-size($image-width: 40rpx, $image-height: 36rpx);
+					@include image-size($image-width: 41rpx, $image-height: 33rpx);
 				}
 				> view:nth-child(4){
-					@include image-size($image-width: 38rpx, $image-height: 38rpx);
+					@include image-size($image-width: 35rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(5){
-					@include image-size($image-width: 36rpx, $image-height: 40rpx);
+					@include image-size($image-width: 37rpx, $image-height: 37rpx);
 				}
 				> view:nth-child(6){
-					@include image-size($image-width: 36rpx, $image-height: 40rpx);
+					@include image-size($image-width: 33rpx, $image-height: 35rpx);
 				}
 			}
 		} 
@@ -426,8 +462,11 @@ export default {
 				$image-width: 71rpx
 			);
 			.content {
+				> view {
+					width: 100rpx;
+				}
 				> view:not(:last-child) {
-					margin-right: 58rpx;
+					margin-right: 36rpx;
 				}
 			}
 		}
@@ -439,8 +478,11 @@ export default {
 				$image-width: 71rpx
 			);
 			.content {
+				> view {
+					width: 100rpx;
+				}
 				> view:not(:last-child) {
-					margin-right: 46rpx;
+					margin-right: 36rpx;
 				}
 			}
 		}
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -46,7 +46,7 @@
 			<!-- 拼团列表 -->
 			<group></group>
 			<view class="activity-view">
-				<image class="lingquan" :src="activityInfo.adv_code" @click="activityLink({ type: activityInfo.url_type, id: activityInfo.info_id })"></image>
+				<image class="lingquan" :src="activityInfo.adv_code" @click="jumpPage({ type: activityInfo.url_type, id: activityInfo.info_id })"></image>
 			</view>
            <!-- 优惠券 -->
 			<youhq></youhq>
@@ -61,6 +61,7 @@
 	</view>
 </template>
 <script>
+	import common from '@/static/js/common.js';
 	import shopitem from "@/components/shop/shop-item/index";
 	import recommend from "@/components/shop/recommend/index";
 	import pintuan from "@/components/shop/recommend/pintuan";
@@ -190,31 +191,11 @@
 			clickImage(index) {
 				// console.log(this.list[index]);
                let item = this.list[index];
-                this.activityLink({
-                	type: item.url_type,
+				this.jumpPage({ 
+					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
-            	})
-            },
 			// 下拉加载更多推荐商品
 			onreachBottom() {
 				this.$refs.recommendGoods.loadMore();
@@ -240,28 +221,19 @@
 					}
 				})
 			},
-			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
-				})
-			},
+			jumpPage(uri) {
+				// console.log(uri);
+				common.jumpPage({ type: uri.type, id: uri.id });
+			}
 		},
 	}
 </script>
 <style lang="scss" scoped>
 	.shop {
-		height: calc(100% - var(--window-top));
+		height: calc(100vh - var(--window-top));
 		box-sizing: border-box;
 		background-color: #F0EDF1;
        overflow-y: scroll;
-
 		.top {
 			padding: 0 30rpx;
 			background-color: #ffffff;
--- a/pages/zhibo/index.nvue
+++ b/pages/zhibo/index.nvue
@@ -370,7 +370,7 @@ export default {
    const token = uni.getStorageSync('token');
    console.log(token,that.id)
    uni.request({
-      url:"https://dmmall.sdbairui.com/api/Specialci/goodsShelves",
+      url:"https://mall.dmygkeji.com/api/Specialci/goodsShelves",
      data:{
        live_id:that.id
      },
@@ -385,7 +385,7 @@ export default {
    })
    setInterval(function(){
       uni.request({
-          url:"https://dmmall.sdbairui.com/api/Specialci/goodsShelves",
+          url:"https://mall.dmygkeji.com/api/Specialci/goodsShelves",
          data:{
            live_id:that.id
          },
@@ -403,7 +403,7 @@ export default {

    },10 * 1000)
    uni.request({
-      url:"https://dmmall.sdbairui.com/api/Specialci/livingUserInfo",
+      url:"https://mall.dmygkeji.com/api/Specialci/livingUserInfo",
      data:{
        live_id:that.id
      },
@@ -417,32 +417,13 @@ export default {
        // that.list= res.data.data
      }
    })
-    //当前用户
-     var currentUser = {}
-    if(this.$store.state.hasLogin){
-      const user = uni.getStorageSync('user_info');
-      currentUser = {
-        id : user.member.member_id,
-        nickname : user.member.member_nickname,
-        avatar: user.member.member_avatar 
-      };
-    }else{
-      const user = uni.getStorageSync('morenimg');
-      currentUser = {
-        id : new Date().getTime(),
-        nickname : "123",
-        avatar: user
-      };
-    }
-     
    var room = {
        id : a.rid + "",
        name : a.rid + ""
    };
      that.chatRoomService = getApp().globalData.im
-    console.log(room,currentUser)
    //构造chatRoomService
-    that.chatRoomService.subscribeRoomMessage(room,currentUser)
+    that.chatRoomService.subscribeRoomMessage(room)
    //获取当前聊天室数据
    that.room = that.chatRoomService.room;
    that.chatRoomService.initialWhenOnlineUserChange(that.newpeople)
@@ -508,11 +489,19 @@ export default {
      });
    },
    guanzhu(){
+      if(!this.$store.state.hasLogin){
+       uni.showToast({
+          title: '请先登录',
+          duration: 2000,
+          icon:"none"
+        });
+        return ;
+      }
      const token = uni.getStorageSync('token');
      let that = this
      console.log(token)
      uni.request({
-        url:"https://dmmall.sdbairui.com/api/member/attentionMember",
+        url:"https://mall.dmygkeji.com/api/member/attentionMember",
        data:{
          member_id:that.info.user_id
        },
@@ -523,7 +512,7 @@ export default {
        success(res){
          console.log(res)
          uni.request({
-            url:"https://dmmall.sdbairui.com/api/Specialci/livingUserInfo",
+            url:"https://mall.dmygkeji.com/api/Specialci/livingUserInfo",
            data:{
              live_id:that.id
            },
--- a/static/goeasy-im-1.1.1.js
+++ b/static/goeasy-im-1.1.1.js
--- a/static/image/common/31.png
+++ b/static/image/common/31.png
--- a/static/image/common/32.png
+++ b/static/image/common/32.png
--- a/static/image/mine/39.png
+++ b/static/image/mine/39.png
--- a/static/image/userinfo/dianzan.png
+++ b/static/image/userinfo/dianzan.png
--- a/static/image/userinfo/dianzan1.png
+++ b/static/image/userinfo/dianzan1.png
--- a/static/image/userinfo/gouwuche.png
+++ b/static/image/userinfo/gouwuche.png
--- a/static/image/userinfo/gouwuche1.png
+++ b/static/image/userinfo/gouwuche1.png
--- a/static/image/userinfo/pinglun.png
+++ b/static/image/userinfo/pinglun.png
--- a/static/image/userinfo/pinglun1.png
+++ b/static/image/userinfo/pinglun1.png
--- a/static/image/userinfo/shoucang.png
+++ b/static/image/userinfo/shoucang.png
--- a/static/image/userinfo/shoucang1.png
+++ b/static/image/userinfo/shoucang1.png
--- a/static/imservice.js
+++ b/static/imservice.js
@@ -6,6 +6,7 @@
 */

 import GoEasyIM from './goeasy-im-1.0.9';
+// import GoEasyIM from './goeasy-im-1.1.1';
 import restApi from './restapi';

 function Friend(uuid, name, avatar,time = "", text = "",date = "",unReadMessage = 0) {
@@ -38,6 +39,7 @@ function IMService() {
        appkey:'BC-453aa755c4ea48148abefc55a86df283'
    });
    this.status = false
+    this.lianjie = false
    //当前“我”
    this.currentUser = null;
    //我的好友
@@ -84,6 +86,7 @@ function IMService() {
 IMService.prototype.login = function (uuid, name, avatar) {
        //初始化当前用户
        this.currentUser = new CurrentUser(uuid, name, avatar);
+        
        //初始化联系人信息，包括群
        this.initialContacts();
        return true;
@@ -105,7 +108,7 @@ IMService.prototype.initialContacts = function (friendList) {
        const token = uni.getStorageSync('token');
        console.log(token)
        uni.request({
-            url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+            url:"https://mall.dmygkeji.com/api/Specialci/getAtwillUserInfo",
            data:{
                userId:i[0],
                markup:1
@@ -120,7 +123,7 @@ IMService.prototype.initialContacts = function (friendList) {
                console.log(that.friends)
                let sorts = function (friends){
                    let paixu = function (a,b){
-                        if(a.date > b.date){
+                        if(a.date > b.date && b.unReadMessage == 0){
                            return 0;
                        }else{
                            return 1;
@@ -203,6 +206,7 @@ IMService.prototype.resetFriendUnReadMessage = function (friend) {
 //连接GoEasy
 IMService.prototype.connectIM = function () {
    //初始化IM相关的监听器
+
    try {
    this.initialIMListeners();
        
@@ -210,6 +214,7 @@ IMService.prototype.connectIM = function () {
        console.log(123)
    }
    try {
+        console.log(this.currentUser)
        this.im.connect({
            id: this.currentUser.uuid,
            data: {
@@ -226,7 +231,6 @@ IMService.prototype.connectIM = function () {
            this.subscribeFriendsPresence();
        }).catch(error => {
            console.log('连接失败,请确保网络正常，appkey和host正确，code:' + error.code + " content:" + error.content);
-            this.connectIM()
        });
    } catch (error) {
        console.log(12323)
@@ -244,6 +248,7 @@ IMService.prototype.initialIMListeners = function () {
    this.im.on(GoEasyIM.EVENT.DISCONNECTED, () => {
        console.log('连接断开.')
        this.status = false
+        this.lianjie = false
    });

    //监听好友上下线
@@ -268,7 +273,7 @@ IMService.prototype.initialIMListeners = function () {
            // return ;
            let sorts = function (friends){
                let paixu = function (a,b){
-                    if(a.date > b.date){
+                    if(a.date > b.date && b.unReadMessage == 0){
                        return 0;
                    }else{
                        return 1;
@@ -284,7 +289,7 @@ IMService.prototype.initialIMListeners = function () {
                const token = uni.getStorageSync('token');
                console.log(token)
                uni.request({
-                    url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+                    url:"https://mall.dmygkeji.com/api/Specialci/getAtwillUserInfo",
                    data:{
                        userId:message.senderId,
                        markup:1
@@ -511,7 +516,7 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
    // return ;
    let sorts = function (friends){
        let paixu = function (a,b){
-            if(a.date > b.date){
+            if(a.date > b.date && b.unReadMessage == 0){
                return 0;
            }else{
                return 1;
@@ -527,7 +532,7 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
        const token = uni.getStorageSync('token');
        console.log(token)
        uni.request({
-            url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+            url:"https://mall.dmygkeji.com/api/Specialci/getAtwillUserInfo",
            data:{
                userId:friendId,
                markup:1
@@ -831,7 +836,7 @@ IMService.prototype.listenerGroupPresence = function () {
 //查询和初始化在线用户列表和在线用户数
 IMService.prototype.initialOnlineUsers = function (roomId) {
    let self = this;
-
+    console.log(roomId)
    //查询最新上线的用户列表
    this.im.groupHereNow(roomId)
        .then(result => {
@@ -850,7 +855,7 @@ IMService.prototype.initialOnlineUsers = function (roomId) {
        if (e.code == 401) {
            console.log("您还没有开通用户在线状态提醒，登录goeasy->我的应用->查看详情->高级功能，自助开通.");
        } else {
-            console.log(e);
+            console.log(e,1212);
        }
    });
    //获取聊天室在线用户数
@@ -873,7 +878,12 @@ IMService.prototype.subscribePresence = function (roomId) {
 }

 //订阅聊天室消息
-IMService.prototype.subscribeRoomMessage = function (room, user) {
+IMService.prototype.subscribeRoomMessage = function (room) {
+    let user = {
+        id:this.currentUser.uuid,
+        nickname:this.currentUser.name,
+        avatar:this.currentUser.avatar
+    }
    this.room = new Room(room.id, room.name, user);
    

--- a/static/js/common.js
+++ b/static/js/common.js
@@ -67,5 +67,29 @@ const common = {
 		else result = hours + ':' + minutes + ':' + seconds;
 		return result;
 	},
+	/**
+	* 广告位跳转
+	* @param { String } type 跳转类型
+	* @param { String | Number } id 跳转id 商品id/商家id...
+	* @return { undefined } undefined
+	*/
+	jumpPage({ type, id }) {
+		let url;
+		switch (type) {
+			case 1:
+				url = '/pageB/sdetails/index?id=' + id;
+				break;
+			case 2:
+				url = '/pageC/merchant/index?id=' + id;
+				break;
+			case 3:
+				url = '/pageE/mine/MemberServe?current=1'
+				break;
+			default:
+				break;
+		}
+		// console.log(url);
+		uni.navigateTo({ url: url });
+	},
 }
-export default common
+export default common;
Author	SHA1	Message	Date
zmr900709	78169d8cde	解决样式问题	2020-08-20 14:24:17 +08:00
zmr900709	7f0d1063f0	Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr	2020-08-20 14:23:32 +08:00
zmr900709	c81ee7e961	1	2020-08-20 14:23:21 +08:00
hansu	6864f22576	Merge pull request '首页拼团商品显示不全' (#262 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/262	2020-08-20 12:05:44 +08:00
ghusermoon	a91fa4708b	首页拼团商品显示不全	2020-08-20 12:05:15 +08:00
hansu	bfffb44fe2	Merge pull request 'zhy' (#261 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/261	2020-08-20 11:43:19 +08:00
ghusermoon	16c2c1fa71	使用优惠券价格	2020-08-20 11:42:52 +08:00
ghusermoon	4c8e2ba4b6	使用优惠券价格	2020-08-20 11:41:58 +08:00
hansu	96d7ad439a	Merge pull request '优惠券列表显示，使用优惠券价格计算' (#259 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/259	2020-08-20 11:29:22 +08:00
ghusermoon	390bda7c0e	优惠券列表显示，使用优惠券价格计算	2020-08-20 11:28:49 +08:00
luyuan	0ae19c2ddf	Merge pull request 'touxiang' (#258 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/258	2020-08-20 11:27:56 +08:00
luyuan	26cb84748a	touxiang	2020-08-20 11:26:59 +08:00
luyuan	c6cd88dc48	Merge pull request 'xbx' (#257 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/257	2020-08-20 11:10:11 +08:00
luyuan	a34880e6a6	Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx	2020-08-20 11:09:49 +08:00
luyuan	3d840a0546	修复了交易物流	2020-08-20 10:54:09 +08:00
hansu	30539ddf64	Merge pull request '新人优惠券显示问题，使用优惠券价格问题' (#256 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/256	2020-08-20 10:26:39 +08:00
ghusermoon	51823edb12	新人优惠券显示问题，使用优惠券价格问题	2020-08-20 10:25:58 +08:00
luyuan	e58f571de4	直播添加了下拉刷新	2020-08-20 10:16:40 +08:00
gyh	c4821f888f	Merge pull request 'gdpao' (#255 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/255	2020-08-19 19:25:14 +08:00
Gdpao	69760e6377	gdpao	2020-08-19 19:24:14 +08:00
hansu	080f0c6d86	Merge pull request 'zhy' (#254 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/254	2020-08-19 18:04:59 +08:00
ghusermoon	4e842b127c	fixing bug coupon	2020-08-19 18:04:32 +08:00
ghusermoon	627cfc4aa0	优惠券加分页	2020-08-19 17:55:58 +08:00
hansu	1e94eb864f	Merge pull request '调整首页全部拼团样式' (#253 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/253	2020-08-19 17:28:58 +08:00
ghusermoon	64597b26fa	调整首页全部拼团样式	2020-08-19 17:27:49 +08:00
hansu	05b334fdcb	Merge pull request '广告位跳转' (#252 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/252	2020-08-19 16:59:46 +08:00
ghusermoon	dc636e30b7	广告位跳转	2020-08-19 16:59:06 +08:00
hansu	f9950c4a14	Merge pull request '联系客服拨号，新人优惠券跳转' (#251 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/251	2020-08-19 15:36:55 +08:00
ghusermoon	5dff8c8d96	联系客服拨号，新人优惠券跳转	2020-08-19 15:36:25 +08:00
hansu	35da48a87b	Merge pull request '调整个人中心首页，添加物流无信息提示' (#250 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/250	2020-08-19 15:20:18 +08:00
ghusermoon	5dd4023f97	调整个人中心首页，添加物流无信息提示	2020-08-19 15:19:25 +08:00
hansu	10957c96d6	Merge pull request 'zhy' (#249 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/249	2020-08-19 11:22:45 +08:00
ghusermoon	86d765d6ba	order number 8.19	2020-08-19 11:21:31 +08:00
ghusermoon	bea615253c	Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy	2020-08-19 08:31:26 +08:00
gyh	48f50dbc89	Merge pull request 'gdpaomg' (#248 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/248	2020-08-18 21:11:59 +08:00
Gdpao	891f1b4194	gdpaomg	2020-08-18 21:11:28 +08:00
zhaomingrui	fb16e774b8	Merge pull request 'zmr' (#247 ) from zmr into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/247	2020-08-18 21:10:19 +08:00
zmr900709	97c95c2024	Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr	2020-08-18 21:03:39 +08:00
zmr900709	9d8d54cf02	修改活动背景高度	2020-08-18 21:03:23 +08:00
hansu	417ec2106e	Merge pull request 'fixing bug' (#246 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/246	2020-08-18 18:06:29 +08:00
ghusermoon	2b1b1f1395	Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy	2020-08-18 18:05:26 +08:00
ghusermoon	18dd96dec7	fixing bug	2020-08-18 18:05:15 +08:00
gyh	6dd010fd42	Merge pull request 'gdpao;' (#245 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/245	2020-08-18 17:44:37 +08:00
Gdpao	41cda556ce	gdpao;	2020-08-18 17:43:58 +08:00
hansu	6b4bfee380	Merge pull request 'upgrade version 8.18' (#244 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/244	2020-08-18 17:43:03 +08:00
ghusermoon	cb0a6fafa3	upgrade version 8.18	2020-08-18 17:42:26 +08:00
luyuan	fd1801de3d	Merge pull request '背景颜色' (#243 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/243	2020-08-18 17:06:19 +08:00
luyuan	418068102c	背景颜色	2020-08-18 17:05:29 +08:00
hansu	72fa854e78	Merge pull request '...' (#242 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/242	2020-08-18 15:51:35 +08:00
ghusermoon	2a382aa0b4	...	2020-08-18 15:51:04 +08:00
luyuan	bb651df8a0	Merge pull request '替换域名' (#241 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/241	2020-08-18 15:31:53 +08:00
luyuan	9c388e898c	替换域名	2020-08-18 15:29:52 +08:00
hansu	473b96f552	Merge pull request 'fixing bug' (#240 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/240	2020-08-18 15:28:51 +08:00
ghusermoon	1a2c40955b	fixing bug	2020-08-18 15:28:22 +08:00
luyuan	5291d70c6c	Merge pull request 'paixu' (#239 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/239	2020-08-18 15:26:52 +08:00
luyuan	f98cdd7937	paixu	2020-08-18 15:26:28 +08:00
gyh	60913ab612	Merge pull request 'gdpaoup' (#238 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/238	2020-08-18 15:24:58 +08:00
Gdpao	ee04a8cb08	gdpaoup	2020-08-18 15:24:06 +08:00
luyuan	711eeadc28	Merge pull request 'xbx' (#237 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/237	2020-08-18 15:11:24 +08:00
luyuan	8286dbfa58	替换url	2020-08-18 15:10:43 +08:00
luyuan	cb95d1ead1	链接登录退出	2020-08-18 15:08:42 +08:00
hansu	f577de11f1	Merge pull request '写死首页拼团推荐的头像' (#236 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/236	2020-08-18 12:12:29 +08:00
ghusermoon	689aecc572	写死首页拼团推荐的头像	2020-08-18 12:12:01 +08:00
zhaomingrui	8ba87795b3	Merge pull request 'zmr' (#235 ) from zmr into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/235	2020-08-18 12:04:34 +08:00
zmr900709	e51675d2e7	修改活动样式	2020-08-18 12:02:30 +08:00
luyuan	43e09e977d	修复	2020-08-18 11:40:53 +08:00
zmr900709	91927fdc57	Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr	2020-08-18 11:35:37 +08:00
zmr900709	8f83aeec8e	修改活动样式	2020-08-18 11:28:51 +08:00
hansu	d5202c02cc	Merge pull request 'fixing bug' (#234 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/234	2020-08-18 11:15:01 +08:00
ghusermoon	631e8ae3e6	fixing bug	2020-08-18 11:14:29 +08:00
zmr900709	b2b740c207	修改活动列表页样式	2020-08-18 11:06:28 +08:00
gyh	7191b29b44	Merge pull request 'gdpao' (#233 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/233	2020-08-18 11:03:41 +08:00
Gdpao	50c790c7fc	gdpao	2020-08-18 11:02:41 +08:00
hansu	ec8831152e	Merge pull request 'fixing bug' (#232 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/232	2020-08-18 11:02:20 +08:00
ghusermoon	6f5c2d1fc9	fixing bug	2020-08-18 11:01:48 +08:00
luyuan	9f17c5478c	提交	2020-08-18 10:43:15 +08:00
hansu	41ea8122e6	Merge pull request '首页拼团推荐样式' (#231 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/231	2020-08-18 10:39:03 +08:00
ghusermoon	06ee3b9038	首页拼团推荐样式	2020-08-18 10:38:35 +08:00
hansu	5b763fdb82	Merge pull request '秒杀时间背景色' (#230 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/230	2020-08-18 10:20:54 +08:00
ghusermoon	31689af773	秒杀时间背景色	2020-08-18 10:20:30 +08:00
hansu	caaea4de62	Merge pull request 'store css 8.18' (#229 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/229	2020-08-18 10:06:53 +08:00
ghusermoon	cada935c17	store css 8.18	2020-08-18 10:06:20 +08:00
hansu	9e9a6dcc5b	Merge pull request 'fixing bug 8.18' (#228 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/228	2020-08-18 08:53:18 +08:00
ghusermoon	a702558eac	fixing bug 8.18	2020-08-18 08:52:47 +08:00
gyh	2a180ba05f	Merge pull request 'gdpao2' (#227 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/227	2020-08-17 20:32:50 +08:00
Gdpao	2a5e4b89b2	gdpao2	2020-08-17 20:32:11 +08:00
gyh	fd31d14881	Merge pull request 'gdpaon' (#226 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/226	2020-08-17 19:34:48 +08:00
Gdpao	aae9f78a91	gdpaon	2020-08-17 19:33:55 +08:00
luyuan	a39aa6e059	文字定位	2020-08-17 18:13:01 +08:00
luyuan	3e6f7ebf1b	Merge pull request 'xbx' (#225 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/225	2020-08-17 18:09:43 +08:00
luyuan	35838e3a9e	添加了划线价	2020-08-17 18:09:19 +08:00
luyuan	d0d034cd7f	直播暂无消息	2020-08-17 17:49:18 +08:00
luyuan	d8a92db5c2	直播关注	2020-08-17 17:30:51 +08:00
luyuan	67a8316666	Merge pull request 'xbx' (#224 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/224	2020-08-17 17:24:08 +08:00
luyuan	51d8f6a762	推荐权益	2020-08-17 17:23:48 +08:00
gyh	f77b4ebc02	Merge pull request 'gdpao' (#223 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/223	2020-08-17 16:58:52 +08:00
Gdpao	b1a705e0f8	gdpao	2020-08-17 16:57:23 +08:00
luyuan	c14b4338e9	Merge pull request '修复 694' (#222 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/222	2020-08-17 16:34:01 +08:00
luyuan	ec3420a026	替换	2020-08-17 16:33:36 +08:00
luyuan	b7c9ec2354	Merge pull request '修复 707' (#221 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/221	2020-08-17 15:28:22 +08:00
luyuan	a5962d96df	Merge pull request '新增 701' (#220 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/220	2020-08-17 15:15:17 +08:00
Niujiawei	23b2b11bc8	2020.08.10	2020-08-11 21:47:28 +08:00
Niujiawei	21d3201c4b	2020.08.10	2020-08-11 21:18:34 +08:00
Niujiawei	9a9276fc94	修改样式2020.08.06	2020-08-06 21:35:27 +08:00