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

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

App.vue

@@ -28,7 +28,7 @@
             // #endif
 		},
 		onShow(){
-
+			this.getVersion();
 		},
 		onHide(){
 
@@ -45,6 +45,16 @@
 					}
 				})
 			},
+			getVersion() {
+				this.$u.post("Specialci/checkVersion",{ app_version: this.$app_version }).then(res => {
+					// console.log(res);
+					if(res.data.app_version != this.$app_version) {
+						this.$u.route('/pageE/setting/updateVersion', {
+							status: res.data.is_focus_upgrade
+						});
+					}
+				})
+			},
 		}
 	}
 </script>

README.md

@@ -49,4 +49,12 @@ unescapeHTML(temp){}
 * @return { object } promise 对象 resolve 返回文件服务器地址 reject 返回错误信息
 */
 uploadFile({ url, name, filePath }) {}
+
+/**
+* 广告位跳转
+* @param { String } type 跳转类型 1 商品 2 店铺 3 领取优惠券
+* @param { String | Number } id 跳转id 商品id/商家id...
+* @return { undefined } undefined
+*/
+jumpPage({ type, id }) ()
 ```

common/api/user.js

@@ -251,8 +251,8 @@ export default {
 			// 	return vm.$u.post('order/afterSaleList', { page: page });
 			// },
 			// 试穿列表
-			goodsTryOrderList() {
-				return vm.$u.post('order/goodsTryOrderList');
+			goodsTryOrderList({ page }) {
+				return vm.$u.post('order/goodsTryOrderList', { page });
 			},
 			// 试穿订单确认完成
 			goodsTryConfirm({ id }) {

components/index/video-item/index.vue

@@ -1,6 +1,6 @@
 <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>
+        <image class="head" :src="item.article_pic" v-if="item.type == 1"></image>
 		<view class="header_fist" v-else>
 			<view class="backes">
                 <u-icon name="play-circle-fill" color="#ffffff" size="20"></u-icon>
@@ -64,6 +64,7 @@
         display:-webkit-box; 
         -webkit-box-orient:vertical;
         -webkit-line-clamp:2; 
+		height: 80rpx;
     }
     .jianjie{
         margin:0 auto;

components/mine/coupon/index.vue

@@ -2,8 +2,8 @@
 	<view class="c-coupon">
 		<view class="coupon-usable">
 			<view class="info-type" :style="{ backgroundImage: 'url(' + '/static/image/mine/30.png' + ')', backgroundSize:'contain', backgroundRepeat: 'no-repeat' }">
-				<div class="wrap_left_top"></div>
-				{{ couponInfo.type == 2 ? '店铺优惠券' : '平台优惠券' }}
+				<div class="wrap_left_top" v-if="couponInfo.type == 1">{{ couponInfo.vouchertemplate_id == 1 ? '新人专享' : '平台优惠券' }}</div>
+				<div class="wrap_left_top" v-else-if="couponInfo.type == 2">店铺优惠券</div>
 			</view>
 			<view class="coupon-info">
 				<view class="info-usable">

components/mine/coupon/mine.vue

@@ -2,8 +2,8 @@
 	<view class="c-coupon" v-if="goodsClass.length">
 		<view :class="couponInfo.voucher_state != 1 ? 'coupon-unable' : 'coupon-usable'">
 			<view class="info-type" :style="{ backgroundImage: 'url(' + (couponInfo.voucher_state == 1 ? '/static/image/mine/30.png' : '/static/image/mine/31.png') + ')', backgroundSize:'contain', backgroundRepeat: 'no-repeat' }">
-				<div class="wrap_left_top"></div>
-				{{ couponInfo.type == 2 ? '店铺优惠券' : '平台优惠券' }}
+				<div class="wrap_left_top" v-if="couponInfo.type == 1">{{ couponInfo.vouchertemplate_id == 1 ? '新人专享' : '平台优惠券' }}</div>
+				<div class="wrap_left_top" v-else-if="couponInfo.type == 2">店铺优惠券</div>
 			</view>
 			<view class="coupon-info">
 				<view class="info-usable">

components/remaining/remaining.vue

@@ -50,8 +50,8 @@
 		data() {
 			return {
 				remaining: 7,
-				type: true,
-				banner: false,
+				type: false,
+				banner: true,
 				protocol: false,
 				heightOut: '',
 				imgurl: [],
@@ -116,18 +116,18 @@
 			},
 			// 3秒倒计时
 			remaining_time() {
-				this.timer = setInterval(() => {
-					this.remaining--;
-					if (this.remaining <= 0) {
-						clearInterval(this.timer);
-						console.log("完了")
-						this.type = !this.type;
-						this.banner = !this.banner;
-					}
-				}, 1000);
+				// this.timer = setInterval(() => {
+				// 	this.remaining--;
+				// 	if (this.remaining <= 0) {
+				// 		clearInterval(this.timer);
+				// 		console.log("完了")
+				// 		// this.type = !this.type;
+				// 		// this.banner = !this.banner;
+				// 	}
+				// }, 1000);
 			},
 			leap_over() {
-				this.type = !this.type
+				// this.type = !this.type
 				this.banner = !this.banner;
 				clearInterval(this.timer)
 					// 获取屏幕高度

components/shop/group/item.vue

@@ -62,7 +62,7 @@ export default {
     }
     .price{
         display: flex;
-        // align-items: center;
+        align-items: center;
 		// align-content: flex-end;
         justify-content: space-between;
         margin-top: 16rpx;

main.js

@@ -5,6 +5,10 @@ import uView from "uview-ui";
 Vue.config.productionTip = false
 Vue.use(uView);
 App.mpType = 'app'
+
+// 当前 app 版本号
+Vue.prototype.$app_version = '1.0.0';
+
 Vue.prototype.imService = new IMService();
 Vue.prototype.a = 1;
 import store from '@/common/store/index.js'

manifest.json

@@ -112,22 +112,22 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "static/app/icon/72x72.png",
-                    "xhdpi" : "static/app/icon/96x96.png",
-                    "xxhdpi" : "static/app/icon/144x144.png",
-                    "xxxhdpi" : "static/app/icon/192x192.png"
+                    "hdpi" : "E:/Source-code/appleidmore/安卓png/72x72psd.PNG",
+                    "xhdpi" : "E:/Source-code/appleidmore/安卓png/96x96psd.PNG",
+                    "xxhdpi" : "E:/Source-code/appleidmore/安卓png/144x144.PNG",
+                    "xxxhdpi" : "E:/Source-code/appleidmore/安卓png/192x192.PNG"
                 },
                 "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "appstore" : "E:/Source-code/appleidmore/苹果png/appstore 1024X1024.PNG",
                     "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png"
+                        "app@2x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG",
+                        "app@3x" : "E:/Source-code/appleidmore/苹果png/180x180.PNG",
+                        "spotlight@2x" : "E:/Source-code/appleidmore/苹果png/80x80.PNG",
+                        "spotlight@3x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG",
+                        "settings@2x" : "E:/Source-code/appleidmore/苹果png/58x58psd.PNG",
+                        "settings@3x" : "E:/Source-code/appleidmore/苹果png/87X87.PNG",
+                        "notification@2x" : "E:/Source-code/appleidmore/苹果png/40X40.PNG",
+                        "notification@3x" : "E:/Source-code/appleidmore/苹果png/60X60.PNG"
                     },
                     "ipad" : {
                         "app" : "unpackage/res/icons/76x76.png",

pageB/comment/index.vue

@@ -7,7 +7,7 @@
 			<view v-for="(item, index) in evalueList" :key="index" class="itme">
 				<comment :reply="true" :content="item"></comment>
 			</view>
-			<u-empty text="暂无评论" mode="list" v-if="!evalueList.length" margin-top="120" color="#333"></u-empty>
+			<u-empty text="暂无评价" mode="list" v-if="!evalueList.length" margin-top="120" color="#333"></u-empty>
 		</view>
 		<!-- 加载更多 -->
 		<u-loadmore :status="loadStatus" bgColor="#EEEBEE" margin-top="20" margin-bottom="20" v-if="evalueList.length >= 12"></u-loadmore>

pageB/components/sdetails/guige.vue

@@ -31,12 +31,16 @@
                     height: 60rpx;
                     background-color: #ececec;
                     color: #999;
-                    text-align: center;
-                    line-height: 60rpx;
+                    // text-align: center;
+                    // line-height: 60rpx;
                     box-sizing: border-box;
                     border-radius: 6rpx;
                     margin-right: 26rpx;
 					margin-bottom: 20rpx;
+					border: #ececec 1rpx solid;
+					display: flex;
+					align-items: center;
+					justify-content: center;
                 }
                 .xuanzhong{
                     border: #ff780f 1rpx solid;

pageB/components/userinfo/index.vue

@@ -64,7 +64,7 @@
         z-index: 100;
         position: absolute;
         top: 80rpx;
-        left: 30rpx;
+        left: 34rpx;
         width: 50rpx;
         height: 50rpx;
     }
@@ -82,7 +82,6 @@
         margin-top: 10rpx;
         font-size: 28rpx;
         color: #fff;
-        text-shadow: 0px 0px 4rpx #999999;
     }
 
     .operat-img {

pageB/photo/index.vue

@@ -24,8 +24,8 @@
 		<!-- 用户操作 -->
         <userinfo class="userinfo" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo>
 		<!-- 评论 -->
-		<u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" height="700rpx">
-			<view class="top">
+		<u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" @touchmove.stop.prevent="moveHandle">
+			<view class="comment-top">
 				<text>评论</text>
 				<u-icon name="close" color="#333" size="28" @click="is_comment=false"></u-icon>
 			</view>
@@ -52,7 +52,10 @@
                             </view>
                             <view class="child_content">{{ child.content }}</view>
                         </view>
-                        <view class="more-reply" v-if="item.reply_count" @click="getReplyList(item.id)">展开更多回复<u-icon name="arrow-down"></u-icon></view>
+                        <view class="more-reply" v-if="item.reply_count" @click="getReplyList(item.id)">
+                            {{ child_end[item.id] ? "暂无更多回复" : "展开更多回复" }}
+                            <u-icon name="arrow-down" v-if="!child_end[item.id]"></u-icon>
+                        </view>
                     </view>
 				</block>
                 <view class="no-data" v-if="!commentList.length">还没有评论，快来评论吧！</view>
@@ -80,7 +83,8 @@
 		        <view v-for="(item,index) in list.goods" :key="index" class="item" @click="gotoInfo(item.goods_id)">
 					<image :src="item.goods_image" mode="aspectFill"></image>
 					<view>
-						<text class="title">{{ item.goods_advword }}</text>
+						<text class="cart-title u-line-1">{{ item.goods_advword }}</text>
+						<text class="cart-info u-line-2">{{ item.goods_name }}</text>
 						<text class="price">{{ item.goods_promotion_price }}</text>
 					</view>
 				</view>
@@ -179,10 +183,11 @@
         transform: translateY(-285rpx);
     }
 	.pl {
-		.top {
+		.comment-top {
 			z-index: 1000;
 			position: fixed;
 			top: 0;
+            left: 0;
             display: flex;
             align-items: center;
             justify-content: space-between;
@@ -200,7 +205,7 @@
 		.scroll-box {
 			z-index: 99;
 			margin: 88rpx 0 100rpx 0;
-			height: 100%;
+			height: 600rpx;
 			.box {
 				display: flex;
 				align-items: center;
@@ -220,6 +225,7 @@
 					height: 60rpx;
 					font-size: 26rpx;
 					color: #333;
+                    pointer-events: none;
 					.time {
 						font-size: 22rpx;
 						color: #999;
@@ -232,10 +238,13 @@
 			}
 			.content {
 				padding: 0 20rpx 10rpx 90rpx;
+                pointer-events: none;
 			}
             .child-content {
                 margin: 6rpx 90rpx 6rpx;
+                // pointer-events: none;
                 .child-box {
+                    pointer-events: none;
                     .info {
                         display: flex;
                         align-items: center;
@@ -336,11 +345,17 @@
 					display: flex;
 					flex-direction: column;
 					justify-content: space-around;
-					color: #333;
+                    width: 500rpx;
+					color: #343434;
 					font-size: 28rpx;
-					.title {
+					.cart-title {
 						line-height: 40rpx;
+                        font-size: 29rpx;
 					}
+                    .cart-info {
+                        font-size: 24rpx;
+                        line-height: 1.2;
+                    }
 					.name {
 						width: 500rpx;
 						height: 80rpx;
@@ -430,6 +445,7 @@ export default {
 			edit_text_other: "有爱评论，说点好听的 ~",
 			commentList: [], // 评论
             allList: {}, // 全部子评论
+            child_end: {},
             status: 'loadmore',
             iconType: 'circle',
             loadText: {
@@ -507,6 +523,8 @@ export default {
                         // console.log(item);
                         item.page = 0;
                         item.commentList = [];
+                        this.page_[item.id] = 0;
+                        this.child_end[item.id] = false;
                     })
                     this.commentList = list;
                 }
@@ -560,14 +578,14 @@ export default {
                     // console.log(p_id);
                     if (res.data.data.pid) {
                         this.commentList[this.comment_id].reply_count = true;
-                        console.log(this.allList[p_id]);
+                        // console.log(this.allList[p_id]);
                         if (this.allList[p_id]) {
                             this.allList[p_id].push(res.data.data);
                         } else {
                             this.allList[p_id] = [];
                             this.allList[p_id].push(res.data.data);
                         }
-                        console.log(this.allList);
+                        // console.log(this.allList);
                     } else {
                         this.commentList.unshift(res.data.data);
                     }
@@ -581,18 +599,20 @@ export default {
             uni.showLoading({
                 title: "loading..."
             })
-            if (!this.page_[id] === 0) {
-            }
             this.$u.post("article/articleReplyList", {id: id, page: this.page_[id]}).then(res => {
                 uni.hideLoading();
                 if (res.errCode == 0) {
-                    // if (res.data.length < 10) {
-                    //     this.is_more = false;
-                    // }
+                    if (this.page_[id] == 0) {
+                        this.allList[id] = res.data;
+                    } else {
+                        this.allList[id] = this.allList[id].concat(res.data);
+                    }
                     this.page_[id]++;
-                    this.allList[id] = res.data;
                     this.$forceUpdate();
-                    console.log(this.allList);
+                    // console.log(this.allList);
+                } else if (res.errCode == 1) {
+                    this.child_end[id] = true;
+                    this.$forceUpdate();
                 }
             })
         },
@@ -609,6 +629,7 @@ export default {
 		},
         // 评论滚动到底部
         scrollBottom(e) {
+            console.log(1);
             this.getComment();
         },
 		// 跳转到商品
@@ -618,6 +639,11 @@ export default {
 				url: "/pageB/sdetails/index?id=" + id + "&type=" + 1,
 			})
 		},
+        // 禁止滚动
+        moveHandle(e) {
+            console.log(e);
+            return;
+        },
 		goBack() {
 			uni.navigateBack({
 				delta: 1

pageB/playVideo/index.nvue

@@ -0,0 +1,44 @@
+<template>
+    <view style="width:750rpx" :style="{'height':height}">
+        <image @click="calose()" style="width:30rpx;height:30rpx;position: fixed;top:80rpx;right:30rpx;" src="/static/image/clons.png"></image>
+        <video :src="url" class="video" :style="{'padding-top':top,'height': width}" :autoplay="true"></video>
+    </view>
+</template>
+<style>
+.video{
+    width: 750rpx;
+    
+}
+</style>
+<script>
+export default {
+    name:"video",
+    data(){
+        return {
+            url:"",
+            top:0,
+            height:0,
+            width:0
+        }
+    },
+    onLoad(a){
+        const res = uni.getSystemInfoSync();
+        let height = res.windowHeight
+        let width = res.windowWidth 
+        this.width = width + ( (height - width) / 2) + 'px'
+        console.log(this.width)
+        this.top = (height - width) / 2+ 'px'
+        console.log(this.top)
+        this.height = height + 'px';
+        console.log(a)
+        this.url = a.url
+    },
+    methods:{
+        calose(){
+            uni.navigateBack({
+                delta: 1
+            });
+        }
+    }
+}
+</script>

pageB/sdetails/index.vue

@@ -121,6 +121,11 @@
             <view class="heng"></view>
         </view>
 		<view class="rich">
+			<view class="goods-video" v-if="list.length && goodsInfo.video" @click="playVideo">
+				<image class="video-play" src="/static/videoPlay.png"></image>
+				<view class="blacks"></view>
+				<image class="video-img" :src="list[0].image" mode="aspectFill"></image>
+			</view>
 			<rich-text :nodes="goodsInfo.mobile_body"></rich-text>
 		</view>
 		<!-- 选择规格数量 -->
@@ -425,7 +430,7 @@ export default {
 		},
 		// 拼团详情
 		pinTuanDetails() {
-			console.log(this.id);
+			// console.log(this.id);
 			this.$u.api.getPinTuanDetails({
 				pintuan_id: this.pintuan_id,
 				goods_id: this.id,
@@ -676,6 +681,12 @@ export default {
 				id: id
 			});
 		},
+		playVideo() {
+			console.log(this.goodsInfo.video);
+			this.$u.route('/pageB/playVideo/index', {
+				url: this.goodsInfo.video
+			});
+		}
 	},
 }
 </script>
@@ -1085,6 +1096,30 @@ export default {
     }
 	.rich {
 		width: 100%;
+		.goods-video {
+			position: relative;
+			.video-img {
+				width: 100%;
+			}
+			.blacks {
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				top: 0;
+				left: 0;
+				background-color: rgba(0, 0, 0, 0.35);
+				z-index: 8;
+			}
+			.video-play {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+				width: 100rpx;
+				height: 100rpx;
+				z-index: 9;
+			}
+		}
 	}
 	.group-tool {
 		position: fixed;

pageB/video/video.nvue

@@ -71,10 +71,11 @@
                                 </view>
                                 <text class="child_content">{{ child.content }}</text>
                             </view>
-                            <view>
-                                <text class="more-comment" @click="getReplyList(item.id)" v-if="item.reply_count">展开更多回复</text>
-                                <text></text>
-                            </view>
+                            <!-- <view> -->
+                                <text class="more-comment" @click="getReplyList(item.id)" v-if="item.reply_count">
+                                    {{ child_end[item.id] ? "暂无更多回复" : "展开更多回复" }}
+                                </text>
+                            <!-- </view> -->
                         </view>
                     </view>
                     <view class="send-box" @click="openKeyInput">
@@ -109,6 +110,7 @@
                             <image class="goods-img" :src="item.goods_image" mode=""></image>
                             <view class="goods-info">
                                 <text class="good-title">{{ item.goods_advword }}</text>
+                                <text class="good-name">{{ item.goods_name }}</text>
                                 <text class="good-price">{{ item.goods_promotion_price }}</text>
                             </view>
                         </view>
@@ -166,6 +168,7 @@
                 time_count: 0,
                 linear: null,
                 loadinging: false,
+                child_end: {},
             };
         },
         onLoad(option) {
@@ -178,7 +181,11 @@
             this.videoBox = uni.createVideoContext("videoId", this);
         },
         onHide() {
-            this.videoBox.pause();
+            if (uni.getSystemInfoSync().platform == "ios") {
+                console.log("ios");
+            } else if (uni.getSystemInfoSync().platform == "android") {
+                this.videoBox.pause();
+            }
         },
         onBackPress() {
             if (this.cart_type) {
@@ -241,6 +248,16 @@
                             // console.log(res.data);
                             this.commentList = res.data.data;
                         }
+                        let list = this.commentList;
+                        list.forEach((item,index) => {
+                            console.log(item);
+                            item.page = 0;
+                            item.commentList = [];
+                            this.page_[item.id] = 0;
+                            this.child_end[item.id] = false;
+                        })
+                        console.log(list);
+                        this.commentList = list;
                     }
                 })
             },
@@ -312,8 +329,6 @@
                 uni.showLoading({
                     title: "loading..."
                 })
-                if (!this.page_[id] === 0) {}
-                console.log(id);
                 uni.request({
                     url: temp_url + "article/articleReplyList",
                     method: "POST",
@@ -326,16 +341,20 @@
                     },
                     success: (res) => {
                         uni.hideLoading();
+                        console.log(this.page_);
                         if (res.data.errCode == 0) {
-                            if (res.data.data.length < 10) {
-                                this.is_more = false;
+                            if (this.page_[id] == 0) {
+                                this.allList[id] = res.data.data;
+                            } else {
+                                this.allList[id] = this.allList[id].concat(res.data.data);
                             }
                             this.page_[id]++;
-                            this.allList[id] = res.data.data;
                             this.$forceUpdate();
-                            // console.log(this.page_[id]);
-                            // console.log(this.allList);
+                        } else if (res.data.errCode == 1) {
+                            this.child_end[id] = true;
+                            this.$forceUpdate();
                         }
+                        console.log(this.allList);
                     }
                 })
             },
@@ -631,7 +650,6 @@
         font-size: 28rpx;
         color: #333;
         lines: 2;
-		letter-spacing: 2rpx;	
     }
 
     .more-content-box {
@@ -659,14 +677,17 @@
     }
 
     .child_content {
-        padding: 4rpx 0;
+        width: 550rpx;
+        padding-top: 6rpx;
         margin-left: 40rpx;
         font-size: 26rpx;
     }
 
     .more-comment {
-        margin: 10rpx 0;
+        width: 150rpx;
+        height: 40rpx;
         font-size: 22rpx;
+        line-height: 4;
         color: #999;
     }
 
@@ -725,6 +746,7 @@
     }
 
     .btn-send {
+        padding: 0 20rpx;
         font-size: 28rpx;
         color: #666;
     }
@@ -821,6 +843,14 @@
         width: 500rpx;
         color: #333;
         font-size: 30rpx;
+        lines: 1;
+        text-overflow: ellipsis;
+    }
+    
+    .good-name {
+        width: 500rpx;
+        font-size: 24rpx;
+        line-height: 30rpx;
         lines: 2;
         text-overflow: ellipsis;
     }
@@ -856,15 +886,14 @@
     .title {
         width: 700rpx;
         color: #fff;
-        font-size: 26rpx;
+        font-size: 30rpx;
         margin-bottom: 20rpx;
         lines: 1;
         text-overflow: ellipsis;
-		letter-spacing: 2rpx;
     }
 
     .centent {
-        width: 600rpx;
+        width: 700rpx;
         color: #fff;
         font-size: 28rpx;
         margin-bottom: 20rpx;

pageC/cart/ConfirmOrder.vue

@@ -67,17 +67,17 @@
 			</view>
 		</view>
 		<u-popup v-model="couponStatus" mode="bottom">
-			<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 1">
+			<scroll-view class="coupon-choose" scroll-y style="height: 50vh;" v-if="this.couponType.type == 1">
 				<view class="title">优惠券详情</view>
 				<view class="text">平台优惠券</view>
 				<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_all_list" :key="index"></Coupon>
-				<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_all_list.length"></u-empty>
+				<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_all_list.length" style="height: 200rpx"></u-empty>
 			</scroll-view>
-			<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 2">
+			<scroll-view class="coupon-choose" scroll-y style="height: 50vh;" v-if="this.couponType.type == 2">
 				<view class="title">优惠券详情</view>
 				<view class="text">店铺优惠券</view>
 				<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_list[this.couponType.store_id]" :key="index"></Coupon>
-				<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_list[this.couponType.store_id].length"></u-empty>
+				<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_list[this.couponType.store_id].length" style="height: 200rpx"></u-empty>
 			</scroll-view>
 		</u-popup>
 		<view class="bottom">
@@ -142,7 +142,7 @@ export default {
 			return num;
 		},
 		setFreight(freight, index) {
-			return freight[index];
+			return freight[index] || '0.00';
 		}
 	},
 	onLoad(option) {

pageC/components/merchant/list-item.vue

@@ -1,8 +1,8 @@
 <template>
     <view class="listItem">
-        <!-- <video  :src="url" :show-fullscreen-btn="true"></video> -->
 		<view v-if="type == '2'" class="video-container">
 			<image :src="url" mode="aspectFill" class="video"></image>
+			<view class="backs"></view>
 			<image src="/static/videoPlay.png" mode="aspectFill" class="play-video"></image>
 		</view>
         <image v-else :src="url" mode="aspectFill"></image>
@@ -27,6 +27,15 @@
 			width: 100%;
         	height: 100%;
 		}
+		.backs {
+			width: 100%;
+        	height: 100%;
+			position: absolute;
+			top: 0;
+			right: 0;
+			background-color: rgba($color: #000000, $alpha: 0.35);
+			z-index: 9;
+		}
 		.play-video {
 			position: absolute;
 			width: 100rpx;
@@ -47,6 +56,6 @@ export default {
 
         }
     },
-    props:['url','type']
+	props:['url','type'],
 }
 </script>

pageC/components/merchant/video-top.vue

@@ -1,6 +1,7 @@
 <template>
     <view class="videoTop">
 		  <image :src="url" mode="aspectFill" class="video"></image>
+		  <view class="backs"></view>
 		  <image src="/static/videoPlay.png" mode="aspectFill" class="play-video"></image>
     </view>
 </template>
@@ -16,6 +17,15 @@
         height: 100%;
 		z-index: 9;
     }
+	.backs {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.35);
+		z-index: 9;
+	}
 	.play-video {
 		position: absolute;
 		width: 100rpx;

pageC/merchant/index.vue

@@ -46,7 +46,7 @@
 					<imageTop v-else :url="item.article_pic" @click.native="toDetailsPage({ id: item.article_id, type: item.type })"></imageTop>
 				</view>
 				<view v-if="indexlist.length" class="container-bottom">
-					<listitem v-for="item in indexlist" :key="item.id" :type="item.type" :url="item.article_pic" class="bottom-item" @click.native="toDetailsPage({ id: item.article_id, type: item.type })"></listitem>
+					<listitem v-for="item in indexlist" :key="item.article_id" :type="item.type" :url="item.article_pic" class="bottom-item" @click.native="toDetailsPage({ id: item.article_id, type: item.type })"></listitem>
 				</view>
 			</scroll-view>
 			<view class="item" v-if="cur==1">
@@ -355,7 +355,7 @@ export default {
 						border-radius: 50%;
 						flex-shrink: 0;
 						margin-bottom: 20rpx;
-						background-color: aqua;
+						// background-color: aqua;
 					}
 					.nickname {
 						font-size: 22rpx;

pageD/activity/activity.vue

@@ -15,6 +15,7 @@
                 </view>
             </view>
         </block>
+		<u-loadmore :status="loadStatus" bg-color="#ECECEC" margin-top="20" v-if="loadStatus=='nomore'" />
 	</view>
 </template>
 
@@ -23,9 +24,8 @@
 		data() {
 			return {
 				height:'600',
-				actives: [
-					
-				]
+				actives: [],
+				loadStatus: 'loadmore'
 			};
 		},
 		onLoad(){
@@ -45,7 +45,9 @@
 			messageactivityList(){
 				this.$u.api.messageactivityList({}).then((res)=>{
                     if (res.errCode == 0) {
-                        this.actives = res.data;
+						this.actives = res.data;
+						// 目前没有分页,只无数据提示用,他们建议这样做
+						if(!this.actives.length) this.loadStatus = 'nomore';
                     }
 				})
 			}

pageD/logistics/logistics.vue

@@ -10,7 +10,7 @@
 				</view>
 				<view class="xiantiao"></view>
 				<view class="title">{{item.title}}</view>
-				<view class="images_about">
+				<view class="images_about" @click="viewLogistics(item)">
 					<image :src="item.picture"></image>
 					<view>
 						<text>{{item.summary}}</text>
@@ -18,6 +18,7 @@
 				</view>
 			</view>
 		</view>
+		<u-loadmore :status="loadStatus" bg-color="#ECECEC" margin-top="20" @loadmore="loadmore" />
 	</view>
 </template>
 
@@ -26,21 +27,57 @@
 		data() {
 			return {
 				actives: [],
-                page: 1
+				page: 1,
+				timer: true,
+				loadStatus: 'loadmore'
 			};
 		},
         onLoad() {
           this.getCartList();  
-        },
+		},
+		onReachBottom() {
+			this.loadmore();
+		},
 		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.data;
-                    }
-                })
-            }
+			loadmore() {
+				if(!this.timer) return false;
+				this.loadStatus = "loading";
+				this.page++;
+				this.getCartList({ load: 'loadmore' }).then(length => {
+					if(length == 0) {
+						this.page--;
+						this.loadStatus = 'nomore';
+					} else {
+						this.loadStatus = 'loading';
+					}
+				}).catch(() => {
+					this.loadStatus = "nomore";
+					this.page--;
+				})
+			},
+            async getCartList({ load = 'reload' } = {}) {
+                const res = await this.$u.post("message/orderDeliveryList",{ page: this.page })
+				this.timer = true;
+				if (res.errCode == 0) {
+					if(load == 'reload') {
+						this.actives = res.data.data;
+						if(res.data.data.length < 12) this.loadStatus = "nomore";
+					}
+					else if(load == 'loadmore') this.actives.push(...res.data.data);
+				}
+				return res.data.data.length;
+			},
+			viewLogistics(item) {
+				let url;
+				if(item.takeawayer_phone) {
+					url = '/pageE/order/Details';
+				} else {
+					url = '/pageE/order/Logistics';
+				}
+				this.$u.route(url, {
+					oid: item.order_id,
+				});
+			}
 		},
 		components:{
 		}

pageD/notice/notice.vue

@@ -2,6 +2,7 @@
 	<view id="viewes" :style="{height : height  + 'px'}">
 		<!-- 公告咨询 -->
 		<notice :list="list"></notice>
+		<u-loadmore :status="loadStatus" bg-color="#ECECEC" margin-top="20" v-if="loadStatus=='nomore'" />
 	</view>
 </template>
 
@@ -11,6 +12,7 @@
 		data() {
 			return {
 				list: [],
+				loadStatus: 'loadmore'
 			};
 		},
 		onLoad() {
@@ -29,6 +31,8 @@
 				this.$u.api.informationList({}).then((res) => {
 					if (res.errCode == 0) {
 						this.list = res.data;
+						// 目前没有分页,只无数据提示用
+						if(!this.list.length) this.loadStatus = 'nomore';
 					}
 				})
 			}

pageE/mine/EditUserInfo.vue

@@ -136,7 +136,7 @@ export default {
 				sizeType: ['original', 'compressed'],
 				sourceType: ['album'],
 				success: (res) => {
-					this.avatar = res.tempFilePaths[0];
+					// this.avatar = res.tempFilePaths[0];
 					common.uploadFile({ 
 						url: url,
 						name: 'avatar',
@@ -144,7 +144,7 @@ export default {
 					}).then(result => {
 						// console.log(result);
 						// this.$set(this, 'avatar', result.file_path);
-						// this.avatar = result.file_path;
+						this.avatar = result.file_path + "?" + new Date().getTime();
 						this.uploadPath = result.file_name;
 					}, error => {
 						this.$u.toast(error);

pageE/mine/MemberServeCoupon.vue

@@ -1,8 +1,5 @@
 <template>
 	<view class="coupon-swiper">
-		<!-- <scroll-view scroll-x="true" class="classify-coupon">
-			<view v-for="(classify, index) in couponGroupList" :key="index" class="classify-item" :class="{ 'active': couponCurrent == index }" @click="couponTabsChange(index)">{{ classify.gc_name }}</view>
-		</scroll-view> -->
 		<u-tabs :list="couponGroupList" name="gc_name" :is-scroll="true" :current="couponCurrent" @change="couponTabsChange" active-color="#FF780F" :show-bar="false" height="88" font-size="24"  inactive-color="#333333"></u-tabs>
 		<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{ height: swiperHeight }">
 			<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
@@ -11,17 +8,10 @@
 						<Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon>
 					</view>
 					<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList[i] || !couponList[i].length"></u-empty>
-					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-bottom="60" v-if="!couponList[i] || couponList[i].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
+					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-bottom="60" v-if="couponList[i] && couponList[i].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
-		<!-- <scroll-view scroll-y style="height: 100%;" @scrolltolower="onreachBottom" class="coupon-scroll" :style="{ height: swiperHeight }">
-			<view v-for="(coupon, index) in couponList" :key="index" class="coupon-item">
-				<Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon>
-			</view>
-			<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="couponList.length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
-			<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList.length"></u-empty>
-		</scroll-view> -->
 	</view>
 </template>
 <script>
@@ -49,7 +39,6 @@ export default {
 	},
 	watch: {
 		couponCurrent(index) {
-			// this.couponList = [];
 			const id = this.couponGroupList[index].gc_id;
 			this.getCouponList({ gc_id: id, load: 'reload' });
 		},

pageE/mine/MineInfo.vue

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

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" mode="aspectFit" @click="previewImage(item.fb_images)"></image>
+						<image v-for="(url, index) in item.fb_images" :key="index" :src="url" mode="aspectFit" @click="previewImage(item.fb_images, index)"></image>
 					</view>
 				</view>
 				<view class="reply" v-if="item.is_reply">
@@ -45,10 +45,11 @@ export default {
 				}
 			})
 		},
-		previewImage(urls) {
+		previewImage(urls, index) {
 			// console.log(urls);
 			uni.previewImage({
 				urls: urls,
+				current: urls[index]
 			});
 		},
 	},

pageE/order/Details.vue

@@ -76,7 +76,7 @@
 			<view class="cancel" v-if="orderstate == '6'" @click="cancelOrder">取消支付</view>
 			<!-- <view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> -->
 			<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code" @click="toOtherPage('Logistics')">查看物流</view>
-			<view class="phone" v-if="orderstate == '1' && orderInfo.takeawayer_phone" @click="makePhone(order.takeawayer_phone)">
+			<view class="phone" v-if="orderstate == '1' && orderInfo.takeawayer_mobile" @click="makePhone(orderInfo.takeawayer_mobile)">
 				<u-icon name="phone-fill" color="#FF780F" size="28"></u-icon>
 				<text>联系骑手</text>
 			</view>
@@ -153,7 +153,6 @@ export default {
 		clearInterval(this.timer);
 	},
 	methods: {
-		
 		viewStoreDetails(id) {
 			this.$u.route('pageC/merchant/index', {
 				id: id
@@ -201,7 +200,7 @@ export default {
 			this.$u.api.getOrderInfo({
 				order_id: id,
 			}).then(res => {
-				console.log(res)
+				// console.log(res)
 				if(res.errCode == 0) {
 					this.orderInfo = res.data;
 					this.setTitle(this.orderInfo.view_type);

pageE/order/Index.vue

@@ -1,7 +1,6 @@
 <template>
 	<view class="order">
 		<view>
-			<!-- <u-tabs-swiper ref="tabs" :list="list" active-color="#FF780F" :current="current" font-size="26" @change="tabsChange" height="88" :gutter="30"></u-tabs-swiper> -->
 			<u-tabs :list="list" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="88" font-size="26" :gutter="20" inactive-color="#333333"></u-tabs>
 		</view>
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ height: swiperHeight }">
@@ -14,7 +13,7 @@
 						</view>
 					</view>
 					<u-empty text="暂无订单" mode="order" color="#000000" v-if="!orderList[index] || !orderList[index].length"></u-empty>
-					<u-loadmore :status="loadStatus[index]" bgColor="#ECECEC" font-size="14" margin-bottom="20" v-if="current != 4 && (!orderList[index] || orderList[index].length>3)" class="order-loadmore"></u-loadmore>
+					<u-loadmore :status="loadStatus[index]" bgColor="#ECECEC" font-size="14" margin-bottom="20" v-if="current != 4 && (orderList[index] && orderList[index].length>3)" class="order-loadmore"></u-loadmore>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
@@ -175,8 +174,8 @@ export default {
 			let promise;
 			// if(this.current == 6) promise = this.getAfterSaleList();
 			// else 
-			// if(this.current == 4) promise = this.goodsTryOrderList();
-			promise = this.getOrderList();
+			if(this.current == 4) promise = this.goodsTryOrderList();
+			else promise = this.getOrderList();
 			promise.then(length => {
 				this.loadStatus.splice(this.current, 1, "nomore");
 				if(length == 0) this.page--;

pageE/order/Logistics.vue

@@ -22,10 +22,10 @@
 			<view class="title">物流跟踪</view>
 			<view class="main">
 				<view v-for="(item, index) in list" :key="index" class="logistics-item">
-					<view class="info u-line-2">{{ item.content }}</view>
+					<view class="info">{{ item.content }}</view>
 					<view class="date">{{ item.kd_time }}</view>
 				</view>
-				<u-empty text="暂无物流信息" mode="data" icon-size="88" margin-top="60"></u-empty>
+				<u-empty text="暂无物流信息" mode="data" icon-size="88" margin-top="60" v-if="!list.length"></u-empty>
 			</view>
 		</view>
 	</view>

pageE/setting/updateVersion.vue

@@ -1,7 +1,7 @@
 <template>
-	<u-modal v-model="show" :show-cancel-button="true" confirm-text="升级" title="发现新版本" @cancel="cancel" @confirm="confirm">
+	<u-modal v-model="show" :show-cancel-button="is_focus_upgrade" confirm-text="升级" title="发现新版本" @cancel="cancel" @confirm="confirm">
 		<view class="u-update-content">
-			<rich-text :nodes="content"></rich-text>
+			<!-- <rich-text :nodes="content"></rich-text> -->
 		</view>
 	</u-modal>
 </template>
@@ -10,6 +10,7 @@
 	export default {
 		data() {
 			return {
+				is_focus_upgrade: Boolean, // 是否强制更新
 				show: true,
 				// 传递给uni-app"rich-text"组件的内容，可以使用"<br>"进行换行
 				content: `
@@ -19,6 +20,9 @@
 				`,
 			}
 		},
+		onLoad(option) {
+			this.is_focus_upgrade = option.status == 1 ? false : true;
+		},
 		onReady() {
 			this.show = true;
 		},
@@ -27,7 +31,18 @@
 				this.closeModal();
 			},
 			confirm() {
+				// #ifdef APP-PLUS
+				if (plus.os.name == "Android") {
+					const appurl = "market://details?id=com.tencent.mobileqq"; //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数
+					plus.runtime.openURL(appurl);
+				} else if(plus.os.name == "ios") {
+					const appurl = "itms-apps://itunes.apple.com/cn/app/id1144816653?mt=8";
+					plus.runtime.openURL(appurl);
+				}
+				// endif
+				// ifdef H5
 				this.closeModal();
+				// #endif
 			},
 			closeModal() {
 				uni.navigateBack();
@@ -36,11 +51,11 @@
 	}
 </script>
 
-<style scoped lang="scss">
+<style lang="scss">
 	page {
 		background-color: rgba(0, 0, 0, 0);
 	}
-	/deep/ .u-mode-center-box {
+	.u-mode-center-box {
 		background-color: transparent;
 	}
 	// .u-full-content {

pageE/setting/version.vue

@@ -3,7 +3,7 @@
 		<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 class="tit-info">版本: {{ $app_version }} for {{ phone_type }}</view>
 		</view>
 		<view class="main">
 			<view @click="viewAboutUs">
@@ -12,8 +12,8 @@
 			</view>
 			<view class="version-view">
 				<text class="title">版本更新</text>
-				<text class="tips" v-if="1">已是最新版本</text>
-				<text class="tips" v-else @click="updateVersion">发现新版本</text>
+				<text class="tips" v-if="version" @click="updateVersion">发现新版本: {{ version }}</text>
+				<text class="tips" v-else>已是最新版本</text>
 			</view>
 		</view>
 	</view>
@@ -22,8 +22,9 @@
 export default {
 	data() {
 		return {
-			version: "",
+			version: '',
 			phone_type: "",
+			status: '',
 		}
 	},
 	onLoad() {
@@ -33,9 +34,12 @@ export default {
 	methods: {
 		// 检查版本号
 		getVersion() {
-			this.$u.post("Specialci/checkVersion",{ app_version: 1 }).then(res => {
+			this.$u.post("Specialci/checkVersion",{ app_version: this.$app_version }).then(res => {
 				// console.log(res);
-				this.version = res.data.app_version;
+				if(res.data.app_version != this.$app_version) {
+					this.version = res.data.app_version;
+					this.status = res.data.is_focus_upgrade; // 0 不强制 1 强制 
+				}
 			})
 		},
 		viewAboutUs() {
@@ -44,7 +48,9 @@ export default {
 			});
 		},
 		updateVersion() {
-			this.$u.route('/pageE/setting/updateVersion');
+			this.$u.route('/pageE/setting/updateVersion', {
+				status: this.status
+			});
 		}
 	}
 };

pages.json

@@ -56,6 +56,7 @@
 					"style": {
 						"navigationBarTitleText": "",
 						"navigationStyle": "custom",
+						"backgroundColorBottom":"#000000",
 						"app-plus": {
 							"titleNView": false
 						}
@@ -79,6 +80,13 @@
 		{
 			"root": "pageB",
 			"pages": [
+				{
+					"path": "playVideo/index",
+					"style": {
+						"navigationStyle":"custom",
+						"backgroundColor":"#000000"
+					}
+				},
 				{
 					"path": "follow/index",
 					"style": {
@@ -1011,10 +1019,10 @@
 					"style": {
 						"navigationStyle": "custom",  // 取消本页面的导航栏
 						"app-plus": {
-							"animationType": "fade-in", // 设置fade-in淡入动画，为最合理的动画类型
-							"background": "transparent", // 背景透明
-							"backgroundColor": "rgba(0,0,0,0)", // 背景透明
-							"popGesture": "none" // 关闭IOS屏幕左边滑动关闭当前页面的功能
+							"animationType": "fade-in",
+							"background": "transparent",
+							"backgroundColor": "rgba(0,0,0,0)",
+							"popGesture": "none"
 						}
 					}
 				},

pages/index/index.vue

@@ -400,7 +400,12 @@
 					member_id: member_id
 				}).then((res) => {
                     this.follow_page = 0;
-					this.getRecommendList(); // 关注列表
+					// this.getRecommendList(); // 关注列表
+					for(let i in this.recommendList){
+						if(this.recommendList[i].member_id == member_id){
+							this.recommendList[i].is_attention == 1 ? this.recommendList[i].is_attention = 0 : this.recommendList[i].is_attention = 1
+						}
+					}
                     this.getFollowList(); // 刷新发现的列表
 				})
 			},

pages/mine/index.vue

@@ -2,7 +2,7 @@
     <view class="mine">
         <view class="mine-top">
             <view class="top">
-				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="110"></u-avatar>
+				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar" :size="110"></u-avatar>
 				<view class="user-info">
 					<view class="info-top">
 						<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
@@ -58,35 +58,6 @@
 							<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>
-						<view>待发货</view>
-					</view>
-					<view @click="toOtherPage('/order/Index?current=3')">
-						<image src="/static/image/mine/2.png"></image>
-						<view>待收货</view>
-					</view>
-					<view @click="toOtherPage('/order/Index?current=4')">
-						<image src="/static/image/mine/1.png"></image>
-						<view>试穿试送</view>
-					</view>
-					<view @click="toOtherPage('/order/Index?current=5')">
-						<image src="/static/image/mine/37.png"></image>
-						<view>拼团中</view>
-					</view>
-					<view @click="toOtherPage('/order/Index?current=6')">
-						<image src="/static/image/mine/3.png"></image>
-						<view>待评价</view>
-					</view>
-                    <view @click="toOtherPage('/order/Index?current=7')">
-                    	<image src="/static/image/mine/9.png"></image>
-                    	<view>售后</view>
-                    </view> -->
 				</view>
 			</view>
 			<view class="tool">
@@ -206,9 +177,10 @@ export default {
 			uni.navigateTo({
 				url: "../../pageA/login/login"
 			})
-		}
-		this.getUserInfo();
-		this.getOrderNumber();
+		} else {
+            this.getOrderNumber();
+			this.getUserInfo();
+        }
 	},
 	onNavigationBarButtonTap(e) {
 		// console.log(e);
@@ -346,7 +318,7 @@ export default {
 				height: $image-height !important;
 			}
 		}
-		@mixin common-mine($content-padding-top, $content-padding-bottom, $image-width, $image-height) {
+		@mixin common-mine($content-padding-top, $content-padding-row, $content-padding-bottom, $image-width, $image-height) {
 			box-sizing: border-box;
 			width: 710rpx;
 			background: rgba(255,255,255,1);
@@ -366,7 +338,7 @@ export default {
                 color: #999;
             }
 			.content {
-				padding: $content-padding-top 20rpx $content-padding-bottom;
+				padding: $content-padding-top $content-padding-row $content-padding-bottom;
 				display: flex;
 				> view {
 					text-align: center;
@@ -386,6 +358,7 @@ export default {
 		.order {
 			@include common-mine(
 				$content-padding-top: 22rpx, 
+				$content-padding-row: 30rpx,
 				$content-padding-bottom: 30rpx, 
 				$image-height: 36rpx,
 				$image-width: 36rpx
@@ -412,11 +385,9 @@ export default {
 					align-items: center;
 					justify-content: space-between;
 					position: relative;
-					.order-num{
+					.order-num {
 						position: absolute;
-						top: -12rpx;
-						right: -38rpx;
-						width: 50rpx;
+						top: -14rpx;
 					}
 					.order-num > text {
 						z-index: 9;
@@ -434,6 +405,11 @@ export default {
 						color:rgba(255,120,15,1);
 					}
 				}
+				> view:not(:nth-child(6)) {
+					.order-num {
+						left: 40rpx;
+					}
+				}
 				> view:nth-child(1){
 					@include image-size($image-width: 33rpx, $image-height: 36rpx);
 				}
@@ -447,16 +423,20 @@ export default {
 					@include image-size($image-width: 35rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(5){
-					@include image-size($image-width: 37rpx, $image-height: 37rpx);
+					@include image-size($image-width: 35rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(6){
 					@include image-size($image-width: 33rpx, $image-height: 35rpx);
+					.order-num {
+						left: 24rpx;
+					}
 				}
 			}
 		} 
 		.tool {
 			@include common-mine(
 				$content-padding-top: 24rpx,
+				$content-padding-row: 20rpx,
 				$content-padding-bottom: 25rpx, 
 				$image-height: 71rpx,
 				$image-width: 71rpx
@@ -473,6 +453,7 @@ export default {
 		 .more-tool {
 			@include common-mine(
 				$content-padding-top: 24rpx, 
+				$content-padding-row: 20rpx,
 				$content-padding-bottom: 48rpx, 
 				$image-height: 71rpx,
 				$image-width: 71rpx