更新移动端代码

template/uni-app/App.vue

@@ -82,27 +82,27 @@
 				switch (res.data.status) {
 					case 1:
 						uni.setStorageSync('viewColor', blue)
-						uni.$emit('ok', blue, res.data.status)
+						uni.$emit('ok', blue,res.data.status)
 						break;
 					case 2:
 						uni.setStorageSync('viewColor', green)
-						uni.$emit('ok', green, res.data.status)
+						uni.$emit('ok', green,res.data.status)
 						break;
 					case 3:
 						uni.setStorageSync('viewColor', red)
-						uni.$emit('ok', red, res.data.status)
+						uni.$emit('ok', red,res.data.status)
 						break;
 					case 4:
 						uni.setStorageSync('viewColor', pink)
-						uni.$emit('ok', pink, res.data.status)
+						uni.$emit('ok', pink,res.data.status)
 						break;
 					case 5:
 						uni.setStorageSync('viewColor', orange)
-						uni.$emit('ok', orange, res.data.status)
+						uni.$emit('ok', orange,res.data.status)
 						break;
 					default:
 						uni.setStorageSync('viewColor', red)
-						uni.$emit('ok', red, res.data.status)
+						uni.$emit('ok', red,res.data.status)
 						break
 				}
 			});

template/uni-app/components/homeList/index.vue

@@ -1,22 +1,25 @@
 <template>
 	<!-- #ifdef APP-PLUS -->
-	<view class="animated dialog_nav" :style="{ top: (navH+15) + 'rpx', marginTop: sysHeight}" :class="[goodList?'dialogIndex':'',currentPage?'':'']" v-show="currentPage">
-	<!-- #endif -->
-	<!-- #ifndef APP-PLUS -->
-	<view class="animated dialog_nav" :style="{ top: (navH+15) + 'rpx' }" :class="[goodList?'dialogIndex':'',goodsShow?'dialogGoods':'',currentPage?'':'']" v-show="currentPage">
-	<!-- #endif -->
-		<view class="dialog_nav_item" :class="item.after" v-for="(item,index) in selectNavList" :key="index" @click="linkPage(item.url)">
-			<text class="iconfont" :class="item.icon"></text>
-			<text class="pl-20">{{item.name}}</text>
+	<view class="animated dialog_nav" :style="{ top: (navH+65) + 'rpx', marginTop: sysHeight}"
+		:class="[goodList?'dialogIndex':'',currentPage?'':'']" v-show="currentPage">
+		<!-- #endif -->
+		<!-- #ifndef APP-PLUS -->
+		<view class="animated dialog_nav" :style="{ top: (navH+15) + 'rpx' }"
+			:class="[goodList?'dialogIndex':'',goodsShow?'dialogGoods':'',currentPage?'':'']" v-show="currentPage">
+			<!-- #endif -->
+			<view class="dialog_nav_item" :class="item.after" v-for="(item,index) in selectNavList" :key="index"
+				@click="linkPage(item.url)">
+				<text class="iconfont" :class="item.icon"></text>
+				<text class="pl-20">{{item.name}}</text>
+			</view>
 		</view>
-	</view>
 </template>
 <script>
 	export default {
 		name: "homeIdex",
 		props: {
 			navH: {
-				type: String|Number,
+				type: String | Number,
 				default: ""
 			},
 			returnShow: {
@@ -36,24 +39,49 @@
 				default: false
 			},
 			sysHeight: {
-				type: String|Number,
+				type: String | Number,
 				default: ""
 			}
 		},
 		data: function() {
 			return {
-				selectNavList:[
-					{name:'首页',icon:'icon-shouye8',url:'/pages/index/index',after:'dialog_after'},
-					{name:'搜索',icon:'icon-sousuo6',url:'/pages/goods_search/index',after:'dialog_after'},
-					{name:'购物车',icon:'icon-gouwuche7',url:'/pages/order_addcart/order_addcart',after:'dialog_after'},
-					{name:'我的收藏',icon:'icon-shoucang3',url:'/pages/users/user_goods_collection/index',after:'dialog_after'},
-					{name:'个人中心',icon:'icon-gerenzhongxin1',url:'/pages/user/index'},
+				selectNavList: [{
+						name: '首页',
+						icon: 'icon-shouye8',
+						url: '/pages/index/index',
+						after: 'dialog_after'
+					},
+					{
+						name: '搜索',
+						icon: 'icon-sousuo6',
+						url: '/pages/goods_search/index',
+						after: 'dialog_after'
+					},
+					{
+						name: '购物车',
+						icon: 'icon-gouwuche7',
+						url: '/pages/order_addcart/order_addcart',
+						after: 'dialog_after'
+					},
+					{
+						name: '我的收藏',
+						icon: 'icon-shoucang3',
+						url: '/pages/users/user_goods_collection/index',
+						after: 'dialog_after'
+					},
+					{
+						name: '个人中心',
+						icon: 'icon-gerenzhongxin1',
+						url: '/pages/user/index'
+					},
 				]
 			};
 		},
 		methods: {
-			linkPage(url){
-				if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index', '/pages/index/index']
+			linkPage(url) {
+				if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index',
+						'/pages/index/index'
+					]
 					.indexOf(url) == -1) {
 					uni.navigateTo({
 						url: url
@@ -66,13 +94,12 @@
 			}
 		},
 		created() {},
-		beforeDestroy() {
-		}
+		beforeDestroy() {}
 	};
 </script>
 
 <style scoped lang="scss">
-	.dialog_nav{
+	.dialog_nav {
 		position: absolute;
 		/* #ifdef MP */
 		left: 14rpx;
@@ -85,6 +112,7 @@
 		box-shadow: 0px 0px 16rpx rgba(0, 0, 0, 0.08);
 		z-index: 310;
 		border-radius: 14rpx;
+
 		&::before {
 			content: "";
 			width: 0;
@@ -93,11 +121,16 @@
 			border-right: 15rpx solid transparent;
 			border-bottom: 30rpx solid #fff;
 			position: absolute;
-			top: -23rpx;
-			right: 36rpx;
+			top: -20rpx;
+			/* #ifdef APP-PLUS || H5 */
+			right: 32rpx;
+			/* #endif */
+			/* #ifdef MP */
+			left: 80rpx;
+			/* #endif */
 			border-bottom-color: #f2f2f2;
 		}
-		
+
 		&::after {
 			content: "";
 			width: 0;
@@ -107,21 +140,31 @@
 			border-bottom: 30rpx solid #fff;
 			position: absolute;
 			top: -20rpx;
-			right: 36rpx;
+			/* #ifdef APP-PLUS || H5 */
+			right: 32rpx;
+			/* #endif */
+			/* #ifdef MP */
+			left: 80rpx;
+			/* #endif */
+
 		}
-		&.dialogIndex{
+
+		&.dialogIndex {
 			left: 14rpx;
-			&::before{
-				left: -160rpx!important;
+
+			&::before {
+				left: -160rpx !important;
 			}
 		}
-		&.dialogGoods{
-			&::before{
+
+		&.dialogGoods {
+			&::before {
 				left: -170rpx;
 			}
 		}
 	}
-	.dialog_nav_item{
+
+	.dialog_nav_item {
 		width: 100%;
 		height: 84rpx;
 		line-height: 84rpx;
@@ -132,16 +175,18 @@
 		color: #333;
 		position: relative;
 		display: flex;
-		.iconfont{
+
+		.iconfont {
 			font-size: 32rpx;
 			margin-right: 26rpx;
 		}
 	}
-	.dialog_after{
-		::after{
+
+	.dialog_after {
+		::after {
 			content: '';
 			position: absolute;
-			width:90px;
+			width: 90px;
 			height: 1px;
 			background-color: #EEEEEE;
 			bottom: 0;

template/uni-app/components/kefuIcon/index.vue

@@ -5,9 +5,8 @@
 	<!-- 	<navigator :url="'/pages/customer_list/chat?productId='+ids" hover-class="none" class="acea-row row-center-wrapper cartf iconfont icon-kefu3" :style="{ top: top + 'px'}" @touchmove.stop.prevent="setTouchMove"></navigator> -->
 	<!-- #endif -->
 	<!-- #ifdef MP -->
-	<navigator :url="'/pages/customer_list/chat?productId='+ids" hover-class="none"
-		class="acea-row row-center-wrapper cartf iconfont icon-kefu3" :style="{ top: top + 'px'}"
-		@touchmove.stop.prevent="setTouchMove" v-if="routineContact == 0"></navigator>
+	<view v-if="routineContact == 0" class="acea-row row-center-wrapper cartf iconfont icon-kefu3"
+		:style="{ top: top + 'px'}" @touchmove.stop.prevent="setTouchMove" @click="goCustomer"></view>
 	<button class="acea-row row-center-wrapper cartf iconfont icon-kefu3" open-type='contact'
 		:style="{ top: top + 'px'}" @touchmove.stop.prevent="setTouchMove"
 		v-else-if="routineContact==1 && !goodsCon"></button>
@@ -20,7 +19,9 @@
 </template>
 
 <script>
-	import {getCustomer} from '@/utils/index.js'
+	import {
+		getCustomer
+	} from '@/utils/index.js'
 	let app = getApp();
 	export default {
 		name: "kefuIcon",
@@ -35,7 +36,7 @@
 			},
 			storeInfo: {
 				type: Object,
-				default: ()=>{}
+				default: () => {}
 			},
 			goodsCon: {
 				type: Number,

template/uni-app/components/payment/index.vue

@@ -210,7 +210,7 @@
 								});
 							} else {
 								that.$wechat.pay(data.result.jsConfig)
-									.finally(() => {
+									.then(() => {
 										return that.$util.Tips({
 											title: "支付成功",
 											icon: 'success'
@@ -220,7 +220,7 @@
 											});
 										});
 									})
-									.catch(function() {
+									.catch(()=> {
 										return that.$util.Tips({
 											title: '支付失败'
 										}, () => {

template/uni-app/components/update/app-update.vue

@@ -69,6 +69,7 @@
 		},
 		created() {
 			vm = this;
+			this.update()
 		},
 		computed: {
 			// 下载进度计算

template/uni-app/manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "routine",
+    "name" : "CRMEB标准版",
     "appid" : "__UNI__A3F1ED4",
     "description" : "CRMEB标准版",
     "versionName" : "1.0.0",
-    "versionCode" : 103,
+    "versionCode" : 107,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -17,12 +17,12 @@
         },
         /* 模块配置 */
         "modules" : {
-            "Payment" : {},
             "OAuth" : {},
-            "Maps" : {},
+            "Geolocation" : {},
+            "Payment" : {},
             "Share" : {},
             "VideoPlayer" : {},
-            "Geolocation" : {}
+            "Maps" : {}
         },
         "safearea" : {
             "bottom" : {
@@ -58,7 +58,7 @@
             "ios" : {
                 "capabilities" : {
                     "entitlements" : {
-                        "com.apple.developer.associated-domains" : [ "applinks:", "applinks:bzapp.crmeb.net" ]
+                        "com.apple.developer.associated-domains" : [ "applinks:", "applinks:demo26.crmeb.net", "applinks:bzapp.crmeb.net" ]
                     }
                 },
                 "privacyDescription" : {
@@ -69,18 +69,18 @@
                     "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店",
                     "NSCameraUsageDescription" : "上传用户头像保存分享海报"
                 },
-                "idfa" : true
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
                 "payment" : {
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    },
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
                         "appid" : "wx277a269f3d736d67",
                         "UniversalLinks" : "https://bzapp.crmeb.net/uni-universallinks/__UNI__A3F1ED4/"
-                    },
-                    "alipay" : {
-                        "__platform__" : [ "ios", "android" ]
                     }
                 },
                 "share" : {
@@ -97,12 +97,12 @@
                     }
                 },
                 "oauth" : {
+                    "apple" : {},
                     "weixin" : {
                         "appid" : "wx277a269f3d736d67",
                         "appsecret" : "bd08741a055c2ecac5826ff1c048464b",
                         "UniversalLinks" : "https://bzapp.crmeb.net/uni-universallinks/__UNI__A3F1ED4/"
-                    },
-                    "apple" : {}
+                    }
                 },
                 "ad" : {},
                 "geolocation" : {
@@ -111,6 +111,12 @@
                         "appkey_ios" : "aeb768547b9d752891e37e1ca0a2b66d",
                         "appkey_android" : "41ec5c3f4d110ce02a326210fe147be8"
                     }
+                },
+                "statics" : {
+                    "google" : {
+                        "config_ios" : "",
+                        "config_android" : ""
+                    }
                 }
             },
             "splashscreen" : {
@@ -156,7 +162,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "1234567890",
+        "appid" : "wx3b82801238ca1b57",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

template/uni-app/pages.json

@@ -13,7 +13,10 @@
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"scrollIndicator": "none"
+				}
 			}
 		},
 		{
@@ -945,7 +948,13 @@
 						// #endif
 					}
 				}
-			]
+			],
+			"plugins": {
+				"live-player-plugin": {
+					"version": "1.3.2",
+					"provider": "wx2b03c6e691cd7370"
+				}
+			}
 		},
 		{
 			"root": "pages/goods_details",
@@ -954,10 +963,18 @@
 				"path": "index",
 				"style": {
 					"navigationStyle": "custom",
+					"transparentTitle": "auto",
 					"app-plus": {
 						// #ifdef APP-PLUS
 						"titleNView": {
-							"type": "default"
+							"padding-left": "10px",
+							"padding-right": "10px",
+							"type": "transparent",
+							"buttons": [ //原生标题栏按钮配置,
+								{
+									"type": "menu" //原生标题栏增加分享按钮，点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
+								}
+							]
 						}
 						// #endif
 					}
@@ -1026,7 +1043,14 @@
 						"app-plus": {
 							// #ifdef APP-PLUS
 							"titleNView": {
-								"type": "default"
+								"padding-left": "10px",
+								"padding-right": "10px",
+								"type": "transparent",
+								"buttons": [ //原生标题栏按钮配置,
+									{
+										"type": "menu" //原生标题栏增加分享按钮，点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
+									}
+								]
 							}
 							// #endif
 						}
@@ -1075,7 +1099,14 @@
 						"app-plus": {
 							// #ifdef APP-PLUS
 							"titleNView": {
-								"type": "default"
+								"padding-left": "10px",
+								"padding-right": "10px",
+								"type": "transparent",
+								"buttons": [ //原生标题栏按钮配置,
+									{
+										"type": "menu" //原生标题栏增加分享按钮，点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
+									}
+								]
 							}
 							// #endif
 						}
@@ -1125,24 +1156,6 @@
 						}
 					}
 				},
-				{
-					"path": "presell_details/index",
-					"style": {
-						"navigationStyle": "custom"
-							// #ifdef MP
-							,
-						"navigationBarTextStyle": "#fff"
-							// #endif
-							,
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				},
 				{
 					"path": "lottery/grids/index",
 					"style": {
@@ -1449,11 +1462,18 @@
 				{
 					"path": "integral_goods_details",
 					"style": {
-						"navigationBarTitleText": "商品详情",
+						"navigationStyle": "custom",
 						"app-plus": {
 							// #ifdef APP-PLUS
 							"titleNView": {
-								"type": "default"
+								"padding-left": "10px",
+								"padding-right": "10px",
+								"type": "transparent",
+								"buttons": [ //原生标题栏按钮配置,
+									{
+										"type": "menu" //原生标题栏增加分享按钮，点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
+									}
+								]
 							}
 							// #endif
 						}

template/uni-app/pages/activity/goods_bargain_details/index.vue

@@ -481,7 +481,6 @@
 		},
 		methods: {
 			colorShow(colorStatus) {
-				console.log(colorStatus)
 				switch (colorStatus) {
 					case 1:
 						this.picUrl = this.picList[0]

template/uni-app/pages/activity/goods_combination_details/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view :style="colorStyle">
-		<!-- 头部 -->
+		<!-- #ifndef APP-PLUS -->
 		<view class='navbar' :style="{height:navH+'rpx',opacity:opacity}">
 			<view class='navbarH' :style='"height:"+navH+"rpx;"'>
 				<view class='navbarCon acea-row row-center-wrapper'>
@@ -13,286 +13,277 @@
 				</view>
 			</view>
 		</view>
-		<!-- #ifdef APP-PLUS -->
 		<view id="home" class="home-nav acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-			:style="{ top:(navH/2-92)+'rpx' ,marginTop:sysHeight}">
+			:style="{ top: homeTop +'rpx'}">
+			<view class="iconfont icon-fanhui2" @tap="returns"></view>
+			<!-- #ifdef MP -->
+			<view class="line"></view>
+			<view class="iconfont icon-gengduo5" @click="moreNav"></view>
 			<!-- #endif -->
-			<!-- #ifndef APP-PLUS -->
-			<view id="home" class="home-nav acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-				:style="{ top: homeTop +'rpx'}">
-				<!-- #endif -->
-				<view class="iconfont icon-fanhui2" @tap="returns"></view>
-				<!-- #ifdef MP -->
-				<view class="line"></view>
-				<view class="iconfont icon-gengduo5" @click="moreNav"></view>
-				<!-- #endif -->
-			</view>
-
+		</view>
+		<!-- #endif -->
 
-			<!-- #ifdef APP-PLUS -->
-			<view id="home" class="home-nav right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-				:style="{ top:(navH/2-92)+'rpx',marginTop:sysHeight}">
-				<!-- #endif -->
-				<!-- #ifdef H5 -->
-				<view id="home" class="home-nav right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-					:style="{ top: homeTop +'rpx'}">
+		<!-- #ifdef H5 -->
+		<view id="home" class="home-nav right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
+			:style="{ top: homeTop +'rpx'}">
+			<!-- #ifdef H5 -->
+			<view class="iconfont icon-gengduo2" @click="moreNav"></view>
+		</view>
+		<!-- #endif -->
+		<!-- #endif -->
+		<homeList :navH="navH" :returnShow="returnShow" :currentPage="currentPage" :sysHeight="sysHeight">
+		</homeList>
+		<!-- 详情 -->
+		<view class='product-con'>
+			<scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true"
+				:style="'height:'+height+'px;'" @scroll="scroll">
+				<view id="past0">
+					<!-- #ifdef APP-PLUS || MP -->
+					<view class="" :style="'width:100%;' + 'height:'+sysHeight"></view>
 					<!-- #endif -->
-					<!-- #ifdef APP-PLUS || H5 -->
-					<view class="iconfont icon-gengduo2" @click="moreNav"></view>
-				</view>
-				<!-- #endif -->
-
-				<homeList :navH="navH" :returnShow="returnShow" :currentPage="currentPage" :sysHeight="sysHeight">
-				</homeList>
-				<!-- 详情 -->
-				<view class='product-con'>
-					<scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true"
-						:style="'height:'+height+'px;'" @scroll="scroll">
-						<view id="past0">
-							<productConSwiper :imgUrls="imgUrls"></productConSwiper>
-							<view class='wrapper'>
-								<view class='share acea-row row-between row-bottom'>
-									<view class='money font-color'>
-										￥<text class='num'>{{storeInfo.price || 0}}</text>
-										<text
-											v-if="attribute.productAttr.length && (attribute.productAttr.length?attribute.productAttr[0].attr_values.length:0) > 1">起</text>
-										<text class='y-money'>￥{{storeInfo.product_price || 0}}</text>
-									</view>
-									<view class='iconfont icon-fenxiang' @click="listenerActionSheet"></view>
-								</view>
-								<view class='introduce'>{{storeInfo.title}}</view>
-								<view class='label acea-row row-between-wrapper'>
-									<view class='stock'>类型：{{storeInfo.people || 0}}人团</view>
-									<view>累计销量：{{storeInfo.total?storeInfo.total:0}} {{storeInfo.unit_name || ''}}
-									</view>
-									<view>限购: {{ storeInfo.quota ? storeInfo.quota : 0 }}
-										{{storeInfo.unit_name || ''}}
-									</view>
-								</view>
+					<productConSwiper :imgUrls="imgUrls"></productConSwiper>
+					<view class='wrapper'>
+						<view class='share acea-row row-between row-bottom'>
+							<view class='money font-color'>
+								￥<text class='num'>{{storeInfo.price || 0}}</text>
+								<text
+									v-if="attribute.productAttr.length && (attribute.productAttr.length?attribute.productAttr[0].attr_values.length:0) > 1">起</text>
+								<text class='y-money'>￥{{storeInfo.product_price || 0}}</text>
 							</view>
-							<view class='attribute acea-row row-between-wrapper' @tap='selecAttr'
-								v-if='attribute.productAttr.length'>
-								<!-- 		<view>{{attr}}：<text class='atterTxt'>{{attrValue}}</text></view>
+							<view class='iconfont icon-fenxiang' @click="listenerActionSheet"></view>
+						</view>
+						<view class='introduce'>{{storeInfo.title}}</view>
+						<view class='label acea-row row-between-wrapper'>
+							<view class='stock'>类型：{{storeInfo.people || 0}}人团</view>
+							<view>累计销量：{{storeInfo.total?storeInfo.total:0}} {{storeInfo.unit_name || ''}}
+							</view>
+							<view>限购: {{ storeInfo.quota ? storeInfo.quota : 0 }}
+								{{storeInfo.unit_name || ''}}
+							</view>
+						</view>
+					</view>
+					<view class='attribute acea-row row-between-wrapper' @tap='selecAttr'
+						v-if='attribute.productAttr.length'>
+						<!-- 		<view>{{attr}}：<text class='atterTxt'>{{attrValue}}</text></view>
 						<view class='iconfont icon-jiantou'></view> -->
-								<view class="flex">
-									<view style="display: flex; align-items: center; width: 90%">
-										<view class="attr-txt"> {{ attr }}： </view>
-										<view class="atterTxt line1" style="width: 82%">{{
+						<view class="flex">
+							<view style="display: flex; align-items: center; width: 90%">
+								<view class="attr-txt"> {{ attr }}： </view>
+								<view class="atterTxt line1" style="width: 82%">{{
 						      attrValue
 						    }}</view>
-									</view>
-									<view class="iconfont icon-jiantou"></view>
-								</view>
-								<view class="acea-row row-between-wrapper" style="margin-top: 7px; padding-left: 70px"
-									v-if="skuArr.length > 1">
-									<view class="flexs">
-										<image :src="item.image" v-for="(item, index) in skuArr.slice(0, 4)"
-											:key="index" class="attrImg"></image>
-									</view>
-									<view class="switchTxt">共{{ skuArr.length }}种规格可选</view>
-								</view>
 							</view>
-							<view class="bg-color">
-								<view class='notice acea-row row-middle'>
-									<view class='num font-num'>
-										<text class='iconfont icon-laba'></text>
-										已拼{{pink_ok_sum}}件<text class='line'>|</text>
-									</view>
-									<view class='swiper'>
-										<swiper :indicator-dots="indicatorDots" :autoplay="autoplay" interval="2500"
-											duration="500" vertical="true" circular="true">
-											<block v-for="(item,index) in itemNew" :key='index'>
-												<swiper-item>
-													<view class='line1'>{{item}}</view>
-												</swiper-item>
-											</block>
-										</swiper>
-									</view>
-								</view>
+							<view class="iconfont icon-jiantou"></view>
+						</view>
+						<view class="acea-row row-between-wrapper" style="margin-top: 7px; padding-left: 70px"
+							v-if="skuArr.length > 1">
+							<view class="flexs">
+								<image :src="item.image" v-for="(item, index) in skuArr.slice(0, 4)" :key="index"
+									class="attrImg"></image>
 							</view>
-							<view class='assemble'>
-								<view class='item acea-row row-between-wrapper' v-for='(item,index) in pink'
-									:key='index' v-if="index < AllIndex">
-									<view class='pictxt acea-row row-between-wrapper'>
-										<view class='pictrue'>
-											<image :src='item.avatar'></image>
-										</view>
-										<view class='text line1'>{{item.nickname}}</view>
-									</view>
-									<view class='right acea-row row-middle'>
-										<view>
-											<view class='lack'>还差<text class='font-num'>{{item.count}}</text>人成团</view>
-											<view class='time'>
-												<count-down :is-day="false" :tip-text="' '" :day-text="' '"
-													:hour-text="':'" :minute-text="':'" :second-text="' '"
-													:datatime="item.stop_time">
-												</count-down>
-											</view>
-										</view>
-										<navigator hover-class='none'
-											:url="'/pages/activity/goods_combination_status/index?id='+item.id"
-											class='spellBnt'>
-											去拼单
-											<text class='iconfont icon-jiantou'></text>
-										</navigator>
-									</view>
-								</view>
-								<template v-if="pink.length">
-									<view class='more' @tap='showAll' v-if="pink.length > AllIndex">查看更多<text
-											class='iconfont icon-xiangxia'></text></view>
-									<view class='more' @tap='hideAll'
-										v-else-if="pink.length === AllIndex && pink.length !== AllIndexDefault">收起<text
-											class='iconfont icon-xiangshang'></text></view>
-								</template>
+							<view class="switchTxt">共{{ skuArr.length }}种规格可选</view>
+						</view>
+					</view>
+					<view class="bg-color">
+						<view class='notice acea-row row-middle'>
+							<view class='num font-num'>
+								<text class='iconfont icon-laba'></text>
+								已拼{{pink_ok_sum}}件<text class='line'>|</text>
 							</view>
-							<view class='playWay'>
-								<view class='title acea-row row-between-wrapper'>
-									<view>拼团玩法</view>
-									<!-- <navigator hover-class='none' class='font-color' url='/pages/activity/goods_combination_rule/index'>查看规则<text class="iconfont icon-jiantou"></text></navigator> -->
+							<view class='swiper'>
+								<swiper :indicator-dots="indicatorDots" :autoplay="autoplay" interval="2500"
+									duration="500" vertical="true" circular="true">
+									<block v-for="(item,index) in itemNew" :key='index'>
+										<swiper-item>
+											<view class='line1'>{{item}}</view>
+										</swiper-item>
+									</block>
+								</swiper>
+							</view>
+						</view>
+					</view>
+					<view class='assemble'>
+						<view class='item acea-row row-between-wrapper' v-for='(item,index) in pink' :key='index'
+							v-if="index < AllIndex">
+							<view class='pictxt acea-row row-between-wrapper'>
+								<view class='pictrue'>
+									<image :src='item.avatar'></image>
 								</view>
-								<view class='way acea-row row-middle'>
-									<view class='item'>
-										<text class='num'>①</text>
-										<text>开团/参团</text>
-									</view>
-									<view class='iconfont icon-arrow'></view>
-									<view class='item'>
-										<text class='num'>②</text>
-										<text>邀请好友</text>
-									</view>
-									<view class='iconfont icon-arrow'></view>
-									<view class='item'>
-										<view>
-											<text class='num'>③</text>
-											<text>满员发货</text>
-										</view>
-										<!-- <view class='tip'>不满自动退款</view> -->
+								<view class='text line1'>{{item.nickname}}</view>
+							</view>
+							<view class='right acea-row row-middle'>
+								<view>
+									<view class='lack'>还差<text class='font-num'>{{item.count}}</text>人成团</view>
+									<view class='time'>
+										<count-down :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="':'"
+											:minute-text="':'" :second-text="' '" :datatime="item.stop_time">
+										</count-down>
 									</view>
 								</view>
-							</view>
-						</view>
-						<view class='userEvaluation' id="past1" v-if="replyCount">
-							<view class='title acea-row row-between-wrapper'>
-								<view>用户评价({{replyCount}})</view>
-								<navigator class='praise' hover-class='none'
-									:url='"/pages/users/goods_comment_list/index?product_id="+storeInfo.product_id'>
-									<text class='font-num'>{{replyChance || 0}}%</text>
-									好评率
+								<navigator hover-class='none'
+									:url="'/pages/activity/goods_combination_status/index?id='+item.id"
+									class='spellBnt'>
+									去拼单
 									<text class='iconfont icon-jiantou'></text>
 								</navigator>
 							</view>
-							<userEvaluation :reply="reply"></userEvaluation>
 						</view>
-						<view class='product-intro' id="past2">
-							<view class='title'>产品介绍</view>
-							<view class='conter'>
-								<!-- <view class="" v-html="storeInfo.description"></view> -->
-								<parser :html="storeInfo.description" ref="article" :tag-style="tagStyle"></parser>
-							</view>
-						</view>
-					</scroll-view>
-					<view class='footer acea-row row-between-wrapper'>
-						<!-- #ifdef MP -->
-						<!-- <button open-type="contact" hover-class='none' class='item'>
-					<view class='iconfont icon-kefu'></view>
-					<view class="p_center">客服</view>
-				</button> -->
-						<!-- #endif -->
-						<!-- #ifndef MP -->
-						<!-- <navigator hover-class="none" class="item" url="/pages/customer_list/chat">
-					<view class="iconfont icon-kefu"></view>
-					<view class="p_center">客服</view>
-				</navigator> -->
-						<!-- #endif -->
-						<navigator hover-class="none" class="item" open-type="switchTab" url="/pages/index/index">
-							<view class="iconfont icon-shouye6"></view>
-							<view class="p_center">首页</view>
-						</navigator>
-						<view @tap='setCollect' class='item'>
-							<view class='iconfont icon-shoucang1' v-if="storeInfo.userCollect"></view>
-							<view class='iconfont icon-shoucang' v-else></view>
-							<view class="p_center">收藏</view>
+						<template v-if="pink.length">
+							<view class='more' @tap='showAll' v-if="pink.length > AllIndex">查看更多<text
+									class='iconfont icon-xiangxia'></text></view>
+							<view class='more' @tap='hideAll'
+								v-else-if="pink.length === AllIndex && pink.length !== AllIndexDefault">收起<text
+									class='iconfont icon-xiangshang'></text></view>
+						</template>
+					</view>
+					<view class='playWay'>
+						<view class='title acea-row row-between-wrapper'>
+							<view>拼团玩法</view>
+							<!-- <navigator hover-class='none' class='font-color' url='/pages/activity/goods_combination_rule/index'>查看规则<text class="iconfont icon-jiantou"></text></navigator> -->
 						</view>
-						<view class="bnt acea-row">
-							<view class="joinCart bnts" @tap="goProduct">单独购买</view>
-							<view class="buy bnts" @tap="goCat"
-								v-if='attribute.productSelect.product_stock>0&&attribute.productSelect.quota>0'>
-								立即开团
+						<view class='way acea-row row-middle'>
+							<view class='item'>
+								<text class='num'>①</text>
+								<text>开团/参团</text>
 							</view>
-							<view class="buy bnts bg-color-hui" v-if="!dataShow">
-								立即开团
+							<view class='iconfont icon-arrow'></view>
+							<view class='item'>
+								<text class='num'>②</text>
+								<text>邀请好友</text>
 							</view>
-							<view class="buy bnts bg-color-hui"
-								v-if='attribute.productSelect.quota <= 0 || attribute.productSelect.product_stock <= 0'>
-								已售罄
+							<view class='iconfont icon-arrow'></view>
+							<view class='item'>
+								<view>
+									<text class='num'>③</text>
+									<text>满员发货</text>
+								</view>
+								<!-- <view class='tip'>不满自动退款</view> -->
 							</view>
 						</view>
 					</view>
 				</view>
-
-				<!-- 分享按钮 -->
-				<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
-					<!-- #ifndef MP -->
-					<button class="item" hover-class='none' v-if="weixinStatus === true" @click="H5ShareBox = true">
-						<!-- <button class="item" hover-class='none' v-if="weixinStatus === true" @click="setShareInfoStatus"> -->
-						<view class="iconfont icon-weixin3"></view>
-						<view class="">发送给朋友</view>
-					</button>
-					<!-- #endif -->
-					<!-- #ifdef MP -->
-					<button class="item" open-type="share" hover-class='none' @click="goFriend">
-						<view class="iconfont icon-weixin3"></view>
-						<view class="">发送给朋友</view>
-					</button>
-					<!-- #endif -->
-					<!-- #ifdef APP-PLUS -->
-					<view class="item" @click="appShare('WXSceneSession')">
-						<view class="iconfont icon-weixin3"></view>
-						<view class="">微信好友</view>
-					</view>
-					<view class="item" @click="appShare('WXSenceTimeline')">
-						<view class="iconfont icon-pengyouquan"></view>
-						<view class="">微信朋友圈</view>
+				<view class='userEvaluation' id="past1" v-if="replyCount">
+					<view class='title acea-row row-between-wrapper'>
+						<view>用户评价({{replyCount}})</view>
+						<navigator class='praise' hover-class='none'
+							:url='"/pages/users/goods_comment_list/index?product_id="+storeInfo.product_id'>
+							<text class='font-num'>{{replyChance || 0}}%</text>
+							好评率
+							<text class='iconfont icon-jiantou'></text>
+						</navigator>
 					</view>
-					<!-- #endif -->
-					<button class="item" hover-class='none' @tap="goPoster">
-						<view class="iconfont icon-haibao"></view>
-						<view class="">生成海报</view>
-					</button>
-				</view>
-				<view class="mask" v-if="posters" @click="listenerActionClose"></view>
-
-				<!-- 海报展示 -->
-				<view class='poster-pop' v-if="posterImageStatus">
-					<image src='/static/images/poster-close.png' class='close' @click="posterImageClose"></image>
-					<image :src='posterImage'></image>
-					<!-- #ifndef H5  -->
-					<view class='save-poster' @click="savePosterPath">保存到手机</view>
-					<!-- #endif -->
-					<!-- #ifdef H5 -->
-					<view class="keep">长按图片可以保存到手机</view>
-					<!-- #endif -->
+					<userEvaluation :reply="reply"></userEvaluation>
 				</view>
-				<view class='mask1' v-if="posterImageStatus"></view>
-				<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
-				<view class="share-box" v-if="H5ShareBox">
-					<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
+				<view class='product-intro' id="past2">
+					<view class='title'>产品介绍</view>
+					<view class='conter'>
+						<!-- <view class="" v-html="storeInfo.description"></view> -->
+						<parser :html="storeInfo.description" ref="article" :tag-style="tagStyle"></parser>
+					</view>
 				</view>
+			</scroll-view>
+			<view class='footer acea-row row-between-wrapper'>
 				<!-- #ifdef MP -->
-				<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
+				<!-- <button open-type="contact" hover-class='none' class='item'>
+					<view class='iconfont icon-kefu'></view>
+					<view class="p_center">客服</view>
+				</button> -->
 				<!-- #endif -->
-				<product-window :attr='attribute' :limitNum='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-					@ChangeCartNum="ChangeCartNum" @iptCartNum="iptCartNum" @attrVal="attrVal" @getImg="showImg">
-				</product-window>
-				<cus-previewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"
-					@shareFriend="listenerActionSheet" />
-				<kefuIcon :ids='storeInfo.product_id' :routineContact='routineContact'></kefuIcon>
-				<!-- #ifdef H5 || APP-PLUS -->
-				<zb-code ref="qrcode" :show="codeShow" :cid="cid" :val="codeVal" :size="size" :unit="unit"
-					:background="background" :foreground="foreground" :pdground="pdground" :icon="codeIcon"
-					:iconSize="iconsize" :onval="onval" :loadMake="loadMake" @result="qrR" />
+				<!-- #ifndef MP -->
+				<!-- <navigator hover-class="none" class="item" url="/pages/customer_list/chat">
+					<view class="iconfont icon-kefu"></view>
+					<view class="p_center">客服</view>
+				</navigator> -->
 				<!-- #endif -->
+				<navigator hover-class="none" class="item" open-type="switchTab" url="/pages/index/index">
+					<view class="iconfont icon-shouye6"></view>
+					<view class="p_center">首页</view>
+				</navigator>
+				<view @tap='setCollect' class='item'>
+					<view class='iconfont icon-shoucang1' v-if="storeInfo.userCollect"></view>
+					<view class='iconfont icon-shoucang' v-else></view>
+					<view class="p_center">收藏</view>
+				</view>
+				<view class="bnt acea-row">
+					<view class="joinCart bnts" @tap="goProduct">单独购买</view>
+					<view class="buy bnts" @tap="goCat"
+						v-if='attribute.productSelect.product_stock>0&&attribute.productSelect.quota>0'>
+						立即开团
+					</view>
+					<view class="buy bnts bg-color-hui" v-if="!dataShow">
+						立即开团
+					</view>
+					<view class="buy bnts bg-color-hui"
+						v-if='attribute.productSelect.quota <= 0 || attribute.productSelect.product_stock <= 0'>
+						已售罄
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 分享按钮 -->
+		<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
+			<!-- #ifndef MP -->
+			<button class="item" hover-class='none' v-if="weixinStatus === true" @click="H5ShareBox = true">
+				<!-- <button class="item" hover-class='none' v-if="weixinStatus === true" @click="setShareInfoStatus"> -->
+				<view class="iconfont icon-weixin3"></view>
+				<view class="">发送给朋友</view>
+			</button>
+			<!-- #endif -->
+			<!-- #ifdef MP -->
+			<button class="item" open-type="share" hover-class='none' @click="goFriend">
+				<view class="iconfont icon-weixin3"></view>
+				<view class="">发送给朋友</view>
+			</button>
+			<!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<view class="item" @click="appShare('WXSceneSession')">
+				<view class="iconfont icon-weixin3"></view>
+				<view class="">微信好友</view>
 			</view>
+			<view class="item" @click="appShare('WXSenceTimeline')">
+				<view class="iconfont icon-pengyouquan"></view>
+				<view class="">微信朋友圈</view>
+			</view>
+			<!-- #endif -->
+			<button class="item" hover-class='none' @tap="goPoster">
+				<view class="iconfont icon-haibao"></view>
+				<view class="">生成海报</view>
+			</button>
+		</view>
+		<view class="mask" v-if="posters" @click="listenerActionClose"></view>
+
+		<!-- 海报展示 -->
+		<view class='poster-pop' v-if="posterImageStatus">
+			<image src='/static/images/poster-close.png' class='close' @click="posterImageClose"></image>
+			<image :src='posterImage'></image>
+			<!-- #ifndef H5  -->
+			<view class='save-poster' @click="savePosterPath">保存到手机</view>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="keep">长按图片可以保存到手机</view>
+			<!-- #endif -->
+		</view>
+		<view class='mask1' v-if="posterImageStatus"></view>
+		<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
+		<view class="share-box" v-if="H5ShareBox">
+			<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
+		</view>
+		<!-- #ifdef MP -->
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
+		<!-- #endif -->
+		<product-window :attr='attribute' :limitNum='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
+			@ChangeCartNum="ChangeCartNum" @iptCartNum="iptCartNum" @attrVal="attrVal" @getImg="showImg">
+		</product-window>
+		<cus-previewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"
+			@shareFriend="listenerActionSheet" />
+		<kefuIcon :ids='storeInfo.product_id' :routineContact='routineContact'></kefuIcon>
+		<!-- #ifdef H5 || APP-PLUS -->
+		<zb-code ref="qrcode" :show="codeShow" :cid="cid" :val="codeVal" :size="size" :unit="unit"
+			:background="background" :foreground="foreground" :pdground="pdground" :icon="codeIcon" :iconSize="iconsize"
+			:onval="onval" :loadMake="loadMake" @result="qrR" />
+		<!-- #endif -->
+	</view>
 </template>
 
 <script>
@@ -468,8 +459,11 @@
 			// #ifdef MP
 			this.navH = app.globalData.navHeight;
 			// #endif
-			// #ifndef MP
-			this.navH = 96;
+			// #ifdef H5
+			that.navH = 96;
+			// #endif
+			// #ifdef APP-PLUS
+			that.navH = 30;
 			// #endif
 			//设置商品列表高度
 			uni.getSystemInfo({
@@ -536,6 +530,9 @@
 				'&spid=' + this.$store.state.app.uid
 			// #endif	
 		},
+		onNavigationBarButtonTap(e) {
+			this.currentPage = !this.currentPage
+		},
 		methods: {
 			moreNav() {
 				this.currentPage = !this.currentPage
@@ -1201,6 +1198,7 @@
 				that.opacity = opacity
 				that.scrollY = scrollY
 				that.$set(that, "showMenuIcon", false);
+				that.$set(that, 'currentPage', false);
 				if (that.lock) {
 					that.lock = false
 					return;

template/uni-app/pages/activity/goods_seckill/index.vue

@@ -158,8 +158,7 @@
 			},
 			goDetails(item) {
 				uni.navigateTo({
-					url: '/pages/activity/goods_seckill_details/index?id=' + item.id + '&time=' + this.timeList[
-						this.active].stop + '&status=' + this.status
+					url: '/pages/activity/goods_seckill_details/index?id=' + item.id
 				})
 			}
 		},

template/uni-app/pages/activity/goods_seckill_details/index.vue

@@ -1,6 +1,8 @@
 <template>
 	<view :style="colorStyle">
 		<!-- 头部 -->
+
+		<!-- #ifndef APP-PLUS -->
 		<view class='navbar' :style="{height:navH+'rpx',opacity:opacity}">
 			<view class='navbarH' :style='"height:"+navH+"rpx;"'>
 				<view class='navbarCon acea-row row-center-wrapper'>
@@ -13,240 +15,229 @@
 				</view>
 			</view>
 		</view>
-		<!-- #ifdef APP-PLUS -->
 		<view id="home" class="home-nav acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-			:style="{ top:(navH/2-92)+'rpx' ,marginTop:sysHeight}">
+			:style="{ top: homeTop +'rpx'}">
+			<view class="iconfont icon-fanhui2" @tap="returns"></view>
+			<!-- #ifdef MP -->
+			<view class="line"></view>
+			<view class="iconfont icon-gengduo5" @click="moreNav"></view>
 			<!-- #endif -->
-			<!-- #ifndef APP-PLUS -->
-			<view id="home" class="home-nav acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-				:style="{ top: homeTop +'rpx'}">
-				<!-- #endif -->
-				<view class="iconfont icon-fanhui2" @tap="returns"></view>
-				<!-- #ifdef MP -->
-				<view class="line"></view>
-				<view class="iconfont icon-gengduo5" @click="moreNav"></view>
-				<!-- #endif -->
-			</view>
-
+		</view>
+		<!-- #endif -->
 
-			<!-- #ifdef APP-PLUS -->
-			<view id="home" class="home-nav right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-				:style="{ top:(navH/2-92)+'rpx',marginTop:sysHeight}">
-				<!-- #endif -->
-				<!-- #ifdef H5 -->
-				<view id="home" class="home-nav right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-					:style="{ top: homeTop +'rpx'}">
+		<!-- #ifdef H5 -->
+		<view id="home" class="home-nav right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
+			:style="{ top: homeTop +'rpx'}">
+			<!-- #ifdef  H5 -->
+			<view class="iconfont icon-gengduo2" @click="moreNav"></view>
+		</view>
+		<!-- #endif -->
+		<!-- #endif -->
+		<homeList :navH="navH" :returnShow="returnShow" :currentPage="currentPage" :sysHeight="sysHeight">
+		</homeList>
+		<view class='product-con'>
+			<scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true"
+				:style="'height:'+height+'px;'" @scroll="scroll">
+				<view id="past0">
+					<!-- #ifdef APP-PLUS || MP -->
+					<view class="" :style="'width:100%;' + 'height:'+sysHeight"></view>
 					<!-- #endif -->
-					<!-- #ifdef APP-PLUS || H5 -->
-					<view class="iconfont icon-gengduo2" @click="moreNav"></view>
-				</view>
-				<!-- #endif -->
-				<homeList :navH="navH" :returnShow="returnShow" :currentPage="currentPage" :sysHeight="sysHeight">
-				</homeList>
-				<!-- #ifndef APP-PLUS -->
-				<!-- <menuIcon :showMenuIcon="showMenuIcon" @open="open"></menuIcon> -->
-				<!-- #endif -->
-				<view class='product-con'>
-					<scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true"
-						:style="'height:'+height+'px;'" @scroll="scroll">
-						<view id="past0">
-							<productConSwiper :imgUrls='imgUrls'></productConSwiper>
-							<view class="bg-color">
-								<view class='nav acea-row row-between-wrapper'>
-									<view class='money'>￥<text class='num'>{{storeInfo.price}}</text>
-										<text
-											v-if="attribute.productAttr.length && (attribute.productAttr.length?attribute.productAttr[0].attr_values.length:0) > 1">起</text>
-										<text class='y-money'>￥{{storeInfo.ot_price}}</text>
-									</view>
-									<view class='acea-row row-middle'>
-										<view class='timeItem' v-if="status == 1">
-											<view>距秒杀结束仅剩</view>
-											<countDown :is-day="false" :tip-text="' '" :day-text="' '"
-												:hour-text="' : '" :minute-text="' : '" :second-text="' '"
-												:datatime="datatime" style="margin-top: 4rpx;"></countDown>
-										</view>
-										<!-- <view class="timeState" wx:if="{{status == 0}}">已结束</view>
-						  <view class="timeState" wx:if="{{status == 2}}">即将开始</view> -->
-										<!-- <view class='iconfont icon-jiantou'></view> -->
-									</view>
-								</view>
+					<productConSwiper :imgUrls='imgUrls'></productConSwiper>
+					<view class="bg-color">
+						<view class='nav acea-row row-between-wrapper'>
+							<view class='money'>￥<text class='num'>{{storeInfo.price}}</text>
+								<text
+									v-if="attribute.productAttr.length && (attribute.productAttr.length?attribute.productAttr[0].attr_values.length:0) > 1">起</text>
+								<text class='y-money'>￥{{storeInfo.ot_price}}</text>
 							</view>
-							<view class='wrapper'>
-								<view class='introduce acea-row row-between'>
-									<view class='infor'> {{storeInfo.title}}</view>
-									<!-- <button class='iconfont icon-fenxiang' open-type='share'></button> -->
-									<view class='iconfont icon-fenxiang' @click="listenerActionSheet"></view>
-								</view>
-								<view class='label acea-row row-middle'>
-									<!-- <view class='stock'>库存：{{storeInfo.stock}}{{storeInfo.unit_name}}</view> -->
-									<view class='stock'>
-										累计销售：{{storeInfo.total?storeInfo.total:0}}{{storeInfo.unit_name || ''}}
-									</view>
-									<view>限量: {{ storeInfo.quota ? storeInfo.quota : 0 }}{{storeInfo.unit_name || ''}}
-									</view>
+							<view class='acea-row row-middle'>
+								<view class='timeItem' v-if="status == 1">
+									<view>距秒杀结束仅剩</view>
+									<countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '"
+										:minute-text="' : '" :second-text="' '" :datatime="datatime"
+										style="margin-top: 4rpx;"></countDown>
 								</view>
+								<!-- <view class="timeState" wx:if="{{status == 0}}">已结束</view>
+						  <view class="timeState" wx:if="{{status == 2}}">即将开始</view> -->
+								<!-- <view class='iconfont icon-jiantou'></view> -->
+							</view>
+						</view>
+					</view>
+					<view class='wrapper'>
+						<view class='introduce acea-row row-between'>
+							<view class='infor'> {{storeInfo.title}}</view>
+							<!-- <button class='iconfont icon-fenxiang' open-type='share'></button> -->
+							<view class='iconfont icon-fenxiang' @click="listenerActionSheet"></view>
+						</view>
+						<view class='label acea-row row-middle'>
+							<!-- <view class='stock'>库存：{{storeInfo.stock}}{{storeInfo.unit_name}}</view> -->
+							<view class='stock'>
+								累计销售：{{storeInfo.total?storeInfo.total:0}}{{storeInfo.unit_name || ''}}
+							</view>
+							<view>限量: {{ storeInfo.quota ? storeInfo.quota : 0 }}{{storeInfo.unit_name || ''}}
 							</view>
-							<view class='attribute acea-row row-between-wrapper' @tap='selecAttr'
-								v-if='attribute.productAttr.length'>
-								<!-- 	<view>{{attr}}：<text class='atterTxt'>{{attrValue}}</text></view>
+						</view>
+					</view>
+					<view class='attribute acea-row row-between-wrapper' @tap='selecAttr'
+						v-if='attribute.productAttr.length'>
+						<!-- 	<view>{{attr}}：<text class='atterTxt'>{{attrValue}}</text></view>
 						<view class='iconfont icon-jiantou'></view> -->
-								<view class="flex">
-									<view style="display: flex; align-items: center; width: 90%">
-										<view class="attr-txt"> {{ attr }}： </view>
-										<view class="atterTxt line1" style="width: 82%">{{
+						<view class="flex">
+							<view style="display: flex; align-items: center; width: 90%">
+								<view class="attr-txt"> {{ attr }}： </view>
+								<view class="atterTxt line1" style="width: 82%">{{
 						      attrValue
 						    }}</view>
-									</view>
-									<view class="iconfont icon-jiantou"></view>
-								</view>
-								<view class="acea-row row-between-wrapper" style="margin-top: 7px; padding-left: 70px"
-									v-if="skuArr.length > 1">
-									<view class="flexs">
-										<image :src="item.image" v-for="(item, index) in skuArr.slice(0, 4)"
-											:key="index" class="attrImg"></image>
-									</view>
-									<view class="switchTxt">共{{ skuArr.length }}种规格可选</view>
-								</view>
 							</view>
+							<view class="iconfont icon-jiantou"></view>
 						</view>
-						<view class='userEvaluation' id="past1" v-if="replyCount">
-							<view class='title acea-row row-between-wrapper'>
-								<view>用户评价({{replyCount}})</view>
-								<navigator class='praise' hover-class='none'
-									:url="'/pages/users/goods_comment_list/index?product_id='+storeInfo.product_id">
-									<text class='font-color'>{{replyChance}}%</text>好评率
-									<text class='iconfont icon-jiantou'></text>
-								</navigator>
+						<view class="acea-row row-between-wrapper" style="margin-top: 7px; padding-left: 70px"
+							v-if="skuArr.length > 1">
+							<view class="flexs">
+								<image :src="item.image" v-for="(item, index) in skuArr.slice(0, 4)" :key="index"
+									class="attrImg"></image>
 							</view>
-							<userEvaluation :reply="reply"></userEvaluation>
+							<view class="switchTxt">共{{ skuArr.length }}种规格可选</view>
 						</view>
-						<view class='product-intro' id="past2">
-							<view class='title'>产品介绍</view>
-							<view class='conter'>
-								<!-- <view class="" v-html="storeInfo.description">
+					</view>
+				</view>
+				<view class='userEvaluation' id="past1" v-if="replyCount">
+					<view class='title acea-row row-between-wrapper'>
+						<view>用户评价({{replyCount}})</view>
+						<navigator class='praise' hover-class='none'
+							:url="'/pages/users/goods_comment_list/index?product_id='+storeInfo.product_id">
+							<text class='font-color'>{{replyChance}}%</text>好评率
+							<text class='iconfont icon-jiantou'></text>
+						</navigator>
+					</view>
+					<userEvaluation :reply="reply"></userEvaluation>
+				</view>
+				<view class='product-intro' id="past2">
+					<view class='title'>产品介绍</view>
+					<view class='conter'>
+						<!-- <view class="" v-html="storeInfo.description">
 						</view> -->
 
-								<!-- #ifndef APP-PLUS -->
-								<parser :html="storeInfo.description" ref="article" :tag-style="tagStyle"></parser>
-								<!-- #endif -->
-								<!-- #ifdef APP-PLUS -->
-								<view class="description" v-html="storeInfo.description"></view>
-								<!-- #endif -->
-							</view>
-						</view>
-					</scroll-view>
-					<view class='footer acea-row row-between-wrapper'>
-						<!-- #ifdef MP -->
-						<!-- <button open-type="contact" hover-class='none' class='item'>
+						<!-- #ifndef APP-PLUS -->
+						<parser :html="storeInfo.description" ref="article" :tag-style="tagStyle"></parser>
+						<!-- #endif -->
+						<!-- #ifdef APP-PLUS -->
+						<view class="description" v-html="storeInfo.description"></view>
+						<!-- #endif -->
+					</view>
+				</view>
+			</scroll-view>
+			<view class='footer acea-row row-between-wrapper'>
+				<!-- #ifdef MP -->
+				<!-- <button open-type="contact" hover-class='none' class='item'>
 					<view class='iconfont icon-kefu'></view>
 					<view class="p_center">客服</view>
 				</button> -->
-						<!-- #endif -->
-						<!-- #ifndef MP -->
-						<!-- 	<navigator hover-class="none" class="item" url="/pages/customer_list/chat">
+				<!-- #endif -->
+				<!-- #ifndef MP -->
+				<!-- 	<navigator hover-class="none" class="item" url="/pages/customer_list/chat">
 					<view class="iconfont icon-kefu"></view>
 					<view class="p_center">客服</view>
 				</navigator> -->
-						<!-- #endif -->
-						<navigator hover-class="none" open-type="switchTab" class="item" url="/pages/index/index">
-							<view class="iconfont icon-shouye6"></view>
-							<view class="p_center">首页</view>
-						</navigator>
-						<view @tap='setCollect' class='item'>
-							<view class='iconfont icon-shoucang1' v-if="storeInfo.userCollect"></view>
-							<view class='iconfont icon-shoucang' v-else></view>
-							<view class="p_center">收藏</view>
-						</view>
-						<view class="bnt acea-row"
-							v-if="status == 1 && attribute.productSelect.quota > 0 && attribute.productSelect.product_stock>0">
-							<view class="joinCart bnts" @tap="openAlone">单独购买</view>
-							<view class="buy bnts" @tap="goCat">立即购买</view>
-						</view>
-						<view class="bnt acea-row"
-							v-if="(status == 1 && attribute.productSelect.quota <= 0) || (status == 3 && attribute.productSelect.quota <= 0) || (status == 1 && attribute.productSelect.product_stock <= 0) || (status == 3 && attribute.productSelect.product_stock <= 0)">
-							<view class="joinCart bnts" @tap="openAlone">单独购买</view>
-							<view class="buy bnts bg-color-hui">已售罄</view>
-						</view>
-						<view class="bnt acea-row" v-if="!dataShow && status == 1">
-							<view class="joinCart bnts" @tap="openAlone">单独购买</view>
-							<view class="buy bnts bg-color-hui">立即购买</view>
-						</view>
-						<view class="bnt acea-row" v-if="status == 2">
-							<view class="joinCart bnts" @tap="openAlone">单独购买</view>
-							<view class="buy bnts bg-color-hui">未开始</view>
-						</view>
-						<view class="bnt acea-row" v-if="status == 0">
-							<view class="joinCart bnts" @tap="openAlone">单独购买</view>
-							<view class="buy bnts bg-color-hui">已结束</view>
-						</view>
-					</view>
-				</view>
-				<cus-previewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"
-					@shareFriend="listenerActionSheet" />
-				<product-window :attr='attribute' :limitNum='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-					:type="'seckill'" @ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum"
-					@getImg="showImg">
-				</product-window>
-
-				<!-- #ifdef MP -->
-				<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth"></authorize> -->
 				<!-- #endif -->
-				<!-- 分享按钮 -->
-				<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
-					<!-- #ifndef MP -->
-					<button class="item" hover-class='none' v-if="weixinStatus === true" @click="H5ShareBox = true">
-						<!-- <button class="item" hover-class='none' v-if="weixinStatus === true" @click="setShareInfoStatus"> -->
-						<view class="iconfont icon-weixin3"></view>
-						<view class="">发送给朋友</view>
-					</button>
-					<!-- #endif -->
-					<!-- #ifdef MP -->
-					<button class="item" open-type="share" hover-class='none' @click="goFriend">
-						<view class="iconfont icon-weixin3"></view>
-						<view class="">发送给朋友</view>
-					</button>
-					<!-- #endif -->
-					<!-- #ifdef APP-PLUS -->
-					<view class="item" @click="appShare('WXSceneSession')">
-						<view class="iconfont icon-weixin3"></view>
-						<view class="">微信好友</view>
-					</view>
-					<view class="item" @click="appShare('WXSenceTimeline')">
-						<view class="iconfont icon-pengyouquan"></view>
-						<view class="">微信朋友圈</view>
-					</view>
-					<!-- #endif -->
-					<button class="item" hover-class='none' @tap="goPoster">
-						<view class="iconfont icon-haibao"></view>
-						<view class="">生成海报</view>
-					</button>
+				<navigator hover-class="none" open-type="switchTab" class="item" url="/pages/index/index">
+					<view class="iconfont icon-shouye6"></view>
+					<view class="p_center">首页</view>
+				</navigator>
+				<view @tap='setCollect' class='item'>
+					<view class='iconfont icon-shoucang1' v-if="storeInfo.userCollect"></view>
+					<view class='iconfont icon-shoucang' v-else></view>
+					<view class="p_center">收藏</view>
 				</view>
-				<view class="mask" v-if="posters" @click="listenerActionClose"></view>
-
-				<!-- 海报展示 -->
-				<view class='poster-pop' v-if="posterImageStatus">
-					<image src='/static/images/poster-close.png' class='close' @click="posterImageClose"></image>
-					<image :src='posterImage'></image>
-					<!-- #ifndef H5  -->
-					<view class='save-poster' @click="savePosterPath">保存到手机</view>
-					<!-- #endif -->
-					<!-- #ifdef H5 -->
-					<view class="keep">长按图片可以保存到手机</view>
-					<!-- #endif -->
+				<view class="bnt acea-row"
+					v-if="status == 1 && attribute.productSelect.quota > 0 && attribute.productSelect.product_stock>0">
+					<view class="joinCart bnts" @tap="openAlone">单独购买</view>
+					<view class="buy bnts" @tap="goCat">立即购买</view>
 				</view>
-				<view class='mask1' v-if="posterImageStatus"></view>
-				<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
-				<kefuIcon :ids='storeInfo.product_id' :routineContact='routineContact'></kefuIcon>
-				<!-- 发送给朋友图片 -->
-				<view class="share-box" v-if="H5ShareBox">
-					<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
+				<view class="bnt acea-row"
+					v-if="(status == 1 && attribute.productSelect.quota <= 0) || (status == 3 && attribute.productSelect.quota <= 0) || (status == 1 && attribute.productSelect.product_stock <= 0) || (status == 3 && attribute.productSelect.product_stock <= 0)">
+					<view class="joinCart bnts" @tap="openAlone">单独购买</view>
+					<view class="buy bnts bg-color-hui">已售罄</view>
 				</view>
-				<!-- #ifdef H5 || APP-PLUS -->
-				<zb-code ref="qrcode" :show="codeShow" :cid="cid" :val="codeVal" :size="size" :unit="unit"
-					:background="background" :foreground="foreground" :pdground="pdground" :icon="codeIcon"
-					:iconSize="iconsize" :onval="onval" :loadMake="loadMake" @result="qrR" />
-				<!-- #endif -->
+				<view class="bnt acea-row" v-if="!dataShow && status == 1">
+					<view class="joinCart bnts" @tap="openAlone">单独购买</view>
+					<view class="buy bnts bg-color-hui">立即购买</view>
+				</view>
+				<view class="bnt acea-row" v-if="status == 2">
+					<view class="joinCart bnts" @tap="openAlone">单独购买</view>
+					<view class="buy bnts bg-color-hui">未开始</view>
+				</view>
+				<view class="bnt acea-row" v-if="status == 0">
+					<view class="joinCart bnts" @tap="openAlone">单独购买</view>
+					<view class="buy bnts bg-color-hui">已结束</view>
+				</view>
+			</view>
+		</view>
+		<cus-previewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"
+			@shareFriend="listenerActionSheet" />
+		<product-window :attr='attribute' :limitNum='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr" :type="'seckill'"
+			@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" @getImg="showImg">
+		</product-window>
+
+		<!-- #ifdef MP -->
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth"></authorize> -->
+		<!-- #endif -->
+		<!-- 分享按钮 -->
+		<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
+			<!-- #ifndef MP -->
+			<button class="item" hover-class='none' v-if="weixinStatus === true" @click="H5ShareBox = true">
+				<!-- <button class="item" hover-class='none' v-if="weixinStatus === true" @click="setShareInfoStatus"> -->
+				<view class="iconfont icon-weixin3"></view>
+				<view class="">发送给朋友</view>
+			</button>
+			<!-- #endif -->
+			<!-- #ifdef MP -->
+			<button class="item" open-type="share" hover-class='none' @click="goFriend">
+				<view class="iconfont icon-weixin3"></view>
+				<view class="">发送给朋友</view>
+			</button>
+			<!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<view class="item" @click="appShare('WXSceneSession')">
+				<view class="iconfont icon-weixin3"></view>
+				<view class="">微信好友</view>
+			</view>
+			<view class="item" @click="appShare('WXSenceTimeline')">
+				<view class="iconfont icon-pengyouquan"></view>
+				<view class="">微信朋友圈</view>
 			</view>
+			<!-- #endif -->
+			<button class="item" hover-class='none' @tap="goPoster">
+				<view class="iconfont icon-haibao"></view>
+				<view class="">生成海报</view>
+			</button>
+		</view>
+		<view class="mask" v-if="posters" @click="listenerActionClose"></view>
+
+		<!-- 海报展示 -->
+		<view class='poster-pop' v-if="posterImageStatus">
+			<image src='/static/images/poster-close.png' class='close' @click="posterImageClose"></image>
+			<image :src='posterImage'></image>
+			<!-- #ifndef H5  -->
+			<view class='save-poster' @click="savePosterPath">保存到手机</view>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="keep">长按图片可以保存到手机</view>
+			<!-- #endif -->
+		</view>
+		<view class='mask1' v-if="posterImageStatus"></view>
+		<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
+		<kefuIcon :ids='storeInfo.product_id' :routineContact='routineContact'></kefuIcon>
+		<!-- 发送给朋友图片 -->
+		<view class="share-box" v-if="H5ShareBox">
+			<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
+		</view>
+		<!-- #ifdef H5 || APP-PLUS -->
+		<zb-code ref="qrcode" :show="codeShow" :cid="cid" :val="codeVal" :size="size" :unit="unit"
+			:background="background" :foreground="foreground" :pdground="pdground" :icon="codeIcon" :iconSize="iconsize"
+			:onval="onval" :loadMake="loadMake" @result="qrR" />
+		<!-- #endif -->
+	</view>
 </template>
 
 <script>
@@ -408,17 +399,14 @@
 			let that = this
 			let statusBarHeight = ''
 			var pages = getCurrentPages();
+			if (options.id) {
+				this.id = options.id
+				//记录推广人uid
+				if (options.pid) app.globalData.spid = options.pid;
+				// if (options.time) this.datatime = Number(options.time);
+			}
 			that.returnShow = pages.length === 1 ? false : true;
-			// #ifdef H5
-			this.codeVal = window.location.origin + '/pages/activity/goods_seckill_details/index?id=' + that.id +
-				'&time=' + that.time +
-				'&status=' + that.status + '&spid=' + that.storeInfo.uid
-			// #endif	
-			// #ifdef APP-PLUS
-			this.codeVal = HTTP_REQUEST_URL + '/pages/activity/goods_seckill_details/index?id=' + that.id +
-				'&time=' + that.time +
-				'&status=' + that.status + '&spid=' + that.storeInfo.uid
-			// #endif	
+
 			//设置商品列表高度
 			uni.getSystemInfo({
 				success: function(res) {
@@ -428,11 +416,14 @@
 				},
 			});
 			this.isLogin && silenceBindingSpread();
-			// #ifndef APP-PLUS
-			this.navH = app.globalData.navHeight
+			// #ifdef MP
+			this.navH = app.globalData.navHeight;
+			// #endif
+			// #ifdef H5
+			that.navH = 96;
 			// #endif
 			// #ifdef APP-PLUS
-			this.navH = 96
+			that.navH = 30;
 			// #endif
 			// #ifdef MP
 			let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
@@ -457,13 +448,6 @@
 				// if (value.time) this.datatime = value.time
 			}
 			// #endif
-
-			if (options.id) {
-				this.id = options.id
-				//记录推广人uid
-				if (options.pid) app.globalData.spid = options.pid;
-				// if (options.time) this.datatime = Number(options.time);
-			}
 			if (this.isLogin) {
 				this.getSeckillDetail();
 			} else {
@@ -482,6 +466,9 @@
 				// #endif
 			})
 		},
+		onNavigationBarButtonTap(e) {
+			this.currentPage = !this.currentPage
+		},
 		methods: {
 			moreNav() {
 				this.currentPage = !this.currentPage
@@ -612,9 +599,16 @@
 					setTimeout(() => {
 						that.infoScroll();
 					}, 500);
+					// #ifdef H5
+					this.codeVal = window.location.origin + '/pages/activity/goods_seckill_details/index?id=' +
+						that.id + '&spid=' + that.storeInfo.uid
+					// #endif	
+					// #ifdef APP-PLUS
+					this.codeVal = HTTP_REQUEST_URL + '/pages/activity/goods_seckill_details/index?id=' + that
+						.id + '&spid=' + that.storeInfo.uid
+					// #endif	
 					app.globalData.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id +
-						'&time=' + that.time +
-						'&status=' + that.status + '&spid=' + that.storeInfo.uid;
+						'&spid=' + that.storeInfo.uid;
 					// wxParse.wxParse('description', 'html', that.data.storeInfo.description || '', that, 0);
 					// wxh.time(that.data.time, that);
 				}).catch(err => {

template/uni-app/pages/admin/orderDetail/index.vue

@@ -217,12 +217,15 @@
 				}
 			}
 		},
-		onLoad: function(option) {
+		onShow() {
+			console.log('111')
+			this.getIndex();
+		},
+		onLoad(option) {
 			let self = this
 			this.order_id = option.id;
 			this.goname = option.goname
 			this.order_type = option.types
-			this.getIndex();
 			// #ifdef H5
 			this.$nextTick(function() {
 				var clipboard = new ClipboardJS('.copy-data');

template/uni-app/pages/goods_details/index.vue

@@ -2,155 +2,131 @@
 	<view class="product-con" :style="colorStyle">
 		<skeleton :show="showSkeleton" :isNodes="isNodes" ref="skeleton" loading="chiaroscuro" selector="skeleton"
 			bgcolor="#FFF"></skeleton>
+
 		<view class="product-con skeleton" :style="{ visibility: showSkeleton ? 'hidden' : 'visible' }">
-			<!-- #ifdef APP-PLUS -->
-			<view class="navbar" :style="{ height: navH + 'rpx', opacity: opacity, paddingTop: sysHeight }">
-				<!-- #endif -->
-				<!-- #ifndef APP-PLUS -->
-				<view class="navbar" :style="{ height: navH + 'rpx', opacity: opacity }">
-					<!-- #endif -->
-					<view class="navbarH" :style="'height:' + navH + 'rpx;'">
-						<view class="navbarCon acea-row row-center-wrapper"
-							:style="{ paddingRight: (navbarRight-20) + 'px' }">
-							<view class="header acea-row row-center-wrapper">
-								<view class="item" :class="navActive === index ? 'on' : ''"
-									v-for="(item, index) in navList" :key="index" @tap="tap(index)">{{ item }}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<!-- <view class='iconfont icon-xiangzuo' :style="{top:navH/2+'rpx',opacity:(1-opacity)}" @tap='returns'></view> -->
-				<!-- #ifdef APP-PLUS -->
-				<view id="home" class="home acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-					:style="{ top:(navH/2-58)+'rpx' ,marginTop:sysHeight}">
-					<!-- #endif -->
-					<!-- #ifndef APP-PLUS -->
-					<view id="home" class="home acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-						:style="{ top: homeTop +'rpx'}">
-						<!-- #endif -->
-						<view class="iconfont icon-fanhui2" @tap="returns"></view>
-						<!-- #ifdef MP -->
-						<view class="line"></view>
-						<view class="iconfont icon-gengduo5" @click="moreNav"></view>
-						<!-- #endif -->
-					</view>
 
-					<!-- #ifdef APP-PLUS -->
-					<view id="home" class="home right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-						:style="{ top:(navH/2-58)+'rpx' ,marginTop:sysHeight}">
-						<!-- #endif -->
-						<!-- #ifdef H5 -->
-						<view id="home" class="home right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-							:style="{ top: homeTop +'rpx'}">
-							<!-- #endif -->
-							<!-- #ifdef APP-PLUS || H5 -->
-							<view class="iconfont icon-gengduo2" @click="moreNav"></view>
-						</view>
-						<!-- #endif -->
-						<homeList :navH="navH" :returnShow="returnShow" :currentPage="currentPage"
-							:sysHeight="sysHeight"></homeList>
-						<!-- 		<view class="navbar" :style="{ height: navH + 'rpx', opacity: opacity }">
+			<!-- #ifndef APP-PLUS -->
+			<view class="navbar" :style="{ height: navH + 'rpx', opacity: opacity }">
 				<view class="navbarH" :style="'height:' + navH + 'rpx;'">
-					<view class="navbarCon acea-row row-center-wrapper" :style="{ paddingRight: navbarRight + 'px' }">
+					<view class="navbarCon acea-row row-center-wrapper"
+						:style="{ paddingRight: (navbarRight-20) + 'px' }">
 						<view class="header acea-row row-center-wrapper">
 							<view class="item" :class="navActive === index ? 'on' : ''" v-for="(item, index) in navList"
 								:key="index" @tap="tap(index)">{{ item }}</view>
 						</view>
 					</view>
 				</view>
-			</view> -->
-						<!-- <view class='iconfont icon-xiangzuo' :style="{top:navH/2+'rpx',opacity:(1-opacity)}" @tap='returns'></view> -->
-						<!-- #ifndef APP-PLUS -->
-						<!-- <menuIcon :showMenuIcon="showMenuIcon" @open="open" :opacity="opacity"></menuIcon> -->
+			</view>
+			<!-- #endif -->
+			<!-- <view class='iconfont icon-xiangzuo' :style="{top:navH/2+'rpx',opacity:(1-opacity)}" @tap='returns'></view> -->
+
+			<!-- #ifndef APP-PLUS -->
+			<view id="home" class="home acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
+				:style="{ top: homeTop +'rpx'}">
+				<view class="iconfont icon-fanhui2" @tap="returns"></view>
+				<!-- #ifdef MP -->
+				<view class="line"></view>
+				<view class="iconfont icon-gengduo5" @click="moreNav"></view>
+				<!-- #endif -->
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view id="home" class="home right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
+				:style="{ top: homeTop +'rpx'}">
+				<!-- #endif -->
+				<!-- #ifdef H5 -->
+				<view class="iconfont icon-gengduo2" @click="moreNav"></view>
+			</view>
+			<!-- #endif -->
+			<homeList :navH="navH" :returnShow="returnShow" :currentPage="currentPage" :sysHeight="sysHeight">
+			</homeList>
+			<view>
+				<scroll-view :scroll-top="scrollTop" scroll-y="true" scroll-with-animation="true"
+					:style="'height:' + height + 'px;'" @scroll="scroll">
+					<view id="past0">
+						<!-- #ifdef APP-PLUS || MP -->
+						<view class="" :style="'width:100%;' + 'height:'+sysHeight"></view>
 						<!-- #endif -->
-						<view>
-							<scroll-view :scroll-top="scrollTop" scroll-y="true" scroll-with-animation="true"
-								:style="'height:' + height + 'px;'" @scroll="scroll">
-								<view id="past0">
-									<productConSwiper class="skeleton-rect" :imgUrls="storeInfo.slider_image"
-										:videoline="storeInfo.video_link" @videoPause="videoPause"></productConSwiper>
-									<view class="wrapper">
-										<view class="share acea-row row-between row-bottom">
-											<view class="money font-color skeleton-rect">
-												￥
-												<text class="num" v-text="storeInfo.price || 0"></text>
-												<text v-if="storeInfo.spec_type">起</text>
-												<text class="vip-money" v-if="
+						<productConSwiper class="skeleton-rect" :imgUrls="storeInfo.slider_image"
+							:videoline="storeInfo.video_link" @videoPause="videoPause"></productConSwiper>
+						<view class="wrapper">
+							<view class="share acea-row row-between row-bottom">
+								<view class="money font-color skeleton-rect">
+									￥
+									<text class="num" v-text="storeInfo.price || 0"></text>
+									<text v-if="storeInfo.spec_type">起</text>
+									<text class="vip-money" v-if="
                       storeInfo.vip_price &&
                       storeInfo.vip_price > 0 &&
                       storeInfo.is_vip == 1
                     ">￥{{ storeInfo.vip_price }}</text>
-												<image v-if="
+									<image v-if="
                       storeInfo.vip_price &&
                       storeInfo.vip_price > 0 &&
                       storeInfo.is_vip == 1
                     " src="../../static/images/svip.gif"></image>
-											</view>
-											<view class="iconfont icon-fenxiang skeleton-rect"
-												@click="listenerActionSheet"></view>
-										</view>
-										<view class="introduce skeleton-rect" v-text="storeInfo.store_name"></view>
-										<view class="label acea-row row-between-wrapper" style="padding-bottom: 20rpx">
-											<view class="skeleton-rect" v-text="'原价:￥' + (storeInfo.ot_price || 0)">
-											</view>
-											<view class="skeleton-rect" v-text="
+								</view>
+								<view class="iconfont icon-fenxiang skeleton-rect" @click="listenerActionSheet"></view>
+							</view>
+							<view class="introduce skeleton-rect" v-text="storeInfo.store_name"></view>
+							<view class="label acea-row row-between-wrapper" style="padding-bottom: 20rpx">
+								<view class="skeleton-rect" v-text="'原价:￥' + (storeInfo.ot_price || 0)">
+								</view>
+								<view class="skeleton-rect" v-text="
                     '库存:' +
                     (storeInfo.stock || 0) +
                     (storeInfo.unit_name || '')
                   "></view>
-											<view class="skeleton-rect" v-text="
+								<view class="skeleton-rect" v-text="
                     '销量:' +
                     (storeInfo.fsales || 0) +
                     (storeInfo.unit_name || '')
                   "></view>
-										</view>
-										<view v-if="
+							</view>
+							<view v-if="
                   !is_money_level && storeInfo.vip_price && storeInfo.is_vip
                 " class="svip acea-row row-between-wrapper">
-											<view class="">开通“超级会员”立省{{ diff }}元</view>
-											<navigator url="/pages/annex/vip_paid/index">
-												立即开通
-												<text class="iconfont icon-jiantou"></text>
-											</navigator>
-										</view>
-										<view class="presell_count" v-if="storeInfo.presale">
-											<view>
-												<view>预售活动时间：</view>
-												<view v-if="storeInfo.presale_start_time && storeInfo.presale_end_time"
-													class="presell_time">
-													<view class='iconfont icon-shijian1'></view>
-													{{storeInfo.presale_start_time}}
-													<span class='area_line'>~</span>
-													{{storeInfo.presale_end_time}}
-												</view>
-											</view>
-											<view>预售结束后{{ storeInfo.presale_day }}天内发货</view>
-										</view>
-										<!-- <view class='coupon acea-row row-between-wrapper' v-if="storeInfo.give_integral > 0">
+								<view class="">开通“超级会员”立省{{ diff }}元</view>
+								<navigator url="/pages/annex/vip_paid/index">
+									立即开通
+									<text class="iconfont icon-jiantou"></text>
+								</navigator>
+							</view>
+							<view class="presell_count" v-if="storeInfo.presale">
+								<view>
+									<view>预售活动时间：</view>
+									<view v-if="storeInfo.presale_start_time && storeInfo.presale_end_time"
+										class="presell_time">
+										<view class='iconfont icon-shijian1'></view>
+										{{storeInfo.presale_start_time}}
+										<span class='area_line'>~</span>
+										{{storeInfo.presale_end_time}}
+									</view>
+								</view>
+								<view>预售结束后{{ storeInfo.presale_day }}天内发货</view>
+							</view>
+							<!-- <view class='coupon acea-row row-between-wrapper' v-if="storeInfo.give_integral > 0">
 									<view class='hide line1 acea-row'>
 										赠积分：
 										<view class='activity'>赠送 {{storeInfo.give_integral}} 积分</view>
 									</view>
 								</view> -->
-										<view v-if="couponList.length"
-											class="coupon acea-row row-between-wrapper skeleton-rect" @click="couponTap"
-											style="margin-top: 0rpx">
-											<view class="hide line1 acea-row">
-												优惠券：
-												<template v-for="(item, index) in couponList">
-													<view v-if="index < 2" class="activity" :key="index">
-														满{{ item.use_min_price }}减{{ item.coupon_price }}</view>
-												</template>
-											</view>
-											<view class="iconfont icon-jiantou"></view>
-										</view>
-										<view class="coupon acea-row row-between-wrapper skeleton-rect"
-											v-if="activity.length">
-											<view class="line1 acea-row">
-												<text>活&nbsp;&nbsp;&nbsp;动：</text>
-												<view v-for="(item, index) in activity" :key="index"
-													@click="goActivity(item)">
-													<view v-if="item.type === '1'" :class="
+							<view v-if="couponList.length" class="coupon acea-row row-between-wrapper skeleton-rect"
+								@click="couponTap" style="margin-top: 0rpx">
+								<view class="hide line1 acea-row">
+									优惠券：
+									<template v-for="(item, index) in couponList">
+										<view v-if="index < 2" class="activity" :key="index">
+											满{{ item.use_min_price }}减{{ item.coupon_price }}</view>
+									</template>
+								</view>
+								<view class="iconfont icon-jiantou"></view>
+							</view>
+							<view class="coupon acea-row row-between-wrapper skeleton-rect" v-if="activity.length">
+								<view class="line1 acea-row">
+									<text>活&nbsp;&nbsp;&nbsp;动：</text>
+									<view v-for="(item, index) in activity" :key="index" @click="goActivity(item)">
+										<view v-if="item.type === '1'" :class="
                         index == 0
                           ? 'activity_pin'
                           : '' || index == 1
@@ -159,10 +135,10 @@
                           ? 'activity_kan'
                           : ''
                       ">
-														<text class="iconfonts iconfont icon-pintuan"></text>
-														<text class="activity_title">参与秒杀</text>
-													</view>
-													<view :class="
+											<text class="iconfonts iconfont icon-pintuan"></text>
+											<text class="activity_title">参与秒杀</text>
+										</view>
+										<view :class="
                         index == 0
                           ? 'activity_pin'
                           : '' || index == 1
@@ -171,10 +147,10 @@
                           ? 'activity_kan'
                           : ''
                       " v-if="item.type === '2'">
-														<text class="iconfonts iconfont icon-shenhezhong"></text>
-														<text class="activity_title">参与砍价</text>
-													</view>
-													<view :class="
+											<text class="iconfonts iconfont icon-shenhezhong"></text>
+											<text class="activity_title">参与砍价</text>
+										</view>
+										<view :class="
                         index == 0
                           ? 'activity_pin'
                           : '' || index == 1
@@ -183,186 +159,180 @@
                           ? 'activity_kan'
                           : ''
                       " v-if="item.type === '3'">
-														<text class="iconfonts iconfont icon-kanjia"></text>
-														<text class="activity_title">参与拼团</text>
-													</view>
-												</view>
-											</view>
+											<text class="iconfonts iconfont icon-kanjia"></text>
+											<text class="activity_title">参与拼团</text>
 										</view>
 									</view>
-									<view class="attribute acea-row row-between-wrapper skeleton-rect"
-										@click="selecAttr" v-if="attr.productAttr.length">
-										<view class="flex">
-											<view style="display: flex; align-items: center; width: 90%">
-												<view class="attr-txt"> {{ attrTxt }}： </view>
-												<view class="atterTxt line1" style="width: 82%">{{
+								</view>
+							</view>
+						</view>
+						<view class="attribute acea-row row-between-wrapper skeleton-rect" @click="selecAttr"
+							v-if="attr.productAttr.length">
+							<view class="flex">
+								<view style="display: flex; align-items: center; width: 90%">
+									<view class="attr-txt"> {{ attrTxt }}： </view>
+									<view class="atterTxt line1" style="width: 82%">{{
                     attrValue
                   }}</view>
-											</view>
-											<view class="iconfont icon-jiantou"></view>
-										</view>
-										<view class="acea-row row-between-wrapper"
-											style="margin-top: 7px; padding-left: 60px" v-if="skuArr.length > 1">
-											<view class="flexs">
-												<image :src="item.image" v-for="(item, index) in skuArr.slice(0, 4)"
-													:key="index" class="attrImg"></image>
-											</view>
-											<view class="switchTxt">共{{ skuArr.length }}种规格可选</view>
-										</view>
-									</view>
 								</view>
-								<view class="userEvaluation skeleton-rect" id="past1" v-if="replyCount">
-									<view class="title acea-row row-between-wrapper">
-										<view>用户评价({{ replyCount }})</view>
-										<navigator class="praise" hover-class="none"
-											:url="'/pages/users/goods_comment_list/index?product_id=' + id">
-											<text class="font-num">{{ replyChance }}%</text>
-											好评率
-											<text class="iconfont icon-jiantou"></text>
-										</navigator>
-									</view>
-									<block v-if="replyCount">
-										<userEvaluation :reply="reply"></userEvaluation>
-									</block>
+								<view class="iconfont icon-jiantou"></view>
+							</view>
+							<view class="acea-row row-between-wrapper" style="margin-top: 7px; padding-left: 60px"
+								v-if="skuArr.length > 1">
+								<view class="flexs">
+									<image :src="item.image" v-for="(item, index) in skuArr.slice(0, 4)" :key="index"
+										class="attrImg"></image>
 								</view>
-								<!-- 优品推荐 -->
-								<view class="superior" v-if="good_list.length" id="past2">
-									<view class="title acea-row row-center-wrapper">
-										<!-- <image src="../../static/images/ling.png"></image> -->
-										<view class="lingw acea-row row-center-wrapper">
-											<view class="lingn"></view>
-										</view>
-										<view class="titleTxt">优品推荐</view>
-										<view class="lingw acea-row row-center-wrapper">
-											<view class="lingn"></view>
+								<view class="switchTxt">共{{ skuArr.length }}种规格可选</view>
+							</view>
+						</view>
+					</view>
+					<view class="userEvaluation skeleton-rect" id="past1" v-if="replyCount">
+						<view class="title acea-row row-between-wrapper">
+							<view>用户评价({{ replyCount }})</view>
+							<navigator class="praise" hover-class="none"
+								:url="'/pages/users/goods_comment_list/index?product_id=' + id">
+								<text class="font-num">{{ replyChance }}%</text>
+								好评率
+								<text class="iconfont icon-jiantou"></text>
+							</navigator>
+						</view>
+						<block v-if="replyCount">
+							<userEvaluation :reply="reply"></userEvaluation>
+						</block>
+					</view>
+					<!-- 优品推荐 -->
+					<view class="superior" v-if="good_list.length" id="past2">
+						<view class="title acea-row row-center-wrapper">
+							<!-- <image src="../../static/images/ling.png"></image> -->
+							<view class="lingw acea-row row-center-wrapper">
+								<view class="lingn"></view>
+							</view>
+							<view class="titleTxt">优品推荐</view>
+							<view class="lingw acea-row row-center-wrapper">
+								<view class="lingn"></view>
+							</view>
+							<!--<image src="../../static/images/ling.png"></image> -->
+						</view>
+						<view class="slider-banner banner">
+							<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval"
+								:duration="duration" indicator-color="#999" indicator-active-color="var(--view-theme)"
+								:style="'height:' + clientHeight + 'px'">
+								<swiper-item v-for="(item, indexw) in good_list" :key="indexw">
+									<view class="list acea-row row-middle" :id="'list' + indexw">
+										<view class="item" v-for="(val, indexn) in item.list" :key="indexn"
+											@click="goDetail(val)">
+											<view class="pictrue">
+												<image :src="val.image"></image>
+												<span class="pictrue_log pictrue_log_class"
+													v-if="val.activity && val.activity.type === '1'">秒杀</span>
+												<span class="pictrue_log pictrue_log_class"
+													v-if="val.activity && val.activity.type === '2'">砍价</span>
+												<span class="pictrue_log pictrue_log_class"
+													v-if="val.activity && val.activity.type === '3'">拼团</span>
+											</view>
+											<view class="name line1">{{ val.store_name }}</view>
+											<view class="money font-color">¥{{ val.price }}</view>
 										</view>
-										<!--<image src="../../static/images/ling.png"></image> -->
-									</view>
-									<view class="slider-banner banner">
-										<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular"
-											:interval="interval" :duration="duration" indicator-color="#999"
-											indicator-active-color="var(--view-theme)"
-											:style="'height:' + clientHeight + 'px'">
-											<swiper-item v-for="(item, indexw) in good_list" :key="indexw">
-												<view class="list acea-row row-middle" :id="'list' + indexw">
-													<view class="item" v-for="(val, indexn) in item.list" :key="indexn"
-														@click="goDetail(val)">
-														<view class="pictrue">
-															<image :src="val.image"></image>
-															<span class="pictrue_log pictrue_log_class"
-																v-if="val.activity && val.activity.type === '1'">秒杀</span>
-															<span class="pictrue_log pictrue_log_class"
-																v-if="val.activity && val.activity.type === '2'">砍价</span>
-															<span class="pictrue_log pictrue_log_class"
-																v-if="val.activity && val.activity.type === '3'">拼团</span>
-														</view>
-														<view class="name line1">{{ val.store_name }}</view>
-														<view class="money font-color">¥{{ val.price }}</view>
-													</view>
-												</view>
-											</swiper-item>
-											<!-- <view class="swiper-pagination" slot="pagination"></view> -->
-										</swiper>
-									</view>
-								</view>
-								<view class="product-intro" id="past3">
-									<view class="title">产品介绍</view>
-									<view class="conter">
-										<!-- #ifndef APP-PLUS -->
-										<parser :html="description" ref="article" :tag-style="tagStyle"></parser>
-										<!-- #endif -->
-										<!-- #ifdef APP-PLUS -->
-										<view class="description" v-html="description"></view>
-										<!-- #endif -->
 									</view>
-								</view>
-							</scroll-view>
+								</swiper-item>
+								<!-- <view class="swiper-pagination" slot="pagination"></view> -->
+							</swiper>
+						</view>
+					</view>
+					<view class="product-intro" id="past3">
+						<view class="title">产品介绍</view>
+						<view class="conter">
+							<!-- #ifndef APP-PLUS -->
+							<parser :html="description" ref="article" :tag-style="tagStyle"></parser>
+							<!-- #endif -->
+							<!-- #ifdef APP-PLUS -->
+							<view class="description" v-html="description"></view>
+							<!-- #endif -->
 						</view>
-						<!-- <view class="uni-p-b-98"></view> -->
-						<view class="footer acea-row row-between-wrapper">
-							<!-- <button open-type="contact" hover-class='none' class='item'>
+					</view>
+				</scroll-view>
+			</view>
+			<!-- <view class="uni-p-b-98"></view> -->
+			<view class="footer acea-row row-between-wrapper">
+				<!-- <button open-type="contact" hover-class='none' class='item'>
 						<view class='iconfont icon-kefu'></view>
 						<view>客服</view>
 					</button> -->
 
-							<navigator hover-class="none" class="item skeleton-rect" open-type="switchTab"
-								url="/pages/index/index">
-								<view class="iconfont icon-shouye6"></view>
-								<view class="p_center">首页</view>
-							</navigator>
-							<view @click="setCollect" class="item skeleton-rect">
-								<view class="iconfont icon-shoucang1" v-if="storeInfo.userCollect"></view>
-								<view class="iconfont icon-shoucang" v-else></view>
-								<view class="p_center">收藏</view>
-							</view>
-							<navigator open-type="reLaunch" class="animated item skeleton-rect"
-								:class="animated == true ? 'bounceIn' : ''" url="/pages/order_addcart/order_addcart"
-								hover-class="none">
-								<view class="iconfont icon-gouwuche1">
-									<text class="num bg-color" v-if="parseFloat(CartCount) > 0">{{
+				<navigator hover-class="none" class="item skeleton-rect" open-type="switchTab" url="/pages/index/index">
+					<view class="iconfont icon-shouye6"></view>
+					<view class="p_center">首页</view>
+				</navigator>
+				<view @click="setCollect" class="item skeleton-rect">
+					<view class="iconfont icon-shoucang1" v-if="storeInfo.userCollect"></view>
+					<view class="iconfont icon-shoucang" v-else></view>
+					<view class="p_center">收藏</view>
+				</view>
+				<view class="animated item skeleton-rect" :class="animated == true ? 'bounceIn' : ''" @click="goCart">
+					<view class="iconfont icon-gouwuche1">
+						<text class="num bg-color" v-if="parseFloat(CartCount) > 0">{{
               CartCount || 0
             }}</text>
-								</view>
-								<view class="p_center skeleton-rect">购物车</view>
-							</navigator>
-							<view v-if="a" class="presale">
-								<view class="acea-row">
-									<form class=" bnts bg-color-hui"><button class=" bnts bg-color-hui"
-											form-type="submit">暂无产品</button></form>
-								</view>
-							</view>
-							<view v-else>
-								<view v-if="!storeInfo.presale">
-									<view class="bnt acea-row" :class="!storeInfo.cart_button ? 'virbnt' : ''"
-										v-if="attr.productSelect.stock <= 0">
-										<form v-if="storeInfo.cart_button" @submit="joinCart" class="joinCart bnts"
-											:class="!storeInfo.cart_button ? 'virbnt' : ''">
-											<button class="joinCart bnts" form-type="submit">
-												加入购物车
-											</button>
-										</form>
-										<form class="buy bnts bg-color-hui">
-											<button class="buy bnts bg-color-hui" form-type="submit"
-												:class="!storeInfo.cart_button ? 'virbnt' : ''">
-												已售罄
-											</button>
-										</form>
-									</view>
-									<view class="bnt acea-row skeleton-rect" v-else>
-										<form v-if="storeInfo.cart_button" @submit="joinCart" class="joinCart bnts">
-											<button class="joinCart bnts" form-type="submit">
-												加入购物车
-											</button>
-										</form>
-										<form @submit="goBuy" class="buy bnts"
-											:class="!storeInfo.cart_button ? 'virbnt' : ''">
-											<button class="buy bnts" :class="!storeInfo.cart_button ? 'virbnt' : ''"
-												form-type="submit">
-												立即购买
-											</button>
-										</form>
-									</view>
-								</view>
-								<view class="presale" v-else>
-									<view class="acea-row" v-if="presale_pay_status === 1 || presale_pay_status === 3">
-										<form class="bnts bg-color-hui"><button class="bnts bg-color-hui"
-												form-type="submit">{{presale_pay_status === 1?'未开始':'已结束'}}</button>
-										</form>
-									</view>
-									<view class="acea-row"
-										v-else-if="attr.productSelect.quota <= 0 || attr.productSelect.quota < attr.productSelect.cart_num">
-										<form class=" bnts bg-color-hui"><button class=" bnts bg-color-hui"
-												form-type="submit">已售罄</button></form>
-									</view>
-									<view class="bnts acea-row" v-else-if="presale_pay_status === 2">
-										<form @submit="goBuy" class="bnts"><button class="bnts"
-												form-type="submit">立即购买</button>
-										</form>
-									</view>
-								</view>
-							</view>
+					</view>
+					<view class="p_center skeleton-rect">购物车</view>
+				</view>
+				<view v-if="a" class="presale">
+					<view class="acea-row">
+						<form class=" bnts bg-color-hui"><button class=" bnts bg-color-hui"
+								form-type="submit">暂无产品</button></form>
+					</view>
+				</view>
+				<view v-else>
+					<view v-if="!storeInfo.presale">
+						<view class="bnt acea-row" :class="!storeInfo.cart_button ? 'virbnt' : ''"
+							v-if="attr.productSelect.stock <= 0">
+							<form v-if="storeInfo.cart_button" @submit="joinCart" class="joinCart bnts"
+								:class="!storeInfo.cart_button ? 'virbnt' : ''">
+								<button class="joinCart bnts" form-type="submit">
+									加入购物车
+								</button>
+							</form>
+							<form class="buy bnts bg-color-hui">
+								<button class="buy bnts bg-color-hui" form-type="submit"
+									:class="!storeInfo.cart_button ? 'virbnt' : ''">
+									已售罄
+								</button>
+							</form>
+						</view>
+						<view class="bnt acea-row skeleton-rect" v-else>
+							<form v-if="storeInfo.cart_button" @submit="joinCart" class="joinCart bnts">
+								<button class="joinCart bnts" form-type="submit">
+									加入购物车
+								</button>
+							</form>
+							<form @submit="goBuy" class="buy bnts" :class="!storeInfo.cart_button ? 'virbnt' : ''">
+								<button class="buy bnts" :class="!storeInfo.cart_button ? 'virbnt' : ''"
+									form-type="submit">
+									立即购买
+								</button>
+							</form>
+						</view>
+					</view>
+					<view class="presale" v-else>
+						<view class="acea-row" v-if="presale_pay_status === 1 || presale_pay_status === 3">
+							<form class="bnts bg-color-hui"><button class="bnts bg-color-hui"
+									form-type="submit">{{presale_pay_status === 1?'未开始':'已结束'}}</button>
+							</form>
+						</view>
+						<view class="acea-row"
+							v-else-if="attr.productSelect.quota <= 0 || attr.productSelect.quota < attr.productSelect.cart_num">
+							<form class=" bnts bg-color-hui"><button class=" bnts bg-color-hui"
+									form-type="submit">已售罄</button></form>
+						</view>
+						<view class="bnts acea-row" v-else-if="presale_pay_status === 2">
+							<form @submit="goBuy" class="bnts"><button class="bnts" form-type="submit">立即购买</button>
+							</form>
+						</view>
+					</view>
+				</view>
 
-							<!-- 	<view v-else>
+				<!-- 	<view v-else>
 						<view class="virbnt acea-row" :class="storeInfo.is_virtual?'virbnt':''" v-if="attr.productSelect.stock <= 0">
 							<form class="buy bnts bg-color-hui"><button class="virbuy virbnts bg-color-hui"
 									form-type="submit">已售罄</button></form>
@@ -372,90 +342,87 @@
 							</form>
 						</view>
 					</view> -->
-						</view>
-						<shareRedPackets :sharePacket="sharePacket" @listenerActionSheet="listenerActionSheet"
-							@closeChange="closeChange" :showAnimate="showAnimate" @boxStatus="boxStatus">
-						</shareRedPackets>
-						<!-- 组件 -->
-						<productWindow :attr="attr" :isShow="1" :iSplus="1" @myevent="onMyEvent"
-							@ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNum" @attrVal="attrVal"
-							@iptCartNum="iptCartNum" id="product-window" :is_vip="is_vip" @getImg="showImg"
-							:is_virtual="storeInfo.is_virtual"></productWindow>
-						<cus-previewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"
-							@shareFriend="listenerActionSheet" />
-						<couponListWindow :coupon="coupon" v-if="coupon" @ChangCouponsClone="ChangCouponsClone"
-							@ChangCoupons="ChangCoupons" @ChangCouponsUseState="ChangCouponsUseState"
-							@tabCouponType="tabCouponType">
-						</couponListWindow>
-						<!-- 分享按钮 -->
-						<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
-							<!-- #ifndef MP -->
-							<button class="item" hover-class="none" v-if="weixinStatus === true"
-								@click="H5ShareBox = true">
-								<view class="iconfont icon-weixin3"></view>
-								<view class="">发送给朋友</view>
-							</button>
-							<!-- #endif -->
-							<!-- #ifdef MP -->
-							<button class="item" open-type="share" hover-class="none" @click="goFriend">
-								<view class="iconfont icon-weixin3"></view>
-								<view class="">发送给朋友</view>
-							</button>
-							<!-- #endif -->
-							<!-- #ifdef H5  -->
-							<div class="item copy-data" v-if="storeInfo.command_word != ''"
-								:data-clipboard-text="storeInfo.command_word">
-								<view class="iconfont icon-fuzhikouling"></view>
-								<text>复制口令</text>
-							</div>
-							<!-- #endif -->
-							<!-- #ifdef APP-PLUS -->
-							<view class="item" @click="appShare('WXSceneSession')">
-								<view class="iconfont icon-weixin3"></view>
-								<view class="">微信好友</view>
-							</view>
-							<view class="item" @click="appShare('WXSenceTimeline')">
-								<view class="iconfont icon-pengyouquan"></view>
-								<view class="">微信朋友圈</view>
-							</view>
-							<!-- #endif -->
-							<button class="item" hover-class="none" @click="goPoster">
-								<view class="iconfont icon-haibao"></view>
-								<view class="">生成海报</view>
-							</button>
-						</view>
-						<view class="mask" v-if="posters" @click="listenerActionClose"></view>
-						<!-- #ifdef MP -->
-						<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
-						<!-- #endif -->
-						<!-- 海报展示 -->
-						<view class="poster-pop" v-if="posterImageStatus">
-							<image src="../../static/images/poster-close.png" class="close" @click="posterImageClose">
-							</image>
-							<image :src="posterImage"></image>
-							<!-- #ifndef H5  -->
-							<view class="save-poster" @click="savePosterPath">保存到手机</view>
-							<!-- #endif -->
-							<!-- #ifdef H5 -->
-							<view class="keep">长按图片可以保存到手机</view>
-							<!-- #endif -->
-						</view>
-						<view class="mask" v-if="posterImageStatus"></view>
-						<canvas class="canvas" canvas-id="myCanvas" v-if="canvasStatus"></canvas>
-						<!-- 发送给朋友图片 -->
-						<view class="share-box" v-if="H5ShareBox">
-							<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
-						</view>
-						<kefuIcon :ids="parseInt(id)" :routineContact="routineContact" :storeInfo="storeInfo"
-							:goodsCon="1">
-						</kefuIcon>
-						<!-- #ifdef H5 || APP-PLUS -->
-						<zb-code ref="qrcode" :show="codeShow" :cid="cid" :val="codeVal" :size="size" :unit="unit"
-							:background="background" :foreground="foreground" :pdground="pdground" :icon="codeIcon"
-							:iconSize="iconsize" :onval="onval" :loadMake="loadMake" @result="qrR" />
-						<!-- #endif -->
-					</view>
+			</view>
+			<shareRedPackets :sharePacket="sharePacket" @listenerActionSheet="listenerActionSheet"
+				@closeChange="closeChange" :showAnimate="showAnimate" @boxStatus="boxStatus">
+			</shareRedPackets>
+			<!-- 组件 -->
+			<productWindow :attr="attr" :isShow="1" :iSplus="1" @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
+				@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id="product-window"
+				:is_vip="is_vip" @getImg="showImg" :is_virtual="storeInfo.is_virtual"></productWindow>
+			<cus-previewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"
+				@shareFriend="listenerActionSheet" />
+			<couponListWindow :coupon="coupon" v-if="coupon" @ChangCouponsClone="ChangCouponsClone"
+				@ChangCoupons="ChangCoupons" @ChangCouponsUseState="ChangCouponsUseState"
+				@tabCouponType="tabCouponType">
+			</couponListWindow>
+			<!-- 分享按钮 -->
+			<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
+				<!-- #ifndef MP -->
+				<button class="item" hover-class="none" v-if="weixinStatus === true" @click="H5ShareBox = true">
+					<view class="iconfont icon-weixin3"></view>
+					<view class="">发送给朋友</view>
+				</button>
+				<!-- #endif -->
+				<!-- #ifdef MP -->
+				<button class="item" open-type="share" hover-class="none" @click="goFriend">
+					<view class="iconfont icon-weixin3"></view>
+					<view class="">发送给朋友</view>
+				</button>
+				<!-- #endif -->
+				<!-- #ifdef H5  -->
+				<div class="item copy-data" v-if="storeInfo.command_word != ''"
+					:data-clipboard-text="storeInfo.command_word">
+					<view class="iconfont icon-fuzhikouling"></view>
+					<text>复制口令</text>
+				</div>
+				<!-- #endif -->
+				<!-- #ifdef APP-PLUS -->
+				<view class="item" @click="appShare('WXSceneSession')">
+					<view class="iconfont icon-weixin3"></view>
+					<view class="">微信好友</view>
+				</view>
+				<view class="item" @click="appShare('WXSenceTimeline')">
+					<view class="iconfont icon-pengyouquan"></view>
+					<view class="">微信朋友圈</view>
 				</view>
+				<!-- #endif -->
+				<button class="item" hover-class="none" @click="goPoster">
+					<view class="iconfont icon-haibao"></view>
+					<view class="">生成海报</view>
+				</button>
+			</view>
+			<view class="mask" v-if="posters" @click="listenerActionClose"></view>
+			<!-- #ifdef MP -->
+			<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
+			<!-- #endif -->
+			<!-- 海报展示 -->
+			<view class="poster-pop" v-if="posterImageStatus">
+				<image src="../../static/images/poster-close.png" class="close" @click="posterImageClose">
+				</image>
+				<image :src="posterImage"></image>
+				<!-- #ifndef H5  -->
+				<view class="save-poster" @click="savePosterPath">保存到手机</view>
+				<!-- #endif -->
+				<!-- #ifdef H5 -->
+				<view class="keep">长按图片可以保存到手机</view>
+				<!-- #endif -->
+			</view>
+			<view class="mask" v-if="posterImageStatus"></view>
+			<canvas class="canvas" canvas-id="myCanvas" v-if="canvasStatus"></canvas>
+			<!-- 发送给朋友图片 -->
+			<view class="share-box" v-if="H5ShareBox">
+				<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
+			</view>
+			<kefuIcon :ids="parseInt(id)" :routineContact="routineContact" :storeInfo="storeInfo" :goodsCon="1">
+			</kefuIcon>
+			<!-- #ifdef H5 || APP-PLUS -->
+			<zb-code ref="qrcode" :show="codeShow" :cid="cid" :val="codeVal" :size="size" :unit="unit"
+				:background="background" :foreground="foreground" :pdground="pdground" :icon="codeIcon"
+				:iconSize="iconsize" :onval="onval" :loadMake="loadMake" @result="qrR" />
+			<!-- #endif -->
+		</view>
+	</view>
 </template>
 
 <script>
@@ -745,7 +712,11 @@
 				path: "/pages/goods_details/index?id=" + that.id + "&spid=" + that.uid,
 			};
 		},
+
 		// #endif
+		onNavigationBarButtonTap(e) {
+			this.currentPage = !this.currentPage
+		},
 		methods: {
 			// 操作菜单
 			moreNav() {
@@ -1432,6 +1403,11 @@
 					this.goCat();
 				}
 			},
+			goCart() {
+				uni.switchTab({
+					url: '/pages/order_addcart/order_addcart'
+				})
+			},
 			/*
 			 * 加入购物车
 			 */

template/uni-app/pages/index/diy/index.vue

@@ -395,9 +395,6 @@
 			let curRoute = routes[routes.length - 1].route //获取当前页面路由
 			this.activeRouter = '/' + curRoute
 			// #ifdef APP-PLUS
-			this.$nextTick(() => {
-				this.$refs.appUpdate.update(); //调用子组件 检查更新
-			});
 			try {
 				let val = uni.getStorageSync('privacyStatus') || false
 				if (!val) {

template/uni-app/pages/index/visualization/components/swiperBg.vue

@@ -69,16 +69,17 @@
 						uni.getImageInfo({
 							src: this.imgUrls.length ? this.imgUrls[0].img : '',
 							success: (res) => {
+								console.log('2222222222')
 								if (res && res.height > 0) {
 									this.$set(this, 'imageH',
 										res.height / res
 										.width * 690)
 								} else {
-									this.$set(this, 'imageH', 375);
+									this.$set(this, 'imageH', 320);
 								}
 							},
 							fail: (error) => {
-								this.$set(this, 'imageH', 375);
+								this.$set(this, 'imageH', 320);
 							}
 						})
 					}
@@ -100,12 +101,11 @@
 				isIframe: false,
 				mt: -55,
 				isShow: true,
-				imageH: 250,
+				imageH: 320,
 				swiperCur: 0,
 			};
 		},
 		created() {
-
 			// #ifdef MP || APP-PLUS
 			const res = uni.getSystemInfoSync()
 			const system = res.platform

template/uni-app/pages/index/visualization/index.vue

@@ -290,7 +290,7 @@
 				}
 			} catch (e) {}
 			this.$nextTick(() => {
-				this.$refs.appUpdate.update(); //调用子组件 检查更新
+				// this.$refs.appUpdate.update(); //调用子组件 检查更新
 			});
 			// #endif
 			let that = this;

template/uni-app/pages/news_details/index.vue

@@ -112,12 +112,15 @@
 			setShareInfo: function() {
 				let href = location.href;
 				let configAppMessage = {
-					desc: this.articleInfo.synopsis,
 					title: this.articleInfo.title,
+					desc: this.articleInfo.synopsis,
 					link: href,
 					imgUrl: this.articleInfo.image_input.length ? this.articleInfo.image_input[0] : ""
 				};
-				this.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"], configAppMessage);
+				this.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData",
+					"onMenuShareAppMessage",
+					"onMenuShareTimeline",
+				], configAppMessage);
 			}
 		}
 	}

template/uni-app/pages/order_addcart/order_addcart.vue

@@ -139,7 +139,7 @@
 		<view class="uni-p-b-98"></view>
 		<!-- <pageFooter :countNum="cartCount"></pageFooter> -->
 		<tabBar v-if="!is_diy" :pagePath="'/pages/order_addcart/order_addcart'"></tabBar>
-		<view  class="foot" v-else-if="is_diy && newData.status && newData.status.status">
+		<view class="foot" v-else-if="is_diy && newData.status && newData.status.status">
 			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
 				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
 					<block v-if="item.link == activeRouter">
@@ -248,28 +248,14 @@
 				cartId: 0,
 				product_id: 0,
 				sysHeight: sysHeight,
-				footerSee: false,
 				newData: {},
 				activeRouter: ''
 			};
 		},
 		computed: mapGetters(['isLogin']),
 		onLoad(options) {
-			// uni.hideTabBar()
-
-
-			let that = this;
-			if (that.isLogin == false) {
-				toLogin();
-			}
-			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-			let curRoute = routes[routes.length - 1].route //获取当前页面路由
-			this.activeRouter = '/' + curRoute
-		},
-		onShow() {
 			if (this.is_diy) {
 				if (uni.getStorageSync('FOOTER_BAR')) {
-					this.footerSee = true
 					uni.hideTabBar()
 				}
 				getNavigation().then(res => {
@@ -280,7 +266,18 @@
 						uni.showTabBar()
 					}
 				})
+			} else {
+				uni.hideTabBar()
 			}
+			let that = this;
+			if (that.isLogin == false) {
+				toLogin();
+			}
+			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+			let curRoute = routes[routes.length - 1].route //获取当前页面路由
+			this.activeRouter = '/' + curRoute
+		},
+		onShow() {
 			this.canShow = false
 			if (this.isLogin == true) {
 				this.hotPage = 1;
@@ -1197,7 +1194,7 @@
 		border-left: 0;
 		border-radius: 0 3rpx 3rpx 0;
 	}
-	
+
 	.shoppingCart .list .item .picTxt .carnum .plus.on {
 		border-color: #e3e3e3;
 		color: #dedede;

template/uni-app/pages/order_pay_status/index.vue

@@ -240,7 +240,7 @@
 				})
 				openOrderSubscribe().then(res => {
 					uni.hideLoading();
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/users/order_details/index?order_id=' + that.orderId
 					});
 				}).catch(() => {
@@ -248,7 +248,7 @@
 				});
 				// #endif
 				// #ifndef MP
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/users/order_details/index?order_id=' + that.orderId
 				})
 				// #endif

template/uni-app/pages/points_mall/integral_goods_details.vue

@@ -2,131 +2,121 @@
 	<view :style="colorStyle">
 		<view class="product-con">
 			<!-- 头部 -->
-			<!-- #ifdef APP-PLUS -->
-			<view class="navbar" :style="{ height: (navH)+'rpx', opacity: opacity, }">
-				<!-- #endif -->
-				<!-- #ifndef APP-PLUS -->
-				<view class='navbar' :style="{height:navH+'rpx',opacity:opacity}">
-					<!-- #endif -->
-					<view class='navbarH' :style='"height:"+navH+"rpx;"'>
-						<view class='navbarCon acea-row row-center-wrapper'>
-							<view class="header acea-row row-center-wrapper">
-								<view class="item line1">
-									{{storeInfo.title}}
-								</view>
+
+			<!-- #ifndef APP-PLUS -->
+			<view class='navbar' :style="{height:navH+'rpx',opacity:opacity}">
+				<view class='navbarH' :style='"height:"+navH+"rpx;"'>
+					<view class='navbarCon acea-row row-center-wrapper'>
+						<view class="header acea-row row-center-wrapper">
+							<view class="item line1">
+								{{storeInfo.title}}
 							</view>
 						</view>
 					</view>
 				</view>
-				<!-- #ifdef APP-PLUS -->
-				<view id="home" class="home-nav acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-					:style="{ top:(navH / 2-92)+'rpx',marginTop:sysHeight}">
+			</view>
+			<view id="home" class="home-nav acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
+				:style="{ top: homeTop +'rpx'}">
+				<view class="iconfont icon-fanhui2" @tap="returns"></view>
+				<!-- #ifdef MP -->
+				<view class="line"></view>
+				<view class="iconfont icon-gengduo5" @click="moreNav"></view>
+				<!-- #endif -->
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view id="home" class="home-nav right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
+				:style="{ top: homeTop +'rpx'}">
+				<!-- #ifdef APP-PLUS || H5 -->
+				<view class="iconfont icon-gengduo2" @click="moreNav"></view>
+			</view>
+			<!-- #endif -->
+			<!-- #endif -->
+			<homeList :navH="navH" :returnShow="returnShow" :currentPage="currentPage" :sysHeight="sysHeight">
+			</homeList>
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" scroll-with-animation="true"
+				:style="'height:' + height + 'px;'" @scroll="scroll">
+				<view id="past0">
+					<!-- #ifdef APP-PLUS || MP -->
+					<view class="" :style="'width:100%;' + 'height:'+sysHeight"></view>
 					<!-- #endif -->
-					<!-- #ifndef APP-PLUS -->
-					<view id="home" class="home-nav acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-						:style="{ top: homeTop +'rpx'}">
-						<!-- #endif -->
-						<view class="iconfont icon-fanhui2" @tap="returns"></view>
-						<!-- #ifdef MP -->
-						<view class="line"></view>
-						<view class="iconfont icon-gengduo5" @click="moreNav"></view>
-						<!-- #endif -->
+					<productConSwiper :imgUrls="imgUrls"></productConSwiper>
+					<view class="nav acea-row row-between-wrapper">
+						<view class="share acea-row row-between row-bottom">
+							<view class="money font-color">
+								<image src="/static/images/my-point.png" mode=""></image>
+								<text class="num" v-text="storeInfo.price || 0"></text>积分
+							</view>
+							<view></view>
+						</view>
 					</view>
-					<!-- #ifdef APP-PLUS -->
-					<view id="home" class="home-nav right acea-row row-center-wrapper" :class="[opacity>0.5?'on':'']"
-						:style="{ top:(navH/2-92)+'rpx',marginTop:sysHeight}">
-						<!-- #endif -->
-						<!-- #ifdef H5 -->
-						<view id="home" class="home-nav right acea-row row-center-wrapper"
-							:class="[opacity>0.5?'on':'']" :style="{ top: homeTop +'rpx'}">
-							<!-- #endif -->
-							<!-- #ifdef APP-PLUS || H5 -->
-							<view class="iconfont icon-gengduo2" @click="moreNav"></view>
+					<view class="wrapper">
+						<view class="introduce acea-row row-between">
+							<view class="infor"> {{ storeInfo.title }}</view>
 						</view>
-						<!-- #endif -->
-						<homeList :navH="navH" :returnShow="returnShow" :currentPage="currentPage"
-							:sysHeight="sysHeight">
-						</homeList>
-						<scroll-view :scroll-top="scrollTop" scroll-y="true" scroll-with-animation="true"
-							:style="'height:' + height + 'px;'" @scroll="scroll">
-							<view id="past0">
-								<productConSwiper :imgUrls="imgUrls"></productConSwiper>
-								<view class="nav acea-row row-between-wrapper">
-									<view class="share acea-row row-between row-bottom">
-										<view class="money font-color">
-											<image src="/static/images/my-point.png" mode=""></image>
-											<text class="num" v-text="storeInfo.price || 0"></text>积分
-										</view>
-										<view></view>
-									</view>
-								</view>
-								<view class="wrapper">
-									<view class="introduce acea-row row-between">
-										<view class="infor"> {{ storeInfo.title }}</view>
-									</view>
-									<view class="label acea-row row-middle">
-										<view class="stock">原价：{{ storeInfo.product_price }}</view>
-										<view class="stock">限量:
-											{{ storeInfo.quota_show }}
-										</view>
-										<view class="stock">已兑换：{{ storeInfo.sales }} </view>
-									</view>
-								</view>
-								<view class="attribute acea-row row-between-wrapper" @tap="selecAttr"
-									v-if="attribute.productAttr.length">
-									<!-- <view class="df"><text class='atterTxt line1'>{{attr}}：{{attrValue}}</text></view>
+						<view class="label acea-row row-middle">
+							<view class="stock">原价：{{ storeInfo.product_price }}</view>
+							<view class="stock">限量:
+								{{ storeInfo.quota_show }}
+							</view>
+							<view class="stock">已兑换：{{ storeInfo.sales }} </view>
+						</view>
+					</view>
+					<view class="attribute acea-row row-between-wrapper" @tap="selecAttr"
+						v-if="attribute.productAttr.length">
+						<!-- <view class="df"><text class='atterTxt line1'>{{attr}}：{{attrValue}}</text></view>
 						<view class='iconfont icon-jiantou'></view> -->
-									<view class="flex">
-										<view style="display: flex; align-items: center; width: 90%">
-											<view class="attr-txt"> {{ attr }}： </view>
-											<view class="atterTxt line1" style="width: 82%">{{
+						<view class="flex">
+							<view style="display: flex; align-items: center; width: 90%">
+								<view class="attr-txt"> {{ attr }}： </view>
+								<view class="atterTxt line1" style="width: 82%">{{
                   attrValue
                 }}</view>
-										</view>
-										<view class="iconfont icon-jiantou"></view>
-									</view>
-									<view class="acea-row row-between-wrapper"
-										style="margin-top: 7px; padding-left: 70px" v-if="skuArr.length > 1">
-										<view class="flexs">
-											<image :src="item.image" v-for="(item, index) in skuArr.slice(0, 4)"
-												:key="index" class="attrImg"></image>
-										</view>
-										<view class="switchTxt">共{{ skuArr.length }}种规格可选</view>
-									</view>
-								</view>
 							</view>
-							<view class="product-intro" id="past2">
-								<view class="title">产品介绍</view>
-								<view class="conter">
-									<view class="" v-html="storeInfo.description"> </view>
-								</view>
+							<view class="iconfont icon-jiantou"></view>
+						</view>
+						<view class="acea-row row-between-wrapper" style="margin-top: 7px; padding-left: 70px"
+							v-if="skuArr.length > 1">
+							<view class="flexs">
+								<image :src="item.image" v-for="(item, index) in skuArr.slice(0, 4)" :key="index"
+									class="attrImg"></image>
 							</view>
-						</scroll-view>
-						<view class="footer acea-row row-between-wrapper">
-							<navigator hover-class="none" open-type="switchTab" class="item" url="/pages/index/index">
-								<view class="iconfont icon-shouye6"></view>
-								<view class="p_center">首页</view>
-							</navigator>
-							<view class="bnt acea-row" v-if="
+							<view class="switchTxt">共{{ skuArr.length }}种规格可选</view>
+						</view>
+					</view>
+				</view>
+				<view class="product-intro" id="past2">
+					<view class="title">产品介绍</view>
+					<view class="conter">
+						<view class="" v-html="storeInfo.description"> </view>
+					</view>
+				</view>
+			</scroll-view>
+			<view class="footer acea-row row-between-wrapper">
+				<navigator hover-class="none" open-type="switchTab" class="item" url="/pages/index/index">
+					<view class="iconfont icon-shouye6"></view>
+					<view class="p_center">首页</view>
+				</navigator>
+				<view class="bnt acea-row" v-if="
             attribute.productSelect.quota > 0 &&
             attribute.productSelect.product_stock > 0
           ">
-								<view class="buy bnts" @tap="goCat">立即兑换</view>
-							</view>
-							<view class="bnt acea-row" v-else>
-								<view class="bnts no-goods">无法兑换</view>
-							</view>
-						</view>
-					</view>
-					<product-window :attr="attribute" :limitNum="1" @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-						@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" @getImg="showImg">
-					</product-window>
-					<cus-previewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"
-						@shareFriend="listenerActionSheet" />
-					<!-- 分享按钮 -->
-					<kefuIcon :ids="storeInfo.product_id" :routineContact="routineContact"></kefuIcon>
-					<!-- 发送给朋友图片 -->
+					<view class="buy bnts" @tap="goCat">立即兑换</view>
+				</view>
+				<view class="bnt acea-row" v-else>
+					<view class="bnts no-goods">无法兑换</view>
 				</view>
+			</view>
+		</view>
+		<product-window :attr="attribute" :limitNum="1" @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
+			@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" @getImg="showImg">
+		</product-window>
+		<cus-previewImg ref="cusPreviewImg" :list="skuArr" @changeSwitch="changeSwitch"
+			@shareFriend="listenerActionSheet" />
+		<!-- 分享按钮 -->
+		<kefuIcon :ids="storeInfo.product_id" :routineContact="routineContact"></kefuIcon>
+		<!-- 发送给朋友图片 -->
+	</view>
 </template>
 
 <script>
@@ -281,13 +271,14 @@
 				},
 			});
 			this.isLogin && silenceBindingSpread();
-			// #ifndef APP-PLUS
-			this.navH = app.globalData.navHeight
+			// #ifdef H5
+			that.navH = 96;
 			// #endif
-			// #ifndef MP
-			this.navH = 96;
+			// #ifdef APP-PLUS
+			that.navH = 30;
 			// #endif
 			// #ifdef MP
+			this.navH = app.globalData.navHeight;
 			let menuButtonInfo = uni.getMenuButtonBoundingClientRect()
 			this.meunHeight = menuButtonInfo.height
 			this.backH = (that.navH / 2) + (this.meunHeight / 2)
@@ -334,6 +325,9 @@
 				// #endif
 			})
 		},
+		onNavigationBarButtonTap(e) {
+			this.currentPage = !this.currentPage
+		},
 		methods: {
 			moreNav() {
 				this.currentPage = !this.currentPage

template/uni-app/pages/user/index.vue

@@ -730,8 +730,9 @@
 			goMenuPage(url, name) {
 				if (this.isLogin) {
 					if (url.indexOf('http') === -1) {
-						// #ifdef H5
+						// #ifdef H5 || APP-PLUS
 						if (name && name === '客服接待') {
+							// return window.location.href = `${location.origin}${url}`
 							return uni.navigateTo({
 								url: `/pages/annex/web_view/index?url=${location.origin}${url}`
 							});
@@ -742,7 +743,11 @@
 							return window.location.href = `${location.origin}${url}`
 						}
 						// #endif
+
 						// #ifdef MP
+						if (name && name === '联系客服') {
+							return getCustomer(url)
+						}
 						if (url != '#' && url == '/pages/users/user_info/index') {
 							uni.openSetting({
 								success: function(res) {}

template/uni-app/pages/users/login/index.vue

@@ -598,10 +598,11 @@
 				width: 68rpx;
 				height: 68rpx;
 				border-radius: 50%;
-				background: #EAEAEA;
+				background: #000;
+
 
 				.icon-s-pingguo {
-					color: #333;
+					color: #fff;
 					font-size: 44rpx;
 				}
 			}
@@ -622,6 +623,7 @@
 			}
 
 			.yanzheng {
+				margin-right: 30rpx;
 				background-color: #F89C23;
 			}
 

template/uni-app/pages/users/order_details/index.vue

@@ -40,11 +40,10 @@
 				<view class='nav'>
 					<view class='navCon acea-row row-between-wrapper'>
 						<view :class="status.type == 0 || status.type == -9 ? 'on':''">待付款</view>
-						<view :class="status.type == 1 || status.type == 5 ? 'on':''" v-if="orderInfo.shipping_type!=4">
-							{{(orderInfo.shipping_type==1 || orderInfo.shipping_type==3) ? '待发货':'待核销'}}
+						<view :class="status.type == 1 || status.type == 5 ? 'on':''">
+							{{orderInfo.shipping_type==1 ? '待发货':'待核销'}}
 						</view>
-						<view :class="status.type == 2 ? 'on':''"
-							v-if="orderInfo.shipping_type == 1 || orderInfo.shipping_type == 3">待收货</view>
+						<view :class="status.type == 2 ? 'on':''" v-if="orderInfo.shipping_type == 1">待收货</view>
 						<view :class="status.type == 3 ? 'on':''">待评价</view>
 						<view :class="status.type == 4 ? 'on':''">已完成</view>
 					</view>
@@ -52,18 +51,18 @@
 						<view class='iconfont'
 							:class='(status.type == 0 || status.type == -9  ? "icon-webicon318":"icon-yuandianxiao") + " " + (status.type >= 0 ? "font-num":"")'>
 						</view>
-						<view class='line' :class='status.type > 0 ? "bg-color":""' v-if="orderInfo.shipping_type!=4">
+						<view class='line' :class='status.type > 0 ? "bg-color":""'>
 						</view>
 						<view class='iconfont'
 							:class='(status.type == 1 || status.type == 5 ? "icon-webicon318":"icon-yuandianxiao") + " " + (status.type >= 1 ? "font-num":"")'
 							v-if="orderInfo.shipping_type!=4">
 						</view>
 						<view class='line' :class='status.type > 1 && status.type != 5 ? "bg-color":""'
-							v-if="orderInfo.shipping_type == 1 || orderInfo.shipping_type == 3">
+							v-if="orderInfo.shipping_type == 1">
 						</view>
 						<view class='iconfont'
 							:class='(status.type == 2 ? "icon-webicon318":"icon-yuandianxiao") + " " +(status.type >= 2 ? "font-num":"")'
-							v-if="orderInfo.shipping_type == 1 || orderInfo.shipping_type == 3"></view>
+							v-if="orderInfo.shipping_type == 1"></view>
 						<view class='line' :class='status.type > 2 && status.type != 5 ? "bg-color":""'></view>
 						<view class='iconfont'
 							:class='(status.type == 3 ? "icon-webicon318":"icon-yuandianxiao") + " " + (status.type >= 3 && status.type != 5  ? "font-num":"")'>
@@ -119,7 +118,7 @@
 				</view>
 
 				<view v-if="orderInfo.virtual_type == 0">
-					<view class='address' v-if="orderInfo.shipping_type === 1 || orderInfo.shipping_type === 3">
+					<view class='address' v-if="orderInfo.shipping_type === 1">
 						<view class='name'>{{orderInfo.real_name}}<text class='phone'>{{orderInfo.user_phone}}</text>
 						</view>
 						<view>{{orderInfo.user_address}}</view>
@@ -209,9 +208,8 @@
 					<view class='conter'>{{orderInfo.remark}}</view>
 				</view>
 			</view>
-			<view class='wrapper' v-if="orderInfo.custom_form && orderInfo.custom_form.length">
-				<view class='item acea-row row-between' v-for="(item,index) in orderInfo.custom_form">
-
+			<view class='wrapper' v-if="customForm && customForm.length">
+				<view class='item acea-row row-between' v-for="(item,index) in customForm">
 					<view class='upload' v-if="item.label == 'img'">
 						<view>{{item.title}}：</view>
 						<view class='pictrue' v-for="(img,index) in item.value" :key="index">
@@ -459,6 +457,7 @@
 		mixins: [colors],
 		data() {
 			return {
+				customForm: '', //自定义留言
 				//二维码参数
 				codeShow: false,
 				cid: '1',
@@ -660,7 +659,11 @@
 						phoneNumber: this.customerInfo.customer_phone
 					});
 				} else if (this.customerInfo.customer_type == 2) {
+
 					let href = this.customerInfo.customer_url;
+					// #ifdef APP-PLUS
+					plus.runtime.openURL(href)
+					// #endif
 					let hrefO = href + '?uid=' + this.userInfo.uid + '&nickName=' + this.userInfo.nickname + '&phone=' +
 						this.userInfo.phone + '&sex=' + this.userInfo.sex + '&avatar=' + this.userInfo.avatar +
 						'&openid=' + this.userInfo.openid;
@@ -668,9 +671,31 @@
 						this.userInfo.phone + '&sex=' + this.userInfo.sex + '&avatar=' + this.userInfo.avatar +
 						'&openid=' + this.userInfo.openid;
 					let urls = encodeURIComponent(href.indexOf('?') === -1 ? hrefO : hrefT);
-					uni.navigateTo({
-						url: `/pages/annex/web_view/index?url=${urls}`
-					});
+					if (href.indexOf('work.weixin.qq.com') > 0) {
+						// #ifdef H5
+						return window.location.href = href
+						// #endif			
+						// #ifdef MP
+						uni.openCustomerServiceChat({
+							extInfo: {
+								url: href
+							},
+							corpId: this.customerInfo.customer_corpId,
+							success(res) {},
+							fail(err) {
+								uni.showToast({
+									title: '请先配置企业ID',
+									icon: 'none',
+									duration: 2000
+								});
+							}
+						})
+						// #endif
+					} else {
+						uni.navigateTo({
+							url: `/pages/annex/web_view/index?url=${urls}`
+						});
+					}
 				} else {
 					uni.navigateTo({
 						url: `/pages/customer_list/chat?orderId=${self.order_id}&isReturen=${this.isReturen}`
@@ -887,6 +912,15 @@
 					let _type = res.data._status._type;
 					uni.hideLoading();
 					that.$set(that, 'orderInfo', res.data);
+					//处理自定义留言非必填项的数据展示
+					let arr = []
+					that.orderInfo.custom_form.map(i => {
+						if (i.value != '') {
+							arr.push(i)
+						}
+					})
+					that.$set(that, 'customForm', arr);
+
 					that.$set(that, 'cartInfo', res.data.cartInfo);
 					that.$set(that, 'pid', res.data.pid);
 					that.$set(that, 'split', res.data.split);
@@ -1176,14 +1210,21 @@
 						if (res.confirm) {
 							orderCancel(self.orderInfo.order_id)
 								.then((data) => {
+									// #ifndef MP
 									self.$util.Tips({
 										title: data.msg
 									}, {
 										tab: 3
 									})
+									// #endif
+									// #ifdef MP
+									self.$util.Tips({
+										title: data.msg
+									}, '/pages/users/order_list/index');
+									// #endif
 								})
 								.catch(() => {
-									self.getDetail();
+									self.getOrderInfo();
 								});
 						} else if (res.cancel) {
 							console.log('用户点击取消');
@@ -1205,11 +1246,11 @@
 			margin-right: 6rpx;
 		}
 	}
-	
+
 	.refund-tip1 {
 		font-size: 24rpx;
 		color: var(--view-theme);
-	
+
 		.iconfont {
 			font-size: 24rpx;
 			margin-right: 6rpx;
@@ -2161,7 +2202,8 @@
 	}
 
 	.upload .pictrue {
-		margin: 22rpx 23rpx 20rpx 0;
+		display: inline-block;
+		margin: 22rpx 17rpx 20rpx 0;
 		width: 156rpx;
 		height: 156rpx;
 		color: #bbb;

template/uni-app/pages/users/payment_on_behalf/index.vue

@@ -65,6 +65,9 @@
 				发送给微信好友
 			</button>
 			<!-- #endif -->
+			<button v-if="!resData.paid && !resData.type" class="order-btn detail" @click="goOrderDetail()">
+				查看订单详情
+			</button>
 			<button class="order-btn" v-if="!resData.paid && resData.type" @tap='payOpen()'>立即付款</button>
 			<button class="order-btn on-pay" v-if="resData.paid && resData.type">订单已支付</button>
 			<button class="order-btn" v-if="resData.paid && !resData.type" @tap='goOrderDetail()'>查看订单详情</button>
@@ -81,6 +84,9 @@
 		</view>
 		<payment :payMode='payMode' :pay_close="pay_close" :friendPay="true" @onChangeFun='onChangeFun'
 			:order_id="order_id" :totalPrice='resData.pay_price'></payment>
+		<!-- #ifndef MP -->
+		<home></home>
+		<!-- #endif -->
 	</view>
 </template>
 
@@ -88,6 +94,7 @@
 	import orderGoods from '@/components/orderGoods';
 	import colors from "@/mixins/color";
 	import payment from '@/components/payment';
+	import home from '@/components/home/index.vue'
 	import {
 		friendDetail
 	} from '@/api/user.js'
@@ -105,7 +112,8 @@
 		mixins: [colors],
 		components: {
 			orderGoods,
-			payment
+			payment,
+			home
 		},
 		computed: mapGetters(["isLogin"]),
 		data() {
@@ -412,6 +420,13 @@
 				margin-top: 60rpx;
 			}
 
+			.order-btn.detail {
+				margin-top: 20rpx;
+				color: var(--view-theme);
+				background-color: #fff;
+				border: 1px solid var(--view-theme);
+			}
+
 			.order-btn.on-pay {
 				background-color: #ccc;
 			}

template/uni-app/pages/users/payment_on_behalf/pay_status.vue

@@ -54,7 +54,7 @@
 				deep: true
 			}
 		},
-		onLoad: function(options) {
+		onLoad(options) {
 			this.options = options
 			if (!options.order_id) return this.$util.Tips({
 				title: '缺少参数无法查看订单支付状态'
@@ -90,15 +90,13 @@
 			openTap() {
 				this.$set(this, 'couponsHidden', !this.couponsHidden);
 			},
-			onLoadFun: function() {
+			onLoadFun() {
 				this.getDetail();
 			},
 			/**
-			 * 
 			 * 支付完成查询支付状态
-			 * 
 			 */
-			getOrderPayInfo: function() {
+			getOrderPayInfo() {
 				let that = this;
 				uni.showLoading({
 					title: '正在加载中'
@@ -118,7 +116,7 @@
 			/**
 			 * 去首页关闭当前所有页面
 			 */
-			goIndex: function(e) {
+			goIndex(e) {
 				uni.switchTab({
 					url: '/pages/index/index'
 				});

template/uni-app/pages/users/user_info/index.vue

@@ -108,12 +108,10 @@
 				</view>
 
 				<button class='modifyBnt bg-color' formType="submit">保存修改</button>
-				<!-- #ifdef H5 -->
-				<view class="logOut cartcolor acea-row row-center-wrapper" @click="outLogin"
-					v-if="!this.$wechat.isWeixin()">退出登录</view>
+				<!-- #ifdef H5 || APP-PLUS -->
+				<view class="logOut cartcolor acea-row row-center-wrapper" @click="outLogin">退出登录</view>
 				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->
-				<view class="logOut cartcolor acea-row row-center-wrapper" @click="outLogin">退出登录</view>
 				<app-update ref="appUpdate" :force="true" :tabbar="false" :getVer='true' @isNew="isNew"></app-update>
 				<!-- #endif -->
 			</view>
@@ -190,7 +188,7 @@
 				// #ifdef APP-PLUS
 				this.formatSize()
 				// 获取版本号
-				plus.runtime.getProperty(plus.runtime.appid, (inf)=> {
+				plus.runtime.getProperty(plus.runtime.appid, (inf) => {
 					console.log(inf.version)
 					this.version = inf.version;
 				});
@@ -200,12 +198,12 @@
 			}
 		},
 		methods: {
-			isNew(){
+			isNew() {
 				that.$util.Tips({
 					title: '当前为最新版本'
 				});
 			},
-			
+
 			updateApp() {
 				this.$refs.appUpdate.update(); //调用子组件 检查更新
 			},
@@ -347,6 +345,7 @@
 							if (res.confirm) {
 								getLogout()
 									.then(res => {
+										// uni.clearStorage()
 										that.$store.commit("LOGOUT");
 										uni.reLaunch({
 											url: '/pages/index/index'

template/uni-app/pages/users/user_spread_code/index.vue

@@ -198,7 +198,7 @@
 				this.qrcode = await this.imgToBase(res.data.qrcode)
 				// #endif
 				let codeUrl = "?spread=" + this.userInfo.uid
-				// #ifdef MP || APP-PLUS
+				// #ifdef MP
 				await this.routineCode()
 				let mpUrl = await this.downloadFilestoreImage(this.mpUrl)
 				// #endif

template/uni-app/pages/users/user_spread_user/index.vue

@@ -8,11 +8,10 @@
 						<view class="user-msg" @click="jumbPath">
 							<image class="avatar" :src="userInfo.avatar" mode=""></image>
 							<view class="nickname">{{userInfo.nickname}}</view>
-							<view class="level" v-if="userInfo.agent_level_name">
-								{{userInfo.agent_level_name}}
+							<view class="level">
+								{{userInfo.agent_level_name?userInfo.agent_level_name:'分销等级'}}
 								<text class='iconfont icon-xiangyou'></text>
 							</view>
-							<text class='iconfont icon-xiangyou' v-else></text>
 						</view>
 					</view>
 					<view class="distribution acea-row row-center-wrapper" :class="userInfo.agent_level_name?'on':''"
@@ -33,6 +32,15 @@
 						<view class='money'>{{userInfo.extractTotalPrice}}</view>
 					</view>
 				</view>
+				<!-- <view class="apply"
+					v-if="(userInfo.is_division && userInfo.division_invite && userInfo.division_status) || (!userInfo.is_division && !userInfo.is_agent)">
+					<view v-if="userInfo.is_division">邀请码：{{userInfo.division_invite}}</view>
+					<view v-if="!userInfo.is_division && !userInfo.is_agent">
+						<navigator url='/pages/annex/settled/index' hover-class="none">
+							<view>代理商申请</view>
+						</navigator>
+					</view>
+				</view> -->
 			</view>
 			<!-- #ifdef APP-PLUS || H5 -->
 			<navigator url="/pages/users/user_cash/index" hover-class="none" class='bnt bg-color'>立即提现</navigator>
@@ -218,14 +226,14 @@
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
 		width: 100%;
-		height: 400rpx;
+		height: 480rpx;
 		background-color: var(--view-theme);
 	}
 
 	.my-promotion .header .name {
 		font-size: 30rpx;
 		color: #fff;
-		padding-top: 57rpx;
+		padding-top: 37rpx;
 		position: relative;
 
 		.distribution {
@@ -256,30 +264,33 @@
 		.user-msg {
 			display: flex;
 			align-items: center;
+			justify-content: center;
+			flex-direction: column;
 
 			.nickname {
-				font-size: 28rpx;
+				font-size: 32rpx;
+				margin: 10rpx 0;
 			}
 
 			.level {
-				border: 1px solid #fff;
-				font-size: 32rpx;
-				padding: 2rpx 8rpx;
+				font-size: 18rpx;
+				padding: 4rpx 10rpx;
+				background: linear-gradient(135deg, var(--view-bntColor) 0%, var(--view-main-over) 100%);
 				border-radius: 6rpx;
-				transform: scale(0.6);
+				transform: scale(0.9);
 				display: flex;
 				align-items: center;
 
 				.icon-xiangyou {
+					transform: scale(0.7);
 					font-size: 28rpx;
 				}
 			}
 
 			image {
-				width: 46rpx;
-				height: 46rpx;
+				width: 100rpx;
+				height: 100rpx;
 				border-radius: 50%;
-				margin-right: 10rpx;
 			}
 		}
 	}
@@ -300,7 +311,7 @@
 	.my-promotion .header .num {
 		text-align: center;
 		color: #fff;
-		margin-top: 28rpx;
+		margin-top: 8rpx;
 		font-size: 90rpx;
 		font-family: 'Guildford Pro';
 	}

template/uni-app/utils/index.js

@@ -76,11 +76,32 @@ export function getCustomer(url) {
 			// #ifdef APP-PLUS
 			plus.runtime.openURL(res.data.customer_url)
 			// #endif
-			// #ifdef H5
-			// window.open(res.data.customer_url, '_blank')
-			uni.navigateTo({
-				url: `/pages/annex/web_view/index?url=${res.data.customer_url}`
-			});
+			// #ifdef H5 || MP
+			if (res.data.customer_url.indexOf('work.weixin.qq.com') > 0) {
+				// #ifdef H5
+				return window.location.href = res.data.customer_url
+				// #endif			
+				// #ifdef MP
+				uni.openCustomerServiceChat({
+					extInfo: {
+						url: res.data.customer_url
+					},
+					corpId: res.data.customer_corpId,
+					success(res) {},
+					fail(err) {
+						uni.showToast({
+							title: '请先配置企业ID',
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				})
+				// #endif
+			} else {
+				uni.navigateTo({
+					url: `/pages/annex/web_view/index?url=${res.data.customer_url}`
+				});
+			}
 			// #endif
 		}
 	})