diff --git a/components/productConSwiper/index.vue b/components/productConSwiper/index.vue
index 1b918a5..14618ec 100644
--- a/components/productConSwiper/index.vue
+++ b/components/productConSwiper/index.vue
@@ -1,13 +1,14 @@
 <template>
 	<view class='product-bg'>
-		<swiper :indicator-dots="indicatorDots" indicator-active-color="#e93323" :autoplay="autoplay" :circular="circular"
-		 :interval="interval" :duration="duration" @change="change" v-if="isPlay">
+		<swiper :indicator-dots="indicatorDots" indicator-active-color="#e93323" :autoplay="autoplay"
+			:circular="circular" :interval="interval" :duration="duration" @change="change" v-if="isPlay">
 			<!-- #ifndef APP-PLUS -->
 			<swiper-item v-if="videoline && videoline != '' && videoline != 'https:'">
 				<view class="item">
-					<video id="myVideo" :src='videoline && (videoline.substring(0,4) == "http" || videoline.substring(0,5) == "https") ? videoline : ("http:" + videoline)'
-					 objectFit="cover" controls style="width:100%;height:100% " show-mute-btn="true"
-					 auto-pause-if-navigate @ended="endedFun()"></video>
+					<video id="myVideo"
+						:src='videoline && (videoline.substring(0,4) == "http" || videoline.substring(0,5) == "https") ? videoline : ("http:" + videoline)'
+						objectFit="cover" controls style="width:100%;height:100% " show-mute-btn="true"
+						auto-pause-if-navigate @ended="endedFun()"></video>
 					<view class="poster" v-if="controls">
 						<image class="image" :src="videoCoverImg"></image>
 					</view>
@@ -37,9 +38,11 @@
 		</swiper>
 		<!-- #ifdef APP-PLUS -->
 		<view v-if="!isPlay" style="width: 100%; height: 750rpx;">
-			<video id="myVideo" :src='videoline && (videoline.substring(0,4) == "http" || videoline.substring(0,5) == "https") ? videoline : "http:" + videoline'
-			 objectFit="cover" controls style="width:100%;height:100% " show-center-play-btn show-mute-btn="true"
-			 auto-pause-if-navigate :enable-progress-gesture="false" :poster="videoCoverImg" @pause="videoPause" @ended="endedFun()"></video>
+			<video id="myVideo"
+				:src='videoline && (videoline.substring(0,4) == "http" || videoline.substring(0,5) == "https") ? videoline : "http:" + videoline'
+				objectFit="cover" controls style="width:100%;height:100% " show-center-play-btn show-mute-btn="true"
+				auto-pause-if-navigate :enable-progress-gesture="false" :poster="videoCoverImg" @pause="videoPause"
+				@ended="endedFun()"></video>
 
 		</view>
 		<!-- #endif -->
@@ -119,7 +122,7 @@
 				// #ifdef APP-PLUS
 				this.isPlay = false
 				this.videoContext = uni.createVideoContext('myVideo', this);
-				this.$nextTick(()=>{
+				this.$nextTick(() => {
 					this.videoContext.play();
 				})
 				// #endif
@@ -140,15 +143,18 @@
 		height: 750rpx;
 		position: relative;
 	}
+
 	.product-bg swiper {
 		width: 100%;
 		height: 100%;
 		position: relative;
 	}
+
 	.product-bg .slide-image {
 		width: 100%;
 		height: 100%;
 	}
+
 	.product-bg .pages {
 		position: absolute;
 		background-color: #fff;
@@ -161,15 +167,18 @@
 		font-size: 24rpx;
 		color: #050505;
 	}
+
 	#myVideo {
 		width: 100%;
 		height: 100%
 	}
+
 	.product-bg .item {
 		position: relative;
 		width: 100%;
 		height: 100%;
 	}
+
 	.product-bg .item .poster {
 		position: absolute;
 		top: 0;
@@ -178,10 +187,12 @@
 		width: 100%;
 		z-index: 9;
 	}
+
 	.product-bg .item .poster .image {
 		width: 100%;
 		height: 100%;
 	}
+
 	.product-bg .item .stop {
 		position: absolute;
 		top: 50%;
@@ -192,8 +203,9 @@
 		margin-left: -68rpx;
 		z-index: 9;
 	}
+
 	.product-bg .item .stop .image {
 		width: 100%;
 		height: 100%;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/productConSwiper/indexNew.vue b/components/productConSwiper/indexNew.vue
new file mode 100644
index 0000000..6a96c78
--- /dev/null
+++ b/components/productConSwiper/indexNew.vue
@@ -0,0 +1,210 @@
+<template>
+	<view class='product-bg'>
+		<swiper :indicator-dots="indicatorDots" indicator-active-color="#e93323" :autoplay="autoplay" :current='current'
+			:circular="circular" :interval="interval" :duration="duration" @change="change" v-if="isPlay">
+			<!-- #ifndef APP-PLUS -->
+			<swiper-item v-if="videoline && videoline != '' && videoline != 'https:'" v-for="(item,index) in videoline">
+				<view class="item">
+					<video id="myVideo" :src='item' objectFit="cover" style="width:100%;height:100% "
+						show-mute-btn="true" auto-pause-if-navigate @ended="endedFun()"></video>
+					<view class="poster" v-if="controls">
+						<image class="image" :src="videoCoverImg"></image>
+					</view>
+					<view class="stop" v-if="controls" @tap="bindPause" style="width: 100rpx;height: 100rpx;">
+						<!-- <image class="image" src="../../static/images/stop.png"></image> -->
+					</view>
+				</view>
+			</swiper-item>
+			<!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<swiper-item v-if="videoline">
+				<!-- <view class="item">
+					<view class="poster" v-show="controls">
+						<image class="image" :src="videoCoverImg"></image>
+					</view>
+					<view class="stop" v-show="controls" @tap="bindPause">
+						<image class="image" src="../../static/images/stop.png"></image>
+					</view>
+				</view> -->
+			</swiper-item>
+			<!-- #endif -->
+			<block v-for="(item,index) in imgUrls" :key='index'>
+				<swiper-item>
+					<image :src="item" class="slide-image" @click='getpreviewImage(item)' />
+				</swiper-item>
+			</block>
+		</swiper>
+		<!-- #ifdef APP-PLUS -->
+		<view v-if="!isPlay" style="width: 100%; height: 750rpx;">
+			<!-- 	<!-- <video id="myVideo" :src='videoline[current]' objectFit="cover" controls style="width:100%;height:100% "
+				show-center-play-btn show-mute-btn="true" auto-pause-if-navigate :enable-progress-gesture="false"
+				:poster="videoCoverImg" @pause="videoPause" @ended="endedFun()"></video> -->
+			<video id="myVideo1" :src='videoline[current]' objectFit="cover" controls style="width:100%;height:100% "
+				show-center-play-btn show-mute-btn="true" auto-pause-if-navigate :enable-progress-gesture="false"
+				:poster="videoCoverImg" @pause="videoPause" @ended="endedFun()"></video> -->
+		</view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	export default {
+		props: {
+			imgUrls: {
+				type: Array,
+				default: function() {
+					return [];
+				}
+			},
+			videoline: {
+				type: Array,
+				value: ""
+			},
+			videoCoverImg: {
+				type: String,
+			}
+		},
+		data() {
+			return {
+				current: "",
+				indicatorDots: true,
+				circular: true,
+				autoplay: true,
+				interval: 5000,
+				duration: 500,
+				currents: "1",
+				controls: true,
+				isPlay: true,
+				videoContext: ''
+			};
+		},
+		created() {
+
+		},
+		watch: {
+
+		},
+		mounted() {
+			// #ifndef APP-PLUS
+			this.videoContext = uni.createVideoContext('myVideo', this);
+			// #endif
+		},
+		methods: {
+			getpreviewImage: function(item) {
+				uni.previewImage({
+					urls: this.imgUrls,
+					current: item
+				});
+			},
+			videoPause(e) {
+				// #ifdef APP-PLUS
+				this.isPlay = true
+				this.autoplay = true
+				// #endif
+			},
+			bindPause: function() {
+				// #ifndef APP-PLUS
+				this.videoContext.play();
+				this.$set(this, 'controls', false)
+				this.autoplay = false
+				// #endif
+
+				// #ifdef APP-PLUS
+				this.isPlay = false
+				this.videoContext = uni.createVideoContext('myVideo', this);
+				this.$nextTick(() => {
+					this.videoContext.play();
+				})
+				// #endif
+			},
+			change: function(e) {
+				this.$set(this, 'currents', e.detail.current + 1);
+			},
+			endedFun() {
+				this.controls = true
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.product-bg {
+		width: 100%;
+		height: 750rpx;
+		position: relative;
+	}
+
+	.product-bg swiper {
+		width: 100%;
+		height: 100%;
+		position: relative;
+	}
+
+	.product-bg .slide-image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.product-bg .pages {
+		position: absolute;
+		background-color: #fff;
+		height: 34rpx;
+		padding: 0 10rpx;
+		border-radius: 3rpx;
+		right: 30rpx;
+		bottom: 30rpx;
+		line-height: 34rpx;
+		font-size: 24rpx;
+		color: #050505;
+	}
+
+	#myVideo {
+		width: 100%;
+		height: 100%
+	}
+
+	.product-bg .item {
+		position: relative;
+		width: 100%;
+		height: 100%;
+	}
+
+	.product-bg .item .poster {
+		position: absolute;
+		top: 0;
+		left: 0;
+		height: 750rpx;
+		width: 100%;
+		z-index: 9;
+	}
+
+	.product-bg .item .poster .image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.product-bg .item .stop {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		width: 136rpx;
+		height: 136rpx;
+		margin-top: -68rpx;
+		margin-left: -68rpx;
+		z-index: 9;
+	}
+
+	.product-bg .item .stop .image {
+		width: 100%;
+		height: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/admin/goods_details/index.vue b/pages/admin/goods_details/index.vue
index bd2454e..ade3a0d 100644
--- a/pages/admin/goods_details/index.vue
+++ b/pages/admin/goods_details/index.vue
@@ -1,1652 +1,1723 @@
 <template>
-  <view class="product-con">
-    <view v-if="storeInfo && storeInfo.merchant">
-      <scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true" :style='"height:"+height+"px;"'
-        @scroll="scroll">
-        <view id="past0">
-          <productConSwiper :imgUrls="storeInfo.slider_image" :videoCoverImg="videoCoverImg"
-            :videoline="storeInfo.video_link"></productConSwiper>
-          <!--秒杀-->
-          <view v-if="storeInfo.product_type == 1" class='nav acea-row row-between-wrapper'>
-            <view class='money'>￥<text class='num'>{{storeInfo.price}}</text><text
-                class='y-money'>￥{{storeInfo.ot_price}}</text></view>
-            <view class='acea-row row-middle'>
-              <view class='time'>
-                <view>距秒杀结束仅剩</view>
-                <countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '" :minute-text="' : '"
-                  :second-text="' '" :datatime="datatime"></countDown>
-              </view>
-            </view>
-          </view>
-          <!--预售-->
-          <view v-if="storeInfo.product_type == 2" class='wrapper'>
-            <view class='share acea-row row-between row-bottom' style="padding: 0;margin: 0;">
-              <view class='money font-color'>
-                ￥
-                <text class='num'>{{storeInfo.price}}</text>
-                <text class="price_text">预售价</text>
-              </view>
-              <view class='iconfont icon-fenxiang' v-if="comForm != 'admin'"></view>
-            </view>
-            <view class='label acea-row'>
-              <view>市场价:￥{{storeInfo.ot_price || ''}}</view>
-              <view style="margin-left: 30rpx;">已预定:0{{ storeInfo.unit_name }}</view>
-            </view>
-            <view class='introduce line2'>
-              <text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)"
-                class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
-              <text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red">自营</text>
-              {{storeInfo.store_name}}
-            </view>
-            <view class="presell_count">
-              <view>
-                <view>预售活动时间：</view>
-                <view v-if="storeInfo.start_time && storeInfo.p_end_time" class="presell_time">
-                  <view class='iconfont icon-shijian1'></view>
-                  {{ new Date(storeInfo.start_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(storeInfo.start_time.replace(/-/g,"/")).getDate() }}日{{ new Date(storeInfo.start_time.replace(/-/g,"/")).getHours() }}时{{ new Date(storeInfo.start_time.replace(/-/g,"/")).getMinutes()}}分
-                  <span class='area_line'>~</span>
-                  <view class='iconfont icon-shijian1'></view>
-                  {{ new Date(storeInfo.p_end_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(storeInfo.p_end_time.replace(/-/g,"/")).getDate() }}日{{ new Date(storeInfo.p_end_time.replace(/-/g,"/")).getHours() }}时{{ new Date(storeInfo.p_end_time.replace(/-/g,"/")).getMinutes()}}分
-                </view>
-              </view>
-              <view v-if="storeInfo.presell_type === 2">
-                <view>支付尾款时间：</view>
-                <view v-if="storeInfo.final_start_time && storeInfo.final_end_time" class="presell_time">
-                  <view class='iconfont icon-shijian1'></view>
-                  {{ new Date(storeInfo.final_start_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(storeInfo.final_start_time.replace(/-/g,"/")).getDate() }}日{{ new Date(storeInfo.final_start_time.replace(/-/g,"/")).getHours() }}时{{ new Date(storeInfo.final_start_time.replace(/-/g,"/")).getMinutes()}}分
-                  <span class='area_line'>~</span>
-                  <view class='iconfont icon-shijian1'></view>
-                  {{ new Date(storeInfo.final_end_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(storeInfo.final_end_time.replace(/-/g,"/")).getDate() }}日{{ new Date(storeInfo.final_end_time.replace(/-/g,"/")).getHours() }}时{{ new Date(storeInfo.final_end_time.replace(/-/g,"/")).getMinutes()}}分
-                </view>
-              </view>
-              <view v-if="storeInfo.delivery_type == 1">
-                <view v-if="storeInfo.presell_type==1">支付成功后{{ storeInfo.delivery_day }}天内发货</view>
-                <view v-if="storeInfo.presell_type==2">付尾款成功后{{ storeInfo.delivery_day }}天内发货</view>
-              </view>
-              <view v-if="storeInfo.delivery_type == 2">预售结束后{{ storeInfo.delivery_day }}天内发货</view>
-            </view>
-          </view>
-          <!--拼团-->
-          <view v-if="storeInfo.product_type == 4" class='wrapper'>
-            <view class='share acea-row row-between row-bottom' style="padding: 0;margin: 0;">
-              <view class='money '>
-                <text class="font-color">￥<text class='num'>{{storeInfo.price}}</text></text>
-                <text class="font-gray orig_price">￥<text class='num'
-                    style="font-size: 28rpx;">{{storeInfo.ot_price}}</text></text>
-              </view>
+	<view class="product-con">
+		<view v-if="storeInfo && storeInfo.merchant">
+			<scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true"
+				:style='"height:"+height+"px;"' @scroll="scroll">
+				<view id="past0">
+					<productConSwiper :imgUrls="imgUrls" :videoCoverImg="videoCoverImg" :videoline="videoline">
+					</productConSwiper>
+					<!--秒杀-->
+					<view v-if="storeInfo.product_type == 1" class='nav acea-row row-between-wrapper'>
+						<view class='money'>￥<text class='num'>{{storeInfo.price}}</text><text
+								class='y-money'>￥{{storeInfo.ot_price}}</text></view>
+						<view class='acea-row row-middle'>
+							<view class='time'>
+								<view>距秒杀结束仅剩</view>
+								<countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '"
+									:minute-text="' : '" :second-text="' '" :datatime="datatime"></countDown>
+							</view>
+						</view>
+					</view>
+					<!--预售-->
+					<view v-if="storeInfo.product_type == 2" class='wrapper'>
+						<view class='share acea-row row-between row-bottom' style="padding: 0;margin: 0;">
+							<view class='money font-color'>
+								￥
+								<text class='num'>{{storeInfo.price}}</text>
+								<text class="price_text">预售价</text>
+							</view>
+							<view class='iconfont icon-fenxiang' v-if="comForm != 'admin'"></view>
+						</view>
+						<view class='label acea-row'>
+							<view>市场价:￥{{storeInfo.ot_price || ''}}</view>
+							<view style="margin-left: 30rpx;">已预定:0{{ storeInfo.unit_name }}</view>
+						</view>
+						<view class='introduce line2'>
+							<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)"
+								class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
+							<text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)"
+								class="font-bg-red">自营</text>
+							{{storeInfo.store_name}}
+						</view>
+						<view class="presell_count">
+							<view>
+								<view>预售活动时间：</view>
+								<view v-if="storeInfo.start_time && storeInfo.p_end_time" class="presell_time">
+									<view class='iconfont icon-shijian1'></view>
+									{{ new Date(storeInfo.start_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(storeInfo.start_time.replace(/-/g,"/")).getDate() }}日{{ new Date(storeInfo.start_time.replace(/-/g,"/")).getHours() }}时{{ new Date(storeInfo.start_time.replace(/-/g,"/")).getMinutes()}}分
+									<span class='area_line'>~</span>
+									<view class='iconfont icon-shijian1'></view>
+									{{ new Date(storeInfo.p_end_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(storeInfo.p_end_time.replace(/-/g,"/")).getDate() }}日{{ new Date(storeInfo.p_end_time.replace(/-/g,"/")).getHours() }}时{{ new Date(storeInfo.p_end_time.replace(/-/g,"/")).getMinutes()}}分
+								</view>
+							</view>
+							<view v-if="storeInfo.presell_type === 2">
+								<view>支付尾款时间：</view>
+								<view v-if="storeInfo.final_start_time && storeInfo.final_end_time"
+									class="presell_time">
+									<view class='iconfont icon-shijian1'></view>
+									{{ new Date(storeInfo.final_start_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(storeInfo.final_start_time.replace(/-/g,"/")).getDate() }}日{{ new Date(storeInfo.final_start_time.replace(/-/g,"/")).getHours() }}时{{ new Date(storeInfo.final_start_time.replace(/-/g,"/")).getMinutes()}}分
+									<span class='area_line'>~</span>
+									<view class='iconfont icon-shijian1'></view>
+									{{ new Date(storeInfo.final_end_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(storeInfo.final_end_time.replace(/-/g,"/")).getDate() }}日{{ new Date(storeInfo.final_end_time.replace(/-/g,"/")).getHours() }}时{{ new Date(storeInfo.final_end_time.replace(/-/g,"/")).getMinutes()}}分
+								</view>
+							</view>
+							<view v-if="storeInfo.delivery_type == 1">
+								<view v-if="storeInfo.presell_type==1">支付成功后{{ storeInfo.delivery_day }}天内发货</view>
+								<view v-if="storeInfo.presell_type==2">付尾款成功后{{ storeInfo.delivery_day }}天内发货</view>
+							</view>
+							<view v-if="storeInfo.delivery_type == 2">预售结束后{{ storeInfo.delivery_day }}天内发货</view>
+						</view>
+					</view>
+					<!--拼团-->
+					<view v-if="storeInfo.product_type == 4" class='wrapper'>
+						<view class='share acea-row row-between row-bottom' style="padding: 0;margin: 0;">
+							<view class='money '>
+								<text class="font-color">￥<text class='num'>{{storeInfo.price}}</text></text>
+								<text class="font-gray orig_price">￥<text class='num'
+										style="font-size: 28rpx;">{{storeInfo.ot_price}}</text></text>
+							</view>
 
-              <view class='iconfont icon-fenxiang' v-if="comForm != 'admin'"></view>
-            </view>
+							<view class='iconfont icon-fenxiang' v-if="comForm != 'admin'"></view>
+						</view>
 
-            <view class='introduce line2'>
-              <text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)"
-                class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
-              <text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red">自营</text>
-              {{storeInfo.store_name}}
-            </view>
-            <view class='label acea-row row-between-wrapper'>
-              <view>类型:{{storeInfo.buying_count_num ? storeInfo.buying_count_num : 0}}人团</view>
-              <view>库存:{{storeInfo.stock ? storeInfo.stock : 0}}</view>
-              <view>已拼:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
-              </view>
-            </view>
+						<view class='introduce line2'>
+							<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)"
+								class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
+							<text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)"
+								class="font-bg-red">自营</text>
+							{{storeInfo.store_name}}
+						</view>
+						<view class='label acea-row row-between-wrapper'>
+							<view>类型:{{storeInfo.buying_count_num ? storeInfo.buying_count_num : 0}}人团</view>
+							<view>库存:{{storeInfo.stock ? storeInfo.stock : 0}}</view>
+							<view>
+								已拼:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
+							</view>
+						</view>
 
-          </view>
-          <view v-if="storeInfo.product_type == 4" class="combination_wrapper">
-            <view class='notice acea-row row-middle' v-if="itemNew.length">
-              <view class='num font-color'>
-                <text class='iconfont icon-laba'></text>
-                已拼{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}<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.nickname ? item.nickname : ''}}拼团成功</view>
-                    </swiper-item>
-                  </block>
-                </swiper>
-              </view>
-            </view>
-            <view class='assemble' v-if="pink.length" :style="itemNew.length ? '' : 'margin-top: 20rpx;'">
-              <view class='item acea-row row-between-wrapper' v-for='(item,index) in pink' :key='index'
-                v-if="index < AllIndex && pink.length>0">
-                <view class='pictxt acea-row row-between-wrapper'>
-                  <view class='pictrue'>
-                    <image :src='item.initiator.avatar ? item.initiator.avatar : "/static/images/f.png"'></image>
-                  </view>
-                  <view class='text line1'>{{ item.initiator.nickname ? item.initiator.nickname : ""}}</view>
-                </view>
-                <view class='right acea-row row-middle'>
-                  <view>
-                    <view class='lack'>还差<text
-                        class='font-color'>{{item.buying_count_num - item.yet_buying_num}}</text>人成团</view>
-                    <view class='time'>
-                      剩余
-                      <count-down :justifyLeft="justifyLeft" :is-day="false" :tip-text="' '" :day-text="' '"
-                        :hour-text="':'" :minute-text="':'" :second-text="' '" :datatime="item.end_time"></count-down>
-                    </view>
-                  </view>
-                  <navigator hover-class='none'
-                    :url="'/pages/activity/combination_status/index?id='+item.group_buying_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>
-            <view class='playWay'>
-              <view class='title acea-row row-between-wrapper'>
-                <view>拼团玩法</view>
-              </view>
-              <view class='way acea-row row-middle'>
-                <view class='item'>
-                  <text class='num'>①</text>
-                  <text class="way_text">开团/参团</text>
-                </view>
-                <view class='iconfont icon-arrow'></view>
-                <view class='item'>
-                  <text class='num'>②</text>
-                  <text class="way_text">邀请好友</text>
-                </view>
-                <view class='iconfont icon-arrow'></view>
-                <view class='item'>
-                  <view>
-                    <text class='num'>③</text>
-                    <text class="way_text">满员发货</text>
-                  </view>
-                  <view class='tip'>不满自动退款</view>
-                </view>
-              </view>
-            </view>
-          </view>
-          <view v-if="storeInfo.product_type == 0 || storeInfo.product_type == 3 || storeInfo.product_type == 1"
-            class='wrapper'>
-            <view v-if="storeInfo.product_type != 1" class='share acea-row row-between row-bottom'
-              style="padding: 0;margin: 0;">
-              <view class='money font-color'>
-                ￥
-                <text class='num'>{{storeInfo.price}}</text>
-              </view>
-              <view class='iconfont icon-fenxiang' v-if="comForm != 'admin'"></view>
-            </view>
-            <view class='introduce line2'>
-              <text v-if="storeInfo.merchant.type_name" class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
-              <text v-else-if="storeInfo.merchant.is_trader"
-                class="font-bg-red bg">自营</text>{{storeInfo.store_name ? storeInfo.store_name : ''}}
-            </view>
-            <view class='label acea-row row-between-wrapper' style="padding-bottom: 10px">
-              <view v-if="storeInfo.product_type != 3">原价:￥{{storeInfo.ot_price ? storeInfo.ot_price : ''}}</view>
-              <view>库存:{{storeInfo.stock ? storeInfo.stock : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
-              </view>
-              <view>销量:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
-              </view>
-            </view>
-          </view>
-          <view class='attribute acea-row row-between-wrapper' @click="selecAttr">
-            <view class="acea-row row-between-wrapper">{{attrTxt}}：
-              <text class='atterTxt'>{{attrValue}}</text>
-            </view>
-            <view class='iconfont icon-jiantou'></view>
-          </view>
-          <!--运费-->
-          <view class='attribute acea-row row-between-wrapper' @click="showShip">
-            <view class="acea-row row-between-wrapper">运费：
-              <text class='atterTxt'>{{shippingValue}}</text>
-            </view>
-            <view class='iconfont icon-jiantou'></view>
-          </view>
-          <!--保障-->
-          <view v-if="guarantee && guarantee.length" class='attribute acea-row row-between-wrapper'
-            @click="showGuaranee">
-            <view class="acea-row row-between-wrapper">保障：
-              <view class="guaranteeAttr">
-                <text class='atterTxt1' :class="item.guarantee_name ? 'hasAttr' : ''" v-for="(item,index) in guarantee">
-                  {{item.guarantee_name ? item.guarantee_name : ''}}
-                </text>
-              </view>
+					</view>
+					<view v-if="storeInfo.product_type == 4" class="combination_wrapper">
+						<view class='notice acea-row row-middle' v-if="itemNew.length">
+							<view class='num font-color'>
+								<text class='iconfont icon-laba'></text>
+								已拼{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}<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.nickname ? item.nickname : ''}}拼团成功</view>
+										</swiper-item>
+									</block>
+								</swiper>
+							</view>
+						</view>
+						<view class='assemble' v-if="pink.length" :style="itemNew.length ? '' : 'margin-top: 20rpx;'">
+							<view class='item acea-row row-between-wrapper' v-for='(item,index) in pink' :key='index'
+								v-if="index < AllIndex && pink.length>0">
+								<view class='pictxt acea-row row-between-wrapper'>
+									<view class='pictrue'>
+										<image
+											:src='item.initiator.avatar ? item.initiator.avatar : "/static/images/f.png"'>
+										</image>
+									</view>
+									<view class='text line1'>{{ item.initiator.nickname ? item.initiator.nickname : ""}}
+									</view>
+								</view>
+								<view class='right acea-row row-middle'>
+									<view>
+										<view class='lack'>还差<text
+												class='font-color'>{{item.buying_count_num - item.yet_buying_num}}</text>人成团
+										</view>
+										<view class='time'>
+											剩余
+											<count-down :justifyLeft="justifyLeft" :is-day="false" :tip-text="' '"
+												:day-text="' '" :hour-text="':'" :minute-text="':'" :second-text="' '"
+												:datatime="item.end_time"></count-down>
+										</view>
+									</view>
+									<navigator hover-class='none'
+										:url="'/pages/activity/combination_status/index?id='+item.group_buying_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>
+						<view class='playWay'>
+							<view class='title acea-row row-between-wrapper'>
+								<view>拼团玩法</view>
+							</view>
+							<view class='way acea-row row-middle'>
+								<view class='item'>
+									<text class='num'>①</text>
+									<text class="way_text">开团/参团</text>
+								</view>
+								<view class='iconfont icon-arrow'></view>
+								<view class='item'>
+									<text class='num'>②</text>
+									<text class="way_text">邀请好友</text>
+								</view>
+								<view class='iconfont icon-arrow'></view>
+								<view class='item'>
+									<view>
+										<text class='num'>③</text>
+										<text class="way_text">满员发货</text>
+									</view>
+									<view class='tip'>不满自动退款</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view
+						v-if="storeInfo.product_type == 0 || storeInfo.product_type == 3 || storeInfo.product_type == 1"
+						class='wrapper'>
+						<view v-if="storeInfo.product_type != 1" class='share acea-row row-between row-bottom'
+							style="padding: 0;margin: 0;">
+							<view class='money font-color'>
+								￥
+								<text class='num'>{{storeInfo.price}}</text>
+							</view>
+							<view class='iconfont icon-fenxiang' v-if="comForm != 'admin'"></view>
+						</view>
+						<view class='introduce line2'>
+							<text v-if="storeInfo.merchant.type_name"
+								class="font-bg-red">{{storeInfo.merchant.type_name}}</text>
+							<text v-else-if="storeInfo.merchant.is_trader"
+								class="font-bg-red bg">自营</text>{{storeInfo.store_name ? storeInfo.store_name : ''}}
+						</view>
+						<view class='label acea-row row-between-wrapper' style="padding-bottom: 10px">
+							<view v-if="storeInfo.product_type != 3">
+								原价:￥{{storeInfo.ot_price ? storeInfo.ot_price : ''}}</view>
+							<view>
+								库存:{{storeInfo.stock ? storeInfo.stock : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
+							</view>
+							<view>
+								销量:{{storeInfo.sales ? storeInfo.sales : 0}}{{storeInfo.unit_name ? storeInfo.unit_name : ''}}
+							</view>
+						</view>
+					</view>
+					<view class='attribute acea-row row-between-wrapper' @click="selecAttr">
+						<view class="acea-row row-between-wrapper">{{attrTxt}}：
+							<text class='atterTxt'>{{attrValue}}</text>
+						</view>
+						<view class='iconfont icon-jiantou'></view>
+					</view>
+					<!--运费-->
+					<view class='attribute acea-row row-between-wrapper' @click="showShip">
+						<view class="acea-row row-between-wrapper">运费：
+							<text class='atterTxt'>{{shippingValue}}</text>
+						</view>
+						<view class='iconfont icon-jiantou'></view>
+					</view>
+					<!--保障-->
+					<view v-if="guarantee && guarantee.length" class='attribute acea-row row-between-wrapper'
+						@click="showGuaranee">
+						<view class="acea-row row-between-wrapper">保障：
+							<view class="guaranteeAttr">
+								<text class='atterTxt1' :class="item.guarantee_name ? 'hasAttr' : ''"
+									v-for="(item,index) in guarantee">
+									{{item.guarantee_name ? item.guarantee_name : ''}}
+								</text>
+							</view>
 
-            </view>
-            <view class='iconfont icon-jiantou'></view>
-          </view>
-          <!--定金预售流程-->
-          <view v-if="storeInfo.presell_type === 2" class='acea-row row-between-wrapper wrapper presell_process'>
-            <view>流程：
-              <view class='process_count'>
-                <view class="process_line"></view>
-                <span class="text_line text_line1"><text>定金</text></span>
-                <span class="text_line text_line2"><text>尾款</text></span>
-                <span class="text_line text_line3"><text>发货</text></span>
-              </view>
-            </view>
-          </view>
-        </view>
-        <!-- 商铺信息 -->
-        <view class="store-wrapper" v-if="storeInfo.merchant && hide_mer_status !=1">
-          <view class="store-hd">
-            <view class="store-info">
-              <view class="logo">
-                <image :src="storeInfo.merchant.mer_avatar" mode=""></image>
-              </view>
-              <view class="info">
-                <view class="name">{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}
-                  <text v-if="storeInfo.merchant.type_name"
-                    class="font-bg-red ml8">{{storeInfo.merchant.type_name}}</text>
-                  <text v-else-if="storeInfo.merchant.is_trader" class="font-bg-red ml8">自营</text>
-                </view>
-                <view v-if="storeInfo.merchant.care_count" class="txt">
-                  {{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
-                </view>
-                <view v-else class="txt">0人关注</view>
-              </view>
-            </view>
-            <view class="score-wrapper">
-              <view class="item">
-                商品描述<text>{{storeInfo.merchant.product_score}}</text>
-              </view>
-              <view class="item">
-                卖家服务<text>{{storeInfo.merchant.service_score}}</text>
-              </view>
-              <view class="item">
-                物流服务<text>{{storeInfo.merchant.postage_score}}</text>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view class='product-intro' id="past3">
-          <view class='title'>产品介绍</view>
-          <!-- #ifndef APP-PLUS -->
-          <jyf-parser v-if="description.type == 0 && typeof description.content == 'string'" :domain='domain'
-          	:html="description.content.replace(/<br\/>/ig, '')" ref="article"
-          	:tag-style="tagStyle"></jyf-parser>
-          <!-- #endif -->
-          <!-- #ifdef APP-PLUS -->
-          <view v-if="description.type == 0 && typeof description.content == 'string'" class="description"
-          	v-html="description.content.replace(/<br\/>/ig, '')"></view>
-          <!-- #endif -->
-          <view v-else class="product_content">
-            <view v-if="description.content && description.content.title" class="product_content_title">{{description.content.title}}
-            </view>
-            <block v-if="description.content && description.content.image">
-            	<image v-for="(item,index) in description.content.image" :key="index" :src="item"  mode="widthFix" style="background-color: #fff;width: 100vw;">
-            	</image>
-            </block>
-          </view>
-        </view>
-        <view style='height:120rpx;'></view>
-      </scroll-view>
-    </view>
-    <!-- 组件 -->
-    <productWindow :attr="attr" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-      @ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'></productWindow>
-    <guaranteeTemplate ref="guartemplate" :guarantee='guarantee' :shipping='shipping'></guaranteeTemplate>
-  </view>
+						</view>
+						<view class='iconfont icon-jiantou'></view>
+					</view>
+					<!--定金预售流程-->
+					<view v-if="storeInfo.presell_type === 2"
+						class='acea-row row-between-wrapper wrapper presell_process'>
+						<view>流程：
+							<view class='process_count'>
+								<view class="process_line"></view>
+								<span class="text_line text_line1"><text>定金</text></span>
+								<span class="text_line text_line2"><text>尾款</text></span>
+								<span class="text_line text_line3"><text>发货</text></span>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 商铺信息 -->
+				<view class="store-wrapper" v-if="storeInfo.merchant && hide_mer_status !=1">
+					<view class="store-hd">
+						<view class="store-info">
+							<view class="logo">
+								<image :src="storeInfo.merchant.mer_avatar" mode=""></image>
+							</view>
+							<view class="info">
+								<view class="name">{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}
+									<text v-if="storeInfo.merchant.type_name"
+										class="font-bg-red ml8">{{storeInfo.merchant.type_name}}</text>
+									<text v-else-if="storeInfo.merchant.is_trader" class="font-bg-red ml8">自营</text>
+								</view>
+								<view v-if="storeInfo.merchant.care_count" class="txt">
+									{{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
+								</view>
+								<view v-else class="txt">0人关注</view>
+							</view>
+						</view>
+						<view class="score-wrapper">
+							<view class="item">
+								商品描述<text>{{storeInfo.merchant.product_score}}</text>
+							</view>
+							<view class="item">
+								卖家服务<text>{{storeInfo.merchant.service_score}}</text>
+							</view>
+							<view class="item">
+								物流服务<text>{{storeInfo.merchant.postage_score}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class='product-intro' id="past3">
+					<view class='title'>产品介绍</view>
+					<!-- #ifndef APP-PLUS -->
+					<jyf-parser v-if="description.type == 0 && typeof description.content == 'string'" :domain='domain'
+						:html="description.content.replace(/<br\/>/ig, '')" ref="article"
+						:tag-style="tagStyle"></jyf-parser>
+					<!-- #endif -->
+					<!-- #ifdef APP-PLUS -->
+					<view v-if="description.type == 0 && typeof description.content == 'string'" class="description"
+						v-html="description.content.replace(/<br\/>/ig, '')"></view>
+					<!-- #endif -->
+					<view v-else class="product_content">
+						<view v-if="description.content && description.content.title" class="product_content_title">
+							{{description.content.title}}
+						</view>
+						<block v-if="description.content && description.content.image">
+							<image v-for="(item,index) in description.content.image" :key="index" :src="item"
+								mode="widthFix" style="background-color: #fff;width: 100vw;">
+							</image>
+						</block>
+					</view>
+				</view>
+				<view style='height:120rpx;'></view>
+			</scroll-view>
+		</view>
+		<!-- 组件 -->
+		<productWindow :attr="attr" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
+			@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'>
+		</productWindow>
+		<guaranteeTemplate ref="guartemplate" :guarantee='guarantee' :shipping='shipping'></guaranteeTemplate>
+	</view>
 </template>
 
 <script>
-  // +----------------------------------------------------------------------
-  // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-  // +----------------------------------------------------------------------
-  // | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-  // +----------------------------------------------------------------------
-  // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-  // +----------------------------------------------------------------------
-  // | Author: CRMEB Team <admin@crmeb.com>
-  // +----------------------------------------------------------------------
-  var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-  import { getProductDetail, getPreviewProDetail } from '@/api/store.js';
-  import productWindow from '@/components/productWindow';
-  import productConSwiper from '@/components/productConSwiper';
-  import { mapGetters } from "vuex";
-  import home from '@/components/home';
-  import countDown from '@/components/countDown';
-  import parser from "@/components/jyf-parser/jyf-parser";
-  import { HTTP_REQUEST_URL } from '@/config/app';
-  import guaranteeTemplate from '@/components/freightGuarantee';
-  import { configMap } from "@/utils";
-  let app = getApp();
-  export default {
-    components: {
-      home,
-      productWindow,
-      productConSwiper,
-      guaranteeTemplate,
-      countDown,
-      "jyf-parser": parser,
-    },
-    data() {
-      let that = this;
-      return {
-        statusBarHeight: statusBarHeight, //系统导航条高度
-        attrTxt: '请选择', //属性页面提示
-        attrValue: '', //已选属性
-        animated: false, //购物车动画
-        product_id: 0, //商品id
-        product_type: 0, //活动类型
-        reply: [], //评论列表
-        storeInfo: {
-          merchant: {}
-        }, //商品详情
-        productValue: [], //系统属性
-        cart_num: 1, //购买数量
-        isAuto: false, //没有授权的不会自动授权
-        isShowAuth: false, //是否隐藏授权
-        isOpen: false, //是否打开属性组件
-        actionSheetHidden: true,
-        storeImage: '', //海报产品图
-        canvasStatus: false, //海报绘图标签
-        posterImage: '', //海报路径
-        posterbackgd: '/static/images/posterbackgd.png',
-        source: '',
-        domain: HTTP_REQUEST_URL,
-        sharePacket: {
-          isState: true, //默认不显示
-        }, //分销商详细
-        // uid: 0, //用户uid
-        circular: false,
-        autoplay: false,
-        interval: 3000,
-        duration: 500,
-        clientHeight: "",
-        systemStore: {}, //门店信息
-        replyChance: 0,
-        CartCount: 0,
-        isDown: true,
-        attr: {
-          cartAttr: false,
-          productAttr: [],
-          productSelect: {}
-        },
-        description: '',
-        navActive: 0,
-        activity: [],
-        retunTop: true, //顶部返回
-        navH: "",
-        navList: [],
-        opacity: 0,
-        scrollY: 0,
-        topArr: [],
-        toView: '',
-        height: 0,
-        heightArr: [],
-        lock: false,
-        scrollTop: 0,
-        tagStyle: {
-          img: 'width:100%;display:block;'
-        },
-        // 动画状态
-        showAnimate: true,
-        codeImg: "",
-        videoCoverImg: "",
-        shipping: "",
-        guarantee: [],
-        guaranteeValue: "",
-        shippingValue: "",
-        uniqueValue: "",
-        datatime: 0,
-        pink_ok_sum: 0,
-        pink: [],
-        AllIndexDefault: 0,
-        AllIndex: 2,
-        maxAllIndex: 0,
-        itemNew: [],
-        indicatorDots: false,
-        preview_key: '',
-        comForm: '' // 页面打开的途径，admin代表时后台的预览
-      };
-    },
-    computed: configMap(['hide_mer_status'], mapGetters(['isLogin', 'uid'])),
-    onLoad(options) {
-      let that = this
-      var pages = getCurrentPages();
-      let curPage = pages[pages.length - 1];
-      if (pages.length <= 1) {
-        that.retunTop = false
-      }
-      let curParam = curPage.options || curPage.$route.query;
-      this.source = curParam.source;
-      this.navH = 96;
-      this.id = options.product_id;
-      this.preview_key = options.preview_key;
-      this.product_type = options.product_type;
-      this.comForm = options.comForm
-      uni.getSystemInfo({
-        success: function(res) {
-          that.height = res.windowHeight
-          //res.windowHeight:获取整个窗口高度为px，*2为rpx；98为头部占据的高度；
-        },
-      });
-      this.getPreviewDetails()
-    },
-    onReady() {},
-    onShow() {
-      // this.getConfig()
-    },
-    methods: {
-      boxStatus(data) {
-        this.showAnimate = data
-      },
-      closeChange: function() {
-        this.$set(this.sharePacket, 'isState', true);
-      },
-      /**查看运费说明*/
-      showShip: function() {
-        this.$refs.guartemplate.showShippingTel();
-      },
-      /**查看服务保障*/
-      showGuaranee: function() {
-        this.$refs.guartemplate.showGuaranteeTel();
-      },
-      goActivity: function(e) {
-        let item = e;
-        if (item.type === "1") {
-          uni.navigateTo({
-            url: `/pages/activity/goods_seckill_details/index?id=${item.id}&time=${item.time}&status=1`
-          });
-        } else if (item.type === "2") {
-          uni.navigateTo({
-            url: `/pages/activity/goods_bargain_details/index?id=${item.id}&bargain=${this.uid}`
-          });
-        } else {
-          uni.navigateTo({
-            url: `/pages/activity/goods_combination_details/index?id=${item.id}`
-          });
-        }
-      },
-      /**
-       * 购物车手动填写
-       *
-       */
-      iptCartNum: function(e) {
-        this.$set(this.attr.productSelect, 'cart_num', e);
-      },
-      tap: function(index) {
-        var id = "past" + index;
-        var index = index;
-        var that = this;
-        this.$set(this, 'toView', id);
-        this.$set(this, 'navActive', index);
-        this.$set(this, 'lock', true);
-        this.$set(this, 'scrollTop', index > 0 ? that.topArr[index] - (app.globalData.navHeight / 2) : that.topArr[
-          index]);
-      },
-      scroll: function(e) {
-        var that = this,
-          scrollY = e.detail.scrollTop;
-        var opacity = scrollY / 200;
-        opacity = opacity > 1 ? 1 : opacity;
-        that.$set(that, 'showAnimate', false);
-        that.$set(that, 'opacity', opacity);
-        that.$set(that, 'scrollY', scrollY);
-        if (that.lock) {
-          that.$set(that, 'lock', false)
-          return;
-        }
-        for (var i = 0; i < that.topArr.length; i++) {
-          if (scrollY < that.topArr[i] - (app.globalData.navHeight / 2) + that.heightArr[i]) {
-            that.$set(that, 'navActive', i)
-            break
-          }
-        }
-      },
-      // 微信登录回调
-      onLoadFun: function(e) {},
-      /**
-       * 购物车数量加和数量减
-       *
-       */
-      ChangeCartNum: function(changeValue) {},
-      attrVal(val) {
-        this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
-        .indexn]);
-      },
-      /**
-       * 属性变动赋值
-       *
-       */
-      ChangeAttr: function(res) {
-        let productSelect = this.productValue[res];
-        if (productSelect) this.$set(this, "uniqueValue", productSelect.unique);
-        if (productSelect && productSelect.stock > 0) {
-          this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.storeInfo
-            .image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "stock", productSelect.stock);
-          this.$set(this.attr.productSelect, "unique", productSelect.unique);
-          this.$set(this, "uniqueValue", productSelect.unique);
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "attrValue", res);
-          this.$set(this, "attrTxt", "已选择");
-        } else {
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", 0);
-          this.$set(this.attr.productSelect, "stock", 0);
-          this.$set(this.attr.productSelect, "unique", "");
-          this.$set(this.attr.productSelect, "cart_num", 0);
-          this.$set(this, "attrValue", "");
-          this.$set(this, "attrTxt", "请选择");
-        }
-      },
-      setClientHeight: function() {
-        let that = this;
-        let view = uni.createSelectorQuery().in(this).select("#list0");
-        view.fields({
-          size: true,
-        }, data => {
-          that.$set(that, 'clientHeight', data.height + 20)
-        }).exec();
-      },
-      /**
-       * 获取产品详情
-       *
-       */
-      getGoodsDetails: function() {
-        uni.showLoading({
-          title: '加载中',
-          mask: true
-        });
-        let that = this;
-        getProductDetail({ id: that.id, product_type: that.product_type }).then(res => {
-          uni.hideLoading();
-          let storeInfo = res.data;
-          if (storeInfo.video_link && storeInfo.slider_image.length > 1) {
-            this.videoCoverImg = storeInfo.slider_image[0]
-            storeInfo.slider_image.splice(0, 1)
-          } else if (storeInfo.video_link && storeInfo.slider_image.length === 1) {
-            this.videoCoverImg = storeInfo.slider_image[0]
-          }
-          that.$set(that, 'storeInfo', storeInfo);
-          that.$set(that, 'description', storeInfo.content);
-          if(typeof that.description.content == 'string'){
-            try{
-              that.description.content = JSON.parse(that.description.content);
-            }catch(e){
-              console.log(e);
-            }
-          }
-          if (that.description.type == 0 && typeof that.description.content == 'string') {
-          	that.description.content = that.description.content.replace(
-          		/<img/gi,
-          		'<img style="max-width:100%;height:auto;float:left;display:block" '
-          	);
-          	that.description.content = that.description.content.replace(
-          		/<video/gi,
-          		'<video style="width:100%;height:300px;display:block" '
-          	);
-          }
-          that.$set(that, 'reply', res.data.topReply ? [res.data.topReply] : []);
-          that.$set(that.attr, 'productAttr', res.data.attr);
-          that.$set(that, 'productValue', res.data.sku);
-          that.$set(that.sharePacket, 'priceName', res.data.priceName);
-          that.$set(that.sharePacket, 'max', res.data.max_extension);
-          that.$set(that.sharePacket, 'min', res.data.min_extension);
-          that.$set(that, 'systemStore', res.data.system_store);
-          that.$set(that, 'PromotionCode', storeInfo.code_base);
-          that.$set(that, 'activity', res.data.activity ? res.data.activity : []);
-          that.$set(that, 'shippingValue', res.data.temp ? res.data.temp.name : '');
-          that.$set(that, 'guaranteeValue', res.data.guarantee ? res.data.guarantee.template_name : '');
-          that.$set(that, 'guarantee', res.data.guaranteeTemplate ? res.data.guaranteeTemplate : []);
-          that.$set(that, 'shipping', res.data.temp ? res.data.temp.info : '');
-          uni.setNavigationBarTitle({
-            title: storeInfo.store_name.substring(0, 7) + "..."
-          })
-          that.$set(that, 'storeImage', that.storeInfo.image);
-          setTimeout(function() {
-            that.infoScroll();
-          }, 500);
-          that.DefaultSelect();
-        }).catch(err => {
-          //状态异常返回上级页面
-          return that.$util.Tips({
-            title: err
-          }, {
-            tab: 3,
-            url: 1
-          });
-        })
-      },
-      /*获取预览商品详情*/
-      getPreviewDetails() {
-        uni.showLoading({
-          title: '加载中',
-          mask: true
-        });
-        let that = this;
-        let params = that.preview_key ? { key: that.preview_key } : { id: that.id, product_type: that.product_type }
-        getPreviewProDetail(params).then(res => {
-          uni.hideLoading();
-          let storeInfo = res.data;
-          if (storeInfo.video_link && storeInfo.slider_image.length > 1) {
-            this.videoCoverImg = storeInfo.slider_image[0]
-            storeInfo.slider_image.splice(0, 1)
-          } else if (storeInfo.video_link && storeInfo.slider_image.length === 1) {
-            this.videoCoverImg = storeInfo.slider_image[0]
-          }
-          that.$set(that, 'storeInfo', storeInfo);
-          that.$set(that, 'description', storeInfo.content);
-          if(typeof that.description.content == 'string'){
-            try{
-              that.description.content = JSON.parse(that.description.content);
-            }catch(e){
-              console.log(e);
-            }
-          }
-          if (that.description.type == 0 && typeof that.description.content == 'string') {
-          	that.description.content = that.description.content.replace(
-          		/<img/gi,
-          		'<img style="max-width:100%;height:auto;float:left;display:block" '
-          	);
-          	that.description.content = that.description.content.replace(
-          		/<video/gi,
-          		'<video style="width:100%;height:300px;display:block" '
-          	);
-          }
-          that.$set(that.description, 'type', storeInfo.content.type || 0);
-          that.$set(that, 'reply', res.data.topReply ? [res.data.topReply] : []);
-          that.$set(that.attr, 'productAttr', res.data.attr);
-          that.$set(that, 'productValue', res.data.sku);
-          that.$set(that.sharePacket, 'priceName', res.data.priceName);
-          that.$set(that.sharePacket, 'max', res.data.max_extension);
-          that.$set(that.sharePacket, 'min', res.data.min_extension);
-          that.$set(that, 'systemStore', res.data.system_store);
-          that.$set(that, 'PromotionCode', storeInfo.code_base);
-          that.$set(that, 'activity', res.data.activity ? res.data.activity : []);
-          that.$set(that, 'shippingValue', res.data.temp ? res.data.temp.name : '');
-          that.$set(that, 'guaranteeValue', res.data.guarantee ? res.data.guarantee.template_name : '');
-          that.$set(that, 'guarantee', res.data.guaranteeTemplate ? res.data.guaranteeTemplate : []);
-          that.$set(that, 'shipping', res.data.temp ? res.data.temp.info : '');
-          that.$set(that, 'datatime', storeInfo.stop ? Number(storeInfo.stop) : 0);
-          uni.setNavigationBarTitle({
-            title: storeInfo.store_name.substring(0, 7) + "..."
-          })
-          that.$set(that, 'storeImage', that.storeInfo.image);
-          setTimeout(function() {
-            that.infoScroll();
-          }, 500);
-          that.DefaultSelect();
-        }).catch(err => {
-          //状态异常返回上级页面
-          return that.$util.Tips({
-            title: err
-          }, {
-            tab: 3,
-            url: 1
-          });
-        })
-      },
-      infoScroll: function() {
-        var that = this,
-          topArr = [],
-          heightArr = [];
-        for (var i = 0; i < that.navList.length; i++) { //productList
-          //获取元素所在位置
-          var query = uni.createSelectorQuery().in(this);
-          var idView = "#past" + i;
-          query.select(idView).boundingClientRect();
-          query.exec(function(res) {
-            var top = res[0].top;
-            var height = res[0].height;
-            topArr.push(top);
-            heightArr.push(height);
-            that.$set(that, 'topArr', topArr);
-            that.$set(that, 'heightArr', heightArr);
-          });
-        };
-      },
-      /**
-       * 默认选中属性
-       *
-       */
-      DefaultSelect: function() {
-        let productAttr = this.attr.productAttr;
-        let value = [];
-        let arr = []
-        let unSortArr = []
-        for (var key in this.productValue) {
-          if (this.productValue[key].stock > 0) {
-            value = this.attr.productAttr.length ? key.split(",") : [];
-            break;
-          }
-        }
-        for (let i = 0; i < productAttr.length; i++) {
-          this.$set(productAttr[i], "index", value[i]);
-        }
-        let productSelect = this.productValue[value.join(",")];
-        if (productSelect && productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.store_name
-          );
-          this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.storeInfo
-            .image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "stock", productSelect.stock);
-          this.$set(this.attr.productSelect, "unique", productSelect.unique);
-          this.$set(this, "uniqueValue", productSelect.unique);
-          this.$set(this, "attrValue", value.join(","));
-          this.$set(this, "attrTxt", "已选择");
-          if (productSelect.stock == 0) {
-            this.$set(this.attr.productSelect, "cart_num", 0);
-          } else {
-            this.$set(this.attr.productSelect, "cart_num", 1);
-          }
-        } else if (!productSelect && productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.store_name
-          );
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "stock", 0);
-          this.$set(this.attr.productSelect, "unique", "");
-          this.$set(this, "uniqueValue", "");
-          this.$set(this.attr.productSelect, "cart_num", 0);
-          this.$set(this, "attrValue", "");
-          this.$set(this, "attrTxt", "请选择");
-        } else if (!productSelect && !productAttr.length) {
-          this.$set(
-            this.attr.productSelect,
-            "store_name",
-            this.storeInfo.store_name
-          );
-          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-          this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
-          this.$set(this.attr.productSelect, "unique", this.storeInfo.unique || "");
-          this.$set(this, "uniqueValue", this.storeInfo.unique || "");
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "attrValue", "");
-          this.$set(this, "attrTxt", "请选择");
-        } else if (productSelect && !productAttr.length) {
-          this.$set(this.attr.productSelect, "store_name", this.storeInfo.store_name);
-          this.$set(this.attr.productSelect, "image", productSelect.image);
-          this.$set(this.attr.productSelect, "price", productSelect.price);
-          this.$set(this.attr.productSelect, "stock", productSelect.stock);
-          this.$set(this.attr.productSelect, "unique", productSelect.unique);
-          this.$set(this, "uniqueValue", productSelect.unique);
-          this.$set(this, "attrValue", value.join(","));
-          this.$set(this, "attrTxt", "已选择");
-          if (productSelect.stock == 0) {
-            this.$set(this.attr.productSelect, "cart_num", 0);
-          } else {
-            this.$set(this.attr.productSelect, "cart_num", 1);
-          }
-        }
-      },
-      onMyEvent: function() {
-        this.$set(this.attr, 'cartAttr', false);
-        this.$set(this, 'isOpen', false);
-      },
-      /**
-       * 打开属性插件
-       */
-      selecAttr: function() {
-        this.$set(this.attr, 'cartAttr', true);
-        this.$set(this, 'isOpen', true);
-      },
-    },
-  }
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	import {
+		getProductDetail,
+		getPreviewProDetail
+	} from '@/api/store.js';
+	import productWindow from '@/components/productWindow';
+	import productConSwiper from '@/components/productConSwiper/indexNew';
+	import {
+		mapGetters
+	} from "vuex";
+	import home from '@/components/home';
+	import countDown from '@/components/countDown';
+	import parser from "@/components/jyf-parser/jyf-parser";
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import guaranteeTemplate from '@/components/freightGuarantee';
+	import {
+		configMap
+	} from "@/utils";
+	let app = getApp();
+	export default {
+		components: {
+			home,
+			productWindow,
+			productConSwiper,
+			guaranteeTemplate,
+			countDown,
+			"jyf-parser": parser,
+		},
+		data() {
+			let that = this;
+			return {
+				videoline: [],
+				vidioTypeList: ['mp4', 'avi', 'mov', 'wmv', 'mkv', 'flv', 'mpeg', '3gp', 'webm'],
+				statusBarHeight: statusBarHeight, //系统导航条高度
+				attrTxt: '请选择', //属性页面提示
+				attrValue: '', //已选属性
+				animated: false, //购物车动画
+				product_id: 0, //商品id
+				product_type: 0, //活动类型
+				reply: [], //评论列表
+				storeInfo: {
+					merchant: {}
+				}, //商品详情
+				productValue: [], //系统属性
+				cart_num: 1, //购买数量
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				isOpen: false, //是否打开属性组件
+				actionSheetHidden: true,
+				storeImage: '', //海报产品图
+				canvasStatus: false, //海报绘图标签
+				posterImage: '', //海报路径
+				posterbackgd: '/static/images/posterbackgd.png',
+				source: '',
+				domain: HTTP_REQUEST_URL,
+				sharePacket: {
+					isState: true, //默认不显示
+				}, //分销商详细
+				// uid: 0, //用户uid
+				circular: false,
+				autoplay: false,
+				interval: 3000,
+				duration: 500,
+				clientHeight: "",
+				systemStore: {}, //门店信息
+				replyChance: 0,
+				CartCount: 0,
+				isDown: true,
+				attr: {
+					cartAttr: false,
+					productAttr: [],
+					productSelect: {}
+				},
+				description: '',
+				navActive: 0,
+				activity: [],
+				retunTop: true, //顶部返回
+				navH: "",
+				navList: [],
+				opacity: 0,
+				scrollY: 0,
+				topArr: [],
+				toView: '',
+				height: 0,
+				heightArr: [],
+				lock: false,
+				scrollTop: 0,
+				tagStyle: {
+					img: 'width:100%;display:block;'
+				},
+				// 动画状态
+				showAnimate: true,
+				codeImg: "",
+				videoCoverImg: "",
+				shipping: "",
+				guarantee: [],
+				guaranteeValue: "",
+				shippingValue: "",
+				uniqueValue: "",
+				datatime: 0,
+				pink_ok_sum: 0,
+				pink: [],
+				AllIndexDefault: 0,
+				AllIndex: 2,
+				maxAllIndex: 0,
+				itemNew: [],
+				indicatorDots: false,
+				preview_key: '',
+				comForm: '' // 页面打开的途径，admin代表时后台的预览
+			};
+		},
+		computed: configMap(['hide_mer_status'], mapGetters(['isLogin', 'uid'])),
+		onLoad(options) {
+			let that = this
+			var pages = getCurrentPages();
+			let curPage = pages[pages.length - 1];
+			if (pages.length <= 1) {
+				that.retunTop = false
+			}
+			let curParam = curPage.options || curPage.$route.query;
+			this.source = curParam.source;
+			this.navH = 96;
+			this.id = options.product_id;
+			this.preview_key = options.preview_key;
+			this.product_type = options.product_type;
+			this.comForm = options.comForm
+			uni.getSystemInfo({
+				success: function(res) {
+					that.height = res.windowHeight
+					//res.windowHeight:获取整个窗口高度为px，*2为rpx；98为头部占据的高度；
+				},
+			});
+			this.getPreviewDetails()
+		},
+		onReady() {},
+		onShow() {
+			// this.getConfig()
+		},
+		methods: {
+			// 判断
+			getSuffix(url) {
+				const str = url;
+				const lastIndex = str.lastIndexOf(".");
+				if (lastIndex !== -1) {
+					const extension = str.substring(lastIndex + 1);
+					return extension
+				} else {
+					console.log("字符串中没有找到点号。");
+				}
+			},
+			boxStatus(data) {
+				this.showAnimate = data
+			},
+			closeChange: function() {
+				this.$set(this.sharePacket, 'isState', true);
+			},
+			/**查看运费说明*/
+			showShip: function() {
+				this.$refs.guartemplate.showShippingTel();
+			},
+			/**查看服务保障*/
+			showGuaranee: function() {
+				this.$refs.guartemplate.showGuaranteeTel();
+			},
+			goActivity: function(e) {
+				let item = e;
+				if (item.type === "1") {
+					uni.navigateTo({
+						url: `/pages/activity/goods_seckill_details/index?id=${item.id}&time=${item.time}&status=1`
+					});
+				} else if (item.type === "2") {
+					uni.navigateTo({
+						url: `/pages/activity/goods_bargain_details/index?id=${item.id}&bargain=${this.uid}`
+					});
+				} else {
+					uni.navigateTo({
+						url: `/pages/activity/goods_combination_details/index?id=${item.id}`
+					});
+				}
+			},
+			/**
+			 * 购物车手动填写
+			 *
+			 */
+			iptCartNum: function(e) {
+				this.$set(this.attr.productSelect, 'cart_num', e);
+			},
+			tap: function(index) {
+				var id = "past" + index;
+				var index = index;
+				var that = this;
+				this.$set(this, 'toView', id);
+				this.$set(this, 'navActive', index);
+				this.$set(this, 'lock', true);
+				this.$set(this, 'scrollTop', index > 0 ? that.topArr[index] - (app.globalData.navHeight / 2) : that
+					.topArr[
+						index]);
+			},
+			scroll: function(e) {
+				var that = this,
+					scrollY = e.detail.scrollTop;
+				var opacity = scrollY / 200;
+				opacity = opacity > 1 ? 1 : opacity;
+				that.$set(that, 'showAnimate', false);
+				that.$set(that, 'opacity', opacity);
+				that.$set(that, 'scrollY', scrollY);
+				if (that.lock) {
+					that.$set(that, 'lock', false)
+					return;
+				}
+				for (var i = 0; i < that.topArr.length; i++) {
+					if (scrollY < that.topArr[i] - (app.globalData.navHeight / 2) + that.heightArr[i]) {
+						that.$set(that, 'navActive', i)
+						break
+					}
+				}
+			},
+			// 微信登录回调
+			onLoadFun: function(e) {},
+			/**
+			 * 购物车数量加和数量减
+			 *
+			 */
+			ChangeCartNum: function(changeValue) {},
+			attrVal(val) {
+				this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
+					.indexn]);
+			},
+			/**
+			 * 属性变动赋值
+			 *
+			 */
+			ChangeAttr: function(res) {
+				let productSelect = this.productValue[res];
+				if (productSelect) this.$set(this, "uniqueValue", productSelect.unique);
+				if (productSelect && productSelect.stock > 0) {
+					this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this
+						.storeInfo
+						.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this, "uniqueValue", productSelect.unique);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", res);
+					this.$set(this, "attrTxt", "已选择");
+				} else {
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", 0);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+					this.$set(this, "attrTxt", "请选择");
+				}
+			},
+			setClientHeight: function() {
+				let that = this;
+				let view = uni.createSelectorQuery().in(this).select("#list0");
+				view.fields({
+					size: true,
+				}, data => {
+					that.$set(that, 'clientHeight', data.height + 20)
+				}).exec();
+			},
+			/**
+			 * 获取产品详情
+			 *
+			 */
+			getGoodsDetails: function() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
+				let that = this;
+				getProductDetail({
+					id: that.id,
+					product_type: that.product_type
+				}).then(res => {
+					uni.hideLoading();
+					let storeInfo = res.data;
+					if (storeInfo.video_link && storeInfo.slider_image.length > 1) {
+						this.videoCoverImg = storeInfo.slider_image[0]
+						storeInfo.slider_image.splice(0, 1)
+					} else if (storeInfo.video_link && storeInfo.slider_image.length === 1) {
+
+
+					}
+					that.$set(that, 'storeInfo', storeInfo);
+					that.$set(that, 'description', storeInfo.content);
+					if (typeof that.description.content == 'string') {
+						try {
+							that.description.content = JSON.parse(that.description.content);
+						} catch (e) {
+							console.log(e);
+						}
+					}
+					if (that.description.type == 0 && typeof that.description.content == 'string') {
+						that.description.content = that.description.content.replace(
+							/<img/gi,
+							'<img style="max-width:100%;height:auto;float:left;display:block" '
+						);
+						that.description.content = that.description.content.replace(
+							/<video/gi,
+							'<video style="width:100%;height:300px;display:block" '
+						);
+					}
+					that.$set(that, 'reply', res.data.topReply ? [res.data.topReply] : []);
+					that.$set(that.attr, 'productAttr', res.data.attr);
+					that.$set(that, 'productValue', res.data.sku);
+					that.$set(that.sharePacket, 'priceName', res.data.priceName);
+					that.$set(that.sharePacket, 'max', res.data.max_extension);
+					that.$set(that.sharePacket, 'min', res.data.min_extension);
+					that.$set(that, 'systemStore', res.data.system_store);
+					that.$set(that, 'PromotionCode', storeInfo.code_base);
+					that.$set(that, 'activity', res.data.activity ? res.data.activity : []);
+					that.$set(that, 'shippingValue', res.data.temp ? res.data.temp.name : '');
+					that.$set(that, 'guaranteeValue', res.data.guarantee ? res.data.guarantee.template_name :
+						'');
+					that.$set(that, 'guarantee', res.data.guaranteeTemplate ? res.data.guaranteeTemplate : []);
+					that.$set(that, 'shipping', res.data.temp ? res.data.temp.info : '');
+					uni.setNavigationBarTitle({
+						title: storeInfo.store_name.substring(0, 7) + "..."
+					})
+					that.$set(that, 'storeImage', that.storeInfo.image);
+					setTimeout(function() {
+						that.infoScroll();
+					}, 500);
+					that.DefaultSelect();
+				}).catch(err => {
+					//状态异常返回上级页面
+					return that.$util.Tips({
+						title: err
+					}, {
+						tab: 3,
+						url: 1
+					});
+				})
+			},
+			/*获取预览商品详情*/
+			getPreviewDetails() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
+				let that = this;
+				let params = that.preview_key ? {
+					key: that.preview_key
+				} : {
+					id: that.id,
+					product_type: that.product_type
+				}
+				getPreviewProDetail(params).then(res => {
+					this.videoline = []
+					this.imgUrls = []
+					res.data.slider_image.forEach(item => {
+						if (this.vidioTypeList.includes(this.getSuffix(item))) {
+							this.videoline.push(item.replace(/\\/g, ""))
+						} else {
+							this.imgUrls.push(item.replace(/\\/g, ""))
+						}
+					})
+
+
+					// storeInfo.slider_image.filter(item=> !vidioTypeList.includes(getSuffix(item)))
+					uni.hideLoading();
+					let storeInfo = res.data;
+					// console.log(storeInfo, 'sdsdsd')
+					if (storeInfo.video_link && storeInfo.slider_image.length > 1) {
+						this.videoCoverImg = storeInfo.slider_image[0]
+						storeInfo.slider_image.splice(0, 1)
+					} else if (storeInfo.video_link && storeInfo.slider_image.length === 1) {
+						this.videoCoverImg = storeInfo.slider_image[0]
+					}
+					that.$set(that, 'storeInfo', storeInfo);
+					that.$set(that, 'description', storeInfo.content);
+					if (typeof that.description.content == 'string') {
+						try {
+							that.description.content = JSON.parse(that.description.content);
+						} catch (e) {
+							console.log(e);
+						}
+					}
+					if (that.description.type == 0 && typeof that.description.content == 'string') {
+						that.description.content = that.description.content.replace(
+							/<img/gi,
+							'<img style="max-width:100%;height:auto;float:left;display:block" '
+						);
+						that.description.content = that.description.content.replace(
+							/<video/gi,
+							'<video style="width:100%;height:300px;display:block" '
+						);
+					}
+					that.$set(that.description, 'type', storeInfo.content.type || 0);
+					that.$set(that, 'reply', res.data.topReply ? [res.data.topReply] : []);
+					that.$set(that.attr, 'productAttr', res.data.attr);
+					that.$set(that, 'productValue', res.data.sku);
+					that.$set(that.sharePacket, 'priceName', res.data.priceName);
+					that.$set(that.sharePacket, 'max', res.data.max_extension);
+					that.$set(that.sharePacket, 'min', res.data.min_extension);
+					that.$set(that, 'systemStore', res.data.system_store);
+					that.$set(that, 'PromotionCode', storeInfo.code_base);
+					that.$set(that, 'activity', res.data.activity ? res.data.activity : []);
+					that.$set(that, 'shippingValue', res.data.temp ? res.data.temp.name : '');
+					that.$set(that, 'guaranteeValue', res.data.guarantee ? res.data.guarantee.template_name : '');
+					that.$set(that, 'guarantee', res.data.guaranteeTemplate ? res.data.guaranteeTemplate : []);
+					that.$set(that, 'shipping', res.data.temp ? res.data.temp.info : '');
+					that.$set(that, 'datatime', storeInfo.stop ? Number(storeInfo.stop) : 0);
+					uni.setNavigationBarTitle({
+						title: storeInfo.store_name.substring(0, 7) + "..."
+					})
+					that.$set(that, 'storeImage', that.storeInfo.image);
+					setTimeout(function() {
+						that.infoScroll();
+					}, 500);
+					that.DefaultSelect();
+				}).catch(err => {
+					//状态异常返回上级页面
+					return that.$util.Tips({
+						title: err
+					}, {
+						tab: 3,
+						url: 1
+					});
+				})
+			},
+			infoScroll: function() {
+				var that = this,
+					topArr = [],
+					heightArr = [];
+				for (var i = 0; i < that.navList.length; i++) { //productList
+					//获取元素所在位置
+					var query = uni.createSelectorQuery().in(this);
+					var idView = "#past" + i;
+					query.select(idView).boundingClientRect();
+					query.exec(function(res) {
+						var top = res[0].top;
+						var height = res[0].height;
+						topArr.push(top);
+						heightArr.push(height);
+						that.$set(that, 'topArr', topArr);
+						that.$set(that, 'heightArr', heightArr);
+					});
+				};
+			},
+			/**
+			 * 默认选中属性
+			 *
+			 */
+			DefaultSelect: function() {
+				let productAttr = this.attr.productAttr;
+				let value = [];
+				let arr = []
+				let unSortArr = []
+				for (var key in this.productValue) {
+					if (this.productValue[key].stock > 0) {
+						value = this.attr.productAttr.length ? key.split(",") : [];
+						break;
+					}
+				}
+				for (let i = 0; i < productAttr.length; i++) {
+					this.$set(productAttr[i], "index", value[i]);
+				}
+				let productSelect = this.productValue[value.join(",")];
+				if (productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeInfo.store_name
+					);
+					this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this
+						.storeInfo
+						.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this, "uniqueValue", productSelect.unique);
+					this.$set(this, "attrValue", value.join(","));
+					this.$set(this, "attrTxt", "已选择");
+					if (productSelect.stock == 0) {
+						this.$set(this.attr.productSelect, "cart_num", 0);
+					} else {
+						this.$set(this.attr.productSelect, "cart_num", 1);
+					}
+				} else if (!productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeInfo.store_name
+					);
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", "");
+					this.$set(this, "uniqueValue", "");
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+					this.$set(this, "attrTxt", "请选择");
+				} else if (!productSelect && !productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"store_name",
+						this.storeInfo.store_name
+					);
+					this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+					this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+					this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
+					this.$set(this.attr.productSelect, "unique", this.storeInfo.unique || "");
+					this.$set(this, "uniqueValue", this.storeInfo.unique || "");
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", "");
+					this.$set(this, "attrTxt", "请选择");
+				} else if (productSelect && !productAttr.length) {
+					this.$set(this.attr.productSelect, "store_name", this.storeInfo.store_name);
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.unique);
+					this.$set(this, "uniqueValue", productSelect.unique);
+					this.$set(this, "attrValue", value.join(","));
+					this.$set(this, "attrTxt", "已选择");
+					if (productSelect.stock == 0) {
+						this.$set(this.attr.productSelect, "cart_num", 0);
+					} else {
+						this.$set(this.attr.productSelect, "cart_num", 1);
+					}
+				}
+			},
+			onMyEvent: function() {
+				this.$set(this.attr, 'cartAttr', false);
+				this.$set(this, 'isOpen', false);
+			},
+			/**
+			 * 打开属性插件
+			 */
+			selecAttr: function() {
+				this.$set(this.attr, 'cartAttr', true);
+				this.$set(this, 'isOpen', true);
+			},
+		},
+	}
 </script>
 <style scoped lang="scss">
-  .product-con .price_text {
-    display: inline-block;
-    width: 90rpx;
-    height: 30rpx;
-    background: url('@/static/images/presell_text.png');
-    background-size: 100%;
-    color: #FD6523;
-    font-size: 22rpx;
-    line-height: 30rpx;
-    text-align: center;
-    margin-left: 27rpx;
-    position: relative;
-    top: -8rpx;
-  }
-
-  .product-con .presell_count {
-    margin-top: 20rpx;
-    font-size: 26rpx;
-    color: #999999;
-
-    .presell_time {
-      margin: 8rpx 0 4rpx;
-
-      .area_line {
-        display: inline-block;
-        margin: 0 6rpx;
-      }
-    }
-
-    .icon-shijian1 {
-      display: inline-block;
-      margin-right: 4rpx;
-    }
-  }
-
-  .product-con .presell_process {
-    margin-top: 20rpx;
-    height: 110rpx;
-    padding: 4rpx 32rpx 32rpx;
-
-    .process_count {
-      display: inline-block;
-      position: relative;
-      top: 24rpx;
-      left: 40rpx;
-    }
-
-    .process_line {
-      width: 414rpx;
-      height: 2rpx;
-      background: #CCCCCC;
-    }
-
-    .text_line {
-      display: inline-block;
-      width: 25%;
-      color: #CCCCCC;
-      margin-top: 6rpx;
-      position: relative;
-
-      &::after {
-        content: "";
-        display: inline-block;
-        width: 14rpx;
-        height: 14rpx;
-        background: #CCCCCC;
-        border-radius: 100%;
-        position: absolute;
-        top: -14rpx;
-      }
-
-      &.text_line1 {
-        text-align: left;
-        color: #E93323;
-
-        &::after {
-          background: #E93323;
-          left: 0;
-        }
-
-        text {
-          margin-left: -20rpx
-        }
-      }
-
-      &.text_line3 {
-        text-align: right;
-
-        &::after {
-          right: 0;
-        }
-
-        text {
-          margin-right: -20rpx
-        }
-      }
-
-      &.text_line2 {
-        width: 50%;
-        text-align: center;
-
-        &::after {
-          left: 50%;
-          margin-left: -4rpx;
-        }
-      }
-    }
-  }
-
-  /*拼团*/
-  .product-con .notice {
-    width: 100%;
-    height: 62rpx;
-    background-color: #ffedeb;
-    padding: 0 30rpx;
-    box-sizing: border-box;
-  }
-
-  .product-con .notice .num {
-    font-size: 24rpx;
-  }
-
-  .product-con .notice .num .iconfont {
-    font-size: 30rpx;
-    vertical-align: -3rpx;
-    margin-right: 20rpx;
-  }
-
-  .product-con .notice .num .line {
-    color: #282828;
-    margin-left: 15rpx;
-  }
-
-  .product-con .notice .swiper {
-    height: 100%;
-    width: 360rpx;
-    line-height: 62rpx;
-    overflow: hidden;
-    margin-left: 14rpx;
-  }
-
-  .product-con .notice .swiper swiper {
-    height: 100%;
-    width: 100%;
-    overflow: hidden;
-    font-size: 24rpx;
-    color: #282828;
-  }
-
-  .product-con .playWay {
-    background-color: #fff;
-    padding: 0 30rpx;
-    margin-top: 20rpx;
-    font-size: 28rpx;
-    color: #282828;
-  }
-
-  .product-con .playWay .title {
-    height: 86rpx;
-    border-bottom: 1px solid #eee;
-  }
-
-  .product-con .playWay .title .iconfont {
-    margin-left: 13rpx;
-    font-size: 28rpx;
-    color: #717171;
-  }
-
-  .product-con .playWay .way {
-    min-height: 110rpx;
-    font-size: 26rpx;
-    color: #282828;
-  }
-
-  .product-con .playWay .way .iconfont {
-    color: #cdcdcd;
-    font-size: 40rpx;
-    margin: 0 35rpx;
-  }
-
-  .product-con .playWay .way .item .num {
-    font-size: 34rpx;
-    margin-right: 6rpx;
-    width: 17px;
-    height: 28px;
-    display: inline-block;
-    vertical-align: middle;
-  }
-
-  .product-con .playWay .way .item .tip {
-    font-size: 22rpx;
-    color: #a5a5a5;
-    margin-top: -4rpx;
-  }
-
-  .product-con .playWay .way .way_text {
-    position: relative;
-    top: 4rpx;
-  }
-
-  .activity_pin {
-    width: auto;
-    height: 44rpx;
-    line-height: 44rpx;
-    background: linear-gradient(90deg, rgba(233, 51, 35, 1) 0%, rgba(250, 101, 20, 1) 100%);
-    opacity: 1;
-    border-radius: 22rpx;
-    padding: 0 15rpx;
-    margin-left: 19rpx;
-  }
-
-  .activity_miao {
-    width: auto;
-    height: 44rpx;
-    line-height: 44rpx;
-    padding: 0 15rpx;
-    background: linear-gradient(90deg, rgba(250, 102, 24, 1) 0%, rgba(254, 161, 15, 1) 100%);
-    opacity: 1;
-    border-radius: 22rpx;
-    margin-left: 19rpx;
-  }
-
-  .iconfonts {
-    color: #fff !important;
-    font-size: 28rpx;
-  }
-
-  .activity_title {
-    font-size: 24rpx;
-    color: #fff;
-  }
-
-  .activity_kan {
-    width: auto;
-    height: 44rpx;
-    line-height: 44rpx;
-    padding: 0 15rpx;
-    background: linear-gradient(90deg, rgba(254, 159, 15, 1) 0%, rgba(254, 178, 15, 1) 100%);
-    opacity: 1;
-    border-radius: 22rpx;
-    margin-left: 19rpx;
-  }
-
-  .mask {
-    z-index: 300 !important;
-  }
-
-  .head-bar {
-    background: #fff;
-  }
-
-  .generate-posters {
-    width: 100%;
-    height: 170rpx;
-    background-color: #fff;
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    z-index: 388;
-    transform: translate3d(0, 100%, 0);
-    transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-    border-top: 1px solid #eee;
-  }
-
-  .generate-posters.on {
-    transform: translate3d(0, 0, 0);
-  }
-
-  .generate-posters .item {
-    flex: 50%;
-    text-align: center;
-    font-size: 30rpx;
-  }
-
-  .generate-posters .item .iconfont {
-    font-size: 80rpx;
-    color: #5eae72;
-  }
-
-  .generate-posters .item .iconfont.icon-haibao {
-    color: #5391f1;
-  }
-
-  .product-con .mask {
-    z-index: 88;
-  }
-
-  .product-con .footer {
-    padding: 0 20rpx 0 30rpx;
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    box-sizing: border-box;
-    height: 100rpx;
-    background-color: #fff;
-    z-index: 277;
-    border-top: 1px solid #f0f0f0;
-  }
-
-  .product-con .footer .item {
-    font-size: 18rpx;
-    color: #666;
-  }
-
-  .product-con .attribute .atterTxt {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    display: inline-block;
-    width: 400rpx;
-  }
-
-  .product-con .attribute .atterTxt1 {
-    color: #282828;
-
-    &.hasAttr {
-      &:after {
-        content: "";
-        display: inline-block;
-        position: relative;
-        top: -6rpx;
-        margin: 0 6rpx;
-        width: 5rpx;
-        height: 5rpx;
-        background-color: #282828;
-        border-radius: 100%;
-      }
-
-      &:last-child {
-        &:after {
-          display: none;
-        }
-      }
-    }
-  }
-
-  .product-intro .title {
-    font-size: 30rpx;
-    color: #282828;
-    text-align: center;
-  }
-
-  .product-intro .pictures,
-  .product-intro .pictures uni-image,
-  .product-intro .pictures image {
-    width: 100%;
-  }
-
-  .product-con .guaranteeAttr {
-    display: inline-block;
-    width: 560rpx;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-
-  .product-con .superior {
-    background-color: #fff;
-    margin-top: 20rpx;
-    padding-bottom: 10rpx;
-  }
-
-  .product-con .superior .title {
-    height: 98rpx;
-  }
-
-  .product-con .superior .title image {
-    width: 30rpx;
-    height: 30rpx;
-  }
-
-  .product-con .superior .title .titleTxt {
-    margin: 0 20rpx;
-    font-size: 30rpx;
-    background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-  }
-
-  .product-con .superior .slider-banner {
-    width: 690rpx;
-    margin: 0 auto;
-    position: relative;
-  }
-
-  .product-con .superior .slider-banner swiper {
-    height: 100%;
-    width: 100%;
-  }
-
-  .product-con .superior .slider-banner swiper-item {
-    height: 100%;
-  }
-
-  .product-con .superior .slider-banner .list {
-    width: 100%;
-  }
-
-  .product-con .superior .slider-banner .list .item {
-    width: 215rpx;
-    margin: 0 22rpx 30rpx 0;
-    font-size: 26rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item:nth-of-type(3n) {
-    margin-right: 0;
-  }
-
-  .product-con .superior .slider-banner .list .item .pictrue {
-    position: relative;
-    width: 100%;
-    height: 215rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item .pictrue image {
-    width: 100%;
-    height: 100%;
-    border-radius: 6rpx;
-  }
-
-  .product-con .superior .slider-banner .list .item .name {
-    color: #282828;
-    margin-top: 12rpx;
-  }
-
-  .product-con .superior .slider-banner .swiper-pagination-bullet {
-    background-color: #999;
-  }
-
-  .product-con .superior .slider-banner .swiper-pagination-bullet-active {
-    background-color: #e93323;
-  }
-
-  button {
-    padding: 0;
-    margin: 0;
-    line-height: normal;
-    background-color: #fff;
-  }
-
-  button::after {
-    border: 0;
-  }
-
-  action-sheet-item {
-    padding: 0;
-    height: 240rpx;
-    align-items: center;
-    display: flex;
-  }
-
-  .contact {
-    font-size: 16px;
-    width: 50%;
-    background-color: #fff;
-    padding: 8rpx 0;
-    border-radius: 0;
-    margin: 0;
-    line-height: 2;
-  }
-
-  .contact::after {
-    border: none;
-  }
-
-  .action-sheet {
-    font-size: 17px;
-    line-height: 1.8;
-    width: 50%;
-    position: absolute;
-    top: 0;
-    right: 0;
-    padding: 25rpx 0;
-  }
-
-  .canvas {
-    z-index: 300;
-    width: 750px;
-    height: 1190px;
-  }
-
-  .poster-pop {
-    width: 450rpx;
-    height: 714rpx;
-    position: fixed;
-    left: 50%;
-    transform: translateX(-50%);
-    z-index: 399;
-    top: 50%;
-    margin-top: -357rpx;
-  }
-
-  .poster-pop image {
-    width: 100%;
-    height: 100%;
-    display: block;
-  }
-
-  .poster-pop .close {
-    width: 46rpx;
-    height: 75rpx;
-    position: fixed;
-    right: 0;
-    top: -73rpx;
-    display: block;
-  }
-
-  .poster-pop .save-poster {
-    background-color: #df2d0a;
-    font-size: ：22rpx;
-    color: #fff;
-    text-align: center;
-    height: 76rpx;
-    line-height: 76rpx;
-    width: 100%;
-  }
-
-  .poster-pop .keep {
-    color: #fff;
-    text-align: center;
-    font-size: 25rpx;
-    margin-top: 10rpx;
-  }
-
-  .mask {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.6);
-    z-index: 9;
-  }
-
-  .product-con .wrapper {
-    padding: 32rpx;
-    width: 100%;
-    box-sizing: border-box;
-  }
-
-  .product-con .nav {
-    background-image: url('data:image/jpeg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QN/aHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjYtYzE0MiA3OS4xNjA5MjQsIDIwMTcvMDcvMTMtMDE6MDY6MzkgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6NDNlZTU0ZDMtNjEwZS03ZjQ4LWEwODgtNTZlMTZiNzI3NTQwIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjI1NEI2MDUyM0ZDMjExRTk5OTg1REI1OUM1NjNEMUZCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjI1NEI2MDUxM0ZDMjExRTk5OTg1REI1OUM1NjNEMUZCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjUyMDIzNWNmLTIwNGYtOTQ0My05YTBiLWNmMmZlMTJmMDk3NCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0M2VlNTRkMy02MTBlLTdmNDgtYTA4OC01NmUxNmI3Mjc1NDAiLz4gPC9yZGY6RGVzY3JpcHRpb24+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');
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-    width: 100%;
-    height: 100rpx;
-    padding: 0 30rpx;
-    box-sizing: border-box;
-  }
-
-  .product-con .nav .money {
-    font-size: 28rpx;
-    color: #fff;
-  }
-
-  .product-con .nav .money .num {
-    font-size: 48rpx;
-  }
-
-  .product-con .nav .money .y-money {
-    font-size: 26rpx;
-    margin-left: 10rpx;
-    text-decoration: line-through;
-  }
-
-  .product-con .nav .time {
-    font-size: 20rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .product-con .nav .time .timeCon {
-    margin-top: 10rpx;
-  }
-
-  .product-con .nav .time .timeCon .num {
-    padding: 0 7rpx;
-    font-size: 22rpx;
-    color: #ff3d3d;
-    background-color: #fff;
-    border-radius: 2rpx;
-  }
-
-  .product-con .nav .timeState {
-    font-size: 28RPX;
-    color: #FFF;
-  }
-
-  .product-con .nav .iconfont {
-    color: #fff;
-    font-size: 30rpx;
-    margin-left: 20rpx;
-  }
-
-  .pictrue_log {
-    width: 80upx;
-    height: 40upx;
-    border-radius: 6upx 0 12upx 0;
-    line-height: 40upx;
-    font-size: 24upx;
-  }
-
-  .pictrue_log_class {
-    z-index: 3;
-    background: -webkit-gradient(linear, left top, right top, from(rgba(246, 122, 56, 1)), to(rgba(241, 27, 9, 1)));
-    background: linear-gradient(90deg, rgba(246, 122, 56, 1) 0%, rgba(241, 27, 9, 1) 100%);
-    opacity: 1;
-    position: absolute;
-    top: 0;
-    left: 0;
-    color: #fff;
-    text-align: center;
-
-  }
-
-  .navbar .header {
-    height: 96rpx;
-    font-size: 30rpx;
-    color: #050505;
-    background-color: #fff;
-    /* #ifdef MP */
-    padding-right: 95rpx;
-    /* #endif */
-  }
-
-  .navbar .header .item {
-    position: relative;
-    margin: 0 25rpx;
-  }
-
-  .navbar .header .item.on:before {
-    position: absolute;
-    width: 60rpx;
-    height: 5rpx;
-    background-repeat: no-repeat;
-    content: "";
-    background-image: linear-gradient(to right, #ff3366 0%, #ff6533 100%);
-    bottom: -10rpx;
-    left: 50%;
-    margin-left: -28rpx;
-  }
-
-  .navbar {
-    position: fixed;
-    background-color: #fff;
-    top: 0;
-    left: 0;
-    z-index: 99;
-    width: 100%;
-  }
-
-  .navbar .navbarH {
-    position: relative;
-  }
-
-  .navbar .navbarH .navbarCon {
-    position: absolute;
-    bottom: 0;
-    height: 100rpx;
-    width: 100%;
-  }
-
-  .share-box {
-    z-index: 1000;
-    position: fixed;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-
-    image {
-      width: 100%;
-      height: 100%;
-    }
-  }
-
-  .store-wrapper {
-    margin-top: 20rpx;
-    background-color: #fff;
-
-    .store-hd {
-      padding: 30rpx;
-      border-bottom: 1px solid #F5F5F5;
-
-      .store-info {
-        position: relative;
-        display: flex;
-
-        .logo {
-          width: 86rpx;
-          height: 86rpx;
-
-          image {
-            width: 86rpx;
-            height: 86rpx;
-            border-radius: 6rpx;
-          }
-        }
-
-        .info {
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          margin-left: 20rpx;
-
-          .name {
-            font-size: 28rpx;
-            color: #282828;
-            font-weight: bold;
-          }
-
-          .txt {
-            margin-top: 8rpx;
-            color: #666666;
-            font-size: 22rpx;
-          }
-        }
-
-        .link {
-          position: absolute;
-          right: 0;
-          top: 50%;
-          transform: translateY(-50%);
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          width: 114rpx;
-          height: 50rpx;
-          background: linear-gradient(-90deg, $bg-end 0%, $bg-star 100%);
-          border-radius: 25rpx;
-          color: #fff;
-        }
-      }
-
-      .score-wrapper {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 30rpx;
-
-        .item {
-          color: #948D8C;
-          font-size: 26rpx;
-
-          text {
-            margin-left: 10rpx;
-            color: $theme-color;
-          }
-        }
-      }
-    }
-
-    .con-box {
-      padding: 20rpx 0 20rpx 30rpx;
-
-      .title {
-        font-size: 28rpx;
-        color: #282828;
-        margin-bottom: 20rpx;
-      }
-
-      .img-box {
-        display: flex;
-
-        .img-item {
-          width: 206rpx;
-          margin-right: 20rpx;
-
-          /deep/image,
-          /deep/uni-image,
-          /deep/.easy-loadimage {
-            width: 206rpx;
-            height: 206rpx;
-            border-radius: 16rpx;
-          }
-
-          .txt {
-            .title {
-              font-size: 28rpx;
-              color: #282828;
-            }
-
-            .price {
-              color: $theme-color;
-              font-size: 28rpx;
-
-              text {
-                font-size: 20rpx;
-              }
-            }
-          }
-
-        }
-      }
-    }
-  }
-
-  .sys-head {
-    background: transparent;
-  }
-
-  .head-wrapper {
-    z-index: 999;
-    display: flex;
-    align-items: center;
-    position: fixed;
-    left: 30rpx;
-    top: 0;
-    /* #ifdef MP */
-    height: 43px;
-    /* #endif */
-    /* #ifdef H5 */
-    height: 114rpx;
-    /* #endif */
-  }
-
-  .head-menu {
-    display: flex;
-    align-items: center;
-    height: 54rpx;
-    width: 140rpx;
-    background: rgba(0, 0, 0, .25);
-    border-radius: 27rpx;
-
-    .iconfont {
-      flex: 1;
-      text-align: center;
-      color: #fff;
-      box-sizing: border-box;
-
-      &.icon-xiangzuo {
-        border-right: 1px solid #fff;
-      }
-    }
-  }
-  .product_content{
-    background-color: #fff;
-    &_title{
-      width: 100%;
-      height: auto;
-      line-height: 50rpx;
-      padding: 28rpx;
-      word-wrap: break-word;
-      text-align: center;
-    }
-    image{
-      width: 750rpx;
-      // height: 750rpx;
-    }
-  }
+	.product-con .price_text {
+		display: inline-block;
+		width: 90rpx;
+		height: 30rpx;
+		background: url('@/static/images/presell_text.png');
+		background-size: 100%;
+		color: #FD6523;
+		font-size: 22rpx;
+		line-height: 30rpx;
+		text-align: center;
+		margin-left: 27rpx;
+		position: relative;
+		top: -8rpx;
+	}
+
+	.product-con .presell_count {
+		margin-top: 20rpx;
+		font-size: 26rpx;
+		color: #999999;
+
+		.presell_time {
+			margin: 8rpx 0 4rpx;
+
+			.area_line {
+				display: inline-block;
+				margin: 0 6rpx;
+			}
+		}
+
+		.icon-shijian1 {
+			display: inline-block;
+			margin-right: 4rpx;
+		}
+	}
+
+	.product-con .presell_process {
+		margin-top: 20rpx;
+		height: 110rpx;
+		padding: 4rpx 32rpx 32rpx;
+
+		.process_count {
+			display: inline-block;
+			position: relative;
+			top: 24rpx;
+			left: 40rpx;
+		}
+
+		.process_line {
+			width: 414rpx;
+			height: 2rpx;
+			background: #CCCCCC;
+		}
+
+		.text_line {
+			display: inline-block;
+			width: 25%;
+			color: #CCCCCC;
+			margin-top: 6rpx;
+			position: relative;
+
+			&::after {
+				content: "";
+				display: inline-block;
+				width: 14rpx;
+				height: 14rpx;
+				background: #CCCCCC;
+				border-radius: 100%;
+				position: absolute;
+				top: -14rpx;
+			}
+
+			&.text_line1 {
+				text-align: left;
+				color: #E93323;
+
+				&::after {
+					background: #E93323;
+					left: 0;
+				}
+
+				text {
+					margin-left: -20rpx
+				}
+			}
+
+			&.text_line3 {
+				text-align: right;
+
+				&::after {
+					right: 0;
+				}
+
+				text {
+					margin-right: -20rpx
+				}
+			}
+
+			&.text_line2 {
+				width: 50%;
+				text-align: center;
+
+				&::after {
+					left: 50%;
+					margin-left: -4rpx;
+				}
+			}
+		}
+	}
+
+	/*拼团*/
+	.product-con .notice {
+		width: 100%;
+		height: 62rpx;
+		background-color: #ffedeb;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+	}
+
+	.product-con .notice .num {
+		font-size: 24rpx;
+	}
+
+	.product-con .notice .num .iconfont {
+		font-size: 30rpx;
+		vertical-align: -3rpx;
+		margin-right: 20rpx;
+	}
+
+	.product-con .notice .num .line {
+		color: #282828;
+		margin-left: 15rpx;
+	}
+
+	.product-con .notice .swiper {
+		height: 100%;
+		width: 360rpx;
+		line-height: 62rpx;
+		overflow: hidden;
+		margin-left: 14rpx;
+	}
+
+	.product-con .notice .swiper swiper {
+		height: 100%;
+		width: 100%;
+		overflow: hidden;
+		font-size: 24rpx;
+		color: #282828;
+	}
+
+	.product-con .playWay {
+		background-color: #fff;
+		padding: 0 30rpx;
+		margin-top: 20rpx;
+		font-size: 28rpx;
+		color: #282828;
+	}
+
+	.product-con .playWay .title {
+		height: 86rpx;
+		border-bottom: 1px solid #eee;
+	}
+
+	.product-con .playWay .title .iconfont {
+		margin-left: 13rpx;
+		font-size: 28rpx;
+		color: #717171;
+	}
+
+	.product-con .playWay .way {
+		min-height: 110rpx;
+		font-size: 26rpx;
+		color: #282828;
+	}
+
+	.product-con .playWay .way .iconfont {
+		color: #cdcdcd;
+		font-size: 40rpx;
+		margin: 0 35rpx;
+	}
+
+	.product-con .playWay .way .item .num {
+		font-size: 34rpx;
+		margin-right: 6rpx;
+		width: 17px;
+		height: 28px;
+		display: inline-block;
+		vertical-align: middle;
+	}
+
+	.product-con .playWay .way .item .tip {
+		font-size: 22rpx;
+		color: #a5a5a5;
+		margin-top: -4rpx;
+	}
+
+	.product-con .playWay .way .way_text {
+		position: relative;
+		top: 4rpx;
+	}
+
+	.activity_pin {
+		width: auto;
+		height: 44rpx;
+		line-height: 44rpx;
+		background: linear-gradient(90deg, rgba(233, 51, 35, 1) 0%, rgba(250, 101, 20, 1) 100%);
+		opacity: 1;
+		border-radius: 22rpx;
+		padding: 0 15rpx;
+		margin-left: 19rpx;
+	}
+
+	.activity_miao {
+		width: auto;
+		height: 44rpx;
+		line-height: 44rpx;
+		padding: 0 15rpx;
+		background: linear-gradient(90deg, rgba(250, 102, 24, 1) 0%, rgba(254, 161, 15, 1) 100%);
+		opacity: 1;
+		border-radius: 22rpx;
+		margin-left: 19rpx;
+	}
+
+	.iconfonts {
+		color: #fff !important;
+		font-size: 28rpx;
+	}
+
+	.activity_title {
+		font-size: 24rpx;
+		color: #fff;
+	}
+
+	.activity_kan {
+		width: auto;
+		height: 44rpx;
+		line-height: 44rpx;
+		padding: 0 15rpx;
+		background: linear-gradient(90deg, rgba(254, 159, 15, 1) 0%, rgba(254, 178, 15, 1) 100%);
+		opacity: 1;
+		border-radius: 22rpx;
+		margin-left: 19rpx;
+	}
+
+	.mask {
+		z-index: 300 !important;
+	}
+
+	.head-bar {
+		background: #fff;
+	}
+
+	.generate-posters {
+		width: 100%;
+		height: 170rpx;
+		background-color: #fff;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 388;
+		transform: translate3d(0, 100%, 0);
+		transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+		border-top: 1px solid #eee;
+	}
+
+	.generate-posters.on {
+		transform: translate3d(0, 0, 0);
+	}
+
+	.generate-posters .item {
+		flex: 50%;
+		text-align: center;
+		font-size: 30rpx;
+	}
+
+	.generate-posters .item .iconfont {
+		font-size: 80rpx;
+		color: #5eae72;
+	}
+
+	.generate-posters .item .iconfont.icon-haibao {
+		color: #5391f1;
+	}
+
+	.product-con .mask {
+		z-index: 88;
+	}
+
+	.product-con .footer {
+		padding: 0 20rpx 0 30rpx;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		box-sizing: border-box;
+		height: 100rpx;
+		background-color: #fff;
+		z-index: 277;
+		border-top: 1px solid #f0f0f0;
+	}
+
+	.product-con .footer .item {
+		font-size: 18rpx;
+		color: #666;
+	}
+
+	.product-con .attribute .atterTxt {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		display: inline-block;
+		width: 400rpx;
+	}
+
+	.product-con .attribute .atterTxt1 {
+		color: #282828;
+
+		&.hasAttr {
+			&:after {
+				content: "";
+				display: inline-block;
+				position: relative;
+				top: -6rpx;
+				margin: 0 6rpx;
+				width: 5rpx;
+				height: 5rpx;
+				background-color: #282828;
+				border-radius: 100%;
+			}
+
+			&:last-child {
+				&:after {
+					display: none;
+				}
+			}
+		}
+	}
+
+	.product-intro .title {
+		font-size: 30rpx;
+		color: #282828;
+		text-align: center;
+	}
+
+	.product-intro .pictures,
+	.product-intro .pictures uni-image,
+	.product-intro .pictures image {
+		width: 100%;
+	}
+
+	.product-con .guaranteeAttr {
+		display: inline-block;
+		width: 560rpx;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.product-con .superior {
+		background-color: #fff;
+		margin-top: 20rpx;
+		padding-bottom: 10rpx;
+	}
+
+	.product-con .superior .title {
+		height: 98rpx;
+	}
+
+	.product-con .superior .title image {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	.product-con .superior .title .titleTxt {
+		margin: 0 20rpx;
+		font-size: 30rpx;
+		background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+	}
+
+	.product-con .superior .slider-banner {
+		width: 690rpx;
+		margin: 0 auto;
+		position: relative;
+	}
+
+	.product-con .superior .slider-banner swiper {
+		height: 100%;
+		width: 100%;
+	}
+
+	.product-con .superior .slider-banner swiper-item {
+		height: 100%;
+	}
+
+	.product-con .superior .slider-banner .list {
+		width: 100%;
+	}
+
+	.product-con .superior .slider-banner .list .item {
+		width: 215rpx;
+		margin: 0 22rpx 30rpx 0;
+		font-size: 26rpx;
+	}
+
+	.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
+		margin-right: 0;
+	}
+
+	.product-con .superior .slider-banner .list .item .pictrue {
+		position: relative;
+		width: 100%;
+		height: 215rpx;
+	}
+
+	.product-con .superior .slider-banner .list .item .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6rpx;
+	}
+
+	.product-con .superior .slider-banner .list .item .name {
+		color: #282828;
+		margin-top: 12rpx;
+	}
+
+	.product-con .superior .slider-banner .swiper-pagination-bullet {
+		background-color: #999;
+	}
+
+	.product-con .superior .slider-banner .swiper-pagination-bullet-active {
+		background-color: #e93323;
+	}
+
+	button {
+		padding: 0;
+		margin: 0;
+		line-height: normal;
+		background-color: #fff;
+	}
+
+	button::after {
+		border: 0;
+	}
+
+	action-sheet-item {
+		padding: 0;
+		height: 240rpx;
+		align-items: center;
+		display: flex;
+	}
+
+	.contact {
+		font-size: 16px;
+		width: 50%;
+		background-color: #fff;
+		padding: 8rpx 0;
+		border-radius: 0;
+		margin: 0;
+		line-height: 2;
+	}
+
+	.contact::after {
+		border: none;
+	}
+
+	.action-sheet {
+		font-size: 17px;
+		line-height: 1.8;
+		width: 50%;
+		position: absolute;
+		top: 0;
+		right: 0;
+		padding: 25rpx 0;
+	}
+
+	.canvas {
+		z-index: 300;
+		width: 750px;
+		height: 1190px;
+	}
+
+	.poster-pop {
+		width: 450rpx;
+		height: 714rpx;
+		position: fixed;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 399;
+		top: 50%;
+		margin-top: -357rpx;
+	}
+
+	.poster-pop image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.poster-pop .close {
+		width: 46rpx;
+		height: 75rpx;
+		position: fixed;
+		right: 0;
+		top: -73rpx;
+		display: block;
+	}
+
+	.poster-pop .save-poster {
+		background-color: #df2d0a;
+		font-size: ：22rpx;
+		color: #fff;
+		text-align: center;
+		height: 76rpx;
+		line-height: 76rpx;
+		width: 100%;
+	}
+
+	.poster-pop .keep {
+		color: #fff;
+		text-align: center;
+		font-size: 25rpx;
+		margin-top: 10rpx;
+	}
+
+	.mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.6);
+		z-index: 9;
+	}
+
+	.product-con .wrapper {
+		padding: 32rpx;
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.product-con .nav {
+		background-image: url('data:image/jpeg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QN/aHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjYtYzE0MiA3OS4xNjA5MjQsIDIwMTcvMDcvMTMtMDE6MDY6MzkgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6NDNlZTU0ZDMtNjEwZS03ZjQ4LWEwODgtNTZlMTZiNzI3NTQwIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjI1NEI2MDUyM0ZDMjExRTk5OTg1REI1OUM1NjNEMUZCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjI1NEI2MDUxM0ZDMjExRTk5OTg1REI1OUM1NjNEMUZCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjUyMDIzNWNmLTIwNGYtOTQ0My05YTBiLWNmMmZlMTJmMDk3NCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0M2VlNTRkMy02MTBlLTdmNDgtYTA4OC01NmUxNmI3Mjc1NDAiLz4gPC9yZGY6RGVzY3JpcHRpb24+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');
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
+		width: 100%;
+		height: 100rpx;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+	}
+
+	.product-con .nav .money {
+		font-size: 28rpx;
+		color: #fff;
+	}
+
+	.product-con .nav .money .num {
+		font-size: 48rpx;
+	}
+
+	.product-con .nav .money .y-money {
+		font-size: 26rpx;
+		margin-left: 10rpx;
+		text-decoration: line-through;
+	}
+
+	.product-con .nav .time {
+		font-size: 20rpx;
+		color: #fff;
+		text-align: center;
+	}
+
+	.product-con .nav .time .timeCon {
+		margin-top: 10rpx;
+	}
+
+	.product-con .nav .time .timeCon .num {
+		padding: 0 7rpx;
+		font-size: 22rpx;
+		color: #ff3d3d;
+		background-color: #fff;
+		border-radius: 2rpx;
+	}
+
+	.product-con .nav .timeState {
+		font-size: 28RPX;
+		color: #FFF;
+	}
+
+	.product-con .nav .iconfont {
+		color: #fff;
+		font-size: 30rpx;
+		margin-left: 20rpx;
+	}
+
+	.pictrue_log {
+		width: 80upx;
+		height: 40upx;
+		border-radius: 6upx 0 12upx 0;
+		line-height: 40upx;
+		font-size: 24upx;
+	}
+
+	.pictrue_log_class {
+		z-index: 3;
+		background: -webkit-gradient(linear, left top, right top, from(rgba(246, 122, 56, 1)), to(rgba(241, 27, 9, 1)));
+		background: linear-gradient(90deg, rgba(246, 122, 56, 1) 0%, rgba(241, 27, 9, 1) 100%);
+		opacity: 1;
+		position: absolute;
+		top: 0;
+		left: 0;
+		color: #fff;
+		text-align: center;
+
+	}
+
+	.navbar .header {
+		height: 96rpx;
+		font-size: 30rpx;
+		color: #050505;
+		background-color: #fff;
+		/* #ifdef MP */
+		padding-right: 95rpx;
+		/* #endif */
+	}
+
+	.navbar .header .item {
+		position: relative;
+		margin: 0 25rpx;
+	}
+
+	.navbar .header .item.on:before {
+		position: absolute;
+		width: 60rpx;
+		height: 5rpx;
+		background-repeat: no-repeat;
+		content: "";
+		background-image: linear-gradient(to right, #ff3366 0%, #ff6533 100%);
+		bottom: -10rpx;
+		left: 50%;
+		margin-left: -28rpx;
+	}
+
+	.navbar {
+		position: fixed;
+		background-color: #fff;
+		top: 0;
+		left: 0;
+		z-index: 99;
+		width: 100%;
+	}
+
+	.navbar .navbarH {
+		position: relative;
+	}
+
+	.navbar .navbarH .navbarCon {
+		position: absolute;
+		bottom: 0;
+		height: 100rpx;
+		width: 100%;
+	}
+
+	.share-box {
+		z-index: 1000;
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.store-wrapper {
+		margin-top: 20rpx;
+		background-color: #fff;
+
+		.store-hd {
+			padding: 30rpx;
+			border-bottom: 1px solid #F5F5F5;
+
+			.store-info {
+				position: relative;
+				display: flex;
+
+				.logo {
+					width: 86rpx;
+					height: 86rpx;
+
+					image {
+						width: 86rpx;
+						height: 86rpx;
+						border-radius: 6rpx;
+					}
+				}
+
+				.info {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					margin-left: 20rpx;
+
+					.name {
+						font-size: 28rpx;
+						color: #282828;
+						font-weight: bold;
+					}
+
+					.txt {
+						margin-top: 8rpx;
+						color: #666666;
+						font-size: 22rpx;
+					}
+				}
+
+				.link {
+					position: absolute;
+					right: 0;
+					top: 50%;
+					transform: translateY(-50%);
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 114rpx;
+					height: 50rpx;
+					background: linear-gradient(-90deg, $bg-end 0%, $bg-star 100%);
+					border-radius: 25rpx;
+					color: #fff;
+				}
+			}
+
+			.score-wrapper {
+				display: flex;
+				justify-content: space-between;
+				margin-top: 30rpx;
+
+				.item {
+					color: #948D8C;
+					font-size: 26rpx;
+
+					text {
+						margin-left: 10rpx;
+						color: $theme-color;
+					}
+				}
+			}
+		}
+
+		.con-box {
+			padding: 20rpx 0 20rpx 30rpx;
+
+			.title {
+				font-size: 28rpx;
+				color: #282828;
+				margin-bottom: 20rpx;
+			}
+
+			.img-box {
+				display: flex;
+
+				.img-item {
+					width: 206rpx;
+					margin-right: 20rpx;
+
+					/deep/image,
+					/deep/uni-image,
+					/deep/.easy-loadimage {
+						width: 206rpx;
+						height: 206rpx;
+						border-radius: 16rpx;
+					}
+
+					.txt {
+						.title {
+							font-size: 28rpx;
+							color: #282828;
+						}
+
+						.price {
+							color: $theme-color;
+							font-size: 28rpx;
+
+							text {
+								font-size: 20rpx;
+							}
+						}
+					}
+
+				}
+			}
+		}
+	}
+
+	.sys-head {
+		background: transparent;
+	}
+
+	.head-wrapper {
+		z-index: 999;
+		display: flex;
+		align-items: center;
+		position: fixed;
+		left: 30rpx;
+		top: 0;
+		/* #ifdef MP */
+		height: 43px;
+		/* #endif */
+		/* #ifdef H5 */
+		height: 114rpx;
+		/* #endif */
+	}
+
+	.head-menu {
+		display: flex;
+		align-items: center;
+		height: 54rpx;
+		width: 140rpx;
+		background: rgba(0, 0, 0, .25);
+		border-radius: 27rpx;
+
+		.iconfont {
+			flex: 1;
+			text-align: center;
+			color: #fff;
+			box-sizing: border-box;
+
+			&.icon-xiangzuo {
+				border-right: 1px solid #fff;
+			}
+		}
+	}
+
+	.product_content {
+		background-color: #fff;
+
+		&_title {
+			width: 100%;
+			height: auto;
+			line-height: 50rpx;
+			padding: 28rpx;
+			word-wrap: break-word;
+			text-align: center;
+		}
+
+		image {
+			width: 750rpx;
+			// height: 750rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 8e62c49..37d061f 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -1,14 +1,14 @@
 <template>
 	<view class="select_warehouse">
-		<view class="wrapper flex_a_c_j_sb">
+		<!-- <view class="wrapper flex_a_c_j_sb">
 			<block v-for="item in goodsData" :key="item.name">
 				<view class="select_item select_item1" @click="navigato(item.type)" :class="'select_item'+item.type">
 					<view class="title">{{ item.name }}</view>
-					<!-- <view class="iconfont icon-jiantou"></view> -->
+					{{item.type}}
 					<image class="img" :src="item.src"></image>
 				</view>
 			</block>
-		</view>
+		</view> -->
 		<view v-if="pageType==1" class="list-box-put">
 			<view class="item" v-for="(item, index) in goods" :key="index">
 				<view class="top">
@@ -217,19 +217,16 @@
 				goodsData: [{
 						name: '搜索名称入库',
 						type: 1,
-						// src: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/mingcheng.png'
 						src: '/static/images/SMRK/name.png'
 					},
 					{
 						name: '标品扫码入库',
 						type: 2,
-						// src: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/saoma.png'
 						src: '/static/images/SMRK/bar.png'
 					},
 					{
 						name: '非标手动入库',
 						type: 3,
-						// src: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/saoma.png'
 						src: '/static/images/SMRK/img.png'
 					}
 				],
@@ -295,6 +292,9 @@
 			this.mer_id = e.mer_id
 			this.userInfo = this.$store.state.app.userInfo;
 			if (typeof this.userInfo == 'string') this.userInfo = JSON.parse(this.userInfo);
+			if (e.type) {
+				this.navigato(e.type)
+			}
 			// if(this.userInfo.mer_info.type_code=='PersonalStore'){
 			//   this.goodsData = [{
 			//       name: '农产品入库',
@@ -624,7 +624,7 @@
 				}
 			},
 			navigato(type) {
-				if (type === 1) {
+				if (type == 1) {
 					this.searchGoodsName = '';
 					this.searchGoodsShow = true;
 					this.pageType = 1;
diff --git a/pages/product/addGood/addGood.vue b/pages/product/addGood/addGood.vue
index ded1b87..16375a0 100644
--- a/pages/product/addGood/addGood.vue
+++ b/pages/product/addGood/addGood.vue
@@ -67,17 +67,17 @@
 					</view>
 				</u-form-item>
 				<u-form-item label="零售价格" prop="userInfo.name" ref="item1" border-bottom>
-					<u--input inputAlign='right' placeholderStyle="color:#777777" style="width: 220rpx;"
+					<u--input inputAlign='right' placeholderStyle="color:#777777" style="width: 300rpx;"
 						placeholder="请输入零售价" type='number' v-model="formData.attrValue[0].price"
 						slot='right'></u--input>
 				</u-form-item>
 				<u-form-item v-if='isWholeSale' label="批发价格" prop="userInfo.name" ref="item1" border-bottom>
-					<u--input inputAlign='right' placeholderStyle="color:#777777" style="width: 250rpx;"
+					<u--input inputAlign='right' placeholderStyle="color:#777777" style="width: 300rpx;"
 						placeholder="请输入批发价格" type='number' v-model="formData.attrValue[0].wholesale_price"
 						slot='right'></u--input>
 				</u-form-item>
 				<u-form-item label="商品库存" prop="userInfo.name" ref="item1">
-					<u--input inputAlign='right' type='number' placeholderStyle="color:#777777" style="width: 220rpx;"
+					<u--input inputAlign='right' type='number' placeholderStyle="color:#777777" style="width: 300rpx;"
 						placeholder="请输入库存" v-model="formData.attrValue[0].stock" slot='right'></u--input>
 				</u-form-item>
 			</view>
@@ -97,6 +97,7 @@
 				<u-button text="立即发布获取订单" color="#33BB3C" class="custom-style"></u-button>
 			</view>
 		</u--form>
+
 		<u-popup :show="showPouple" @close="showPouple=false" @open="showPouple=true" :round="10">
 			<view class="RegularFont" style="padding: 42rpx 40rpx">
 				<view class="pop-head">
@@ -129,6 +130,10 @@
 				</view>
 			</view>
 		</u-popup>
+
+
+
+
 		<u-picker :show="show" :columns="columns" confirmColor='#33BB3C' @close='show=false' @confirm='choseMedia'
 			@cancel='show=false'></u-picker>
 
@@ -202,7 +207,7 @@
 					}, ],
 					"attrValue": [{
 						detail: {
-							规格名: 'attr[index]value',
+							规格名: '',
 						},
 						"price": "",
 						"unit_name": "",
@@ -415,27 +420,19 @@
 				let that = this
 				uni.previewImage({
 					urls: [url],
-					// longPressActions: {
-					// 	itemList: ['发送给朋友', '保存图片', '收藏'],
-					// 	success: function(data) {
-					// 		console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
-					// 	},
-					// 	fail: function(err) {
-					// 		console.log(err.errMsg);
-					// 	}
-					// }
+
 				});
 
 			},
 			handAdd() {
 				let data = uni.$u.deepClone(this.formData)
-				data.image = data.imageList[0]
-				data.slider_image = data.imageList.splice(0, 1)
+				data.image = data.imageList.find(item => {
+					return !this.vidioTypeList.includes(this.getSuffix(item))
+				})
+				data.slider_image = this.formData.imageList.filter((item, index) => index != 0)
 				data.store_name = data.cate_name
 				productCreate(this.mer_id, data)
 					.then(res => {
-						console.log("提交成功")
-						// hideLoading();
 						Modal('提交成功', '点击确定，前往商品列表页面').then(() => {
 							if (this.import == 1) {
 								uni.$emit('importAttrValueOK', this.setFormData.import_id);
@@ -457,6 +454,7 @@
 				this.$refs.formData.validate().then(res => {
 					this.handAdd()
 				}).catch(errors => {
+					console.log(errors)
 					uni.$u.toast(errors[0].message)
 				})
 
diff --git a/pages/product/addGoodDetail/addGoodDetail.vue b/pages/product/addGoodDetail/addGoodDetail.vue
index 30fabd8..56d46fe 100644
--- a/pages/product/addGoodDetail/addGoodDetail.vue
+++ b/pages/product/addGoodDetail/addGoodDetail.vue
@@ -14,16 +14,15 @@
 
 				<u-form-item label="商品主图" prop="formData.imageList" ref="item1" required>
 					<text style="color: #E18C34;font-size: 24rpx">上传时应注重真实性、清晰度</text>
-					<!-- {{formData.imageList}}
-					{{formData.content.image}} -->
 				</u-form-item>
 				<view class="card" style="min-height: 150rpx;margin-bottom: 0;padding: 0;">
 					<view class="" style="display: flex;flex-wrap: wrap;">
+
 						<view v-for="(item,index) in formData.imageList"
 							style="margin-right: 20rpx;margin-bottom: 20rpx;">
 							<view class="video_list" v-if='vidioTypeList.includes(getSuffix(item))'>
 								<view class="video_list_item photo" style="position: relative;">
-									<view class="jiao" @click="formData.imageList.splice(index,1)">
+									<view class="jiao">
 										<!-- video标签在app端层级过高 -->
 										<!--#ifndef APP-PLUS-->
 										<video :src="item"></video>
@@ -32,7 +31,8 @@
 										<img src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png"
 											style=" width:150rpx"></img>
 										<!--#endif-->
-										<image src="@/static/images/gban.png" mode="widthFix"></image>
+										<image @click="formData.imageList.splice(index,1)"
+											src="@/static/images/gban.png" mode="widthFix"></image>
 									</view>
 									<view style="position: absolute;top: 20rpx;z-index: 99;width: 140rpx;height: 100%;"
 										@click="videoshow(index)">
@@ -43,13 +43,18 @@
 							</view>
 							<view class="" style="position: relative;" v-else>
 								<view class="jiao" @click="formData.imageList.splice(index,1)">
+									<!-- <view class="jiao" @click="test(index)"> -->
 									<image src="@/static/images/gban.png" mode="widthFix"></image>
 								</view>
 								<u--image @click="preViewImg(item)" :src="item" :fade="true" duration="450"
 									width='140rpx' height='140rpx'></u--image>
 							</view>
 						</view>
+
+
+
 						<view class='uploadimg' @click="show=true,isDetail=false">
+							<!-- <view class='uploadimg'> -->
 							<u-icon name="plus" color="#777777"></u-icon>
 							<view class="" style="color: #777777;font-size: 20rpx;">
 								上传图片/视频
@@ -143,30 +148,22 @@
 				<view class="" v-if="showSet">
 					<view class="" v-for="(item,index) in formData.attrValue.filter(item=> item.is_use==0)">
 						<view class="" v-if='formData.attrValue.filter(item=> item.is_use==0).length==1'>
-							<u-line color="#CECECE" style="margin: 30rpx 0;"></u-line>
-							<view class="" style="display: flex;justify-content: space-around;">
-								<view class=""
-									style="display: flex;justify-content: space-around;flex: 1;border-right: 1px solid #CECECE;">
-									<text>零售价格</text>
-									<text>{{item.price}}元/{{item.unit_name}}</text>
+							<u-form-item label="零售价格" label-width="auto" labelPosition="left" border-bottom>
+								<view style="font-size: 28rpx;color:#777777 ;width: 100%;text-align: right;">
+									{{item.price}}元/{{item.unit_name}}
 								</view>
-								<view class="" style="display: flex;justify-content: space-around;flex: 1;">
-									<text>商品库存</text>
-									<text>{{item.stock}}</text>
+							</u-form-item>
+							<u-form-item v-if='isWholeSale' label="批发价格" label-width="auto" labelPosition="left"
+								border-bottom>
+								<view style="font-size: 28rpx;color:#777777 ;width: 100%;text-align: right;">
+									{{item.wholesale_price}}元/{{item.wholesale_unit_name}}
 								</view>
-							</view>
-							<u-line color="#CECECE" style="margin: 30rpx 0;" v-if='isWholeSale'></u-line>
-							<view class="" style="display: flex;justify-content: space-around;" v-if='isWholeSale'>
-								<view class=""
-									style="display: flex;justify-content: space-around;flex: 1;border-right: 1px solid #CECECE;">
-									<text>批发价格</text>
-									<text>{{item.wholesale_price}}元/{{item.wholesale_unit_name}}</text>
+							</u-form-item>
+							<u-form-item label="商品库存" label-width="auto" labelPosition="left" border-bottom>
+								<view style="font-size: 28rpx;color:#777777 ;width: 100%;text-align: right;">
+									{{item.stock}}
 								</view>
-								<view class="" style="display: flex;justify-content: space-around;flex: 1;">
-									<text>批发单位</text>
-									<text>{{item.stock}}</text>
-								</view>
-							</view>
+							</u-form-item>
 						</view>
 						<view class="" v-else>
 							<u-form-item :label="formData.attr[index].value" label-width="350rpx" prop="userInfo.name"
@@ -313,7 +310,6 @@
 				uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
 				show: false, //选择图片还是视屏
 				showSet: false,
-				vidioTypeList: ['mp4', 'avi', 'mov', 'wmv', 'mkv', 'flv', 'mpeg', '3gp', 'webm'],
 				delivery_way: [],
 				isWholeSale: false,
 				formData: {
@@ -328,7 +324,7 @@
 					}, ],
 					"attrValue": [{
 						detail: {
-							规格名: 'attr[index]value',
+							规格名: '',
 						},
 						"price": "",
 						"unit_name": "",
@@ -336,7 +332,7 @@
 						"wholesale_price": '',
 						"cost": "",
 						"stock": "",
-						sku: 'attr[index]value',
+						sku: '',
 						"ot_price": "",
 						"procure_price": "",
 						"bar_code": "",
@@ -457,7 +453,6 @@
 									}
 								}
 							})
-							console.log(errList, 'err')
 							return errList.length == 0
 						},
 						message: '请填写完整商品规格',
@@ -500,7 +495,10 @@
 			};
 		},
 		methods: {
-
+			test(index) {
+				// this.formData.imageList.splice(index, 1)
+				console.log(this.formData, index)
+			},
 			preViewImg(url) {
 				let that = this
 				uni.previewImage({
@@ -665,10 +663,10 @@
 			async handAdd() {
 				let that = this
 				let data = uni.$u.deepClone(this.formData)
-				data.image = data.imageList[0]
-				data.slider_image = data.imageList.splice(0, 1)
-				data.store_name = data.cate_name
-
+				data.image = data.imageList.find(item => {
+					return !this.vidioTypeList.includes(this.getSuffix(item))
+				})
+				data.slider_image = this.formData.imageList.filter((item, index) => index != 0)
 				that.formData.product_id ?
 					productUpdate(that.mer_id, that.formData.product_id, data)
 					.then(res => {
@@ -677,7 +675,7 @@
 								uni.$emit('importAttrValueOK', this.setFormData.import_id);
 								uni.navigateBack();
 							} else uni.redirectTo({
-								url: `/pages/product/goodsOnSale/index?mer_id=${that.mer_id}&type=6`
+								url: `/pages/product/list/index?mer_id=${that.mer_id}&type=6`
 							})
 						}).catch(() => {
 							uni.navigateBack()
@@ -698,7 +696,9 @@
 								url: `/pages/product/list/index?mer_id=${this.mer_id}&type=6`
 							})
 						}).catch(() => {
-							uni.navigateBack()
+							uni.redirectTo({
+								url: `/pages/product/list/index?mer_id=${this.mer_id}&type=6`
+							})
 						})
 					})
 					.catch(rej => {
@@ -706,9 +706,11 @@
 					})
 			},
 			submit() {
+				// console.log(this.formData)
 				this.$refs.formData.validate().then(res => {
 					this.handAdd()
 				}).catch(errors => {
+					// console.log(errors)
 					uni.$u.toast(errors[0].message)
 				})
 
@@ -724,28 +726,27 @@
 
 
 		onLoad(option) {
+			// let that = this
 			this.initFormData(option)
 			this.showSet = option.showSet ? JSON.parse(option.showSet) : this.showSet
-			let that = this
 			this.isSet2()
-			that.formData.delivery_way = that.$store.state.app.userInfo?.mer_info.delivery_way.split(',')
+			this.formData.delivery_way = this.$store.state.app.userInfo?.mer_info.delivery_way.split(',')
 			if (option.product_id) {
-				that.formData.product_id = option.product_id
+				this.formData.product_id = option.product_id
 				this.mode = 'edit'
 				this.showSet = true
 				productDetail(option.mer_id, option.product_id).then(res => {
-					this.formData = res.data
-					//该死的后端，格式不按添加的格式来
+					console.log(res.data)
+					Object.assign(this.formData, res.data)
+					this.$set(this.formData, "imageList", res.data.image_list)
 					this.formData.product_attribute = JSON.parse(this.formData.product_attribute)
 					this.formData.cate_name = this.formData.storeCategory.cate_name
 					this.formData.cate_id = this.formData.storeCategory.store_category_id
-					this.formData.imageList = this.formData.image_list
-					if (!that.formData.imageList) that.formData.imageList = []
+					delete this.formData.image_list
+					if (!this.formData.imageList) this.formData.imageList = []
+					console.log(this.formData)
 				})
 			}
-
-
-
 		},
 		onBackPress: function(e) {
 			this.showlay = true
diff --git a/pages/product/addGoodDetail/goodsPrice.vue b/pages/product/addGoodDetail/goodsPrice.vue
index 3b77402..6454f24 100644
--- a/pages/product/addGoodDetail/goodsPrice.vue
+++ b/pages/product/addGoodDetail/goodsPrice.vue
@@ -19,7 +19,8 @@
 					<view class="" style="flex: 1;text-align: center;">
 						/
 					</view>
-					<u--input style=" flex: 2;width:100rpx;background-color: #F6F6F6;" placeholder="请输入计量单位"
+					<u--input @focus="unitIptClick(index,false)"
+						style=" flex: 2;width:100rpx;background-color: #F6F6F6;" placeholder="请输入计量单位"
 						v-model="item.unit_name"></u--input>
 				</view>
 				<view class="" v-if='isWholeSale'
@@ -29,8 +30,8 @@
 					<view class="" style="flex: 1;text-align: center;">
 						/
 					</view>
-					<u--input style=" flex: 2;width:100rpx;background-color: #F6F6F6;" placeholder="请输入计量单位"
-						v-model="item.wholesale_unit_name"></u--input>
+					<u--input style=" flex: 2;width:100rpx;background-color: #F6F6F6;" @focus="unitIptClick(index,true)"
+						placeholder="请输入计量单位" v-model="item.wholesale_unit_name"></u--input>
 				</view>
 			</view>
 			<u-line direction="row" style="margin: 25rpx 0;" color="#ECECEC"></u-line>
@@ -63,6 +64,42 @@
 		<view class="submit-btn">
 			<u-button type="primary" shape="circle" text="保存" @click="submit"></u-button>
 		</view>
+
+		<u-popup :show="showPouple" @close="showPouple=false" @open="showPouple=true" :round="10">
+			<view class="RegularFont" style="padding: 42rpx 40rpx">
+				<view class="pop-head">
+					<text v-if='!showCustom' @click='showPouple=false'>取消</text>
+					<text v-else @click='showCustom=false'>
+						<u-icon name="arrow-left" size="20"></u-icon>
+					</text>
+					<text style="font-size:32rpx ;color:#333333 ;">计量单位</text>
+					<text v-if='showCustom' @click='addAttr'>确定</text>
+					<text v-else></text>
+				</view>
+				<view style="height: 500rpx;">
+					<u-transition :show="!showCustom" mode="slide-right">
+						<view class="goods-leval">
+							<view class="goods-leval-li" v-for='(item,index) in attrList' :key='index'
+								@click='choseAttr(item)'>
+								{{item}}
+							</view>
+							<view class="goods-leval-li " style="display: flex;color:#38BE41 ;"
+								@click="showCustom=true">
+								<u-icon name="plus" color="#38BE41" style='margin-right: 8rpx;'></u-icon> 自定义
+							</view>
+						</view>
+					</u-transition>
+					<u-transition :show="showCustom" mode="slide-left">
+						<view class="transition">
+							<u--textarea v-model="selfAttr" placeholder="请输入计量单位"></u--textarea>
+						</view>
+					</u-transition>
+				</view>
+			</view>
+		</u-popup>
+
+
+
 	</view>
 </template>
 
@@ -73,8 +110,28 @@
 	export default {
 		data() {
 			return {
+				selfAttr: "",
+				attrList: ['斤',
+					"公斤",
+					"吨",
+					"升",
+					"个",
+					"台",
+					"瓶",
+					"桶",
+					"箱",
+					"袋",
+					"包",
+					"盒",
+					"件",
+					"罐"
+				],
+				showCustom: false, //计量单位自定义
+				showPouple: false,
+				unitIndex: 0,
 				mer_id: "",
 				isWholeSale: "",
+				isWhose: false,
 				text: "",
 				value: "",
 				formData: {},
@@ -111,6 +168,32 @@
 			}
 		},
 		methods: {
+			choseAttr(name) {
+				this.isWhose ?
+					this.attrValue[this.unitIndex].wholesale_unit_name = name :
+					this.attrValue[this.unitIndex].unit_name = name;
+				this.showPouple = false
+			},
+			addAttr() {
+				if (!this.selfAttr) return;
+				this.attrList.push(this.selfAttr)
+				this.isWhose ?
+					this.attrValue[this.unitIndex].wholesale_unit_name = this.attrList[this.attrList.length - 1] :
+					this.attrValue[this.unitIndex].unit_name = this.attrList[this.attrList.length - 1];
+				// this.attrValue[this.unitIndex].unit_name = this.attrList[this.attrList.length - 1]
+				// this.attrValue[this.unitIndex].wholesale_unit_name = this.attrList[this.attrList.length - 1]
+				this.selfAttr = ''
+				this.showCustom = false
+				this.showPouple = false
+			},
+
+			unitIptClick(index, type) {
+				this.isWhose = type
+				console.log(index)
+				this.unitIndex = index
+				this.showPouple = true
+
+			},
 			pushFn() {
 				this.attrValue.push({
 					detail: {
@@ -264,4 +347,34 @@
 			width: 670rpx;
 		}
 	}
+
+	.pop-head {
+		display: flex;
+		justify-content: space-between;
+		color: #20B128;
+		margin-bottom: 42rpx;
+	}
+
+	.goods-leval {
+		display: flex;
+		flex-wrap: wrap;
+		overflow-y: auto;
+
+		.goods-leval-li {
+			margin-right: 20rpx;
+			padding: 10rpx 40rpx;
+			height: 60rpx;
+			margin-bottom: 20rpx;
+			border-radius: 36rpx 36rpx 36rpx 36rpx;
+			background-color: #F1F1F1;
+		}
+
+		.act {
+			color: #20B128;
+			background-color: #E8F7E9;
+			border: 1px solid #20B128;
+
+
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index faa6f2b..45ee085 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view style="padding-bottom: 200rpx;">
 		<view class="order-index" ref="container">
 			<view class="search" style="margin-bottom: 24rpx;">
 				<u-search :showAction="true" actionText="搜索" v-model="keyword" :animation="true"
@@ -206,13 +206,13 @@
 		</view>
 
 		<view class="footer">
-			<view class="footer-li">
+			<view class="footer-li" @click="handClick(1)">
 				搜索入库
 			</view>
-			<view class="footer-li">
+			<view class="footer-li" @click="handClick(2)">
 				扫码入库
 			</view>
-			<view class="footer-li act">
+			<view class="footer-li act" @click="handClick(3)">
 				发布商品
 			</view>
 		</view>
@@ -446,6 +446,19 @@
 		},
 
 		methods: {
+			handClick(type) {
+				// console.log(type)
+				if (type == 3) {
+					uni.navigateTo({
+						url: `/pages/product/addGood/addGood?mer_id=${this.mer_id}`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/pages/nongKe/gather/select_warehouse?mer_id=${this.mer_id}&&type=${type}`
+					})
+				}
+
+			},
 			Iknow() {
 				if (this.where.type == 2) {
 					this.flag = false
diff --git a/pages/product/updateStock/updateStock.vue b/pages/product/updateStock/updateStock.vue
index c885453..4ee6f3f 100644
--- a/pages/product/updateStock/updateStock.vue
+++ b/pages/product/updateStock/updateStock.vue
@@ -12,10 +12,10 @@
 			<view class="right">
 				<view class="">
 					<view class="" style="font-size: 32rpx;color: #444444;">
-						打扫房间好看
+						{{short.store_name||short.storeCategory.cate_name}}
 					</view>
 					<view class="" style="font-size: 24rpx;color: #989898;margin-top: 10rpx;">
-						库存： 100个
+						库存： {{short.attrValue[0].stock}}个
 					</view>
 				</view>
 				<view class="" style="color: #FC452F;font-size: 24rpx;">
@@ -25,7 +25,7 @@
 		</view>
 		<view class="attr" v-for="(item,index) in short.attrValue" :key="index">
 			<view class="attr-tit">
-				{{item.sku}}
+				{{item.sku||'单规格'}}
 			</view>
 			<u-line color="#CECECE" style="margin: 30rpx 0 28rpx 0"></u-line>
 			<view class="" style="display: flex;justify-content: space-between;font-size: 32rpx;">