diff --git a/App.vue b/App.vue
index 0a64ceb..c084788 100644
--- a/App.vue
+++ b/App.vue
@@ -16,14 +16,14 @@
 		checkLogin
 	} from "./libs/login";
 	import {
-	
+
 		getUserInfo
-		
+
 	} from '@/api/user.js';
 	import {
 		HTTP_REQUEST_URL
 	} from './config/app';
-	
+
 	import {
 		getconfig,
 		history
@@ -79,17 +79,29 @@
 			imgColor: '',
 			...uni.getStorageSync('GLOBAL_DATA') || {}
 		},
-		onLaunch: function(option) {
+		onLaunch(option) {
+			// console.log(option,'1111111111')
+			uni.sendHostEvent('log', option, (ret) => {
+				//发送消息成功回调
+				console.log('消息成功' + JSON.stringify(option));
+
+			});
+
 			this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 			this.globalData.uid = this.$store.state.app.uid;
 			let appkey = uni.getStorage({
 				key: 'launchFlag'
 			})
-		
+
+
+
 			if (option.referrerInfo?.extraData?.uniMP) {
 				uni.setStorageSync('uniMP', option.referrerInfo?.extraData?.uniMP);
-				uni.setStorageSync('APP_token', option.referrerInfo?.extraData?.token);
-			
+				// uni.setStorageSync('APP_token', option.referrerInfo?.extraData?.token);
+				this.$store.commit("LOGIN", {
+					'token': option.referrerInfo?.extraData?.token,
+					'time': 604800
+				});
 			}
 			// #ifdef APP-PLUS
 
diff --git a/pages.json b/pages.json
index fae6c79..b83f2e4 100644
--- a/pages.json
+++ b/pages.json
@@ -1280,75 +1280,6 @@
 				}
 			]
 		},
-		{
-			"root": "pages/plantGrass",
-			"name": "plant_grass",
-			"pages": [{
-					"path": "plant_detail/index",
-					"style": {
-						"navigationBarTitleText": "内容详情",
-						"navigationStyle": "custom",
-						"enablePullDownRefresh": false
-					}
-				},
-				{
-					"path": "plant_release/index",
-					"style": {
-						"navigationBarTitleText": "内容发布",
-						"enablePullDownRefresh": false
-					}
-				},
-				{
-					"path": "plant_show/index",
-					"style": {
-						"navigationBarTitleText": "种草秀"
-					}
-				},
-				{
-					"path": "plant_topic/index",
-					"style": {
-						"navigationBarTitleText": "话题筛选"
-					}
-				},
-				{
-					"path": "plant_search/index",
-					"style": {
-						"navigationBarTitleText": "搜索"
-					}
-				},
-				{
-					"path": "plant_search_list/index",
-					"style": {
-						"navigationBarTitleText": "搜索结果"
-					}
-				},
-				{
-					"path": "plant_featured/index",
-					"style": {
-						"navigationBarTitleText": "为你精选"
-					}
-				},
-				{
-					"path": "plant_user/index",
-					"style": {
-						"navigationBarTitleText": "个人主页"
-					}
-				},
-				{
-					"path": "plant_user_attention/index",
-					"style": {
-						"navigationBarTitleText": "我的关注"
-					}
-				},
-				{
-					"path": "plant_user_fans/index",
-					"style": {
-						"navigationBarTitleText": "我的粉丝"
-					}
-				}
-
-			]
-		},
 		{
 			"root": "pages/columnGoods",
 			"name": "columnGoods",
@@ -1423,153 +1354,6 @@
 				}
 			]
 		},
-		{
-			"root": "pages/activity",
-			"name": "activity",
-			"pages": [{
-					"path": "goods_seckill/index",
-					"style": {
-						"navigationBarTitleText": "限时秒杀",
-						"navigationBarBackgroundColor": "#F2F2F2"
-					}
-				},
-				{
-					"path": "goods_seckill_details/index",
-					"style": {
-						"navigationBarTitleText": "秒杀详情",
-						"navigationStyle": "custom"
-							// #ifdef MP || APP-PLUS
-							,
-						"navigationBarTextStyle": "#fff"
-						// #endif
-					}
-				},
-				{
-					"path": "liveBroadcast/index",
-					"style": {
-						"navigationBarTitleText": "直播列表",
-						"navigationBarBackgroundColor": "#F2F2F2"
-					}
-				},
-				{
-					"path": "presell/index",
-					"style": {
-						"navigationBarTitleText": "预售列表"
-							// #ifdef MP || APP-PLUS
-							,
-						"navigationBarBackgroundColor": "#F2F2F2"
-						// #endif
-					}
-				},
-				{
-					"path": "presell_details/index",
-					"style": {
-						"navigationStyle": "custom"
-							// #ifdef MP || APP-PLUS
-							,
-						"navigationBarTextStyle": "#fff"
-						// #endif
-					}
-				},
-				{
-					"path": "combination/index",
-					"style": {
-						"navigationBarTitleText": "拼团"
-							// #ifdef MP || APP-PLUS
-							,
-						"navigationBarBackgroundColor": "#F2F2F2"
-						// #endif
-					}
-				},
-				{
-					"path": "combination_details/index",
-					"style": {
-						"navigationStyle": "custom",
-						"navigationBarTitleText": "拼团详情",
-						"navigationBarBackgroundColor": "#F2F2F2"
-					}
-				},
-				{
-					"path": "combination_status/index",
-					"style": {
-						"navigationBarTitleText": "拼团状态"
-					}
-				},
-				{
-					"path": "assist/index",
-					"style": {
-						"navigationBarTitleText": "助力列表",
-						"navigationBarBackgroundColor": "#F2F2F2"
-					}
-				},
-				{
-					"path": "assist_detail/index",
-					"style": {
-						"navigationBarTitleText": "发起助力"
-					}
-				},
-				{
-					"path": "assist_record/index",
-					"style": {
-						"navigationBarTitleText": "助力记录"
-					}
-				},
-				{
-					"path": "topic/index",
-					"style": {
-						"navigationBarTitleText": "活动专场"
-					}
-				},
-				{
-					"path": "topic_detail/index",
-					"style": {
-						"navigationBarTitleText": "主题活动"
-					}
-				},
-				{
-					"path": "lifeService/index",
-					"style": {
-						"navigationBarTitleText": "本地服务"
-					}
-				},
-				{
-					"path": "collect_coupons/index",
-					"style": {
-						"navigationBarTitleText": "领劵中心"
-					}
-				},
-				{
-					"path": "rank/index",
-					"style": {
-						"navigationBarTitleText": "热卖排行"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/short_video",
-			"name": "shortVideo",
-			"pages": [{
-				"navigationBarTitleText": "短视频",
-				"enablePullDownRefresh": false,
-				//#ifdef APP
-				"path": "appSwiper/index",
-				//#endif	
-				//#ifndef APP
-				"path": "nvueSwiper/index",
-				//#endif
-				"style": {
-					"navigationBarTitleText": "社区视频",
-					"navigationStyle": "custom",
-					"app-plus": {
-						"titleNView": false,
-
-						"bounce": "none"
-					}
-				}
-
-			}]
-		},
 		{
 			"root": "pages/annex",
 			"name": "annx",
diff --git a/pages/activity/assist/index.vue b/pages/activity/assist/index.vue
deleted file mode 100644
index fabff7c..0000000
--- a/pages/activity/assist/index.vue
+++ /dev/null
@@ -1,305 +0,0 @@
-<template>
-	<view :style="viewColor" class="page_container">
-		<view class='bargain-list'>
-			<!-- #ifdef H5 -->
-			<view class="fixed-head">
-				<view class="sys-head" :style="{height:statusBarHeight}"></view>
-				<view class="tool-bar">
-					<view class='iconfont icon-xiangzuo' @tap='goBack'></view>
-				</view>
-			</view>
-			<!-- #endif -->
-			<view class='header'>
-				<image mode="widthFix" class="assistBg" :src="domain+'assist_bg'+keyColor+'.png'" alt="">
-			</view>
-			<view class='list'>
-				<block v-for="(item,index) in assistList" :key="index">
-					<view class='item acea-row row-between-wrapper' @tap="openSubscribe(item.product_assist_id)">
-						<view class='pictrue'>
-							<image :src='item.product.image'></image>
-						</view>
-						<view class='text acea-row row-column-around'>
-							<view class='name line1'>{{item.store_name}}</view>
-							<view class='num'><text class='iconfont icon-pintuan'></text>{{item.user_count}}人正在参与</view>
-							<view class='money'>助力价: ￥<text class='price'>{{item.assistSku ? item.assistSku[0].assist_price : ''}}</text></view>
-						</view>
-						<view class='cutBnt'></text>发起助力</view>
-					</view>
-				</block>
-			</view>
-		</view>
-		<home></home>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<!-- #ifndef H5 -->
-		<passwordPopup></passwordPopup>
-		<!-- #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>
-	// +----------------------------------------------------------------------
-	import {
-		getAssistList,
-		initiateAssistApi
-	} from '../../../api/activity.js';
-	import home from '@/components/home/index.vue';
-	import { getUserInfo } from '@/api/user.js';
-	import { mapGetters } from "vuex";
-	import { configMap } from "@/utils";
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	import authorize from '@/components/Authorize';
-	// #ifndef H5
-	import passwordPopup from '@/components/passwordPopup';
-	// #endif
-	export default {
-		components: {
-			home,
-			// #ifndef H5
-			passwordPopup,
-			// #endif
-			authorize
-		},
-		data() {
-			return {
-				domain: HTTP_REQUEST_URL+'/static/diy/',
-				topImage: '',
-				assistList: [],
-				active: 0,
-				type: 0,
-				scrollLeft: 0,
-				interval: 0,
-				status: 1,
-				page: 1,
-				limit: 8,
-				loading: false,
-				loadend: false,
-				pageloading: false,
-				userInfo: {},
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-			}
-		},
-		/**
-		 * 用户点击右上角分享
-		 */
-		// #ifdef MP
-		onShareAppMessage: function() {
-			wx.showShareMenu({
-			      withShareTicket: true,
-			      menus: ['shareAppMessage', 'shareTimeline']
-			    })
-			return {
-				title: '助力活动',
-				path: 'pages/activity/assist/index',
-			}
-		},
-		onShareTimeline: function() {
-			return {
-				title: '助力活动',
-				  query: {
-				    key: ''
-				  },
-				  imageUrl: ''
-				}
-		},
-		// #endif
-		computed: configMap({statusBarHeight:0},mapGetters(['isLogin','viewColor','keyColor'])),
-		watch:{
-		 isLogin:{
-			handler:function(newV,oldV){
-				if(newV){
-					this.getUserInfo();
-					this.getAssistProductList();
-				}
-			},
-			deep:true
-		 }
-		},
-		onLoad() {
-			this.getAssistProductList();
-			if (this.isLogin) {
-				this.getUserInfo();
-			}
-		},
-		methods: {
-			goBack: function() {
-				uni.navigateBack();
-			},
-			// 微信登录回调
-			onLoadFun: function(e) {
-				this.getUserInfo();
-				this.isShowAuth = false
-			},
-			getAssistProductList: function() {
-				var that = this;
-				var data = {
-					page: that.page,
-					limit: that.limit,
-				};
-				if (that.loadend) return;
-				if (that.pageloading) return;
-				this.pageloading = true
-				getAssistList(data).then(res => {
-					// console.log(res);
-					var assistList = res.data.list;
-					var loadend = assistList.length < that.limit;
-					that.page++;
-					that.assistList = that.assistList.concat(assistList),
-					that.pageloading = false;
-					that.loadend = loadend;
-				}).catch(err => {
-					that.pageloading = false
-				});
-			},
-			openSubscribe: function(id) {
-				if(this.isLogin){
-					initiateAssistApi(id).then(res => {
-						let id = res.data.product_assist_set_id;
-						uni.hideLoading();
-						uni.navigateTo({
-							url: '/pages/activity/assist_detail/index?id='+id
-						});
-					}).catch((err) => {
-						uni.showToast({
-							title:err,
-							icon:'none'
-						})
-					});
-				}else{
-					this.isAuto = true;
-					this.isShowAuth = true
-				}
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			/*
-			 * 获取用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.$set(that, 'userInfo', res.data);
-				});
-			},
-		},
-		/**
-		 * 页面上拉触底事件的处理函数
-		 */
-		onReachBottom: function() {
-			this.getAssistProductList();
-		}
-	}
-</script>
-
-<style lang="scss">
-	.page_container {
-		min-height: 100vh;
-		background-color: var(--view-theme);
-	}
-	.bargain-list .header {
-		width: 100%;
-		position: relative;
-	}
-	.bargain-list .header .assistBg {
-		width: 750rpx;
-	}
-	.bargain-list .list {
-		background-color: #fff;
-		border: 6rpx solid #fc8b42;
-		border-radius: 30rpx;
-		margin: -90rpx 30rpx 66rpx 30rpx;
-		padding: 0 24rpx;
-		position: relative;
-		top: -50rpx;
-	}
-	.bargain-list .list .item {
-		border-bottom: 1px solid #eee;
-		position: relative;
-		height: 223rpx;
-	}
-	.bargain-list .list .item .pictrue {
-		width: 160rpx;
-		height: 160rpx;
-	}
-	.bargain-list .list .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-	.bargain-list .list .item .text {
-		width: 450rpx;
-		font-size: 30rpx;
-		color: #282828;
-		height: 160rpx;
-	}
-	.bargain-list .list .item .text .name {
-		width: 100%;
-	}
-	.bargain-list .list .item .text .num {
-		font-size: 26rpx;
-		color: #999;
-	}
-	.bargain-list .list .item .text .num .iconfont {
-		font-size: 35rpx;
-		margin-right: 7rpx;
-	}
-	.bargain-list .list .item .text .money {
-		font-size: 24rpx;
-		font-weight: bold;
-		color: var(--view-priceColor);
-	}
-	.bargain-list .list .item .text .money .price {
-		font-size: 32rpx;
-	}
-	.bargain-list .list .item .cutBnt {
-		position: absolute;
-		width: 180rpx;
-		border-radius: 50rpx;
-		font-size: 26rpx;
-		color: #fff;
-		text-align: center;
-		padding: 10rpx 0;
-		right: 0;
-		bottom: 44rpx;
-		box-shadow: 0 7rpx 0 var(--view-theme);
-		background-color: var(--view-theme);
-	}
-	.bargain-list .list .item .cutBnt .iconfont {
-		margin-right: 8rpx;
-		font-size: 30rpx;
-	}
-	.bargain-list .list .load {
-		font-size: 24rpx;
-		height: 85rpx;
-		text-align: center;
-		line-height: 85rpx;
-	}
-	.tool-bar{
-		display: flex;
-		align-items: center;
-		height: 40px;
-	}
-	.fixed-head{
-		position: absolute;
-		left: 0;
-		top: 20px;
-		width: 100%;
-		z-index: 10;
-		.icon-xiangzuo {
-			margin-right: 40rpx;
-			margin-left: 20rpx;
-			font-size: 40rpx;
-			color: #fff;
-		}
-	}
-</style>
diff --git a/pages/activity/assist_detail/index.vue b/pages/activity/assist_detail/index.vue
deleted file mode 100644
index ad283bc..0000000
--- a/pages/activity/assist_detail/index.vue
+++ /dev/null
@@ -1,1158 +0,0 @@
-<template>
-	<view :style="viewColor" class="page-container">
-		<view class='bargain'>
-			<!-- #ifndef APP-PLUS || MP -->
-			<view class='iconfont icon-xiangzuo' v-if='retunTop' @tap='goBack' :style="'top:'+navH+'px'"></view>
-			<!-- #endif -->
-			<view class="header"
-			:style="{ 'background-image': bargainInfo.relation == 10 ? `url(${domain}/static/diy/assist_detail2${keyColor}.png)` : `url(${domain}/static/diy/assist_detail1${keyColor}.png)`}">
-				<view class='people'>
-					{{bargainInfo.view_num || 0}}人查看 丨 {{bargainInfo.share_num || 0}}人分享 丨 {{bargainInfo.user_count_all || 0}}人参与
-				</view>
-				<countDown v-if="bargainInfo.relation == 10" :tipText="'倒计时'" :dayText="'天'" :hourText="'时'" :minuteText="'分'"
-				 :secondText="'秒'" :datatime="datatime" :isView="true" :isDay="true" :bgImage="`${domain}/static/images/assist-time.png`"></countDown>
-				<view v-if="bargainInfo.relation == 1" class='pictxt acea-row row-center-wrapper'>
-					<view class='pictrue'>
-						<image :src='userInfo.avatar ? userInfo.avatar : "/static/images/f.png"'></image>
-					</view>
-					<view class='text'>
-						{{userInfo.nickname || ''}}
-						<text>邀请您助力加油</text>
-					</view>
-				</view>
-			</view>
-			<view class='wrapper'>
-				<view class='pictxt acea-row row-between-wrapper' @tap="goProduct">
-					<view class='pictrue'>
-						<image :src='bargainInfo.product && bargainInfo.product.image ? bargainInfo.product.image : ""'></image>
-						<view class="bargain_view">
-							查看商品
-							<text class="iconfont icon-jiantou iconfonts"></text>
-						</view>
-					</view>
-					<view class='text acea-row row-column-around'>
-						<view class='line2'>{{bargainData.store_name}}</view>
-						<view>
-							<text class='money t-color'>
-								助力价: ￥
-								<text class='num'>{{bargainPrice}}</text>
-							</text>
-							<text class="old-price">￥{{old_price}}</text>
-						</view>
-						<view class='successNum'>{{bargainInfo.user_count_product}}人正在参与</view>
-					</view>
-				</view>
-				<!-- 进度条 -->
-				<block>
-					<view class="cu-progress acea-row row-middle round margin-top">
-						<view class='acea-row row-middle bg-red' :style="'width:'+ (bargainInfo.yet_assist_count/bargainInfo.assist_count*100).toFixed(2) +'%;'"></view>
-					</view>
-					<view class='money acea-row row-between-wrapper'>
-						<view v-if="bargainInfo.yet_assist_count != bargainInfo.assist_count">还差{{bargainInfo.assist_count-bargainInfo.yet_assist_count}}人</view>
-					</view>
-				</block>
-				<!-- 帮助助力、助力成功： -->
-				<view v-if="bargainInfo.relation == 10">
-					<view v-if="bargainInfo.yet_assist_count == bargainInfo.assist_count">
-						<view class='bargainSuccess'>
-							<text class='iconfont icon-xiaolian'></text>
-							恭喜您助力成功，快去支付
-						</view>
-						<view v-if="bargainInfo.order.paid != 0 && bargainInfo.order.paid != 1" class='bargainBnt' @tap='goPay'>立即支付</view>
-						<view v-else class='bargainBnt' @tap='goOrderDetail(bargainInfo.order)'>查看订单</view>
-						<view class='bargainBnt on' @tap='goBargainList'>抢更多商品</view>
-					</view>
-					<view v-else>
-						<!-- #ifdef H5 -->
-						<button class='bargainBnt' v-if="$wechat.isWeixin()" @click="H5ShareBox = true">邀请好友助力</button>
-						<button v-else class='bargainBnt copy-data' :data-clipboard-text="protocol +
-							'//' +
-							host +
-							'/pages/activity/assist_detail/index?id='+
-							id+'&spid='+uid">邀请好友助力</button>
-						<!-- #endif -->
-
-						<!-- #ifdef MP-->
-						<button open-type='share' class='bargainBnt'>邀请好友助力</button>
-						<!-- #endif -->
-						<!-- #ifdef APP-PLUS -->
-						  <button class='bargainBnt' @click="listenerActionSheet">邀请好友助力</button>
-						<!-- #endif -->
-						<view class='tip'>
-							已有
-							<text class='t-color'>{{bargainInfo.yet_assist_count}}</text>
-							位好友成功助力
-						</view>
-					</view>
-				</view>
-				<view v-if="bargainInfo.relation == 1">
-					<view class='bargainBnt' @tap='setBargainHelp' :class="load ? 'disabled' : ''">为好友助力</view>
-				</view>
-				<view v-if="bargainInfo.relation == -1 || bargainInfo.relation == -2">
-					<view>
-						<view v-if="bargainInfo.relation == -1" class='bargainSuccess'>
-							<text class='iconfont icon-xiaolian'></text>
-							已成功助力好友
-						</view>
-						<view class='bargainBnt' @tap='currentBargainUser'>我也要发起助力</view>
-					</view>
-				</view>
-				<view class='lock' :style="{ 'background-image': `url(${domain}/static/images/assist-lock.png)`}"></view>
-			</view>
-			<view class='bargainGang'>
-				<view class='title font-color acea-row row-center-wrapper'>
-					<view class='pictrue'>
-						<image :src="domain+'/static/diy/left'+keyColor+'.png'"></image>
-					</view>
-					<view class='titleCon'>助力好友</view>
-					<view class='pictrue on'>
-						<image :src="domain+'/static/diy/left'+keyColor+'.png'"></image>
-					</view>
-				</view>
-				<view class='list'>
-					<block v-for="(item,index) in bargainUserHelpList" :key='index'>
-						<view class='item acea-row row-between-wrapper'>
-							<view class='pictxt acea-row row-between-wrapper'>
-								<view class='pictrue'>
-									<image :src='item.avatar_img' v-if="item.avatar_img"></image>
-									<image src="/static/images/f.png" v-else></image>
-								</view>
-								<view class='text'>
-									<view class='name line1'>{{item.nickname}}</view>
-									<view class='line1 t-color'>{{item.create_time}}</view>
-								</view>
-							</view>
-							<view class='money t-color'>
-								已助力
-							</view>
-						</view>
-					</block>
-				</view>
-				<view class='load font-color' v-if="!limitStatus" @tap='getBargainUser'>点击加载更多</view>
-				<view class='lock'></view>
-			</view>
-			<view class='goodsDetails'>
-				<view class='title font-color acea-row row-center-wrapper'>
-					<view class='pictrue'>
-						<image :src="domain+'/static/diy/left'+keyColor+'.png'"></image>
-					</view>
-					<view class='titleCon'>商品详情</view>
-					<view class='pictrue on'>
-						<image :src="domain+'/static/diy/left'+keyColor+'.png'"></image>
-					</view>
-				</view>
-				<view v-if="bargainInfo.product && bargainInfo.product.content" class='conter'>
-					<jyf-parser :domain='domain' :html="bargainInfo.product.content.content.replace(/<br\/>/ig, '')" ref="article" :tag-style="tagStyle"></jyf-parser>
-				</view>
-				<view class='lock'></view>
-			</view>
-			<view class='mask' catchtouchmove="true" v-show='active==true' @tap='close'></view>
-		</view>
-		<!-- 发送给朋友图片 -->
-		<view class="share-box" v-if="H5ShareBox">
-			<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
-		</view>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<home></home>
-		<!-- 分享按钮 -->
-		<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
-			<button class="item" hover-class='none' @tap="goPoster">
-				<view class="iconfont icon-haibao"></view>
-				<view class="">生成海报</view>
-			</button>
-			<button class="item" hover-class='none' @click="copyPwd">
-				<view class="iconfont icon-fuzhikouling1"></view>
-				<view>生成口令</view>
-			</button>
-		</view>
-		<view class="mask" v-if="posters || posterImageStatus" @click="listenerActionClose"></view>
-		<!--口令复制结果-->
-		<copyPassword :isCopy='isCopy' :copyUrl='copyUrl' @close="closeCopy"></copyPassword>
-		<!-- 海报展示 -->
-		<view class='poster-pop' v-if="posterImageStatus">
-			<image src='../../../static/images/poster-close.png' class='close' @click="posterImageClose"></image>
-			<image class="poster-image" :src='posterImage'></image>
-			<!-- #ifndef H5  -->
-			<view class='save-poster' @click="savePosterPath">保存到手机</view>
-			<!-- #endif -->
-			<!-- #ifdef H5 -->
-			<view class="keep">长按图片可以保存到手机</view>
-			<!-- #endif -->
-		</view>
-		<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
-
-		<!-- #ifndef H5 -->
-		<passwordPopup></passwordPopup>
-		<!-- #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>
-	// +----------------------------------------------------------------------
-	import {
-		getAssistDetail,
-		postAssistHelp,
-		assistHelpList,
-		initiateAssistApi,
-		getAssistUser
-	} from '../../../api/activity.js';
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	import { postCartAdd, getProductCode, copyPasswordApi } from '../../../api/store.js';
-	import copyPassword from '@/components/copyPassword';
-	import util from '../../../utils/util.js';
-	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
-	import { mapGetters } from "vuex";
-	import { configMap } from "@/utils";
-	import authorize from '@/components/Authorize';
-	// #ifndef H5
-	import passwordPopup from '@/components/passwordPopup';
-	// #endif
-	import countDown from '@/components/countDown';
-	import home from '@/components/home';
-	import parser from "@/components/jyf-parser/jyf-parser";
-	import { silenceBindingSpread } from "@/utils";
-	import { spread, imgToBase } from '@/api/user.js'
-	import history from "@/mixins/history";
-	import shareScence from "@/libs/spread";
-	const app = getApp();
-	export default {
-		components: {
-			// #ifndef H5
-			passwordPopup,
-			// #endif
-			countDown,
-			copyPassword,
-			authorize,
-			home,
-			"jyf-parser": parser
-		},
-		mixins: [history],
-		/**
-		 * 页面的初始数据
-		 */
-		data() {
-			return {
-				countDownDay: '00',
-				countDownHour: '00',
-				countDownMinute: '00',
-				countDownSecond: '00',
-				active: false,
-				id: 0, //助力产品编号
-				userInfo: {}, //当前用户信息
-				bargainUid: 0, //开启助力用户
-				bargainUserInfo: {}, //开启助力用户信息
-				bargainUserId: 0, //开启助力编号
-				bargainInfo: [], //助力产品
-				bargainData: {
-					assistSku: []
-				},
-				offset: 0,
-				limit: 20,
-				limitStatus: false,
-				bargainUserHelpList: [],
-				bargainUserHelpInfo: [],
-				bargainUserBargainPrice: 0,
-				status: '', // 0 开启助力   1  朋友帮忙助力  2 朋友帮忙助力成功 3 完成助力  4 助力失败 5已创建订单
-				bargainCount: [], //分享人数  浏览人数 参与人数
-				old_price: 0,
-				retunTop: true,
-				bargainPartake: 0,
-				interval: null,
-				userBargainStatus: 0, //判断自己是否助力
-				productStock: 0, //判断是否售罄；
-				quota: 0, //判断是否已限量；
-				userBargainStatusHelp: true,
-				navH: '',
-				statusPay: '',
-				bargainSumCount: 0,
-				bargainPrice: 0,
-				datatime: 0,
-				offest: '',
-				tagStyle: {
-					img: 'width:100%;display:block;',
-					video: 'width:100%;'
-				},
-				domain: HTTP_REQUEST_URL,
-				H5ShareBox: false, //公众号分享图片
-				systemH: 0,
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				pages: '',
-				protocol: '',
-				host: '',
-				currSpid: "",
-				posters: false,
-				actionSheetHidden: true,
-				posterImageStatus: false,
-				storeImage: '', //海报产品图
-				PromotionCode: '', //二维码图片
-				canvasStatus: false, //海报绘图标签
-				posterImage: '', //海报路径
-				posterbackgd: '/static/images/posterbackgd.png',
-				isDown: true,
-				isCopy: false,
-				copyUrl: '',
-				load: false,
-			}
-		},
-		computed:{
-			...configMap({site_name: '',share_pic: ''}, mapGetters(['isLogin','uid','viewColor','keyColor'])),
-		},
-		watch: {
-			isLogin: {
-				handler: function(newV, oldV) {
-					if (newV) {
-						this.getBargainDetails();
-					}
-				},
-				deep: true
-			}
-		},
-		/**
-		 * 生命周期函数--监听页面加载
-		 */
-		onLoad: function(options) {
-			var that = this;
-			if(options.spid){
-				app.globalData.spid = options.spid;
-				that.currSpid = options.spid
-			}
-			// #ifdef MP
-			uni.getSystemInfo({
-				success: function(res) {
-					that.systemH = res.statusBarHeight
-					that.navH = that.systemH + 10
-				}
-			})
-			// #endif
-			var pages = getCurrentPages();
-			if (pages.length <= 1) {
-				// that.retunTop = false
-			}
-			//扫码携带参数处理
-			// #ifdef MP
-			if (options.scene) {
-				var value = util.getUrlParams(decodeURIComponent(options.scene));
-				if (typeof value === 'object') {
-					if (value.id) options.id = value.id;
-					if (value.bargain) options.bargain = value.bargain;
-					//记录推广人uid
-					if (value.spid){
-						app.globalData.spid = value.spid;
-						that.currSpid = value.spid
-					}
-				} else {
-					app.globalData.spid = value;
-				}
-			}
-			//记录推广人uid
-			if (options.spid) app.globalData.spid = options.spid;
-			// #endif
-			if (options.hasOwnProperty('id')) {
-				that.id = options.id;
-				that.bargainUid = options.bargain || 0
-			}
-			if (that.isLogin) {
-				// console.log(that.bargainUid, 'that.bargainUid')
-				if (that.bargainUid == 'undefined') {
-					that.bargainUid = that.$store.state.app.uid
-				}
-				that.getBargainDetails();
-				that.downloadFilePromotionCode();
-				//#ifdef APP-PLUS
-				that.downloadFilePromotionCode();
-				// #endif
-				// #ifdef MP
-				that.getHistory()
-				// #endif
-			} else {
-				this.isAuto = true;
-				this.isShowAuth = true
-			}
-			shareScence(that.currSpid,that.isLogin)
-			uni.setNavigationBarTitle({
-				title: '助力详情'
-			})
-		},
-		onShow: function(){
-			// #ifdef H5
-			this.protocol = window.location.protocol
-			this.host = window.location.host
-			//#endif
-		},
-		onReady: function() {
-			// #ifdef H5
-			this.$nextTick(function() {
-				const clipboard = new ClipboardJS(".copy-data");
-				clipboard.on("success", () => {
-					this.$util.Tips({
-						title: '链接已复制成功，请粘贴分享'
-					});
-				});
-			});
-			// #endif
-		},
-		methods: {
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e;
-			},
-			goBack: function() {
-				uni.navigateBack({
-					delta: 1
-				})
-			},
-			// 去商品页
-			goProduct() {
-				uni.navigateTo({
-					url: `/pages/goods_details/index?id=${this.bargainInfo.product.old_product_id}`
-				})
-			},
-			/**
-			 * 生成海报
-			 */
-			async goPoster() {
-				if (this.posterImage) {
-					this.posterImageStatus = true
-					this.posters = false
-					return
-				}
-				let that = this;
-				let arr2
-				that.posters = false;
-				that.$set(that, 'canvasStatus', true);
-				uni.showLoading({
-					title: '海报生成中',
-					mask: true
-				});
-				// #ifdef H5
-				arr2 = [that.posterbackgd, await that.imgToBase(that.storeImage), await that.imgToBase(that.codeImg), await that.imgToBase(that.share_pic)];
-				// #endif
-				// #ifdef MP || APP-PLUS
-				arr2 = [that.posterbackgd, await that.fileStoreImage(that.storeImage), await that.fileStoreImage(
-					that.codeImg), await that.fileStoreImage(that.share_pic)];
-				// #endif
-				that.$util.goodsPosterCanvas(arr2, that.bargainData.store_name, that.bargainPrice, that.site_name, that.old_price, function(tempFilePath) {
-					that.$set(that, 'posterImage', tempFilePath);
-					that.$set(that, 'posterImageStatus', true);
-					that.$set(that, 'canvasStatus', false);
-					that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-				}, (err) => {
-					that.$set(that, 'canvasStatus', false);
-				});
-			},
-			async imgToBase(url) {
-				let res = await imgToBase({
-					image: url
-				})
-				return res.data.image
-			},
-			//图片转符合安全域名路径
-			fileStoreImage(url) {
-				// #ifdef MP
-				let ishttps = url.split('//')[0] == 'https:'
-				if (!ishttps) {
-					url = 'https://'+url.split('//')[1]
-				}
-				// #endif
-				return new Promise((resolve, reject) => {
-					let that = this;
-					uni.downloadFile({
-						url: url,
-						success: function(res) {
-							resolve(res.tempFilePath);
-						},
-						fail: function(error) {
-							// console.log(error)
-							return that.$util.Tips({
-								title: `${error}`
-							});
-						}
-					});
-				})
-			},
-			/**
-			 * 分享打开
-			 *
-			 */
-			listenerActionSheet: function() {
-				if (this.isLogin == false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					this.posters = !this.posters;
-				}
-			},
-			// 分享关闭
-			listenerActionClose: function() {
-				this.posters = false;
-			},
-			//隐藏海报
-			posterImageClose: function() {
-				this.posterImageStatus = false
-			},
-			downloadFilePromotionCode() {
-				let that = this;
-				getProductCode(that.id, {
-					type: 'wechat',
-					product_type: 3
-				}).then(async res => {
-					that.codeImg = res.data.url;
-					// console.log(this.codeImg)
-					that.$set(that, 'isDown', false);
-				}).catch(err => {
-					that.$util.Tips({
-						title: err
-					});
-					that.posters = false;
-					that.$set(that, 'isDown', false);
-					that.$set(that, 'PromotionCode', '');
-				});
-			},
-
-			/*
-			 * 保存到手机相册
-			 */
-
-			savePosterPath: function() {
-				let that = this;
-				// #ifdef APP-PLUS
-				uni.saveImageToPhotosAlbum({
-					filePath: that.posterImage,
-					success: function(res) {
-						that.posterImageClose();
-						that.$util.Tips({
-							title: '保存成功',
-							icon: 'success'
-						});
-					},
-					fail: function(res) {
-						that.$util.Tips({
-							title: '保存失败'
-						});
-					},
-				})
-				// #endif
-			},
-			//复制口令
-			copyPwd(){
-				let that = this;
-				copyPasswordApi({
-					id: that.id,
-					product_type: 30
-				}).then(async res => {
-					that.copyUrl = res.data.str;
-					that.posters = false
-					that.isCopy = true;
-				})
-			},
-			closeCopy(){
-				this.isCopy = false
-			},
-			goPay: function() { //立即支付
-				var that = this;
-				var data = {
-					product_id: that.bargainInfo.product_assist_set_id,
-					product_attr_unique: that.bargainInfo.product.unique,
-					cart_num: 1,
-					product_type: 3,
-					is_new: 1
-				};
-				postCartAdd(data).then(res => {
-					uni.navigateTo({
-						url: '/pages/users/order_confirm/index?new=1&cartId=' + res.data.cart_id
-					});
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					})
-				});
-			},
-			getBargainDetails: function() { //获取助力产品详情
-				var that = this;
-				var id = that.id;
-				getAssistDetail(id).then(function(res) {
-					that.bargainInfo = res.data;
-					that.bargainData = res.data.assist;
-					that.bargainPrice = that.bargainData.assistSku[0].assist_price;
-					that.old_price = (that.bargainData.assistSku[0].sku && that.bargainData.assistSku[0].sku.price) || 0;
-					that.userInfo = res.data.user;
-					that.bargainSumCount = res.data.yet_assist_count;
-					that.$set(that, 'storeImage', that.bargainInfo.product.image);
-					that.datatime = res.data.stopTime;
-					that.pages = '/pages/activity/assist_detail/index?id=' + that.id;
-					that.bargainUserHelpList = []
-					that.getBargainUser();
-					//#ifdef H5
-					that.setOpenShare();
-					//#endif
-				}).catch(function(err) {
-					that.$util.Tips({
-						title: err
-					}, {
-						tab: 3
-					})
-				})
-			},
-			currentBargainUser: function() { //当前用户助力
-				let that = this;
-				let id = that.bargainInfo.product_assist_id;
-				initiateAssistApi(id).then(res => {
-					let assist_id = res.data.product_assist_set_id
-					uni.hideLoading();
-					uni.navigateTo({
-						url: '/pages/activity/assist_detail/index?id=' + assist_id
-					});			
-				}).catch((err) => {
-					uni.hideLoading();
-					that.$util.Tips({
-						title: err
-					})
-				});
-			},
-			setBargainHelp: function() { //帮好友助力
-				var that = this;
-				that.load = true
-				postAssistHelp(that.bargainInfo.product_assist_set_id).then(res => {
-					that.$set(that, 'bargainUserHelpList', []);
-					that.getBargainUser();
-					that.$util.Tips({
-						title: res.message
-					})
-					that.getBargainDetails();
-					that.load = false
-				}).catch(err => {
-					that.$util.Tips({
-						title: err
-					})
-					that.$set(that, 'bargainUserHelpList', []);
-					that.getBargainUser();
-					that.load = false
-				})
-			},
-			getBargainUser: function() { //获取助力帮
-				var that = this;
-				var data = {
-					offset: that.offset,
-					limit: that.limit,
-				};
-				assistHelpList(that.id).then(res => {
-					var bargainUserHelpListNew = [];
-					var bargainUserHelpList = that.bargainUserHelpList;
-					var len = res.data.list.length;
-					bargainUserHelpListNew = bargainUserHelpList.concat(res.data.list);
-					that.$set(that, 'bargainUserHelpList', res.data.list);
-					that.$set(that, 'limitStatus', data.limit > len);
-					that.$set(that, 'offest', (Number(data.offset) + Number(data.limit)));
-				});
-			},
-			goBargainList: function() {
-				uni.navigateTo({
-					url: '/pages/activity/assist/index',
-				})
-			},
-			goOrderDetail: function(order) {
-				if (order.paid == 1) {
-					uni.navigateTo({
-						url: '/pages/order_details/index?order_id=' + order.order_id,
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/order_details/stay?order_id=' + order.group_order_id,
-					})
-				}
-			},
-			close: function() {
-				this.$set(this, 'active', false);
-			},
-			onLoadFun: function(e) {
-				this.getBargainDetails();
-				this.isShowAuth = false
-				this.downloadFilePromotionCode();
-			},
-			addShareAssist: function() { //添加分享次数 获取人数
-				var that = this;
-				getAssistUser(that.bargainInfo.product_assist_set_id).then(res => {});
-			},
-			//#ifdef H5
-			setOpenShare() {
-				let that = this;
-				let configTimeline = {
-					title: "您的好友" +
-						that.userInfo.nickname +
-						"邀请您助力" +
-						that.bargainInfo.product.store_name,
-					desc: that.bargainInfo.product.store_name,
-					link: window.location.protocol +
-						"//" +
-						window.location.host +
-						"/pages/activity/assist_detail/index?id=" +
-						that.id+'&spid='+that.uid,
-					imgUrl: that.bargainInfo.product.image,
-				};
-				if (this.$wechat.isWeixin()) {
-					this.$wechat.wechatEvevt([
-								"updateAppMessageShareData",
-								"updateTimelineShareData",
-								"onMenuShareAppMessage",
-								"onMenuShareTimeline"
-							],
-							configTimeline
-						)
-						.then(res => {
-							// console.log(res);
-						})
-						.catch(res => {
-							if (res.is_ready) {
-								res.wx.updateAppMessageShareData(configTimeline);
-								res.wx.updateTimelineShareData(configTimeline);
-								res.wx.onMenuShareAppMessage(configTimeline);
-								res.wx.onMenuShareTimeline(configTimeline);
-							}
-						});
-				}
-			}
-			//#endif
-		},
-		/** 生命周期函数--监听页面隐藏
-		 */
-		onHide: function() {
-			if (this.interval !== null) clearInterval(this.interval);
-		},
-		/**
-		 * 生命周期函数--监听页面卸载
-		 */
-		onUnload: function() {
-			if (this.interval !== null) clearInterval(this.interval);
-		},
-		//#ifdef MP
-		/**
-		 * 用户点击右上角分享
-		 */
-		onShareAppMessage: function() {
-			let that = this,
-				share = {
-					title: '您的好友' + that.userInfo.nickname + '邀请您帮他助力' + that.bargainInfo.product.store_name + ' 快去帮忙吧！',
-					path: '/pages/activity/assist_detail/index?id=' + this.id+'&spread='+that.uid,
-					imageUrl: that.bargainInfo.product.image,
-				};
-			that.close();
-			that.addShareAssist();
-			return share;
-		},
-		//#endif
-	}
-</script>
-
-<style lang="scss">
-	.page-container {
-		min-height: 100vh;
-		background-color: var(--view-theme);
-	}
-	.canvas {
-		z-index: 300;
-		width: 750px;
-		height: 1190px;
-		opacity: 0;
-	}
-	.poster-pop {
-		width: 600rpx;
-		height: 897rpx;
-		position: fixed;
-		left: 50%;
-		transform: translateX(-50%);
-		z-index: 1000;
-		top: 50%;
-		margin-top: -446rpx;	
-	}
-	.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%;
-		border-radius: 43rpx;
-		margin-top: 20rpx;
-	}
-	.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;
-		width: 100%;
-		height: 100%;
-		background-color: rgba(0, 0, 0, 0.6);
-		z-index: 100;
-	}
-	.generate-posters {
-		width: 100%;
-		height: 170rpx;
-		background-color: #fff;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		z-index: 999;
-		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;
-	}
-	.generate-posters .item .iconfont.icon-fuzhikouling1 {
-		color: #FBB324;
-	}
-	.bargain .icon-xiangzuo {
-		font-size: 40rpx;
-		color: #fff;
-		position: fixed;
-		top: 30rpx;
-		left: 30rpx;
-		z-index: 99;
-		font-size: 36rpx;
-	}
-	.bargain .header {
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		width: 698rpx;
-		height: 572rpx;
-		margin: 0 auto;
-		padding-top: 0.1rpx;
-		position: relative;
-	}
-	.bargain .header .pictxt {
-		margin: 330rpx auto 0 auto;
-		font-size: 26rpx;
-		color: #fff;
-	}
-	.bargain .header .pictxt .pictrue {
-		width: 56rpx;
-		height: 56rpx;
-		margin-right: 30rpx;
-	}
-	.bargain .header .pictxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-		border: 2rpx solid #fff;
-	}
-	.bargain .header .pictxt .text text {
-		margin-left: 20rpx;
-	}
-	.bargain .header .time {
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		width: 470rpx;
-		height: 176rpx;
-		font-size: 22rpx;
-		text-align: center;
-		padding-top: 11rpx;
-		box-sizing: border-box;
-		position: absolute;
-		top: 340rpx;
-		left: 50%;
-		margin-left: -220rpx;
-		align-items: inherit;
-	}
-	.t-color {
-		color: var(--view-theme);
-	}
-	.b-color {
-		background-color: var(--view-theme);
-	}
-	.bargain .header .people {
-		text-align: center;
-		color: #fff;
-		font-size: 20rpx;
-		position: absolute;
-		width: 100%;
-		/* #ifdef MP || APP-PLUS */
-		height: 44px;
-		line-height: 44px;
-		/* #endif */
-		/* #ifdef H5 */
-		top: 36rpx;
-		/* #endif */
-	}
-	.bargain .header .time text {
-		// color: var(--view-theme);
-	}
-	.bargain .wrapper,
-	.bargain .bargainGang,
-	.bargain .goodsDetails {
-		width: 660rpx;
-		border: 6rpx solid #fc8b42;
-		background-color: #fff;
-		border-radius: 20rpx;
-		margin: -162rpx auto 0 auto;
-		box-sizing: border-box;
-		padding: 0 24rpx 47rpx 24rpx;
-		position: relative;
-	}
-	.bargain .wrapper .pictxt {
-		margin: 26rpx 0 37rpx 0;
-	}
-	.bargain .wrapper .pictxt .pictrue {
-		width: 180rpx;
-		height: 180rpx;
-		position: relative;
-	}
-	.bargain .wrapper .pictxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-	.bargain .wrapper .pictxt .text {
-		width: 395rpx;
-		font-size: 28rpx;
-		color: #282828;
-		height: 180rpx;
-	}
-	.bargain .wrapper .pictxt .text .money {
-		font-weight: bold;
-		font-size: 24rpx;
-		color: var(--view-priceColor);
-	}
-	.bargain .wrapper .pictxt .text .money .num {
-		font-size: 36rpx;
-	}
-	.bargain .wrapper .pictxt .text .old-price{
-		text-decoration: line-through;
-		color: #999;
-		margin-left: 10rpx;
-		font-size: 24rpx;
-	}
-	.bargain .wrapper .pictxt .text .successNum {
-		font-size: 22rpx;
-		color: #999;
-	}
-	.bargain .wrapper .cu-progress {
-		overflow: hidden;
-		height: 12rpx;
-		background-color: #eee;
-		width: 100%;
-		border-radius: 20rpx;
-	}
-	.bargain .wrapper .cu-progress .bg-red {
-		width: 0;
-		height: 100%;
-		transition: width 0.6s ease;
-		border-radius: 20rpx;
-		background-image: linear-gradient(to right, var(--view-bntColor11) 0%, var(--view-bntColor12) 100%);
-	}
-	.bargain .wrapper .money {
-		font-size: 22rpx;
-		color: #999;
-		margin-top: 15rpx;
-	}
-	.bargain .wrapper .bargainSuccess {
-		font-size: 26rpx;
-		color: #282828;
-		text-align: center;
-	}
-	.bargain .wrapper .bargainSuccess .iconfont {
-		font-size: 45rpx;
-		color: #54c762;
-		padding-right: 18rpx;
-		vertical-align: -5rpx;
-	}
-	.bargain .wrapper .bargainBnt {
-		font-size: 30rpx;
-		font-weight: bold;
-		color: #fff;
-		width: 600rpx;
-		height: 80rpx;
-		border-radius: 40rpx;
-		background-image: linear-gradient(to right, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-		text-align: center;
-		line-height: 80rpx;
-		margin-top: 32rpx;
-		&.disabled {
-			background: #BFBFBF;
-			pointer-events: none;
-		}
-	}
-	.bargain .wrapper .bargainBnt.on {
-		border: 2rpx solid var(--view-theme);
-		color: var(--view-theme);
-		background-image: linear-gradient(to right, #fff 0%, #fff 100%);
-		width: 596rpx;
-		height: 76rpx;
-	}
-	.bargain .wrapper .bargainBnt.grey {
-		color: #fff;
-		background-image: linear-gradient(to right, #BBBBBB 0%, #BBBBBB 100%);
-	}
-	.bargain .wrapper .tip {
-		font-size: 22rpx;
-		color: #999;
-		text-align: center;
-		margin-top: 20rpx;
-	}
-	.bargain .wrapper .lock,
-	.bargain .bargainGang .lock,
-	.bargain .goodsDetails .lock {
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		width: 548rpx;
-		height: 66rpx;
-		position: absolute;
-		left: 50%;
-		transform: translateX(-50%);
-		bottom: -43rpx;
-		z-index: 5;
-	}
-	.bargain .bargainGang {
-		margin: 13rpx auto 0 auto;
-	}
-	.bargain .bargainGang .title,
-	.bargain .goodsDetails .title {
-		font-size: 32rpx;
-		font-weight: bold;
-		height: 80rpx;
-		margin-top: 30rpx;
-	}
-	.bargain .bargainGang .title .pictrue,
-	.bargain .goodsDetails .title .pictrue {
-		width: 46rpx;
-		height: 24rpx;
-	}
-	.bargain .bargainGang .title .pictrue.on,
-	.bargain .goodsDetails .title .pictrue.on {
-		transform: rotate(180deg);
-	}
-	.bargain .bargainGang .title .pictrue image,
-	.bargain .goodsDetails .title .pictrue image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-	.bargain .bargainGang .title .titleCon,
-	.bargain .goodsDetails .title .titleCon {
-		margin: 0 20rpx;
-		color: var(--view-theme);
-	}
-	.bargain .bargainGang .list .item {
-		border-bottom: 1rpx dashed #ddd;
-		height: 112rpx;
-	}
-	.bargain .bargainGang .list .item .pictxt {
-		width: 310rpx;
-	}
-	.bargain .bargainGang .list .item .pictxt .pictrue {
-		width: 70rpx;
-		height: 70rpx;
-	}
-	.bargain .bargainGang .list .item .pictxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-	}
-	.bargain .bargainGang .list .item .pictxt .text {
-		width: 225rpx;
-		font-size: 20rpx;
-		color: #999;
-	}
-	.bargain .bargainGang .list .item .pictxt .text .name {
-		font-size: 25rpx;
-		color: #282828;
-		margin-bottom: 7rpx;
-	}
-	.bargain .bargainGang .list .item .money {
-		font-size: 25rpx;
-	}
-	.bargain .bargainGang .list .item .money .iconfont {
-		font-size: 35rpx;
-		vertical-align: middle;
-		margin-right: 10rpx;
-	}
-	.bargain .bargainGang .load {
-		font-size: 24rpx;
-		text-align: center;
-		line-height: 80rpx;
-		height: 80rpx;
-	}
-	.bargain .goodsDetails {
-		margin: 13rpx auto 0 auto;
-	}
-	.bargain .goodsDetails~.goodsDetails {
-		margin-bottom: 50rpx;
-	}
-	.bargain .goodsDetails .conter {
-		margin-top: 20rpx;
-		overflow: hidden;
-	}
-	.bargain_view {
-		width: 180rpx;
-		height: 48rpx;
-		background: rgba(0, 0, 0, 0.5);
-		opacity: 1;
-		border-radius: 0 0 6rpx 6rpx;
-		position: absolute;
-		bottom: 0;
-		font-size: 22rpx;
-		color: #fff;
-		text-align: center;
-		line-height: 48rpx;
-	}
-	.iconfonts {
-		font-size: 22rpx !important;
-	}
-	.bargain .mask {
-		z-index: 100;
-	}
-	.share-box {
-		z-index: 1000;
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-</style>
diff --git a/pages/activity/assist_record/index.vue b/pages/activity/assist_record/index.vue
deleted file mode 100644
index c44a43e..0000000
--- a/pages/activity/assist_record/index.vue
+++ /dev/null
@@ -1,297 +0,0 @@
-<template>
-	<view :style="viewColor">
-		<block v-if="bargain.length>0">
-			<div class="bargain-record" ref="container">
-				<div class="item" v-for="(item, index) in bargain" :key="index">
-					<div class="picTxt acea-row row-between-wrapper">
-						<div v-if="item.product" class="pictrue">
-							<image :src="item.product.image ? item.product.image : ''" />
-						</div>
-						<div class="text acea-row row-column-around">
-							<div v-if="item.product" class="line1" style="width: 100%;">{{ item.product.store_name }}</div>
-							<count-down :justify-left="'justify-content:left'" :is-day="true" :tip-text="'倒计时 '" :day-text="' 天 '" :hour-text="' 时 '" :minute-text="' 分 '"
-							 :second-text="' 秒'" :datatime="item.stop_time" v-if="item.status === 1" :id="item.product_assist_set_id"></count-down>
-							 <view class="acea-row price_count">
-								 <view class='money t-color'>
-								 	助力价: ￥
-								 	<text class='num' v-if="item.assistSku && item.assistSku[0]">{{item.assistSku[0].assist_price}}</text>
-								 </view>
-								 <view class='money money_lf' v-if="item.product">
-								 	<text class="under_price">￥{{item.product.price}}</text>
-								 </view>
-							 </view>
-						</div>
-					</div>
-					<div class="bottom acea-row row-between-wrapper">
-						<div class="purple" v-if="item.status === 1 || item.status === 0">活动进行中</div>
-						<div class="success" v-if="item.status === 10 || item.status === 20">助力成功</div>
-						<div class="end" v-if="item.status === -1">活动已结束</div>
-						<div class="acea-row row-middle row-right">
-							<div v-if="item.status === 1 || item.status === 0">
-								<div class="bnt cancel" @click="getBargainUserCancel(item.product_assist_set_id)">
-									取消活动
-								</div>
-								<div class="bnt b-color" @click="getInvitation(item.product_assist_set_id)">
-									邀请助力
-								</div>
-							</div>				
-							<div v-if="item.status === 10 || item.status === 20">
-								<view v-if="(item.order.paid == 0 || item.order.paid == 1) && item.status === 20"class="bnt b-color" @click="goOrderDetail(item.order)">查看详情</view>
-								<view v-else  class="bnt b-color" @click="goPay(item)">立即付款</view>
-							</div>							
-						</div>
-					</div>
-				</div>
-				<Loading :loaded="status" :loading="loadingList"></Loading>
-			</div>
-		</block>
-		<block v-if="bargain.length == 0">
-			<emptyPage title="暂无记录～"></emptyPage>
-		</block>
-		<home></home>
-	</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>
-	// +----------------------------------------------------------------------
-	import CountDown from "@/components/countDown";
-	import emptyPage from '@/components/emptyPage.vue'
-	import { getBargainUserList, getBargainUserCancel } from "@/api/activity";
-	import { postCartAdd } from '../../../api/store.js';
-	import Loading from "@/components/Loading";
-	import home from '@/components/home';
-	import { mapGetters } from "vuex";
-	export default {
-		name: "BargainRecord",
-		components: {
-			CountDown,
-			Loading,
-			emptyPage,
-			home
-		},
-		computed: { ...mapGetters(['viewColor'])},
-		props: {},
-		data: function() {
-			return {
-				bargain: [],
-				status: false, //助力列表是否获取完成 false 未完成 true 完成
-				loadingList: false, //当前接口是否请求完成 false 完成 true 未完成
-				page: 1, //页码
-				limit: 20, //数量
-			};
-		},
-		onLoad: function() {
-			this.getBargainUserList();
-		},
-		onReady() {
-			uni.$once('endTime',(data)=>{
-				this.bargain.forEach((el,index)=>{
-					if(el.product_assist_set_id == data){
-						el.status = -1
-					}
-				})
-			})
-		},
-		methods: {
-			goDetail: function(id) {
-				uni.navigateTo({
-					url: `/pages/activity/assist_detail/index?id=${id}`
-				})
-			},
-			getBargainUserList: function() {
-				var that = this;
-				if (that.loadingList) return;
-				if (that.status) return;
-				getBargainUserList({
-						page: that.page,
-						limit: that.limit
-					})
-					.then(res => {
-						that.status = res.data.list.length < that.limit;
-						that.bargain.push.apply(that.bargain, res.data.list);
-						that.page++;
-						that.loadingList = false;
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						})
-					});
-			},
-			// 立即购买
-			goPay: function(item) { //立即支付
-				var that = this;
-				var data = {
-					product_id : item.product_assist_set_id,
-					product_attr_unique: item.assistSku[0].unique,
-					cart_num: 1,
-					product_type: 3,
-					is_new: 1					
-				};
-				postCartAdd(data).then(res => {
-					uni.navigateTo({
-						url: '/pages/users/order_confirm/index?new=1&cartId=' + res.data.cart_id
-					});
-				}).catch(err => {
-					return that.$util.Tips({title:err})
-				});
-			},
-			// 邀请助力
-			getInvitation: function(id){
-				uni.navigateTo({
-					url: '/pages/activity/assist_detail/index?id=' + id
-				});
-			},
-			// 查看详情
-			goOrderDetail: function(order) {
-				if(order.paid == 1){
-					uni.navigateTo({
-						url: '/pages/order_details/index?order_id='+order.order_id,
-					})
-				}else{
-					uni.navigateTo({
-						url: '/pages/order_details/stay?order_id='+order.group_order_id,
-					})
-				}
-			},		
-			// 取消
-			getBargainUserCancel: function(id) {
-				var that = this;
-				getBargainUserCancel(id)
-					.then(res => {
-						that.status = false;
-						that.loadingList = false;
-						that.page = 1;						
-						that.$util.Tips({
-							title: res.message
-						})
-						setTimeout(function(){
-							that.bargain = [];
-							that.getBargainUserList();
-						},3000)					
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						})
-					});
-			},		
-		},
-		onReachBottom() {
-			this.getBargainUserList();
-		}
-	};
-</script>
-
-<style lang="scss">
-	/*助力记录*/
-	.bargain-record .item .picTxt .text .time .styleAll {
-		color: #fc4141;
-		font-size:24rpx;
-	}
-	.bargain-record .item .picTxt .text .time .red {
-		color: #999;
-		font-size:24rpx;
-	}
-	.bargain-record .item {
-		background-color: #fff;
-		margin-bottom: 12upx;
-	}
-	.bargain-record .item .price_count{
-		align-items: center;
-		.money_lf{
-			margin-left: 10rpx;
-		}
-		.t-color {
-			color: var(--view-priceColor);
-		}
-		.under_price{
-			color: #999999;
-			font-size: 26rpx;
-			text-decoration: line-through;
-		}
-	}
-	.bargain-record .item .picTxt {
-		height: 210upx;
-		border-bottom: 1px solid #f0f0f0;
-		padding: 0 30upx;
-	}
-	.bargain-record .item .picTxt .pictrue {
-		width: 150upx;
-		height: 150upx;
-	}
-	.bargain-record .item .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6upx;
-	}
-	.bargain-record .item .picTxt .text {
-		width: 515upx;
-		font-size: 30upx;
-		color: #282828;
-		height: 150upx;
-	}
-	.bargain-record .item .picTxt .text .time {
-		font-size: 24upx;
-		color: #868686;
-		justify-content: left !important;
-	}
-	.bargain-record .item .picTxt .text .successTxt{
-		font-size:24rpx;
-	}
-	.bargain-record .item .picTxt .text .endTxt{
-		font-size:24rpx;
-		color: #999;
-	}
-	.bargain-record .item .picTxt .text .money {
-		font-size: 24upx;
-	}
-	.bargain-record .item .picTxt .text .money .num {
-		font-size: 32upx;
-		font-weight: bold;
-	}
-	.bargain-record .item .picTxt .text .money .symbol {
-		font-weight: bold;
-	}
-	.bargain-record .item .bottom {
-		height: 100upx;
-		padding: 0 30upx;
-		font-size: 27upx;
-	}
-	.bargain-record .item .bottom .purple {
-		color: #f78513;
-	}
-	.bargain-record .item .bottom .end {
-		color: #999;
-	}
-	.bargain-record .item .bottom .success {
-		color: var(--view-theme);
-	}
-	.bargain-record .item .bottom .bnt {
-		font-size: 27upx;
-		color: #fff;
-		width: 176upx;
-		height: 60upx;
-		border-radius: 32upx;
-		text-align: center;
-		line-height: 60upx;
-		display: inline-block;
-		&.b-color {
-			background-color: var(--view-theme);
-		}
-	}
-	.bargain-record .item .bottom .bnt.cancel {
-		color: #aaa;
-		border: 1px solid #ddd;
-	}
-	.bargain-record .item .bottom .bnt~.bnt {
-		margin-left: 18upx;
-	}
-</style>
diff --git a/pages/activity/collect_coupons/index.vue b/pages/activity/collect_coupons/index.vue
deleted file mode 100644
index 18b6c4f..0000000
--- a/pages/activity/collect_coupons/index.vue
+++ /dev/null
@@ -1,371 +0,0 @@
-<template>
-	<view class='my-coupon' :style="viewColor">
-		<view class='header'>
-			<view class='nav acea-row row-around'>
-				<view class='item' :class='type==-1 ? "on": ""' @click="statusClick(-1)">
-					<view>全部</view>
-				</view>
-				<view class='item' :class='type==10 ? "on": ""' @click="statusClick(10)">
-					<view>通用券</view>
-				</view>
-				<view class='item' :class='type==11 ? "on": ""' @click="statusClick(11)">
-					<view>品类券</view>
-				</view>
-				<view class='item' :class='type==12 ? "on": ""' @click="statusClick(12)">
-					<view>跨店券</view>
-				</view>
-				<view class='item' :class='type==0 ? "on": ""' @click="statusClick(0)">
-					<view>店铺券</view>
-				</view>
-			</view>
-		</view>
-		<view class="listBox">
-			<block v-for="(item) in list" :key='item.coupon_id'>
-				<view class="list acea-row row-around">
-					<view class="left cross" v-if="item.ProductLst.length == 1 || item.ProductLst.length == 0">
-						<view v-if="item.ProductLst.length == 1" class="cross-left" v-for="(items,index) in item.ProductLst" :key='index'>
-							<easyLoadimage :image-src="items.image"></easyLoadimage>
-						</view>
-						<view v-if="item.ProductLst.length == 0" class="cross-left">
-							<image src="../static/images/no_product.png"></image>
-						</view>
-						<view class="tips cross-right">					
-							<view class="title line2">{{item.title || ''}}</view>						
-							<view class="time">{{item.create_time}}</view>
-						</view>
-					</view>
-					<view class="left" v-else>
-						<view class="tips line1">{{item.title || ''}}</view>
-						<view class="info">
-							<view class="info-box" v-for="(items,index) in item.ProductLst" :key='index'>
-								<easyLoadimage :image-src="items.image"></easyLoadimage>
-								<view class="money">¥ {{items.price}}</view>
-							</view>
-						</view>
-					</view>
-					<view class="right">
-						<view class="couponlogo" v-if="item.type == 10">通用券</view>
-						<view class="couponlogo" v-if="item.type == 11">品类券</view>
-						<view class="couponlogo" v-if="item.type == 12">跨店券</view>
-						<view class="couponlogo" v-if="item.type == 0">店铺券</view>
-						<view class="title">
-							<view>
-								<p><text class='font1'>¥</text><text class='font2'>{{parsePrice(item.coupon_price)}}</text></p>
-								<p>
-									<text class='font3' v-if="item.use_min_price == 0">无使用门槛</text>
-									<text class='font3' v-else>满{{parsePrice(item.use_min_price)}}元可用</text>
-								</p>
-							</view>
-							<view class="btn" :class="item.ProductLst.length == 0 ? 'disabled' : ''"  v-if="!item.issue" @click="receiveCoupon(item)">立即领取</view>
-							<navigator :url="'/pages/columnGoods/goods_coupon_list/index?coupon_id='+item.coupon_id" class='btn shiyong' hover-class="none" v-if="item.issue && item.ProductLst.length > 0">
-							去使用
-							</navigator>
-							<view v-if="item.issue && item.ProductLst.length == 0" class='btn shiyong disabled'>去使用</view>
-						</view>
-					</view>
-				</view>	
-			</block>				
-		</view>
-		<view class="loadingicon acea-row row-center-wrapper">
-			<text class="loading iconfont icon-jiazai" :hidden="loading == false" style="color:#33;"></text>
-		</view>
-		<view class='noCommodity' v-if="!list.length && loaded">
-			<view class='pictrue'>
-				<image src='/static/images/noCoupon.png'></image>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {getCouponLst} from '@/api/activity.js';
-	import {setCouponReceive} from '@/api/api.js';
-	import { mapGetters } from "vuex";
-	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-	export default {
-		computed: mapGetters(['viewColor']),
-		components: {
-			easyLoadimage
-		},
-		data() {
-			return {
-				type: '',
-				list:[],
-				loading: false,
-				loaded: false,
-				page: 1,
-				limit: 15,
-			}
-		},
-		onLoad: function() {
-			this.statusClick(-1)
-		},
-		methods: {
-			parsePrice(price){
-				if(price >= 100){
-					return parseFloat(price)
-				}else{
-					return price 
-				}
-			},
-			// 领取优惠券
-			receiveCoupon(item) {
-				let that = this;
-					setCouponReceive(item.coupon_id).then(res => {
-						item.issue = 1
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-					}).catch(err => {
-						uni.showToast({
-							title: err,
-							icon: 'none'
-						})
-					})
-			},
-			getList(){
-				if(this.loading || this.loaded) return ;
-				this.loading = true;
-				getCouponLst({
-					product:1,
-					type: this.type == -1 ? '' : this.type,
-					page: this.page,
-					limit: this.limit
-				}).then(res=>{
-					this.list = this.list.concat(res.data.list);
-					this.loading = false;
-					this.loaded = res.data.list.length != this.limit;
-					this.page ++;
-				})
-			},
-			//切换类型
-			statusClick: function(status) {
-				if (status == this.type) return;
-				this.loaded = false;
-				this.loading = false;
-				this.page = 1;
-				this.list = [];
-				this.type = status;
-				this.getList()
-			},
-		},
-		// 滚动监听
-		onPageScroll(e) {
-			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-			uni.$emit('scroll');
-		},
-		onReachBottom: function() {
-			this.getList();
-		}
-	}
-</script>
-
-<style lang="scss">
-	.my-coupon .header {
-		height: 200rpx;
-		padding: 0 15rpx;
-		background-color: var(--view-theme);
-		border-bottom-left-radius: 10%;
-		border-bottom-right-radius: 10%;
-		.nav {
-			border-radius: 6rpx;
-			padding-top: 30rpx;
-			.item {
-				text-align: center;
-				font-size: 26rpx;
-				color: #FFFFFF;
-				padding: 29rpx 0;
-				opacity: 0.7;
-				line-height: 2rpx;
-				.num {
-					margin-top: 18rpx;
-				}
-			}
-			.item.on {
-				opacity: 1;
-				font-weight: bold;
-				border-bottom: 5rpx solid #FFFFFF;
-			}
-		}
-	}
-	.my-coupon .listBox {
-		margin: -73rpx auto 0 auto;
-		padding: 0 30rpx;
-		.list {
-			width: 100%;
-			height: 260rpx;
-			overflow: hidden;
-			background: #FFFFFF;
-			border-radius: 12rpx;
-			margin-bottom: 25rpx;
-			text-align: center;
-			.cross{
-				display: flex;
-				.cross-left{
-					margin-top: 6rpx;
-					.easy-loadimage,image{
-						width: 200rpx;
-						height: 200rpx;
-						border-radius: 12rpx;
-					}
-					
-				}
-				.cross-right{
-					margin-left: 20rpx;
-					margin-top: 6rpx;
-					.title{
-						overflow:hidden; 
-						text-overflow:ellipsis;
-						display:-webkit-box; 
-						-webkit-box-orient:vertical;
-						-webkit-line-clamp:2; 
-					}
-					.time{
-						margin-top: 40rpx;
-						font-size: 22rpx;
-						font-weight: 400;
-						color: #666666;
-					}
-				}
-			}
-			.left{
-				width: 75%;
-				height: 210rpx;
-				margin-top: 20rpx;
-				border-right: 2rpx dashed #E5E5E5;
-				text-align: left;
-				padding-left: 30rpx;
-				.tips{
-					font-size: 26rpx;
-					font-weight: 600;
-					color: #282828;
-					display: block;
-					overflow: auto;
-				}
-				.info{
-					margin-top: 18rpx;
-					display: flex;
-					justify-content: flex-start;
-					.info-box{
-						margin-right: 25rpx;
-						.easy-loadimage{
-							display: inline-block;
-							width: 130rpx;
-							height: 130rpx;
-							border-radius: 8rpx;
-						}
-						.money{
-							text-align: center;
-							font-size: 24rpx;
-							font-weight: 400;
-							color: #666666;
-							margin-top: 4rpx;
-						}
-					}
-				}
-			}
-			.right{
-				width: 25%;
-				height: 100%;
-				position: relative;
-				&::before,&::after{
-					content: "";
-					display: inline-block;
-					width: 24rpx;
-					height: 24rpx;
-					background: #f5f5f5;
-					border-radius: 100%;
-					position: absolute;
-					bottom: -12rpx;
-				}
-				&::before{
-					left: -12rpx;
-				}
-				&::after{
-					top: -12rpx;
-					left: -12rpx;
-				}
-				.couponlogo{
-					width: 112rpx;
-					height: 32rpx;
-					margin: 0 auto;
-					font-size: 20rpx;
-					font-weight: 400;
-					line-height: 38rpx;
-					color: #9B5434;
-					background-image: url(@/static/images/couponlogo.png);
-					background-size: 112rpx 32rpx;
-				}
-				.title{
-					width: 146rpx;
-					height:169rpx;
-					margin: 30rpx auto 0;
-					color: var(--view-priceColor);
-					font-weight: 600;
-					.font1{
-						font-size: 26rpx;
-					}
-					.font2{
-						font-size: 32rpx;
-					}
-					.font3{
-						font-size: 24rpx;
-						font-weight: 400;
-						color: var(--view-theme);
-					}
-					p{
-						margin-top: 10rpx;
-					}
-					.btn{
-						width: 142rpx;
-						background: linear-gradient(270deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-						border-radius: 26rpx;
-						font-size: 24rpx;
-						font-weight: 400;
-						color: #FFFFFF;
-						line-height: 44rpx;
-						text-align: center;
-						margin-top: 20rpx;
-						&.disabled{
-							pointer-events: none;
-							background: #ccc;
-							color: #fff;
-							border-color: #ccc;
-							cursor: not-allowed;
-						}
-					}
-					.shiyong{
-						border: 2rpx solid var(--view-theme);
-						background: none;
-						color: var(--view-theme);
-						border-radius: 26rpx;
-						&.disabled{
-							pointer-events: none;
-							color: #ccc;
-							border-color: #ccc;
-							cursor: not-allowed;
-							background: none;
-						}
-					}
-				}
-				
-			}
-		}
-		.list:nth-child(1){
-			.right{
-				&::after{
-					background-color: var(--view-theme);
-				}
-			}
-		}
-	}
-	.noCommodity{
-		width: 100%;
-		margin-top: 4rpx;
-		background-color: #f5f5f5;
-		.pictrue{
-			margin: 0 auto;
-		}
-	}
-</style>
diff --git a/pages/activity/combination/index.vue b/pages/activity/combination/index.vue
deleted file mode 100644
index 081f39a..0000000
--- a/pages/activity/combination/index.vue
+++ /dev/null
@@ -1,475 +0,0 @@
-<template>
-	<view :style="viewColor" class="page-container">
-		<view class='flash-sale'>
-			<view class="fixed-head">
-				<view class="sys-head" :style="{height:statusBarHeight}"></view>
-				<view class="tool-bar">
-					<!--#ifdef H5-->
-					<view class='iconfont icon-xiangzuo' @tap='goBack'></view>
-					<!--#endif-->
-					<user-name-swiper class="name-swiper" :style="'top:'+ (navH/2) +'rpx'" :combinationUserList="combinationUserList"></user-name-swiper>
-				</view>
-			</view>
-			<view class='head' :style="{ 'background-image': `url(${domain}/static/diy/combination${keyColor}.png)` }">
-				<view class="sys-head" :style="{height:statusBarHeight}"></view>
-				<view class="tool-bar"></view>
-				<view class='header'>
-					<view class="success_per">
-						<view class="success_num">{{combinationUserCount}}人已参与拼团</view>
-						<view class="activity_pic" v-if="combinationUserList.length > 0">
-							<view v-for="(item,index) in combinationUserList.slice(0,10)" class="picture" :key="index">							
-								<image v-if="index != 9" class="avatar" :src='item.avatar ? item.avatar : "/static/images/f.png"'></image>
-								<span v-else class="avatar" style="background:#fff;"><text class="iconfont icon-gengduo1"></text></span>							
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="main_count">
-				<tabNav class="tabNav" :class="{'fixed':isFixed}" :tabTitle="navTop" @changeTab='changeTab'></tabNav>
-				<view class='list'>
-					<block v-for="(item,index) in combinationList" :key='index'>
-						<view class='item acea-row row-between-wrapper' @tap='goDetails(item)'>
-							<view class='pictrue'>
-								<image :src='item.product.image'></image>
-							</view>
-							<view class='text acea-row row-column-around'>
-								<view class='name line1'>{{item.product.store_name}}</view>
-								<view class='booking'>
-									<text class="count">
-										<text class="iconfont icon-pintuan"></text>
-										{{item.buying_count_num}}人团 <text class="line"></text>
-										已拼{{item.sales ? item.sales : 0}}{{item.product.unit_name}}
-									</text>
-								</view>
-								<view class="progress">
-									<view class='combination_price'>
-										<text class="combination_text">拼团价</text>
-										<text class="price">¥ <text>{{ item.price }}</text></text>
-									</view>
-									<view class='order_btn' :style="{ 'background-image': `url(${domain}/static/diy/pink_btn${keyColor}.png)` }">去拼团</view>
-								</view>
-							</view>
-						</view>
-					</block>
-				</view>
-			</view>
-		</view>
-		<home></home>
-		<!-- #ifndef H5 -->
-		<passwordPopup></passwordPopup>
-		<!-- #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>
-	// +----------------------------------------------------------------------
-	import { getCombinationList, getCombinationUser, getActivitycategory } from '../../../api/activity.js';
-	import home from '@/components/home/index.vue'
-	import tabNav from '@/components/combinNav'
-	import userNameSwiper from '@/components/userNameSwiper/userNameSwiper.vue'
-	import { getIndexData } from '@/api/api.js';
-	import { configMap } from "@/utils";
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	// #ifndef H5
-	import passwordPopup from '@/components/passwordPopup';
-	// #endif
-	import { mapGetters } from "vuex";
-	let app = getApp();
-	export default {
-		components: {
-			// #ifndef H5
-			passwordPopup,
-			// #endif
-			home,
-			tabNav,
-			userNameSwiper
-		},
-		computed: configMap({statusBarHeight:0},mapGetters(['viewColor','keyColor'])),
-		data() {
-			return {
-				domain: HTTP_REQUEST_URL,
-				navH: '',
-				topImage: '',
-				combinationList: [],
-				combinationUserList: [],
-				combinationUserCount: 0,
-				navTop: [{
-					'cate_name': '精选',
-					store_category_id: ''
-				}],
-				active: 1,
-				type: 0,
-				scrollLeft: 0,
-				interval: 0,
-				status: 1,
-				page: 1,
-				limit: 8,
-				loading: false,
-				loadend: false,
-				pageloading: false,
-				isFixed: false,
-				navIndex: 0,
-				avatar: '../../../static/images/f.png',
-				headBg: '../static/images/comHead'
-			}
-		},
-		/**
-		 * 用户点击右上角分享
-		 */
-		// #ifdef MP
-		onShareAppMessage: function() {
-			wx.showShareMenu({
-				withShareTicket: true,
-				menus: ['shareAppMessage', 'shareTimeline']
-			})
-			return {
-				title: '拼团',
-				path: 'pages/activity/combination/index',
-			}
-		},
-		onShareTimeline: function() {
-			return {
-				title: '拼团活动',
-				query: {
-					key: ''
-				},
-				imageUrl: ''
-			}
-		},
-		// #endif
-		onLoad() {
-			var pages = getCurrentPages();
-			uni.setNavigationBarTitle({
-				title: "拼团列表"
-			})
-			this.navH = app.globalData.navHeight;
-			this.getCombinationProductList('');
-			this.getIndexConfig();
-			this.getCombinationUser();
-		},
-		methods: {
-			goBack: function() {
-				uni.navigateBack();
-			},
-			getCombinationProductList: function(store_category_id) {
-				var that = this;
-				var data = {
-					page: that.page,
-					limit: that.limit,
-					store_category_id: store_category_id
-				};
-				if (that.pageloading) return;
-				this.pageloading = true
-				getCombinationList(data).then(res => {
-					var combinationList = res.data.list;
-					that.page++;
-					that.combinationList = that.combinationList.concat(combinationList),
-					that.page = that.page;
-					that.pageloading = false;
-				}).catch(err => {
-					that.pageloading = false
-				});
-			},
-			// 首页数据
-			getIndexConfig: function() {
-				let that = this;
-				getActivitycategory(4).then(res => {
-					that.navTop = that.navTop.concat(res.data)
-				})
-			},
-			//获取参与拼团用户
-			getCombinationUser: function() {
-				let that = this;
-				getCombinationUser({
-					limit: 30
-				}).then(res => {
-					that.$set(that, "combinationUserCount", res.data.count);
-					that.$set(that, "combinationUserList", res.data.list);
-				})
-			},
-			// 导航分类切换
-			changeTab(e) {
-				let that = this
-				if (that.navIndex == e.index) return
-				that.navIndex = e.index;
-				that.page = 1;
-				that.limit = 8;
-				that.combinationList = [];
-				that.getCombinationProductList(e.pid)
-
-			},
-			goDetails(item) {
-				uni.navigateTo({
-					url: '/pages/activity/combination_details/index?id=' + item.product_group_id
-				})
-			}
-		},
-		/**
-		 * 页面上拉触底事件的处理函数
-		 */
-		onReachBottom: function() {
-			this.getCombinationProductList('');
-		},
-		// 滚动监听
-		onPageScroll(e) {
-			// #ifdef H5
-			let self = this
-			if (e.scrollTop >= self.searchH) {
-				self.isFixed = true
-			} else {
-				self.isFixed = false
-			}
-			// #endif
-		}
-	}
-</script>
-
-<style lang="scss">
-	.page-container{
-		min-height: 100vh;
-		background-color: var(--view-theme);
-	}
-	.icon-xiangzuo {
-		margin-left: 20rpx;
-		font-size: 40rpx;
-		color: #fff;
-	}
-	.head {
-		display: flex;
-		flex-direction: column;
-		/* #ifdef MP || APP-PLUS */
-		height: 576rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		height: 490rpx;
-		/* #endif */
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		width: 100%;
-	}
-	.name-swiper{
-		margin-left: 40rpx;
-	}
-	.header {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		.success_per {
-			width: 100%;
-			text-align: center;
-			left: 0;
-			.success_num {
-				color: #FFF1BF;
-				font-size: 26rpx;
-			}
-		}
-	}
-	.activity_pic {
-		margin-left: 20rpx;
-		padding-left: 20rpx;
-		position: relative;
-		display: inline-block;
-		margin-top: 17rpx;
-		background: rgba(0, 0, 0, .15);
-		padding: 13rpx 24rpx 13rpx 14rpx;
-		border-radius: 33rpx;
-		.picture {
-			display: inline-block;
-		}
-		.avatar {
-			width: 42rpx;
-			height: 42rpx;
-			line-height: 20rem;
-			display: inline-block;
-			background-repeat: no-repeat;
-			background-size: center/cover;
-			position: relative;
-			text-align: center;
-			color: #fff;
-			font-weight: 600;
-			vertical-align: bottom;
-			font-size: .875rem;
-			-webkit-user-select: none;
-			-moz-user-select: none;
-			-ms-user-select: none;
-			user-select: none;
-			border-radius: 50%;
-			background-repeat: no-repeat;
-			background-size: cover;
-			background-position: 0 0;
-			margin-right: -10rpx;
-			box-shadow: 0 0 0 1px #fff;
-			position: relative;
-			text {
-				position: absolute;
-				line-height: 42rpx;
-				color: #8E8E8E;
-				width: 42rpx;
-				left: 0;
-			}
-		}
-	}
-	.noCommodity {
-		border-top: none;
-	}
-	.flash-sale .header {
-		width: 100%;
-		position: relative;
-	}
-	.flash-sale .main_count {
-		position: relative;
-		top: 10rpx;
-	}
-	.flash-sale .timeList {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin: 0 auto;
-	}
-	.flash-sale .timeList .item {
-		font-size: 20rpx;
-		color: #666;
-		text-align: center;
-		box-sizing: border-box;
-		width: 224rpx;
-	}
-	.flash-sale .timeList .item .time {
-		font-size: 26rpx;
-		color: #AAAAAA;
-	}
-	.flash-sale .timeList .item.on .time {
-		color: #FD6523;
-		font-weight: 600;
-		span {
-			position: relative;  
-			&::after {
-				content: '';
-				display: inline-block;
-				width: 100%;
-				height: 4rpx;
-				background: #FD6523;
-				position: absolute;
-				left: 0;
-				bottom: -4rpx;
-				border-radius: 2rpx;
-			}
-		}
-	}
-	.flash-sale .list {
-		margin-top: 24rpx;
-	}
-	.flash-sale .list .item {
-		height: 278rpx;
-		position: relative;
-		width: 90%;
-		margin: 0 auto 20rpx auto;
-		background-color: #fff;
-		border-radius: 20rpx;
-		padding: 0 25rpx;
-	}
-	.flash-sale .list .item .pictrue {
-		width: 240rpx;
-		height: 240rpx;
-		border-radius: 10rpx;
-	}
-	.flash-sale .list .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 10rpx;
-	}
-
-	.flash-sale .list .item .text {
-		width: 370rpx;
-		font-size: 30rpx;
-		color: #333;
-	}
-	.flash-sale .list .item .text .name {
-		width: 100%;
-		color: #282828;
-		font-weight: bold;
-		font-size: 28rpx;
-	}
-	.flash-sale .list .item .text .booking {
-		margin-top: 17rpx;
-	}
-	.flash-sale .list .item .text .booking .count {
-		font-size: 22rpx;
-		color: var(--view-priceColor);
-		border-radius: 18rpx;
-		background-color: var(--view-bgColor);
-		line-height: 36rpx;
-		padding: 5rpx 12rpx;
-		.iconfont {
-			margin-right: 10rpx;
-		}
-		.line {
-			display: inline-block;
-			width: 1rpx;
-			height: 14rpx;
-			background: #F49088;
-			margin: 0 9rpx;
-			position: relative;
-			top: -3rpx;
-		}
-	}
-	.flash-sale .list .item .text .limit {
-		font-size: 22rpx;
-		color: #999;
-		margin-bottom: 5rpx;
-	}
-	.flash-sale .list .item .text .limit .limitPrice {
-		margin-left: 10rpx;
-	}
-	.flash-sale .list .item .text .progress {
-		margin-top: 20rpx;
-		overflow: hidden;
-		.combination_price {
-			line-height: 15px;
-			padding: 8rpx 0;
-			color: #282828;
-			float: left;
-			position: relative;
-			top: 10rpx;
-			.combination_text {
-				font-size: 22rpx;
-			}
-			.price {
-				font-size: 24rpx;
-				font-weight: bold;
-			}
-		}
-		.order_btn {
-			float: right;
-			width: 145rpx;
-			height: 62rpx;
-			text-align: center;
-			color: #FFFFFF;
-			font-size: 26rpx;
-			line-height: 72rpx;
-			background-size: 100%;
-		}
-	}
-.tool-bar{
-	display: flex;
-	align-items: center;
-	height: 40px;
-}
-.fixed-head{
-	position: absolute;
-	left: 0;
-	top: 20px;
-	width: 100%;
-	z-index: 10;
-}
-</style>
\ No newline at end of file
diff --git a/pages/activity/combination_details/index.vue b/pages/activity/combination_details/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/pages/activity/combination_poster/index.vue b/pages/activity/combination_poster/index.vue
deleted file mode 100644
index 8870898..0000000
--- a/pages/activity/combination_poster/index.vue
+++ /dev/null
@@ -1,362 +0,0 @@
-<template>
-	<view :style="viewColor">
-		<view class='poster-poster' v-if="posterStatus">
-			<view class='poster-pop'>
-				<image src='../../../static/images/poster-close.png' class='close' @click="posterImageClose"></image>
-				<view class="user-code">
-					<image class="canvas" :style="{width:wd+'px', height:hg+'px'}" :src="posterImage" v-if="posterImage"></image>
-					<canvas class="canvas" :style="{width:wd+'px',height:hg+'px'}" canvas-id="myCanvas" v-else></canvas>
-				</view>
-				<!-- #ifndef H5  -->
-				<view v-if="posterImage" class='save-poster' @click="savePosterPath(posterImage)">保存到手机</view>
-				<!-- #endif -->
-				<!-- #ifdef H5 -->
-				<view v-if="posterImage" class="keep">长按图片可以保存到手机</view>
-				<!-- #endif -->
-			</view>
-		</view>
-		<view class='mask' v-if="posterImage"></view>
-	</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>
-	// +----------------------------------------------------------------------
-	import { imgToBase } from '@/api/user.js';
-	import { mapGetters } from 'vuex';
-	export default {
-		computed: mapGetters(['viewColor']),
-		data() {
-			return {
-				wd: 225,
-				hg: 357,
-				posterImage: "",
-				posterBag: '../static/images/poster-bag.png',
-			}
-		},
-		props: {
-			picData: {
-				type: Object
-			},
-			posterStatus: {
-				type: Boolean,
-				default: false
-			}
-		},
-		watch: {
-			posterStatus(data) {
-				if (data) {
-					this.posterShow()
-				}
-			},
-		},
-		onLoad() {},
-		methods: {
-			async posterShow() {
-				let that = this;
-				uni.showLoading({
-					title: '海报生成中',
-					mask: true
-				});
-				let arr, bag_pic, goods_img, mp_code	
-				goods_img = await that.imgToBase(that.picData.goodsPic)
-				mp_code = await that.imgToBase(that.picData.codePic)
-				// #ifdef H5
-				arr = [that.posterBag, goods_img, mp_code]
-				// #endif
-				// #ifdef MP || APP-PLUS
-				arr = [that.posterBag, await that.downloadFilestoreImage(that.picData.goodsPic), await that.downloadFilestoreImage(
-					that.picData.codePic)]
-				// #endif
-				that.bargainPosterCanvas(arr, that.picData.title, that.picData.label, that.picData.msg, that.picData.price,
-					that.wd,
-					that.hg,
-					(tempFilePath) => {
-						that.posterImage = tempFilePath
-					});
-			},
-			async imgToBase(url) {
-				let res = await imgToBase({
-					image: url
-				})
-				return res.data.image
-			},
-			savePosterPath(url) {
-				let that = this;
-				// #ifdef MP
-				uni.getSetting({
-					success(res) {
-						if (!res.authSetting['scope.writePhotosAlbum']) {
-							uni.authorize({
-								scope: 'scope.writePhotosAlbum',
-								success() {
-									uni.saveImageToPhotosAlbum({
-										filePath: url,
-										success: function(res) {
-											that.$util.Tips({
-												title: '保存成功',
-												icon: 'success'
-											});
-										},
-										fail: function(res) {
-											that.$util.Tips({
-												title: '保存失败'
-											});
-										}
-									});
-								}
-							});
-						} else {
-							uni.saveImageToPhotosAlbum({
-								filePath: url,
-								success: function(res) {
-									that.$util.Tips({
-										title: '保存成功',
-										icon: 'success'
-									});
-								},
-								fail: function(res) {
-									that.$util.Tips({
-										title: '保存失败'
-									});
-								}
-							});
-						}
-					}
-				});
-				// #endif
-				// #ifdef APP-PLUS
-				uni.saveImageToPhotosAlbum({
-					filePath: that.posterImage,
-					success: function(res) {
-						that.posterImageClose();
-						that.$util.Tips({
-							title: '保存成功',
-							icon: 'success'
-						});
-					},
-					fail: function(res) {
-						that.$util.Tips({
-							title: '保存失败'
-						});
-					},
-				})
-				// #endif
-			},
-			posterImageClose() {
-				this.$emit('update:posterStatus', false)
-				this.posterImage = ""
-			},
-			//图片转符合安全域名路径
-			downloadFilestoreImage(url) {
-				// #ifdef MP
-				let ishttps = url.split('//')[0] == 'https:'
-				if (!ishttps) {
-					url = 'https://'+url.split('//')[1]
-				} 
-				// #endif
-				return new Promise((resolve, reject) => {
-					let that = this;
-					uni.downloadFile({
-						url: url,
-						success: function(res) {
-							resolve(res.tempFilePath);
-						},
-						fail: function() {
-							return that.$util.Tips({
-								title: ''
-							});
-						}
-					});
-				})
-			},
-			bargainPosterCanvas(arr2, title, label, msg, price, wd, hg, successFn) {
-				let that = this;
-				const ctx = uni.createCanvasContext('myCanvas', this);
-				ctx.clearRect(0, 0, 0, 0);
-				/**
-				 * 只能获取合法域名下的图片信息,本地调试无法获取
-				 * 
-				 */
-				ctx.fillStyle = '#ccc';
-				ctx.fillRect(0, 0, wd, hg);
-				uni.getImageInfo({
-					src: arr2[0],
-					success: (res) => {
-						// console.log(arr2)
-						const WIDTH = res.width;
-						const HEIGHT = res.height;
-						ctx.drawImage(arr2[0], 0, 0, wd, hg);
-						// 保证在不同机型对应坐标准确
-						let labelx = 0.6656 //标签x
-						let labely = 0.167 //标签y
-						let pricex = 0.1847 //价格x
-						let pricey = 0.175 //价格y
-						let codex = 0.385 //二维码
-						let codey = 0.77
-						let picturex = 0.1571 //商品图左上点
-						let picturey = 0.2916
-						let picturebx = 0.6857 //商品图右下点
-						let pictureby = 0.3916
-						let msgx = 0.1036 //msg
-						let msgy = 0.2306
-						ctx.drawImage(arr2[1], wd * picturex, hg * picturey, wd * picturebx, hg * pictureby);
-						ctx.save();
-						ctx.drawImage(arr2[2], wd * codex, hg * codey, 55, 55);
-						ctx.save();
-						//标题
-						const CONTENT_ROW_LENGTH = 25;
-						let [contentLeng, contentArray, contentRows] = that.textByteLength(title, CONTENT_ROW_LENGTH);
-						if (contentRows > 2) {
-							contentRows = 2;
-							let textArray = contentArray.slice(0, 2);
-							textArray[textArray.length - 1] += '…';
-							contentArray = textArray;
-						}
-						ctx.setTextAlign('left');
-						ctx.setFillStyle('#000');
-						if (contentArray.length < 2) {
-							ctx.setFontSize(16);
-						} else {
-							ctx.setFontSize(14);
-						}
-						let contentHh = 3;
-						for (let m = 0; m < contentArray.length; m++) {
-							if (m) {
-								ctx.fillText(contentArray[m], 20, 25 + contentHh * m + 13, 1100);
-							} else {
-								ctx.fillText(contentArray[m], 20, 25, 1100);
-							}
-						}
-						// 标签内容
-						ctx.setTextAlign('left')
-						ctx.setFontSize(10);
-						ctx.setFillStyle('#FFF');
-						ctx.fillText(label, wd * labelx, hg * labely);
-						ctx.save();
-						// 价格
-						ctx.setFillStyle('red');
-						// ctx.setFontSize(16);
-						ctx.font = "bold 18px Arial";
-						ctx.fillText(price, wd * pricex, hg * pricey);
-						ctx.save();
-						// msg
-						ctx.setFontSize(8);
-						ctx.setFillStyle('#3F3F3F');
-						ctx.fillText(msg, wd * msgx, hg * msgy);
-						ctx.save();
-						ctx.draw(true, () => {
-							uni.canvasToTempFilePath({
-								canvasId: 'myCanvas',
-								fileType: 'png',
-								quality: 1,
-								success: (res) => {
-									// console.log(res)
-									successFn && successFn(res.tempFilePath);
-									uni.hideLoading();
-								}
-							}, this)
-						});
-					},
-					fail: function(err) {
-						uni.hideLoading();
-						that.Tips({
-							title: '无法获取图片信息'
-						});
-					}
-				})
-			},
-			textByteLength(text, num) {
-				let strLength = 0;
-				let rows = 1;
-				let str = 0;
-				let arr = [];
-				for (let j = 0; j < text.length; j++) {
-					if (text.charCodeAt(j) > 255) {
-						strLength += 2;
-						if (strLength > rows * num) {
-							strLength++;
-							arr.push(text.slice(str, j));
-							str = j;
-							rows++;
-						}
-					} else {
-						strLength++;
-						if (strLength > rows * num) {
-							arr.push(text.slice(str, j));
-							str = j;
-							rows++;
-						}
-					}
-				}
-				arr.push(text.slice(str, text.length));
-				return [strLength, arr, rows] //  [处理文字的总字节长度，每行显示内容的数组，行数]
-			},
-		}
-	}
-</script>
-
-<style>
-	.poster-poster {
-		width: 100%;
-		height: 100%;
-		width: 450rpx;
-		height: 714rpx;
-	}
-	.poster-pop {
-		position: fixed;
-		left: 50%;
-		transform: translateX(-50%);
-		top: 50%;
-		margin: 0 auto;
-		margin-top: -357rpx;
-		z-index: 999;
-	}
-	.poster-pop image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-	.poster-pop .close {
-		width: 46rpx;
-		height: 75rpx;
-		position: fixed;
-		right: 0;
-		top: -73rpx;
-		display: block;
-		z-index: 3999;
-	}
-	.poster-pop .save-poster {
-		background-color: var(--view-theme);
-		font-size: ：22rpx;
-		color: #fff;
-		text-align: center;
-		height: 76rpx;
-		line-height: 76rpx;
-		width: 100%;
-		margin-top: 20rpx;
-	}
-	.poster-pop .keep {
-		color: #fff;
-		text-align: center;
-		font-size: 25rpx;
-		margin-top: 10rpx;
-	}
-	.mask {
-		z-index: 300 !important;
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.6);
-		z-index: 9;
-	}
-</style>
diff --git a/pages/activity/combination_status/index.vue b/pages/activity/combination_status/index.vue
deleted file mode 100644
index cb099a8..0000000
--- a/pages/activity/combination_status/index.vue
+++ /dev/null
@@ -1,949 +0,0 @@
-<template>
-	<div class="group-con" :style="viewColor">
-		<div class="header acea-row row-between-wrapper">
-			<div class="pictrue"><image :src="storeCombination.image" /></div>
-			<div class="text">
-				<div class="line1" v-text="storeCombination.store_name"></div>
-				<div class="money">
-					￥
-					<span class="num" v-text="storeCombination.price"></span>
-					<span class="team sColor" v-text="(combinationData.buying_count_num ? combinationData.buying_count_num : '') + '人拼'"></span>
-				</div>
-			</div>
-			<div v-if="pinkBool === -1" class="iconfont icon-pintuanshibai"></div>
-			<div v-else-if="pinkBool === 10" class="iconfont icon-pintuanchenggong t-color"></div>
-		</div>
-		<div class="wrapper">
-			<div class="title acea-row row-center-wrapper" v-if="pinkBool === 0">
-				<div class="line"></div>
-				<div class="name acea-row row-center-wrapper">
-					剩余
-					<CountDown :justifyLeft="justifyLeft" :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '" :minute-text="' : '" :second-text="' '"
-					 :datatime="combinationData.end_time"></CountDown>
-					结束
-				</div>
-				<div class="line"></div>
-			</div>
-			<div class="tips t-color" v-if="pinkBool === 10">恭喜您拼团成功</div>
-			<div class="tips t-color" v-else-if="pinkBool === -1">还差{{ count }}人，拼团失败</div>
-			<div class="tips t-color" v-else-if="pinkBool === 0">拼团中，还差{{ count }}人拼团成功</div>
-			<div class="list acea-row row-middle" :class="iShidden ? 'on' : 'result'">
-				<div class="acea-row row-middle" v-if="pinkAll.length > 0">
-					<div class="pictrue" v-for="(item, index) in pinkAll" :key="index"><image :src="item.avatar ? item.avatar : '/static/images/f.png'" /></div>
-				</div>
-				<div v-if="(pinkBool === 0 || pinkBool === -1)" class="pictrue" v-for="index in count" :key="index"><image class="img-none" src="../static/images/vacancy.png" /></div>
-			</div>
-			<div v-if="count > 9" class="lookAll acea-row row-center-wrapper" @click="lookAll">
-				{{ iShidden ? '收起' : '查看全部' }}
-				<span class="iconfont" :class="iShidden ? 'icon-xiangshang' : 'icon-xiangxia'"></span>
-			</div>
-			<div v-if="userBool !== 0 && pinkBool === 0">
-				<div class="teamBnt" @click="listenerActionSheet">邀请好友参团</div>
-			</div>
-			<div class="teamBnt" v-else-if="userBool === 0 && pinkBool === 0 && count > 0" @click="pay">我要参团</div>
-			<div class="teamBnt" v-if="pinkBool === 10 || pinkBool === -1" @click="goDetail(combinationData.product_group_id)">再次开团</div>
-			<div class="cancel" @click="getCombinationRemove" v-if="pinkBool === 0 && userBool !== 0">
-				<span class="iconfont icon-guanbi3"></span>
-				取消开团
-			</div>
-			<div class="lookOrder" v-if="pinkBool === 10" @click="goOrder">
-				查看订单信息
-				<span class="iconfont icon-xiangyou"></span>
-			</div>
-		</div>
-		<div class="group-recommend">
-			<div class="title acea-row row-between-wrapper">
-				<div>大家都在拼</div>
-				<div class="more" @click="goList">
-					更多拼团
-					<span class="iconfont icon-jiantou"></span>
-				</div>
-			</div>
-			<div class="list acea-row row-middle">
-				<div class="item" v-for="(item, index) in storeCombinationHost" :key="index" @click="goDetail(item.product_group_id)">
-					<div class="pictrue">
-						<image :src="item.product.image" />
-						<div class="team" v-text="item.buying_count_num + '人团'"></div>
-					</div>
-					<div class="name line1" v-text="item.product.store_name"></div>
-					<div class="money" v-text="'￥' + item.price"></div>
-				</div>
-			</div>
-		</div>
-		<product-window :attr="attr" :limitNum="1" :iSbnt="1" @myevent="onMyEvent" @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNum"
-		 @iptCartNum="iptCartNum" @attrVal="attrVal" @goCat="goPay"></product-window>
-		<!-- 分享按钮 -->
-		<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
-			<!-- #ifndef MP -->
-			<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' v-if="weixinStatus === true" @click="H5ShareBox = true">
-				<!-- <button class="item" hover-class='none' v-if="weixinStatus === true" @click="setShareInfoStatus"> -->
-				<view class="iconfont icon-weixin3"></view>
-				<view class="">发送给朋友</view>
-			</button>
-			<!-- #endif -->
-			<!-- #ifdef MP -->
-			<button class="item" :class="weixinStatus ? 'item3' : ''" open-type="share" hover-class='none' @click="goFriend">
-				<view class="iconfont icon-weixin3"></view>
-				<view class="">发送给朋友</view>
-			</button>
-			<!-- #endif -->
-			<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @tap="goPoster">
-				<view class="iconfont icon-haibao"></view>
-				<view class="">生成海报</view>
-			</button>
-			<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="copyPwd">
-				<view class="iconfont icon-fuzhikouling1"></view>
-				<view>生成口令</view>
-			</button>
-		</view>
-		<view class="mask" v-if="posters" @click="listenerActionClose"></view>
-		<!--口令复制结果-->
-		<copyPassword :isCopy='isCopy' :copyUrl='copyUrl' @close="closeCopy"></copyPassword>
-		<!-- 发送给朋友图片 -->
-		<view class="share-box" v-if="H5ShareBox">
-			<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
-		</view>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<!-- <Product-window v-on:changeFun="changeFun" :attr="attr" :limitNum='1' :iSbnt='1'></Product-window> -->
-		<home></home>
-		<canvasPoster v-if="posterCompenents" :posterStatus.sync="posterStatus" :picData="picData"></canvasPoster>
-	</div>
-</template>
-<script>
-	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-	// +----------------------------------------------------------------------
-	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-	// +----------------------------------------------------------------------
-	// | Author: CRMEB Team <admin@crmeb.com>
-	// +----------------------------------------------------------------------
-	import CountDown from '@/components/countDown';
-	import ProductWindow from '@/components/productWindow';
-	import copyPassword from '@/components/copyPassword';
-	import canvasPoster from '../combination_poster/index.vue'
-	import { mapGetters } from 'vuex';
-	import {
-		getCombinationPink,
-		postCombinationRemove,
-		getCombinationList
-	} from '@/api/activity';
-	import {
-		postCartAdd,
-		getProductCode,
-		copyPasswordApi
-	} from '@/api/store';
-	import authorize from '@/components/Authorize';
-	import home from '@/components/home';
-	const NAME = 'GroupRule';
-	const app = getApp();
-	export default {
-		name: NAME,
-		components: {
-			CountDown,
-			ProductWindow,
-			home,
-			canvasPoster,
-			copyPassword,
-			authorize,
-		},
-		props: {},
-		data: function() {
-			return {
-				currentPinkOrder: '', //当前拼团订单
-				isOk: 0, //判断拼团是否完成
-				pinkBool: 0, //判断拼团是否成功|0=失败,1=成功
-				userBool: 0, //判断当前用户是否在团内|0=未在,1=在
-				pinkAll: [], //团员
-				storeCombination: [], //拼团产品
-				storeCombinationHost: [], //拼团推荐
-				pinkId: 0,
-				count: 0, //拼团剩余人数
-				iShidden: false,
-				isOpen: false, //是否打开属性组件
-				attr: {
-					cartAttr: false,
-					productSelect: {
-						image: '',
-						store_name: '',
-						price: '',
-						quota: 0,
-						unique: '',
-						cart_num: 1,
-						quota_show: 0,
-						product_stock: 0,
-						num: 0
-					},
-					productAttr: []
-				},
-				cart_num: '',
-				userInfo: {},
-				combinationData: {},
-				posters: false,
-				weixinStatus: false,
-				H5ShareBox: false, //公众号分享图片
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				attrTxt: '请选择', //属性页面提示
-				attrValue: '', //已选属性
-				posterStatus: false,
-				posterCompenents: false,
-				currSpid: "",
-				picData: {
-					bagPic: '',
-					goodsPic: '',
-					codePic: "",
-					title: "",
-					label: "",
-					msg: "",
-					price: '',
-				},
-				isCopy: false,
-				copyUrl: '',
-				justifyLeft: ''
-			};
-		},
-		computed: mapGetters(['isLogin', 'uid', 'viewColor']),
-
-		watch: {
-			isLogin: {
-				handler: function(newV, oldV) {
-					if (newV) {
-						this.getCombinationPink();
-					}
-				},
-				deep: true
-			},
-		},
-		onLoad(options) {
-			var that = this;
-			that.justifyLeft = that.viewColor;
-			if(options.id)that.pinkId = options.id;
-			//扫码携带参数处理
-			// #ifdef MP
-			if (options.scene) {
-				let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
-				if (value.id) this.pinkId = value.id;
-				//记录推广人uid
-				if (value.spid) {
-					app.globalData.spid = value.spid;
-					that.currSpid = value.spid
-				}
-			}
-			// #endif
-			if (that.isLogin == false) {
-                this.isAuto = true;
-                this.isShowAuth = true
-			} else {
-				this.getCombinationPink();
-			}
-
-		},
-		mounted: function() {
-			this.getCombinationProductList();
-			this.getPosterCode()
-		},
-		//#ifdef MP
-		/**
-		 * 用户点击右上角分享
-		 */
-		onShareAppMessage: function() {
-			let that = this;
-			let pathUrl = '/pages/activity/combination_status/index?id=' + this.pinkId;
-			return {
-				title: '您的好友' + that.pinkAll[0].nickname + '邀请您参团' + that.storeCombination.store_name,
-				path: pathUrl,
-				imageUrl: that.storeCombination.image || ''
-			};
-		},
-		onShareTimeline: function() {
-			let that = this;
-			// console.log(app.globalData.openPages)
-			return {
-				title: '您的好友' + that.pinkAll[0].nickname + '邀请您参团' + that.storeCombination.store_name,
-				query: {
-					id: that.pinkId,
-					spid: that.uid
-				},
-				imageUrl: that.storeCombination.image || ''
-			}
-		},
-		//#endif
-		methods: {
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e;
-			},
-			// 授权后回调
-			onLoadFun: function(e) {
-				app.globalData.openPages = '/pages/activity/combination_status/index?id=' + this.pinkId;
-				this.getCombinationPink();
-				this.isShowAuth = false;
-			},
-			/**
-			 * 分享打开
-			 *
-			 */
-			listenerActionSheet: function() {
-				if (this.isLogin == false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					// #ifdef H5
-					if (this.$wechat.isWeixin() === true) {
-						this.weixinStatus = true;
-					}
-					// #endif
-					this.posters = !this.posters;
-				}
-			},
-			// 分享关闭
-			listenerActionClose: function() {
-				this.posters = false;
-			},
-			// 小程序关闭分享弹窗；
-			goFriend: function() {
-				this.posters = false;
-				// this.H5ShareBox = true
-			},
-			/**
-			 * 购物车手动填写
-			 *
-			 */
-			iptCartNum: function(e) {
-				this.$set(this.attr.productSelect, 'cart_num', e);
-				this.$set(this, 'cart_num', e);
-			},
-			attrVal(val) {
-				this.attr.productAttr[val.indexw].index = this.attr.productAttr[val.indexw].attr_values[val.indexn];
-			},
-			onMyEvent: function() {
-				this.$set(this.attr, 'cartAttr', false);
-				this.$set(this, 'isOpen', false);
-			},
-			//选择属性；
-			ChangeAttr: function(res) {
-				this.$set(this, 'cart_num', 1);
-				let productSelect = this.productValue[res];
-				if (productSelect) {
-					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, 'quota', productSelect.quota);
-					this.$set(this.attr.productSelect, 'unique', productSelect.unique);
-					this.$set(this.attr.productSelect, 'cart_num', 1);
-					this.$set(this.attr.productSelect, 'product_stock', productSelect.stock);
-					this.$set(this.attr.productSelect, 'quota_show', productSelect.stock);
-					this.$set(this, 'attrValue', res);
-					this.$set(this, 'attrTxt', '已选择');
-				} else {
-					this.$set(this.attr.productSelect, 'image', this.storeCombination.image);
-					this.$set(this.attr.productSelect, 'price', this.storeCombination.price);
-					this.$set(this.attr.productSelect, 'quota', 0);
-					this.$set(this.attr.productSelect, 'unique', '');
-					this.$set(this.attr.productSelect, 'cart_num', 0);
-					this.$set(this.attr.productSelect, 'quota_show', 0);
-					this.$set(this.attr.productSelect, 'stock', 0);
-					this.$set(this.attr.productSelect, 'product_stock', 0);
-					this.$set(this, 'attrValue', '');
-					this.$set(this, 'attrTxt', '请选择');
-				}
-			},
-			ChangeCartNum: function(changeValue) {
-				//changeValue:是否 加|减
-				//获取当前变动属性
-				let productSelect = this.productValue[this.attrValue];
-				//如果没有属性,赋值给商品默认库存
-				if (productSelect === undefined && !this.attr.productAttr.length)
-					productSelect = this.attr.productSelect;
-				//无属性值即库存为0；不存在加减；
-				if (productSelect === undefined) return;
-				let stock = productSelect.stock || 0;
-				let num = this.attr.productSelect;
-				if (changeValue) {
-					num.cart_num++;
-					if (num.cart_num > stock) {
-						this.$set(this.attr.productSelect, "cart_num", stock);
-						this.$set(this, "cart_num", stock);
-					}
-				} else {
-					num.cart_num--;
-					if (num.cart_num < 1) {
-						this.$set(this.attr.productSelect, "cart_num", 1);
-						this.$set(this, "cart_num", 1);
-					}
-				}
-			},
-			//默认选中属性；
-			DefaultSelect() {
-				let productAttr = this.attr.productAttr,
-					value = [];
-				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]);
-				}
-				//sort();排序函数:数字-英文-汉字；
-				let productSelect = this.productValue[value.join(',')];
-				if (productSelect && productAttr.length) {
-					this.$set(this.attr.productSelect, 'store_name', this.storeCombination.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.attr.productSelect, 'cart_num', 1);
-					this.$set(this.attr.productSelect, 'product_stock', productSelect.stock);
-					this.$set(this.attr.productSelect, 'quota_show', productSelect.stock);
-					this.$set(this, 'attrValue', value.join(','));
-					this.attrValue = value.join(',');
-					this.$set(this, 'attrTxt', '已选择');
-				} else if (!productSelect && productAttr.length) {
-					this.$set(this.attr.productSelect, 'store_name', this.storeCombination.store_name);
-					this.$set(this.attr.productSelect, 'image', this.storeCombination.image);
-					this.$set(this.attr.productSelect, 'price', this.storeCombination.price);
-					this.$set(this.attr.productSelect, 'stock', 0);
-					this.$set(this.attr.productSelect, 'unique', '');
-					this.$set(this.attr.productSelect, 'cart_num', 0);
-					this.$set(this.attr.productSelect, 'product_stock', 0);
-					this.$set(this.attr.productSelect, 'quota_show', 0);
-					this.$set(this, 'attrValue', '');
-					this.$set(this, 'attrTxt', '请选择');
-				} else if (!productSelect && !productAttr.length) {
-					this.$set(this.attr.productSelect, 'store_name', this.storeCombination.store_name);
-					this.$set(this.attr.productSelect, 'image', this.storeCombination.image);
-					this.$set(this.attr.productSelect, 'price', this.storeCombination.price);
-					this.$set(this.attr.productSelect, 'stock', 0);
-					this.$set(this.attr.productSelect, 'unique', this.storeCombination.unique || '');
-					this.$set(this.attr.productSelect, 'cart_num', 1);
-					this.$set(this.attr.productSelect, 'quota_show', 0);
-					this.$set(this.attr.productSelect, 'product_stock', 0);
-					this.$set(this, 'attrValue', '');
-					this.$set(this, 'attrTxt', '请选择');
-				} else if (productSelect && !productAttr.length) {
-					this.$set(
-						this.attr.productSelect,
-						"store_name",
-						this.storeCombination.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.attr.productSelect, 'quota_show', productSelect.stock);
-					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);
-					}
-				}
-			},
-			setProductSelect: function() {
-				var that = this;
-				var attr = that.attr;
-				attr.productSelect.image = that.storeCombination.image;
-				attr.productSelect.store_name = that.storeCombination.store_name;
-				attr.productSelect.price = that.storeCombination.price;
-				attr.productSelect.quota = 0;
-				attr.productSelect.quota_show = that.storeCombination.stock;
-				attr.productSelect.stock = that.storeCombination.stock;
-				attr.productSelect.product_stock = that.storeCombination.stock;
-				attr.cartAttr = false;
-				that.$set(that, 'attr', attr);
-			},
-			pay: function() {
-				var that = this;
-				that.attr.cartAttr = true;
-				that.isOpen = true;
-			},
-			goPay() {
-				var that = this;
-				var data = {
-					product_id: that.combinationData.product_group_id,
-					product_attr_unique: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : "",
-					cart_num: that.attr.productSelect.cart_num,
-					product_type: 4,
-					is_new: 1,
-					group_buying_id: that.combinationData.group_buying_id
-				};
-				postCartAdd(data)
-					.then(res => {
-						uni.navigateTo({
-							url: '/pages/users/order_confirm/index?new=1&cartId=' + res.data.cart_id
-						});
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			goPoster: function() {
-				var that = this;
-				that.posters = false;
-				this.posterStatus = true
-			},
-			goOrder: function() {
-				var that = this;
-				uni.navigateTo({
-					url: '/pages/order_details/index?order_id=' + that.currentPinkOrder
-				});
-			},
-			//拼团列表
-			goList: function() {
-				uni.navigateTo({
-					url: '/pages/activity/combination/index'
-				});
-			},
-			//拼团详情
-			goDetail: function(id) {
-				this.pinkId = id;
-				uni.navigateTo({
-					url: '/pages/activity/combination_details/index?id=' + id
-				});
-			},
-			getPosterCode() {
-				let type
-				// #ifndef MP
-				type = 'wechat'
-				// #endif
-				// #ifdef MP
-				type = 'routine'
-				// #endif
-				getProductCode(this.pinkId, {
-					type,
-					product_type: 40
-				}).then(res => {
-					this.picData.codePic = res.data.url
-				}).catch(err => {
-					this.$util.Tips({
-						title: err
-					});
-				})
-			},
-			//复制口令
-			copyPwd(){
-				let that = this;
-				copyPasswordApi({
-					id: that.pinkId,
-					product_type: 40
-				}).then(async res => {
-					that.copyUrl = res.data.str;
-					that.posters = false
-					that.isCopy = true;
-				})
-			},
-			closeCopy(){
-				this.isCopy = false
-			},
-			//拼团信息
-			getCombinationPink: function() {
-				var that = this;
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				});
-
-				getCombinationPink(that.pinkId)
-					.then(res => {
-						uni.hideLoading();
-						that.$set(that, 'combinationData', res.data);
-						that.$set(that, 'storeCombination', res.data.product);
-						that.$set(that, 'pinkAll', res.data.groupUser);
-						that.$set(that, 'count', res.data.buying_count_num - res.data.yet_buying_num);
-						that.$set(that, 'userBool', res.data.create_status);
-						that.$set(that, 'pinkBool', res.data.status);
-						that.$set(that, 'currentPinkOrder', res.data.self ? res.data.self.order_id : '');
-						that.attr.productAttr = res.data.product.attr;
-						that.productValue = res.data.product.sku;
-						that.$set(that.picData, 'goodsPic', res.data.product.image);
-						that.$set(that.picData, 'title', res.data.product.store_name.length > 28 ? res.data.product.store_name.slice(0,
-							28) + '...' : res.data.product.store_name);
-						that.$set(that.picData, 'label', res.data.buying_count_num + "人团");
-						that.$set(that.picData, 'price', res.data.product.price);
-						that.$set(that.picData, 'msg', '市场价：¥ ' + res.data.product.ot_price + " 还差 " +
-							that.count + " 人 拼团成功");
-						this.posterCompenents = true
-						//#ifdef H5
-						that.setOpenShare();
-						//#endif
-						that.setProductSelect();
-						that.DefaultSelect();
-					})
-					.catch(err => {
-						this.$util.Tips({
-							title: err
-						});
-						uni.redirectTo({
-							success() {},
-							fail() {
-								uni.navigateTo({
-									url: '/pages/index/index',
-								})
-							}
-						})
-					});
-			},
-			//拼团列表
-			getCombinationProductList: function() {
-				var that = this;
-				var data = {
-					page: 1,
-				};
-				getCombinationList(data)
-					.then(res => {
-						var storeCombinationHost = res.data.list;
-						that.storeCombinationHost = that.storeCombinationHost.concat(storeCombinationHost)
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			//#ifdef H5
-			setOpenShare() {
-				let that = this;
-				let configTimeline = {
-					title: '您的好友' + that.pinkAll[0].nickname + '邀请您参团' + that.storeCombination.store_name,
-					desc: that.storeCombination.store_name,
-					link: window.location.protocol + '//' + window.location.host +
-						'/pages/activity/combination_status/index?id=' + that.pinkId,
-					imgUrl: that.storeCombination.image
-				};
-				if (this.$wechat.isWeixin()) {
-					this.$wechat
-						.wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareAppMessage',
-							'onMenuShareTimeline'
-						], configTimeline)
-						.then(res => {
-							// console.log(res);
-						})
-						.catch(res => {
-							if (res.is_ready) {
-								res.wx.updateAppMessageShareData(configTimeline);
-								res.wx.updateTimelineShareData(configTimeline);
-								res.wx.onMenuShareAppMessage(configTimeline);
-								res.wx.onMenuShareTimeline(configTimeline);
-							}
-						});
-				}
-			},
-			//#endif
-			//拼团取消
-			getCombinationRemove: function() {
-				var that = this;
-				uni.showModal({
-				    title: '提示',
-				     content: '确定取消拼团？',
-				     success: function (res) {
-						if (res.confirm) {
-							postCombinationRemove({
-									group_buying_id: that.pinkId
-								})
-								.then(res => {
-									that.$util.Tips({
-										title: res.message
-									}, {
-										tab: 3
-									});
-								})
-								.catch(res => {
-									that.$util.Tips({
-										title: res.message
-									});
-								});
-						}else if (res.cancel) {
-							return that.$util.Tips({
-								title: '已取消'
-							});
-				    }
-					}
-				});
-			},
-			lookAll: function() {
-				this.iShidden = !this.iShidden;
-			}
-		}
-	};
-</script>
-<style lang="scss" scoped>
-	.generate-posters {
-		width: 100%;
-		height: 170rpx;
-		background-color: #fff;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		z-index: 301;
-		transform: translate3d(0, 100%, 0);
-		transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-		border-top: 1rpx solid #eee;
-	}
-	.generate-posters.on {
-		transform: translate3d(0, 0, 0);
-	}
-	.generate-posters .item {
-		/* #ifdef H5 */
-		flex: 50%;
-		/* #endif */
-		/* #ifndef H5 */
-		flex: 33.33%;
-		/* #endif */
-		text-align: center;
-		font-size: 30rpx;
-		&.item3{
-			flex: 33.33%;
-		}
-	}
-	.generate-posters .item .iconfont {
-		font-size: 80rpx;
-		color: #5eae72;
-	}
-	.generate-posters .item .iconfont.icon-haibao {
-		color: #5391f1;
-	}
-	.generate-posters .item .iconfont.icon-fuzhikouling1 {
-		color: #FBB324;
-	}
-	/* #ifdef MP */
-	.group-con{
-		padding-top: 30rpx;
-	}
-	/* #endif */
-	.sColor{
-		color: var(--view-theme);
-		border: 1rpx solid var(--view-theme);
-	}
-	/*开团*/
-	.group-con .header {
-		width: 100%;
-		height: 186rpx;
-		background-color: #fff;
-		border-top: 1px solid #f5f5f5;
-		padding: 0 30rpx;
-		position: relative;
-	}
-	.group-con .header .iconfont {
-		font-size: 100rpx;
-		position: absolute;
-		color: #ccc;
-		right: 33rpx;
-		bottom: 20rpx;
-	}
-	.group-con .header .pictrue {
-		width: 140rpx;
-		height: 140rpx;
-	}
-	.group-con .header .pictrue uni-image,.group-con .header .pictrue image {
-		width: 140rpx;
-		height: 140rpx;
-		border-radius: 6rpx;
-	}
-	.group-con .header .text {
-		width: 540rpx;
-		font-size: 30rpx;
-		color: #222;
-	}
-	.group-con .header .text .money {
-		font-size: 24rpx;
-		font-weight: bold;
-		margin-top: 15rpx;
-	}
-	.group-con .header .text .money .num {
-		font-size: 32rpx;
-	}
-	.group-con .header .text .money .team {
-		padding: 1rpx 10rpx;
-		font-weight: normal;
-		border-radius: 50rpx;
-		font-size: 20rpx;
-		vertical-align: 4rpx;
-		margin-left: 15rpx;
-	}
-	.group-con .wrapper {
-		background-color: #fff;
-		margin-top: 20rpx;
-		padding: 2rpx 0 35rpx 0;
-	}
-	.group-con .wrapper .title {
-		margin-top: 30rpx;
-	}
-	.group-con .wrapper .title .line {
-		width: 136rpx;
-		height: 1px;
-		background-color: #ddd;
-	}
-	.group-con .wrapper .title .name {
-		margin: 0 45rpx;
-		font-size: 28rpx;
-		color: #282828;
-	}
-	.group-con .wrapper .title .name .time {
-		margin: 0 14rpx;
-	}
-	/deep/.group-con .wrapper .styleAll {
-		background-color: #ffcfcb;
-		text-align: center;
-		border-radius: 3rpx;
-		font-size: 28rpx;
-		font-weight: bold;
-		display: inline-block;
-		vertical-align: middle;
-		background-color: var(--view-minorColor);
-		padding: 2rpx 5rpx;
-	}
-	.gColor{
-		background-color: var(--view-theme)!important;
-	}
-	.t-color{
-		color: var(--view-theme)!important;
-	}
-	.group-con .wrapper .tips {
-		font-size: 30rpx;
-		font-weight: bold;
-		text-align: center;
-		margin-top: 30rpx;
-	}
-	.group-con .wrapper .list {
-		padding: 0 30rpx;
-		margin-top: 45rpx;
-	}
-	.group-con .wrapper .list.result {
-		max-height: 240rpx;
-		overflow: hidden;
-	}
-	.group-con .wrapper .list.result.on {
-		max-height: 2000rpx;
-	}
-	.group-con .wrapper .list .pictrue {
-		width: 94rpx;
-		height: 94rpx;
-		margin: 0 0 29rpx 35rpx;
-	}
-	.group-con .wrapper .list .pictrue uni-image,.group-con .wrapper .list .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-	}
-	.group-con .wrapper .list .img-none {
-		border: none;
-		width: 140rpx;
-		height: 140rpx;
-	}
-	.group-con .wrapper .lookAll {
-		font-size: 24rpx;
-		color: #282828;
-		padding-top: 10rpx;
-	}
-	.group-con .wrapper .lookAll .iconfont {
-		font-size: 25rpx;
-		margin: 2rpx 0 0 10rpx;
-	}
-	.group-con .wrapper .teamBnt {
-		font-size: 30rpx;
-		width: 620rpx;
-		height: 86rpx;
-		border-radius: 50rpx;
-		text-align: center;
-		line-height: 86rpx;
-		color: #fff;
-		margin: 21rpx auto 0 auto;
-		background-color: var(--view-theme);
-	}
-	.group-con .wrapper .cancel,
-	.group-con .wrapper .lookOrder {
-		text-align: center;
-		font-size: 24rpx;
-		color: #282828;
-		padding-top: 30rpx;
-	}
-	.group-con .wrapper .cancel .iconfont {
-		font-size: 35rpx;
-		color: #2c2c2c;
-		vertical-align: -4rpx;
-		margin-right: 9rpx;
-	}
-	.group-con .wrapper .lookOrder .iconfont {
-		font-size: 25rpx;
-		color: #2c2c2c;
-		margin-left: 10rpx;
-	}
-	.group-con .group-recommend {
-		background-color: #fff;
-		margin-top: 25rpx;
-	}
-	.group-con .group-recommend .title {
-		padding-right: 30rpx;
-		margin-left: 30rpx;
-		height: 85rpx;
-		border-bottom: 1px solid #eee;
-		font-size: 28rpx;
-		color: #282828;
-	}
-	.group-con .group-recommend .title .more {
-		color: #808080;
-	}
-	.group-con .group-recommend .title .more .iconfont {
-		margin-left: 13rpx;
-		font-size: 28rpx;
-	}
-	.group-con .group-recommend .list {
-		margin-top: 30rpx;
-	}
-	.group-con .group-recommend .list .item {
-		width: 210rpx;
-		margin: 0 0 25rpx 30rpx;
-	}
-	.group-con .group-recommend .list .item .pictrue {
-		width: 100%;
-		height: 210rpx;
-		position: relative;
-	}
-	.group-con .group-recommend .list .item .pictrue uni-image,.group-con .group-recommend .list .item .pictrue image {
-		width: 210rpx;
-		height: 210rpx;
-		border-radius: 10rpx;
-	}
-	.group-con .group-recommend .list .item .pictrue .team {
-		position: absolute;
-		top: 28rpx;
-		left: -5rpx;
-		min-width: 100rpx;
-		height: 36rpx;
-		line-height: 36rpx;
-		text-align: center;
-		border-radius: 0 18rpx 18rpx 0;
-		font-size: 20rpx;
-		color: #fff;
-		background-image: linear-gradient(to right, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-	}
-	.group-con .group-recommend .list .item .name {
-		font-size: 28rpx;
-		color: #333;
-		margin-top: 0.18rem;
-	}
-	.group-con .group-recommend .list .item .money {
-		font-weight: bold;
-		font-size: 28rpx;
-		color: var(--view-priceColor);
-	}
-	.share-box {
-		z-index: 1000;
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-</style>
diff --git a/pages/activity/goods_seckill/index.vue b/pages/activity/goods_seckill/index.vue
deleted file mode 100644
index 73f0b91..0000000
--- a/pages/activity/goods_seckill/index.vue
+++ /dev/null
@@ -1,429 +0,0 @@
-<template>
-	<view :style="viewColor">
-		<view class='flash-sale'>
-			<!-- #ifdef H5 -->
-			<view class="fixed-head">
-				<view class="sys-head" :style="{height:statusBarHeight}"></view>
-				<view class="tool-bar">
-					<view class='iconfont icon-xiangzuo' @tap='goBack'></view>
-				</view>
-			</view>
-			<!-- #endif -->
-			<view class="saleBox"></view>
-			<view class='header' v-if="timeList.length>0">
-				<image :src='timeList[active].pic'></image>
-			</view>
-			<view class="seckillList acea-row row-between-wrapper">
-				<view class="priceTag">
-					<image :src="`${domain}/static/diy/priceTag${keyColor}.png`"></image>
-				</view>
-				<view class='timeLsit'>
-					<scroll-view class="scroll-view_x" scroll-x scroll-with-animation  style="width:auto;overflow:hidden;height:106rpx;" :scroll-into-view="intoindex">
-						<block v-for="(item,index) in timeList" :key='index'>
-							<view @tap='settimeList(item,index)' class='item' :class="active == index?'on':''" :id='"sort"+index'>
-								<view class='time'>{{item.time}}</view>
-								<view class="state">{{item.state}}</view>
-							</view>
-						</block>
-					</scroll-view>
-				</view>
-			</view>
-			<view class='list'>
-				<block v-for="(item,index) in seckillList" :key='index'>
-					<view class='item acea-row row-between-wrapper' @tap='goDetails(item)'>
-						<view class='pictrue'>
-							<image :src='item.image'></image>
-						</view>
-						<view class='text acea-row row-column-around'>
-							<view class='name line1'>{{item.store_name}}</view>
-							<view class='money'>￥
-								<text class='num'>{{item.price}}</text>
-								<text class="y_money">￥{{item.ot_price}}</text>
-							</view>
-							<view class="limit">限量 <text class="limitPrice">{{item.stock}}{{item.unit_name || ''}}</text></view>
-							<view class="progress">
-								<view class='bg-reds' :style="'width:'+item.percent+';'"></view>
-								<view class='piece'>已抢{{item.percent}}</view>
-							</view>
-						</view>
-						<view class='grab b-color' v-if="status == 1">马上抢</view>
-						<view class='grab b-color' v-else-if="status == 2">未开始</view>
-						<view class='grab bg-color-hui' v-else>已结束</view>
-					</view>
-				</block>
-			</view>
-		</view>
-		<view class='noCommodity' v-if="seckillList.length == 0 && (page != 1 || active== 0)">
-			<view class='pictrue'>
-				<image src='/static/images/noCart.png'></image>
-				<view>暂无商品，去看点什么吧</view>
-			</view>
-		</view>
-		<home></home>
-		<!-- #ifndef H5 -->
-		<passwordPopup></passwordPopup>
-		<!-- #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>
-	// +----------------------------------------------------------------------
-	import {
-		getSeckillIndexTime,
-		getSeckillList
-	} from '../../../api/activity.js';
-	import home from '@/components/home/index.vue'
-	// #ifndef H5
-	import passwordPopup from '@/components/passwordPopup';
-	// #endif
-	import { mapGetters } from "vuex";
-	import { configMap } from "@/utils";
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	export default {
-		components: {
-			// #ifndef H5
-			passwordPopup,
-			// #endif
-			home
-		},
-		computed: configMap({statusBarHeight:0},mapGetters(['viewColor','keyColor'])),
-		data() {
-			return {
-				domain: HTTP_REQUEST_URL,
-				seckillList: [],
-				timeList: [],
-				active: 5,
-				scrollLeft: 0,
-				interval: 0,
-				status: 1,
-				countDownHour: "00",
-				countDownMinute: "00",
-				countDownSecond: "00",
-				page: 1,
-				limit: 8,
-				loading: false,
-				loadend: false,
-				pageloading: false,
-				intoindex:''
-			}
-		},
-		/**
-		 * 用户点击右上角分享
-		 */
-		// #ifdef MP
-		onShareAppMessage: function() {
-			wx.showShareMenu({
-				withShareTicket: true,
-				menus: ['shareAppMessage', 'shareTimeline']
-			})
-			return {
-				title: '秒杀活动',
-				path: 'pages/activity/goods_seckill/index',
-			}
-		},
-		onShareTimeline: function() {
-			return {
-				title: '秒杀活动',
-				  query: {
-				    key: ''
-				  },
-				  imageUrl: ''
-				}      
-		},
-		// #endif
-		onLoad() {
-			this.getSeckillConfig();
-		},
-		methods: {
-			goBack: function() {
-				uni.navigateBack();
-			},
-			getSeckillConfig: function() {
-				let that = this;
-				getSeckillIndexTime().then(res => {
-					that.timeList = res.data.seckillTime;
-					that.active = res.data.seckillTimeIndex;
-					that.$nextTick(()=>{
-						that.intoindex = 'sort'+res.data.seckillTimeIndex
-					})
-					let time;
-					that.timeList.map((item) => {
-						time = item.start_time > 9 ? item.start_time + ':00' : '0' + item.start_time + ':00';
-						item.time = time;
-					})
-					if (that.timeList.length) {
-						// wxh.time(that.data.timeList[that.data.active].stop, that);
-						setTimeout(function() {
-							that.loading = true
-						}, 2000);
-						that.seckillList = [],
-							that.page = 1
-						that.status = that.timeList[that.active].status
-						that.getSeckillList();
-						// 不用延时 app不会自动滚动到当前时间
-						setTimeout(()=>{
-							// that.scrollLeft = (that.active - 1.37) * 100
-						},500)
-					}
-				});
-			},
-			getSeckillList: function() {
-				var that = this;
-				var data = {
-					page: that.page,
-					limit: that.limit,
-					start_time: that.timeList[that.active].start_time,
-					end_time: that.timeList[that.active].end_time
-				};
-				if (that.loadend) return;
-				if (that.pageloading) return;
-				this.pageloading = true
-				getSeckillList(data).then(res => {
-					// console.log(res);
-					var seckillList = res.data.list;
-					seckillList.map((item) => {
-						item.percent = item.stock === 0 ? '0%' : (item.sales*100 / item.stock).toFixed(2) + '%';
-					})
-					var loadend = seckillList.length < that.limit;
-					that.page++;
-					that.seckillList = that.seckillList.concat(seckillList);
-					that.pageloading = false;
-					that.loadend = loadend;
-				}).catch(err => {
-					that.pageloading = false
-				});
-			},
-			settimeList: function(item, index) {
-				var that = this;
-				this.active = index
-				if (that.interval) {
-					clearInterval(that.interval);
-					that.interval = null
-				}
-				that.interval = 0;
-				that.countDownHour = "00";
-				that.countDownMinute = "00";
-				that.countDownSecond = "00";
-				that.status = that.timeList[that.active].status;
-				that.loadend = false;
-				that.page = 1;
-				that.seckillList = [];
-				that.getSeckillList();
-			},
-			goDetails(item) {
-				uni.navigateTo({
-					url: '/pages/activity/goods_seckill_details/index?id=' + item.product_id
-				})
-			}
-		},
-		/**
-		 * 页面上拉触底事件的处理函数
-		 */
-		onReachBottom: function() {
-			this.getSeckillList();
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #F5F5F5 !important;
-	}
-	.flash-sale .header {
-		width: 710rpx;
-		height: 300rpx;
-		margin: -215rpx auto 0 auto;
-		border-radius: 20rpx;
-	}
-	.flash-sale .header image {
-		width: 100%;
-		height: 100%;
-		border-radius: 20rpx;
-	}
-	.flash-sale .seckillList {
-		padding: 0 20rpx;
-	}
-	.flash-sale .seckillList .priceTag {
-		width: 76rpx;
-		height: 70rpx;
-	}
-	.flash-sale .seckillList .priceTag image {
-		opacity: 1;
-	}
-	.flash-sale .seckillList .priceTag image {
-		width: 100%;
-		height: 100%;
-	}
-	.flash-sale .timeLsit {
-		width: 610rpx;
-		white-space: nowrap;
-		margin: 10rpx 0;
-	}
-	.flash-sale .timeLsit .item {
-		display: inline-block;
-		font-size: 20rpx;
-		color: #666;
-		text-align: center;
-		padding: 11rpx 0;
-		box-sizing: border-box;
-		height: 96rpx;
-		margin-right: 35rpx;
-	}
-	.flash-sale .timeLsit .item .time {
-		font-size: 36rpx;
-		font-weight: 600;
-		color: #333;
-	}
-	.flash-sale .timeLsit .item.on .time {
-		color: var(--view-theme);
-	}
-	.flash-sale .timeLsit .item.on .state {
-		width: 90rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		height: 30rpx;
-		border-radius: 15rpx;
-		background-image: linear-gradient(90deg, var(--view-bntColor11) 0%, var(--view-bntColor12) 100%);
-		color: #fff;
-	}
-	.flash-sale .countDown {
-		height: 92rpx;
-		border-bottom: 1px solid #f0f0f0;
-		margin-top: -14rpx;
-		font-size: 28rpx;
-		color: #282828;
-	}
-	.flash-sale .countDown .num {
-		font-size: 28rpx;
-		font-weight: bold;
-		background-color: #ffcfcb;
-		padding: 4rpx 7rpx;
-		border-radius: 3rpx;
-	}
-	.flash-sale .countDown .text {
-		font-size: 28rpx;
-		color: #282828;
-		margin-right: 13rpx;
-	}
-	.flash-sale .list .item {
-		height: 230rpx;
-		position: relative;
-		width: 710rpx;
-		margin: 0 auto 20rpx auto;
-		background-color: #fff;
-		border-radius: 20rpx;
-		padding: 0 25rpx;
-	}
-	.flash-sale .list .item .pictrue {
-		width: 180rpx;
-		height: 180rpx;
-		border-radius: 10rpx;
-	}
-	.flash-sale .list .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 10rpx;
-	}
-	.flash-sale .list .item .text {
-		width: 460rpx;
-		font-size: 30rpx;
-		color: #333;
-		height: 166rpx;
-	}
-	.flash-sale .list .item .text .name {
-		width: 100%;
-	}
-	.flash-sale .list .item .text .money {
-		font-size: 30rpx;
-		color: var(--view-priceColor);
-	}
-	.flash-sale .list .item .text .money .num {
-		font-size: 40rpx;
-		font-weight: 500;
-	}
-	.flash-sale .list .item .text .money .y_money {
-		font-size: 24rpx;
-		color: #999;
-		text-decoration-line: line-through;
-		margin-left: 15rpx;
-	}
-	.flash-sale .list .item .text .limit {
-		font-size: 22rpx;
-		color: #999;
-		margin-bottom: 5rpx;
-	}
-	.flash-sale .list .item .text .limit .limitPrice {
-		margin-left: 10rpx;
-	}
-	.flash-sale .list .item .text .progress {
-		overflow: hidden;
-		background-color: var(--view-bgColor);
-		width: 260rpx;
-		border-radius: 18rpx;
-		height: 18rpx;
-		position: relative;
-	}
-	.flash-sale .list .item .text .progress .bg-reds {
-		width: 0;
-		height: 100%;
-		transition: width 0.6s ease;
-		background: linear-gradient(90deg, var(--view-bntColor11) 0%, var(--view-bntColor12) 100%);
-	}
-	.flash-sale .list .item .text .progress .piece {
-		position: absolute;
-		left: 8%;
-		transform: translate(0%, -50%);
-		top: 49%;
-		font-size: 16rpx;
-		color: var(--view-theme);
-	}
-	.flash-sale .list .item .grab {
-		font-size: 28rpx;
-		color: #fff;
-		width: 150rpx;
-		height: 54rpx;
-		border-radius: 27rpx;
-		text-align: center;
-		line-height: 54rpx;
-		position: absolute;
-		right: 30rpx;
-		bottom: 30rpx;
-		background: #bbbbbb;
-		&.b-color {
-			background: var(--view-theme);
-		}
-	}
-	.flash-sale .saleBox {
-		width: 100%;
-		height: 230rpx;
-		background: var(--view-theme);
-		border-radius: 0 0 50rpx 50rpx;
-	}
-	.tool-bar{
-		display: flex;
-		align-items: center;
-		height: 40px;
-	}
-	.fixed-head{
-		position: absolute;
-		left: 0;
-		top: 20px;
-		width: 100%;
-		z-index: 10;
-		.icon-xiangzuo {
-			margin-right: 40rpx;
-			margin-left: 20rpx;
-			font-size: 40rpx;
-			color: #fff;
-		}
-	}
-</style>
diff --git a/pages/activity/goods_seckill_details/index.vue b/pages/activity/goods_seckill_details/index.vue
deleted file mode 100644
index 73119f0..0000000
--- a/pages/activity/goods_seckill_details/index.vue
+++ /dev/null
@@ -1,1943 +0,0 @@
-<template>
-	<view :style="viewColor">
-		<view class="product-con skeleton">
-			<view class="head-wrapper" :style="'top:'+statusBarHeight">
-				<view class="head-menu">
-					<view class='iconfont icon-xiangzuo' @click="returns"></view>
-					<view class="iconfont icon-shouye4" @click="goHome"></view>
-				</view>
-			</view>
-			<view>
-				<scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true" :style='"height:"+height+"px;"'
-				 @scroll="scroll">
-					<view id="past0">
-						<productConSwiper class="skeleton-rect" :imgUrls="storeInfo.slider_image" :videoCoverImg='videoCoverImg' :videoline="storeInfo.video_link"></productConSwiper>
-						<view class='nav acea-row row-between-wrapper' :style="{ 'background-image': `url(${domain}/static/images/seckill-bg.png)`}">
-							<view class='money skeleton-rect'>￥<text class='num'>{{storeInfo.price}}</text><text class='y-money'>￥{{storeInfo.ot_price}}</text></view>
-							<view class='acea-row row-middle skeleton-rect' v-if="storeInfo.seckill_status == '1'">
-								<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 class='wrapper'>
-							<view class='introduce skeleton-rect acea-row row-between row-bottom'>
-								<view>
-									<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="fenxiang_btn" @click="listenerActionSheet">
-									<view class='iconfont icon-fenxiang'></view>
-									分享
-								</view>
-
-							</view>
-							<view class='label acea-row row-between-wrapper'>
-								<view class="skeleton-rect">市场价:￥{{storeInfo.ot_price}}</view>
-								<view class="skeleton-rect">库存:{{storeInfo.stock}}{{storeInfo.unit_name}}</view>
-								<view class="skeleton-rect">销量:{{storeInfo.sales}}{{storeInfo.unit_name}}</view>
-							</view>
-						</view>
-						<view class='attribute acea-row row-between-wrapper' @click="selecAttr">
-							<view class="skeleton-rect">{{attrTxt}}：
-								<text class='atterTxt'>{{attrValue}}</text>
-							</view>
-							<view class='iconfont icon-jiantou skeleton-rect'></view>
-						</view>
-						<!--运费-->
-						<view v-if="shipping || shippingValue" class='attribute acea-row row-between-wrapper' @click="showShip">
-							<view class="acea-row row-between-wrapper skeleton-rect">运费：
-								<text class='atterTxt'>{{shippingValue}}</text>
-							</view>
-							<view class='iconfont icon-jiantou skeleton-rect'></view>
-						</view>
-						<!--保障-->
-						<view v-if="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="specsInfo.params.length>0" class="attribute acea-row row-between-wrapper" @click="seeSpecs">
-						  <view class="acea-row row-middle">
-						    参数：
-						    <view class="list line1">
-						      <text class="item params" v-for="(item,index) in specsInfo.params" :key="index"
-						        v-if="index<2">{{item.name}}</text>
-						      <text>...</text>
-						    </view>
-						  </view>
-						  <view class="iconfont icon-jiantou"></view>
-						</view>
-					</view>
-					<view class='userEvaluation' id="past1" v-if="replyCount && replyCount>0">
-						<view class='title acea-row row-between-wrapper'>
-							<view>用户评价({{replyCount}})</view>
-							<navigator class='praise' hover-class='none' :url='"/pages/users/goods_comment_list/index?product_id="+id'>
-								<text class='t-color'>{{replyChance}}</text>好评率
-								<text class='iconfont icon-jiantou'></text>
-							</navigator>
-						</view>
-						<block v-if="replyCount">
-							<userEvaluation :reply="reply"></userEvaluation>
-						</block>
-					</view>
-					<!-- 种草秀 -->
-					<view class='userPlant' v-if="storeInfo.community && storeInfo.community.length>0">
-						<view class='title acea-row row-between-wrapper'>
-							<view>种草秀 </view>
-							<navigator class='praise' hover-class='none' :url="'/pages/plantGrass/plant_show/index?spu_id='+storeInfo.spu_id">
-								查看全部
-								<text class='iconfont icon-jiantou'></text>
-							</navigator>
-						</view>
-						<view class="imgList acea-row">
-							<navigator class="pictrue" v-for="(item, index) in storeInfo.community" :key="index" v-if="index<=2"
-							 hover-class='none' :url="'/pages/plantGrass/plant_detail/index?id='+item.community_id">
-								<image :src="item.image[0]" class="image"></image>
-
-							</navigator>
-						</view>
-					</view>
-					<!-- 商铺信息 -->
-					<view class="store-wrapper" v-if="storeInfo.merchant && hide_mer_status ==0">
-						<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}}
-										<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)" class="font-bg-red ml8">{{storeInfo.merchant.type_name}}</text>
-										<text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red ml8">自营</text>
-									</view>
-									<view class="txt">
-									{{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
-									</view>
-								</view>
-								<navigator v-if="hide_mer_status == 0" :url="'/pages/store/home/index?id='+storeInfo.merchant.mer_id" class="link"
-								 hover-class="none">进店</navigator>
-							</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 v-if="storeInfo.merchant.recommend && storeInfo.merchant.recommend.length > 0" class="con-box">
-							<view class="title">店铺推荐</view>
-							<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="false">
-								<view class="img-box">
-									<view class="img-item" v-for="(item,index) in storeInfo.merchant.recommend" :key="index" @click="goProDetail(item)">
-										<image :src="item.image" mode=""></image>
-										<view class="txt">
-											<view class="title line1">{{item.store_name}}</view>
-											<view class="price">
-												<text>￥</text>{{item.price}}
-											</view>
-										</view>
-									</view>
-								</view>
-							</scroll-view>
-						</view>
-					</view>
-					<view class='product-intro' id="past3">
-						<view class='title'>产品介绍</view>
-						<view class='conter' v-if="description">
-							<jyf-parser :domain='domain' :html="description.content" ref="article" :tag-style="tagStyle"></jyf-parser>
-						</view>
-						<!-- 价格说明 -->
-						<view v-if="priceRule.content" class="price-info">
-							<view class="price-title">价格说明</view>
-							<!-- #ifndef APP-PLUS -->
-							<jyf-parser :domain='domain' :html="priceRule.content.replace(/<br\/>/ig, '')" ref="article" :tag-style="tagStyle"></jyf-parser>
-							<!-- #endif -->
-							<!-- #ifdef APP-PLUS -->
-							<view class="description" v-html="priceRule.content.replace(/<br\/>/ig, '')"></view>
-							<!-- #endif -->
-						</view>
-					</view>
-					<view style='height:120rpx;'></view>
-				</scroll-view>
-			</view>
-			<view class='footer acea-row row-between-wrapper'>
-				<view v-if="storeInfo.merchant && storeInfo.merchant.services_type == 1" class="item skeleton-rect" @click="call">
-					<view class="iconfont icon-kefu"></view>
-					<view>客服</view>
-				</view>
-				<view v-else class="item skeleton-rect" @click="goCustomer">
-					<view class="iconfont icon-kefu"></view>
-					<view>客服</view>
-				</view>
-				<view @click="setCollect" class='item skeleton-rect'>
-					<view class='iconfont icon-shoucang1' v-if="storeInfo.isRelation"></view>
-					<view class='iconfont icon-shoucang' v-else></view>
-					<view>收藏</view>
-				</view>
-				<view class='bnt acea-row skeleton-rect'>
-					<form @submit="joinCart" report-submit='true'>
-						<button class='joinCart bnts' @tap="openAlone">直接购买</button>
-					</form>
-					<form @submit="goBuy" report-submit='true' v-if="attr.productSelect && storeInfo.seckill_status == '1'">
-						<button v-if="attr.productSelect.stock == 0" class='buy bnts' form-type="submit" disabled>已售罄</button>
-						<button v-else class='buy bnts' form-type="submit">秒杀购买</button>
-					</form>
-					<form @submit="goBuy" report-submit='true' v-if="attr.productSelect && storeInfo.seckill_status == '0'">
-						<button class='buy bnts' form-type="submit" disabled>未开始</button>
-					</form>
-					<form @submit="goBuy" report-submit='true' v-if="attr.productSelect && storeInfo.seckill_status == '-1'">
-						<button class='buy bnts' form-type="submit" disabled>已结束</button>
-					</form>
-				</view>
-			</view>
-			<!-- 组件 -->
-			<productWindow :attr="attr" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNum"
-			 @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window' :image="storeInfo.image"></productWindow>
-			<!-- 商品参数 -->
-			<specs :specsInfo="specsInfo" @myevent="mySpecs"></specs>
-			<!-- 分享按钮 -->
-			<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
-				<!-- #ifndef MP -->
-				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' v-if="weixinStatus === true" @click="H5ShareBox = true">
-					<view class="iconfont icon-weixin3"></view>
-					<view class="">发送给朋友</view>
-				</button>
-				<!-- #endif -->
-				<!-- #ifdef MP -->
-				<button class="item" :class="weixinStatus ? 'item3' : ''" open-type="share" hover-class='none' @click="goFriend">
-					<view class="iconfont icon-weixin3"></view>
-					<view class="">发送给朋友</view>
-				</button>
-				<!-- #endif -->
-				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="goPoster">
-					<view class="iconfont icon-haibao"></view>
-					<view class="">生成海报</view>
-				</button>
-				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="copyPwd">
-					<view class="iconfont icon-fuzhikouling1"></view>
-					<view>复制口令</view>
-				</button>
-			</view>
-			<view class="mask" v-if="posters" @click="listenerActionClose"></view>
-			<!--口令复制结果-->
-			<copyPassword :isCopy='isCopy' :copyUrl='copyUrl' @close="closeCopy"></copyPassword>
-			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-			<!-- 海报展示 -->
-			<view class='poster-pop' v-if="posterImageStatus">
-				<image src='../../../static/images/poster-close.png' class='close' @click="posterImageClose"></image>
-				<image :src='posterImage'></image>
-				<!-- #ifndef H5  -->
-				<view class='save-poster' @click="savePosterPath">保存到手机</view>
-				<!-- #endif -->
-				<!-- #ifdef H5 -->
-				<view class="keep">长按图片可以保存到手机</view>
-				<!-- #endif -->
-			</view>
-			<view class='mask' v-if="posterImageStatus"></view>
-			<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
-			<!-- 发送给朋友图片 -->
-			<view class="share-box" v-if="H5ShareBox">
-				<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
-			</view>
-			<guaranteeTemplate ref="guartemplate" :guarantee='guarantee' :shipping='shipping'></guaranteeTemplate>
-			<!-- #ifndef H5 -->
-			<passwordPopup></passwordPopup>
-			<!-- #endif -->
-		</view>
-	</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 {
-		getSeckillProductDetail,
-		getProductCode,
-		collectAdd,
-		collectDel,
-		postCartAdd,
-		copyPasswordApi, priceRuleApi
-	} from '@/api/store.js';
-	import { getUserInfo, imgToBase } from '@/api/user.js';
-	import { getCoupons, getShopCoupons } from '@/api/api.js';
-	import { getCartCounts } from '@/api/order.js';
-	import { mapGetters } from "vuex";
-	import { imageBase64 } from "@/api/public";
-	import specs from '@/components/specs/index.vue';
-	import productConSwiper from '@/components/productConSwiper';
-	import productWindow from '@/components/productWindow';
-	import copyPassword from '@/components/copyPassword';
-	import userEvaluation from '@/components/userEvaluation';
-	import countDown from '@/components/countDown';
-	import home from '@/components/home';
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	import { silenceBindingSpread, configMap } from "@/utils";
-	import parser from "@/components/jyf-parser/jyf-parser";
-	import authorize from '@/components/Authorize';
-	// #ifndef H5
-	import passwordPopup from '@/components/passwordPopup';
-	// #endif
-	import history from "@/mixins/history";
-	import shareScence from "@/libs/spread";
-	import guaranteeTemplate from '@/components/freightGuarantee';
-	const app = getApp();
-	export default {
-		components: {
-			// #ifndef H5
-			passwordPopup,
-			// #endif
-			specs,
-			productConSwiper,
-			productWindow,
-			userEvaluation,
-			home,
-			countDown,
-			guaranteeTemplate,
-			copyPassword,
-			"jyf-parser": parser,
-			authorize,
-		},
-		mixins: [history],
-		data() {
-			let that = this;
-			return {
-				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
-				countDownHour: "00",
-				countDownMinute: "00",
-				countDownSecond: "00",
-				datatime: '',
-				statusBarHeight: statusBarHeight, //系统导航条高度
-				//属性是否打开
-				coupon: {
-					'coupon': false,
-					list: [],
-				},
-				attrTxt: '选择', //属性页面提示
-				attrValue: '', //已选属性
-				animated: false, //购物车动画
-				id: 0, //商品id
-				replyCount: 0, //总评论数量
-				reply: [], //评论列表
-				storeInfo: {}, //商品详情
-				productValue: [], //系统属性
-				cart_num: 1, //购买数量
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				isOpen: false, //是否打开属性组件
-				actionSheetHidden: true,
-				posterImageStatus: false,
-				storeImage: '', //海报产品图
-				PromotionCode: '', //二维码图片
-				canvasStatus: false, //海报绘图标签
-				posterImage: '', //海报路径
-				posterbackgd: '/static/images/posterbackgd.png',
-				// uid: 0, //用户uid
-				circular: false,
-				autoplay: false,
-				interval: 3000,
-				duration: 500,
-				clientHeight: "",
-				priceRule: "",
-				systemStore: {}, //门店信息
-				replyChance: 0,
-				CartCount: 0,
-				isDown: true,
-				storeSelfMention: true,
-				posters: false,
-				weixinStatus: false,
-				attr: {
-					cartAttr: false,
-					productAttr: [],
-					productSelect: {}
-				},
-				description: '',
-				navActive: 0,
-				H5ShareBox: false, //公众号分享图片
-				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,
-				domain: HTTP_REQUEST_URL,
-				currSpid: "",
-				codeImg: "",
-				videoCoverImg: "",
-				shipping: "",
-				guarantee: [],
-				guaranteeValue: "",
-				shippingValue: "",
-				isCopy: false,
-				copyUrl: '',
-				services_type: "",
-				specsInfo: {
-				  show: false,
-				  params: []
-				},
-			};
-		},
-		computed: configMap(['hide_mer_status','site_name','share_pic'],mapGetters(['isLogin','uid','viewColor'])),
-		onLoad(options) {
-			let that = this;
-			if (options.spid) {
-				that.currSpid = options.spid
-				app.globalData.spid = options.spid;
-			}
-			var pages = getCurrentPages();
-			if (pages.length <= 1) {
-				that.retunTop = false
-			}
-			// #ifdef MP
-			this.navH = app.globalData.navHeight;
-			// #endif
-			// #ifndef MP
-			this.navH = 96;
-			// #endif
-			this.id = options.id;
-			if (options.id) {
-				this.id = options.id
-			}
-			uni.getSystemInfo({
-				success: function(res) {
-					that.height = res.windowHeight
-				},
-			});
-			//扫码携带参数处理
-			// #ifdef MP
-			if (options.scene) {
-				let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
-				if (value.id) options.id = value.id;
-				//记录推广人uid
-				if (value.spid) {
-					app.globalData.spid = value.spid;
-					that.currSpid = value.spid
-				}
-			}
-			if (!options.id && !options.scene) {
-				return this.$util.Tips({
-					title: '缺少参数无法查看商品'
-				}, {
-					tab: 3,
-					url: 1
-				});
-			} else {
-				this.id = options.id
-			}
-			//记录推广人uid
-			if (options.spid) app.globalData.spid = options.spid;
-			// #endif
-			shareScence(that.currSpid, that.isLogin)
-			this.getGoodsDetails();
-
-			//#ifdef H5
-			this.isLogin && silenceBindingSpread();
-			//#endif
-			if (this.isLogin) {
-				this.downloadFilePromotionCode();
-				// #ifdef MP
-				this.getHistory()
-				// #endif
-			}
-		},
-		onReady() {
-			this.isNodes++;
-		},
-		mounted: function() {
-
-		},
-		show() {
-
-		},
-		/**
-		 * 用户点击右上角分享
-		 */
-		// #ifdef MP
-		onShareAppMessage: function() {
-			let that = this;
-			that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-			return {
-				title: that.storeInfo.store_name || '',
-				imageUrl: that.storeInfo.image || '',
-				path: '/pages/activity/goods_seckill_details/index?id=' + that.id + '&spid=' + that.uid,
-			}
-		},
-		onShareTimeline: function() {
-			let that = this;
-			that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-			return {
-				title: that.storeInfo.store_name || '',
-				query: {
-					id: that.id,
-					spid: that.uid
-				},
-				imageUrl: that.storeInfo.image || ''
-			}
-		},
-		// #endif
-		methods: {
-			call: function(){
-				uni.makePhoneCall({
-					// 手机号
-				    phoneNumber: this.storeInfo.merchant.service_phone,
-					// 成功回调
-					success: (res) => {
-						// console.log('调用成功!')
-					},
-					// 失败回调
-					fail: (res) => {
-						// console.log('调用失败!')
-					}
-				});
-			},
-			goCustomer(){
-				let that = this;
-				if (that.isLogin === false) {
-				    this.isAuto = true;
-				    this.isShowAuth = true
-				} else {
-					uni.navigateTo({
-						url: `/pages/chat/customer_list/chat?mer_id=${that.storeInfo.mer_id}&uid=${that.uid}&productId=${that.id}`
-					});
-				}
-			},
-			goProDetail(item) {
-				uni.redirectTo({
-					url: '/pages/goods_details/index?id=' + item.product_id
-				})
-			},
-			/**查看运费说明*/
-			showShip: function() {
-				this.$refs.guartemplate.showShippingTel();
-			},
-			/**查看服务保障*/
-			showGuaranee: function() {
-				this.$refs.guartemplate.showGuaranteeTel();
-			},
-			/**查看商品参数*/
-			seeSpecs() {
-			  this.specsInfo.show = true;
-			},
-			mySpecs() {
-			  this.$set(this.specsInfo, 'show', false);
-			},
-			/*获取价格说明*/
-			getPricrRule() {
-				priceRuleApi(this.storeInfo.cate_id).then(res => {
-					this.priceRule = res.data
-				}).catch(err => {
-			
-				});
-			},
-			goActivity: function(e) {
-				let item = e;
-				if (item.type === "1") {
-					uni.navigateTo({
-						url: `/pages/activity/goods_seckill_details/index?id=${item.id}&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);
-			},
-			// 后退
-			returns: function() {
-				uni.navigateBack()
-			},
-			// 首页
-			goHome() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-			},
-			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) {
-				this.getCartCount();
-				this.downloadFilePromotionCode();
-				this.isShowAuth = false
-			},
-			/*
-			 * 获取用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {});
-			},
-			/**
-			 * 购物车数量加和数量减
-			 *
-			 */
-			ChangeCartNum: function(changeValue) {
-				//changeValue:是否 加|减
-				//获取当前变动属性
-				let productSelect = this.productValue[this.attrValue];
-				//如果没有属性,赋值给商品默认库存
-				if (productSelect === undefined && !this.attr.productAttr.length)
-					productSelect = this.attr.productSelect;
-				//无属性值即库存为0；不存在加减；
-				if (productSelect === undefined) return;
-				let stock = productSelect.stock || 0;
-				let num = this.attr.productSelect;
-				if (changeValue) {
-					num.cart_num++;
-					if (num.cart_num > stock) {
-						this.$set(this.attr.productSelect, "cart_num", stock);
-						this.$set(this, "cart_num", stock);
-					}
-				} else {
-					num.cart_num--;
-					if (num.cart_num < 1) {
-						this.$set(this.attr.productSelect, "cart_num", 1);
-						this.$set(this, "cart_num", 1);
-					}
-				}
-			},
-			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 && productSelect.stock > 0) {
-					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.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", this.storeInfo.price);
-					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;
-				getSeckillProductDetail(that.id).then(async 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);
-					that.$set(that, 'reply', res.data.topReply ? [res.data.topReply] : []);
-					that.$set(that, 'replyCount', res.data.replayData && res.data.replayData.count);
-					that.$set(that, 'replyChance', res.data.replayData && res.data.replayData.rate);
-					that.$set(that.attr, 'productAttr', res.data.attr);
-					that.$set(that, 'productValue', res.data.sku);
-					that.$set(that, 'systemStore', res.data.system_store);
-					that.$set(that, 'storeSelfMention', res.data.store_self_mention);
-					that.$set(that, 'PromotionCode', storeInfo.code_base);
-					that.$set(that, 'activity', res.data.activity ? res.data.activity : []);
-					that.$set(that, 'datatime', res.data.stop ? res.data.stop : []);
-					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.specsInfo, 'params', res.data.params);	
-					uni.setNavigationBarTitle({
-						title: storeInfo.store_name.substring(0, 7) + "..."
-					})
-					that.$set(that, 'storeImage', that.storeInfo.image);
-					// #ifdef H5
-					if (that.isLogin) {
-						that.getCartCount();
-						that.ShareInfo();
-						that.downloadFilePromotionCode();
-					};
-
-					// #endif
-					// #ifdef APP-PLUS || MP
-					that.getCartCount();
-					// #endif
-					setTimeout(function() {
-						that.infoScroll();
-					}, 500);
-					that.DefaultSelect();
-					that.getPricrRule(that.storeInfo.cate_id);
-				}).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);
-					});
-				};
-			},
-			/**
-			 * 拨打电话
-			 */
-			makePhone: function() {
-				uni.makePhoneCall({
-					phoneNumber: this.systemStore.phone
-				})
-			},
-			/**
-			 * 默认选中属性
-			 *
-			 */
-			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]);
-				}
-				//sort();排序函数:数字-英文-汉字；
-				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);
-					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, "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.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.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, "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);
-					}
-				}
-			},
-			/*
-			 *  单独购买
-			 */
-			openAlone: function() {
-				uni.navigateTo({
-					url: `/pages/goods_details/index?id=${this.storeInfo.old_product_id}`
-				})
-			},
-			/**
-			 *
-			 *
-			 * 收藏商品
-			 */
-			setCollect: function() {
-				if (this.isLogin === false) {
-                    this.isAuto = true;
-                    this.isShowAuth = true
-				} else {
-					let that = this;
-					if (this.storeInfo.isRelation) {
-						collectDel({
-							type: 1,
-							type_id: this.id
-						}).then(res => {
-							that.$set(that.storeInfo, 'isRelation', !that.storeInfo.isRelation);
-						})
-					} else {
-						collectAdd({
-							type_id: this.id,
-							type: 1
-						}).then(res => {
-							that.$set(that.storeInfo, 'isRelation', !that.storeInfo.isRelation);
-						})
-					}
-				}
-			},
-			/**
-			 * 打开属性插件
-			 */
-			selecAttr: function() {
-				this.$set(this.attr, 'cartAttr', true);
-				this.$set(this, 'isOpen', true);
-			},
-
-			onMyEvent: function() {
-				this.$set(this.attr, 'cartAttr', false);
-				this.$set(this, 'isOpen', false);
-			},
-			/**
-			 * 打开属性加入购物车
-			 *
-			 */
-			joinCart: function(e) {
-				//是否登录
-				if (this.isLogin === false) {
-                    this.isAuto = true;
-                    this.isShowAuth = true
-				} else {
-					this.goCat();
-				}
-			},
-			/*
-			 * 加入购物车
-			 */
-			goCat: function(news) {
-				let that = this,
-					productSelect = that.productValue[this.attrValue];
-				//打开属性
-				if (that.attrValue) {
-					//默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
-					that.attr.cartAttr = !that.isOpen ? true : false;
-				} else {
-					if (that.isOpen) that.attr.cartAttr = true;
-					else that.attr.cartAttr = !that.attr.cartAttr;
-
-				}
-				//只有关闭属性弹窗时进行加入购物车
-				if (that.attr.cartAttr === true && that.isOpen === false)
-					return (that.isOpen = true);
-				//如果有属性,没有选择,提示用户选择
-				if (
-					that.attr.productAttr.length &&
-					that.isOpen === true &&
-					productSelect.stock == 0
-				)
-					return that.$util.Tips({
-						title: "产品库存不足，请选择其它"
-					});
-				let q = {
-					is_new: 1,
-					product_id: that.id,
-					cart_num: that.attr.productSelect.cart_num,
-					product_attr_unique: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : "",
-					product_type: 1,
-					spread_id: this.currSpid
-				};
-				postCartAdd(q)
-					.then(function(res) {
-						that.isOpen = false;
-						that.attr.cartAttr = false;
-						if (news) {
-							uni.navigateTo({
-								url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id + '&seckillId=' + that.id
-							});
-						} else {
-							that.$util.Tips({
-								title: "添加购物车成功",
-								success: () => {
-									that.getCartCount(true);
-								}
-							});
-						}
-					})
-					.catch(res => {
-						that.isOpen = false;
-						return that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			/**
-			 * 获取购物车数量
-			 * @param boolean 是否展示购物车动画和重置属性
-			 */
-			getCartCount: function(isAnima) {
-				let that = this;
-				const isLogin = that.isLogin;
-				if (isLogin) {
-					getCartCounts().then(res => {
-						that.CartCount = res.data[0].count;
-						//加入购物车后重置属性
-						if (isAnima) {
-							that.animated = true;
-							setTimeout(function() {
-								that.animated = false;
-							}, 500);
-						}
-					});
-				}
-			},
-			/**
-			 * 立即购买
-			 */
-			goBuy: function(e) {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					this.goCat(true);
-				}
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			/**
-			 * 分享打开
-			 *
-			 */
-			listenerActionSheet: function() {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					// #ifdef H5
-					if (this.$wechat.isWeixin() === true) {
-						this.weixinStatus = true;
-					}
-					// #endif
-					this.posters = true;
-				}
-			},
-			// 分享关闭
-			listenerActionClose: function() {
-				this.posters = false;
-			},
-			//隐藏海报
-			posterImageClose: function() {
-				this.posterImageStatus = false
-			},
-			//替换安全域名
-			setDomain: function(url) {
-				url = url ? url.toString() : '';
-				//本地调试打开,生产请注销
-				if (url.indexOf("https://") > -1) return url;
-				else return url.replace('http://', 'https://');
-			},
-			/**
-			 * 获取产品分销二维码
-			 * @param function successFn 下载完成回调
-			 *
-			 */
-			downloadFilePromotionCode() {
-				let that = this;
-				let type;
-				// #ifndef MP
-				type = 'wechat'
-				// #endif
-				// #ifdef MP
-				type = 'routine'
-				// #endif
-				getProductCode(that.id, {
-					type: type,
-					product_type: 1
-				}).then(async res => {
-					this.codeImg = res.data.url;
-					that.$set(that, 'isDown', false);
-				}).catch(err => {
-					that.$util.Tips({
-						title: err
-					});
-					that.posters = false;
-					that.$set(that, 'isDown', false);
-					that.$set(that, 'PromotionCode', '');
-				});
-			},
-			async imgToBase(url) {
-				let res = await imgToBase({
-					image: url
-				})
-				return res.data.image
-			},
-			// 小程序关闭分享弹窗；
-			goFriend: function() {
-				this.posters = false;
-			},
-			/**
-			 * 生成海报
-			 */
-			async goPoster() {
-				if (this.posterImage) {
-					this.posterImageStatus = true
-					this.posters = false
-					return
-				}
-				let that = this;
-				let arr2
-				that.posters = false;
-				that.$set(that, 'canvasStatus', true);
-				uni.showLoading({
-					title: '海报生成中',
-					mask: true
-				});
-				// #ifdef MP || APP-PLUS
-				arr2 = [that.posterbackgd, await that.fileStoreImage(that.storeImage), await that.fileStoreImage(
-					that.codeImg), await that.fileStoreImage(that.share_pic)];
-				// #endif
-				// #ifdef H5
-				arr2 = [that.posterbackgd, await that.imgToBase(that.storeImage), await that.imgToBase(that.codeImg), await that.imgToBase(that.share_pic)];
-				// #endif
-				that.$util.goodsPosterCanvas(arr2, that.storeInfo.store_name, that.storeInfo.price, that.site_name, that.storeInfo.ot_price, function(tempFilePath) {
-					that.$set(that, 'posterImage', tempFilePath);
-					that.$set(that, 'posterImageStatus', true);
-					that.$set(that, 'canvasStatus', false);
-					that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-				}, (err) => {
-					that.$set(that, 'canvasStatus', false);
-				});
-			},
-			//图片转符合安全域名路径
-			fileStoreImage(url) {
-				// #ifdef MP
-				let ishttps = url.split('//')[0] == 'https:'
-				if (!ishttps) {
-					url = 'https://'+url.split('//')[1]
-				}
-				// #endif
-				return new Promise((resolve, reject) => {
-					let that = this;
-					uni.downloadFile({
-						url: url,
-						success: function(res) {
-							resolve(res.tempFilePath);
-						},
-						fail: function(error) {
-							// console.log(error)
-							return that.$util.Tips({
-								title: `${error}`
-							});
-						}
-					});
-				})
-			},
-			/*
-			 * 保存到手机相册
-			 */
-			savePosterPath: function() {
-				let that = this;
-				// #ifdef MP
-				uni.getSetting({
-					success(res) {
-						if (!res.authSetting['scope.writePhotosAlbum']) {
-							uni.authorize({
-								scope: 'scope.writePhotosAlbum',
-								success() {
-									uni.saveImageToPhotosAlbum({
-										filePath: that.posterImage,
-										success: function(res) {
-											that.posterImageClose();
-											that.$util.Tips({
-												title: '保存成功',
-												icon: 'success'
-											});
-										},
-										fail: function(res) {
-											that.$util.Tips({
-												title: '保存失败'
-											});
-										}
-									})
-								}
-							})
-						} else {
-							uni.saveImageToPhotosAlbum({
-								filePath: that.posterImage,
-								success: function(res) {
-									that.posterImageClose();
-									that.$util.Tips({
-										title: '保存成功',
-										icon: 'success'
-									});
-								},
-								fail: function(res) {
-									that.$util.Tips({
-										title: '保存失败'
-									});
-								},
-							})
-						}
-					}
-				})
-				// #endif
-				// #ifdef APP-PLUS
-				uni.saveImageToPhotosAlbum({
-					filePath: that.posterImage,
-					success: function(res) {
-						that.posterImageClose();
-						that.$util.Tips({
-							title: '保存成功',
-							icon: 'success'
-						});
-					},
-					fail: function(res) {
-						that.$util.Tips({
-							title: '保存失败'
-						});
-					},
-				})
-				// #endif
-			},
-			//复制口令
-			copyPwd(){
-				let that = this;
-				copyPasswordApi({
-					id: that.id,
-					product_type: 1
-				}).then(async res => {
-					that.copyUrl = res.data.str;
-					that.posters = false
-					that.isCopy = true;
-				})
-			},
-			closeCopy(){
-				this.isCopy = false
-			},
-			//#ifdef H5
-			ShareInfo() {
-				let data = this.storeInfo;
-				let href = location.href;
-				if (this.$wechat.isWeixin()) {
-					getUserInfo().then(res => {
-						href =
-							href.indexOf("?") === -1 ?
-							href + "?spid=" + res.data.uid :
-							href + "&spid=" + res.data.uid;
-
-						let configAppMessage = {
-							desc: data.store_info,
-							title: data.store_name,
-							link: href,
-							imgUrl: data.image
-						};
-						this.$wechat.wechatEvevt([
-							"updateAppMessageShareData",
-							"updateTimelineShareData",
-							"onMenuShareAppMessage",
-							"onMenuShareTimeline"
-						], configAppMessage).then(res => {}).catch(err => {
-							// console.log(err);
-						})
-					});
-				}
-			},
-			//#endif
-		},
-	}
-</script>
-
-<style scoped lang="scss">
-	.font-bg-red{
-		position: relative;
-		top: -3rpx;
-		background-color: var(--view-theme);
-		border: 1px solid var(--view-theme);
-	}
-	.product-con .nav {
-		background-color: var(--view-theme);
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		width: 100%;
-		height: 100rpx;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-	}
-	.t-color {
-		color: var(--view-theme);
-	}
-	.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;
-	}
-
-	.product-con .wrapper {
-		padding: 32rpx;
-		width: 100%;
-		box-sizing: border-box;
-	}
-	.product-con .attribute .params{
-		margin-right: 20rpx;
-		font-size: 28rpx;
-		color: #282828;
-		&:nth-child(2){
-			margin-right: 0;
-		}
-	}
-	.product-con .wrapper .introduce {
-		align-items: center;
-		position: relative;
-		padding-right: 50rpx;
-		margin-bottom: 30rpx;
-		.fenxiang_btn {
-			text-align: center;
-			font-size: 14rpx;
-			color: #666;
-			font-weight: normal;
-			position: absolute;
-			top: -4rpx;
-			right: 0;
-		}
-	}
-	.product-con .wrapper .introduce .infor {
-		width: 570rpx;
-	}
-
-	.product-con .wrapper .introduce .iconfont {
-		font-size: 37rpx;
-		color: #515151;
-	}
-	.product-con .wrapper .label {
-		margin: 18rpx 0 0 0;
-		font-size: 24rpx;
-		color: #82848f;
-	}
-	.product-con .wrapper .label .stock {
-		width: 255rpx;
-		margin-right: 28rpx;
-	}
-	.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 {
-		/* #ifdef H5 */
-		flex: 50%;
-		/* #endif */
-		/* #ifndef H5 */
-		flex: 33.33%;
-		/* #endif */
-		text-align: center;
-		font-size: 30rpx;
-		&.item3{
-			flex: 33.33%;
-		}
-	}
-	.generate-posters .item .iconfont {
-		font-size: 80rpx;
-		color: #5eae72;
-	}
-	.generate-posters .item .iconfont.icon-haibao {
-		color: #5391f1;
-	}
-	.generate-posters .item .iconfont.icon-fuzhikouling1 {
-		color: #FBB324;
-	}
-	.product-con .mask {
-		z-index: 88;
-	}
-	.product-con .footer {
-		padding: 0 20rpx 0 80rpx;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		box-sizing: border-box;
-		height: 100rpx;
-		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-		background-color: #fff;
-		z-index: 277;
-		border-top: 1px solid #f0f0f0;
-	}
-	.product-con .attribute .atterTxt {
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		display: inline;
-		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-con .guaranteeAttr{
-		display: inline-block;
-		width: 560rpx;
-		overflow: hidden;white-space: nowrap;text-overflow: ellipsis;
-	}
-	.product-con .footer .item {
-		font-size: 18rpx;
-		color: #666;
-		text-align: center;
-	}
-	.product-con .footer .item .iconfont {
-		text-align: center;
-		font-size: 40rpx;
-	}
-	.product-con .footer .item .iconfont.icon-shoucang1 {
-		color: var(--view-priceColor);
-	}
-	.product-con .footer .item .iconfont.icon-gouwuche1 {
-		font-size: 40rpx;
-		position: relative;
-	}
-	.product-con .footer .item .iconfont.icon-gouwuche1 .num {
-		color: #fff;
-		position: absolute;
-		font-size: 18rpx;
-		padding: 2rpx 8rpx 3rpx;
-		border-radius: 200rpx;
-		top: -10rpx;
-		right: -10rpx;
-	}
-	.product-con .footer .bnt {
-		width: 444rpx;
-		height: 76rpx;
-	}
-	.product-con .footer .bnt .bnts {
-		width: 222rpx;
-		text-align: center;
-		line-height: 76rpx;
-		color: #fff;
-		font-size: 28rpx;
-	}
-
-	.product-con .footer .bnt .joinCart {
-		border-radius: 50rpx 0 0 50rpx;
-		background-image: linear-gradient(to right, var(--view-bntColor11) 0%, var(--view-bntColor12) 100%);
-	}
-	.product-con .footer .bnt .buy {
-		border-radius: 0 50rpx 50rpx 0;
-		background-image: linear-gradient(to right, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-	}
-	.product-con .footer .bnt .joinCart[disabled] {
-		background: #bbb;
-	}
-	.product-con .footer .bnt .buy[disabled] {
-		background: #bbb;
-	}
-	.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: 600rpx;
-		height: 897rpx;
-		position: fixed;
-		left: 50%;
-		transform: translateX(-50%);
-		z-index: 399;
-		top: 50%;
-		margin-top: -500rpx;
-	}
-	.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%;
-		border-radius: 43rpx;
-		margin-top: 20rpx;
-	}
-	.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;
-	}
-
-	.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-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 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: var(--view-theme);
-					}
-				}
-			}
-		}
-		.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: 15rpx;
-					image {
-						width: 206rpx;
-						height: 206rpx;
-						border-radius: 16rpx;
-					}
-					.txt {
-						.title {
-							font-size: 28rpx;
-							color: #282828;
-						}
-						.price {
-							color: var(--view-priceColor);
-							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;
-			}
-		}
-	}
-</style>
diff --git a/pages/activity/lifeService/index.vue b/pages/activity/lifeService/index.vue
deleted file mode 100644
index ec938a5..0000000
--- a/pages/activity/lifeService/index.vue
+++ /dev/null
@@ -1,668 +0,0 @@
-<template>
-	<view :style="viewColor">
-		<view class='productList'>
-			<view class='search acea-row row-between-wrapper'>
-				<view class="back" @click='backjJump()'>
-					<view class="iconfont icon-xiangzuo"></view>
-				</view>
-				<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
-					<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search" :value='sotreParam.keyword'
-					 @confirm="searchSubmit"></input>
-				</view>
-				<view v-if="mer_location == 1" style="text-align: right;" class='iconfont search-right' @click='showMaoLocation(latitude,longitude)'>
-					<view class="iconfont icon-dingwei"></view>
-					<view class="right-text" v-if="recommend_address">
-						{{recommend_address}}
-					</view>
-					<view class="iconfont icon-xiangyou" v-if="recommend_address"></view>
-				</view>
-			</view>
-			<view class="nav-wrapper">
-				<view class='nav acea-row row-middle'>
-					<view v-for="item in downMenus" :key="item.key" class='item' :class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'>
-						<view>
-							{{item.title}}
-						</view>
-						<view class="line" :class="{'font-line':firstKey == item.key}">
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 店铺 -->
-			<block>
-				<view class="mer-box"v-if="storeList.length > 0">
-					<view class="mer-item" v-for="(item,index) in storeList" :key='index'>
-						<view class="mer-hd" @click="goStore(item.mer_id)">
-							<image :src="item.mini_banner?item.mini_banner:item.mer_banner"></image>
-							<view class="mer-name">
-								<image :src="item.mer_avatar"></image>
-								<view class="">
-									<view class="mer-top">
-										<view class="txt line1">{{item.mer_name}}</view>
-										<text v-if="item.type_name" class="font-bg-red ml8">{{item.type_name}}</text>
-										<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
-									</view>
-									<view class="mer-btn">
-										<view class="">
-											{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
-										</view>
-										<view class="line" v-if="item.distance"></view>
-										<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
-											<view class="">
-												{{item.distance}}
-											</view>
-											<view class="iconfont icon-xiangyou"></view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="pro-box">
-							<navigator :url="`/pages/goods_details/index?id=${itemn.product_id}`" hover-class="none" class="pro-item" v-for="(itemn,indexn) in item.recommend"
-							 :key='indexn' v-if="item.recommend.length<=3">
-								<image :src="itemn.image" mode=""></image>
-								<view class="price">
-									<text>￥</text>{{itemn.price}}
-								</view>
-							</navigator>
-						</view>
-					</view>
-					<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
-						<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-					</view>
-				</view>
-				<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
-					<view class='pictrue' style="margin: 0 auto;">
-						<image src='../../../static/images/noCart.png'></image>
-						<text>暂无店铺，快去搜索其他店铺吧</text>
-					</view>
-				</view>
-			</block>
-		</view>
-	</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>
-	// +----------------------------------------------------------------------
-	import {
-		getGeocoder
-	} from '@/api/store.js';
-	import {
-		getMerchantServiceLst,
-	} from '@/api/activity.js';
-	import {
-		mapGetters
-	} from "vuex";
-	import {
-		goShopDetail
-	} from '@/libs/order.js'
-	const app = getApp();
-	export default {
-		data() {
-			return {
-				price: 0,
-				stock: 0,
-				nows: false,
-				loading: false,
-				loadingIcon: true,
-				loadTitle: '加载更多',
-				title: '',
-				hotPage: 1,
-				hotLimit: 10,
-				hotScroll: false,
-				// 筛选框
-				rightBox: false,
-				//品牌列表
-				brandList: [],
-				downKey: 0,
-				downStatus: false,
-				// 下拉菜单
-				downMenu: [{
-						title: '默认',
-						key: 0,
-						order: ""
-					},
-					{
-						title: '销量',
-						key: 1,
-						order: 'sales'
-					},
-					{
-						title: '好评',
-						key: 2,
-						order: 'rate'
-					},
-					{
-						title: '距离',
-						key: 3,
-						order: 'location'
-					}
-				],
-				// 是否第一个
-				firstKey: 0,
-				// 商铺列表
-				storeList: [],
-				sotreParam: {
-					keyword: '',
-					page: 1,
-					limit: 10,
-					order: '',
-				},
-				storeKey: 0,
-				storeScroll: true,
-				mer_id: '',
-				sortId: '',
-				hide_mer_status: "",
-				price_on: '',
-				price_off: '',
-				detaile_address: "",
-				recommend_address: "",
-				latitude: "",
-				longitude: "",
-				count: 0,
-				mer_location: "",
-			};
-		},
-		created() {
-			uni.getStorage({
-				key: 'GLOBAL_DATA',
-				success: (res) => {
-					// console.log(res);
-					this.hide_mer_status = res.data.hide_mer_status
-					this.storeList = []
-					if (res.data.mer_location == 1) {
-						this.mer_location = res.data.mer_location
-						this.selfLocation()
-					} else {
-						this.getServiceList();
-					}
-				}
-			});
-			
-		},
-		computed: {
-			downMenus: function() {
-				return this.downMenu.filter((item) => {
-					if (this.mer_location) {
-						return item
-					} else {
-						return item.key < 3
-					}
-				})
-			},
-			...mapGetters(['viewColor']),
-		},
-		onLoad: function(options) {
-			this.mer_id = options.mer_id;
-		},
-		methods: {	
-			// 打开地图
-			showMaoLocation(lat, long) {
-				// console.log(lat, long)
-				if (!lat || !long) return this.$util.Tips({
-					title: '请设置允许商城访问您的位置！'
-				});
-				//#ifdef H5
-				if (this.$wechat.isWeixin() === true) {
-					this.$wechat.seeLocation({
-						latitude: Number(lat),
-						longitude: Number(long)
-					}).then(res=>{
-						// console.log('success');
-					})
-				}else{
-				//#endif
-					uni.openLocation({
-						latitude: parseFloat(lat),
-						longitude: parseFloat(long),
-						scale: 8,
-						success: function(res) {
-							// console.log(res)
-						},
-					});
-				// #ifdef H5
-				}
-				//#endif	
-			},
-			showStoreLocation(item) {
-				// console.log(lat, long)
-				if (!item.lat || !item.long) return this.$util.Tips({
-					title: '请设置允许商城访问您的位置！'
-				});
-				//#ifdef H5
-				if (this.$wechat.isWeixin() === true) {
-					this.$wechat.seeLocation({
-						latitude: Number(item.lat),
-						longitude: Number(item.long),
-						name: item.mer_name,
-						address: item.mer_address ? item.mer_address: '',
-					}).then(res=>{
-						// console.log('success');
-					})
-				}else{
-				//#endif
-					uni.openLocation({
-						latitude: parseFloat(item.lat),
-						longitude: parseFloat(item.long),
-						scale: 8,
-						name: item.mer_name,
-						address: item.mer_address ? item.mer_address: '',
-						success: function(res) {
-							// console.log(res)
-						},
-					});
-				// #ifdef H5
-				}
-				//#endif	
-			},
-			selfLocation() {
-				let self = this
-				uni.getLocation({
-					type: 'gcj02',
-					success: (res) => {
-						let latitude, longitude;
-						latitude = res.latitude.toString();
-						longitude = res.longitude.toString();
-						this.latitude = res.latitude
-						this.longitude = res.longitude
-						getGeocoder({
-							lat: latitude,
-							long: longitude
-						}).then(res => {
-							// console.log(res)
-							this.detaile_address = res.data.address;
-							this.recommend_address = res.data.address.length > 4 ? res.data.address.slice(0,4) + '...' : res.data.address
-							uni.setStorageSync('adress_location',res.data.address)
-						})
-					},
-					fail: (res) => {
-						uni.showToast({
-							title: res,
-							icon: 'none',
-							duration: 1000
-						});
-					},
-					complete: (res) => {
-						this.getServiceList();
-					}
-				});
-			},
-			// 查找店铺
-			getServiceList() {
-				if (this.loading) return
-				this.loading = true
-				let rqData = {
-					keyword: this.sotreParam.keyword,
-					page: this.sotreParam.page,
-					limit: 10,
-					order: this.sotreParam.order,
-				}
-				if (this.latitude) {
-					rqData.location = this.latitude + ',' + this.longitude
-				}
-				getMerchantServiceLst(rqData).then(res => {
-					this.count = res.data.count
-					this.storeList = this.storeList.concat(res.data.list)
-					this.loading = false
-					this.loadingIcon = false
-				})
-			},
-			// 进店
-			goStore(id) {
-				if (this.hide_mer_status != 1) {
-					uni.navigateTo({
-						url: `/pages/store/home/index?id=${id}`
-					})
-				}
-			},
-			searchSubmit: function(e) {
-				let that = this;
-				that.$set(that.sotreParam, 'keyword', e.detail.value);
-				this.set_where(this.firstKey)
-			},
-			//点击事件处理
-			set_where: function(e) {
-				if (this.loading) return
-				// console.log(this.downMenu, e)
-				this.storeList = []
-				this.firstKey = e
-				this.sotreParam.page = 1
-				this.sotreParam.order = this.downMenu[e].order
-				this.getServiceList();
-			},
-			backjJump() {
-				uni.navigateBack({
-					delta: 1
-				})
-			},
-		},
-		//刷新
-		onPullDownRefresh() {
-
-		},
-		//上划加载更多
-		onReachBottom() {
-			if (this.count === this.storeList.length) {
-				if (this.count === 0) {
-					return
-				}
-				uni.showToast({
-					title: '已加载全部',
-					icon: 'none',
-					duration: 1000
-				});
-			} else {
-				this.sotreParam.page += 1
-				this.getServiceList()
-			}
-		}
-	}
-</script>
-<style lang="scss">
-	.productList .search {
-		width: 100%;
-		height: 86rpx;
-		padding: 0 20rpx;
-		box-sizing: border-box;
-		position: fixed;
-		left: 0;
-		top: 0;
-		z-index: 9;
-		display: flex;
-		flex-wrap: nowrap;
-		background: var(--view-theme);
-		.search-right {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			max-width: max-content;
-			flex: 1;
-			padding-left: 20rpx;
-		}
-		.right-text {
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-			font-size: 28rpx;
-			width: max-content;
-			// max-width: 4.4rem;
-			color: #fff;
-			padding: 0 10rpx;
-		}
-		.icon-xiangyou,
-		.icon-dingwei {
-			font-size: 30rpx;
-			color: #fff;
-		}
-	}
-	.productList .search .back {
-		display: flex;
-		align-items: center;
-		width: 40rpx;
-		height: 60rpx;
-
-		.iconfont {
-			color: #fff;
-			font-size: 36rpx;
-		}
-	}
-	.productList .search .input {
-		flex: 1;
-		// width: 540rpx;
-		height: 60rpx;
-		background-color: #fff;
-		border-radius: 50rpx;
-		padding: 0 20rpx;
-		box-sizing: border-box;
-	}
-	.productList .search .input input {
-		flex: 1;
-		height: 100%;
-		font-size: 26rpx;
-		margin-left: 10rpx;
-	}
-	.productList .search .input .placeholder {
-		color: #999;
-	}
-	.productList .search .input .iconfont {
-		font-size: 35rpx;
-		color: #555;
-	}
-	.productList .search .icon-pailie,
-	.productList .search .icon-tupianpailie {
-		color: #fff;
-		width: 62rpx;
-		font-size: 40rpx;
-		height: 86rpx;
-		line-height: 86rpx;
-	}
-	.productList .nav-wrapper {
-		z-index: 9;
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		margin-top: 86rpx;
-		background-color: $theme-color;
-		.tab-bar {
-			display: flex;
-			align-items: center;
-			.tab-item {
-				position: relative;
-				flex: 1;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				padding: 8rpx 0 20rpx;
-				color: #fff;
-				font-size: 28rpx;
-				font-weight: bold;
-				&::after {
-					content: ' ';
-					position: absolute;
-					left: 50%;
-					bottom: 18rpx;
-					width: 30rpx;
-					height: 3rpx;
-					background: transparent;
-					transform: translateX(-50%);
-				}
-				&.on {
-					&::after {
-						background: #fff;
-					}
-				}
-			}
-		}
-	}
-	.productList .nav {
-		height: 86rpx;
-		color: #454545;
-		font-size: 28rpx;
-		background-color: var(--view-theme);
-		display: flex;
-		justify-content: space-between;
-		padding: 0 28rpx;
-	}
-	.productList .nav .item {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		color: #FFFFFF;
-		flex: 1;
-	}
-	.productList .nav .item.font-colors {
-		font-weight: 500;
-		color: #FFFFFF;
-	}
-	.productList .nav .item .font-line {
-		height: 4rpx;
-		background-color: #fff;
-		margin-top: 3rpx;
-		width: 28rpx;
-		animation: line 0.3s;
-		-moz-animation: line 0.3s;
-		/* Firefox */
-		-webkit-animation: line 0.3s;
-		/* Safari 和 Chrome */
-		-o-animation: line 0.3s;
-		/* Opera */
-	}
-	@keyframes line {
-		from {
-			width: 0rpx;
-		}
-		to {
-			width: 28rpx;
-		}
-	}
-	.productList .nav .item image {
-		width: 15rpx;
-		height: 19rpx;
-		margin-left: 10rpx;
-	}
-	.mer-box {
-		padding: 20rpx 20rpx;
-		margin-top: 168rpx;
-		.mer-item {
-			margin-bottom: 20rpx;
-			background-color: #fff;
-			border-radius: 16rpx;
-			.mer-hd {
-				position: relative;
-				width: 100%;
-				height: 134rpx;
-				border-radius: 16rpx 16rpx 0 0;
-				overflow: hidden;
-				display: flex;
-				image {
-					width: 100%;
-					height: 100%;
-				}
-				.mer-name {
-					position: absolute;
-					left: 20rpx;
-					top: 30rpx;
-					display: flex;
-					align-items: center;
-					padding: 0 10rpx;
-					image {
-						width: 79rpx;
-						height: 79rpx;
-						border: 1px solid #fff;
-						border-radius: 50%;
-						margin-right: 10rpx;
-					}
-					.mer-top {
-						display: flex;
-						align-items: center;
-						color: #FFFFFF;
-						font-size: 28rpx;
-						font-weight: bold;
-						margin-bottom: 6rpx;
-						.font-bg-red {
-							margin-left: 20rpx;
-							font-size: 18rpx;
-							padding: 2rpx 10rpx;
-							border-color: var(--view-theme);
-							background: #FFFFFF;
-							border-radius: 30rpx;
-							width: auto;
-						}
-					}
-					.mer-btn {
-						color: rgba($color: #fff, $alpha: 0.7);
-						font-size: 24rpx;
-						display: flex;
-						align-items: center;
-						.line {
-							width: 2rpx;
-							height: 18rpx;
-							color: rgba($color: #fff, $alpha: 0.7);
-							margin: 0 12rpx;
-						}
-						.distance {
-							display: flex;
-							align-items: center;
-							font-size: 24rpx;
-							color: rgba($color: #fff, $alpha: 0.7);
-							.iconfont {
-								font-size: 24rpx;
-								line-height: 24rpx;
-							}
-						}
-					}
-					.txt {
-						flex: 1;
-					}
-				}
-			}
-			.pro-box {
-				display: flex;
-				align-items: center;
-				padding: 20rpx 20rpx 30rpx;
-				.pro-item {
-					width: 218rpx;
-					margin-right: 14rpx;
-					image {
-						width: 100%;
-						height: 214rpx;
-						border-radius: 8rpx;
-					}
-					.price {
-						margin-top: 5rpx;
-						font-size: 28rpx;
-						color: var(--view-priceColor);
-						font-weight: bold;
-						text {
-							font-size: 28rpx;
-						}
-					}
-					&:last-child {
-						margin-right: 0;
-					}
-				}
-			}
-		}
-		.more-shop {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			background-color: #FFFFFF;
-			padding: 27rpx 0;
-			color: #999999;
-			font-size: 26rpx;
-
-			.icon-xiangyou {
-				font-size: 22rpx;
-			}
-		}
-
-	}
-
-	.no-shop {
-		background-color: #fff;
-		padding-bottom: calc(100% - 40rpx);
-		padding-top: 200rpx;
-		.pictrue {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			color: $uni-nothing-text;
-
-			image {
-				width: 414rpx;
-				height: 380rpx;
-			}
-		}
-	}
-</style>
diff --git a/pages/activity/liveBroadcast/index.vue b/pages/activity/liveBroadcast/index.vue
deleted file mode 100644
index a9eb619..0000000
--- a/pages/activity/liveBroadcast/index.vue
+++ /dev/null
@@ -1,295 +0,0 @@
-<template>
-	<div class="main">
-		<view class='flash-sale'>
-			<view class='list'>
-				<view v-for="(item,index) in broadcastList" :key='index' >
-					<navigator hover-class="none" :url="((item.live_status == 103 &&  item.replay_status) || item.live_status === 101 || item.live_status === 102) ? 'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id : ''">
-						<view class='item acea-row row-between-wrapper'>
-							<view class="live-image">
-								<img class="image" :src="item.share_img">
-								<view class="live-top" :class="item.live_status == 102 ? 'playRadius' : 'notPlayRadius'" :style="'background:' + (item.live_status == 101 ? playBg : (item.live_status != 101 && item.live_status != 102) ? endBg : notBg) + ';'">
-									<block v-if="item.live_status == 101">
-										<image src="/static/images/live-01.png" mode=""></image>
-										<text>直播中</text>
-									</block>
-									<block v-if="item.live_status == 103 && item.replay_status === 1">
-										<image src="/static/images/live-02.png" mode=""></image>
-										<text>回放</text>
-									</block>
-									<block v-if="(item.live_status != 101 && item.live_status != 102 && item.live_status != 103) ||  (item.live_status == 103 && item.replay_status == 0)">
-										<image src="/static/images/live-02.png" mode=""></image>
-										<text>已结束</text>
-									</block>
-									<block v-if="item.live_status == 102">
-										<image src="/static/images/live-03.png" mode=""></image>
-										<text>预告</text>
-									</block>
-								</view>
-								<view v-if="item.live_status == 101 || item.live_status == 102" class="broadcast-time">{{ item.show_time }}</view>
-							</view>
-							<view class="live-wrapper">
-								<view class="live-title">{{ item.name }}</view>
-								<view class="live-store">{{ item.anchor_name }}</view>
-								<view class="pro-count" style="white-space: nowrap; display: flex" v-if="item.broadcast.length > 0">
-									<navigator hover-class="none" class="item" v-for="(itm, idx) in item.broadcast" :key="idx">
-										<view class="pro-img" v-if="idx < 3">
-											<image :src="itm.goods.cover_img"></image>
-											<view class="price" v-if="idx < 2">¥{{itm.goods.price}}</view>
-											<view v-else class="more">+{{ item.broadcast.length - 2 }}</view>
-										</view>
-									</navigator>
-								</view>
-							</view>
-						</view>
-					</navigator>
-				</view>
-				<view class='loadingicon acea-row row-center-wrapper'>
-					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-				</view>
-			</view>
-		</view>
-		<home></home>
-	</div>
-</template>
-
-<script>
-	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-	// +----------------------------------------------------------------------
-	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-	// +----------------------------------------------------------------------
-	// | Author: CRMEB Team <admin@crmeb.com>
-	// +----------------------------------------------------------------------
-	import {
-		getBroadcastListApi
-	} from '../../../api/store.js';
-	import home from '@/components/home/index.vue'
-	export default {
-		components: {
-			home
-		},
-		data() {
-			return {
-				topImage: '',
-				broadcastList: [],
-				loadTitle: '加载更多',
-				scrollLeft: 0,
-				interval: 0,
-				status: 1,
-				page: 1,
-				limit: 5,
-				loading: false,
-				loadend: false,
-				pageloading: false,
-				endBg: 'linear-gradient(#666666, #999999)',
-				notBg: 'rgb(26, 163, 246)',
-				playBg: 'linear-gradient(#FF0000, #FF5400)',
-			}
-		},
-		/**
-		 * 用户点击右上角分享
-		 */
-		// #ifdef MP
-		onShareAppMessage: function() {
-			wx.showShareMenu({
-			      withShareTicket: true,
-			      menus: ['shareAppMessage', 'shareTimeline']
-			    })	
-			return {
-				title: '直播',
-				path: 'pages/activity/liveBroadcast/index',
-			}
-		},
-		onShareTimeline: function() {
-			return {
-				title: '直播',
-				  query: {
-				    key: ''
-				  },
-				  imageUrl: ''
-				}      
-		},
-		// #endif
-		onLoad() {
-			this.getBroadcastList();
-		},
-		methods: {
-			getBroadcastList() {
-				var that = this;
-				var data = {
-					page: that.page,
-					limit: that.limit,
-				};
-				if (that.loadend) return;
-				if (that.pageloading) return;
-				this.pageloading = true
-				getBroadcastListApi(data).then(res => {
-					var list = res.data.list;
-					var loadend = list.length < that.limit;
-					that.page++;
-					that.broadcastList = that.broadcastList.concat(list),
-					that.page = that.page;
-					that.pageloading = false;
-					that.loadend = loadend;
-					that.loadTitle = loadend ? '我也是有底线的' : '加载更多';
-				}).catch(err => {
-					that.pageloading = false
-					that.loadTitle = '我也是有底线的'
-				});
-			},
-		},
-		/**
-		 * 页面上拉触底事件的处理函数
-		 */
-		onReachBottom: function() {
-			this.getBroadcastList();
-		}
-	}
-</script>
-
-<style lang="scss">
-	.main {
-		padding: 0 20rpx;
-		margin-top: 20rpx;
-		.row-between-wrapper {
-			margin-bottom: 20rpx;
-			display: flex;
-			flex-direction: row;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			border-radius: 18rpx;
-			.live-image {
-				position: relative;
-				width: 355rpx;
-				height: 272rpx;
-				border-radius: 18rpx 0 0 18rpx;
-
-				.image {
-					width: 100%;
-					height: 100%;
-					border-radius: 18rpx 0 0 18rpx;
-				}
-			}
-
-			.live-wrapper {
-				width: 50%;
-				height: 272rpx;
-				padding: 20rpx;
-				background: #fff;
-				border-radius: 0 18rpx 18rpx 0;
-				position: relative;
-
-				.live-title {
-					font-size: 30rpx;
-					color: #282828;
-					font-weight: bold;
-				}
-
-				.live-store {
-					font-size: 24rpx;
-					color: #666666;
-				}
-
-				.pro-count {
-					width: 330rpx;
-					height: 100rpx;
-					white-space: nowrap;
-					position: absolute;
-					bottom: 20rpx;
-				}
-
-				.item {
-					width: 100rpx;
-					height: 100rpx;
-					margin-right: 15rpx;
-					border-radius: 8rpx;
-					position: relative;
-					.pro-img{
-						width: 100rpx;
-						height: 100rpx;
-					}
-					image {
-						width: 100rpx;
-						height: 100rpx;
-						max-width: 100%;
-						border-radius: 8rpx;
-					}
-
-					.price {
-						text-align: center;
-						color: #FEFEFE;
-						position: absolute;
-						bottom: 4rpx;
-						left: 0;
-						width: 100%;
-						font-size: 22rpx;
-						background: rgba(0,0,0,.5);
-						border-radius: 0 0 8rpx 8rpx;
-					}
-
-					.more {
-						width: 100rpx;
-						height: 100rpx;
-						line-height: 100rpx;
-						text-align: center;
-						font-size: 28rpx;
-						color: #FEFEFE;
-						font-weight: bold;
-						position: absolute;
-						top: 0;
-						left: 0;
-						background-color: rgba(0, 0, 0, .2);
-						border-radius: 8rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.live-top {
-		z-index: 20;
-		position: absolute;
-		left: 0;
-		top: 0;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		color: #fff;
-		min-width: 130rpx;
-		max-width: 140rpx;
-		height: 50rpx;	
-		font-size: 22rpx;
-		&.playRadius {
-			border-radius:  18rpx 0px 0 0px;
-		}
-		
-		&.notPlayRadius {
-			border-radius: 18rpx 0px 18rpx 0px;
-		}
-		image {
-			width: 30rpx;
-			height: 30rpx;
-			margin-right: 10rpx;
-			/* #ifdef H5 */
-			display: block;
-			/* #endif */
-		}
-	}
-	.broadcast-time {
-		z-index: 20;
-		position: absolute;
-		left: 120rpx;
-		top: 0;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		color: #fff;
-		width: 160rpx;
-		height: 50rpx;
-		background: rgba(0,0,0,.4);
-		font-size: 22rpx;
-		border-radius: 0 0 18rpx 0;
-	}
-</style>
diff --git a/pages/activity/presell/index.vue b/pages/activity/presell/index.vue
deleted file mode 100644
index 7ec4933..0000000
--- a/pages/activity/presell/index.vue
+++ /dev/null
@@ -1,421 +0,0 @@
-<template>
-	<view class="container" :style="viewColor">
-		<view class='flash-sale'>
-			<!-- #ifdef H5 -->
-			<view class="fixed-head">
-				<view class="sys-head" :style="{height:statusBarHeight}"></view>
-				<view class="tool-bar">
-					<view class='iconfont icon-xiangzuo' @tap='goBack'></view>
-				</view>
-			</view>
-			<!-- #endif -->
-			<view class='header'>
-				<image mode="widthFix" class="presellBg" :src="domain+'/static/diy/presell_title'+keyColor+'.png'" alt="">	
-			</view>
-			<view class="main_count">
-				<view class="presellList acea-row row-between-wrapper">
-					<view class='timeList'>
-						<block v-for="(item,index) in timeList" :key='index'>
-							<view @tap='settimeList(item,index)' class='item' :class="active == index?'on':''">
-								<view class='time'><text>{{item}}</text></view>
-							</view>
-						</block>
-					</view>
-				</view>
-				<view class='list'>
-					<block v-for="(item,index) in presellList" :key='index'>
-						<view class='item acea-row row-between-wrapper' @tap='goDetails(item)'>
-							<view class='pictrue'>
-								<image :src='item.product.image'></image>
-							</view>
-							<view class='text acea-row row-column-around'>
-								<view class='name line1'>{{item.store_name}}</view>
-								<view class='booking'>
-									<text v-if="item.presell_type != 0 && active != 0" class="count" style="color: #BFBFBF;">已预定{{item.seles ? item.seles : 0}}{{item.product.unit_name}}</text>
-									<text v-else style="color: #999; font-size: 24rpx;">暂未开始</text>
-								</view>
-								<view v-if="item.coupon" class='coupon acea-row row-between-wrapper' style="margin-top: 14rpx;">
-									<view class='hide line1 acea-row'>									
-										<view class='activity'>满{{item.coupon.use_min_price}}减{{item.coupon.coupon_price}}</view>
-									</view>
-								</view>
-								<view class="progress" :style="'background-image:url('+domain+'/static/diy/priceBg'+keyColor+'.png'">
-									<view class='presell_price'>
-										<text class="presell_text">预售价</text>
-										<text class="price">¥ <text>{{ item.price }}</text></text>
-									</view>
-									<view v-if="active != 0" class='order_btn'>{{ active === 1  ? '立即预定' : '已结束' }}</view>
-									<view v-else class="unStartBtn">
-										<text>开售时间</text>
-										<view>{{ new Date(item.start_time.replace(/-/g,"/")).getMonth()+1 }}月
-										{{ new Date(item.start_time.replace(/-/g,"/")).getDate() }}日 
-										{{ new Date(item.start_time.replace(/-/g,"/")).getHours()<10?'0'+ 
-										new Date(item.start_time.replace(/-/g,"/")).getHours():new Date(item.start_time.replace(/-/g,"/")).getHours() || '00'}}:
-										{{ new Date(item.start_time.replace(/-/g,"/")).getMinutes()<10?"0" + new Date(item.start_time.replace(/-/g,"/")).getMinutes():
-										new Date(item.start_time.replace(/-/g,"/")).getMinutes() || '00'}}</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</block>
-				</view>
-			</view>	
-		</view>		
-		<home></home>
-		<!-- #ifndef H5 -->
-		<passwordPopup></passwordPopup>
-		<!-- #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>
-	// +----------------------------------------------------------------------
-	import {
-		getSeckillIndexTime,
-		getPresellList
-	} from '../../../api/activity.js';
-	import home from '@/components/home/index.vue'
-	// #ifndef H5
-	import passwordPopup from '@/components/passwordPopup';
-	// #endif
-	import { configMap } from "@/utils";
-	import { mapGetters } from "vuex";
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	export default {
-		computed: configMap({statusBarHeight:0},mapGetters(['viewColor','keyColor'])),
-		components: {
-			// #ifndef H5
-			passwordPopup,
-			// #endif
-			home
-		},
-		data() {
-			return {
-				domain: HTTP_REQUEST_URL,
-				topImage: '',
-				presellList: [],
-				timeList: [
-					'未开始',
-					'正在进行',
-					'已结束'
-				],
-				active: 1,
-				type: 0,
-				scrollLeft: 0,
-				interval: 0,
-				status: 1,
-				page: 1,
-				limit: 8,
-				loading: false,
-				loadend: false,
-				pageloading: false,
-			}
-		},
-		/**
-		 * 用户点击右上角分享
-		 */
-		// #ifdef MP
-		onShareAppMessage: function() {
-			wx.showShareMenu({
-			      withShareTicket: true,
-			      menus: ['shareAppMessage', 'shareTimeline']
-			    })	
-			return {
-				title: '预售活动',
-				path: 'pages/activity/presell/index',
-			}
-		},
-		onShareTimeline: function() {
-			return {
-				title: '预售活动',
-				  query: {
-				    key: ''
-				  },
-				  imageUrl: ''
-				}      
-		},
-		// #endif
-		onLoad() {
-			this.getPresellProductList();
-		},
-		methods: {		
-			goBack: function() {
-				uni.navigateBack();
-			},
-			getPresellProductList: function() {
-				var that = this;
-				var data = {
-					page: that.page,
-					limit: that.limit,
-					type: that.active
-				};
-				if (that.loadend) return;
-				if (that.pageloading) return;
-				this.pageloading = true
-				getPresellList(data).then(res => {
-					// console.log(res);
-					var presellList = res.data.list;
-					var loadend = presellList.length < that.limit;
-					that.page++;
-					that.presellList = that.presellList.concat(presellList),
-						that.page = that.page;
-					that.pageloading = false;
-					that.loadend = loadend;
-				}).catch(err => {
-					that.pageloading = false
-				});
-			},
-			settimeList: function(item, index) {
-				var that = this;
-				that.active = index			
-				that.type = that.active;
-				that.loadend = false;
-				that.page = 1;
-				that.presellList = [];
-				// wxh.time(e.currentTarget.dataset.stop, that);
-				that.getPresellProductList();
-			},
-			goDetails(item) {
-				uni.navigateTo({
-					url: '/pages/activity/presell_details/index?id=' + item.product_presell_id
-				})
-			}
-		},
-		/**
-		 * 页面上拉触底事件的处理函数
-		 */
-		onReachBottom: function() {
-			this.getPresellProductList();
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.container {
-		min-height: 100vh;
-		background-color: var(--view-theme);
-	}
-	.noCommodity{
-		border-top: none;
-	}
-	.flash-sale .header {
-		width: 100%;
-		position: relative;
-	}
-	.flash-sale .main_count{
-		position: relative;
-		top: -150rpx;
-	}
-	.flash-sale .header .presellBg {
-		width: 750rpx;
-	}
-	.flash-sale .presellList {
-		padding: 0 20rpx;
-		bottom: 0;
-		margin: 0 30rpx;
-		width: 690rpx;
-		background: #fff;
-		border-radius: 16rpx;
-		line-height: 80rpx;
-		height: 80rpx;
-	}
-	.flash-sale .presellList .priceTag {
-		width: 75rpx;
-		height: 70rpx;
-	}
-	.flash-sale .presellList .priceTag image {
-		opacity: 1;
-	}
-	.flash-sale .presellList .priceTag image {
-		width: 100%;
-		height: 100%;
-	}
-	.flash-sale .timeList {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin: 0 auto;
-	}
-	.flash-sale .timeList .item {
-		font-size: 20rpx;
-		color: #666;
-		text-align: center;
-		box-sizing: border-box;
-		width: 224rpx;
-	}
-	.flash-sale .timeList .item .time {
-		font-size: 26rpx;
-		color: #AAAAAA;
-	}
-	.flash-sale .timeList .item.on .time {
-		color: var(--view-theme);
-		font-weight: 700;
-		span{
-			position: relative;
-			&::after{
-				content: '';
-				display: inline-block;
-				width: 100%;
-				height: 5rpx;
-				background: var(--view-theme);
-				position: absolute;
-				left: 0;
-				bottom: -8rpx;
-				border-radius: 2rpx;
-			}
-		}
-	}
-	.activity {
-		padding: 0 20rpx;
-		border: 1px solid var(--view-theme);
-		color: var(--view-theme);
-		font-size: 24rpx;
-		line-height: 40rpx;
-		position: relative;
-	}
-	.activity:before {
-		content: ' ';
-		position: absolute;
-		width: 7rpx;
-		height: 10rpx;
-		border-radius: 0 7rpx 7rpx 0;
-		border: 1px solid var(--view-theme);
-		background-color: #fff;
-		bottom: 50%;
-		left: -3rpx;
-		margin-bottom: -6rpx;
-		border-left-color: #fff;
-	}
-	.activity:after {
-		content: ' ';
-		position: absolute;
-		width: 7rpx;
-		height: 10rpx;
-		border-radius: 7rpx 0 0 7rpx;
-		border: 1px solid var(--view-theme);
-		background-color: #fff;
-		right: -3rpx;
-		bottom: 50%;
-		margin-bottom: -6rpx;
-		border-right-color: #fff;
-	}
-	.flash-sale .list{
-		margin-top: 24rpx;
-	}
-	.flash-sale .list .item {
-		height: 278rpx;
-		position: relative;
-		width: 690rpx;
-		margin: 0 auto 20rpx auto;
-		background-color: #fff;
-		border-radius: 20rpx;
-		padding: 0 25rpx;
-	}
-	.flash-sale .list .item .pictrue {
-		width: 240rpx;
-		height: 240rpx;
-		border-radius: 10rpx;
-	}
-	.flash-sale .list .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 10rpx;
-	}
-	.flash-sale .list .item .text {
-		width: 380rpx;
-		font-size: 30rpx;
-		color: #333;
-	}
-	.flash-sale .list .item .text .name {
-		width: 100%;
-		color: #282828;
-		font-weight: bold;
-		font-size: 28rpx;
-	}
-	.flash-sale .list .item .text .booking {
-		font-size: 30rpx;
-		color: #E93323;
-	}
-	.flash-sale .list .item .text .booking .count {
-		font-size: 24rpx;
-		color: #E93323;
-	}
-	.flash-sale .list .item .text .limit {
-		font-size: 22rpx;
-		color: #999;
-		margin-bottom: 5rpx;
-	}
-	.flash-sale .list .item .text .limit .limitPrice {
-		margin-left: 10rpx;
-	}
-	.flash-sale .list .item .text .progress {
-		width: 392rpx;
-		height: 74rpx;
-		background-size: 100%;
-		margin-top: 16rpx;
-		.presell_price{
-			float: left;
-			width: 50%;
-			text-align: center;
-			line-height: 15px;
-			padding: 8rpx 0;
-			.presell_text{
-				display: block;
-				color: #FF4F00;
-				font-size: 20rpx;
-			}
-			.price{
-				font-size: 26rpx;
-				color: #FF4F00;
-				text{
-					font-weight: bold;
-				}
-			}
-		}
-		.order_btn{
-			float: left;
-			width: 50%;
-			text-align: center;
-			color: #FFFFFF;
-			font-size: 26rpx;
-			line-height: 76rpx;
-		}
-		.unStartBtn{
-			float: left;
-			width: 50%;
-			text-align: center;
-			color: #FFFFFF;
-			font-size: 20rpx;
-			padding: 8rpx 0;
-			text{
-				font-size: 22rpx;
-			}
-		}
-	}
-	.tool-bar{
-		display: flex;
-		align-items: center;
-		height: 40px;
-	}
-	.fixed-head{
-		position: absolute;
-		left: 0;
-		top: 20px;
-		width: 100%;
-		z-index: 10;
-		.icon-xiangzuo {
-			margin-right: 40rpx;
-			margin-left: 20rpx;
-			font-size: 40rpx;
-			color: #fff;
-		}
-	}
-</style>
diff --git a/pages/activity/presell_details/index.vue b/pages/activity/presell_details/index.vue
deleted file mode 100644
index f79f205..0000000
--- a/pages/activity/presell_details/index.vue
+++ /dev/null
@@ -1,2339 +0,0 @@
-<template>
-	<view :style="viewColor">
-		<view class="product-con">
-			<view class="head-wrapper" :style="'top:'+statusBarHeight">
-				<view class="head-menu">
-					<view class='iconfont icon-xiangzuo' @click="returns"></view>
-					<view class="iconfont icon-shouye4" @click="goHome"></view>
-				</view>
-			</view>
-			<view>
-				<scroll-view :scroll-top="scrollTop" scroll-y='true' scroll-with-animation="true" :style='"height:"+height+"px;"'
-				 @scroll="scroll">
-					<view id="past0">
-						<productConSwiper class="skeleton-rect" :imgUrls="storeInfo.slider_image" :videoCoverImg="videoCoverImg" :videoline="storeInfo.video_link"></productConSwiper>
-						<view v-if="storeInfo.atmosphere_pic" :style="{ backgroundImage: `url(${storeInfo.atmosphere_pic})` }" class="nav acea-row row-between-wrapper">
-							<view class='money skeleton-rect'>
-								￥<text class='num'>{{presellInfo.price}}</text>
-							</view>
-						</view>
-						<view class='wrapper'>
-							<view :class="{ atmosphere: storeInfo.atmosphere_pic }" class='share acea-row row-between row-bottom' style="padding: 0;margin: 0;">
-								<view v-if="storeInfo.atmosphere_pic" class='introduce skeleton-rect'>
-									<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>
-									{{presellInfo.store_name}}</view>
-								<view v-else class='money p-color skeleton-rect'>
-									￥
-									<text class='num'>{{presellInfo.price}}</text>
-									<text class="price_text">预售价</text>
-								</view>
-								<view @click="listenerActionSheet" class="fenxiang_btn">
-									<view class='iconfont icon-fenxiang'></view>
-									分享
-								</view>
-							</view>
-							<view class='label acea-row skeleton-rect'>
-								<view>市场价:￥{{storeInfo.price || ''}}</view>
-								<view style="margin-left: 30rpx;">已预定:{{presellInfo.seles}}{{ storeInfo.unit_name }}</view>
-							</view>
-							<view v-if="!storeInfo.atmosphere_pic" class='introduce skeleton-rect'>
-								<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>
-								{{presellInfo.store_name}}</view>
-							<view class="presell_count">
-								<view>
-									<view>预售活动时间：</view>
-									<view v-if="presellInfo.start_time && presellInfo.end_time" class="presell_time">
-										<view class='iconfont icon-shijian1'></view>
-										{{ new Date(presellInfo.start_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(presellInfo.start_time.replace(/-/g,"/")).getDate() }}日{{ new Date(presellInfo.start_time.replace(/-/g,"/")).getHours() }}时{{ new Date(presellInfo.start_time.replace(/-/g,"/")).getMinutes()}}分
-										<span class='area_line'>~</span>
-										<view class='iconfont icon-shijian1'></view>
-										{{ new Date(presellInfo.end_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(presellInfo.end_time.replace(/-/g,"/")).getDate() }}日{{ new Date(presellInfo.end_time.replace(/-/g,"/")).getHours() }}时{{ new Date(presellInfo.end_time.replace(/-/g,"/")).getMinutes()}}分
-									</view>
-								</view>
-								<view v-if="presellInfo.presell_type === 2">
-									<view>支付尾款时间：</view>
-									<view v-if="presellInfo.final_start_time && presellInfo.final_end_time" class="presell_time">
-										<view class='iconfont icon-shijian1'></view>
-										{{ new Date(presellInfo.final_start_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(presellInfo.final_start_time.replace(/-/g,"/")).getDate() }}日{{ new Date(presellInfo.final_start_time.replace(/-/g,"/")).getHours() }}时{{ new Date(presellInfo.final_start_time.replace(/-/g,"/")).getMinutes()}}分
-										<span class='area_line'>~</span>
-										<view class='iconfont icon-shijian1'></view>
-										{{ new Date(presellInfo.final_end_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(presellInfo.final_end_time.replace(/-/g,"/")).getDate() }}日{{ new Date(presellInfo.final_end_time.replace(/-/g,"/")).getHours() }}时{{ new Date(presellInfo.final_end_time.replace(/-/g,"/")).getMinutes()}}分
-									</view>
-								</view>
-								<view v-if="presellInfo.delivery_type == 1">
-									<view>预计发货时间：</view>
-									<view v-if="presellInfo.presell_type==1">支付成功后{{ presellInfo.delivery_day }}天内发货</view>
-									<view v-if="presellInfo.presell_type==2">付尾款成功后{{ presellInfo.delivery_day }}天内发货</view>
-								</view>
-								<view v-if="presellInfo.delivery_type == 2">
-									<view>预计发货时间：</view>
-									预售结束后{{ presellInfo.delivery_day }}天内发货
-								</view>
-							</view>
-							<view class='coupon acea-row row-between-wrapper skeleton-rect' @click='couponTap' style="margin-top: 20rpx;">
-								<view class='hide line1 acea-row'>
-									优惠券：
-									<view class='activity' v-for="(item,index) in coupon.list" :key="index">满{{item.use_min_price}}减{{item.coupon_price}}</view>
-								</view>
-								<view class='iconfont icon-jiantou'></view>
-							</view>
-						</view>
-						<view class='attribute acea-row row-between-wrapper' @click="selecAttr">
-							<view class="acea-row row-between-wrapper skeleton-rect">{{attrTxt}}：
-								<text class='atterTxt'>{{attrValue}}</text>
-							</view>
-							<view class='iconfont icon-jiantou skeleton-rect'></view>
-						</view>
-						<!--运费-->
-						<view v-if="shipping || shippingValue" 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.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="specsInfo.params.length>0" class="attribute acea-row row-between-wrapper" @click="seeSpecs">
-						  <view class="acea-row row-middle">
-						    参数：
-						    <view class="list line1">
-						      <text class="item params" v-for="(item,index) in specsInfo.params" :key="index"
-						        v-if="index<2">{{item.name}}</text>
-						      <text>...</text>
-						    </view>
-						  </view>
-						  <view class="iconfont icon-jiantou"></view>
-						</view>
-						<!--定金预售流程-->
-						<view v-if="presellInfo.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='userEvaluation' id="past1" v-if="replyCount && replyCount>0">
-						<view class='title acea-row row-between-wrapper'>
-							<view>用户评价({{replyCount}})</view>
-							<navigator class='praise' hover-class='none' :url='"/pages/users/goods_comment_list/index?product_id="+storeInfo.product_id'>
-								<text class='t-color'>{{replyChance}}</text>好评率
-								<text class='iconfont icon-jiantou'></text>
-							</navigator>
-						</view>
-						<block v-if="replyCount">
-							<userEvaluation :reply="reply"></userEvaluation>
-						</block>
-					</view>
-					<!-- 种草秀 -->
-					<view class='userPlant' v-if="storeInfo.community && storeInfo.community.length>0">
-						<view class='title acea-row row-between-wrapper'>
-							<view>种草秀 </view>
-							<navigator class='praise' hover-class='none' :url="'/pages/plantGrass/plant_show/index?spu_id='+storeInfo.spu_id">
-								查看全部
-								<text class='iconfont icon-jiantou'></text>
-							</navigator>
-						</view>
-						<view class="imgList acea-row">
-							<navigator class="pictrue" v-for="(item, index) in storeInfo.community" :key="index" v-if="index<=2"
-							 hover-class='none' :url="'/pages/plantGrass/plant_detail/index?id='+item.community_id">
-								<image :src="item.image[0]" class="image"></image>
-
-							</navigator>
-						</view>
-					</view>
-					<!-- 商铺信息 -->
-					<view v-if="hide_mer_status == 0 && storeInfo.merchant" class="store-wrapper">
-						<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}}
-									<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)" class="font-bg-red ml8">{{storeInfo.merchant.type_name}}</text>
-									<text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red ml8">自营</text>
-									</view>
-									<view class="txt">
-									{{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
-									</view>
-								</view>
-								<navigator :url="'/pages/store/home/index?id='+storeInfo.merchant.mer_id" class="link" hover-class="none">进店</navigator>
-							</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 v-if="storeInfo.merchant.recommend && storeInfo.merchant.recommend.length > 0" class="con-box">
-							<view class="title">店铺推荐</view>
-							<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="false">
-								<view class="img-box">
-									<view class="img-item" v-for="(item,index) in storeInfo.merchant.recommend" :key="index" @click="goProDetail(item)">
-										<image :src="item.image" mode=""></image>
-										<view class="txt">
-											<view class="title line1">{{item.store_name}}</view>
-											<view class="price">
-												<text>￥</text>{{item.price}}
-											</view>
-										</view>
-									</view>
-								</view>
-							</scroll-view>
-						</view>
-					</view>
-					<view class='product-intro' id="past3">
-						<view class='title'>产品介绍</view>
-						<view class='conter' v-if="description">
-							<jyf-parser :domain="domain" :html="description.content" ref="article" :tag-style="tagStyle"></jyf-parser>
-						</view>
-						<!-- 价格说明 -->
-						<view v-if="priceRule.content" class="price-info">
-							<view class="price-title">价格说明</view>
-							<!-- #ifndef APP-PLUS -->
-							<jyf-parser :domain='domain' :html="priceRule.content.replace(/<br\/>/ig, '')" ref="article" :tag-style="tagStyle"></jyf-parser>
-							<!-- #endif -->
-							<!-- #ifdef APP-PLUS -->
-							<view class="description" v-html="priceRule.content.replace(/<br\/>/ig, '')"></view>
-							<!-- #endif -->
-						</view>
-					</view>
-					<view v-if="presellInfo && presellInfo.presell_type === 2 && presellInfo.final_end_time" style="height:160rpx;"></view>
-					<view v-else style="height:120rpx;"></view>
-				</scroll-view>
-			</view>
-			<view class='footer_count'>
-				<view v-if="presellInfo && presellInfo.presell_type === 2 && presellInfo.final_end_time" class="presell_desc">
-					<text v-if="presellInfo.end_time" class='iconfont icon-zhuyi-copy'></text>
-					定金支付时间{{new Date(presellInfo.end_time.replace(/-/g,"/")).getMonth()+1 }}月{{ new Date(presellInfo.end_time.replace(/-/g,"/")).getDate() }}日{{ new Date(presellInfo.end_time.replace(/-/g,"/")).getHours() }}时{{ new Date(presellInfo.end_time.replace(/-/g,"/")).getMinutes()}}分结束
-					<text>{{ presellInfo.delivery_type === 1 ? '   付尾款后' : '   活动结束后' }}{{ presellInfo.delivery_day }}天内发货</text>
-				</view>
-				<view class="acea-row row-between-wrapper footer" :class="presellInfo.presell_type === 2 ? 'noborder' : ''">
-					<view v-if="storeInfo.merchant && storeInfo.merchant.services_type == 1" class="item skeleton-rect" @click="call">
-						<view class="iconfont icon-kefu"></view>
-						<view>客服</view>
-					</view>
-					<view v-else @click="goCustomer" class="item skeleton-rect">
-						<view class="iconfont icon-kefu"></view>
-						<view>客服</view>
-					</view>
-					<view @click="setCollect" class='item skeleton-rect'>
-						<view class='iconfont icon-shoucang1' v-if="storeInfo.isRelation"></view>
-						<view class='iconfont icon-shoucang' v-else></view>
-						<view>收藏</view>
-					</view>
-					<view class='bnt acea-row skeleton-rect'>
-						<form @submit="goBuy" report-submit='true' v-if="attr.productSelect && presellInfo.presell_status == 1">
-							<button v-if="attr.productSelect.stock == 0" class='buy bnts' form-type="submit" disabled>商品已售罄</button>
-							<button v-else class='buy bnts' form-type="submit">{{ presellInfo.presell_type === 1 ? "立即支付" : "立即支付定金："+minNum+'元起'  }}</button>
-						</form>
-						<form @submit="goBuy" report-submit='true' v-if="attr.productSelect && presellInfo.presell_status == 2">
-							<button class='buy bnts' form-type="submit" disabled>已结束</button>
-						</form>
-						<form @submit="goBuy" report-submit='true' v-if="attr.productSelect && presellInfo.presell_status == 0">
-							<button class='buy bnts' form-type="submit" disabled>未开始</button>
-						</form>
-					</view>
-				</view>
-			</view>
-			<block v-if="sharePacket.max&&sharePacket.max>0">
-				<shareRedPackets :sharePacket="sharePacket" @listenerActionSheet="listenerActionSheet" @closeChange="closeChange"
-				 :showAnimate="showAnimate" @boxStatus="boxStatus"></shareRedPackets>
-			</block>
-			<!-- 组件 -->
-			<productWindow :attr="attr" :isShow='1' :iSplus='1' :isPresell='1' :presell_type="presellInfo.presell_type" :image="storeInfo.image"
-			 @myevent="onMyEvent" @ChangeAttr="ChangeAttr" @ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum"
-			 id='product-window'></productWindow>
-			<block v-if="coupon.coupon">
-				<couponListWindow :showTitle="0" :isShop="1" :coupon='coupon' @ChangCouponsClone="ChangCouponsClone" @ChangCoupons="ChangCoupons"
-				 @ChangCouponsUseState="ChangCouponsUseState"></couponListWindow>
-			</block>
-			<!-- 分享按钮 -->
-			<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
-				<!-- #ifndef MP -->
-				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' v-if="weixinStatus === true" @click="H5ShareBox = true">
-					<view class="iconfont icon-weixin3"></view>
-					<view class="">发送给朋友</view>
-				</button>
-				<!-- #endif -->
-				<!-- #ifdef MP -->
-				<button class="item" :class="weixinStatus ? 'item3' : ''" open-type="share" hover-class='none' @click="goFriend">
-					<view class="iconfont icon-weixin3"></view>
-					<view class="">发送给朋友</view>
-				</button>
-				<!-- #endif -->
-				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="goPoster">
-					<view class="iconfont icon-haibao"></view>
-					<view class="">生成海报</view>
-				</button>
-				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="copyPwd">
-					<view class="iconfont icon-fuzhikouling1"></view>
-					<view>生成口令</view>
-				</button>
-			</view>
-			<view class="mask" v-if="posters" @click="listenerActionClose"></view>
-			<!--口令复制结果-->
-			<copyPassword :isCopy='isCopy' :copyUrl='copyUrl' @close="closeCopy"></copyPassword>
-			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-			<!-- 海报展示 -->
-			<view class='poster-pop' v-if="posterImageStatus">
-				<image src='../../../static/images/poster-close.png' class='close' @click="posterImageClose"></image>
-				<image :src='posterImage'></image>
-				<!-- #ifndef H5  -->
-				<view class='save-poster' @click="savePosterPath">保存到手机</view>
-				<!-- #endif -->
-				<!-- #ifdef H5 -->
-				<view class="keep">长按图片可以保存到手机</view>
-				<!-- #endif -->
-			</view>
-			<view class='mask' v-if="posterImageStatus"></view>
-			<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
-			<!-- 发送给朋友图片 -->
-			<view class="share-box" v-if="H5ShareBox">
-				<image src="/static/images/share-info.png" @click="H5ShareBox = false"></image>
-			</view>
-			<guaranteeTemplate ref="guartemplate" :guarantee='guarantee' :shipping='shipping'></guaranteeTemplate>
-			<!-- 商品参数 -->
-			<specs :specsInfo="specsInfo" @myevent="mySpecs"></specs>
-			<!-- #ifndef H5 -->
-			<passwordPopup></passwordPopup>
-			<!-- #endif -->
-		</view>
-	</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 {
-		getPresellProductDetail,
-		getProductCode,
-		collectAdd,
-		collectDel,
-		postCartAdd,
-		copyPasswordApi, priceRuleApi
-	} from '@/api/store.js';
-	import { getUserInfo, imgToBase } from '@/api/user.js';
-	import { getShopCoupons } from '@/api/api.js';
-	import { getCartCounts } from '@/api/order.js';
-	import { mapGetters } from "vuex";
-	import { imageBase64 } from "@/api/public";
-	import specs from '@/components/specs/index.vue';
-	import productConSwiper from '@/components/productConSwiper';
-	import productWindow from '@/components/productWindow';
-	import couponListWindow from '@/components/couponListWindow';
-	import userEvaluation from '@/components/userEvaluation';
-	import shareRedPackets from '@/components/shareRedPackets';
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	import home from '@/components/home';
-	import { silenceBindingSpread, configMap } from "@/utils";
-	import parser from "@/components/jyf-parser/jyf-parser";
-	import authorize from '@/components/Authorize';
-	// #ifndef H5
-	import passwordPopup from '@/components/passwordPopup';
-	// #endif
-	let app = getApp();
-	import history from "@/mixins/history";
-	import shareScence from "@/libs/spread";
-	import guaranteeTemplate from '@/components/freightGuarantee';
-	import copyPassword from '@/components/copyPassword';
-	export default {
-		components: {
-			// #ifndef H5
-			passwordPopup,
-			// #endif
-			specs,
-			productConSwiper,
-			productWindow,
-			couponListWindow,
-			userEvaluation,
-			shareRedPackets,
-			home,
-			guaranteeTemplate,
-			copyPassword,
-			"jyf-parser": parser,
-			authorize,
-		},
-		mixins: [history],
-		data() {
-			let that = this;
-			return {
-				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
-				statusBarHeight: statusBarHeight, //系统导航条高度
-				//属性是否打开
-				coupon: {
-					'coupon': false,
-					list: [],
-				},
-				attrTxt: '选择', //属性页面提示
-				attrValue: '', //已选属性
-				animated: false, //购物车动画
-				id: 0, //商品id
-				replyCount: 0, //总评论数量
-				reply: [], //评论列表
-				storeInfo: {}, //商品详情
-				presellInfo: {}, //预售详情
-				productValue: [], //系统属性
-				couponList: [], //优惠券
-				cart_num: 1, //购买数量
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				isOpen: false, //是否打开属性组件
-				actionSheetHidden: true,
-				posterImageStatus: false,
-				storeImage: '', //海报产品图
-				PromotionCode: '', //二维码图片
-				canvasStatus: false, //海报绘图标签
-				posterImage: '', //海报路径
-				posterbackgd: '/static/images/posterbackgd.png',
-				sharePacket: {
-					isState: true, //默认不显示
-				}, //分销商详细
-				// uid: 0, //用户uid
-				circular: false,
-				autoplay: false,
-				interval: 3000,
-				duration: 500,
-				clientHeight: "",
-				systemStore: {}, //门店信息
-				replyChance: 0,
-				CartCount: 0,
-				isDown: true,
-				storeSelfMention: true,
-				posters: false,
-				weixinStatus: false,
-				attr: {
-					cartAttr: false,
-					productAttr: [],
-					productSelect: {}
-				},
-				description: '',
-				navActive: 0,
-				H5ShareBox: false, //公众号分享图片
-				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,
-				domain: HTTP_REQUEST_URL,
-				minNum: 0,
-				currSpid: "",
-				codeImg: "",
-				videoCoverImg: "",
-				shipping: "",
-				guarantee: [],
-				guaranteeValue: "",
-				shippingValue: "",
-				isCopy: false,
-				copyUrl: '',
-				services_type: "",
-				priceRule: "",
-				specsInfo: {
-				  show: false,
-				  params: []
-				},
-			};
-		},
-		computed: configMap(['hide_mer_status','site_name','share_pic'],mapGetters(['isLogin','uid','viewColor'])),
-		onLoad(options) {
-			let that = this
-			if (options.spid) {
-				app.globalData.spid = options.spid;
-				that.currSpid = options.spid
-			}
-			// console.log(that.currSpid)
-			var pages = getCurrentPages();
-			if (pages.length <= 1) {
-				that.retunTop = false
-			}
-			// #ifdef MP
-			this.navH = app.globalData.navHeight;
-			// #endif
-			// #ifndef MP
-			this.navH = 96;
-			// #endif
-			this.id = options.id;
-			if (options.id) {
-				this.id = options.id
-			}
-			uni.getSystemInfo({
-				success: function(res) {
-					that.height = res.windowHeight
-					//res.windowHeight:获取整个窗口高度为px，*2为rpx；98为头部占据的高度；
-				},
-			});
-			//扫码携带参数处理
-			// #ifdef MP
-			if (options.scene) {
-				let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
-				if (value.id) options.id = value.id;
-				//记录推广人uid
-				if (value.spid) {
-					app.globalData.spid = value.spid;
-					that.currSpid = value.spid
-				}
-			}
-			if (!options.id && !options.scene) {
-				return this.$util.Tips({
-					title: '缺少参数无法查看商品'
-				}, {
-					tab: 3,
-					url: 1
-				});
-			} else {
-				this.id = options.id
-			}
-			//记录推广人uid
-			if (options.spid) app.globalData.spid = options.spid;
-			// #endif
-			this.getGoodsDetails();
-			if (this.isLogin) {
-				this.downloadFilePromotionCode();
-				//#ifdef H5
-				silenceBindingSpread();
-				//#endif
-			}
-			// #ifdef MP
-			this.getHistory()
-			// #endif
-			shareScence(that.currSpid, that.isLogin)
-		},
-		onReady() {this.isNodes++;},
-		onShow() {},
-		/**
-		 * 用户点击右上角分享
-		 */
-		// #ifdef MP
-		onShareAppMessage: function() {
-			let that = this;
-			that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-			return {
-				title: that.storeInfo.store_name || '',
-				imageUrl: that.storeInfo.image || '',
-				path: '/pages/activity/presell_details/index?id=' + that.id + '&spid=' + that.uid,
-			}
-		},
-		onShareTimeline: function() {
-			let that = this;
-			that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-			return {
-				title: that.storeInfo.store_name || '',
-				query: {
-					id: that.id,
-					spid: that.uid
-				},
-				imageUrl: that.storeInfo.image || ''
-			}
-		},
-		// #endif
-		methods: {
-			call: function(){
-				uni.makePhoneCall({
-					// 手机号
-				    phoneNumber: this.storeInfo.merchant.service_phone,
-					// 成功回调
-					success: (res) => {
-						// console.log('调用成功!')
-					},
-					// 失败回调
-					fail: (res) => {
-						// console.log('调用失败!')
-					}
-				});
-			},
-			goCustomer(){
-				let that = this;
-				if (that.isLogin === false) {
-				    this.isAuto = true;
-				    this.isShowAuth = true
-				} else {
-					uni.navigateTo({
-						url: `/pages/chat/customer_list/chat?mer_id=${that.storeInfo.mer_id}&uid=${that.uid}&productId=${that.storeInfo.product_id}&presellId=${that.id}`
-					});
-				}
-			},
-			goProDetail(item) {
-				// console.log(item, 'goProDetail')
-				uni.redirectTo({
-					url: '/pages/goods_details/index?id=' + item.product_id
-				})
-			},
-			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();
-			},
-			/**查看商品参数*/
-			seeSpecs() {
-			  this.specsInfo.show = true;
-			},
-			mySpecs() {
-			  this.$set(this.specsInfo, 'show', false);
-			},
-			/*获取价格说明*/
-			getPricrRule() {
-				priceRuleApi(this.storeInfo.cate_id).then(res => {
-					this.priceRule = res.data
-				}).catch(err => {
-			
-				});
-			},
-			goActivity: function(e) {
-				// console.log(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}`
-					});
-				}
-			},
-			/**
-			 * 打开优惠券插件
-			 */
-			couponTap: function() {
-				let that = this;
-				if (that.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					// that.getCouponList();
-					that.$set(that.coupon, 'coupon', true);
-				}
-			},
-			/**
-			 * 获取优惠券
-			 *
-			 */
-			getCouponList() {
-				let that = this;
-				let goodsArr = []
-				let couponList = [];
-				let activeList = []
-				getShopCoupons(that.storeInfo.mer_id).then(({
-					data
-				}) => {
-					couponList = goodsArr.concat(data)
-					that.$set(that.coupon, 'list', couponList);
-					for (let i = 0; i < couponList.length; i++) {
-						if (!couponList[i].issue && activeList.length < 2) {
-							activeList.push(couponList[i]);
-						}
-					}
-					// console.log(that.couponList)
-					that.$set(that, 'couponList', activeList);
-				})
-			},
-			ChangCouponsUseState(index) {
-				let that = this;
-				that.$set(that.coupon, 'coupon', false);
-			},
-			/**
-			 * 购物车手动填写
-			 *
-			 */
-			iptCartNum: function(e) {
-				let num = parseInt(e)
-				let stock = this.presellInfo.self_count ? parseInt(this.presellInfo.self_count) : 999999999;
-				if (num > stock) {
-					this.$nextTick(res => {
-						this.$set(this.attr.productSelect, 'cart_num', stock);
-					})
-				} else {
-					if (num <= 0) {
-						this.$nextTick(res => {
-							this.$set(this.attr.productSelect, 'cart_num', stock);
-						})
-					} else {
-						this.$nextTick(res => {
-							this.$set(this.attr.productSelect, 'cart_num', num);
-						})
-					}
-				}
-			},
-			// 后退
-			returns: function() {
-				uni.navigateBack()
-			},
-			// 首页
-			goHome() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-			},
-			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
-					}
-				}
-			},
-			/*
-			 *去商品详情页
-			 */
-			goDetail(item) {
-				if (item.activity.length == 0) {
-					uni.redirectTo({
-						url: '/pages/goods_details/index?id=' + item.id
-					})
-					return
-				}
-				// 砍价
-				if (item.activity && item.activity.type == 2) {
-					uni.redirectTo({
-						url: `/pages/activity/goods_bargain_details/index?id=${item.activity.id}&bargain=${this.uid}`
-					})
-					return
-				}
-				// 拼团
-				if (item.activity && item.activity.type == 3) {
-					uni.redirectTo({
-						url: `/pages/activity/goods_combination_details/index?id=${item.activity.id}`
-					})
-					return
-				}
-				// 秒杀
-				if (item.activity && item.activity.type == 1) {
-					uni.redirectTo({
-						url: `/pages/activity/goods_seckill_details/index?id=${item.activity.id}&time=${item.activity.time}&status=1`
-					})
-					return
-				}
-			},
-			// 微信登录回调
-			onLoadFun: function(e) {
-				this.getGoodsDetails();
-				this.downloadFilePromotionCode();
-				this.isShowAuth = false
-			},
-			ChangCouponsClone: function() {
-				this.$set(this.coupon, 'coupon', false)
-			},
-			/*
-			 * 获取用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				that.$set(that.sharePacket, 'isState', that.sharePacket.priceName != 0 ? false : true);
-				getUserInfo().then(res => {
-					// that.$set(that, 'uid', res.data.uid);
-				});
-			},
-			/**
-			 * 购物车数量加和数量减
-			 *
-			 */
-			ChangeCartNum: function(changeValue) {
-				//changeValue:是否 加|减
-				//获取当前变动属性
-				let productSelect = this.productValue[this.attrValue];
-				//如果没有属性,赋值给商品默认库存
-				if (productSelect === undefined && !this.attr.productAttr.length)
-					productSelect = this.attr.productSelect;
-				//无属性值即库存为0；不存在加减；
-				if (productSelect === undefined) return;
-				let stock = this.presellInfo.self_count ? this.presellInfo.self_count : 999999999;
-				let num = this.attr.productSelect;
-				if (changeValue) {
-					num.cart_num++;
-					if (num.cart_num > stock) {
-						this.$set(this.attr.productSelect, "cart_num", stock);
-						this.$set(this, "cart_num", stock);
-						uni.showToast({
-							title: `每人限购${stock}件`,
-							icon: 'none'
-						})
-					}
-				} else {
-					num.cart_num--;
-					if (num.cart_num < 1) {
-						this.$set(this.attr.productSelect, "cart_num", 1);
-						this.$set(this, "cart_num", 1);
-					}
-				}
-			},
-			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 && productSelect.stock > 0) {
-					this.$set(this.attr.productSelect, "image", productSelect.image);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					if (this.presellInfo.presell_type === 2) this.$set(this.attr.productSelect, "down_price", productSelect.down_price);
-					this.$set(this.attr.productSelect, "stock", productSelect.stock);
-					this.$set(this.attr.productSelect, "unique", 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", this.storeInfo.price);
-					this.$set(this.attr.productSelect, "stock", 0);
-					if (this.presellInfo.presell_type === 2) this.$set(this.attr.productSelect, "down_price", 0);
-					this.$set(this.attr.productSelect, "unique", "");
-					this.$set(this.attr.productSelect, "cart_num", 0);
-					this.$set(this, "attrValue", "");
-					this.$set(this, "attrTxt", "选择");
-				}
-			},
-			/**
-			 * 领取完毕移除当前页面领取过的优惠券展示
-			 */
-			ChangCoupons: function(e) {
-				let coupon = e;
-				// console.log(e);
-				let couponList = this.$util.ArrayRemove(this.couponList, 'id', coupon.id);
-				this.$set(this, 'couponList', couponList);
-				this.getCouponList();
-			},
-			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;
-				getPresellProductDetail(that.id).then(async res => {
-					// console.log(res)
-					uni.hideLoading();
-					let storeInfo = res.data.product;
-					let presellInfo = 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, 'presellInfo', presellInfo);
-					that.$set(that, 'storeInfo', storeInfo);
-					that.$set(that, 'description', storeInfo.content);
-					that.$set(that, 'reply', res.data.product.topReply ? [res.data.product.topReply] : []);
-					that.$set(that, 'replyCount', res.data.product.replayData && res.data.product.replayData.count);
-					that.$set(that, 'replyChance', res.data.product.replayData && res.data.product.replayData.rate);
-					that.$set(that.attr, 'productAttr', res.data.product.attr);
-					that.$set(that, 'productValue', res.data.product.sku);
-					that.$set(that.sharePacket, 'priceName', res.data.product.priceName);
-					that.$set(that.sharePacket, 'max', res.data.product.max_extension);
-					that.$set(that.sharePacket, 'min', res.data.product.min_extension);
-					that.$set(that, 'systemStore', res.data.product.system_store);
-					that.$set(that, 'storeSelfMention', res.data.product.store_self_mention);
-					that.$set(that, 'PromotionCode', storeInfo.code_base);
-					that.$set(that, 'activity', res.data.product.activity ? res.data.product.activity : []);
-					that.$set(that, 'shippingValue', res.data.product.temp ? res.data.product.temp.name : '');
-					that.$set(that, 'guaranteeValue', res.data.product.guarantee ? res.data.product.guarantee.template_name : '');
-					that.$set(that, 'guarantee', res.data.product.guaranteeTemplate ? res.data.product.guaranteeTemplate : []);
-					that.$set(that, 'shipping', res.data.product.temp ? res.data.product.temp.info : '');
-					that.$set(that.specsInfo, 'params', res.data.product.params);	
-					uni.setNavigationBarTitle({
-						title: storeInfo.store_name.substring(0, 7) + "..."
-					})
-					that.$set(that, 'storeImage', that.storeInfo.image);
-					// #ifdef H5
-					if (that.isLogin) {
-						that.getCartCount();
-						that.ShareInfo();
-					};
-					that.downloadFilePromotionCode();
-					// #endif
-					// #ifdef APP-PLUS || MP
-					that.getCartCount();
-					// #endif
-					setTimeout(function() {
-						that.infoScroll();
-					}, 500);
-					that.DefaultSelect();
-					that.getPricrRule(that.storeInfo.cate_id);
-					that.$nextTick(function() {
-						that.getCouponList();
-					})
-					// 找到最小定金金额
-					let objs = Object.keys(res.data.product.sku);
-					let m = objs.map(key => res.data.product.sku[key]);
-					this.minNum = Math.min.apply(Math, m.map(function(o) {
-						return o.down_price
-					}))
-				}).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);
-					});
-				};
-			},
-			/**
-			 * 拨打电话
-			 */
-			makePhone: function() {
-				uni.makePhoneCall({
-					phoneNumber: this.systemStore.phone
-				})
-			},
-			/**
-			 * 默认选中属性
-			 *
-			 */
-			DefaultSelect: function() {
-				let productAttr = this.attr.productAttr;
-				let value = [];
-				let arr = []
-				let unSortArr = []
-				// console.log(arr, 'arr')
-				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]);
-				}
-				// console.log(value, 'value')
-				//sort();排序函数:数字-英文-汉字；
-				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);
-					this.$set(this.attr.productSelect, "price", productSelect.price);
-					if (this.presellInfo.presell_type === 2) this.$set(this.attr.productSelect, "down_price", productSelect.down_price);
-					this.$set(this.attr.productSelect, "stock", productSelect.stock);
-					this.$set(this.attr.productSelect, "unique", 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);
-					if (this.presellInfo.presell_type === 2) this.$set(this.attr.productSelect, "down_price", storeInfo.down_price);
-					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", "选择");
-				} 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.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);
-					if (this.presellInfo.presell_type === 2) this.$set(this.attr.productSelect, "down_price", productSelect.down_price);
-					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);
-					}
-				}
-			},
-			/*
-			 *  单独购买
-			 */
-			openAlone: function() {
-				uni.navigateTo({
-					url: `/pages/goods_details/index?id=${this.storeInfo.old_product_id}`
-				})
-			},
-			/**
-			 *
-			 *
-			 * 收藏商品
-			 */
-			setCollect: function() {
-				if (this.isLogin === false) {
-                    this.isAuto = true;
-                    this.isShowAuth = true
-				} else {
-					let that = this;
-					if (this.storeInfo.isRelation) {
-						collectDel({
-							type: 2,
-							type_id: this.presellInfo.product_presell_id
-						}).then(res => {
-							that.$set(that.storeInfo, 'isRelation', !that.storeInfo.isRelation);
-						})
-					} else {
-						collectAdd({
-							type_id: this.presellInfo.product_presell_id,
-							type: 2
-						}).then(res => {
-							that.$set(that.storeInfo, 'isRelation', !that.storeInfo.isRelation);
-						})
-					}
-				}
-			},
-			/**
-			 * 打开属性插件
-			 */
-			selecAttr: function() {
-				this.$set(this.attr, 'cartAttr', true);
-				this.$set(this, 'isOpen', true);
-			},
-			onMyEvent: function() {
-				this.$set(this.attr, 'cartAttr', false);
-				this.$set(this, 'isOpen', false);
-			},
-			/**
-			 * 打开属性加入购物车
-			 *
-			 */
-			joinCart: function(e) {
-				//是否登录
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					this.goCat();
-				}
-			},
-			/*
-			 * 加入购物车
-			 */
-			goCat: function(news) {
-				let that = this,
-					productSelect = that.productValue[this.attrValue];
-				//打开属性
-				if (that.attrValue) {
-					//默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
-					that.attr.cartAttr = !that.isOpen ? true : false;
-				} else {
-					if (that.isOpen) that.attr.cartAttr = true;
-					else that.attr.cartAttr = !that.attr.cartAttr;
-
-				}
-				//只有关闭属性弹窗时进行加入购物车
-				if (that.attr.cartAttr === true && that.isOpen === false)
-					return (that.isOpen = true);
-				//如果有属性,没有选择,提示用户选择
-				if (
-					that.attr.productAttr.length &&
-					that.isOpen === true &&
-					productSelect.stock == 0
-				)
-					return that.$util.Tips({
-						title: "产品库存不足，请选择其它"
-					});
-				let q = {
-					// productId: that.id,
-					// cartNum: that.attr.productSelect.cart_num,
-					is_new: 1,
-					// uniqueId: that.attr.productSelect !== undefined ?
-					// 	that.attr.productSelect.unique : ""
-					product_id: that.id,
-					cart_num: that.attr.productSelect.cart_num,
-					product_attr_unique: that.attr.productSelect !== undefined ? that.attr.productSelect.unique : "",
-					product_type: 2,
-					spread_id: this.currSpid
-				};
-				postCartAdd(q)
-					.then(function(res) {
-						that.isOpen = false;
-						that.attr.cartAttr = false;
-						if (news) {
-							uni.navigateTo({
-								url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id
-							});
-						} else {
-							that.$util.Tips({
-								title: "添加购物车成功",
-								success: () => {
-									that.getCartCount(true);
-								}
-							});
-						}
-					})
-					.catch(res => {
-						that.isOpen = false;
-						return that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			/**
-			 * 获取购物车数量
-			 * @param boolean 是否展示购物车动画和重置属性
-			 */
-			getCartCount: function(isAnima) {
-				let that = this;
-				const isLogin = that.isLogin;
-				if (isLogin) {
-					getCartCounts().then(res => {
-						that.CartCount = res.data[0].count;
-						//加入购物车后重置属性
-						if (isAnima) {
-							that.animated = true;
-							setTimeout(function() {
-								that.animated = false;
-							}, 500);
-						}
-					});
-				}
-			},
-			/**
-			 * 立即购买
-			 */
-			goBuy: function(e) {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					this.goCat(true);
-				}
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			/**
-			 * 分享打开
-			 *
-			 */
-			listenerActionSheet: function() {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					// #ifdef H5
-					if (this.$wechat.isWeixin() === true) {
-						this.weixinStatus = true;
-					}
-					// #endif
-					this.posters = true;
-				}
-			},
-			// 分享关闭
-			listenerActionClose: function() {
-				this.posters = false;
-			},
-			//隐藏海报
-			posterImageClose: function() {
-				this.posterImageStatus = false
-				this.canvasStatus = false
-			},
-			//替换安全域名
-			setDomain: function(url) {
-				url = url ? url.toString() : '';
-				//本地调试打开,生产请注销
-				if (url.indexOf("https://") > -1) return url;
-				else return url.replace('http://', 'https://');
-			},
-			/**
-			 * 获取产品分销二维码
-			 * @param function successFn 下载完成回调
-			 *
-			 */
-			downloadFilePromotionCode: function(successFn) {
-				let that = this;
-				let type;
-				// #ifndef MP
-				type = 'wechat'
-				// #endif
-				// #ifdef MP
-				type = 'routine'
-				// #endif
-				getProductCode(that.id, {
-					type: type,
-					product_type: 2
-				}).then(async res => {
-					this.codeImg = res.data.url;
-					that.$set(that, 'isDown', false);
-				}).catch(err => {
-					//替换
-					that.$util.Tips({
-						title: err
-					});
-					that.posters = false;
-					that.$set(that, 'isDown', false);
-					that.$set(that, 'PromotionCode', '');
-				});
-			},
-			// 小程序关闭分享弹窗；
-			goFriend: function() {
-				this.posters = false;
-			},
-			async imgToBase(url) {
-				let res = await imgToBase({
-					image: url
-				})
-				return res.data.image
-			},
-			/**
-			 * 生成海报
-			 */
-			async goPoster() {
-				if (this.posterImage) {
-					this.posterImageStatus = true
-					this.posters = false
-					return
-				}
-				let that = this;
-				let arr2
-				that.posters = false;
-				that.$set(that, 'canvasStatus', true);
-				uni.showLoading({
-					title: '海报生成中',
-					mask: true
-				});
-				// #ifdef MP || APP-PLUS
-				arr2 = [that.posterbackgd, await that.fileStoreImage(that.storeImage), await that.fileStoreImage(
-					that.codeImg), await that.fileStoreImage(that.share_pic)];
-				// #endif
-				// #ifdef H5
-				arr2 = [that.posterbackgd, await this.imgToBase(that.storeImage), await this.imgToBase(this.codeImg), await that.imgToBase(that.share_pic)];
-				// #endif
-				that.$util.goodsPosterCanvas(arr2, that.storeInfo.store_name, that.storeInfo.price, that.site_name, that.storeInfo.ot_price, function(tempFilePath) {
-					that.$set(that, 'posterImage', tempFilePath);
-					that.$set(that, 'posterImageStatus', true);
-					that.$set(that, 'canvasStatus', false);
-					that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-				}, (err) => {
-					that.$set(that, 'canvasStatus', false);
-				});
-			},
-
-			/*
-			 * 保存到手机相册
-			 */
-
-			savePosterPath: function() {
-				let that = this;
-				// #ifdef MP
-				uni.getSetting({
-					success(res) {
-						if (!res.authSetting['scope.writePhotosAlbum']) {
-							uni.authorize({
-								scope: 'scope.writePhotosAlbum',
-								success() {
-									uni.saveImageToPhotosAlbum({
-										filePath: that.posterImage,
-										success: function(res) {
-											that.posterImageClose();
-											that.$util.Tips({
-												title: '保存成功',
-												icon: 'success'
-											});
-										},
-										fail: function(res) {
-											that.$util.Tips({
-												title: '保存失败'
-											});
-										}
-									})
-								}
-							})
-						} else {
-							uni.saveImageToPhotosAlbum({
-								filePath: that.posterImage,
-								success: function(res) {
-									that.posterImageClose();
-									that.$util.Tips({
-										title: '保存成功',
-										icon: 'success'
-									});
-								},
-								fail: function(res) {
-									that.$util.Tips({
-										title: '保存失败'
-									});
-								},
-							})
-						}
-					}
-				})
-				// #endif
-				// #ifdef APP-PLUS
-				uni.saveImageToPhotosAlbum({
-					filePath: that.posterImage,
-					success: function(res) {
-						that.posterImageClose();
-						that.$util.Tips({
-							title: '保存成功',
-							icon: 'success'
-						});
-					},
-					fail: function(res) {
-						that.$util.Tips({
-							title: '保存失败'
-						});
-					},
-				})
-				// #endif
-			},
-
-			//#ifdef H5
-			ShareInfo() {
-				let data = this.storeInfo;
-				let href = location.href;
-				if (this.$wechat.isWeixin()) {
-					getUserInfo().then(res => {
-						href =
-							href.indexOf("?") === -1 ?
-							href + "?spid=" + res.data.uid :
-							href + "&spid=" + res.data.uid;
-
-						let configAppMessage = {
-							desc: data.store_info,
-							title: data.store_name,
-							link: href,
-							imgUrl: data.image
-						};
-
-						this.$wechat.wechatEvevt([
-							"updateAppMessageShareData",
-							"updateTimelineShareData",
-							"onMenuShareAppMessage",
-							"onMenuShareTimeline"
-						], configAppMessage).then(res => {
-							// console.log(res, '=============================>>WXAPI');
-						}).catch(err => {
-							// console.log(err);
-						})
-					});
-				}
-			},
-			//#endif
-			//图片转符合安全域名路径
-			fileStoreImage(url) {
-				// #ifdef MP
-				let ishttps = url.split('//')[0] == 'https:'
-				if (!ishttps) {
-					url = 'https://'+url.split('//')[1]
-				}
-				// #endif
-				return new Promise((resolve, reject) => {
-					let that = this;
-					uni.downloadFile({
-						url: url,
-						success: function(res) {
-							resolve(res.tempFilePath);
-						},
-						fail: function() {
-							return that.$util.Tips({
-								title: ''
-							});
-						}
-					});
-				})
-			},
-			//复制口令
-			copyPwd(){
-				let that = this;
-				copyPasswordApi({
-					id: that.id,
-					product_type: 2
-				}).then(async res => {
-					that.copyUrl = res.data.str;
-					that.posters = false
-					that.isCopy = true;
-				})
-			},
-			closeCopy(){
-				this.isCopy = false
-			},
-		},
-	}
-</script>
-
-<style scoped lang="scss">
-	.font-bg-red{
-		position: relative;
-		top: -3rpx;
-		background-color: var(--view-theme);
-		border: 1px solid var(--view-theme);
-	}
-	.p-color {
-		color: var(--view-priceColor);
-	}
-	.t-color {
-		color: var(--view-theme);
-	}
-	.product-con .wrapper .coupon .activity {
-		border: 1px solid var(--view-priceColor);
-		color: var(--view-priceColor);
-	}
-	.product-con .attribute .params{
-		margin-right: 20rpx;
-		font-size: 28rpx;
-		color: #282828;
-		&:nth-child(2){
-			margin-right: 0;
-		}
-	}
-	.product-con .nav {
-		background-image: url('data:image/jpeg;base64,/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QN/aHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjYtYzE0MiA3OS4xNjA5MjQsIDIwMTcvMDcvMTMtMDE6MDY6MzkgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6NDNlZTU0ZDMtNjEwZS03ZjQ4LWEwODgtNTZlMTZiNzI3NTQwIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjI1NEI2MDUyM0ZDMjExRTk5OTg1REI1OUM1NjNEMUZCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjI1NEI2MDUxM0ZDMjExRTk5OTg1REI1OUM1NjNEMUZCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjUyMDIzNWNmLTIwNGYtOTQ0My05YTBiLWNmMmZlMTJmMDk3NCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0M2VlNTRkMy02MTBlLTdmNDgtYTA4OC01NmUxNmI3Mjc1NDAiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7/7gAOQWRvYmUAZMAAAAAB/9sAhAAGBAQEBQQGBQUGCQYFBgkLCAYGCAsMCgoLCgoMEAwMDAwMDBAMDg8QDw4MExMUFBMTHBsbGxwfHx8fHx8fHx8fAQcHBw0MDRgQEBgaFREVGh8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx//wAARCABkAu4DAREAAhEBAxEB/8QAfQABAQEBAQEBAAAAAAAAAAAAAAECAwQFBgEBAQEBAQEBAQAAAAAAAAAAAAECAwQFBgcQAQEAAgEDAwMDBQEBAAAAAAABAgMRITESQTIEUWFxobHBgSJCUgVyExEBAQEBAAICAgMAAwAAAAAAAAECEUEDITFhsVFxEvCBkf/aAAwDAQACEQMRAD8A/PPyb+0gAAAArNvKqAgAAoogAgC448/gtOtsoCAJasjUjLSgPpfC0Y44zZl1zvafRw3fDze3Xzx65WHFZRGgef5fzJpnjj1239Gs5636/X3+ny7bbbbzb3rq9SAAAAAAAAAAAAAAAAAAAAAA+x/y/wDl9t++ffDC/vXHe/EeT3+/xH13F5AAHl+f8/X8XX/tty9mH837N5z109Xqur+H53bt2bdl2bL5ZZd69EnH0c5knIwqgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApyHE5qqcdERRAAAAVm1VAAAQAAUUQFk5/CI2iAgCWrI1Iiqij0atXjxbOc72n0ZtY1p9DXj44TH6d3GvLq9rcqI1KiOHyvlzTPHHrsv6NZz1vGO/0+bbbbbebe9dXpQAAAAAAAAAAAAAAAAAAAAAH1/wDmf82dN++ffXrv71x3vxHl93u8R9iVxeMAB5fn/P1/F1/7bcvZh/N+zec9dPV6rq/h+d27dm3Zdmy+WWXevRJx9HOZJyMKoAAAAAAAAAAAAADnnuxl4nWtTLUy1MrMfLPp9k5/Bz+E17Ms+enE+q2cLONyy9urKAgAAAAAAAAAAAAAAKlqqgNSIgAIAACoAqoAAACAACrJyJa0iAgCWrI1IiqA76tXjxb7r2iWsWvXq1+PW+79nK1w1rrtKywojj8j5U1Txx67L+jUz1vGO/0+fbbbbebe9dHoQAAAAAAAAAAAAAAAAAAAAAH0/wDn/Bk43bp98ML+9ct68R5/b7fEfVxycnk46SozW5UR5fn/AD9fxdf+23L2Yfzfs3nPXT1eq6v4fndu3Zt2XZsvlll3r0ScfRzmScjCqAAAAAAAAAAAAAA5bs7P7Z3vdrMbzDDCYTzz7+kW3vxC3qSZbcub0xi/S/Rs2f4YfjoknmknmtYSa8ecr39Et6l+XRlkEAAAAAAAAAAAAAS1VQVqREATnqoqIACoAoACoAAACAsnINIgIAWrI1IyqgO2vX49b7vSJaxa9WvDx633fs52uOtddWWVlEc/kfJmueOPXO/osnWsY68Ftt5vW3vXR3QAAAAAAAAAAAAAAAAAAAAAHt+H8aczZsn/AJx/msa04+zfiPo45OTz2OuOSMWOuOSM2OXzPna/i6+b/dsy9mH837LnPWvX6rq/h+f27dm3Zdmy+WWXevRJx9DOZJyMKoAAAAAAAAAAAAAADHjMcrsz/o13w13wxJlty5vTGNfTX0bNn+GH46JJ5pJ5q44Y68fLLv6Qt6lvWJMtuXN7L9L9PROOOjmwCAAAAAAAAAAAAF7CsqrUiIAlvKqgNIyCgIAoAACoAABJyDSICAFqrEVQHXXhx1vu9IlrNr0a8PHre7na5WukqMtSojnv+RNc4x99/RZGs568Vtt5vW3vXR2QAAAAAAAAAAAAAAAAAAAAAHfRrnPll/SM2sar2Y5sONjrjkjNjtjkyxYz8j5mHx9fN/uzvsw/m/ZZnq49f+q+Nt27Nuy7Nl8ssu9dpOPZnMk5GFUAAAAAAAAAAAAAAAByywyz2dfbG5eRuXkTZs/ww/HQk81ZPNXHHHXj5Zd/SFvUt6xJlty5vZfpfprZsmM8MP61JO/NSTvzXXCcYyfRis1RAAAAAAAAAAAAEvdViyIAJbyqknILwiAAAAIAoAACoCycgqICAFFRVAdcMOOt7+kS1m12wx463uza52ukqMqiMbd/hOJ7/wBlkaznryW23m923VAAAAAAAAAAAAAAAAAAAAAAaxk55qFdsckYsdcckYsdscmWLF2/Jx04c98r7cSZ6Zx183Zsz2Z3PO85XvXSR6ZOMqAAAAAAAAAAAAAAAAAJsmVxsxvFWLHPHHHXj5Ze70jVvWresSZbcub2X6X6a2bJhPDD+tSTvzSTvzU067b5Xt6LrRqu7m5gAAAAAAAAAAAAHHUUBLeVUk5BUQ56gAAAAAgCgABwgoAgAKiqA6YYcdb3Rm11xnHX1ZtYtbRleQZ27fCcT3fsSLM9ea2283u26IAAAAAAAAAAAAAAAAAAAAAACyg3jkiOmOSM2N5bphOe99InGZnrzZZZZZXLK82tOsnGVAAAAAAAAAAAAAAAAAAAEywxy7xZeLLw8ZMfGdDp1nHVhOvHN+5dVbqtoyAAAAAAAAAAAAAACpbyqknIKiJaCKrSIAAAAAgChwgoAgAKigK3jjx1vdGbXTGcflGa2jKyoM7NvjOJ7v2WRZOuFvPWtNoAAAAAAAAAAAAAAAAAAAAAAAACyg158RE4zbbeaqoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACXuLCTlVVES0EVV46AqMgoAAAACcAoAgAKKANYzj8olbiI1KjKgzns8ek7nCRyabQAAAAAAAAAAAAHq16cZjOZLss5vPtwn1rjrV/6/bndf+Jlq13GWSzHth/tnfr+Cavf+fBLXnyxuOVxvSzpXWXrpKigAAAAAAAAACggAAAAAAAAAAAAAAAAPTr14eE6eVy73636T6SetcdavWLb1jdhjJMpx1+na/ifSNYvhc1xdGgAAAAAAAAAAAAAAAAAAACzkUBLQRVWREUAQAFAAAAABAAUABZAaiMtACGWfHbucJHNWkAAAAAAAAAAAAAB68bjdctl8OemH+WeX3+zhfv8AP6cr9tyZ3O9Z/wDXj+7L0wn0jPxz8ftP1+3j2ePnfH289LXoz9fLtPplQAAAAAAAAAAAAAAAAAAAAAAAAAAAB2w3YzHjL6cfmek+0c7j+Gbk3bccp449efdl2547ST0kMZ4Zy4ujQAAAAAAAAAAAAAAAAAAAACWioqrIiKCc9QUQAAFAAABAAAAUgNQRUQAuXH5DjKqgAAAAAAAAAAAAAANYbM8LzjeL9UuZfss6t25+Hhzxj6yev5T/ADO9T/MYaUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAs5FST6goJaogrSMgAAAoAIAAAAAsAQUC0RFVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALyKyqrx0RFEAAAAAAAAAAAAVAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUEf/9k=');
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		width: 100%;
-		height: 100rpx;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-	}
-	.product-con .coupon {
-		padding: 0;
-	}
-	.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;
-	}
-
-	.product-con .wrapper {
-		padding: 32rpx 32rpx 0;
-		width: 100%;
-		box-sizing: border-box;
-	}
-
-	.product-con .price_text {
-		display: inline-block;
-		width: 90rpx;
-		height: 30rpx;
-		background: url(~pages/activity/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 .attribute .atterTxt {
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		display: inline;
-		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-con .guaranteeAttr{
-		display: inline-block;
-		width: 560rpx;
-		overflow: hidden;white-space: nowrap;text-overflow: ellipsis;
-	}
-	.product-con .wrapper .introduce {
-		margin: 0;
-		padding-right: 40rpx;
-		position: relative;
-		margin-top: 20rpx;
-
-		.icon-fenxiang {
-			position: absolute;
-			top: 0;
-			right: 0;
-		}
-	}
-
-	.product-con .wrapper .introduce .infor {
-		width: 570rpx;
-	}
-
-	.product-con .wrapper .introduce .iconfont {
-		font-size: 37rpx;
-		color: #515151;
-	}
-
-	.product-con .wrapper .label {
-		margin: 18rpx 0 0 0;
-		font-size: 24rpx;
-		color: #82848f;
-	}
-
-	.product-con .wrapper .label .stock {
-		width: 255rpx;
-		margin-right: 28rpx;
-	}
-
-	.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: var(--view-theme);
-				&::after {
-					background: var(--view-theme);
-					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;
-				}
-			}
-		}
-	}
-	.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 {
-		/* #ifdef H5 */
-		flex: 50%;
-		/* #endif */
-		/* #ifndef H5 */
-		flex: 33.33%;
-		/* #endif */
-		text-align: center;
-		font-size: 30rpx;
-		&.item3{
-			flex: 33.33%;
-		}
-	}
-
-	.generate-posters .item .iconfont {
-		font-size: 80rpx;
-		color: #5eae72;
-	}
-
-	.generate-posters .item .iconfont.icon-haibao {
-		color: #5391f1;
-	}
-	.generate-posters .item .iconfont.icon-fuzhikouling1 {
-		color: #FBB324;
-	}
-	.product-con .mask {
-		z-index: 88;
-	}
-
-	.footer_count {
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		background-color: #fff;
-		z-index: 277;
-
-		.presell_desc {
-			height: 60rpx;
-			line-height: 60rpx;
-			background: #FFF7E5;
-			color: #FF7F00;
-			font-size: 22rpx;
-			padding: 0 30rpx;
-		}
-	}
-
-	.product-con .footer {
-		height: 100rpx;
-		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-		padding: 0 30rpx 0 72rpx;
-		box-sizing: border-box;
-		border-top: 1px solid #f0f0f0;
-
-		&.noborder {
-			border-top: none;
-		}
-	}
-
-
-	.product-con .footer .item {
-		font-size: 18rpx;
-		color: #666;
-		text-align: center;
-	}
-
-	.product-con .footer .item .iconfont {
-		text-align: center;
-		font-size: 40rpx;
-	}
-
-	.product-con .footer .item .iconfont.icon-shoucang1 {
-		color: var(--view-priceColor);
-	}
-
-	.product-con .footer .item .iconfont.icon-gouwuche1 {
-		font-size: 40rpx;
-		position: relative;
-	}
-
-	.product-con .footer .item .iconfont.icon-gouwuche1 .num {
-		color: #fff;
-		position: absolute;
-		font-size: 18rpx;
-		padding: 2rpx 8rpx 3rpx;
-		border-radius: 200rpx;
-		top: -10rpx;
-		right: -10rpx;
-	}
-
-	.product-con .footer .bnt {
-		width: 444rpx;
-		height: 76rpx;
-	}
-
-	.product-con .footer .bnt .bnts {
-		width: 444rpx;
-		text-align: center;
-		line-height: 76rpx;
-		color: #fff;
-		font-size: 28rpx;
-	}
-
-	.product-con .footer .bnt .joinCart {
-		border-radius: 50rpx 0 0 50rpx;
-		background-image: linear-gradient(to right, #fea10f 0%, #fa8013 100%);
-	}
-
-	.product-con .footer .bnt .buy {
-		border-radius: 50rpx;
-		background-image: linear-gradient(to right, #FDA923 0%, #FD6523 100%);
-	}
-
-	.product-con .footer .bnt .joinCart[disabled] {
-		background: #bbb;
-	}
-
-	.product-con .footer .bnt .buy[disabled] {
-		background: #bbb;
-	}
-
-	.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: 600rpx;
-		height: 897rpx;
-		position: fixed;
-		left: 50%;
-		transform: translateX(-50%);
-		z-index: 399;
-		top: 50%;
-		margin-top: -500rpx;
-	}
-
-	.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%;
-		border-radius: 43rpx;
-		margin-top: 20rpx;
-	}
-
-	.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;
-	}
-	.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-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor21) 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: var(--view-priceColor);
-					}
-				}
-			}
-		}
-		.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: 15rpx;
-					/deep/image,/deep/uni-image,/deep/.easy-loadimage {
-						width: 206rpx;
-						height: 206rpx;
-						border-radius: 16rpx;
-					}
-					.txt {
-						.title {
-							font-size: 28rpx;
-							color: #282828;
-						}
-						.price {
-							color: var(--view-priceColor);
-							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;
-			}
-		}
-	}
-	.icon-zhuyi-copy {
-		display: inline-block;
-		margin-right: 5rpx;
-		position: relative;
-		top: 3rpx;
-	}
-	.atmosphere {
-		&.money {
-			height: 100rpx;
-			padding-left: 24rpx;
-			margin: 0 -32rpx;
-			background: center/cover no-repeat;
-			font-weight: 800;
-			font-size: 28rpx;
-			line-height: 100rpx;
-			color: #FFFFFF;	
-			.num {
-				font-size: 48rpx;
-			}
-		}	
-		&.share {
-			align-items: flex-start;
-			padding: 20rpx 0 0 !important;		
-			.introduce {
-				flex: 1;
-				margin-top: 0;
-			}
-		}
-	}
-</style>
diff --git a/pages/activity/rank/index.vue b/pages/activity/rank/index.vue
deleted file mode 100644
index a06ba34..0000000
--- a/pages/activity/rank/index.vue
+++ /dev/null
@@ -1,322 +0,0 @@
-<template>
-	<view class="content">
-		<view class="rank_header" :style="{ 'background-image': `url(${domain}/static/images/rank_header.png)`}">
-			<view class="cate_name">
-				<text class="name line1">
-					<text class="title_icon icon_left" :style="{ 'background-image': `url(${domain}/static/images/rank-title.png)`}"></text>
-					{{(active == 0 || !cate_name) ? '热销TOP总榜单' : `${cate_name}热卖榜`}}
-					<text class="title_icon icon_right" :style="{ 'background-image': `url(${domain}/static/images/rank-title.png)`}"></text>
-				</text>
-			</view>
-			<view class="scroll_box">
-				<scroll-view scroll-x="true" style="white-space: nowrap; vertical-align: middle;" show-scrollbar="false" :scroll-into-view="scrollInto">
-					<view class="scroll_item" v-for="(item,index) in categoryList" :key="item.store_category_id" :id="`cate${item.store_category_id}`"
-						@click="checkActive(index,item)"
-						:class="active == item.store_category_id ? 'scroll_item_active' : ''">{{item.cate_name}}
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-		<view class="rank_list pad30">
-			<view class='item acea-row' v-for="(item,index) in spuTopList" :key="item.spu_id" @click="godDetail(item)">
-				<view class="rank" :class="'rank'+index"
-				:style="{'color': index<3 ? '#CE8F21' : '#986561'}">
-				{{index < 9 ? '0'+(index+1) : index+1}}
-				</view>
-				<view class='pictrue on'>
-					<image :src='item.image' class="on"></image>
-				</view>
-				<view class='goods-msg pad16 acea-row row-column row-between'>
-					<text class="name line2">{{item.store_name}}</text>
-					<view v-if="item.sales>0" class="list"><text class="iconfont icon-goumai"></text>{{item.sales>10000 ? (item.sales/10000)+'万' : item.sales}}人买过</view>
-					<view class="mt-18 acea-row row-bottom">
-						<BaseMoney :money="item.price" symbolSize="26" integerSize="36" decimalSize="28"
-							incolor="E93323" weight />
-						<BaseMoney :money="item.ot_price" symbolSize="22" integerSize="22" decimalSize="22"
-							incolor="999999" class="ml-16" line />
-					</view>
-				</view>
-			</view>
-		</view>
-		<!--  -->
-	</view>
-</template>
-
-<script>
-	import { spuTop,spuTopList } from '@/api/activity.js';
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	export default {
-		data() {
-			return {
-				categoryList: [{
-					store_category_id: 0,
-					cate_name: '总榜'
-				}],
-				cate_name: "",
-				spuTopList: [],
-				active: 0,
-				pro_top_banner: 'https://zhongbang-1257983696.cos.ap-beijing.myqcloud.com/uploads/def/20220801/383c0026840f70a9b4e33a43c6bd3341.png',
-				scrollInto: '',
-				domain: HTTP_REQUEST_URL,
-			}
-		},
-		onLoad(option) {
-			this.spuTop(option.cate_id || 0)
-		},
-		methods: {
-			spuTop(cate_id) {
-				spuTop().then(res => {
-					this.categoryList = [...this.categoryList, ...res.data]
-					this.cate_name = this.getCate(cate_id,this.categoryList) || ''
-					this.$nextTick(() => {
-						this.getSpuTopList(cate_id)
-						this.active = cate_id && this.cate_name ? cate_id : 0
-						this.scrollInto = `cate${cate_id}`;
-					});
-				})
-			},
-			getSpuTopList(cate_id) {
-				cate_id = this.cate_name ? cate_id : 0
-				spuTopList({
-					cate_pid: cate_id
-				}).then(res => {
-					this.spuTopList = res.data[0]['list']
-				})
-			},
-			checkActive(index, item) {
-				this.active = item.store_category_id;
-				this.cate_name = item.cate_name
-				this.spuTopList = [];
-				this.getSpuTopList(item.store_category_id)
-			},
-			// 去商品详情页
-			godDetail(item) {
-				uni.navigateTo({
-					url: "/pages/goods_details/index?id=" + item.product_id
-				})
-			},
-			// 获取第一次进来的默认分类名称
-			getCate(id,arr){
-				for (let i = 0; i < arr.length; i++) {
-					if (arr[i].store_category_id == id) {
-						return arr[i]['cate_name']
-					}
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.content{
-		background: #171717;
-		min-height: 100vh;
-	}
-	.rank_header {
-		background-size: cover;
-		height: 270rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
-		display: block;
-		z-index: 9999;
-		background-color: #171717;
-		.cate_name{
-			text-align: center;
-			position: relative;
-			top: 80rpx;
-			.name{
-				color: #FFE9BE;
-				font-weight: bold;
-				font-size: 44rpx;
-				padding: 0 64rpx;
-				position: relative;
-				display: inline-block;
-				.title_icon{
-					content: "";
-					display: inline-block;
-					width: 38rpx;
-					height: 58rpx;
-					background-repeat: no-repeat;
-					background-size: 100% 100%;
-					position: absolute;
-					top: 0;
-					&.icon_left{
-						left: 0;
-					}
-					&.icon_right{
-						right: 0;
-						transform: rotateY(180deg);
-					}
-				}	
-			}
-		}
-	}
-	.header {
-		position: relative;
-		z-index: 6;
-		display: flex;
-		align-items: center;
-		padding-right: 34rpx;
-		height: 43px;
-		padding-left: 33rpx;
-		.head-menu {
-			display: -webkit-box;
-			display: -webkit-flex;
-			display: flex;
-			-webkit-box-align: center;
-			-webkit-align-items: center;
-			align-items: center;
-			height: 27px;
-			width: 70px;
-			border-radius: 13px;
-			.icon-xiangzuo {
-				font-size: 32rpx;
-				color: #FFFFFF;
-			}
-			.iconfont {
-				-webkit-box-flex: 1;
-				-webkit-flex: 1;
-				flex: 1;
-				text-align: center;
-				color: #fff;
-				box-sizing: border-box;
-				&.icon-xiangzuo {
-					border-right: 1px solid #fff;
-				}
-			}
-		}
-	}
-	.head-menu {
-		display: flex;
-		align-items: center;
-		height: 54rpx;
-		width: 140rpx;
-		background: transparent;
-		border: 1px solid rgba(151, 151, 151, 0.2);
-		border-radius: 27rpx;
-		position: relative;
-		z-index: 9999;
-		&:after {
-			content: '';
-			position: absolute;
-			width: 1px;
-			height: 26rpx;
-			background-color: #EAEAEA;
-			left: 50%;
-			top: 50%;
-			transform: translate(-50%, -50%);
-		}
-		.iconfont {
-			flex: 1;
-			text-align: center;
-			color: #fff;
-			box-sizing: border-box;
-		}
-	}
-	.scroll_box {
-		width: 750rpx;
-		line-height: 50rpx;
-		padding-left: 32rpx;
-		margin-top: 140rpx;
-	}
-	.scroll_item {
-		display: inline-block;
-		font-size: 28rpx;
-		color: #6D6D6D;	
-		&:last-child {
-			margin-right: 40rpx;
-		}	
-	}
-	.scroll_item_active {
-		font-weight: 500;
-		position: relative;
-		text-align: center;
-		color: #fff;
-		&::after{
-			content: "";
-			display: block;
-			margin: 10rpx auto 0;
-			width: 80%;
-			height:4rpx;
-			border-radius: 2rpx;
-			background: #fff;
-		}
-	}
-	.scroll_item~.scroll_item {
-		margin-left: 40rpx;
-	}
-	.rank_list {
-		padding-top: 270rpx;
-		padding-bottom: 32rpx;
-		.item {
-			border-radius: 16rpx;
-			background: #fff;
-			margin-top: 30rpx;
-			padding: 28rpx 30rpx 32rpx;
-			position: relative;
-			.rank {
-				position: absolute;
-				top: 0;
-				left: 20rpx;
-				width: 50rpx;
-				height: 61rpx;
-				display: flex;
-				justify-content: center;
-				line-height: 61rpx;
-				font-size: 30rpx;
-				z-index: 10;
-				background-size: 100% 100%;
-				background-image: url('@/pages/activity/static/images/rank_num.png');
-				font-family: '黑体';
-				font-weight: bold;
-				&.rank0,&.rank1,&.rank2{
-					background-image: url('@/pages/activity/static/images/rank.png');
-				}
-			}
-			.name {
-				width: 382rpx;
-				height: 76rpx;
-				line-height: 38rpx;
-				color: #282828;
-				font-weight: 500;
-				font-size: 32rpx;
-			}
-		}
-		.mt-18 {
-			margin-top: 18rpx;
-		}
-		.ot_price {
-			font-weight: 300;
-			color: #6D6D6D;
-			padding-left: 16rpx;
-		}
-		.goods-msg {
-			flex: 1;
-			margin-left: 20rpx;
-			.list{				
-				background: #FDF8EE;
-				border-radius: 6rpx;
-				line-height: 57rpx;				
-				color: #666666;
-				font-size: 26rpx;
-				padding: 0 12rpx;
-				.iconfont{
-					color: #FFB31C;
-					margin-right: 12rpx;
-				}
-			}
-		}
-		.pictrue {
-			width: 240rpx;
-			height: 240rpx;
-			position: relative;
-			flex: 1;
-			image {
-				width: 100%;
-				height: 100%;
-				border-radius: 12rpx 0 0 12rpx;
-			}
-		}
-	}
-</style>
diff --git a/pages/activity/static/images/no_product.png b/pages/activity/static/images/no_product.png
deleted file mode 100644
index 19a208d..0000000
Binary files a/pages/activity/static/images/no_product.png and /dev/null differ
diff --git a/pages/activity/static/images/poster-bag.png b/pages/activity/static/images/poster-bag.png
deleted file mode 100644
index c988305..0000000
Binary files a/pages/activity/static/images/poster-bag.png and /dev/null differ
diff --git a/pages/activity/static/images/presell_text.png b/pages/activity/static/images/presell_text.png
deleted file mode 100644
index 561710f..0000000
Binary files a/pages/activity/static/images/presell_text.png and /dev/null differ
diff --git a/pages/activity/static/images/rank.png b/pages/activity/static/images/rank.png
deleted file mode 100644
index 4aaef2a..0000000
Binary files a/pages/activity/static/images/rank.png and /dev/null differ
diff --git a/pages/activity/static/images/rank_cate.png b/pages/activity/static/images/rank_cate.png
deleted file mode 100644
index fb2af94..0000000
Binary files a/pages/activity/static/images/rank_cate.png and /dev/null differ
diff --git a/pages/activity/static/images/rank_num.png b/pages/activity/static/images/rank_num.png
deleted file mode 100644
index 0d98a69..0000000
Binary files a/pages/activity/static/images/rank_num.png and /dev/null differ
diff --git a/pages/activity/static/images/vacancy.png b/pages/activity/static/images/vacancy.png
deleted file mode 100644
index fef8aff..0000000
Binary files a/pages/activity/static/images/vacancy.png and /dev/null differ
diff --git a/pages/activity/topic/index.vue b/pages/activity/topic/index.vue
deleted file mode 100644
index 9b137f2..0000000
--- a/pages/activity/topic/index.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-<template>
-	<view :style="viewColor" class="page-container">
-		<view class='flash-sale'>
-			<view class='header'>
-				<image mode="widthFix" class="presellBg" :src="`${domain}/static/images/topic_bg.jpg`" alt="">	
-			</view>
-			<view class="main_count">	
-				<block v-if="topicList.length>0">
-					<navigator v-for="(item,index) in topicList" :key='index' :url="`/pages/activity/topic_detail/index?id=${item.group_data_id}`" hover-class="none">
-						<view class='list'>
-							<image :src="item.pic" class="picture"></image>
-						</view>
-					</navigator>
-				</block>				
-				<block v-else>
-					<view class='empty-box' v-cloak>
-						<image src='../../store/static/images/no-topic.png'></image>
-						<view class="txt">暂无活动专场哦~</view>
-					</view>
-				</block>
-			</view>
-		</view>		
-		<home></home>
-		<!-- #ifndef H5 -->
-		<passwordPopup></passwordPopup>
-		<!-- #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>
-	// +----------------------------------------------------------------------
-	import { getTopicList } from '../../../api/activity.js';
-	import home from '@/components/home/index.vue'
-	import emptyPage from '@/components/emptyPage.vue'
-	import { mapGetters } from "vuex";
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	// #ifndef H5
-	import passwordPopup from '@/components/passwordPopup';
-	// #endif
-	export default {
-		components: {
-			// #ifndef H5
-			passwordPopup,
-			// #endif
-			home,
-			emptyPage
-		},
-		computed: mapGetters(['viewColor']),
-		data() {
-			return {
-				domain: HTTP_REQUEST_URL,
-				topicList: [],				
-				page: 1,
-				limit: 30,
-				loading: false,
-				loadend: false,
-				pageloading: false,
-			}
-		},
-		
-		onLoad() {
-			this.getTopicList();
-		},
-		methods: {			
-			getTopicList: function() {
-				var that = this;
-				var data = {
-					page: that.page,
-					limit: that.limit,
-				};
-				if (that.loadend) return;
-				if (that.pageloading) return;
-				this.pageloading = true
-				getTopicList(0,data).then(res => {
-					var topicList = res.data;
-					var loadend = topicList.length < that.limit;
-					that.page++;
-					that.topicList = that.topicList.concat(topicList),
-						that.page = that.page;
-					that.pageloading = false;
-					that.loadend = loadend;
-				}).catch(err => {
-					that.pageloading = false
-				});
-			}
-		},
-		/**
-		 * 页面上拉触底事件的处理函数
-		 */
-		onReachBottom: function() {
-			this.getTopicList();
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.page-container{
-		min-height: 100vh;
-		background-color: #ff5348;
-	}
-	.flash-sale{
-		.header{
-			width: 100%;
-			position: relative;
-			.presellBg{
-				width: 750rpx;
-			}
-		}
-		.main_count{
-			position: relative;
-			top: -90rpx;
-			background-color: #fff;
-			margin: 0 20rpx;
-			border-radius: 16rpx;
-			padding: 20rpx;
-			.list{
-				width: 100%;
-				height: 280rpx;
-				margin-bottom: 30rpx;
-				position: relative;
-				.picture{
-					width: 100%;
-					height: 280rpx;
-					border-radius: 16rpx;
-				}
-			}
-		}
-		.empty-box{
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			margin: 80rpx 0 120rpx 0;
-			image{
-				width: 414rpx;
-				height: 240rpx;
-			}
-			.txt{
-				font-size: 26rpx;
-				color: #999;
-			}
-		}
-	}
-
-</style>
diff --git a/pages/activity/topic_detail/index.vue b/pages/activity/topic_detail/index.vue
deleted file mode 100644
index 6807ee1..0000000
--- a/pages/activity/topic_detail/index.vue
+++ /dev/null
@@ -1,455 +0,0 @@
-<template>
-	<view :style="viewColor" class="page-container">
-		<view class='topic-home' :style="'background-color: '+bgColor+''">
-			<!-- #ifdef H5 -->
-			<view class="header">
-				<view class="head-menu">
-					<view class="iconfont icon-xiangzuo" @click="goback"></view>
-					<view v-if="merchant" class="iconfont merchant" @click="goStore(topicData.group_mer_id)">
-						<image class="icon_merchant" :src="merchant.mer_avatar"></image>
-					</view>
-					<view v-else class="iconfont icon-shouye4" @click="goHome"></view>
-				</view>
-			</view>
-			<!-- #endif -->
-			<view class="main_count">
-				<view class="topic_image">
-					<image :src="topicData.image" class="picture" mode="widthFix"></image>
-				</view>
-				<view class="main">
-					<!-- 轮播 -->
-					<view class="slider-wrapper" v-if="imgUrls.length>0">
-						<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval" :duration="duration"
-						 indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
-							<block v-for="(item,index) in imgUrls" :key="index">
-								<swiper-item>
-									<view class='slide-navigator acea-row row-between-wrapper'>
-										<image :src="item" class="slide-image"></image>
-									</view>
-								</swiper-item>
-							</block>
-						</swiper>
-					</view>
-					<!--商品-->
-					<view class="product_list" :class="['theme'+theme, {'acea-row row-between-wrapper': (theme == 2 || theme == '')}]">
-						<view class='item' v-for="(item,index) in activety_goods" :key="index" hover-class='none' @tap="goDetail(item)">
-							<view class='pictrue'>
-								<!-- <image class="image" :src='item.image'></image> -->
-								<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
-							</view>
-							<view class="text">
-								<view class='name line2'>
-									{{item.store_name}}
-								</view>
-								<view class="acea-row row-middle">
-									<view class='money'>￥<text class='num'>{{item.price}}</text></view>
-								</view>
-								<view v-if="theme != 1" class="score">{{item.rate}}评分 {{item.reply_count}}条评论</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<home></home>
-		<!-- #ifndef H5 -->
-		<passwordPopup></passwordPopup>
-		<!-- #endif -->
-      <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-	</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>
-	// +----------------------------------------------------------------------
-	import {mapGetters} from "vuex";
-	import {getTopicDetail,getTopicProLst,initiateAssistApi } from '../../../api/activity.js';
-	import { goShopDetail } from '@/libs/order.js'
-	import home from '@/components/home/index.vue'
-	// #ifndef H5
-	import passwordPopup from '@/components/passwordPopup';
-	// #endif
-	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-    import authorize from '@/components/Authorize';
-	const app = getApp();
-	export default {
-		computed: mapGetters(['isLogin','uid','viewColor']),
-		components: {
-			// #ifndef H5
-			passwordPopup,
-			// #endif
-			home,
-			easyLoadimage,
-            authorize
-		},
-		data() {
-			return {
-				group_id: '',
-				systemInfo: app.globalData.statusBarHeight,
-				bgColor: '',
-				activety_goods: [],
-				page: 1,
-				limit: 30,
-				loading: false,
-				loadend: false,
-				pageloading: false,
-				autoplay: true,
-				circular: true,
-				interval: 3000,
-				duration: 500,
-				theme: 1,
-				topicData: {},
-				imgUrls: [],
-				label_id: '',
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false ,//是否隐藏授权
-				merchant: {}
-			}
-		},
-
-		onLoad(options) {
-			this.group_id = options.id
-			this.getTopicDetail();
-
-		},
-		methods: {
-			/**
-			 * 授权回调
-			 */
-			onLoadFun: function() {
-					this.isShowAuth = false;
-					this.getTopicDetail();
-			},
-			// 授权关闭
-			authColse: function(e) {
-					this.isShowAuth = e
-			},
-			goback: function() {
-				uni.navigateBack();
-			},
-			// 首页
-			goHome() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-			},
-			// 进入商户首页
-			goStore(id){
-				uni.navigateTo({
-					url: `/pages/store/home/index?id=${id}`
-				})
-			},
-			getTopicDetail(){
-				let that = this;
-				getTopicDetail(that.group_id).then(res => {
-					that.$set(that, 'topicData', res.data)
-					that.$set(that, 'theme', res.data.type)
-					that.$set(that, 'bgColor', res.data.color)
-					that.$set(that, 'imgUrls', res.data.banner)
-					that.$set(that, 'label_id', res.data.label_id)
-					that.$set(that, 'merchant', res.data.merchant)
-					that.getProList()
-				})
-				.catch(err => {});
-			},
-			getProList: function() {
-				var that = this;
-				var data = {
-					page: that.page,
-					limit: that.limit,
-					labels: that.label_id,
-					mer_id: that.topicData.group_mer_id
-				};
-				if (that.loadend) return;
-				if (that.pageloading) return;
-				this.pageloading = true
-				getTopicProLst(data).then(res => {
-					// console.log(res);
-					var activety_goods = res.data.list;
-					var loadend = activety_goods.length < that.limit;
-					that.page++;
-					that.activety_goods = that.activety_goods.concat(activety_goods),
-						that.page = that.page;
-					that.pageloading = false;
-					that.loadend = loadend;
-				}).catch(err => {
-					that.pageloading = false
-				});
-			},
-			goDetail(item) {
-				goShopDetail(item, this.uid).then(res => {
-				if (this.isLogin) {
-						initiateAssistApi(item.activity_id).then(res => {
-							let id = res.data.product_assist_set_id;
-							uni.hideLoading();
-							uni.navigateTo({
-								url: '/pages/activity/assist_detail/index?id=' + id
-							});
-						}).catch((err) => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})
-						});
-					} else {
-						this.isAuto = true;
-						this.isShowAuth = true
-					}
-				})
-			}
-		},
-		/**
-		 * 页面上拉触底事件的处理函数
-		 */
-		onReachBottom: function() {
-			this.getProList()
-		},
-		// 滚动监听
-		onPageScroll(e) {
-			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-			uni.$emit('scroll');
-		}
-	}
-</script>
-
-<style lang="scss">
-	.header {
-		position: absolute;
-		z-index: 6;
-		display: flex;
-		align-items: center;
-		padding-right: 34rpx;
-		height: 43px;
-		padding-left: 33rpx;
-		.head-menu {
-			display: -webkit-box;
-			display: -webkit-flex;
-			display: flex;
-			-webkit-box-align: center;
-			-webkit-align-items: center;
-			align-items: center;
-			height: 27px;
-			width: 70px;
-			background: rgba(0, 0, 0, 0.3);
-			border-radius: 13px;
-			.icon-xiangzuo {
-				font-size: 32rpx;
-				color: #FFFFFF;
-			}
-			.iconfont {
-				-webkit-box-flex: 1;
-				-webkit-flex: 1;
-				flex: 1;
-				text-align: center;
-				color: #fff;
-				box-sizing: border-box;
-				&.icon-xiangzuo {
-					border-right: 1px solid #fff;
-				}
-			}
-			.merchant{
-				width: 36rpx;
-				height: 36rpx;
-				.icon_merchant{
-					width: 36rpx;
-					height: 36rpx;
-					border-radius: 100%;
-				}
-			}
-
-		}
-	}
-	.topic-home{
-		position: relative;
-		min-height: 100vh;
-		padding-bottom: 30rpx;
-		.topic_image{
-			line-height: 0;
-			.picture{
-				width: 750rpx;
-			}
-		}
-	}
-	.main_count{
-		.main{
-			padding: 0 20rpx;
-		}
-		.slider-wrapper{
-			width: 710rpx;
-			height: 250rpx;
-			margin: 40rpx 0;
-			uni-swiper{
-				height: 250rpx;
-			}
-			.slide-image{
-				width: 710rpx;
-				height: 250rpx;
-				border-radius: 16rpx;
-			}
-		}
-		.product_list{
-			.item{
-				background-color: #fff;
-			}
-			.image {
-				width: 100%;
-				height: 100%;
-				border-radius: 20rpx 20rpx 0 0;
-			}
-			.text{
-				color: #222222;
-			}
-			.money {
-				display: flex;
-				align-items: center;
-				font-size: 26rpx;
-				font-weight: bold;
-				margin-top: 8rpx;
-				color: var(--view-priceColor);
-			}
-			.score {
-				margin-top: 10rpx;
-				color: #737373;
-				font-size: 20rpx;
-			}
-			&.theme2,&.theme{
-				.item{
-					position: relative;
-					width: 345rpx;
-					margin-bottom: 20rpx;
-					border-radius: 20rpx;
-					.pictrue {
-						position: relative;
-						width: 100%;
-						height: 345rpx;
-					}
-					/deep/image,/deep/.easy-loadimage,uni-image{
-						height: 345rpx;
-					}
-					.text {
-						padding: 20rpx 17rpx 26rpx 17rpx;
-					}
-					.name{
-						font-size: 13px;
-						color: #282828;
-						margin: 11px 0 5px 0;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						-webkit-line-clamp: 2;
-						-webkit-box-orient: vertical;
-						
-					}
-				}
-			}
-			&.theme1{
-				.item{
-					display: inline-block;
-					width: 225rpx;
-					margin: 0 19rpx 16rpx 0;
-					border-radius: 10rpx;
-					&:nth-child(3n){
-						margin-right: 0;
-					}
-				}
-				.pictrue {
-					position: relative;
-					width: 100%;
-					height: 226rpx;
-					.image{
-						border-radius: 10rpx 10rpx 0 0;
-					}
-				}
-				/deep/image,/deep/.easy-loadimage,uni-image{
-					width: 100%;
-					height: 226rpx;
-					border-radius: 10rpx 10rpx 0 0;
-				}
-				.text{
-					padding: 12rpx 14rpx 16rpx;
-					.name{
-						font-size: 13px;
-						color: #282828;
-						margin: 11px 0 5px 0;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						-webkit-line-clamp: 2;
-						-webkit-box-orient: vertical;
-					}
-					.money {
-						font-size: 22rpx;
-					}
-				}
-			}
-			&.theme2{
-				display: flex;
-				justify-content: space-around;
-				flex-wrap: wrap;
-				.pictrue,/deep/image,/deep/.easy-loadimage,uni-image{
-					border-radius: 20rpx 20rpx 0 0;
-				}
-			}
-			&.theme3{
-				.item{
-					width: 710rpx;
-					border-radius: 20rpx;
-					margin-bottom: 30rpx;
-				}
-				.num{
-					font-family: 'PingFangSC-Semibold';
-					font-size: 32rpx;
-				}
-				.pictrue {
-					position: relative;
-					width: 710rpx;
-					height: 710rpx;
-					.image{
-						border-radius: 20rpx 20rpx 0 0;
-					}
-
-				}
-				/deep/image,/deep/.easy-loadimage,uni-image{
-					width: 710rpx;
-					height: 710rpx;
-					max-height: 710rpx;
-					border-radius: 20rpx 20rpx 0 0;
-				}
-				.text{
-					padding: 24rpx 30rpx 34rpx;
-					position: relative;
-					.name{
-						color: #222222;
-						font-size: 34rpx;
-						margin-bottom: 16rpx;
-						overflow:hidden;
-						text-overflow: ellipsis; 
-						display: -webkit-box; 
-						-webkit-line-clamp: 2; 
-						-webkit-box-orient: vertical;
-					}
-					.money{
-						font-size: 22rpx;
-						font-family: 'PingFangSC-Semibold';
-						font-weight: bold;
-					}
-					.score{
-						color: #737373;
-						display: inline-block;
-						float: right;
-						position: relative;
-						top: -34rpx;
-						margin-top: 0;
-					}
-				}
-			}
-		}
-	}
-</style>
diff --git a/pages/admin/goods_details/index.vue b/pages/admin/goods_details/index.vue
index 9fc4b31..f0c5d5f 100644
--- a/pages/admin/goods_details/index.vue
+++ b/pages/admin/goods_details/index.vue
@@ -761,7 +761,7 @@
     display: inline-block;
     width: 90rpx;
     height: 30rpx;
-    background: url(~pages/activity/static/images/presell_text.png);
+    background: url('@/static/images/presell_text.png');
     background-size: 100%;
     color: #FD6523;
     font-size: 22rpx;
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 399c417..7a44a64 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -291,6 +291,7 @@
 			this.where.status = option.types
 			this.current = "";
 			this.merId = option.merId;
+		
 			this.getIndex();
 		},
 		methods: {
@@ -329,7 +330,9 @@
 			// 获取数据
 			getIndex() {
 			
+			
 				let that = this;
+				console.log(that.merId)
 				if (that.loading || that.loaded) return;
 				that.loading = true;
 				if (that.where.status == 6) {
diff --git a/pages/index/component/hotRanking.vue b/pages/index/component/hotRanking.vue
index 9f60f14..c3a00b4 100644
--- a/pages/index/component/hotRanking.vue
+++ b/pages/index/component/hotRanking.vue
@@ -214,7 +214,7 @@
 					display: inline-block;
 					width: 22rpx;
 					height: 30rpx;
-					background-image: url('../../activity/static/images/rank_cate.png');
+					background-image: url('@/static/images/rank_cate.png');
 					background-repeat: no-repeat;
 					background-size: 100% 100%;
 					position: absolute;
@@ -263,7 +263,7 @@
 			font-weight: bold;
 			font-size: 32rpx;
 			color: #CE8F21;;
-			background-image: url('../../activity/static/images/rank.png');
+			background-image: url('@/static/images/rank.png');
 			background-size: cover;
 			font-family: '黑体';
 		}	
@@ -290,7 +290,7 @@
 			font-size: 16rpx;
 			font-weight: bold;
 			color: #CE8F21;;
-			background-image: url('../../activity/static/images/rank.png');
+			background-image: url('@/static/images/rank.png');
 			background-size: cover;
 			font-family: '黑体';
 		}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 71e3f50..0abc14f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -527,33 +527,33 @@
 					switch (item.type) {
 						case 1:
 							uni.navigateTo({
-								url: '/pages/admin/orderList/index?mer_id=' + this.userInfoData.service.mer_id +
+								url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id +
 									'&types=' + item.type
 							})
 							break;
 						case 2:
 
 							uni.navigateTo({
-								url: '/pages/admin/orderList/index?mer_id=' + this.userInfoData.service.mer_id +
+								url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id +
 									'&types=' + item.type
 							})
 							break;
 						case 3:
 							uni.navigateTo({
-								url: '/pages/admin/orderList/index?mer_id=' + this.userInfoData.service.mer_id +
+								url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id +
 									'&types=' + item.type
 							})
 							break;
 						case 4:
 							uni.navigateTo({
-								url: '/pages/admin/orderList/index?mer_id=' + this.userInfoData.service.mer_id +
+								url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id +
 									'&types=' + item.type
 
 							})
 							break;
 						case 6:
 							uni.navigateTo({
-								url: '/pages/admin/orderList/index?mer_id=' + this.userInfoData.service.mer_id +
+								url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id +
 									'&types=' + item.type
 
 							})
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 3334c48..421d4e0 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="gather">
-<!-- #ifdef MP || APP-PLUS -->
+		<!-- #ifdef MP || APP-PLUS -->
 
 		<view class="conten-top">
 			<view class="" style="position: absolute;left: 30rpx;" @click="logout"><i class="iconfont icon-xiangzuo"
@@ -85,7 +85,7 @@
 								<text class="text">保证缴纳金</text>
 							</view>
 
-							<!-- <view class="examine"
+							<view class="examine"
 								@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
 							<image class="icon_img" src="@/static/images/index13.png"  mode="aspectFit">
 								</image>
@@ -93,10 +93,10 @@
 							</view>
 							<view class="examine"
 								@click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
-							<image class="icon_img" src="@/static/images/index17png"  mode="aspectFit">
+							<image class="icon_img" src="@/static/images/index17.png"  mode="aspectFit">
 								</image>
 								<text class="text">委托订单</text>
-							</view> -->
+							</view>
 							<!-- <view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
 							<image class="icon_img"
 								src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png"  mode="aspectFit">
@@ -136,8 +136,7 @@
 								<view class="special_work-titleb" v-if='codenote[0].status==0'>交易申请状态：待审核</view>
 							</view>
 							<view class="content ">
-								<!-- 	<view class="examine"
-								
+									<view class="examine"
 								
 									@click="navigator(`/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
 									
@@ -148,7 +147,7 @@
 									@click="navigator('/pages/users/order_list/indexCopy?status=-1&product_type=98')">
 										<image class="icon_img" src="@/static/images/index5.png"  mode="aspectFit"></image>
 									<text class="text">进货管理</text>
-								</view> -->
+								</view>
 								<view class="examine"
 									@click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
 									<image class="icon_img" src="@/static/images/index10.png" mode="aspectFit">
@@ -203,9 +202,9 @@
 									<text class="text">保证缴纳金</text>
 								</view>
 
-								<!-- <view class="examine"
+								<view class="examine"
 									@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
-									<image class="icon_img" src="@/static/images/diaohuo.png"  mode="aspectFit">
+									<image class="icon_img" src="@/static/images/index16.png"  mode="aspectFit">
 									</image>
 									<text class="text">交易大厅</text>
 								</view>
@@ -217,16 +216,16 @@
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
-						<image class="icon_img" src="@/static/images/index17png"  mode="aspectFit">
+						<image class="icon_img" src="@/static/images/index17.png"  mode="aspectFit">
 									</image>
 									<text class="text">委托订单</text>
 								</view>
 								<view class="examine"
 									@click="navigator(`/pages/releaseManagement/index?mer_id=${mer_id}`)">
-									<image class="icon_img" src="@/static/images/fabu.png"  mode="aspectFit">
+									<image class="icon_img" src="@/static/images/index15.png"  mode="aspectFit">
 									</image>
 									<text class="text">发布管理</text>
-								</view> -->
+								</view>
 
 								<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
 							<image class="icon_img" src="@/static/images/cwgk.png"  mode="aspectFit">
@@ -315,7 +314,7 @@
 									</image>
 									<text class="text">商户设置</text>
 								</view>
-							
+
 
 								<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
 							<image class="icon_img" src="@/static/images/cwgk.png"  mode="aspectFit">
@@ -412,7 +411,7 @@
 								<text class="text">商户设置</text>
 							</view>
 
-						
+
 
 						</view>
 					</view>
@@ -436,29 +435,29 @@
 				<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
 				<view class="contenta">
 					<jyf-parser :html="detail.mer_settlement_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
-		
+
 				</view>
 				<view class="setAgCountbtn">
 					<button class="setAgCountbtna" @click="refuse">
 						拒绝
 					</button>
-		
+
 					<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
 						<text v-if="num>0">请仔细阅读协议{{num}}S</text>
 						<text v-else>同意</text>
-		
+
 					</button>
 				</view>
 			</view>
 		</view>
 
 		<uni-popup ref="popup" type="bottom">
-		
+
 			<view class="userpage">
 				<view class="userpage-icon" @click="close">
 					<image src="@/static/images/close.png" mode=""></image>
 				</view>
-		
+
 				<form report-submit='true' style="height: 100%;">
 					<view class='merchantsSettled' :style="{'height':Fheight}">
 						<view class="title">填写信息</view>
@@ -471,8 +470,8 @@
 										placeholder-class='placeholder' />
 								</view>
 							</view>
-		
-		
+
+
 							<view class="item">
 								<view class="acea-row row-middle">
 									<text class="item-name">联系电话:</text>
@@ -480,7 +479,7 @@
 										@input="validateBtn" placeholder-class='placeholder' />
 								</view>
 							</view>
-		
+
 							<view class="item">
 								<view class="acea-row row-middle">
 									<text class="item-name">开户行:</text>
@@ -493,7 +492,7 @@
 									<text class="item-name">身份证正面:</text>
 								</view>
 								<view class="item-card">
-		
+
 									<view class="item-carda" @click='uploadpic({type:1})'
 										v-if='merchantData.cardno_front.length==0'>
 										<image src="@/static/images/SFZZ.png" mode="aspectFit"></image>
@@ -509,7 +508,7 @@
 										<image :src="merchantData.cardno_back" mode="aspectFit"></image>
 									</view>
 								</view>
-		
+
 							</view>
 							<view class="item">
 								<view class="acea-row row-middle">
@@ -527,14 +526,14 @@
 										v-if='merchantData.bank_back.length==0'>
 										<image src="@/static/images/YHKF.png" mode="aspectFit"></image>
 									</view>
-		
+
 									<view class="item-cardb" @click='DelPic({type:4})' v-else>
 										<image :src="merchantData.bank_back" mode="aspectFit"></image>
 									</view>
 								</view>
 							</view>
-		
-		
+
+
 							<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
 								提交申请
 							</button>
@@ -631,7 +630,7 @@
 		created() {},
 		onLoad() {
 			this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
-			console.log(this.Fheight )
+			console.log(this.Fheight)
 		},
 		onShow() {
 			if (this.isLogin) {
@@ -721,6 +720,11 @@
 					this.isFshow = false
 				}
 			},
+			logout(){
+				uni.switchTab({
+					url: '/pages/index/index'
+				})
+			},
 
 			countDown() {
 				let {
@@ -763,6 +767,7 @@
 					that.validate = false;
 				}
 			},
+			
 			validateForm: function() {
 				let that = this,
 					value = that.merchantData;
@@ -845,8 +850,8 @@
 				}
 
 			},
-			
-			
+
+
 			//保证金缴纳
 			paydecimal() {
 				if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
@@ -881,7 +886,7 @@
 			navigator(url, t) {
 
 				if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
-				
+
 
 					if (this.codenote.length == 0) {
 						this.isFshow = true
@@ -897,16 +902,16 @@
 						}
 					}
 				} else {
-                        if(t=='商品管理'){
-							uni.switchTab({
-									url: url
-							})
-						}else{
-							uni.navigateTo({
-								url: url
-							})
-						}
-					
+					if (t == '商品管理') {
+						uni.switchTab({
+							url: url
+						})
+					} else {
+						uni.navigateTo({
+							url: url
+						})
+					}
+
 				}
 			},
 			getUserInfo: function() {
@@ -971,6 +976,7 @@
 		position: fixed;
 		z-index: 10;
 	}
+
 	.userpage {
 		width: 100%;
 
diff --git a/pages/plantGrass/components/associated.vue b/pages/plantGrass/components/associated.vue
deleted file mode 100644
index 9c9311d..0000000
--- a/pages/plantGrass/components/associated.vue
+++ /dev/null
@@ -1,460 +0,0 @@
-<template>
-	<view class="containers" :style="viewColor">
-		<view class="header">
-			<view class="title">
-				<text :class="isActive == 0 ? 'on' : ''" @click="tabs(0)">已购</text>
-				<text :class="isActive == 1 ? 'on' : ''" @click="tabs(1)">收藏</text>
-				<text :class="isActive == 2 ? 'on' : ''" @click="tabs(2)">浏览</text>
-			</view>
-			<view class="search">
-				<text class="iconfont icon-xiazai5"></text>
-				<input type="text" placeholder="请输入商品名称" v-model="searchVal" @input="setValue" confirm-type="search" @confirm="searchBut()" placeholder-class='placeholder'>
-			</view>
-			<view class="sub_title">{{isActive == 0 ? '已购宝贝' : isActive == 1 ?'收藏宝贝' : '浏览记录'}}</view>
-			<text class="iconfont icon-guanbi5" @click="close"></text>
-		</view>
-		<view class="main">
-			<scroll-view scroll-y="true">
-				<block v-if="isActive == 0">
-					<view v-if="bought.length" @touchmove="onTouchmove" id="goods">
-						<view class="picTxt acea-row" v-for="(item, index) in bought" :key="index">
-							<view class="checkbox">
-								<text v-if="item.check" @click.stop="goodsCheck(item,index)" class="iconfont icon-xuanzhong1"></text>		
-								<text v-else @click.stop="goodsCheck(item,index)" :class="{'disabled':disabled}" class="iconfont icon-weixuanzhong"></text>
-							</view>
-							<view class='pictrue'>
-								<image :src='item.image'></image>
-							</view>
-							<view class='text'>
-								<view class='line2 name'>{{item.store_name}}</view>	
-								<view class='money'>￥<text>{{item.price}}</text></view>
-							</view>					
-						</view>
-					</view>
-					<view v-else class="empty">
-						<image src="/static/images/no_thing.png"></image>
-						<text>暂无内容哦~</text>
-					</view>
-				</block>
-				<block v-if="isActive == 1">
-					<view v-if="collect.length" id="collect" @touchmove="onTouchmove1">
-						<view class="picTxt acea-row" v-for="(item, index) in collect" :key="index">			
-							<view class="checkbox">							
-								<text v-if="item.check" @click.stop="goodsCheck(item,index)" class="iconfont icon-xuanzhong1"></text>		
-								<text v-else @click.stop="goodsCheck(item,index)" :class="{'disabled':disabled}" class="iconfont icon-weixuanzhong"></text>	
-							</view>
-							<view class='pictrue'>
-								<image :src='item.image'></image>
-							</view>
-							<view class='text'>
-								<view class='line2 name'>{{item.store_name}}</view>	
-								<view class='money'>￥<text>{{item.price}}</text></view>
-							</view>					
-						</view>
-					</view>
-					<view v-else class="empty">
-						<image src="/static/images/no_thing.png"></image>
-						<text>暂无内容哦~</text>
-					</view>
-				</block>
-				<block v-if="isActive == 2">
-					<view v-if="browse.length" id="browse" @touchmove="onTouchmove2">
-						<view class="picTxt acea-row" v-for="(item, index) in browse" :key="index">			
-							<view class="checkbox">							
-								<text v-if="item.check" @click.stop="goodsCheck(item,index)" class="iconfont icon-xuanzhong1"></text>		
-								<text v-else @click.stop="goodsCheck(item,index)" :class="{'disabled':disabled}" class="iconfont icon-weixuanzhong"></text>
-							</view>
-							<view class='pictrue'>
-								<image :src='item.image'></image>
-							</view>
-							<view class='text'>
-								<view class='line2 name'>{{item.store_name}}</view>	
-								<view class='money'>￥<text>{{item.price}}</text></view>
-							</view>					
-						</view>
-					</view>
-					<view v-else class="empty">
-						<image src="/static/images/no_thing.png"></image>
-						<text>暂无内容哦~</text>
-					</view>
-				</block>
-			</scroll-view>
-			<view class="foot_bar">
-				<button class="confirm_btn" @click="submit">确定({{checkedArr.length}})</button>
-			</view>
-		</view>	
-	</view>
-</template>
-
-<script>
-	import Loading from '@/components/Loading/index.vue';
-	import { boughtLstApi, collectLstApi, browseLstApi } from "@/api/community";
-	import { mapGetters } from "vuex";
-	export default {
-		props:{
-			checkedObj: {
-				type: Array,
-				default: []
-			}
-		},
-		computed: mapGetters(['viewColor']),
-		components: { Loading },
-		data() {
-			return {
-				isActive: 0,
-				loadedb: false,
-				loadingb: false,
-				loadedc: false,
-				loadingc: false,
-				loadeds: false,
-				loadings: false,
-				whereb:{
-					page: 1,
-					limit: 10,
-					keyword: '',
-				},
-				wherec:{
-					page: 1,
-					limit: 10,
-					keyword: '',
-				},
-				wheres:{
-					page: 1,
-					limit: 10,
-					keyword: '',
-				},
-				searchVal: "",
-				checked: [],
-				list: [],
-				collect: [],
-				bought: [],
-				browse: [],
-				checkedArr: this.checkedObj,
-				disabled: false
-			};
-		},
-		watch: {
-			checkedObj:{
-				handler(n){
-					this.checkedArr = n
-				},
-				deep: true
-			}
-		},
-		mounted(){
-			this.checkedArr = this.checkedObj
-			this.getBounht();
-			this.getCollect();
-			this.getBrowse();
-		},
-		methods: {	
-			// 点击关闭按钮
-			close() {
-				this.$emit('close');
-			},
-			tabs(index){
-				this.isActive = index
-				this.$set(this.whereb, 'keyword', '');
-				this.$set(this.wherec, 'keyword', '');
-				this.$set(this.wheres, 'keyword', '');
-				this.searchVal = ''
-				this.searchBut()
-			},
-			onTouchmove(e){
-				if (this.loadendb) return;
-				if (this.loadingb) return;
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#goods').boundingClientRect(data => {
-					if(data.bottom < 1500 && data.top < 0) {
-						this.getBounht();	
-					}
-				}).exec();
-				// 模拟触底刷新
-			},
-			onTouchmove1(e){
-				if (this.loadendc) return;
-				if (this.loadingc) return;
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#collect').boundingClientRect(data => {
-					if(data.bottom < 1500 && data.top < 0) {
-						this.getCollect();	
-					}
-				}).exec();
-				// 模拟触底刷新
-			},
-			onTouchmove2(e){
-				if (this.loadends) return;
-				if (this.loadings) return;
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#browse').boundingClientRect(data => {
-					if(data.bottom < 1500 && data.top < 0) {
-						this.getBrowse();	
-					}
-				}).exec();
-				// 模拟触底刷新
-			},
-			setValue: function(event) {
-				this.$set(this.whereb, 'keyword', event.detail.value);
-				this.$set(this.wherec, 'keyword', event.detail.value);
-				this.$set(this.wheres, 'keyword', event.detail.value);
-			},
-			searchBut(){
-				this.loadingb=this.loadingc=this.loadings=this.loadedb=this.loadedc=this.loadeds = false
-				this.whereb.page = this.wherec.page = this.wheres.page = 1
-				this.bought = this.collect = this.browse = []
-				this.isActive == 0 ? this.getBounht() : this.isActive == 1 ? this.getCollect() : this.getBrowse()
-			},
-			getBounht(){
-				var that = this;
-				if(that.loadingb || that.loadedb) return;
-				that.loadingb = true;
-				boughtLstApi(that.whereb).then(
-				  res => {
-				    that.loadingb = false;
-				    that.loadedb = res.data.list.length < that.whereb.limit;
-				    that.bought.push.apply(that.bought, res.data.list);
-				    that.whereb.page = that.whereb.page + 1;
-					that.getInitchecked(that.bought);
-				  },
-				  error => {
-				    that.$util.Tips({
-				      title: error.msg
-				    })
-				  }
-				);
-			},
-			getCollect(){
-				var that = this;
-				if(that.loadingc || that.loadedc) return;
-				that.loadingc = true;
-				collectLstApi(that.wherec).then(
-				  res => {
-				    that.loadingc = false;
-				    that.loadedc = res.data.list.length < that.wherec.limit;
-				    that.collect.push.apply(that.collect, res.data.list);
-				    that.wherec.page = that.wherec.page + 1;
-					that.getInitchecked(that.collect);
-				  },
-				  error => {
-				    that.$util.Tips({
-				      title: error.msg
-				    })
-				  }
-				);
-			},
-			getBrowse(){
-				var that = this;
-				if(that.loadings || that.loadeds) return;
-				that.loadings = true;
-				browseLstApi(that.wheres).then(
-				  res => {
-				    that.loadings = false;
-				    that.loadeds = res.data.list.length < that.wheres.limit;
-				    that.browse.push.apply(that.browse, res.data.list);
-				    that.wheres.page = that.wheres.page + 1;
-						that.getInitchecked(that.browse);
-				  },
-				  error => {
-				    that.$util.Tips({
-				      title: error.msg
-				    })
-				  }
-				);
-			},
-			/*获取初始化选中的数据*/
-			getInitchecked(arr){
-				let that = this;
-				arr.forEach((item, index) => {
-					that.$set(item, 'check', false);
-					that.checkedArr.forEach((val, i) =>{
-						if((item.spu_id == (val.spu&&val.spu.spu_id)) || (item.spu_id == val.spu_id)){
-							that.$set(item, 'check', true);
-						}	
-					})
-				})
-			},
-			/*点击选中与否*/
-			goodsCheck(item,index){
-				if(this.checkedArr.length > 4 && !item.check){
-					return ;
-				}
-				this.$set(item, 'check', !item.check);
-				if(item.check){
-					this.checkedArr.push(item)
-				}else{
-					this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.spu_id == item.spu_id) || (item.spu_id == (itemn.spu&&itemn.spu.spu_id)))), 1)	
-				}
-				this.disabled = this.checkedArr.length > 4
-			},		
-			/*确定提交*/
-			submit(){	
-				this.$emit('getProduct',this.checkedArr);
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-.containers{
-	background: #ffffff;
-	border-radius: 16rpx 16rpx 0 0;
-	padding: 40rpx 0;
-	position: relative;
-	.header{
-		position: relative;
-		padding: 0 30rpx;
-		.title{
-			width: 100%;
-			text-align: center;
-			text{
-				position: relative;
-				margin: 0 50rpx;
-				color: #999999;
-				font-size: 30rpx;
-				&.on{
-					color: #333333;
-					font-weight: bold;
-					font-size: 34rpx;
-					&::after{
-						content: "";
-						display: inline-block;
-						width: 40rpx;
-						height: 5rpx;
-						background: var(--view-theme);
-						position: absolute;
-						bottom: -10rpx;
-						left: 10rpx;
-					}
-				}
-			}	
-		}
-		.search{
-			margin-top: 44rpx;
-			background: #F5F5F5;
-			border-radius: 30rpx;
-			padding: 12rpx 30rpx 12rpx 66rpx;
-			position: relative;
-			.iconfont{
-				font-size: 24rpx;
-				color: #939393;
-				position: absolute;
-				top: 20rpx;
-				left: 30rpx;
-			}
-			.placeholder{
-				color: #999999;
-				font-size: 26rpx;
-			}
-		}
-		.sub_title{
-			color: #282828;
-			font-size: 26rpx;
-			margin-top: 30rpx;
-		}
-		.iconfont{
-			color: #8A8A8A;
-			font-size: 28rpx;
-			position: absolute;
-			top: 0;
-			right: 30rpx;
-		}
-	}
-	scroll-view{
-		height: 650rpx;
-	}
-	.main{
-		height: 650rpx;
-		margin: 40rpx 0 80rpx;
-		padding: 0 30rpx;
-	}
-}
-.picTxt {
-	width: 100%;
-	padding: 25rpx 0;
-	position: relative;
-	align-items: center;
-	justify-content: space-between;
-	margin-bottom: 10rpx;
-	.checkbox {
-		margin-right: 30rpx;
-		.iconfont {
-			font-size: 38rpx;
-			color: #CCCCCC;
-		}
-		.icon-xuanzhong1 {
-			color: var(--view-theme);
-		}
-		.disabled{
-			pointer-events: none;
-			cursor: default;
-			opacity: 0.3;
-		}
-	}
-	.pictrue {
-		width: 160rpx;
-		height: 160rpx;
-		image {
-			width: 100%;
-			height: 100%;
-			border-radius: 8rpx;
-		}
-	}
-	.text {
-		width: 430rpx;
-		margin-left: 30rpx;
-		font-size: 28rpx;
-		color: #282828;
-		position: relative;	
-		height: 160rpx;
-		.name{
-			color: #282828;
-			font-size: 28rpx;
-		}
-		.money{
-			position: absolute;
-			bottom: 0;
-			left: 0;
-			color: var(--view-priceColor);
-			font-size: 22rpx;
-			font-weight: bold;
-			text{
-				font-size: 26rpx;
-			}
-		}
-	}
-}
-.foot_bar{
-	width: 100%;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	background: #ffffff;
-	padding: 20rpx 0;
-	z-index: 5;
-	.confirm_btn{
-		width: 710rpx;
-		height: 86rpx;
-		line-height: 86rpx;
-		color: #ffffff;
-		text-align: center;
-		font-size: 32rpx;
-		background: var(--view-theme);
-		border-radius: 43rpx;
-		margin: 0 auto;
-	}
-}
-.empty{
-	margin: 130rpx 0 150rpx;
-	text-align: center;
-	image,uni-image{
-		display: inline-block;
-		width: 414rpx;
-		height: 305rpx;
-	}
-	text{
-		display: block;
-		color: #999999;
-		font-size: 26rpx;
-	}
-}
-</style>
diff --git a/pages/plantGrass/components/participateTopic.vue b/pages/plantGrass/components/participateTopic.vue
deleted file mode 100644
index df87a52..0000000
--- a/pages/plantGrass/components/participateTopic.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
-	<view class='productSort'>
-		<view class="title">
-			参与话题
-			<text class="iconfont icon-guanbi5" @click="close"></text>
-		</view>
-		<view class="con-box">
-			<view class='aside'>
-				<scroll-view scroll-y="true" style="height: 100%; overflow: hidden;">
-					<view v-for="(item,index) in productList" :key="item.category_id">
-						<view v-show="item.children && item.children.length > 0" class='item acea-row row-center-wrapper' :class='index==navActive?"on":""' @click='tap(index,"b"+index)'><text class="item_text">{{item.cate_name}}</text>
-						 </view>
-					</view>
-				</scroll-view>
-			</view>
-			<view class='conter'>
-				<scroll-view scroll-y="true" style="height: 100%; overflow: hidden;">		
-					<view v-for="(item,index) in childList" :key="item.topic_id">
-						<view class='list' @click.stop="confirmTopic(item)">			
-							<view class='item acea-row'>
-								<view class='picture'>
-									<image :src='item.pic'></image>
-								</view>
-								<view class="name line1">{{item.topic_name}}</view>					
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-	</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>
-	// +----------------------------------------------------------------------
-	let app = getApp();
-	import { getTopicList } from '@/api/community.js';
-	export default {
-		data() {
-			return {
-				navlist: [],
-				productList: [],
-				navActive: 0,
-				childList: []
-			}
-		},
-		watch:{},
-		mounted() {
-			if (!this.productList.length) {
-				this.getAllCategory();
-			}
-		},
-		methods: {
-			// 点击关闭按钮
-			close() {
-				this.$emit('close');
-			},
-			tap: function(index, id) {
-				this.navActive = index;
-				this.childList = this.productList[index].children
-			},
-			getAllCategory: function() {
-				let that = this;
-				let value = ""
-				getTopicList().then(res => {
-					let arr = [
-						{category_id: "",count_use: 0,count_view: 0,pic: null,topic_id: '',topic_name: "不添加任何话题"}
-					]
-					that.productList = res.data;
-					if(that.productList[0].children && that.productList[0].children.length > 0){
-						that.productList[0].children=[...arr,...that.productList[0].children]
-					}else{
-						that.productList[0].children = arr
-					}
-					that.childList = that.productList[0].children;
-				})
-			},
-			confirmTopic(item){
-				this.$emit('getTopic',item);
-			}	
-		}
-	}
-</script>
-<style scoped lang="scss">
-	.productSort {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 70vh;
-		background: #ffffff;
-		border-radius: 16rpx 16rpx 0 0;
-		.title{
-			text-align: center;
-			padding: 40rpx 0;
-			position: relative;
-			color: #333333;
-			font-size: 34rpx;
-			font-weight: bold;
-			.iconfont{
-				color: #8A8A8A;
-				font-size: 28rpx;
-				position: absolute;
-				right: 30rpx;
-				top: 42rpx;
-				font-weight: normal;
-			}
-		}
-		.con-box {
-			flex: 1;
-			display: flex;
-			overflow: hidden;
-		}
-	}
-	.productSort .aside {
-		overflow-y: auto;
-		overflow-x: hidden;
-		border-right: 1px solid #EEEEEE;
-		width: 202rpx;
-		height: 100%;
-		overflow: hidden;
-	}
-	.productSort .aside .item {
-		line-height: 100rpx;
-		width: 100%;
-		font-size: 26rpx;
-		color: #666666;
-	}
-	.productSort .aside .item_text {
-		padding-left: 20rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		-webkit-box-orient: vertical;
-	}
-	.productSort .aside .item.on {
-		width: 100%;
-		text-align: center;
-		font-weight: bold;
-		color: #333333;
-	}
-	.productSort .conter {
-		flex: 1;
-		height: 100%;
-		padding: 0 30rpx;
-		background-color: #ffffff;
-		margin-top: 20rpx;
-	}
-	.productSort .conter .list {
-		flex-wrap: wrap;	
-	}
-	.productSort .conter .list .item {
-		margin-top: 26rpx;
-		margin-bottom: 40rpx;
-		align-items: center;
-	}
-	.productSort .conter .list .item .picture {
-		width: 88rpx;
-		height: 88rpx;
-		border-radius: 100%;
-		position: relative;
-		&::before{
-			content: "#";
-			display: block;
-			width: 88rpx;
-			height: 88rpx;
-			line-height: 88rpx;
-			border-radius: 100%;
-			color: #ffffff;
-			font-size: 40rpx;
-			text-align: center;
-			position: absolute;
-			top: 0;
-			left: 0;
-			background: rgba(0,0,0,.3);
-		}
-	}
-	.productSort .conter .listw:first-child .picture{
-		&::before{
-			content: "\\";
-			background: #D8D8D8;
-		}
-	}
-	.productSort .conter .list .item .picture image {
-		width: 100%;
-		height: 100%;
-		border-radius: 100%;
-	}
-	.productSort .conter .list .name {
-		margin-left: 30rpx;
-		font-size: 28rpx;
-		color: #282828;
-		font-weight: bold;
-		max-width: 300rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue
deleted file mode 100644
index 49539fc..0000000
--- a/pages/plantGrass/plant_detail/index.vue
+++ /dev/null
@@ -1,1438 +0,0 @@
-<template>
-	<view :style="viewColor">
-
-
-
-		<view v-if="followDetail != null && followDetail" class="main" :class="{off_scoll:flag}"
-			@click.stop="showManage = false" style="padding-top: var(--status-bar-height);;">
-			<view v-if="followDetail.status != 1" class="approval_status">
-				<view class="status_count" :class="followDetail.status == 0 ? 'status1' : 'status0'">
-					<view class="status_title">
-						<text class="iconfont"
-							:class="(followDetail.status == -1 || followDetail.status == -2) ? 'icon-tishi' : 'icon-shijian'"></text>
-						<text v-if="followDetail.status == -1" class="title">审核未通过</text>
-						<text v-if="followDetail.status == -2" class="title">已下架</text>
-						<text v-if="followDetail.status == 0" class="title">正在审核</text>
-					</view>
-					<view v-if="followDetail.status == -1 || followDetail.status == -2" class="status_info">
-						{{followDetail.refusal}}
-					</view>
-					<view v-if="followDetail.status == 0" class="status_info">
-						发布的内容审核通过后，将展示在首页！
-					</view>
-				</view>
-			</view>
-			<view class="tab-cont">
-
-				<view class="follow_count">
-					<view class="list_count">
-						<view v-if="followDetail.author" class="title">
-							<view class="head-menu">
-								<image src="@/static/images/right.png" mode="aspectFill" @click="returns"></image>
-							</view>
-
-							<view class="author">
-
-								<navigator hover-class="none"
-									:url="'/pages/plantGrass/plant_user/index?id='+followDetail.uid">
-									<image class="picture" :src="followDetail.author.avatar || '/static/images/f.png'"
-										mode="aspectFit"></image>
-								</navigator>
-								<view class="name acea-row" style="width: 300rpx;">
-									<text>{{followDetail.author.nickname}}</text>
-									<image v-if="followDetail.author.member" class="level_icon"
-										:src="followDetail.author.member.brokerage_icon" alt="">
-								</view>
-							</view>
-							<view class="author" style="margin-left: 50rpx;">
-								<view class="manageCount" v-if="followDetail.is_author">
-									<view class="follow_btn" @click.stop="showManage=!showManage">管理</view>
-									<view class="manage" v-show="showManage">
-										<navigator hover-class="none"
-											:url="'/pages/plantGrass/plant_release/index?id='+id+'&type=1'"
-											class="items">
-											<text class="iconfont icon-bianji"></text>
-											<text>编辑</text>
-										</navigator>
-										<view class="items" @click.stop="deleteTopic">
-											<text class="iconfont icon-shanchu3"></text>
-											<text>删除</text>
-										</view>
-									</view>
-								</view>
-								<view v-else @click.stop="followAuthor">
-									<view v-if="!followDetail.is_fans" class="follow_btn focus"><text
-											class="iconfont icon-jiahao2"></text>关注</view>
-									<view v-else class="follow_btn focused">已关注</view>
-
-								</view>
-								<!-- #ifdef MP -->
-								<button v-if="followDetail.status == 1" class="time iconfont icon-fenxiang2"
-									open-type="share" hover-class='none'></button>
-								<!-- #endif -->
-
-								<!-- #ifdef APP-PLUS -->
-								<view class="fenxa" v-if="followDetail.status == 1"
-									@click="appShare('WXSceneSession',followDetail.community_id)">
-									<image src="@/static/images/fx.png" mode=""></image>
-								</view>
-								<!-- <button v-if="followDetail.status == 1"
-									@click="appShare('WXSceneSession',followDetail.community_id)"
-									class="time iconfont icon-fenxiang2" hover-class='none'></button> -->
-								<!-- #endif -->
-							</view>
-
-
-
-						</view>
-						<view class="product">
-							<productConSwiper :imgUrls="followDetail.image"></productConSwiper>
-						</view>
-						<view class="pro_describle">
-							<!--<view class="mentioned" v-if="followDetail.relevance.length"
-								@click="openMore(followDetail)">
-								<text class="title">查看TA提到的宝贝({{followDetail.relevance.length}})</text>
-								<view class="product_more">
-									<view class="item">
-										<image v-if="indexn<=3" v-for="(itemn, indexn) in followDetail.relevance"
-											:key="indexn" :src="(itemn.spu&&itemn.spu.image) || itemn.image"
-											class="more_image"></image>
-									</view>
-									<text class="iconfont icon-gengduo3"></text>
-								</view>
-							</view> -->
-
-
-							<view class="product">
-								<scroll-view class="scroll-view" scroll-x="true"
-									style="white-space: nowrap; display: flex;" scroll-with-animation
-									show-scrollbar="true">
-									<view class="product-item" v-for="(goods,idx) in followDetail.relevance" :key="idx"
-										@click="shopdetail(goods)">
-										<view v-if="goods.spu" class="item-count acea-row">
-											<view class="picture">
-												<image class="image" :src="goods.spu.image"></image>
-											</view>
-											<view class="product-text">
-												<text class="name line1"
-													v-if="goods.spu && goods.spu.store_name.length>=12">{{goods.spu.store_name.slice(0,12)}}...</text>
-												<text class="name line1"
-													v-else>{{goods.spu && goods.spu.store_name}}</text>
-												<view class="product-price">
-													<view class="price"><text class="sm">¥</text><text
-															class="money">{{goods.spu.price}}</text>
-													</view>
-													<!-- <text class="buy-btn">购买</text> -->
-												</view>
-											</view>
-										</view>
-									</view>
-								</scroll-view>
-							</view>
-							<view class="product_info">
-								<text class="text">
-									{{followDetail.content}}
-								</text>
-							</view>
-							<navigator v-if="followDetail.topic" hover-class="none" class="product_cate"
-								:url="'/pages/plantGrass/plant_search_list/index?id='+followDetail.topic.topic_id">
-								<view>
-									<text class="icon">#</text><text
-										class="text">{{followDetail.topic.topic_name}}</text>
-								</view>
-							</navigator>
-							<view class="create_time">{{followDetail.create_time}}</view>
-						</view>
-					</view>
-				</view>
-				<view v-if="community_reply_status == 1" class="commend_list" @click.stop="loseFocus">
-					<view class="commen_count">评论{{replyData.all == 0 ? '' : replyData.all}}</view>
-					<block v-if="commList.length > 0">
-						<view class="common_list" v-for="(item, index) in commList" :key="index">
-							<view v-if="item.author" @click.stop="toReply(item,index)" class="commen_one">
-								<image :src="item.author.avatar ? item.author.avatar : '/static/images/f.png'"
-									class="image"></image>
-							</view>
-							<view class="info_count">
-								<view class="info">
-									<view class="message">
-										<view v-if="item.author" class="name">{{item.author.nickname}}</view>
-										<view class="desc" @click.stop="toReply(item,index)">{{item.content}}</view>
-										<view class="time">{{item.create_time}}</view>
-									</view>
-									<view class="like" @click.stop="starComment(item)">
-										<view class="iconfont"
-											:class="item.relevance_id ? 'icon-yidianzan' : 'icon-dianzan1'"></view>
-										{{item.count_start}}
-									</view>
-								</view>
-								<view v-if="item.children&&item.children.length > 0" class="reply_count">
-									<view v-for="(itemn,indexn) in item.children" :key="indexn" class="reply_list">
-										<view class="item">
-											<view class="item_count">
-												<image v-if="itemn.author" class="image"
-													:src="itemn.author.avatar ? itemn.author.avatar : '/static/images/f.png'"
-													@click.stop="toReply(itemn,index)"></image>
-												<view v-if="itemn.author" class="name_two">{{itemn.author.nickname}}
-												</view>
-												<view class="desc_two" @click.stop="toReply(itemn,index)">
-													<text class="reply_user" v-if="itemn.reply">回复
-														@{{itemn.reply.nickname}} </text>
-													{{itemn.content}}
-												</view>
-												<view class="time_two">{{itemn.create_time}}</view>
-											</view>
-											<view class="like_two" @click.stop="starComment(itemn)">
-												<view class="iconfont"
-													:class="itemn.relevance_id ? 'icon-yidianzan' : 'icon-dianzan1'">
-												</view>
-												{{itemn.count_start}}
-											</view>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view :hidden="!loading" class="acea-row row-center-wrapper loadingicon">
-							<text class="iconfont icon-jiazai loading"></text>
-						</view>
-					</block>
-					<view v-if="commList.length == 0 && !loading" class="empty">
-						<image src="/static/images/no_commen.png"></image>
-						<text>暂无评论，快去抢沙发吧~</text>
-					</view>
-
-					<view v-if="followDetail.status == 1 && followDetail.relevance.length<=0"
-						class="release_bar acea-row">
-						<view class="input_count" :class="{input_reply:content}">
-							<form @submit="submitComment">
-								<input type="text" :placeholder="placeholder"
-									placeholder-style="color: #999999; font-size: 26rpx;" v-model="content"
-									:focus="focus" @confirm.stop="submitComment()" cursorSpacing={20}>
-							</form>
-						</view>
-
-						<view v-if="content">
-							<button class="send" @click.stop="submitComment">发送</button>
-						</view>
-						<view v-else class="input_bar acea-row">
-							<view class="item acea-row" @click.stop="likeToggle(followDetail.relevance_id)">
-								<text class="iconfont"
-									:class="followDetail.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
-								<text>{{followDetail.count_start}}</text>
-							</view>
-							<view class="item acea-row" @click="FToggle">
-								<text class="iconfont icon-pinglun"></text>
-								<text>{{replyData.all}}</text>
-							</view>
-						</view>
-					</view>
-
-					<view v-if="followDetail.status == 1&& followDetail.relevance.length>0"
-						class="release_bar acea-row">
-
-						<view class="shopp" @click="openMore(followDetail)" style="margin-top: 10rpx">
-							<view class="shopp-img">
-								<image src="@/static/images/shopp.png" mode=""></image>
-							</view>
-							<view class="shopp-txt">
-								商品 ({{followDetail.relevance.length}})
-							</view>
-						</view>
-
-						<view class="input_bar acea-row">
-							<view class="item acea-row">
-								<text class="iconfont"
-									:class="followDetail.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
-								<text>{{followDetail.count_start}}</text>
-							</view>
-							<view class="item acea-row" @click="FToggle">
-								<text class="iconfont icon-pinglun"></text>
-								<text>{{replyData.all}}</text>
-							</view>
-						</view>
-					</view>
-
-
-				</view>
-			</view>
-		</view>
-
-		<view v-if="(!followDetail || followDetail == null) && !loadData" class="no_content">
-			<view class="count">
-				<image src="../static/images/no_content.png"></image>
-				<text>内容不存在，可能被删除了哦~</text>
-				<navigator class="btn" :open-type="open_grass ? 'switchTab' : 'navigate'"
-					url="/pages/plant_grass/index">返回首页</navigator>
-			</view>
-		</view>
-		<!-- 他提到的宝贝弹窗 -->
-		<mentioned ref="mentioned" v-if="followDetail" @close="close" @closes="flag=false"
-			:list="followDetail.relevance" :uid="followDetail.uid"></mentioned>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<!-- 绑定手机号 -->
-		<uni-popup ref="bindmobile" type="bottom">
-			<bindmobile @close="close"></bindmobile>
-		</uni-popup>
-
-		<uni-popup ref="bindmobile1" type="bottom">
-			<view class="" style="background-color: #fff;height: 154rpx ;">
-				<view class="input_count1" :class="{input_reply:content}">
-					<form @submit="submitComment">
-						<view class="" style="display: flex;padding: 0 20rpx;box-sizing: border-box;">
-							<input type="text" class="count1" :placeholder="placeholder"
-								placeholder-style="color: #999999; font-size: 26rpx;" v-model="content" :focus="focus"
-								@confirm.stop="submitComment()" cursorSpacing={20}>
-							<button class="send1" @click.stop="submitComment">发送</button>
-						</view>
-
-					</form>
-				</view>
-			</view>
-		</uni-popup>
-	</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>
-	// +----------------------------------------------------------------------
-	import request from "@/utils/request.js";
-	import {
-		HTTP_REQUEST_URL
-	} from '@/config/app.js';
-	import {
-		getUserInfo
-	} from '@/api/user.js';
-	import {
-		plantDetailApi,
-		replyLstApi,
-		replyCreateApi,
-		starCommentApi,
-		deletePlantApi,
-		followAuthorApi,
-		graphicStartApi
-	} from "@/api/community";
-	import {
-		mapGetters
-	} from "vuex";
-	import shareScence from "@/libs/spread";
-	import authorize from '@/components/Authorize';
-	import productConSwiper from '@/components/plantConSwiper';
-	import mentioned from '@/components/mentioned.vue';
-	import bindmobile from '@/components/bindmobile.vue';
-	import {
-		openPlantGrass
-	} from "@/config/app.js";
-	import {
-		configMap
-	} from '@/utils';
-	const app = getApp();
-	export default {
-		components: {
-			authorize,
-			productConSwiper,
-			mentioned,
-			bindmobile
-		},
-		data() {
-			return {
-				flag: false,
-				open_grass: openPlantGrass,
-				followDetail: null,
-				commList: [], //评论列表
-				moreList: [],
-				isShowAuth: false, //是否隐藏授权
-				isAuto: false, //没有授权的不会自动授权
-				showManage: false,
-				content: "", //评论内容
-				id: "",
-				replyData: {},
-				userInfo: {},
-				loadData: false,
-				loaded: false,
-				loading: false,
-				loadTitle: '加载更多',
-				where: {
-					page: 1,
-					limit: 10
-				},
-				reply_id: "",
-				placeholder: "快来说点儿什么吧...",
-				isChild: false,
-				index: 0,
-				currSpid: '',
-				focus: false,
-				actionSheetHidden: true,
-				type: 0,
-				isshow: false
-			}
-		},
-		created() {},
-		computed: configMap({
-			community_reply_status: 0
-		}, mapGetters(['isLogin', 'uid', 'viewColor'])),
-		watch: {},
-		onLoad: function(options) {
-			let that = this
-			that.id = options.id;
-			that.type = options.type;
-			//#ifdef MP
-			if (options.spid) {
-				app.globalData.spid = options.spid;
-				that.currSpid = options.spid
-			}
-			shareScence(that.currSpid, that.isLogin)
-			//#endif
-			that.getDetail();
-			that.getReplyList();
-
-		},
-		onShow() {
-			uni.hideLoading();
-		},
-		mounted: function() {},
-		methods: {
-
-			shopdetail(item) {
-				// console.log(item)
-				uni.navigateTo({
-					url: '/pages/goods_details/index?id=' + item.spu.product_id
-				})
-			},
-			FToggle() {
-				this.$refs.bindmobile1.open()
-
-			},
-			// 后退
-			returns() {
-				uni.navigateBack()
-			},
-			// 首页
-			goHome() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-			},
-			//分享
-			//#ifdef MP
-			plantShare() {
-				let that = this;
-				if (that.followDetail.status == 1) {
-					uni.showShareMenu({
-						withShareTicket: true,
-						menus: ['shareAppMessage', 'shareTimeline'],
-						title: that.followDetail.title || '',
-						imageUrl: that.followDetail.image[0] || '',
-						path: '/pages/plantGrass/plant_detail/index?id=' + that.id + '&spid=' + that.uid,
-					})
-				} else {
-					uni.hideShareMenu()
-				}
-			},
-			// #endif
-			// 授权回调
-			onLoadFun() {
-				this.isShowAuth = false
-				this.getDetail()
-				this.getReplyList()
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			// 打开授权
-			authOpen: function() {
-				let that = this;
-				if (that.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				}
-			},
-			// #ifdef APP-PLUS
-			appShare(scene, id) {
-				let that = this
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				});
-				let data = this.followDetail;
-				// console.log(data)
-				let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-				let curRoute = routes[routes.length - 1].$page.fullPath // 获取当前页面路由，也就是最后一个打开的页面路由
-				uni.share({
-					provider: "weixin",
-					scene: scene,
-					type: 0,
-					href: `${HTTP_REQUEST_URL}${curRoute}`,
-					title: data.title || '',
-					summary: data.content || '',
-					imageUrl: data.image[0] || '',
-					success: function(res) {
-						uni.showToast({
-							title: '分享成功',
-							icon: 'success'
-						})
-						uni.hideLoading();
-					},
-					fail: function(err) {
-						uni.hideLoading();
-						uni.showToast({
-							title: '分享失败',
-							icon: 'none',
-							duration: 2000
-						})
-					}
-				});
-			},
-			// #endif
-			/**
-			 * 获取个人用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.userInfo = res.data;
-					/*判断是否绑定手机号*/
-					if (res.data.phone) {
-						that.createReply()
-					} else {
-						that.$refs.bindmobile.open()
-					}
-				});
-			},
-			/*获取内容详情*/
-			getDetail() {
-				let that = this;
-				if (that.loadData) return
-				that.loadData = true
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				});
-				plantDetailApi(that.id).then(res => {
-					that.loadData = false
-					that.followDetail = res.data
-					that.followDetail.relevance = that.followDetail.relevance.filter(item => {
-						return item.spu
-					})
-
-					uni.hideLoading()
-					// #ifdef MP
-					that.plantShare();
-					// #endif
-				}).catch(err => {
-					that.followDetail = null
-					that.loadData = false
-					uni.hideLoading()
-					return that.$util.Tips({
-						title: err
-					});
-				})
-			},
-			/*获取评论*/
-			getReplyList() {
-				let that = this;
-				if (that.loading || that.loaded) return;
-				that.loading = true;
-				that.loadTitle = '';
-				replyLstApi(that.id, that.where).then(res => {
-					that.loading = false;
-					that.replyData = res.data
-					let list = res.data.list;
-					let commList = that.$util.SplitArray(list, that.commList);
-					that.loaded = list.length < that.where.limit;
-					that.loading = false;
-					that.loadTitle = that.loaded ? '已全部加载' : '加载更多';
-					that.$set(that, 'commList', commList);
-					that.$set(that.where, 'page', that.where.page + 1);
-				}).catch(err => {
-					that.loading = false;
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
-				})
-			},
-			/*发表评论*/
-			submitComment() {
-				let that = this;
-				if (that.isLogin === false) {
-					that.isAuto = true;
-					that.isShowAuth = true
-				} else {
-					that.getUserInfo();
-				}
-			},
-			createReply() {
-				let that = this;
-				let reply_id = that.reply_id ? that.reply_id : 0
-				replyCreateApi(that.id, {
-					content: that.content,
-					reply_id: reply_id
-				}).then(res => {
-					if (res.status === 200 && res.data.status == 1) {
-						if (that.isChild) {
-							if (that.commList[that.index]['children']) {
-								that.commList[that.index]['children'].push(res.data)
-							} else {
-								that.commList[that.index]['children'] = [res.data]
-							}
-						} else {
-							that.commList.unshift(res.data)
-						}
-						that.replyData.all++
-					}
-					that.$util.Tips({
-						title: res.message
-					});
-					that.loseFocus()
-					that.content = ""
-				}).catch(err => {
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
-				});
-			},
-			toReply(item, index) {
-				this.placeholder = '回复：' + item.author.nickname
-				this.reply_id = item.reply_id
-				this.isChild = true
-				this.index = index
-				this.focus = true
-				this.content = ""
-			},
-			loseFocus() {
-				this.focus = false;
-				this.reply_id = 0;
-				this.placeholder = "快来说点儿什么吧..."
-				this.isChild = false
-			},
-			/*点赞评论*/
-			starComment(item) {
-				let that = this;
-				if (that.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					let status = item.relevance_id ? 0 : 1
-					starCommentApi(item.reply_id, {
-						status: status
-					}).then(res => {
-						if (res.status === 200) {
-							if (item.relevance_id) {
-								item.count_start--;
-								that.replyData.start--
-								item.count_start = item.count_start == 0 ? 0 : item.count_start
-								that.replyData.start = that.replyData.start == 0 ? 0 : that.replyData.start
-								item.relevance_id = false
-							} else {
-								item.count_start++;
-								item.relevance_id = true
-								that.replyData.start++
-							}
-						}
-						that.$util.Tips({
-							title: res.message
-						});
-					}).catch(err => {
-						uni.showToast({
-							title: err,
-							icon: 'none'
-						})
-					});
-				}
-			},
-			/*点赞文章*/
-			likeToggle(id) {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					let status = id ? 0 : 1
-					graphicStartApi(this.followDetail.community_id, {
-						status: status
-					}).then(res => {
-						if (id) {
-							this.followDetail.count_start--;
-							this.followDetail.count_start = this.followDetail.count_start == 0 ? 0 : this
-								.followDetail.count_start
-							this.followDetail.relevance_id = false
-						} else {
-							this.followDetail.count_start++;
-							this.followDetail.relevance_id = true
-						}
-					});
-				}
-			},
-			// 关注作者
-			followAuthor: function() {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					let status = this.followDetail.is_fans == 0 ? 1 : 0
-					followAuthorApi(this.followDetail.uid, {
-						status: status
-					}).then(res => {
-						if (res.status === 200) {
-							this.followDetail.is_fans = this.followDetail.is_fans == 0 ? 1 : 0
-						}
-						this.$util.Tips({
-							title: res.message
-						});
-					});
-				}
-			},
-			// 删除话题
-			deleteTopic() {
-				let that = this;
-				uni.showModal({
-					content: '确定要删除该话题么？',
-					success: function(res) {
-						if (res.confirm) {
-							deletePlantApi(that.id).then(res => {
-								if (res.status === 200) {
-									that.$util.Tips({
-										title: res.message
-									});
-									setTimeout(function() {
-										uni.redirectTo({
-											url: '/pages/plantGrass/plant_user/index'
-										})
-									}, 1000);
-								}
-							})
-						} else if (res.cancel) {
-							// console.log('用户点击取消');
-						}
-					}
-				});
-
-			},
-			/*查看提到的宝贝*/
-			openMore(item) {
-				this.$refs.mentioned.showPopup()
-				this.flag = true
-			},
-			close() {
-				this.$refs.mentioned.closePopup()
-				this.$refs.bindmobile.close()
-				this.flag = false
-			}
-		},
-		onReachBottom() {
-			this.getReplyList()
-		},
-		onPullDownRefresh() {}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page {
-		background: #ffffff;
-	}
-
-	.head-menu {
-		width: 51rpx;
-		height: 51rpx;
-		margin-right: 20rpx;
-
-		margin-top: 10rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.tab-cont {
-		background: #fff;
-		border-radius: 16rpx 16rpx 0 0;
-	}
-
-	.approval_status {
-		padding: 20rpx;
-
-		.status_count {
-			padding: 26rpx 30rpx 20rpx;
-			border-radius: 10rpx;
-
-			.title {
-				margin-left: 10rpx;
-				font-size: 28rpx;
-				font-weight: bold;
-			}
-
-			&.status0 {
-				background: #FDF3F2;
-
-				.title {
-					color: #E93323;
-				}
-			}
-
-			&.status1 {
-				background: #FFF4EB;
-
-				.title {
-					color: #FC8327;
-				}
-			}
-
-			.iconfont {
-				font-size: 30rpx;
-			}
-
-			.icon-shijian {
-				color: #FC8327;
-			}
-
-			.icon-tishi {
-				color: #E93323;
-			}
-
-			.status_info {
-				font-size: 22rpx;
-				color: #666666;
-				margin: 10rpx 0 0 36rpx;
-			}
-		}
-	}
-
-	.product {
-		flex-direction: row;
-		margin-top: 27rpx;
-
-		.scroll-view {
-			flex-direction: row;
-		}
-
-		.product-item {
-			display: inline-block;
-			width: 444rpx;
-			height: 136rpx;
-			// background: rgba(0, 0, 0, .55);
-			background-color: #F4F4F4;
-			border-radius: 12rpx;
-			padding: 16rpx 15rpx;
-			margin-right: 30rpx;
-		}
-
-		.swiper {
-			width: 500rpx !important;
-			height: 136rpx !important;
-
-			.swiper-count {
-				width: 444rpx !important;
-				height: 136rpx !important;
-				background: rgba(0, 0, 0, .55);
-				border-radius: 12rpx;
-				padding: 16rpx 15rpx;
-			}
-
-			.swiper-item {
-				flex-direction: row;
-			}
-		}
-
-		.item-count {
-			flex-direction: row;
-			justify-content: space-between;
-
-			.picture {
-				width: 104rpx;
-				height: 104rpx;
-				border-radius: 10rpx;
-
-				.image {
-					width: 104rpx;
-					height: 104rpx;
-					border-radius: 10rpx;
-				}
-			}
-
-			.product-text {
-				width: 286rpx;
-				justify-content: space-between;
-
-				.name {
-					font-size: 24rpx;
-					width: 286rpx;
-					// color: #fff;
-					color: #000;
-				}
-
-				.product-price {
-					display: flex;
-					flex-direction: row;
-					justify-content: space-between;
-					align-items: center;
-
-					.price {
-						display: flex;
-						flex-direction: row;
-
-						.sm,
-						.money {
-							// color: #ffffff;
-							color: #000;
-							font-size: 24rpx;
-						}
-					}
-
-					.buy-btn {
-						padding: 6rpx 20rpx;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						color: #fff;
-						border-radius: 26rpx;
-						background: #E93323;
-						font-size: 20rpx;
-					}
-				}
-			}
-		}
-	}
-
-
-	.follow_count {
-		padding: 20rpx;
-		border-bottom: 1px solid #F5F5F5;
-
-		.title {
-			display: flex;
-
-
-		}
-
-		.author {
-			display: flex;
-
-			align-items: center;
-
-			.fenxa {
-				width: 51rpx;
-				height: 51rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.picture,
-			uni-image {
-				width: 70rpx;
-				height: 70rpx;
-				border-radius: 100%;
-			}
-
-			.name {
-				margin-left: 20rpx;
-				color: #333333;
-				font-size: 32rpx;
-				font-weight: bold;
-				align-items: center;
-			}
-
-			.follow_btn {
-				margin-right: 24rpx;
-				width: 112rpx;
-				display: flex;
-				text-align: center;
-				justify-content: center;
-				line-height: 42rpx;
-				font-size: 22rpx;
-				border-radius: 33rpx;
-				color: #282828;
-				border: 1px solid #282828;
-
-				&.focus {
-					color: var(--view-theme);
-					border: 1px solid var(--view-theme);
-
-					.iconfont {
-						font-size: 15rpx;
-						margin-right: 5rpx;
-					}
-				}
-
-				&.focused {
-					background: #EEEEEE;
-					border: 1px solid #EEEEEE;
-					color: #999999;
-				}
-			}
-
-			.level_icon {
-				width: 34rpx;
-				height: 32rpx;
-				margin: 4rpx 0 0 6rpx;
-				border: none;
-			}
-		}
-
-		.time {
-			color: #282828;
-			font-size: 46rpx;
-		}
-
-		.product {
-			margin-top: 20rpx;
-			border-radius: 16rpx;
-		}
-
-		.manageCount {
-			position: relative;
-
-			.manage {
-				width: 210rpx;
-				background: #ffffff;
-				box-shadow: 0 2rpx 15rpx rgba(0, 0, 0, 0.1);
-				padding: 0 15rpx;
-				position: absolute;
-				bottom: -180rpx;
-				left: -20rpx;
-				z-index: 10;
-				border-radius: 16rpx;
-
-				&::before {
-					content: "";
-					display: inline-block;
-					width: 26rpx;
-					height: 26rpx;
-					background: #ffffff;
-					transform: rotate(45deg);
-					position: absolute;
-					top: -10rpx;
-					left: 30rpx;
-					box-shadow: -1rpx -1rpx 1rpx rgba(0, 0, 0, 0.05);
-				}
-
-				.items {
-					border-bottom: 1px solid #EEEEEE;
-					color: #282828;
-					font-size: 26rpx;
-					padding: 20rpx 0;
-					display: flex;
-					align-items: center;
-
-					&:last-child {
-						border-bottom: none;
-					}
-
-					.iconfont {
-						margin: 0 16rpx 0;
-					}
-				}
-			}
-		}
-	}
-
-	.pro_describle {
-		.create_time {
-			color: #CCCCCC;
-			font-size: 22rpx;
-			margin-left: 10rpx;
-			margin-top: 5rpx;
-		}
-
-		.mentioned {
-			padding: 20rpx 0;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			border-bottom: 1px solid #F5F5F5;
-
-			.title {
-				color: #666666;
-				font-size: 26rpx;
-			}
-		}
-
-		.product_more {
-			max-width: 360rpx;
-			display: flex;
-			align-items: center;
-
-			.more_image {
-				width: 58rpx;
-				height: 58rpx;
-				border-radius: 5rpx;
-				border: 1px solid #BBBBBB;
-				margin-right: 12rpx;
-			}
-
-			.iconfont {
-				color: #CCCCCC;
-				margin-left: 10rpx;
-			}
-		}
-
-		.product_info {
-			line-height: 45rpx;
-			margin: 20rpx 0;
-
-			.text {
-				font-size: 28rpx;
-				color: #282828;
-				text-align: justify;
-				text-justify: newspaper;
-				word-break: break-all;
-			}
-
-			.unfold_btn {
-				margin-left: 30rpx;
-				font-size: 30rpx;
-				color: #282828;
-				font-weight: bold;
-			}
-		}
-
-		.product_cate {
-			margin: 20rpx 0;
-			display: inline-block;
-
-			>view {
-				display: flex;
-				align-items: center;
-				background: var(--view-minorColor);
-				border-radius: 30rpx;
-				padding: 0 25rpx;
-				line-height: 56rpx;
-				height: 56rpx;
-				color: var(--view-theme);
-
-				.text {
-					font-size: 28rpx;
-				}
-
-				.icon {
-					font-size: 35rpx;
-					font-weight: bold;
-					margin-right: 10rpx;
-				}
-			}
-		}
-	}
-
-	.main_count {
-		padding: 30rpx 20rpx;
-
-		.list {
-			width: 710rpx;
-			height: 280rpx;
-			margin-bottom: 30rpx;
-			position: relative;
-
-			.picture {
-				width: 710rpx;
-				height: 280rpx;
-				border-radius: 16rpx;
-			}
-		}
-	}
-
-	.commend_list {
-		margin-top: 30rpx;
-		padding: 0 20rpx;
-		position: relative;
-		padding-bottom: 120rpx;
-
-
-		.commen_count {
-			font-size: 26rpx;
-			color: #282828;
-			margin: 30rpx 0;
-		}
-
-		.common_list {
-			position: relative;
-			padding-left: 94rpx;
-
-			.commen_one {
-				position: absolute;
-				top: 0;
-				left: 0;
-
-				.image,
-				uni-image {
-					width: 74rpx;
-					height: 74rpx;
-					border-radius: 100%;
-				}
-			}
-
-			.info_count {
-				margin-bottom: 20rpx;
-			}
-
-			.info {
-				position: relative;
-				padding-right: 90rpx;
-			}
-
-			.name,
-			.name_two {
-				color: #999999;
-				font-size: 26rpx;
-			}
-
-			.desc,
-			.desc_two {
-				color: #282828;
-				font-size: 28rpx;
-				margin-top: 10rpx;
-				display: inline-block;
-			}
-
-			.desc_two {
-				font-size: 26rpx;
-
-				.reply_user {
-					font-size: 24rpx;
-					color: #4A8AC9;
-					margin: 0 6rpx;
-				}
-			}
-
-			.time,
-			.time_two {
-				color: #BBBBBB;
-				font-size: 22rpx;
-				margin-top: 15rpx;
-			}
-
-			.like,
-			.like_two {
-				color: #999999;
-				font-size: 26rpx;
-				text-align: center;
-				position: absolute;
-				top: 0;
-				right: 0;
-				width: 75rpx;
-
-				.icon-yidianzan {
-					color: var(--view-theme);
-				}
-			}
-
-			.reply_list {
-				margin-top: 20rpx;
-
-				.item {
-					padding-right: 140rpx;
-					position: relative;
-				}
-
-				.item_count {
-					position: relative;
-					padding-left: 56rpx;
-
-					.image,
-					un-image {
-						width: 36rpx;
-						height: 36rpx;
-						border-radius: 100%;
-						position: absolute;
-						top: 0;
-						left: 0;
-					}
-				}
-			}
-		}
-	}
-
-	.no_content,
-	.main {
-		min-height: 100vh;
-		background: #fff;
-		position: relative;
-
-		.count {
-			position: absolute;
-			text-align: center;
-			width: 100%;
-			top: 50%;
-			margin-top: -300rpx;
-
-			image,
-			uni-image {
-				width: 424rpx;
-				height: 305rpx;
-			}
-
-			text {
-				display: block;
-				color: #999999;
-				font-size: 26rpx;
-			}
-		}
-
-		.btn {
-			width: 440rpx;
-			text-align: center;
-			padding: 15rpx 0;
-			color: var(--view-theme);
-			border: 1px solid var(--view-theme);
-			border-radius: 40rpx;
-			margin: 44rpx auto 0;
-			font-size: 32rpx;
-		}
-	}
-
-	.input_count1 {
-
-		height: 70rpx;
-		padding-top: 15rpx;
-
-
-		/deep/.count1 {
-			padding-left: 20rpx;
-			width: 617rpx;
-			height: 70rpx;
-			background: #F4F4F4;
-			margin: 0 auto;
-
-			border-radius: 35px 35px 35px 35px;
-		}
-
-	}
-
-	.release_bar {
-		align-items: center;
-		width: 100%;
-		background: #ffffff;
-
-		padding: 15rpx 20rpx;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		z-index: 10;
-		border-top: 1px solid #F5F5F5;
-		justify-content: space-between;
-		padding-bottom: var(--status-bar-height);
-
-		.input_count {
-			width: 530rpx;
-			background: #F7F7F7;
-			border-radius: 30rpx;
-			padding: 12rpx 30rpx;
-
-			input {
-				font-size: 26rpx;
-			}
-		}
-
-		.input_bar {
-			align-items: center;
-			color: #282828;
-			font-size: 26rpx;
-
-			.iconfont {
-				font-size: 40rpx;
-				margin-right: 6rpx;
-			}
-
-			.icon-shoucang1 {
-				color: var(--view-theme);
-			}
-
-			.item {
-				align-items: center;
-
-				&:first-child {
-					margin-right: 25rpx;
-				}
-			}
-		}
-
-		.shopp {
-			width: 209rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			background: linear-gradient(90deg, #F84221 0%, #FF6D20 100%);
-			border-radius: 33px 33px 33px 33px;
-			opacity: 1;
-			display: flex;
-
-			.shopp-img {
-				width: 46rpx;
-				height: 46rpx;
-				margin-top: 12rpx;
-				margin-left: 25rpx;
-				margin-right: 11rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.shopp-txt {
-				font-size: 26rpx;
-				font-family: PingFang SC-Regular, PingFang SC;
-				font-weight: 400;
-				color: #FFFFFF;
-			}
-
-		}
-
-		.send {
-			font-size: 26rpx;
-			color: #ffffff;
-			padding: 12rpx 45rpx;
-			background-image: linear-gradient(126deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-			border-radius: 30rpx;
-			text-align: center;
-		}
-	}
-
-	.empty {
-		margin: 130rpx 0 150rpx;
-		text-align: center;
-
-		image,
-		uni-image {
-			display: inline-block;
-			width: 414rpx;
-			height: 305rpx;
-		}
-
-		text {
-			display: block;
-			color: #999999;
-			font-size: 26rpx;
-		}
-	}
-
-	.send1 {
-		font-size: 26rpx;
-		color: #ffffff;
-		// padding: 12rpx 45rpx;
-		background-image: linear-gradient(126deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-		border-radius: 30rpx;
-		text-align: center;
-		width: 150rpx;
-		line-height: 70rpx;
-		margin-left: 20rpx;
-
-		// height: ;
-	}
-
-	// 禁止滚动
-	.off_scoll {
-		height: 100vh;
-		overflow: hidden;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/plantGrass/plant_featured/index.vue b/pages/plantGrass/plant_featured/index.vue
deleted file mode 100644
index 7be5557..0000000
--- a/pages/plantGrass/plant_featured/index.vue
+++ /dev/null
@@ -1,381 +0,0 @@
-<template>
-	<view>
-		<view class="main">
-			<view class="tab-cont">
-				<view v-if="featuredList.length" class="follow_count">
-					<block v-for="(item, index) in featuredList" :key="index">
-						<view class="list_count">
-							<view v-if="item.author" class="title">
-								<view class="author">
-									<image class="picture" :src="item.author.avatar || '/static/images/f.png'"></image>
-									<text class="name">{{item.author.nickname}}</text>
-								</view>
-								<view @click="followAuthor(item)">
-									<view v-if="!item.relevance_id" class="follow focus">
-										<text class="iconfont icon-jiahao2"></text>关注
-									</view>
-									<view v-else class="follow focused">已关注</view>
-								</view>
-							</view>
-							<view class="product">
-								<productConSwiper :imgUrls="item.image"></productConSwiper>
-							</view>
-							<view class="pro_describle">
-								<view class="mentioned" v-if="item.relevance.length>0" @click="openMore(item)">
-									<text class="title">查看TA提到的宝贝({{item.relevance.length}})</text>
-									<view class="product_more">
-										<view class="item">
-											<image v-for="(itemn, indexn) in item.relevance" :key="indexn" :src="(itemn.spu&&itemn.spu.image)||itemn.image" class="more_image"></image>
-										</view>
-										<text class="iconfont icon-gengduo3"></text>
-									</view>
-								</view>
-								<view class="product_info">
-									<text class="text">
-										{{item.content}}
-									</text>
-									<text class="unfold_btn">展开</text>
-								</view>
-								<navigator v-if="item.topic" hover-class="none" class="product_cate" :url="'/pages/plantGrass/plant_search_list/index?id='+item.topic.topic_id">
-									<view>
-										<text class="icon">#</text><text class="text">{{item.topic.topic_name}}</text>
-									</view>
-								</navigator>
-								<view class="foot_bar">
-									<view class="item iconfont icon-fenxiang2"></view>
-									<view class="item">
-										<view class="item_count" @click.stop="likeToggle(item)">
-											<text class="iconfont" :class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
-											<text>{{item.count_start > 0 ? item.count_start : '点赞'}}</text>
-										</view>
-
-										<view class="item_count" @click="openCommon(item,index)">
-											<text class="iconfont icon-pinglun"></text>
-											<text>{{item.count_reply ? item.count_reply : '评论'}}</text>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</block>
-				</view>
-			</view>
-		</view>
-		<!-- 他提到的宝贝弹窗 -->
-		<uni-popup ref="mentioned" type="bottom">
-			<mentioned @close="close" :list="moreList"></mentioned>
-		</uni-popup>
-		<!-- 评论弹窗 -->
-		<comment ref="comment" :isShow="showComment" @close="close" @successFul="commentSucces"></comment>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-	</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>
-	// +----------------------------------------------------------------------
-	import WaterfallsFlow from '@/components/plantWaterfallsFlow/WaterfallsFlow.vue'
-	import mentioned from '@/components/mentioned.vue';
-	import comment from '@/components/comment.vue';
-	import {graphicLstApi, graphicStartApi, followAuthorApi} from '@/api/community.js';
-	import { getUserInfo } from '@/api/user.js';
-	import { mapGetters } from "vuex";
-	import authorize from '@/components/Authorize';
-	import productConSwiper from '@/components/productConSwiper';
-	const app = getApp();
-	export default {
-		components: {
-			authorize,
-			WaterfallsFlow,
-			productConSwiper,
-			mentioned,
-			comment
-		},
-		data() {
-			return {
-				featuredList: [], // 商铺商品
-				moreList: [],
-				commList: [], //评论列表
-				loading: false,
-				loaded: false,
-				loadTitle: '加载更多',
-				isShowAuth: false, //是否隐藏授权
-				isAuto: false, //没有授权的不会自动授权
-				where: {
-					topic_id: '',
-					page: 1,
-					limit: 30
-				},
-				showComment: false,
-			}
-		},
-		created() {
-
-		},
-		computed: {
-			...mapGetters(['isLogin']),
-		},
-		watch: {
-
-		},
-		onLoad: function(options) {
-			this.where.topic_id = options.id
-			this.getList();
-		},
-		onShow() {
-
-		},
-		mounted: function() {
-		},
-		methods: {
-			// 授权回调
-			onLoadFun() {
-				this.isShowAuth = false
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			// 打开授权
-			authOpen: function() {
-				let that = this;
-				if (that.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true;
-				}
-			},
-			// 获取关注商品
-			getList: function() {
-				let that = this;
-				if (that.loaded || that.loading) return;
-				that.loading = true;
-				that.loadTitle = '';
-				graphicLstApi(that.where).then(res => {
-					that.loading = false;
-					let list = res.data.list;
-					let featuredList = that.$util.SplitArray(list, that.featuredList);
-					that.loaded = list.length < that.where.limit;
-					that.loadTitle = loaded ? '已全部加载' : '加载更多';
-					that.$set(that, 'featuredList', featuredList);
-					that.$set(that.where, 'page', that.where.page + 1);
-				}).catch(err => {
-					that.loading = false;
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
-				});
-			},
-			likeToggle(item){
-				let status = item.relevance_id ? 0 : 1
-				graphicStartApi(item.community_id,{status: status}).then(res => {
-					if(item.relevance_id){
-						item.count_start--;
-						item.count_start = item.count_start == 0 ? 0 : item.count_start
-						item.relevance_id = false
-					}else{
-						item.count_start++;
-						item.relevance_id = true
-					}
-				});
-			},
-			// 关注作者
-			followAuthor: function(item) {
-				let status = item.relevance_id ? 0 : 1
-				followAuthorApi(item.uid,{status: status}).then(res => {
-					if (res.status === 200) {
-						item.relevance_id = item.relevance_id ? false : true
-					}
-					this.$util.Tips({
-						title: res.message
-					});
-				});
-			},
-			/*查看提到的宝贝*/
-			openMore(item){
-				this.$refs.mentioned.open();
-				this.moreList = item.relevance;
-			},
-			openCommon(item,index){
-				this.showComment = true
-				this.$refs.comment.getData(item,index);
-			},
-			commentSucces(index){
-				this.featuredList[index]['count_reply']++
-			},
-			close(){
-				this.$refs.mentioned.close();
-				this.showComment = false;
-			}
-		},
-		onReachBottom() {
-			this.getList();
-		},
-		onPullDownRefresh(){
-
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.main{
-		background: #ffffff;
-		min-height: 100vh;
-	}
-	.tab-cont{
-		background: #fff;
-		border-radius: 16rpx 16rpx 0 0;
-	}
-	.follow_count{
-		padding: 20rpx;
-		.list_count{
-			margin-bottom: 70rpx;
-		}
-		.title{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-		}
-		.author{
-			display: flex;
-			align-items: center;
-			.picture, uni-image{
-				width: 78rpx;
-				height: 78rpx;
-				border-radius: 100%;
-			}
-			.name{
-				margin-left: 20rpx;
-				color: #333333;
-				font-size: 32rpx;
-				font-weight: bold;
-			}
-		}
-		.follow{
-			margin-right: 10rpx;
-			width: 112rpx;
-			text-align: center;
-			line-height: 42rpx;
-			font-size: 22rpx;
-			border-radius: 33rpx;
-			&.focus{
-				color: #E93323;
-				border: 1px solid #E93323;
-				.iconfont{
-					font-size: 15rpx;
-					margin-right: 5rpx;
-				}
-			}
-			&.focused{
-				background: #EEEEEE;
-				border: 1px solid #EEEEEE;
-				color: #999999;
-			}
-		}
-		.product{
-			margin-top: 20rpx;
-			border-radius: 16rpx;
-		}
-	}
-	.pro_describle{
-		.mentioned{
-			padding: 20rpx 0;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			border-bottom: 1px solid #F5F5F5;
-			.title{
-				color: #666666;
-				font-size: 26rpx;
-			}
-		}
-		.product_more{
-			max-width: 360rpx;
-			display: flex;
-			align-items: center;
-			.more_image{
-				width: 58rpx;
-				height: 58rpx;
-				border-radius: 5rpx;
-				border: 1px solid #BBBBBB;
-				margin-right: 12rpx;
-			}
-			.iconfont{
-				color: #CCCCCC;
-				margin-left: 10rpx;
-			}
-		}
-		.product_info{
-			line-height: 45rpx;
-			margin: 20rpx 0;
-			.text{
-				font-size: 28rpx;
-				color: #282828;
-			}
-			.unfold_btn{
-				margin-left: 30rpx;
-				font-size: 30rpx;
-				color: #282828;
-				font-weight: bold;
-			}
-		}
-		.product_cate{
-			margin: 20rpx 0;
-			display: inline-block;
-			>view{
-				display: flex;
-				align-items: center;
-				background: #FFF3F2;
-				border-radius: 30rpx;
-				padding: 0 25rpx;
-				line-height: 56rpx;
-				height: 56rpx;
-				color: #E93323;
-				.text{
-					font-size: 28rpx;
-				}
-				.icon{
-					font-size: 35rpx;
-					font-weight: bold;
-					margin-right: 10rpx;
-				}
-			}
-		}
-		.foot_bar{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			.item{
-				display: flex;
-				align-items: center;
-				color: #282828;
-				&.icon-fenxiang2{
-					font-size: 46rpx;
-				}
-			}
-			.item_count{
-				font-size: 26rpx;
-				display: flex;
-				align-items: center;
-				&:first-child{
-					margin-right: 30rpx;
-				}
-				.iconfont{
-					font-size: 40rpx;
-					margin-right: 5rpx;
-				}
-				.icon-shoucang1{
-					color: #E93323;
-				}
-			}
-		}
-	}
-</style>
diff --git a/pages/plantGrass/plant_release/index.vue b/pages/plantGrass/plant_release/index.vue
deleted file mode 100644
index 13b26b8..0000000
--- a/pages/plantGrass/plant_release/index.vue
+++ /dev/null
@@ -1,818 +0,0 @@
-<template>
-	<view :style="viewColor">
-		<form @submit="formSubmit" report-submit='true'>
-			<view class="release_content">
-				<!-- v-if="community_app_switch.length == 1" -->
-				<view  class="release_tab acea-row">
-					<view class="tab_item" v-for="(item, index) in tabList" :key="item.value" :class="{on:tabActive == index}" @click="changeTab(index)">
-						<text class="iconfont" :class="item.icon"></text>{{item.name}}
-					</view>
-				</view>
-				<view>
-					<view class="release_item">
-						<view class="photo_count">
-							<view class="input_photo acea-row row-middle">	
-								<block v-if="tabActive == 1">
-									<view class="pictrue" v-if="formData.video_link">
-										<image class="video-bg" mode="widthFix" src="../static/images/video_bg.png"></image>
-										<view class="videoHover" @click="videoshow">
-											<view>
-												<text class="iconfont icon-24gf-play"></text>
-											</view>							
-										</view>
-										<text class="video-text">点击可预览视频</text>
-										<view class="close_btn" @click="formData.video_link = ''"><text class="iconfont icon-guanbi4"></text></view>
-									</view>
-									<view v-else class="pictrue acea-row row-center-wrapper row-column add" @click="uploadVideo">
-										<view><text class='iconfont icon-tianjiashipin'></text></view>
-										<view class="text">添加视频</view>	
-									</view>
-									<view class="pictrue acea-row row-center-wrapper row-column add" @click.stop="clk">
-										<view><text class='iconfont icon-fengmian'></text></view>
-										<view class="text">添加封面</view>	
-									</view>
-								</block>
-								<view class="pictrue" v-for="(item, index) in formData.image" :key="index">
-									<easy-loadimage mode="widthFix" :image-src="item"></easy-loadimage>
-									<text class="cover_text" v-if="tabActive == 2">封面</text>
-									<view class="close_btn" @click="DelPic(index)"><text class="iconfont icon-guanbi4"></text></view>
-								</view>
-								<block  v-if="tabActive == 0">
-									<view v-if="formData.image.length < 6" class="pictrue acea-row row-center-wrapper row-column add" @click.stop="clk">
-										<view><text class='iconfont icon-icon25201'></text></view>
-										<view class="text">添加图片</view>	
-									</view>
-								</block>
-								<view v-if="showCd" :ratio="16/9" class="container">
-									<bt-cropper ref="cropper" :imageSrc="imageSrc" @cropEnd="loadImage" :dWidth="800">
-										<!-- 你想插入的内容 -->
-										<button class="crop_btn" @click="crop">裁切</button>
-									</bt-cropper>
-								</view>
-							</view>
-						</view>
-						<view class="textarea">
-							<textarea placeholder='分享使用体验和心得，获得更多点赞和关注哦~(600字以内)' name="comment" placeholder-class='placeholder'v-model="formData.content" maxlength="600"></textarea>
-						</view>
-					</view>
-					<view class="release_item">
-						<view class='item acea-row row-between-wrapper'>
-							<view class='name'><text class="iconfont icon-baobeilianjie"></text>添加宝贝({{productList.length}})</view>
-							<view class="select">
-								<view class="select_count" @click.stop="addProduct">
-									<text v-if="productList.length == 0" class="text">选择商品</text>
-									<view v-else class="text">
-										<image class="image" v-for="(item,index) in productList" :key="index" :src="item.image || (item.spu && item.spu.image)"></image>
-									</view>
-									<text class="iconfont icon-xiangyou"></text>
-								</view>
-							</view>
-						</view>
-						<view class='item acea-row row-between-wrapper'>
-							<view class='name'><text class="iconfont icon-canyuhuati"></text>参与话题</view>
-							<view class="select">
-								<view class="select_count" @click="addTopic">
-									<text v-if="!topicName.topic_name"class="text">选择话题</text>
-									<text v-else class="text_name" @click.stop="deleteTopic">
-										<text class="icon">#</text>
-										<text class="title">{{topicName.topic_name}}</text>
-										<text class="iconfont icon-guanbi5"></text>
-									</text>
-									<text class="iconfont icon-xiangyou"></text>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<button class="release_btn button" form-type="submit">发布</button>
-			</view>
-		</form>
-		<!--视频预览弹窗-->
-		<view v-if="showVideo" class="video-count">
-			<!--#ifndef APP-PLUS-->
-			<video id="myVideo" class="videoLink" autoplay loop muted :src="formData.video_link"></video>
-			<!--#endif-->
-			<!--#ifdef APP-PLUS-->
-		
-			<video id="myVideo" class="videoLink" autoplay loop
-			 :src='formData.video_link && (formData.video_link.substring(0,4) == "http" || formData.video_link.substring(0,5) == "https") ? formData.video_link : "http:" + formData.video_link'
-			></video>
-			<!--#endif-->
-		</view>
-		<view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
-		<avatar @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx" selHeight="250upx"></avatar>
-		<!-- 提到的宝贝弹窗 -->
-		<uni-popup ref="associated" type="bottom">
-			<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
-		</uni-popup>
-		<!-- 话题弹窗 -->
-		<uni-popup ref="participateTopic" type="bottom">
-			<participate-topic @close="close" @getTopic="getTopic"></participate-topic>
-		</uni-popup>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-	</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>
-	// +----------------------------------------------------------------------
-	import { mapGetters } from "vuex";
-	import authorize from '@/components/Authorize';
-	import avatar from "@/components/yq-avatar/yq-avatar.vue";
-	import associated from '../components/associated.vue';
-	import participateTopic from '../components/participateTopic.vue';
-	import {TOKENNAME, HTTP_REQUEST_URL} from '@/config/app.js';
-	import {createPlantApi, updatePlantApi, plantDetailApi, orderAssociatePlantApi} from "@/api/community";
-	import { setStorage, getStorage } from '../../../libs/uniApi.js';
-	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-	import { configMap } from '@/utils';
-	import store from '@/store';
-	export default {
-		components: {
-			avatar,
-			associated,
-			participateTopic,
-			authorize,
-			easyLoadimage
-		},
-		data() {
-			return {
-				formData: {
-					image: [],
-					content: "",
-					topic_id: "",
-					spu_id: [],
-					video_link: ''
-				},
-				imageSrc: '',
-				productList: [],
-				topicName: {},
-				isUpload: true,
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				showCd: false,
-				id: "",
-				order_id: "",
-				imgName: "",
-				upload_max: 50,
-				uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
-				tabList: [
-					{name: '图文', value: 1, icon: 'icon-tuwen'},
-					{name: '视频', value: 2, icon: 'icon-shipin'},
-				],
-				tabActive: 1,
-				isPlay: false,
-				videoContext: "",
-				video_link: "",
-				showVideo: false,
-				videoplay: false,
-				videoContext: ''
-			};
-		},
-		computed: {
-			...mapGetters(['isLogin', 'viewColor', 'uid']),
-			...configMap({community_app_switch: []})
-		},
-		watch:{},
-		mounted() {
-			// #ifndef APP-PLUS
-			this.videoContext = uni.createVideoContext('myVideo', this);
-			// #endif
-		},
-		onLoad(options) {
-			
-			this.id = options.id;
-			this.order_id = options.order_id;
-			this.tabActive = options.type || 1;
-			if(this.community_app_switch.length == 1){
-				this.tabActive = this.community_app_switch[0]
-			}
-			if (!this.isLogin)  {
-				this.isAuto = true;
-				this.isShowAuth = true
-			}else{
-				if(this.id){
-					this.getDetail()
-				} else {
-					const data = getStorage('addPlant');
-					this.tabActive = getStorage('tabActive');
-					if(data){
-						this.formData.content = data.content || '';
-						this.formData.image = data.image || [];
-						this.formData.video_link = data.video_link || ''
-					}
-				}
-				if(this.order_id)this.getOrderGoods()
-			}
-			this.videoContext = uni.createVideoContext("myvideo", this);
-		},
-		methods: {
-			onLoadFun() {
-				this.isShowAuth = false;
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e;
-			},			
-			/*获取图文详情*/
-			getDetail(){
-				let that = this
-				plantDetailApi(that.id).then(res => {
-					that.formData = res.data
-					that.productList = res.data.relevance || []
-					that.topicName = res.data.topic || {}
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-				})
-			},
-			/*获取关联订单商品*/
-			getOrderGoods(){
-				let that = this
-				orderAssociatePlantApi(that.order_id).then(res => {
-					that.productList = res.data || []
-					that.formData.spu_id = res.data.map(val => val.spu_id)
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-				})
-			},
-			/*切换tab*/
-			changeTab(index) {
-			
-				
-				this.tabActive =index
-				this.formData.image = []
-			},
-			/*删除话题*/
-			deleteTopic(){
-				this.formData.topic = {}
-				this.topicName = {}
-			},
-			clk() {
-				let that = this
-				uni.chooseImage({
-					count: 1,
-					sizeType: ['original'],
-					success: (res) => {
-						// console.log(res)	
-						let tempFilePaths = res.tempFilePaths[0]
-						//#ifdef APP-PLUS
-						if(uni.getSystemInfoSync().platform == 'ios'){
-							that.doUpload(tempFilePaths)
-						}else{
-							let size = res.tempFiles[0].size/1024
-							if(size >= 1){
-								uni.compressImage({
-									src: tempFilePaths,
-									quality: 80, // 仅对jpg有效
-									success: res => {
-										that.imageSrc = res.tempFilePath;
-										that.showCd = true;
-									},
-									fail: err => {
-										// console.log('失败了compressImage', tempFilePaths);
-										that.imageSrc = tempFilePaths
-										that.showCd = true
-									}
-								})
-							}else{
-								that.imageSrc = tempFilePaths
-								that.showCd = true
-							}
-						}
-						//#endif
-						//#ifndef APP-PLUS
-							that.imageSrc = tempFilePaths
-							that.showCd = true
-						//#endif
-					}
-				})
-			},
-			crop(){
-				uni.showLoading({
-					title: '',
-					mask: true
-				})
-			  // 通过组件定义的ref调用cropper方法，返回一个promise对象
-			  this.$refs.cropper.crop().then(([err,res])=>{
-					if(!err){
-						uni.hideLoading()
-						this.doUpload(res.tempFilePath)
-					}else{
-						uni.hideLoading()
-						// console.log(err)
-					}
-				})
-			},
-			loadImage() {
-				this.showCd = false
-			},
-			doUpload(rsp) {
-				let that = this
-				uni.showLoading({
-					title: '上传中',
-					mask: true
-				})
-				uni.uploadFile({
-					url: HTTP_REQUEST_URL + '/api/upload/image/field',
-					filePath: rsp,
-					name: 'field',
-					formData: {
-						'filename': rsp,
-						'name': that.imgName
-					},
-					header: {
-						// #ifdef MP
-						"Content-Type": "multipart/form-data",
-						// #endif
-						[TOKENNAME]: 'Bearer ' + store.state.app.token
-					},
-					success: (uploadFileRes) => {
-						let imgData = JSON.parse(uploadFileRes.data)
-						if(imgData.data.path){
-							that.formData.image.push(imgData.data.path)
-							uni.hideLoading()
-						}
-					},
-					complete(res) {}
-				});
-			},
-			// 上传视频
-			uploadVideo() {
-				let that = this
-				uni.chooseVideo({
-					sourceType: ['camera', 'album'],
-					success: res => {
-						uni.showLoading({
-							title: '视频上传中',
-						});
-						if (Math.ceil(res.size / 1024) < that.upload_max * 1024) {
-							uni.uploadFile({
-								url: that.uploadUrl, //仅为示例，非真实的接口地址
-								filePath: res.tempFilePath,
-								name: 'file',
-								//请求参数
-								formData: {
-									user: 'test'
-								},
-								header: {
-									// #ifdef MP
-									'Content-Type': 'multipart/form-data',
-									// #endif
-									[TOKENNAME]: 'Bearer ' + store.state.app.token
-								},
-								success: uploadFileRes => {
-									uni.hideLoading();
-									let data = JSON.parse(uploadFileRes.data);
-									that.formData.video_link = (data.data.src);
-								},
-								complete: a => {
-									uni.hideLoading();
-								},
-								fail: function(res) {
-									uni.hideLoading();
-									that.Tips({
-										title: res.message
-									});
-								}
-								
-							});
-						} else {
-							uni.hideLoading();
-							uni.showModal({
-								title: '提示',
-								content: `视频超出限制${that.upload_max}MB`
-							});
-						}
-					},
-					fail: err => {
-						that.$util.Tips({
-							title: err
-						});
-					}
-				});
-			},
-			getImgName(name){
-				this.imgName = name
-			},
-			/**删除图片*/
-			DelPic: function(index) {
-				let that = this
-				that.formData.image.splice(index, 1);
-			},
-			/*添加宝贝*/
-			addProduct(){
-				this.$refs.associated.open();
-			},
-			/*添加话题*/
-			addTopic(){
-				this.$refs.participateTopic.open();
-			},
-			close(){
-				this.$refs.associated.close();
-				this.$refs.participateTopic.close();
-			},
-			/*查看视频*/
-			videoshow() {
-				this.showVideo = true
-				this.videoContext = uni.createVideoContext('myVideo', this);
-				this.$nextTick(()=>{
-					this.videoContext.play();
-				})
-			},
-			screenChange(e) {
-				let fullScreen = e.detail.fullScreen; //值true为进入全屏，false为退出全屏 
-				if (!fullScreen) { 
-					this.videoplay = false
-					//退出全屏 this.videoplay = false; // 隐藏播放盒子 
-				} 
-			},
-			/*获取选中的宝贝*/
-			getProduct(data){
-				this.productList = data;
-				this.formData.spu_id = data.map(val => val.spu_id)
-				this.$refs.associated.close();
-			},
-			/*获取选中的话题*/
-			getTopic(item){
-				if(!item.topic_id){
-					this.topicName = {}
-				}else{
-					this.topicName = item
-				}
-				this.formData.topic_id = item.topic_id;
-				this.$refs.participateTopic.close();
-			},
-			/**
-			 * 提交数据
-			 */
-			formSubmit: function(e) {
-				let that = this;
-				let value = that.formData;
-				if (!that.isLogin)  {
-					that.isAuto = true;
-					that.isShowAuth = true;
-					if(!that.id){
-						setTimeout(()=>{
-							setStorage('addPlant', value);
-							setStorage('tabActive', that.tabActive);
-						});
-					}
-				}else{
-			
-					if (value.image.length == 0) return that.$util.Tips({
-						title: '请添加话题图片'
-					});
-					if (!value.content) return that.$util.Tips({
-						title: '请分享使用心得和体会'
-					});
-					if(that.tabActive == 2 && !value.video_link){
-						return that.$util.Tips({
-							title: '请添加话题视频'
-						});
-					}
-					if(that.id){
-						if (value.relevance.length){
-							value.spu_id = value.relevance.map(val => (val.spu&&val.spu.spu_id) || val.spu_id)
-						}
-					}
-					value.order_id = that.order_id
-					value.is_type = that.tabActive
-					uni.showLoading({
-						title: '保存中',
-						mask: true
-					})
-					that.id ? updatePlantApi(that.id, value).then(res => {
-						uni.hideLoading()
-						that.$util.Tips({
-							title: res.messge,
-							icon: 'success'
-						});
-						if(that.tabActive == 2){
-							uni.navigateTo({
-								//#ifdef APP
-								url: '/pages/short_video/appSwiper/index?id='+res.data.community_id+'&user=1&uid='+that.uid
-								//#endif
-								//#ifndef APP
-								url: '/pages/short_video/nvueSwiper/index?id='+res.data.community_id+'&user=1&uid='+that.uid
-								//#endif
-							});
-						}else{
-							uni.redirectTo({
-								url:'/pages/plantGrass/plant_detail/index?id='+res.data.community_id+'&type='+that.tabActive
-							})
-						}
-					}).catch(err => {
-						return that.$util.Tips({
-							title: err
-						});
-					}) : createPlantApi(value).then(res => {
-						uni.hideLoading()
-						that.$util.Tips({
-							title: res.messge,
-							icon: 'success'
-						});
-						setStorage('addPlant', '');
-						setStorage('tabActive',1)
-
-						if(that.tabActive == 2){
-							uni.navigateTo({
-								//#ifdef APP
-								url: '/pages/short_video/appSwiper/index?id='+res.data.community_id+'&user=1&uid='+that.uid
-								//#endif
-								//#ifndef APP
-								url: '/pages/short_video/nvueSwiper/index?id='+res.data.community_id+'&user=1&uid='+that.uid
-								//#endif
-							});
-						}else{
-							uni.redirectTo({
-								url:'/pages/plantGrass/plant_detail/index?id='+res.data.community_id+'&type='+that.tabActive
-							})
-						}
-					}).catch(err => {
-						return that.$util.Tips({
-							title: err
-						});
-					})
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page{
-		background: #F5F5F5;
-	}
-	.crop_btn{
-		line-height: 90rpx;
-		height: 90rpx;
-		height: calc(90rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		height: calc(90rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-	}
-	.container{
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 20;
-		width: 750rpx;
-		height:100vh;
-	}
-	.release_content{
-		margin-top: 30rpx;
-		.release_tab{
-			border-radius: 16rpx 16rpx 0 0;
-			border-bottom: 1rpx solid #E4E4E4;
-			background: #fff;
-			align-items: center;
-			justify-content: center;
-			height: 86rpx;
-			.tab_item{
-				margin: 0 40rpx;
-				font-size: 32rpx;
-				color: #999;
-				position: relative;
-				line-height: 86rpx;
-				cursor: pointer;
-				&.on{
-					color: #E93323;
-					&::after{
-						content: "";
-						display: inline-block;
-						width: 100%;
-						height: 3rpx;
-						background: #E93323;
-						position: absolute;
-						bottom: 2rpx;
-						left: 0;
-					}
-				}
-				.iconfont{
-					margin-right: 10rpx;
-					font-size: 32rpx;
-				}
-			}
-		}
-		padding: 0 20rpx;
-		.release_item{
-			background: #ffffff;
-			padding: 0 30rpx;
-			border-radius: 10rpx;
-		}
-		.photo_count{
-			padding: 30rpx 0;
-		}
-	}
-	/deep/.input_photo .easy-loadimage,/deep/.input_photo uni-image,/deep/.input_photo image{
-		width: 180rpx;
-		height: 180rpx;
-		border-radius: 12rpx!important;
-	}
-	.input_photo .pictrue{
-		width: 180rpx;
-		height: 180rpx;
-		border-radius: 12rpx!important;
-		margin-right: 11rpx;
-		position: relative;
-		overflow: hidden;
-		&:nth-child(3n){
-			margin-right: 0;
-		}
-		.close_btn{
-			width: 30rpx;
-			height: 30rpx;
-			background: rgba(0,0,0,.6);
-			border-radius: 0 12rpx 0 12rpx;
-			position: absolute;
-			top: 0;
-			right: 0;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			z-index: 10;
-			.iconfont{
-				color: #ffffff;
-				font-size: 12rpx;
-			}
-		}
-		.cover_text{
-			display: flex;
-			width: 58rpx;
-			height: 29rpx;
-			background: #E93323;
-			border-radius: 0px 12rpx 0px 12rpx;
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			z-index: 10;
-			align-items: center;
-			justify-content: center;
-			font-size: 18rpx;
-			color: #fff;
-		}
-	}
-	/deep/.loading-img{
-		width: 180rpx;
-		height: 180rpx;
-		border-radius: 12rpx;
-	}
-	.input_photo .pictrue{
-		margin-bottom: 20rpx;
-		.videoHover{
-			width: 180rpx;
-			height: 180rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: 10;
-			>view{
-				width: 50rpx;
-				height: 50rpx;
-				background: #000000;
-				border-radius: 50rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				.iconfont{
-					color: #ffffff;
-					font-size: 21rpx;
-				}
-			}	
-		}
-		.video-text{
-			display: block;
-			width: 180rpx;
-			text-align: center;
-			color: #ffffff;
-			font-size: 18rpx;
-			z-index: 13;
-			position: absolute;
-			bottom: 20rpx;
-		}
-		video{
-			width: 180rpx;
-			height: 180rpx;
-			border-radius: 12rpx;
-		}
-	}
-	.input_photo .add{
-		background: #f6f6f6;
-		color: #666666;
-		.iconfont{
-			font-size: 50rpx;
-		}
-		.text{
-			margin-top: 20rpx;
-			font-size: 27rpx;
-		}
-	}
-	.textarea textarea {
-		font-size: 28rpx;
-		padding-bottom: 38rpx;
-		width: 100%;
-		box-sizing: border-box;
-		height: 400rpx;
-		overflow: hidden;
-	}
-	.textarea .placeholder {
-		color: #BBBBBB;
-	}
-	.release_item .item{
-		height: 106rpx;
-		border-bottom: 1rpx solid #eee;
-		position: relative;
-		font-size: 30rpx;
-		&:last-child{
-			border-bottom: none;
-		}
-		.name{
-			color: #333333;
-			.iconfont {
-				margin-right: 10rpx;
-				font-size: 28rpx;
-			}
-		}
-		.select{
-			color: #bbbbbb;
-			.select_count{
-				display: flex;
-				align-items: center;
-			}
-			.text{
-				margin-right: 15rpx;
-				display: flex;
-				align-items: center;
-				.image,image,uni-image{
-					width: 60rpx;
-					height: 60rpx;
-					margin-right: 5rpx;
-				}
-			}
-			.iconfont{
-				font-size: 24rpx;
-			}
-			.text_name{
-				color: var(--view-theme);
-				padding: 5rpx 12rpx;
-				background: var(--view-minorColor);
-				border-radius: 23rpx;
-				font-size: 24rpx;
-				margin-right: 10rpx;
-				.icon{
-					color: var(--view-theme);
-					font-weight: bold;
-					font-size: 24rpx;
-				}
-				.title{
-					margin: 0 10rpx;
-				}
-				.iconfont{
-					font-size: 16rpx;
-				}
-			}
-		}
-	}
-	.button{
-		width: 710rpx;
-		height: 86rpx;
-		line-height: 86rpx;
-		color: #ffffff;
-		text-align: center;
-		font-size: 32rpx;
-		background: var(--view-theme);
-		border-radius: 43rpx;
-	}
-	.release_btn{
-		margin-top: 160rpx;
-	}
-	.video-count{
-		position: fixed;
-		width: 600rpx;
-		height: 500rpx;
-		top: 50%;
-		left: 50%;
-		margin-left: -300rpx;
-		margin-top: -250rpx;
-		z-index: 100;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		.videoLink{
-			width: 600rpx;
-			height: 500rpx;
-		}
-	}
-</style>
diff --git a/pages/plantGrass/plant_search/index.vue b/pages/plantGrass/plant_search/index.vue
deleted file mode 100644
index ee31038..0000000
--- a/pages/plantGrass/plant_search/index.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<template>
-	<view>
-		<view class='searchGood'>
-			<view class='search acea-row row-between-wrapper'>
-				<view class='input acea-row row-between-wrapper'>
-					<text class='iconfont icon-sousuo2'></text>
-					<input type='text' :value='searchValue' :focus="focus" placeholder='请输入关键字' placeholder-class='placeholder'
-					 @input="setValue" confirm-type="search" @confirm="searchBut()"></input>
-				</view>
-				<view class='bnt' @tap='searchCancle'>取消</view>
-			</view>
-			<view class='title'>历史记录 <text class="iconfont icon-shanchu" @click="remove"></text></view>
-			<view class='list acea-row' :style="{'height':historyBox?'auto':'150rpx'}" v-if="historyList.length > 0">
-				<block v-for="(item,index) in historyList" :key="index">
-					<view class='item line1' @tap='setHotSearchValue(item,0)'>{{item}}</view>
-				</block>
-			</view>
-			<view>
-				<view class="more-btn" v-if="historyList.length>9 && !historyBox" @click="historyBox = true">
-					展开全部<text class="iconfont icon-xiangxia"></text>
-				</view>
-				<view class="more-btn" v-if="historyList.length>9 && historyBox" @click="historyBox = false">
-					收起<text class="iconfont icon-xiangshang"></text>
-				</view>
-			</view>
-			<view v-if="historyList.length == 0" style="text-align: center; color: #999;">暂无搜索历史~</view>
-			<view class='title'>热门搜索</view>
-			<view class='list acea-row' :style="{'height': hotSearchBox?'auto':'150rpx'}">
-				<block v-for="(item,index) in hotSearchList" :key="index">
-					<view class='item line1' @tap='setHotSearchValue(item,1)'>{{item.keyword}}</view>
-				</block>
-			</view>
-			<view>
-				<view class="more-btn" v-if="hotSearchList.length>8 && !hotSearchBox" @click="hotSearchBox = true">
-					展开全部<text class="iconfont icon-xiangxia"></text>
-				</view>
-				<view class="more-btn" v-if="hotSearchList.length>8 && hotSearchBox" @click="hotSearchBox = false">
-					收起<text class="iconfont icon-xiangshang"></text>
-				</view>
-			</view>
-		</view>
-	</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>
-	// +----------------------------------------------------------------------
-	import { hotSearchLst } from '@/api/community.js';
-	export default {
-		data() {
-			return {
-				hostProduct: [],
-				searchValue: '',
-				focus: true,
-				hotSearchList: [],
-				page: 1,
-				loading: false,
-				loadend: false,
-				loadTitle: '加载更多',
-				isScroll: true,
-				// 搜索历史
-				historyList: [],
-				// 临时搜索列表
-				tempStorage: [],
-				historyBox: false,
-				hotSearchBox: false,
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-			};
-		},
-		onLoad() {
-
-		},
-		onShow: function() {
-			try {
-				this.historyList = []
-				this.tempStorage = []
-				let arr = uni.getStorageSync('historyPlant')
-				if (arr.length > 0) {
-					this.historyList = arr
-				} else {
-					this.historyList = []
-				}
-				this.tempStorage = this.historyList
-			} catch (e) {}
-			this.getRoutineHotSearch();
-		},
-		methods: {
-			// 清空历史记录
-			remove() {
-				let self = this
-				uni.showModal({
-					title: '提示',
-					content: '确认删除全部历史搜索记录？',
-					success: function(res) {
-						if (res.confirm) {
-							self.tempStorage = []
-							try {
-								uni.setStorageSync('historyPlant', self.tempStorage)
-								self.historyList = []
-							} catch (e) {}
-						} else if (res.cancel) {
-							// console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			getRoutineHotSearch: function() {
-				let that = this;
-				hotSearchLst().then(res => {
-					that.$set(that, 'hotSearchList', res.data);
-				});
-			},
-			setHotSearchValue: function(event, key) {
-				this.focus = false
-				if (key) {
-					this.$set(this, 'searchValue', event.keyword);
-				} else {
-					this.$set(this, 'searchValue', event);
-				}
-				this.$nextTick(() => {
-					this.focus = true
-				})
-				this.searchBut()
-			},
-			setValue: function(event) {
-				this.$set(this, 'searchValue', event.detail.value);
-			},
-			searchBut: function() {
-				let status = false
-				this.tempStorage.forEach((el, index) => {
-					if (el == this.searchValue) {
-						status = true
-					}
-				})
-				if (!status && this.searchValue) {
-					this.tempStorage.unshift(this.searchValue)
-				}
-				try {
-					uni.setStorageSync('historyPlant', this.tempStorage);
-				} catch (e) {}
-					
-				uni.navigateTo({
-					url: '/pages/plantGrass/plant_search_list/index?searchValue=' + this.searchValue
-				})													
-			},
-			searchCancle(){
-				uni.navigateBack();
-			}
-		}
-	}
-</script>
-
-<style>
-	page {
-		background-color: #fff;
-	}
-</style>
-<style lang="scss" scoped>
-	.searchGood .search {
-		padding-left: 30rpx;
-		margin-top: 20rpx;
-	}
-	.searchGood .search .input {
-		width: 598rpx;
-		background-color: #f7f7f7;
-		border-radius: 33rpx;
-		padding: 0 35rpx;
-		box-sizing: border-box;
-		height: 66rpx;
-	}
-	.searchGood .search .input input {
-		width: 472rpx;
-		font-size: 28rpx;
-	}
-	.searchGood .search .input .placeholder {
-		color: #bbb;
-	}
-	.searchGood .search .input .iconfont {
-		color: #000;
-		font-size: 35rpx;
-	}
-	.searchGood .search .bnt {
-		width: 120rpx;
-		text-align: center;
-		height: 66rpx;
-		line-height: 66rpx;
-		font-size: 30rpx;
-		color: #282828;
-	}
-	.searchGood .title {
-		position: relative;
-		font-size: 28rpx;
-		color: #282828;
-		margin: 50rpx 30rpx 25rpx 30rpx;
-		.icon-shanchu {
-			position: absolute;
-			right: 0;
-			top: 50%;
-			transform: translateY(-50%);
-			color: #999;
-		}
-	}
-	.searchGood .list {
-		padding: 0 10rpx;
-		overflow: hidden;
-	}
-	.searchGood .list .item {
-		font-size: 26rpx;
-		color: #666;
-		padding: 0 21rpx;
-		height: 60rpx;
-		background: rgba(242, 242, 242, 1);
-		border-radius: 22rpx;
-		line-height: 60rpx;
-		margin: 0 0 20rpx 20rpx;
-		max-width: 150rpx;
-	}
-	.searchGood .line {
-		border-bottom: 1rpx solid #eee;
-		margin: 20rpx 30rpx 0 30rpx;
-	}
-	.more-btn {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin: 0 0 20rpx 20rpx;
-		height: 60rpx;
-		font-size: 24rpx;
-		color: #999;
-		.iconfont {
-			font-size: 22rpx;
-			margin-left: 10rpx;
-		}
-	}
-</style>
diff --git a/pages/plantGrass/plant_search_list/index.vue b/pages/plantGrass/plant_search_list/index.vue
deleted file mode 100644
index 6645dc5..0000000
--- a/pages/plantGrass/plant_search_list/index.vue
+++ /dev/null
@@ -1,202 +0,0 @@
-<template>
-	<view>
-		<view class="main">
-			<view class='search acea-row row-between-wrapper'>
-				<view class='input acea-row row-between-wrapper'>
-					<text class='iconfont icon-sousuo2'></text>
-					<input type='text' :value='searchValue' :focus="focus" placeholder='请输入关键字' placeholder-class='placeholder' @input="setValue" confirm-type="search" @confirm="searchBut()"></input>
-				</view>
-				<view class='bnt' @tap='searchBut'>搜索</view>
-			</view>
-			<view class="tab-cont">
-				<view v-if="goods.length" class="goods-wrap">
-					<view class="goods">
-						<WaterfallsFlow :wfList='goods' :isFind="false" :isAuth="false"/>
-					</view>
-				</view>
-				<view :hidden="!loading" class="acea-row row-center-wrapper loadingicon">
-					<text class="iconfont icon-jiazai loading"></text>
-				</view>
-				<emptyPage v-if="goods.length == 0 && !loading" title="暂无文章~"></emptyPage>
-			</view>
-		</view>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-	</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>
-	// +----------------------------------------------------------------------
-	import WaterfallsFlow from '@/components/plantWaterfallsFlow/WaterfallsFlow.vue'
-	import { graphicLstApi } from '@/api/community.js';
-	import { mapGetters } from "vuex";
-	import authorize from '@/components/Authorize';
-	import emptyPage from '@/components/emptyPage.vue'
-	const app = getApp();
-	export default {
-		components: {
-			authorize,
-			emptyPage,
-			WaterfallsFlow,
-		},
-		data() {
-			return {
-				focus: false,
-				goods: [], // 商铺商品
-				keyword: '',
-				loaded: false,
-				loading: false,
-				loadTitle: '加载更多',
-				isShowAuth: false, //是否隐藏授权
-				isAuto: false, //没有授权的不会自动授权
-				where: {
-					keyword: '',
-					page: 1,
-					limit: 10,
-					topic_id: ''
-				},
-				searchValue: ""
-			}
-		},
-		created() {},
-		computed: {
-			...mapGetters(['isLogin', 'uid']),
-		},
-		watch: {},
-		onLoad: function(options) {
-			this.where.keyword = this.searchValue =  options.searchValue ? options.searchValue : ''
-			this.where.topic_id = options.id ? options.id : ''
-			this.getGoods();
-		},
-		onShow() {},
-		mounted: function() {},
-		methods: {
-			// 授权回调
-			onLoadFun() {
-				this.isShowAuth = false
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			// 打开授权
-			authOpen: function() {
-				let that = this;
-				if (that.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				}
-			},
-			setValue: function(event) {
-				this.$set(this.where, 'keyword', event.detail.value);
-			},
-			searchBut(){
-				this.loadend = this.loading = false
-				this.where.page = 1
-				this.goods = []
-				this.getGoods()
-			},
-			// 获取关注商品
-			getGoods: function() {
-				let that = this;
-				if (that.loadend) return;
-				if (that.loading) return;
-				that.loading = true;
-				that.loadTitle = '';
-				graphicLstApi(that.where).then(res => {
-					that.loading = false;
-					let list = res.data.list;
-					let goodsList = that.$util.SplitArray(list, that.goods);
-					let loadend = list.length < that.where.limit;
-					that.loadend = loadend;
-					that.loading = false;
-					that.loadTitle = loadend ? '已全部加载' : '加载更多';
-					that.$set(that, 'goods', goodsList);
-					that.$set(that.where, 'page', that.where.page + 1);
-				}).catch(err => {
-					that.loading = false;
-					that.goodsLoading = false;
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
-				});
-			},
-		},
-		onReachBottom() {
-			this.getGoods();
-		},
-		onPullDownRefresh(){}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.main .search {
-		padding: 20rpx 0 0 10rpx;
-	}
-	.main .search .input {
-		width: 580rpx;
-		background-color: #f7f7f7;
-		border-radius: 33rpx;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		height: 66rpx;
-	}
-	.main .search .input input {
-		width: 460rpx;
-		font-size: 28rpx;
-	}
-	.main .search .input .placeholder {
-		color: #bbb;
-	}
-	.main .search .input .iconfont {
-		color: #000;
-		font-size: 35rpx;
-	}
-	.main .search .bnt {
-		width: 120rpx;
-		text-align: center;
-		height: 66rpx;
-		line-height: 66rpx;
-		font-size: 28rpx;
-		color: #282828;
-	}
-	.main {
-		background: #ffffff;
-		padding: 0 20rpx;
-		min-height: 100vh;
-		.goods-wrap{
-			margin-top: 20rpx;
-		}
-	}
-	.goods {
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
-		width: 750rpx;
-	}
-	.empty-box{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		margin-top: 0;
-		padding-top: 200rpx;
-		image{
-			width: 414rpx;
-			height: 240rpx;
-		}
-		.txt{
-			font-size: 26rpx;
-			color: #999;
-		}
-	}
-</style>
diff --git a/pages/plantGrass/plant_show/index.vue b/pages/plantGrass/plant_show/index.vue
deleted file mode 100644
index 209768d..0000000
--- a/pages/plantGrass/plant_show/index.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-	<view :style="viewColor">
-		<view class="main">
-			<view class="show_main area-row">
-				<view class="picture">
-					<image :src="proInfo.image"></image>
-				</view>
-				<view class="show_info">
-					<view class="show_name line1">{{proInfo.store_name}}</view>
-					<view class="show_count"><text class="num">{{count}}</text>条买家秀</view>
-				</view>
-			</view>
-			<view class="tab-cont">
-				<view v-if="goods.length" class="goods-wrap">
-					<view class="goods">
-						<WaterfallsFlow :wfList='goods' :isFind="false" :isShow="true" :isAuth="false"/>
-					</view>
-				</view>
-				<view :hidden="!loading" class="acea-row row-center-wrapper loadingicon">
-					<text class="iconfont icon-jiazai loading"></text>
-				</view>
-				<emptyPage v-if="goods.length == 0 && !loading" title="暂无文章~"></emptyPage>
-			</view>
-		</view>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-	</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>
-	// +----------------------------------------------------------------------
-	import WaterfallsFlow from '@/components/plantWaterfallsFlow/WaterfallsFlow.vue'
-	import { graphicLstApi, graphicProApi} from '@/api/community.js';
-	import { mapGetters } from "vuex";
-	import authorize from '@/components/Authorize';
-	import emptyPage from '@/components/emptyPage.vue'
-	const app = getApp();
-	export default {
-		components: {
-			authorize,
-			emptyPage,
-			WaterfallsFlow,
-		},
-		data() {
-			return {
-				focus: false,
-				goods: [], // 商铺商品
-				count: 0, //买家秀条数
-				keyword: '',
-				loaded: false,
-				loading: false,
-				loadTitle: '加载更多',
-				isShowAuth: false, //是否隐藏授权
-				isAuto: false, //没有授权的不会自动授权
-				proInfo: {},
-				where: {
-					keyword: '',
-					page: 1,
-					limit: 30,
-					topic_id: '',
-					spu_id: ''
-				},
-			}
-		},
-		created() {},
-		computed: {
-			...mapGetters(['isLogin','uid','scrollTop','viewColor']),
-		},
-		watch: {},
-		onLoad: function(options) {
-			this.where.spu_id = options.spu_id
-			this.getGoods();
-			this.getProDetail();
-		},
-		onShow() {},
-		mounted: function() {},
-		methods: {
-			// 授权回调
-			onLoadFun() {
-				this.isShowAuth = false
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			// 打开授权
-			authOpen: function() {
-				let that = this;
-				if (that.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				}
-			},
-			// 获取关注商品
-			getGoods: function() {
-				let that = this;
-				if (that.loadend) return;
-				if (that.loading) return;
-				that.loading = true;
-				that.loadTitle = '';
-				graphicLstApi(that.where).then(res => {
-					that.loading = false;
-					let list = res.data.list;
-					let goodsList = that.$util.SplitArray(list, that.goods);
-					let loadend = list.length < that.where.limit;
-					that.loadend = loadend;
-					that.loading = false;
-					that.count = res.data.count;
-					that.loadTitle = loadend ? '已全部加载' : '加载更多';
-					that.$set(that, 'goods', goodsList);
-					that.$set(that.where, 'page', that.where.page + 1);
-				}).catch(err => {
-					that.loading = false;
-					that.goodsLoading = false;
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
-				});
-			},
-			getProDetail(){
-				let that = this
-				graphicProApi(that.where.spu_id).then(res => {
-					that.proInfo = res.data
-				}).catch(err => {
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
-				});
-			}
-		},
-		onReachBottom() {
-			this.getGoods();
-		},
-		// 滚动监听
-		onPageScroll(e) {
-			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-			uni.$emit('scroll');
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.main {
-		padding: 20rpx 20rpx 0;
-		min-height: 100vh;
-		.goods-wrap{
-			margin-top: 20rpx;
-		}
-	}
-	.show_main{
-		padding: 20rpx 30rpx;
-		background: #fff;
-		border-radius: 16rpx;
-		justify-content: space-between;
-		display: flex;
-		.picture{
-			width: 108rpx;
-			height: 108rpx;
-		}
-		.show_info{
-			width: 510rpx;
-			position: relative;
-		}
-		.show_name{
-			color: #282828;
-			font-size: 28rpx;
-			font-weight: bold;
-			font-family: 'PingFang SC';
-		}
-		.show_count{
-			position: absolute;
-			bottom: 4rpx;
-			color: #282828;
-			font-size: 24rpx;
-			 .num{
-				 font-size: 30rpx;
-				 font-weight: bold;
-				 color: var(--view-theme);
-			 }
-		}
-	}
-	.show_main .picture image{
-		width: 100%;
-		height: 100%;
-	}
-	.goods {
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
-	}
-	.empty-box{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		margin-top: 0;
-		padding-top: 200rpx;
-		image{
-			width: 414rpx;
-			height: 240rpx;
-		}
-		.txt{
-			font-size: 26rpx;
-			color: #999;
-		}
-	}
-</style>
diff --git a/pages/plantGrass/plant_topic/index.vue b/pages/plantGrass/plant_topic/index.vue
deleted file mode 100644
index 13e5f01..0000000
--- a/pages/plantGrass/plant_topic/index.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-<template>
-	<view class='productSort' :style="'height:'+winHeight+'px'">
-		<view class="con-box" :style="viewColor">
-			<view class='aside'>
-				<scroll-view scroll-y="true" style="height: 100%; overflow: hidden;" scroll-with-animation='true'>
-					<view v-for="(item,index) in productList" :key="item.category_id">
-						<view class='item acea-row row-center-wrapper' :class='index==navActive?"on":""' v-show='item.children && item.children.length > 0'
-						  @click='tap(index,"b"+index)'><text class="item_text">{{item.cate_name}}</text>
-						 </view>
-					</view>
-				</scroll-view>
-			</view>
-			<view class='conter'>
-				<scroll-view scroll-y="true">
-					<view class='listw' v-for="(item,index) in childList" :key="item.topic_id">
-						<view class='list'>	
-							<navigator hover-class='none' :url="'/pages/plantGrass/plant_search_list/index?id='+item.topic_id" class='item acea-row'>
-								<view class='picture'>
-									<image :src='item.pic'></image>
-								</view>
-								<view class='text'>
-									<view class="name line1">{{item.topic_name}}</view>
-									<view class="info">{{item.count_use || 0}}篇内容 </view>
-								</view>
-							</navigator>	
-						</view>
-					</view>
-					<view :style='"height:"+(height-300)+"rpx;"'></view>
-				</scroll-view>
-			</view>
-		</view>	
-	</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>
-	// +----------------------------------------------------------------------
-	let app = getApp();
-	import { getTopicList } from '@/api/community.js';
-	import { mapGetters } from "vuex";
-	export default {
-		computed: mapGetters(['viewColor']),
-		data() {	
-			return {
-				productList: [],
-				navActive: 0,
-				number: "",
-				height: 0,
-				winHeight: 0,
-				childList: []
-			}
-		},
-		watch:{
-			
-		},
-		onLoad(options) {
-			let that = this			
-			uni.getSystemInfo({
-				success: function(res) {
-					// console.log(res,'res')
-					that.winHeight = res.windowHeight
-				},
-			});
-		},		
-		onShow() {
-			if (!this.productList.length) {
-				this.getAllCategory();
-			}
-		},
-		onReady() {},
-		methods: {
-			tap: function(index, id) {
-				this.navActive = index;
-				this.childList = this.productList[index].children
-			},
-			getAllCategory: function() {
-				let that = this;
-				getTopicList().then(res => {
-					that.productList = res.data;
-					for(let i=0; i < that.productList.length; i++){
-						if(that.productList[i].children && that.productList[i].children.length > 0){
-							that.childList = that.productList[i].children;
-							return
-						}
-					}
-				})
-			},
-		}
-	}
-</script>
-<style scoped lang="scss">
-	.productSort {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		.con-box {
-			flex: 1;
-			display: flex;
-			overflow: hidden;
-		}
-	}
-	.productSort .aside {
-		background-color: #f5f5f5;
-		overflow-y: auto;
-		overflow-x: hidden;
-		width: 202rpx;
-		height: 100%;
-		overflow-y: scroll;
-	}
-	.productSort .aside .item {
-		height: 100rpx;
-		width: 100%;
-		font-size: 28rpx;
-		color: #666666;
-	}
-	.productSort .aside .item_text {
-		padding-left: 20rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		-webkit-box-orient: vertical;
-	}
-	.productSort .aside .item.on {
-		background-color: #ffffff;
-		border-left: 4rpx solid var(--view-theme);
-		width: 100%;
-		text-align: center;
-		color: var(--view-theme);
-		font-weight: bold;
-	}
-	.productSort .conter {
-		flex: 1;
-		height: 100%;
-		padding: 0 30rpx;
-		background-color: #ffffff;
-		overflow-y: scroll;
-	}
-	.productSort .conter .list {
-		flex-wrap: wrap;
-	}
-	.productSort .conter .list .item {
-		margin-top: 26rpx;
-		margin-bottom: 40rpx;
-		align-items: center;
-	}
-	.productSort .conter .list .item .picture {
-		width: 110rpx;
-		height: 110rpx;
-		border-radius: 8rpx;
-	}
-	.productSort .conter .list .item .picture image {
-		width: 100%;
-		height: 100%;
-		border-radius: 8rpx;
-	}
-	.productSort .conter .list .item .text{
-		margin-left: 30rpx;
-	}
-	.productSort .conter .list .text .name {
-		font-size: 28rpx;
-		color: #282828;
-		font-weight: bold;
-		max-width: 300rpx;
-	}
-	.productSort .list .item .info {
-		font-size: 24rpx;
-		color: #999999;
-		margin-top: 10rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/plantGrass/plant_user/index.vue b/pages/plantGrass/plant_user/index.vue
deleted file mode 100644
index c0a2b21..0000000
--- a/pages/plantGrass/plant_user/index.vue
+++ /dev/null
@@ -1,394 +0,0 @@
-<template>
-	<view class="container" :style="viewColor">
-		<view class="header" :style="{ 'background-image': `url(${domain}/static/images/plant-header.png)`}">
-			<view class="user_wrapper acea-row">
-				<image :src="userInfo.avatar || '/static/images/f.png'" class="picture"></image>
-				<view class="user_text">
-					<view class="name acea-row">
-						<text>{{userInfo.nickname || ''}}</text>
-						<image v-if="userInfo.member_icon" class="level_icon" :src="userInfo.member_icon" alt="">
-					</view>
-					<view class="user_id">ID: {{userInfo.uid || ''}}</view>
-				</view>
-			</view>
-			<view class="plant_info acea-row">
-				<view class="count_wrapper acea-row">
-					<navigator :url="userInfo.is_self ? '/pages/plantGrass/plant_user_attention/index' : ''" class="item" hover-class="none">
-						<text>{{userInfo.focus}}</text>关注
-					</navigator>
-					<navigator :url="userInfo.is_self ? '/pages/plantGrass/plant_user_fans/index' : ''" class="item" hover-class="none">
-						<text>{{userInfo.fans==null?0:userInfo.fans}}</text>粉丝
-					</navigator>
-					<view class="item">
-						<text>{{userInfo.start}}</text>获赞
-					</view>
-				</view>
-				<view v-if="!userInfo.is_self" @click.stop="followAuthor">
-					<button v-if="!userInfo.is_start" class="follow_btn focus">
-						<text class="iconfont icon-jiahao2"></text>关注
-					</button>
-					<button v-else class="follow_btn focused">已关注</button>
-				</view>
-				<view v-else>
-					<navigator hover-class="none" url="/pages/plantGrass/plant_release/index" class="follow_btn focus">
-						<text class="iconfont icon-fabu"></text>发布
-					</navigator>
-				</view>
-			</view>
-		</view>
-		<view class="main">
-	
-			<view v-if="userInfo.is_self" class="tab_count">
-				<text @click.stop="changeTab(0)" :class="tab==0 ? 'on' : ''">作品</text>
-				<text @click.stop="changeTab(1)" :class="tab==1 ? 'on' : ''">赞过</text>
-			</view>
-			<view class="tab-cont">
-				<view v-if="goods.length > 0" class="goods-wrap">
-					<view class="goods">
-						<WaterfallsFlow :wfList='goods' :isAuth="1" :uid="parseInt(uid)" :tab="tab"/>
-					</view>
-				</view>
-				<view v-if="goods.length == 0 && !loading" class="empty">
-					<image src="/static/images/no_thing.png"></image>
-					<text>暂无内容哦~</text>
-				</view>
-				<view class='loadingicon acea-row row-center-wrapper'>
-					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
-						<view class="end" :hidden="loading || goods.length == 0"><text :class="loaded ? 'loaded' : ''">{{loadTitle}}</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-	</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>
-	// +----------------------------------------------------------------------
-	import WaterfallsFlow from '@/components/plantWaterfallsFlow/WaterfallsFlow.vue'
-	import { userInfoApi, followAuthorApi, userArticleLst, starArticleLst } from '@/api/community.js';
-	import { mapGetters } from "vuex";
-	import authorize from '@/components/Authorize';
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	const app = getApp();
-	export default {
-		components: {
-			authorize,
-			WaterfallsFlow
-		},
-		data() {
-			return {
-				domain: HTTP_REQUEST_URL,
-				goods: [], // 商铺商品
-				loadTitle: '加载更多',
-				loading: false,
-				loaded: false,
-				isShowAuth: false, //是否隐藏授权
-				isAuto: false, //没有授权的不会自动授权
-				userInfo: {},
-				where: {
-					page: 1,
-					limit: 30
-				},
-				tab: 0,
-				uid: ''
-			}
-		},
-		created() {},
-		computed: {
-			...mapGetters(['isLogin','viewColor']),
-		},
-		watch: {},
-		onLoad: function(options) {
-			let that = this;
-			that.uid = options.id
-			if (that.isLogin) {
-				that.getAuthorInfo(that.uid);
-				that.getList(that.uid);
-			} else {
-				this.isAuto = true;
-				this.isShowAuth = true
-			}
-		},
-		onShow() {},
-		onReady() {},
-		mounted: function() {},
-		methods: {
-			// 授权回调
-			onLoadFun() {
-				this.isShowAuth = false
-				this.getAuthorInfo(this.uid);
-				this.getList(this.uid);
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			// 打开授权
-			authOpen: function() {
-				let that = this;
-				if (that.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				}
-			},
-			/*获取用户信息*/
-			getAuthorInfo(id){
-				let that = this;
-					userInfoApi(id).then(res => {
-						that.userInfo = res.data
-					});
-			},
-			// 关注作者
-			followAuthor: function() {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					let status = this.userInfo.is_start ? false : true
-					followAuthorApi(this.userInfo.uid,{status: status}).then(res => {
-						if (res.status === 200) {
-							this.userInfo.is_start = this.userInfo.is_start ? false : true
-						}
-						this.$util.Tips({
-							title: res.message
-						});
-					});
-				}
-			},
-			changeTab(tab){
-				this.tab = tab
-				this.where.page = 1
-				this.loaded = this.loading = false
-				this.goods = []
-				let uid = this.userInfo.is_self ? this.uid : this.userInfo.uid
-				this.getList(uid)
-			},
-			// 获取用户的作品
-			getList: function(uid) {
-				let that = this;
-				if (that.loaded || that.loading) return;
-				that.loading = true;
-				that.loadTitle = '';
-				that.tab == 1 ? this.where.is_type = 1 : this.where.is_type = ''
-				that.tab == 0 ?
-				userArticleLst(uid,that.where).then(res => {
-					let list = res.data.list;
-					let goods = that.$util.SplitArray(list, that.goods);
-					that.loaded = list.length < that.where.limit;
-					that.loading = false;
-					that.loadTitle = that.loaded ? '到底了' : '加载更多';
-					that.$set(that, 'goods', goods);
-					that.$set(that.where, 'page', that.where.page + 1);
-				}).catch(err => {
-					that.loading = false;
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
-				}) :
-				starArticleLst(that.where).then(res => {
-					that.loading = false;
-					let list = res.data.list;
-					let goods = that.$util.SplitArray(list, that.goods);
-					that.loaded = list.length < that.where.limit;
-					that.loading = false;
-					that.loadTitle = that.loaded ? '到底了' : '加载更多';
-					that.$set(that, 'goods', goods);
-					that.$set(that.where, 'page', that.where.page + 1);
-				}).catch(err => {
-					that.loading = false;
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
-				})
-			}
-		},
-		onReachBottom() {
-			let uid = this.userInfo.is_self ? this.uid : this.userInfo.uid
-			this.getList(uid);
-		},
-		onPullDownRefresh(){},
-		// 滚动监听
-		onPageScroll(e) {
-			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-			uni.$emit('scroll');
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-.container{
-	background: #ffffff;
-	min-height: 100vh;
-}
-.header{
-	width: 750rpx;
-	height: 400rpx;
-	padding: 56rpx 30rpx 0;
-	background-repeat: no-repeat;
-	background-size: 100%;
-	.user_wrapper{
-		align-items: center;
-		.image,uni-image,image{
-			width: 140rpx;
-			height: 140rpx;
-			border-radius: 100%;
-			border: 4rpx solid #ffffff;
-		}
-		.user_text{
-			margin-left: 22rpx;
-			color: #FFFFFF;
-			.name{
-				font-size: 34rpx;
-				font-weight: bold;
-				align-items: center;
-			}
-			.user_id{
-				margin-top: 16rpx;
-				font-size: 24rpx;
-			}
-			.level_icon{
-				width: 34rpx;
-				height: 32rpx;
-				margin: 4rpx 0 0 6rpx;
-				border: none;
-			}
-		}
-	}
-	.plant_info{
-		margin-top: 60rpx;
-		align-items: center;
-		justify-content: space-between;
-		.count_wrapper{
-			color: #FFFFFF;
-			font-size: 24rpx;
-			.item{
-				text-align: center;
-				margin-right: 60rpx;
-				&:last-child{
-					margin-right: 0;
-				}
-				text{
-					display: block;
-					font-size: 30rpx;
-					margin-top: 10rpx;
-				}
-			}
-		}
-	}
-	.follow_btn{
-		color: #ffffff;
-		font-size: 26rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 146rpx;
-		height: 62rpx;
-		background-color: transparent;
-		background-image: linear-gradient(270deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-		border-radius: 33rpx;
-		.iconfont{
-			font-size: 16rpx;
-			margin-right: 12rpx;
-		}
-		.icon-fabu{
-			font-size: 24rpx;
-		}
-		&.focused{
-			background: transparent;
-			color: #FFFFFF;
-			border: 1px solid #FFFFFF;
-		}
-	}
-}
-.main {
-	background: #ffffff;
-	padding: 30rpx 0;
-	border-radius: 24rpx 24rpx 0 0;
-	position: relative;
-	top: -20rpx;
-	.tab_count{
-		margin-bottom: 40rpx;
-		text-align: center;
-		text{
-			font-size: 28rpx;
-			color: #999999;
-			margin: 0 30rpx;
-			position: relative;
-			padding-bottom: 10rpx;
-			&.on{
-				font-size: 32rpx;
-				color: #282828;
-				font-weight: bold;
-				&::after{
-					content: "";
-					width: 40rpx;
-					height: 5rpx;
-					background: var(--view-theme);
-					position: absolute;
-					bottom: 0;
-					left: 10rpx;
-				}
-			}
-		}
-	}
-}
-.goods {
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: space-between;
-	width: 750rpx;
-	padding: 0 20rpx;
-}
-.empty{
-	margin: 130rpx 0 150rpx;
-	text-align: center;
-	image,uni-image{
-		display: inline-block;
-		width: 414rpx;
-		height: 305rpx;
-	}
-	text{
-		display: block;
-		color: #999999;
-		font-size: 26rpx;
-	}
-}
-.end{
-	margin-top: 50rpx 0;
-	text-align: center;
-	text{
-		color: #999999;
-		font-size: 22rpx;
-		position: relative;
-		&.loaded{
-			&::before,&::after{
-				content: "";
-				display: inline-block;
-				width: 22rpx;
-				height: 1rpx;
-				background: #999999;
-				position: absolute;
-				top: 18rpx;
-				opacity: .5;
-			}
-			&::before{
-				left: -30rpx;
-			}
-			&::after{
-				right: -30rpx;
-			}
-		}
-	}
-}
-</style>
diff --git a/pages/plantGrass/plant_user_attention/index.vue b/pages/plantGrass/plant_user_attention/index.vue
deleted file mode 100644
index ff43f86..0000000
--- a/pages/plantGrass/plant_user_attention/index.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-	<view class="user_store_attention">
-		<block v-if="list.length > 0">
-			<view class="item" v-for="(item,index) in list" :key="index" @click="goHomepage(item)">
-				<image :src="(item.focus&&item.focus.avatar) || '/static/images/f.png'" mode=""></image>
-				<view v-if="item.focus" class="info">
-					<view class="line1">
-						<text class="name line1">{{(item.focus && item.focus.nickname) || '用户已注销'}}</text>
-					</view>
-					<view v-if="item.focus.count_fans" class="des">
-						粉丝{{item.focus.count_fans<10000 ? item.focus.count_fans : (item.focus.count_fans/10000).toFixed(2)+'万'}}
-					</view>
-					<view v-else class="des">粉丝0</view>
-					<view class="btn" :class="item.is_fans ? 'focusBtn' : ''" @click.stop="focusToggle(item)">
-						<text v-if="item.is_fans" class="iconfont icon-jiahao2"></text>
-						{{item.is_fans ? '关注' : '已关注'}}
-					</view>
-				</view>
-			</view>
-		</block>
-		<view :hidden="!loading" class="acea-row row-center-wrapper loadingicon">
-			<text class="iconfont icon-jiazai loading"></text>
-		</view>
-		<view class="no_content" v-if="list.length == 0 && !loading">
-			<view class="count">
-				<image src="../static/images/no_attention.png"></image>
-				<text>暂未关注任何人哦~</text>
-			</view>
-		</view>
-	</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>
-	// +----------------------------------------------------------------------
-	let app = getApp();
-	import { myFocusLst, followAuthorApi } from '@/api/community.js'
-	export default{
-		data(){
-			return {
-				list:[],
-				isScroll:true,
-				loading: false,
-				page:1,
-				limit:20,
-			}
-		},
-		onLoad() {
-			this.getList()
-		},
-		mounted: function() {},
-		methods:{	
-			getList(){
-				if(!this.isScroll || this.loading) return
-				this.loading = true;
-				myFocusLst({
-					page:this.page,
-					limit:this.limit
-				}).then(res=>{
-					this.loading = false
-					this.isScroll = res.data.list.length>=this.limit
-					this.list = this.list.concat(res.data.list)
-					this.page+=1
-				})
-			},
-			/*关注*/
-			focusToggle(item){
-				let status = item.is_fans ? 1 : 0
-				followAuthorApi(item.right_id,{status: status}).then(res => {
-					if (res.status === 200) {
-						item.is_fans = item.is_fans ? false : true
-					}
-					this.$util.Tips({
-						title: res.message
-					});
-						this.getList()
-				});
-			},
-			goHomepage(item){
-			
-				uni.navigateTo({
-						url: '/pages/plantGrass/plant_user/index?id='+item.focus.uid
-				})
-			}
-		},
-		onReachBottom() {
-			this.getList()
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-.user_store_attention{
-	.item{
-		position: relative;
-		display: flex;
-		padding: 30rpx 20rpx;
-		background-color: #fff;
-		align-items: center;
-		&::after{
-			content: ' ';
-			position: absolute;
-			bottom: 0;
-			left: 30rpx;
-			right: 0;
-			height: 1px;
-			background: #f0f0f0;
-		}
-		image{
-			width: 120rpx;
-			height: 120rpx;
-			border-radius: 50%;
-		}
-		.info{
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-			margin-left: 20rpx;
-			position: relative;
-			.name{
-				width: 410rpx;
-				font-size: 30rpx;
-				color: #282828;
-			}
-			.des{
-				color: #999999;
-				font-size: 24rpx;
-				margin-top: 10rpx;
-			}
-			.btn{
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				position: absolute;
-				right: 0;
-				top: 50%;
-				width: 126rpx;
-				height: 50rpx;
-				transform: translateY(-50%);
-				border:1px solid #999999;
-				color: #999999;
-				border-radius: 33rpx;
-				font-size: 26rpx;
-				&.focusBtn{
-					color: #E93323;
-					border-color: #E93323;
-					.iconfont{
-						font-size: 20rpx;
-						margin-right: 10rpx;
-					}
-				}
-			}
-		}
-	}
-}
-.no_content,.main{
-	min-height: 100vh;
-	background: #fff;
-	position: relative;
-	.count{
-		position: absolute;
-		text-align: center;
-		width: 100%;
-		top: 50%;
-		margin-top: -300rpx;
-		image,uni-image{
-			width: 424rpx;
-			height: 305rpx;
-		}
-		text{
-			display: block;
-			color: #999999;
-			font-size: 26rpx;
-		}
-	}
-}
-</style>
diff --git a/pages/plantGrass/plant_user_fans/index.vue b/pages/plantGrass/plant_user_fans/index.vue
deleted file mode 100644
index 1d76f8a..0000000
--- a/pages/plantGrass/plant_user_fans/index.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-	<view class="user_store_attention">
-		<block v-if="list.length >0">
-			<view class="item" v-for="(item,index) in list" :key="index" @click="goHomepage(item)">
-				<image :src="(item.fans && item.fans.avatar) || '/static/images/f.png'" mode=""></image>
-				<view class="info">
-					<view class="line1">
-						<text class="name line1">{{(item.fans && item.fans.nickname) || '用户已注销'}}</text>	
-					</view>
-					<view v-if="item.fans && item.fans.count_fans" class="des">
-						粉丝{{item.fans.count_fans<10000 ? item.fans.count_fans : (item.fans.count_fans/10000).toFixed(2)+'万'}}
-					</view>
-					<view v-else class="des">粉丝0</view>
-					<view  @click.stop="focusToggle(item)" class="btn" :class="item.is_start ? '' : 'focusBtn'">
-						<text v-if="!item.is_start" class="iconfont icon-jiahao2"></text>
-						{{item.is_start ? '已关注' : '关注'}}
-					</view>
-				</view>
-			</view>
-		</block>
-		<view :hidden="!loading" class="acea-row row-center-wrapper loadingicon">
-			<text class="iconfont icon-jiazai loading"></text>
-		</view>
-		<view class="no_content" v-if="list.length == 0 && !loading">
-			<view class="count">
-				<image src="../static/images/no_fans.png"></image>
-				<text>你还没有粉丝哦~</text>
-			</view>
-		</view>
-	</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>
-	// +----------------------------------------------------------------------
-	let app = getApp();
-	import { myFansLst, followAuthorApi } from '@/api/community.js'
-	export default{
-		data(){
-			return {
-				list:[],
-				isScroll:true,
-				page:1,
-				limit:20,
-				loading: false,
-			}
-		},
-		onLoad() {
-			this.getList()
-		},
-		onReady(){},
-		mounted: function() {},
-		methods:{	
-			getList(){
-				if(!this.isScroll || this.loading) return
-				this.loading = true;
-				myFansLst({
-					page:this.page,
-					limit:this.limit
-				}).then(res=>{
-					this.loading = false
-					this.isScroll = res.data.list.length>=this.limit
-					this.list = this.list.concat(res.data.list)
-					this.page+=1
-				})
-			},
-			/*关注*/
-			focusToggle(item){
-				let status = item.is_start ? 0 : 1
-				followAuthorApi(item.left_id,{status: status}).then(res => {
-					if (res.status === 200) {
-						item.is_start = item.is_start ? false : true
-					}
-					this.$util.Tips({
-						title: res.message
-					});
-				});
-			}
-		},
-		onReachBottom() {
-			this.getList()
-		}
-	}
-</script>
-
-<style lang="scss" acoped>
-.user_store_attention{
-	.item{
-		position: relative;
-		display: flex;
-		padding: 30rpx 20rpx;
-		background-color: #fff;
-		align-items: center;
-		&::after{
-			content: ' ';
-			position: absolute;
-			bottom: 0;
-			left: 30rpx;
-			right: 0;
-			height: 1px;
-			background: #f0f0f0;
-		}
-		image{
-			width: 120rpx;
-			height: 120rpx;
-			border-radius: 50%;
-		}
-		.info{
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-			margin-left: 20rpx;
-			position: relative;
-			.name{
-				width: 410rpx;
-				font-size: 30rpx;
-				color: #282828;
-			}
-			.des{
-				color: #999999;
-				font-size: 24rpx;
-				margin-top: 10rpx;
-			}
-			.btn{
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				position: absolute;
-				right: 0;
-				top: 50%;
-				width: 126rpx;
-				height: 50rpx;
-				transform: translateY(-50%);
-				border:1px solid #999999;
-				color: #999999;
-				border-radius: 33rpx;
-				font-size: 26rpx;
-				&.focusBtn{
-					color: #E93323;
-					border-color: #E93323;
-					.iconfont{
-						font-size: 20rpx;
-						margin-right: 10rpx;
-					}
-				}
-			}
-		}
-	}
-}
-.no_content,.main{
-	min-height: 100vh;
-	background: #fff;
-	position: relative;
-	.count{
-		position: absolute;
-		text-align: center;
-		width: 100%;
-		top: 50%;
-		margin-top: -300rpx;
-		image,uni-image{
-			width: 424rpx;
-			height: 305rpx;
-		}
-		text{
-			display: block;
-			color: #999999;
-			font-size: 26rpx;
-		}
-	}
-}
-</style>
diff --git a/pages/plantGrass/static/images/no-topic.png b/pages/plantGrass/static/images/no-topic.png
deleted file mode 100644
index dbcffb5..0000000
Binary files a/pages/plantGrass/static/images/no-topic.png and /dev/null differ
diff --git a/pages/plantGrass/static/images/no_attention.png b/pages/plantGrass/static/images/no_attention.png
deleted file mode 100644
index 2e4d18e..0000000
Binary files a/pages/plantGrass/static/images/no_attention.png and /dev/null differ
diff --git a/pages/plantGrass/static/images/no_content.png b/pages/plantGrass/static/images/no_content.png
deleted file mode 100644
index 07fb3f7..0000000
Binary files a/pages/plantGrass/static/images/no_content.png and /dev/null differ
diff --git a/pages/plantGrass/static/images/no_fans.png b/pages/plantGrass/static/images/no_fans.png
deleted file mode 100644
index e3f1c70..0000000
Binary files a/pages/plantGrass/static/images/no_fans.png and /dev/null differ
diff --git a/pages/plantGrass/static/images/plant_bg.jpg b/pages/plantGrass/static/images/plant_bg.jpg
deleted file mode 100644
index 5811735..0000000
Binary files a/pages/plantGrass/static/images/plant_bg.jpg and /dev/null differ
diff --git a/pages/plantGrass/static/images/video_bg.png b/pages/plantGrass/static/images/video_bg.png
deleted file mode 100644
index 8a2edd4..0000000
Binary files a/pages/plantGrass/static/images/video_bg.png and /dev/null differ
diff --git a/pages/plant_grass/index.vue b/pages/plant_grass/index.vue
deleted file mode 100644
index ede6a4e..0000000
--- a/pages/plant_grass/index.vue
+++ /dev/null
@@ -1,1137 +0,0 @@
-<template>
-	<view :style="viewColor">
-		<view class="page_con">
-			<view class="grass_header" :style="{'background-image': `url(${domain}/static/images/grass_header.png)`}">
-				<view v-if="!navShow" class="header">
-					<view class="navTab">
-						<navigator v-if="community_status == 1" url="/pages/plantGrass/plant_release/index" class="release_btn acea-row row-center-wrapper" hover-class="none">
-							<text class="iconfont icon-fabu"></text></navigator>
-						<view class="acea-row row-center-wrapper">
-							<view :class="tabActive == 0 ? 'on' : ''" class="nav-item" @click="tabActive=0;top=200;">关注</view>
-							<view :class="tabActive == 1 ? 'on' : ''" class="nav-item" @click="tabActive=1;top=300;">发现</view>
-						</view>
-						<navigator v-if="isLogin && community_status == 1" :url="'/pages/plantGrass/plant_user/index?id='+userInfo.uid">
-							<image class="avatar" :src="userInfo.avatar ? userInfo.avatar : '/static/images/f.png'"></image>
-						</navigator>
-					</view>
-					<view class="search_count">
-						<navigator url="/pages/plantGrass/plant_search/index" hover-class="none" class="search"><text class="iconfont icon-xiazai5"></text>搜索想看的文章</navigator>
-						<navigator class="search_topic" url="/pages/plantGrass/plant_topic/index">
-							<image class="topic_icon" src="/static/images/topic_cate.png"></image>
-						</navigator>
-					</view>
-				</view>
-				<view class="longTab" v-if="tabActive == 1">
-					<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;" scroll-with-animation class="menu" :scroll-left="tabLeft" show-scrollbar="true">
-						<view class="longItem"
-						:data-index="index"
-						:class="index === tabClick ? 'click' : ''"
-						v-for="(item, index) in menuList"
-						:key="index"
-						:id="'id' + index"
-						@click.stop="selectMenu(item, index, true)">{{ item.cate_name }}</view>
-					</scroll-view>
-				</view>
-			</view>
-			<scroll-view class="main" scroll-y="true" @scroll="followScroll">
-				<view class="tab-cont" id="main">
-					<!-- 关注 -->
-					<view v-if="tabActive === 0">
-						<view v-if="isLogin && followList.length > 0" class="follow_count" :class="(newData.status && newData.status.status && showTab) ? 'showFoot' : ''">
-							<block v-for="(item, index) in followList" :key="index">
-								<view class="list_count">
-									<view class="title">
-										<navigator hover-class="none" :url="'/pages/plantGrass/plant_user/index?id='+item.uid" v-if="item.author" class="author">
-											<easy-loadimage class="picture" mode="widthFix" :image-src="item.author&&item.author.avatar || '/static/images/f.png'"></easy-loadimage>
-											<text class="name">{{item.author.nickname || ''}}</text>
-										</navigator>
-										<view class="time">{{item.time}}</view>
-									</view>
-									<view class="product">
-										<productConSwiper v-if="item.is_type == 1" :imgUrls="item.image"></productConSwiper>
-										<view v-else class="videoSwiper" @click="goVideo(item)">
-											<image class="image" :src="item.image[0]"></image>
-											<image v-if="item.is_type == 2" class="video_img" src="../../static/images/stop.png"></image>
-										</view>
-									</view>
-									<view class="pro_describle">
-										<view class="mentioned" v-if="item.relevance && item.relevance.length > 0" @click="openMore(item)">
-											<text class="title">查看TA提到的宝贝({{item.relevance.length}})</text>
-											<view class="product_more">
-												<view class="item">
-													<easy-loadimage v-if="indexn<4" v-for="(itemn, indexn) in item.relevance" :key="indexn" mode="widthFix" :image-src="(itemn.spu && itemn.spu.image) || itemn.image" class="more_image"></easy-loadimage>
-												</view>
-												<text class="iconfont icon-gengduo3"></text>
-											</view>
-										</view>
-										<view v-if="!item.show && item.content.length > 110" class="product_info">
-											<text class="text">
-												{{item.content.substring(0,90)+'...'}}
-											</text>
-											<text @click.stop="showMore(item)" class="unfold_btn">展开</text>
-										</view>
-										<view v-else class="product_info">
-											<text class="text">
-												{{item.content}}
-											</text>
-										</view>
-										<navigator v-if="item.topic" hover-class="none" class="product_cate" :url="'/pages/plantGrass/plant_search_list/index?id='+item.topic.topic_id">
-											<view>
-												<text class="icon">#</text><text class="text">{{item.topic.topic_name}}</text>
-											</view>
-										</navigator>
-										<view class="foot_bar">
-											<!-- #ifdef MP -->
-											<button class="time iconfont icon-fenxiang2" open-type="share" hover-class='none' @click="shareFriend(item)"></button>
-											<!-- #endif -->
-											<!-- #ifndef MP -->
-											<button></button>
-											<!-- #endif -->
-											<view class="item">
-												<view class="item_count" @click.stop="likeToggle(item)">
-													<text class="iconfont" :class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
-													<text>{{item.count_start > 0 ? item.count_start : '点赞'}}</text>
-												</view>
-												<view v-if="community_reply_status == 1" class="item_count" @click="openCommon(item,index)">
-													<text class="iconfont icon-pinglun"></text>
-													<text>{{item.count_reply > 0 ? item.count_reply : '评论'}}</text>
-												</view>
-											</view>
-										</view>
-									</view>
-								</view>
-							</block>
-						</view>
-						<view v-if="followList.length == 0 && !focusLoading && isLogin" class="empty">
-							<image src="/static/images/no_thing.png"></image>
-							<text>暂无内容~</text>
-						</view>
-						<view v-if="!isLogin" class="empty no_login">
-							<image src="/static/images/no_login.png"></image>
-							<view class="title">暂未登录</view>
-							<text>登录后可查看关注用户的发布哦~</text>
-							<button class="login_btn" @click="authOpen">立即登录</button>
-						</view>
-					</view>
-					<!-- 发现 -->
-					<view v-show="tabActive === 1">
-						<!-- 商品 -->
-						<swiper :interval="interval" indicator-color="rgba(255,255,255,0.6)" :current="swiperCurrent" @change="swiperChange" :style="'height:'+swiperHeight+'px'" >
-							<block v-for="(item,index) in menuList" :key="index">
-								<swiper-item :item-id="`${item.category_id}`">
-									<scroll-view @scroll="scrollLeft" scroll-y="true" :style="'height:'+swiperHeight+'px'" id="goods" @touchmove="onTouchmove">
-										<view v-if="cateGoods[item.category_id] && cateGoods[item.category_id].goods.length" class="goods-wrap" id="goods">
-											<view class="goods">
-												<WaterfallsFlow :isShow="false" :wfList='cateGoods[item.category_id].goods' :isFind="true" @likeToggle="likeToggle"/>
-											</view>
-										</view>
-										<view :hidden="cateGoods[item.category_id] && !cateGoods[item.category_id].goodsLoading" class="acea-row row-center-wrapper loadingicon">
-											<text class="iconfont icon-jiazai loading"></text>{{!cateGoods[item.category_id] ? 0 : cateGoods[item.category_id].goodsLoading}}
-										</view>
-										<view v-if="cateGoods[item.category_id] && cateGoods[item.category_id].goods.length == 0 && !cateGoods[item.category_id].goodsLoading" class="empty">
-											<image src="/static/images/no_thing.png"></image>
-											<text>{{item.category_id == -1 ? '暂无视频' : '暂无文章'}}~</text>
-										</view>
-									</scroll-view>
-								</swiper-item>
-							</block>
-						</swiper>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-		<!-- 他提到的宝贝弹窗 -->
-		<mentioned ref="mentioned" :isHome="true" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned>
-		<!-- 评论弹窗 -->
-		<comment ref="comment" :isShow="showComment" :userInfo="userInfo" :bottom="bottom" @successFul="commentSucces" @close="close"></comment>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<view class="foot" v-if="newData.status && newData.status.status && showTab">
-			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
-				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index"
-					@click="goRouter(item)">
-					<block v-if="item.link == activeRouter">
-						<image :src="item.imgList[0]"></image>
-						<view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}
-						</view>
-					</block>
-					<block v-else>
-						<image :src="item.imgList[1]"></image>
-						<view class="txt" :style="{color:newData.txtColor.color[0].item}">{{item.name}}</view>
-					</block>
-				</view>
-			</view>
-		</view>
-	</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>
-	// +----------------------------------------------------------------------
-	import WaterfallsFlow from '@/components/plantWaterfallsFlow/WaterfallsFlow.vue'
-	import mentioned from '@/components/mentioned.vue';
-	import comment from '@/components/comment.vue';
-	import { graphicLstApi, getTopicList, graphicStartApi, focusArticleLst } from '@/api/community.js';
-	import { getUserInfo } from '@/api/user.js';
-	import { mapGetters } from "vuex";
-	import authorize from '@/components/Authorize';
-	import productConSwiper from '@/components/plantConSwiper';
-	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	import { configMap } from '@/utils';
-	const app = getApp();
-	export default {
-		components: {
-			authorize,
-			WaterfallsFlow,
-			productConSwiper,
-			mentioned,
-			comment,
-			easyLoadimage
-		},
-		data() {
-			return {
-				domain: HTTP_REQUEST_URL,
-				// #ifdef MP
-				menuButtonInfo: uni.getMenuButtonBoundingClientRect(),
-				// #endif
-				tabClick: 0,
-				tabLeft: 0,
-				isLeft: 0, //导航栏下划线位置
-				isWidth: 0, //每个导航栏占位
-				windowHeight: 0,
-				swiperHeight: 0,
-				childIndex: 0,
-				showComment: false,
-				userInfo: {},
-				goods: [], // 商铺商品
-				followList: [], //关注列表
-				menuList: [],
-				moreList: [],
-				commList: [], //评论列表
-				goodsList: [
-
-				],
-				navShow: false,
-				navActive: 0,
-				tabActive: 1, // 底部切换
-				keyword: '',
-				sortPrice: true, // 价格排序
-				focusLoading: false,
-				goodsLoading: false,
-				goodsLoaded: false,
-				focusLoaded: false,
-				loadTitle: '加载更多',
-				isShowAuth: false, //是否隐藏授权
-				isAuto: false, //没有授权的不会自动授权
-				where: {
-					category_id: 0,
-					page: 1,
-					limit: 30
-				},
-				focusWhere: {
-					page: 1,
-					limit: 30
-				},
-				storeScroll: true,
-				storeTop: 0,
-				storeHeight: 0,
-				navHeight: 0,
-				avatar: '',
-				hederBg: '../static/images/plant_header.png',
-				top: 300,
-				shareInfo: {},
-				actionSheetHidden: true,
-				authorUid: 0,
-				swiperCur: 0,
-				circular: true,
-				isScroll: false,
-				interval: 3000,
-				currentItemId: 0,
-				swiperCurrent: 0,
-				cateGoods:{},
-				newData: {},
-				activeRouter: '',
-				showTab: false,
-				//#ifdef MP||APP-PLUS
-				bottom: 0,
-				//#endif
-				//#ifndef MP||APP-PLUS
-				bottom: 90,
-				//#endif
-			}
-		},
-		// 滚动监听
-		onPageScroll({scrollTop}) {
-			uni.$emit('scroll');
-		},
-		created() {
-			var that = this;
-			// 获取设备宽度
-			uni.getSystemInfo({
-				success(e) {
-					that.isWidth = e.windowWidth / 6;
-					that.windowHeight = e.windowHeight;
-					// that.swiperHeight = that.windowHeight - 205
-					that.$set(that, 'swiperHeight', that.windowHeight+55);
-				}
-			});
-		},
-		computed: {
-			...mapGetters(['isLogin', 'uid', 'viewColor']),
-			...configMap({community_reply_status: 0,community_app_switch: [],community_status: 0,navigation: {}})
-		},
-		watch: {},
-		onLoad: function(options) {},
-		onShow() {
-			app.getConfigData();
-			this.getCateList();
-			this.getGoods();
-			let that = this
-			let routes = getCurrentPages();
-			let curRoute = routes[routes.length - 1].route
-			this.activeRouter = '/' + curRoute
-			this.getNav();
-			if (that.isLogin) {
-				this.getUserInfo();
-				this.getFocusArtical();
-			} else {
-				this.userInfo = {}
-			}
-		},
-		mounted: function() {
-			const query = uni.createSelectorQuery().in(this);
-			query.select('#main').boundingClientRect(data => {
-				this.storeHeight = data.height;
-				this.storeTop = data.top;
-			}).exec();
-		},
-		/**
-		 * 用户点击右上角分享
-		 */
-		// #ifdef MP
-		onShareAppMessage: function() {
-			let that = this;
-			that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-			return {
-				title: that.shareInfo.title || '',
-				imageUrl: that.shareInfo.image[0] || '',
-				path: '/pages/plantGrass/plant_detail/index?id=' + that.shareInfo.community_id + '&spid=' + that.uid,
-			}
-		},
-		onShareTimeline: function() {
-			let that = this;
-			that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-			return {
-				title: that.shareInfo.title || '',
-				query: {
-					id: that.shareInfo.community_id,
-					spid: that.uid
-				},
-				imageUrl: that.shareInfo.image[0] || ''
-			}
-		},
-		// #endif
-		methods: {
-			goRouter(item) {
-				var pages = getCurrentPages();
-				var page = (pages[pages.length - 1]).$page.fullPath;
-				if (item.link == page) return
-				uni.switchTab({
-					url: item.link,
-					fail(err) {
-						uni.redirectTo({
-							url: item.link
-						})
-					}
-				})
-			},
-			getNav() {
-				this.newData = this.navigation
-				if (this.newData.status && this.newData.status.status) {
-					this.showTab = true;
-					uni.hideTabBar()
-				} else {
-					this.showTab = false;
-					uni.showTabBar()
-				}			
-			},
-			followScroll(){
-				uni.$emit('scroll');
-			},
-			//分享信息
-			shareFriend(item){
-				this.shareInfo = item
-			},
-			// 授权回调
-			onLoadFun() {
-				this.isShowAuth = false
-				this.getUserInfo();
-				this.getFocusArtical();
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			// 打开授权
-			authOpen: function() {
-				let that = this;
-				if (that.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				}
-			},
-			/**
-			 * 获取个人用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.userInfo = res.data
-				});
-			},
-			/*获取分类列表*/
-			getCateList(){
-				getTopicList().then(res => {
-					let data = [{cate_name: "推荐",category_id: 0,children: []}]
-					if(this.community_app_switch.length == 2 || this.community_app_switch[0]==2){
-						data = [{cate_name: "推荐",category_id: 0,children: []},{cate_name: "视频",category_id: -1,children: []}]
-					}	
-					this.menuList = Array.from(new Set([...data,...res.data]));
-				})
-			},
-			swiperChange(e) {
-				let { current, source, currentItemId } = e.detail;
-				if (source === 'autoplay' || source === 'touch') {
-					this.currentItemId = currentItemId;
-					this.swiperCur = current
-					this.selectMenu(this.menuList[this.swiperCur],this.swiperCur,false)
-					if (this.menuList.length > 6) {
-						var tempIndex = this.swiperCur - 2;
-						tempIndex = tempIndex <= 0 ? 0 : tempIndex;
-						let tabLeft = (this.swiperCur - 2) * this.isWidth; //设置下划线位置
-						this.$nextTick(function() {
-							this.$set(this, 'tabLeft', tabLeft);
-						});
-					}
-				}
-			},
-			// 点击列表头部
-			selectMenu(item, index, isScroll) {
-				this.currentItemId = item.category_id;
-				this.swiperCurrent = index;
-				this.swiperCur = index
-				this.isScroll = isScroll;
-				this.tabClick = index; //设置导航点击了哪一个
-				this.isLeft = index * this.isWidth; //设置下划线位置
-				this.setMenuLeft(index);
-			},
-			/*导航栏移动位置*/
-			setMenuLeft(index) {
-				this.getGoods();
-			},
-			showMore(item){
-				this.$set(item,'show', true);
-			},
-			scrollLeft: function(e){
-				uni.$emit('scroll');
-				this.navShow = e.detail.scrollTop >= this.storeHeight - 200;
-				if(e.detail.scrollTop > e.detail.scrollHeight - 1500){
-					this.getGoods();
-				}
-				// this.swiperHeight = this.windowHeight - 55
-			},
-			// 获取发现商品
-			getGoods: function() {
-				let that = this;
-				if(!this.cateGoods[this.currentItemId]) {
-					this.$set(this.cateGoods, this.currentItemId, {
-						where: {...this.where, category_id: this.currentItemId},
-						goods: []
-					})
-				}
-				const data = this.cateGoods[this.currentItemId];
-				const cateId = this.currentItemId;
-				if (data.goodsLoading || data.goodsLoaded) return;
-				data.goodsLoading = true;
-				data.loadTitle = "";
-				graphicLstApi(data.where).then(res => {
-					data.goodsLoading = false;
-					data.goodsLoaded = res.data.list.length < that.where.limit;
-					if(data.where.page == 1 ){
-						data.goods = [];
-					}
-					data.goods.push.apply(data.goods, res.data.list);
-					data.where.page = data.where.page + 1;
-					this.$set(this.cateGoods,cateId, {...data});
-				}).catch(err => {
-					data.goodsLoading = false;
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
-					this.$set(this.cateGoods,cateId, data);
-				});
-			},
-			/*获取关注的人的文章列表*/
-			getFocusArtical(){
-				let that = this;
-				if (that.focusLoading || that.focusLoaded) return;
-				that.focusLoading = true;
-				that.loadTitle = "";
-				focusArticleLst(that.focusWhere).then(res => {
-					that.focusLoading = false;
-					that.focusLoaded = res.data.list.length < that.focusWhere.limit;
-					res.data.list.forEach((item)=>{
-						item.show = false
-					})
-					that.followList.push.apply(that.followList, res.data.list);
-					that.focusWhere.page = that.focusWhere.page + 1;
-				}).catch(err => {
-					that.focusLoading = false;
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
-				});
-			},
-			// 商铺首页滚动 navbar 吸顶
-			scrollHome: function(e) {
-				this.navShow = e.detail.scrollTop >= this.storeHeight - 20;
-			},
-			likeToggle(item){
-				let status = item.relevance_id ? 0 : 1
-				graphicStartApi(item.community_id,{status: status}).then(res => {
-					if(item.relevance_id){
-						item.count_start--;
-						item.count_start = item.count_start == 0 ? 0 : item.count_start
-						item.relevance_id = false
-					}else{
-						item.count_start++;
-						item.relevance_id = true
-					}
-				});
-			},
-			/*查看提到的宝贝*/
-			openMore(item){
-				this.$refs.mentioned.showPopup()
-				this.moreList = item.relevance;
-				this.authorUid = item.uid
-			},
-			openCommon(item,index){
-				this.switchTab(0);
-				this.showComment = true
-				this.$refs.comment.getData(item,index);
-			},
-			commentSucces(index){
-				this.followList[index]['count_reply']++
-			},
-			closePopup(){
-				this.$refs.mentioned.closePopup()
-			},
-			close(){
-				this.switchTab(1);
-				this.showComment = false;
-			},
-			switchTab(type){ //1打开0关闭
-				this.newData = this.navigation
-				if (this.newData.status && this.newData.status.status) {
-					if(type == 1){
-						this.showTab = true;
-						uni.hideTabBar()
-					}else{
-						this.showTab = false;
-						uni.hideTabBar()
-					}
-				} else {
-					if(type == 1){
-						this.showTab = false;
-						uni.showTabBar()
-					}else{
-						this.showTab = false;
-						uni.hideTabBar()
-					}
-				}			
-			},
-			goVideo(item) {
-				uni.navigateTo({
-					//#ifdef APP
-					url: '/pages/short_video/appSwiper/index?id='+item.community_id
-					//#endif
-					//#ifndef APP
-					url: '/pages/short_video/nvueSwiper/index?id='+item.community_id
-					//#endif
-				});
-			},
-			onTouchmove(e){
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#goods').boundingClientRect(data => {
-					if(data.bottom < 1500) {
-						if(this.tabActive == 1){
-							this.getGoods();
-						}else{
-							this.getFocusArtical();
-						}
-					}
-				}).exec();
-				// 模拟触底刷新
-			},
-		},
-		onReachBottom() {
-			if(this.tabActive == 1){
-				this.getGoods();
-			}else{
-				this.getFocusArtical();
-			}
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-page{
-	background: #fff;
-}
-.page_con{
-	position: fixed;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	display: flex;
-	flex-direction: column;
-}
-/deep/.wf-page{
-	margin-bottom: 98rpx;
-	margin-bottom: calc(98rpx+ constant(safe-area-inset-bottom));
-	margin-bottom: calc(98rpx + env(safe-area-inset-bottom));
-}
-.longTab {
-	display: flex;
-	width: 100%;
-	background: #fff;
-	border-radius: 16rpx 16rpx 0 0;
-	padding: 20rpx;
-	.longItem {
-		height: 50upx;
-		display: inline-block;
-		line-height: 50upx;
-		text-align: center;
-		font-size: 30rpx;
-		color: #999999;
-		max-width: 160rpx;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		overflow-x: scroll;
-		overflow-y: hidden;
-		margin-right: 56rpx;
-		&:last-child{
-			margin-right: 0;
-		}
-		/*解决ios上滑动不流畅*/
-		-webkit-overflow-scrolling: touch;
-		position: relative;
-		&.click {
-			font-weight: bold;
-			font-size: 34rpx;
-			color: var(--view-theme);
-			&::after{
-				content: "";
-				display: block;
-				width: 60rpx;
-				height: 4rpx;
-				background-color: var(--view-theme);
-				display: flex;
-				position: absolute;
-				left: 50%;
-				margin-left: -32rpx;
-				bottom: 0rpx;
-			}
-			.underline {
-				opacity: 1;
-			}
-		}
-	}
-	.underlineBox {
-		height: 3px;
-		width: 20%;
-		display: flex;
-		align-content: center;
-		justify-content: center;
-		.underline {
-			opacity: 0;
-			width: 60rpx;
-			height: 4rpx;
-			background-color: #e93323;
-		}
-	}
-}
-.tab-cont{
-	border-radius: 16rpx 16rpx 0 0;
-}
-.follow_count{
-	background: #ffffff;
-	/* #ifndef MP */
-	padding: 20rpx 20rpx 100rpx;
-	/* #endif */
-	/* #ifdef MP */
-	padding: 20rpx 20rpx calc(0rpx+ constant(safe-area-inset-bottom));
-	padding: 20rpx 20rpx calc(0rpx + env(safe-area-inset-bottom));
-	/* #endif */
-	&.showFoot{
-		padding: 20rpx 20rpx calc(120rpx+ constant(safe-area-inset-bottom));
-		padding: 20rpx 20rpx calc(120rpx + env(safe-area-inset-bottom));
-	}
-	.title{
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
-	.author{
-		display: flex;
-		align-items: center;
-		.picture{
-			width: 78rpx;
-			height: 78rpx;
-			border-radius: 100%;
-			overflow: hidden;
-		}
-		/deep/image,/deep/.easy-loadimage,uni-image{
-			height: 78rpx;
-		}
-		.name{
-			margin-left: 20rpx;
-			color: #333333;
-			font-size: 32rpx;
-			font-weight: bold;
-		}
-	}
-	.time{
-		color: #999999;
-		font-size: 24rpx;
-	}
-	.product{
-		margin-top: 20rpx;
-		border-radius: 16rpx;
-	}
-	.icon-fenxiang2{
-		color: #282828;
-		font-size: 46rpx;
-		background: transparent;
-	}
-}
-.list_count{
-	margin-bottom: 70rpx;
-	&:last-child{
-		margin-bottom: 0;
-	}
-}
-.videoSwiper{
-	width: 710rpx;
-	height: 710rpx;
-	position: relative;
-	border-radius: 16rpx;
-	.image{
-		width: 710rpx;
-		height: 710rpx;
-		border-radius: 16rpx;
-	}
-	.video_img{
-		width: 100rpx;
-		height: 100rpx;
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		margin-left: -50rpx;
-		margin-top: -50rpx;
-		z-index: 10;
-	}
-}
-.pro_describle{
-	.mentioned{
-		padding: 20rpx 0;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		border-bottom: 1px solid #F5F5F5;
-		.title{
-			color: #666666;
-			font-size: 26rpx;
-		}
-	}
-	.product_more{
-		max-width: 360rpx;
-		display: flex;
-		align-items: center;
-		.more_image{
-			width: 58rpx;
-			height: 58rpx;
-			border-radius: 5rpx;
-			margin-right: 12rpx;
-			display: inline-block;
-			border: 1px solid #BBBBBB;
-		}
-		/deep/image,/deep/.easy-loadimage,uni-image{
-			width: 58rpx;
-			height: 58rpx;
-		}
-		.iconfont{
-			color: #CCCCCC;
-			margin-left: 10rpx;
-		}
-	}
-	.product_info{
-		line-height: 45rpx;
-		margin: 20rpx 0;
-		.text{
-			font-size: 28rpx;
-			color: #282828;
-		}
-		.unfold_btn{
-			margin-left: 30rpx;
-			font-size: 30rpx;
-			color: #282828;
-			font-weight: bold;
-		}
-	}
-	.product_cate{
-		margin: 20rpx 0;
-		display: inline-block;
-		>view{
-			display: flex;
-			align-items: center;
-			background: var(--view-minorColor);
-			border-radius: 30rpx;
-			padding: 0 25rpx;
-			line-height: 56rpx;
-			height: 56rpx;
-			color: var(--view-theme);
-			.text{
-				font-size: 28rpx;
-			}
-			.icon{
-				font-size: 35rpx;
-				font-weight: bold;
-				margin-right: 10rpx;
-			}
-		}
-	}
-	.foot_bar{
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		.item{
-			display: flex;
-			align-items: center;
-			color: #282828;
-			&.icon-fenxiang2{
-				font-size: 46rpx;
-			}
-		}
-		.item_count{
-			font-size: 26rpx;
-			display: flex;
-			align-items: center;
-			&:first-child{
-				margin-right: 30rpx;
-			}
-			.iconfont{
-				font-size: 40rpx;
-				margin-right: 5rpx;
-			}
-			.icon-shoucang1{
-				color: var(--view-priceColor);
-			}
-		}
-	}
-}
-.grass_header {
-	display: flex;
-	flex-direction: column;
-	background-size: cover;
-	background-color: #ffffff;
-	width: 100%;
-	z-index: 10;
-}
-.header {
-	padding: 0 30rpx 20rpx;
-	.navTab{
-		position: relative;
-		padding: 20rpx 0 40rpx 0;
-		.nav-item{
-			font-size: 32rpx;
-			color: #666666;
-			&:first-child{
-				margin-right: 70rpx;
-			}
-			&.on{
-				font-size: 38rpx;
-				color: #282828;
-				font-weight: bold;
-			}
-		}
-		.release_btn{
-			width: 58rpx;
-			height: 58rpx;
-			border-radius: 100%;
-			background-image: linear-gradient(126deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-			color: #fff;
-			position: absolute;
-			top: 20rpx;
-			left: 0;
-			.iconfont{
-				font-size: 28rpx;
-			}
-		}
-		.avatar{
-			width: 58rpx;
-			height: 58rpx;
-			border-radius: 100%;
-			border: 3rpx solid rgba(0,0,0,.05);
-			position: absolute;
-			top: 20rpx;
-			right: 0;
-		}
-	}
-	.search_count{
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		.search_topic{
-			width: 46rpx;
-			height: 46rpx;
-			image,.topic_icon,uni-image{
-				width: 46rpx;
-				height: 46rpx;
-			}
-		}
-	}
-	.search {
-		display: flex;
-		align-items: center;
-		min-width: 0;
-		height: 58rpx;
-		border-radius: 29rpx;
-		background-color: #FFFFFF;
-		font-weight: 500;
-		font-size: 24rpx;
-		color: #999999;
-		width: 609rpx;
-		.iconfont {
-			margin-right: 13rpx;
-			margin-left: 30rpx;
-			font-size: 24rpx;
-		}
-	}
-}
-.main_count{
-	background-color: #ffffff;
-	padding: 30rpx 20rpx;
-	.list{
-		width: 710rpx;
-		height: 280rpx;
-		margin-bottom: 30rpx;
-		position: relative;
-		.picture{
-			width: 710rpx;
-			height: 280rpx;
-			border-radius: 16rpx;
-		}
-	}
-}
-.main {
-	flex: 1;
-	min-height: 60vh;
-	height: auto;
-}
-.nav.fixed {
-	position: fixed;
-	left: 0;
-	width: 100%;
-	.nav-cont {
-		position: absolute;
-		width: 100%;
-	}
-}
-.goods {
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: space-between;
-	padding: 0 20rpx;
-	background: #ffffff;
-	width: 750rpx;
-	/* #ifdef H5 */
-	// padding-bottom: 90rpx;
-	/* #endif */
-	.item {
-		width: 345rpx;
-		border-radius: 16rpx;
-		margin-bottom: 20rpx;
-		background-color: #FFFFFF;
-		overflow: hidden;
-		/deep/.image,/deep/.easy-loadimage,uni-image {
-			width: 345rpx;
-			height: 345rpx;
-			image {
-				display: block;
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.text {
-			padding: 20rpx 20rpx 25rpx;
-			.name {
-				font-weight: 500;
-				font-size: 30rpx;
-				line-height: 1;
-				color: #222222;
-				display: flex;
-				align-items: center;
-				.name_text{
-					display: inline-block;
-					max-width: 400rpx;
-				}
-			}
-			.money-wrap {
-				display: flex;
-				align-items: center;
-				margin-top: 43rpx;
-				.money {
-					font-weight: bold;
-					font-size: 26rpx;
-					color: $theme-color;
-					text {
-						font-size: 34rpx;
-						line-height: 1;
-					}
-				}
-				.ticket {
-					height: 26rpx;
-					padding-right: 9rpx;
-					padding-left: 9rpx;
-					border: 1px solid $theme-color;
-					border-radius: 4rpx;
-					margin-left: 10rpx;
-					font-weight: 500;
-					font-size: 20rpx;
-					line-height: 24rpx;
-					color: $theme-color;
-				}
-			}
-			.score {
-				margin-top: 20rpx;
-				font-weight: 500;
-				font-size: 20rpx;
-				line-height: 1;
-				color: #737373;
-			}
-		}
-		.foot {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 52rpx;
-			background: linear-gradient(to right, #F11B09, #F67A38);
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #FFFFFF;
-			.iconfont {
-				margin-right: 10rpx;
-				font-size: 22rpx;
-				line-height: 1;
-			}
-		}
-	}
-}
-.empty{
-	width: 100%;
-	text-align: center;
-	position:relative;
-	top: 200rpx;
-	/* #ifdef MP */
-	// top: 100rpx;
-	/* #endif */
-	image,uni-image{
-		display: inline-block;
-		width: 414rpx;
-		height: 305rpx;
-	}
-	.title{
-		font-size: 28rpx;
-		color: #282828;
-		font-weight: bold;
-		margin-bottom: 14rpx;
-	}
-	text{
-		display: block;
-		color: #999999;
-		font-size: 26rpx;
-	}
-	.login_btn{
-		width: 440rpx;
-		text-align: center;
-		height: 76rpx;
-		line-height: 76rpx;
-		color: var(--view-theme);
-		border: 1px solid var(--view-theme);
-		border-radius: 40rpx;
-		margin: 44rpx auto 0;
-		font-size: 32rpx;
-	}
-}
-.page-footer {
-	position: fixed;
-	bottom: 0;
-	z-index: 30;
-	display: flex;
-	align-items: center;
-	justify-content: space-around;
-	width: 100%;
-	height: 98rpx;
-	height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-	height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-	box-sizing: border-box;
-	border-top: solid 1px #F3F3F3;
-	background-color: #fff;
-	box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
-	padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
-	padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
-	.foot-item {
-		display: flex;
-		width: max-content;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		position: relative;
-		.count-num {
-			position: absolute;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 40rpx;
-			height: 40rpx;
-			top: 0rpx;
-			right: -15rpx;
-			color: #fff;
-			font-size: 20rpx;
-			background-color: #FD502F;
-			border-radius: 50%;
-			padding: 4rpx;
-		}
-	}
-	.foot-item image {
-		height: 50rpx;
-		width: 50rpx;
-		text-align: center;
-		margin: 0 auto;
-	}
-	.foot-item .txt {
-		font-size: 24rpx;
-	}
-}
-</style>
diff --git a/pages/plant_release/index.vue b/pages/plant_release/index.vue
deleted file mode 100644
index bad9ae3..0000000
--- a/pages/plant_release/index.vue
+++ /dev/null
@@ -1,1025 +0,0 @@
-<template>
-	<!-- #ifdef MP -->
-	<view :style="viewColor" style="padding-top: 180rpx;">
-		<!-- #endif -->
-		<!-- #ifdef APP || H5 -->
-		<view :style="viewColor" style="padding-top: 80rpx;">
-			<!-- #endif -->
-			<form @submit="formSubmit" report-submit='true'>
-				<view class="release_content">
-					<view class="release_tab acea-row">
-						<view class="tab_item" v-for="(item, index) in tabList" :key="item.value"
-							:class="{on:tabActive == item.value}" @click="changeTab(item)">
-							<text class="iconfont" :class="item.icon"></text>{{item.name}}
-						</view>
-					</view>
-					<view>
-						<view class="release_item">
-							<view class="photo_count">
-								<view class="input_photo acea-row row-middle">
-									<block v-if="tabActive == 2">
-										<view class="pictrue" v-if="formData.video_link">
-											<view v-if="videoplay">
-												<video controls id="myvideo" :src="video_link"
-													@fullscreenchange="screenChange"></video>
-											</view>
-											<!--#ifndef APP-PLUS-->
-											<video class="pictrue" :src="formData.video_link"></video>
-											<!--#endif-->
-											<image class="video-bg" mode="widthFix"
-												src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png">
-											</image>
-											<view class="videoHover" @click="videoshow">
-												<view>
-													<text class="iconfont icon-24gf-play"></text>
-												</view>
-											</view>
-											<text class="video-text">点击可预览视频</text>
-
-											<view class="close_btn" @click="delVideo"><text
-													class="iconfont icon-guanbi4"></text></view>
-										</view>
-										<view v-else class="pictrue acea-row row-center-wrapper row-column add"
-											@click="uploadVideo">
-											<view><text class='iconfont icon-tianjiashipin'></text></view>
-											<view class="text">添加视频</view>
-										</view>
-										<view v-if="formData.image.length < 1"
-											class="pictrue acea-row row-center-wrapper row-column add"
-											@click.stop="clk">
-											<view><text class='iconfont icon-fengmian'></text></view>
-											<view class="text">添加封面</view>
-										</view>
-									</block>
-									<view class="pictrue" v-for="(item, index) in formData.image" :key="index">
-										<easy-loadimage mode="widthFix" :image-src="item"></easy-loadimage>
-										<text class="cover_text" v-if="tabActive == 2">封面</text>
-										<view class="close_btn" @click="DelPic(index)"><text
-												class="iconfont icon-guanbi4"></text></view>
-									</view>
-									<block v-if="tabActive == 1">
-										<view v-if="formData.image.length < 6"
-											class="pictrue acea-row row-center-wrapper row-column add"
-											@click.stop="clk">
-											<view><text class='iconfont icon-icon25201'></text></view>
-											<view class="text">添加图片</view>
-										</view>
-									</block>
-									<view v-if="showCd" :ratio="16/9" class="container">
-										<bt-cropper ref="cropper" :imageSrc="imageSrc" @cropEnd="loadImage"
-											:dWidth="800" :compress="true">
-											<!-- 你想插入的内容 -->
-											<button class="crop_btn" @click="crop">裁切</button>
-										</bt-cropper>
-									</view>
-								</view>
-							</view>
-							<view class="textarea">
-								<textarea placeholder='分享使用体验和心得，获得更多点赞和关注哦~(600字以内)' name="comment"
-									placeholder-class='placeholder' v-model="formData.content"
-									maxlength="600"></textarea>
-							</view>
-						</view>
-						<view class="release_item">
-							<view class='item acea-row row-between-wrapper'>
-								<view class='name'><text
-										class="iconfont icon-baobeilianjie"></text>添加产品({{productList.length}})</view>
-								<view class="select">
-									<view class="select_count" @click.stop="addProduct">
-										<text v-if="productList.length == 0" class="text">选择产品</text>
-										<view v-else class="text">
-											<image class="image" v-for="(item,index) in productList" :key="index"
-												:src="item.image || (item.spu && item.spu.image)"></image>
-										</view>
-										<text class="iconfont icon-xiangyou"></text>
-									</view>
-								</view>
-							</view>
-							<view class='item acea-row row-between-wrapper'>
-								<view class='name'><text class="iconfont icon-canyuhuati"></text>参与话题</view>
-								<view class="select">
-									<view class="select_count" @click="addTopic">
-										<text v-if="!topicName.topic_name" class="text">选择话题</text>
-										<text v-else class="text_name" @click.stop="deleteTopic">
-											<text class="icon">#</text>
-											<text class="title">{{topicName.topic_name}}</text>
-											<text class="iconfont icon-guanbi5"></text>
-										</text>
-										<text class="iconfont icon-xiangyou"></text>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<button class="release_btn button" form-type="submit">发布</button>
-				</view>
-			</form>
-			<!--视频预览弹窗-->
-			<view v-if="showVideo" class="video-count">
-				<!--#ifndef APP-PLUS-->
-				<video id="myVideo" class="videoLink" autoplay loop muted :src="formData.video_link"></video>
-				<!--#endif-->
-				<!--#ifdef APP-PLUS-->
-
-				<video id="myVideo" class="videoLink" autoplay loop
-					:src='formData.video_link && (formData.video_link.substring(0,4) == "http" || formData.video_link.substring(0,5) == "https") ? formData.video_link : "http:" + formData.video_link'></video>
-				<!--#endif-->
-			</view>
-			<view class='mask' catchtouchmove="true" :hidden='showVideo==false' @tap="showVideo=false"></view>
-			<avatar @upload="doUpload" @getName="getImgName" quality="1" ref="avatar" selWidth="250upx"
-				selHeight="250upx">
-			</avatar>
-			<!-- 提到的宝贝弹窗 -->
-			<uni-popup ref="associated" type="bottom">
-				<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
-			</uni-popup>
-			<!-- 话题弹窗 -->
-			<uni-popup ref="participateTopic" type="bottom">
-				<participate-topic @close="close" @getTopic="getTopic"></participate-topic>
-			</uni-popup>
-			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
-			</authorize>
-		 
-		<!-- 	<m-tabbar native>
-				<template v-slot:tabbar_index_2>
-					<view class="custom_style">
-						<view class="custom_style_icon"></view>
-						<view class="custom_style-txt"  style="color: red;">
-                            发布
-						</view>
-					</view>
-				</template>
-			</m-tabbar> -->
-		</view>
-</template>
-
-<script>
-	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-	import {
-		mapGetters
-	} from "vuex";
-	import authorize from '@/components/Authorize';
-	import avatar from "@/components/yq-avatar/yq-avatar.vue";
-	import associated from '@/components/associated.vue';
-	import participateTopic from '@/components/participateTopic.vue';
-	import {
-		TOKENNAME,
-		HTTP_REQUEST_URL
-	} from '@/config/app.js';
-	import {
-		createPlantApi,
-		updatePlantApi,
-		plantDetailApi,
-		orderAssociatePlantApi
-	} from "@/api/community";
-	import {
-		setStorage,
-		getStorage
-	} from '@/libs/uniApi.js';
-	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-	import {
-		configMap
-	} from '@/utils';
-	import store from '@/store';
-	export default {
-		components: {
-			avatar,
-			associated,
-			participateTopic,
-			authorize,
-			easyLoadimage,
-			mTabbar
-		},
-		data() {
-			return {
-				formData: {
-					image: [],
-					content: "",
-					topic_id: "",
-					spu_id: [],
-					video_link: ''
-				},
-				imageSrc: '',
-				productList: [],
-				topicName: {},
-				isUpload: true,
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				showCd: false,
-				id: "",
-				order_id: "",
-				imgName: "",
-				upload_max: 50,
-				uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`,
-				tabList: [{
-						name: '图文',
-						value: 1,
-						icon: 'icon-tuwen'
-					},
-					{
-						name: '视频',
-						value: 2,
-						icon: 'icon-shipin'
-					},
-				],
-				tabActive: 1,
-				isPlay: false,
-				videoContext: "",
-				video_link: "",
-				showVideo: false,
-				videoplay: false,
-				videoContext: ''
-			};
-		},
-		computed: {
-			...mapGetters(['isLogin', 'viewColor', 'uid']),
-			...configMap({
-				community_app_switch: []
-			})
-		},
-		watch: {
-			// formData:{
-			// 	handler(n){
-			// 		if(!this.id){
-			// 			setTimeout(()=>{
-			// 				setStorage('addPlant', n);
-			// 			});
-			// 		}
-			// 	},
-			// 	deep: true
-			// }
-		},
-		mounted() {
-			// #ifndef APP-PLUS
-			this.videoContext = uni.createVideoContext('myVideo', this);
-			// #endif
-		},
-		onLoad(options) {
-
-			// uni.hideTabBar()
-			this.id = options.id;
-			this.order_id = options.order_id;
-			// console.log("options.order_id", options.order_id)
-			this.tabActive = options.type || 1;
-			if (this.community_app_switch.length == 1) {
-				this.tabActive = this.community_app_switch[0]
-			}
-			if (!this.isLogin) {
-				this.isAuto = true;
-				this.isShowAuth = true
-			} else {
-				if (this.id) {
-					this.getDetail()
-				} else {
-					// const data = getStorage('addPlant');
-					// if(data){
-					// 	this.formData.content = data.content || '';
-					// 	this.formData.image = data.image || [];
-					// }
-				}
-				if (this.order_id) this.getOrderGoods()
-			}
-			this.videoContext = uni.createVideoContext("myvideo", this);
-		},
-		onTabItemTap() {
-			this.$refs.associated.close();
-			this.formData.content = ''
-			this.formData.image = []
-			this.formData.topic_id = ''
-			this.formData.spu_id = ''
-			this.formData.video_link = ''
-			this.productList = []
-			this.topicName = {}
-		},
-
-		methods: {
-			onLoadFun() {
-				this.isShowAuth = false;
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e;
-			},
-			/*获取图文详情*/
-			getDetail() {
-				let that = this
-				plantDetailApi(that.id).then(res => {
-					that.formData = res.data
-					that.productList = res.data.relevance || []
-					that.topicName = res.data.topic || {}
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-				})
-			},
-			/*获取关联订单商品*/
-			getOrderGoods() {
-				let that = this
-				orderAssociatePlantApi(that.order_id).then(res => {
-					that.productList = res.data || []
-					that.formData.spu_id = res.data.map(val => val.spu_id)
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-				})
-			},
-			/*切换tab*/
-			changeTab(item) {
-				if (this.tabActive == item.value) return
-				this.tabActive = item.value
-				this.formData.image = []
-				this.productList = []
-				/**
-				 * 将对象所有值为空
-				 * */
-				this.formData = {
-					image: [],
-					content: "",
-					topic_id: "",
-					spu_id: [],
-					video_link: "",
-				}
-				this.topicName = {}
-			},
-			/*删除话题*/
-			deleteTopic() {
-				this.formData.topic = {}
-				this.topicName = {}
-			},
-			clk() {
-				let that = this
-				uni.chooseImage({
-					count: 1,
-					sizeType: ['original'],
-					success: (res) => {
-						// console.log(res)
-						let tempFilePaths = res.tempFilePaths[0]
-						//#ifdef APP-PLUS
-						if (uni.getSystemInfoSync().platform == 'ios') {
-							that.doUpload(tempFilePaths)
-						} else {
-							let size = res.tempFiles[0].size / 1024
-							if (size >= 1) {
-								uni.compressImage({
-									src: tempFilePaths,
-									quality: 80, // 仅对jpg有效
-									success: res => {
-										that.imageSrc = res.tempFilePath;
-										that.showCd = true;
-									},
-									fail: err => {
-										// console.log('失败了compressImage', tempFilePaths);
-										that.imageSrc = tempFilePaths
-										that.showCd = true
-									}
-								})
-							} else {
-								that.imageSrc = tempFilePaths
-								that.showCd = true
-							}
-						}
-						//#endif
-						//#ifndef APP-PLUS
-						that.imageSrc = tempFilePaths
-						that.showCd = true
-						//#endif
-					}
-				})
-			},
-			crop() {
-				uni.showLoading({
-					title: '',
-					mask: true
-				})
-				// 通过组件定义的ref调用cropper方法，返回一个promise对象
-				this.$refs.cropper.crop().then(([err, res]) => {
-					if (!err) {
-						uni.hideLoading()
-						this.doUpload(res.tempFilePath)
-					} else {
-						uni.hideLoading()
-						// console.log(err)
-					}
-				})
-			},
-			loadImage() {
-				this.showCd = false
-			},
-			doUpload(rsp) {
-				let that = this
-				uni.showLoading({
-					title: '上传中',
-					mask: true
-				})
-				uni.uploadFile({
-					url: HTTP_REQUEST_URL + '/api/upload/image/field',
-					filePath: rsp,
-					name: 'field',
-					formData: {
-						'filename': rsp,
-						'name': that.imgName
-					},
-					header: {
-						// #ifdef MP
-						"Content-Type": "multipart/form-data",
-						// #endif
-						[TOKENNAME]: 'Bearer ' + store.state.app.token
-					},
-					success: (uploadFileRes) => {
-						let imgData = JSON.parse(uploadFileRes.data)
-						if (imgData.data.path) {
-							that.formData.image.push(imgData.data.path)
-							uni.hideLoading()
-						}
-					},
-					complete(res) {
-						let data = JSON.parse(res.data)
-						// that.$util.Tips({
-						// 	title: data.message
-						// });
-					}
-				});
-			},
-			// 上传视频
-			uploadVideo() {
-				let that = this
-				uni.chooseVideo({
-					sourceType: ['camera', 'album'],
-					success: res => {
-						if (Math.ceil(res.size / 1024) < that.upload_max * 1024) {
-							uni.uploadFile({
-								url: that.uploadUrl, //仅为示例，非真实的接口地址
-								filePath: res.tempFilePath,
-								name: 'file',
-								//请求参数
-								formData: {
-									user: 'test'
-								},
-								header: {
-									// #ifdef MP
-									'Content-Type': 'multipart/form-data',
-									// #endif
-									[TOKENNAME]: 'Bearer ' + store.state.app.token
-								},
-								success: uploadFileRes => {
-									let data = JSON.parse(uploadFileRes.data);
-									that.formData.video_link = (data.data.src);
-								},
-								complete: a => {
-
-								}
-							});
-						} else {
-							uni.showModal({
-								title: '提示',
-								content: `视频超出限制${that.upload_max}MB,已过滤`
-							});
-						}
-					},
-					fail: err => {
-						that.$util.Tips({
-							title: err
-						});
-					}
-				});
-			},
-			getImgName(name) {
-				this.imgName = name
-			},
-			/**删除图片*/
-			DelPic: function(index) {
-				let that = this
-				that.formData.image.splice(index, 1);
-			},
-			/*删除视频*/
-			delVideo() {
-				this.formData.video_link = '';
-			},
-			/*添加宝贝*/
-			addProduct() {
-				this.$refs.associated.open();
-			},
-			/*添加话题*/
-			addTopic() {
-				this.$refs.participateTopic.open();
-			},
-			close() {
-				this.$refs.associated.close();
-				this.$refs.participateTopic.close();
-			},
-			/*查看视频*/
-			videoshow() {
-				this.showVideo = true
-				this.videoContext = uni.createVideoContext('myVideo', this);
-				this.$nextTick(() => {
-					this.videoContext.play();
-				})
-				// this.video_link = this.formData.video_link;
-				// this.videoContext.requestFullScreen({ direction: 90 });
-				// this.videoContext.play(); this.videoplay = true; 
-			},
-			screenChange(e) {
-				let fullScreen = e.detail.fullScreen; //值true为进入全屏，false为退出全屏 
-				// console.log(e, "qweeee========================================");
-				if (!fullScreen) {
-					this.videoplay = false
-					//退出全屏 this.videoplay = false; // 隐藏播放盒子 
-				}
-			},
-			/*获取选中的宝贝*/
-			getProduct(data) {
-				this.productList = data;
-				this.formData.spu_id = data.map(val => val.spu_id)
-				this.$refs.associated.close();
-			},
-			/*获取选中的话题*/
-			getTopic(item) {
-				if (!item.topic_id) {
-					this.topicName = {}
-				} else {
-					this.topicName = item
-				}
-				this.formData.category_id = item.category_id;
-				this.formData.topic_id = item.topic_id;
-				this.$refs.participateTopic.close();
-			},
-			/**
-			 * 提交数据
-			 */
-			formSubmit: function(e) {
-				let that = this,
-					value = that.formData;
-				if (value.image.length == 0) return that.$util.Tips({
-					title: '请添加话题图片'
-				});
-				if (!value.content) return that.$util.Tips({
-					title: '请分享使用心得和体会'
-				});
-				if (that.tabActive == 2 && !value.video_link) {
-					return that.$util.Tips({
-						title: '请添加话题视频'
-					});
-				}
-				if (!value.category_id || !value.topic_id) {
-					return that.$util.Tips({
-						title: '请选择话题'
-					})
-				}
-				if (that.id) {
-					if (value.relevance.length) {
-						value.spu_id = value.relevance.map(val => (val.spu && val.spu.spu_id) || val.spu_id)
-					}
-				}
-				value.order_id = that.order_id
-				value.is_type = that.tabActive
-				uni.showLoading({
-					title: '保存中',
-					mask: true
-				})
-				that.id ? updatePlantApi(that.id, value).then(res => {
-					uni.hideLoading()
-					that.$util.Tips({
-						title: res.messge,
-						icon: 'success'
-					});
-
-					setTimeout(function() {
-						if (that.tabActive == 2) {
-							uni.navigateTo({
-								//#ifdef APP
-								url: '/pages/short_video/appSwiper/index?id=' + res.data
-									.community_id + '&user=1&uid=' +
-									that.uid
-								//#endif
-								//#ifndef APP
-								url: '/pages/short_video/nvueSwiper/index?id=' + res.data
-									.community_id + '&user=1&uid=' +
-									that.uid
-								//#endif
-							});
-						} else {
-							uni.navigateTo({
-								url: '/pages/plantGrass/plant_detail/index?id=' + res.data
-									.community_id + '&type=' + that
-									.tabActive
-							})
-						}
-						/**
-						 * 将对象所有值为空
-						 * */
-						/**
-						 * 将对象所有值为空
-						 * */
-						that.formData = {
-							image: [],
-							content: "",
-							topic_id: "",
-							spu_id: [],
-							video_link: "",
-						}
-						that.topicName = {}
-					}, 1000);
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-				}) : createPlantApi(value).then(res => {
-					uni.hideLoading()
-					that.$util.Tips({
-						title: res.messge,
-						icon: 'success'
-					});
-					setStorage('addPlant', '');
-					setTimeout(function() {
-						if (that.tabActive == 2) {
-							uni.navigateTo({
-								//#ifdef APP
-								url: '/pages/short_video/appSwiper/index?id=' + res.data
-									.community_id + '&user=1&uid=' +
-									that.uid
-								//#endif
-								//#ifndef APP
-								url: '/pages/short_video/nvueSwiper/index?id=' + res.data
-									.community_id + '&user=1&uid=' +
-									that.uid
-								//#endif
-							});
-						} else {
-							uni.navigateTo({
-								url: '/pages/plantGrass/plant_detail/index?id=' + res.data
-									.community_id + '&type=' + that
-									.tabActive
-							})
-						}
-						/**
-						 * 将对象所有值为空
-						 * */
-						that.formData = {
-							image: [],
-							content: "",
-							topic_id: "",
-							spu_id: [],
-							video_link: "",
-						}
-						that.topicName = {}
-					}, 1000);
-				}).catch(err => {
-					// console.log('aaa', value)
-					return that.$util.Tips({
-						title: err
-					});
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page {
-		background: #F5F5F5;
-	}
-	.custom_style {
-		color: #fff;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		font-size: 24rpx;
-	
-		&_icon {
-			background-image: url('@/static/tabbar_icon/d-a.png');
-			background-repeat: no-repeat;
-			background-size: cover;
-			font-size: 80rpx;
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 100%;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin-top: -50rpx;
-			// box-shadow: 0px 5px 10px 1px rgba(32, 161, 98, 0.3);
-		}
-		.custom_style-txt{
-			    display: flex;
-			    flex-direction: column;
-			    align-items: center;
-				margin-top: 5rpx;
-			
-		}
-	}
-
-	.crop_btn {
-		line-height: 90rpx;
-		height: 90rpx;
-		height: calc(90rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		height: calc(200rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-	}
-
-	.container {
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 20;
-		width: 750rpx;
-		height: 100vh;
-	}
-
-	.release_content {
-		margin-top: 30rpx;
-
-		.release_tab {
-			border-radius: 16rpx 16rpx 0 0;
-			border-bottom: 1rpx solid #E4E4E4;
-			background: #fff;
-			align-items: center;
-			justify-content: center;
-			height: 86rpx;
-
-			.tab_item {
-				margin: 0 40rpx;
-				font-size: 32rpx;
-				color: #999;
-				position: relative;
-				line-height: 86rpx;
-				cursor: pointer;
-
-				&.on {
-					color: #E93323;
-
-					&::after {
-						content: "";
-						display: inline-block;
-						width: 100%;
-						height: 3rpx;
-						background: #E93323;
-						position: absolute;
-						bottom: 2rpx;
-						left: 0;
-					}
-				}
-
-				.iconfont {
-					margin-right: 10rpx;
-					font-size: 32rpx;
-				}
-			}
-		}
-
-		padding: 0 20rpx;
-
-		.release_item {
-			background: #ffffff;
-			padding: 0 30rpx;
-			border-radius: 10rpx;
-
-		}
-
-		.photo_count {
-			padding: 30rpx 0;
-		}
-	}
-
-	/deep/.input_photo .easy-loadimage,
-	/deep/.input_photo uni-image,
-	/deep/.input_photo image {
-		width: 180rpx;
-		height: 180rpx;
-		border-radius: 12rpx !important;
-	}
-
-	.input_photo .pictrue {
-		width: 180rpx;
-		height: 180rpx;
-		border-radius: 12rpx !important;
-		margin-right: 11rpx;
-		position: relative;
-		overflow: hidden;
-
-		&:nth-child(3n) {
-			margin-right: 0;
-		}
-
-		.close_btn {
-			width: 30rpx;
-			height: 30rpx;
-			background: rgba(0, 0, 0, .6);
-			border-radius: 0 12rpx 0 12rpx;
-			position: absolute;
-			top: 0;
-			right: 0;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			z-index: 100;
-
-			.iconfont {
-				color: #ffffff;
-				font-size: 12rpx;
-			}
-		}
-
-		.cover_text {
-			display: flex;
-			width: 58rpx;
-			height: 29rpx;
-			background: #E93323;
-			border-radius: 0px 12rpx 0px 12rpx;
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			z-index: 10;
-			align-items: center;
-			justify-content: center;
-			font-size: 18rpx;
-			color: #fff;
-		}
-	}
-
-	/deep/.loading-img {
-		width: 180rpx;
-		height: 180rpx;
-		border-radius: 12rpx;
-	}
-
-	.input_photo .pictrue {
-		margin-bottom: 20rpx;
-
-		.videoHover {
-			width: 180rpx;
-			height: 180rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: 10;
-
-			>view {
-				width: 50rpx;
-				height: 50rpx;
-				background: #000000;
-				border-radius: 50rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-
-				.iconfont {
-					color: #ffffff;
-					font-size: 21rpx;
-				}
-			}
-		}
-
-		.video-text {
-			display: block;
-			width: 180rpx;
-			text-align: center;
-			color: #ffffff;
-			font-size: 18rpx;
-			z-index: 13;
-			position: absolute;
-			bottom: 20rpx;
-		}
-
-		video {
-			width: 180rpx;
-			height: 180rpx;
-			border-radius: 12rpx;
-		}
-	}
-
-	.input_photo .add {
-		background: #f6f6f6;
-		color: #666666;
-
-		.iconfont {
-			font-size: 50rpx;
-		}
-
-		.text {
-			margin-top: 20rpx;
-			font-size: 27rpx;
-		}
-	}
-
-	.textarea textarea {
-		font-size: 28rpx;
-		padding-bottom: 38rpx;
-		width: 100%;
-		box-sizing: border-box;
-		height: 400rpx;
-		overflow: hidden;
-	}
-
-	.textarea .placeholder {
-		color: #BBBBBB;
-	}
-
-	.release_item .item {
-		height: 106rpx;
-		border-bottom: 1rpx solid #eee;
-		position: relative;
-		font-size: 30rpx;
-
-		&:last-child {
-			border-bottom: none;
-		}
-
-		.name {
-			color: #333333;
-
-			.iconfont {
-				margin-right: 10rpx;
-				font-size: 28rpx;
-			}
-		}
-
-		.select {
-			color: #bbbbbb;
-
-			.select_count {
-				display: flex;
-				align-items: center;
-			}
-
-			.text {
-				margin-right: 15rpx;
-				display: flex;
-				align-items: center;
-
-				.image,
-				image,
-				uni-image {
-					width: 60rpx;
-					height: 60rpx;
-					margin-right: 5rpx;
-				}
-			}
-
-			.iconfont {
-				font-size: 24rpx;
-			}
-
-			.text_name {
-				color: var(--view-theme);
-				padding: 5rpx 12rpx;
-				background: var(--view-minorColor);
-				border-radius: 23rpx;
-				font-size: 24rpx;
-				margin-right: 10rpx;
-
-				.icon {
-					color: var(--view-theme);
-					font-weight: bold;
-					font-size: 24rpx;
-				}
-
-				.title {
-					margin: 0 10rpx;
-				}
-
-				.iconfont {
-					font-size: 16rpx;
-				}
-			}
-		}
-	}
-
-	.button {
-		width: 710rpx;
-		height: 86rpx;
-		line-height: 86rpx;
-		color: #ffffff;
-		text-align: center;
-		font-size: 32rpx;
-		background: var(--view-theme);
-		border-radius: 43rpx;
-	}
-
-	.release_btn {
-		margin-top: 100rpx;
-	}
-
-	.video-count {
-		position: fixed;
-		width: 600rpx;
-		height: 500rpx;
-		top: 50%;
-		left: 50%;
-		margin-left: -300rpx;
-		margin-top: -250rpx;
-		z-index: 100;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		.videoLink {
-			width: 600rpx;
-			height: 500rpx;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index 1ee001b..55140d5 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -7,8 +7,10 @@
 			<view class="store_bg">
 				<view class="text flex_a_c"><i class="iconfont icon-xinghao"></i>上传店铺背景图</view>
 				<block v-if="images[0].img">
+					<!-- 				<u--image :showLoading="true" :src="images[0].img" width="388px" height="210.53rpx" radius="4px"
+											@click="delImg(0)" mode="aspectFit"></u--image> -->
 					<u--image :showLoading="true" :src="images[0].img" width="360px" height="210.53rpx" radius="4px"
-						@click="delImg(0)"></u--image>
+						@click="delImg(2)"></u--image>
 				</block>
 				<view v-else class="upload" @click="seleckImage(0)">
 					<view class="iconfont icon-tupian1"></view>
@@ -72,9 +74,11 @@
 				<view class="flex_a_c">
 					<text class="sub_title">配送方式：</text>
 					<view class="flex">
-						<checkbox-group name="" @change="checkboxChange"  >
-							<checkbox  disabled='true' :checked="isZiti" :value="check.ziti" /><text class="text ziti">到店自提(加入供应链)</text>
-							<checkbox  disabled='true' :checked="isKuaidi" :value="check.kuaidi" /><text class="text">快递配送</text>
+						<checkbox-group name="" @change="checkboxChange">
+							<checkbox disabled='true' :checked="isZiti" :value="check.ziti" /><text
+								class="text ziti">到店自提(加入供应链)</text>
+							<checkbox disabled='true' :checked="isKuaidi" :value="check.kuaidi" /><text
+								class="text">快递配送</text>
 						</checkbox-group>
 					</view>
 				</view>
@@ -108,10 +112,12 @@
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>店铺营业时间:</view>
 				<view class="bus_time flex_a_c">
 					<view class="select" @click="beginTimeShow = true">
-						{{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}</view>
+						{{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}
+					</view>
 					至
 					<view class="select" @click="overTimeShow = true">
-						{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}</view>
+						{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}
+					</view>
 				</view>
 			</block>
 		</view>
@@ -132,8 +138,8 @@
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view>
 				<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
 			</view>
-			
-		<!-- 	<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
+
+				<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
 				<u-switch v-model="credit_buy" @change="change"></u-switch>
 			</view>
@@ -147,7 +153,7 @@
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view>
 				<input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
 			</view>
-			<view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> -->
+			<view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view>
 			<!-- <view class="item_cell">
         <view class="if_btn flex_a_c_j_sb">
           <text class="sub_title">是否开启商户：</text>
@@ -219,7 +225,7 @@
 				},
 				isZiti: false,
 				isKuaidi: false,
-				delivery_way: [1,2],
+				delivery_way: [1, 2],
 				takeName: '',
 				takePhone: '',
 				servicePhone: '',
@@ -269,16 +275,16 @@
 				credit_buy: false, //开启信用购
 				interest_rate: '', //利率
 				settle_cycle: '', //周期
-				mer_name:'',
-				type_code:''
+				mer_name: '',
+				type_code: ''
 			}
 		},
 		onLoad(e) {
 			this.id = e.mer_id
 			this.getMerchantInfo(e.mer_id)
-			
-		    this.isZiti = true
-		    this.isKuaidi = true
+
+			this.isZiti = true
+			this.isKuaidi = true
 		},
 		onShow() {},
 		methods: {
@@ -286,7 +292,7 @@
 				merchantInfoAPI({
 					id
 				}).then(res => {
-					this.mer_name= res.data.mer_name
+					this.mer_name = res.data.mer_name
 					this.images[0].img = res.data.mer_banner
 					this.images[1].img = res.data.mer_avatar
 					this.images[2].img = res.data.mini_banner
@@ -303,11 +309,11 @@
 					res.data.mer_take_day.forEach((item, i) => {
 						this.dateWeek[Number(item) - 1].isCheck = true
 					})
-					this.type_code= res.data.type_code
+					this.type_code = res.data.type_code
 					this.mer_take_time = res.data.mer_take_time
 					this.intro = res.data.mer_info
 					this.cruxText = res.data.mer_keyword
-					
+
 					this.servicePhone = res.data.service_phone
 					this.mer_address = res.data.mer_address
 					this.merState = res.data.mer_state === 1 ? true : false
@@ -372,7 +378,7 @@
 					mer_avatar: this.images[1].img,
 					mini_banner: this.images[2].img,
 					mer_certificate: this.images[3].img,
-					delivery_way: [1,2],
+					delivery_way: [1, 2],
 					mer_take_name: this.takeName,
 					mer_take_phone: this.takePhone,
 					mer_take_address: this.detailSite,
@@ -406,9 +412,9 @@
 						// 	url:'/pages/moreProject/moreProject'
 						// })
 						uni.redirectTo({
-							url:'/pages/moreProject/moreProject'
+							url: '/pages/moreProject/moreProject'
 						})
-						
+
 					}, 1000)
 				}).catch(err => {
 					Toast(err)
@@ -441,7 +447,7 @@
 				// 	sizeType: ['original', 'compressed'],
 				// 	sourceType: ['album', 'camera'],
 				// 	success: function(res) {
-					
+
 				// 		uni.showLoading({
 				// 			title: '上传中...'
 				// 		})
@@ -459,7 +465,7 @@
 				// 		Toast('添加失败')
 				// 	}
 				// });
-				
+
 			},
 			delImg(i) {
 				let that = this
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index e37bc76..daf46e1 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -47,13 +47,13 @@
 							<swiper-item :class="{ active: 1 == swiperCur }">
 								<view class="slide-navigator">
 									<!-- 隐藏暂时不需要 -->
-									<!-- 	<navigator class="item"
+									<navigator class="item"
 										:url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
 										hover-class='none'>
 										<image mode='widthFix' class="image" src="../static/images/product_freight.png">
 										</image>
 										<text class="text">运费模板</text>
-									</navigator> -->
+									</navigator>
 									<navigator class="item"
 										:url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
 										hover-class='none'>
@@ -61,12 +61,12 @@
 											src="../static/images/product_specification.png"></image>
 										<text class="text">规格模板</text>
 									</navigator>
-									<!-- 	<navigator class="item"
+									<navigator class="item"
 										:url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
 										hover-class='none'>
 										<image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
 										<text class="text">商品导入</text>
-									</navigator> -->
+									</navigator>
 								</view>
 							</swiper-item>
 						</block>
@@ -125,9 +125,9 @@
 						</view>
 						<view class="operation acea-row row-between-wrapper">
 							<view class="acea-row row-middle">
-								<!-- 	<view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
+								<view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
 									线上入库
-								</view> -->
+								</view>
 								<view class="" class="bnt" @click="Fline(item)" style="width:150rpx">
 									线下入库
 								</view>
@@ -201,6 +201,10 @@
 		postImport
 	} from "@/api/product";
 	import Loading from '@/components/Loading/index.vue';
+	import {
+		merstreet,
+		getUserInfo
+	} from '@/api/user.js';
 	import {
 		navigateTo,
 		navigateBack,
@@ -251,8 +255,9 @@
 			}
 		},
 		onLoad(options) {
-			this.mer_id = options.mer_id;
-			this.getList(this.mer_id, true);
+			// this.mer_id = options.mer_id;
+			this.getUserInfo()
+			
 		},
 		onPullDownRefresh() {
 			this.where.page = 1
@@ -264,13 +269,30 @@
 		},
 		onReachBottom() {
 			// console.log(this.status, '222222222')
-			if (this.status == 'nomore') return;
+		if (this.status == 'nomore') return;
 			this.status = 'loading';
 			this.where.page = ++this.where.page;
 			this.getList(this.mer_id, false);
 		},
 
 		methods: {
+			/**
+			 * 获取个人用户信息
+			 */
+			getUserInfo() {
+				getUserInfo().then(res => {
+			
+					
+					this.mer_id = res.data.service.mer_id;
+			
+				   this.getList(res.data.service.mer_id, true);
+			
+					
+					}).catch(res => {
+						console.log(res)
+					})
+				
+			},
 			menuActiona(item, index) {
 				if (item.is_good) {
 					this.options = [{
@@ -282,6 +304,7 @@
 							value: '2',
 							text: '预览'
 						},
+
 					]
 				} else {
 					this.options = [{
@@ -301,9 +324,6 @@
 						text: '删除'
 					})
 				}
-				
-				
-				
 				this.ll++
 				// console.log(this.ll)
 				if (this.ll % 2 == 0) {
@@ -492,7 +512,6 @@
 						that.loading = false;
 						that.loaded = res.data.list.length < that.where.limit;
 						that.productList.push.apply(that.productList, res.data.list);
-
 						that.where.page = that.where.page + 1;
 
 					},
@@ -558,6 +577,7 @@
 									title: '下架成功',
 									icon: 'none'
 								})
+								that.getList(this.mer_id,false)
 							} else if (res.cancel) {
 								// console.log('用户点击取消');
 							}
@@ -578,6 +598,7 @@
 						icon: 'success'
 					}, () => {
 						that.$set(item, 'is_show', item.is_show == 0 ? 1 : 0);
+						that.getList(this.mer_id,false)
 					});
 				}).catch(err => {
 					return that.$util.Tips({
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
deleted file mode 100644
index 6a82f59..0000000
--- a/pages/short_video/appSwiper/index.nvue
+++ /dev/null
@@ -1,1744 +0,0 @@
-<template>
-	<view class="container">
-
-		<!--
-		注意：这是 App 所用页面，请勿引入微信小程序或浏览器运行，最好运行在真机
-		 
-		1. new_index.nvue、index.nvue这两个是App页面
-		 
-		2. index.nvue - 页面预加载使用 - 在线预加载方案
-		 
-		3. 另外：data.js 是上一版本留下的假数据，这一版改成了 URL 请求了（如不需要可以删除，也可作为后端请求参考）
-		 
-		4. 请各位大神多多留手，我已经把请求内存开到最大了
-		 
-		5. 视频 id 切记是字符串类型
-		 
-		6. 这里仅 App 端引入了 App 端专用评论，小程序 、H5 引入的时候 可以作为参考
-		
-		【
-			App、小程序、H5评论请参考插件：https://ext.dcloud.net.cn/plugin?id=7875
-		】
-		 -->
-		<!-- 头部导航 -->
-		<!--    <view v-if="!isUser" class="header" :style="{backgroundColor:currentNav==1?'':'#000'}" >
-       <view class="items" @click.stop="navTap(2)">
-        <text class="tName" :class="currentNav==2?'on':''">关注</text>
-      </view>
-      <view class="items" @click.stop="navTap(1)">
-        <text class="tName" :class="currentNav==1?'on':''">推荐</text>
-      </view>
-      <view class="items" @click.stop="navTap(3)">
-        <text class="tName" :class="currentNav==3?'on':''">列表</text>
-      </view> 
-    </view> -->
-		<!--  <view class="noVideo acea-row row-center-wrapper" v-if="!dataList.length && !loadVideo">
-      <view>
-        <image :src="imgHost+'/static/no-video.png'" class="pictrue"></image>
-        <text class="tips">暂无短视频内容哦~</text>
-      </view>
-    </view> -->
-		<view v-if="currentNav !== 3" :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
-			<!-- 
-			 1.这里的 swiper 不是用来控制视频滑动的，而是用来控制左右滑动的，如果不需要的可以改成 view
-			 
-			 2.为了 视频无限加载，已经把 21 行的 appear 去掉了，加上了 loadmore 方法（第10行）
-			 
-			 3.由于方法比较多，可以采取下面的方式查看代码：
-			 （1）Mac：按住 option 键，然后点击方法名，即可跳转到方法
-			 （2）windows：按住 Alt 键，然后鼠标左击，即可跳转到方法
-			 -->
-			<list @loadmore="getData" @scroll="scrolls" :loadmoreoffset="wHeight*1" :show-scrollbar="false"
-				ref="listBox" :pagingEnabled="true" :scrollable="true">
-
-				<refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown"
-					:display="refreshing ? 'show' : 'hide'">
-					<loading style="background-color: #FFFFFF;">
-						<image src="../static/img/index/logins.gif"
-							:style="'width: 80upx; height: 40upx; margin-top: 80upx; margin-bottom: 30upx; margin-left: '+ (windowWidth - 200) +'px;'">
-						</image>
-					</loading>
-				</refresh>
-				<!-- 循环数据 -->
-				<cell v-for="(item,i) in dataList" :key="i">
-					<!-- 用div把视频模组套起来 -->
-					<div :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
-						<!-- <view v-if="Math.abs(k-i)<=1"> -->
-						<view v-if="Math.abs(k-i)<=1">
-							<view class="root">
-								<!-- 
-								具体视频参数可以参考官方文档
-								说明：
-								1.v-if很关键，这里主要是为了减少 dom 元素【这样才不会加载视频多了闪退】，
-									这里 Math.abs(k-i)<=5 也就是往上预加载 5 个视频，往下预加载 5 
-									个视频这样做的目的是为了让视频能够提前加载但是不播放，在真正滑到位
-									置的时候播放视频。
-									【2.0.1就是  1  Math.abs(k-i)<=1：请勿修改，记住，要不然会提前播放很多视频】
-									
-								2.要注意 @play="playIngs" 里面的 playIngs 方法，这个方法只是在视频播放的时候
-									起效果，我们控制视频播放不是用这个的。这个的主要作用是给视频封面的。我们先用
-									下面的视频封面盖住视频，等到视频播放的时候，我们不要急着直接播放，而是延迟一下下，
-									300-600ms左右。因为视频播放需要一点点时间，这点时间里会黑屏，这个时候我们就用
-									下面的封面盖住，这样用户就不会有从黑屏到有画面的感觉了，但是如果遇到视频太大，缓冲
-									时间太长，还是会出现短暂的黑屏，大部分是不会有黑屏的（这样盖住的话）。
-									
-									【更新记录：2.0版】已经解决了视频黑屏问题，和加载速度慢的情况，如果还是出现了黑屏，
-									意味着此时手滑动的速度，已经超过了视频加载的速度，对于这个问题，建议修改 preloadNumber 
-									变量，当它的值大一点的时候就会提前加载视频，这样用户在滑到视频的时候就不会有停顿感了
-									【注意】：老用户在 video 中增加和修改 
-									（1）:muted="!item.playIng"，
-									（2）@timeupdate="timeupdate($event,i)"
-									（3）把 199 行注释了，
-									（4）:id="item.id"，
-									（5）修改：uni.createVideoContext(this.dataList[this.k].id + '' + this.k,this) 为
-										uni.createVideoContext(this.dataList[this.k].id,this)
-									（6）在 timeupdate 方法里加入，if(index == this.k){把里面的加一个总的判断}
-								3.其他的下面有详解
-								 -->
-								<video :ref="'item'+i" :id="item.community_id" :loop="true" :autoplay="i == k"
-									:src="item.video_link" :muted="item.isplay" :enable-progress-gesture="false"
-									:page-gesture="false" :controls="false" :show-loading="true"
-									:show-fullscreen-btn="false" :show-center-play-btn="false" :style="boxStyle"
-									:object-fit="object_fit" @timeupdate="timeupdate($event,i)"></video>
-							</view>
-							<!-- 直接用 view 就行了，一样是可以覆盖原生组件的 -->
-							<!-- 这个是暂停时出现的图标 -->
-							<view class="videoHover" @click="tapVideoHover(item.state,$event)" :style="boxStyle">
-								<image v-if="item.state=='pause'" class="playState" src="../static/img/index/play.png">
-								</image>
-							</view>
-							<!--审核状态-->
-							<view v-if="item.status==-1 || item.status==0 || item.status==-2" class="video-status">
-								<view v-if="item.status == -1 || item.status == -2" class="status-title">
-									<image class="image" src="../static/img/index/video-failed.png"></image>
-									<text class="title">{{item.status == -1 ? '审核未通过' : '已下架'}}，内容仅自己可见</text>
-								</view>
-								<view v-else class="status-title">
-									<image class="image" src="../static/img/index/video-review.png"></image>
-									<text class="title">正在审核，内容仅自己可见</text>
-								</view>
-								<view class="status_info">
-									<text
-										class="refusal">{{(item.status == -1 || item.status == -2) ? item.refusal : '发布的内容审核通过后，将在首页展示！'}}</text>
-								</view>
-							</view>
-							<!-- 最底下的文字部分 -->
-							<view class="content" v-if="dataList.length !== 0">
-								<view class="cart">
-									<text class="cartName">@{{item.author.nickname}}</text>
-								</view>
-								<view class="words" :style="'width: '+ (windowWidth - 120) +'px;'">
-									<view v-if="item.isMore || item.content.length<=29">
-										<text class="info">{{item.content}}</text>
-										<view class="close">
-											<text v-if="item.isMore" class="more" @click="moreTap(item)">收起</text>
-										</view>
-									</view>
-									<view class="wordsCon" v-else>
-										<text class="info">{{item.content.slice(0,29)}}...</text>
-										<text class="more" @click="moreTap(item)">更多</text>
-									</view>
-								</view>
-								<view v-if="item.relevance.length > 0 && k==i" class="product">
-									<scroll-view class="scroll-view" scroll-x="true"
-										style="white-space: nowrap; display: flex;" scroll-with-animation
-										show-scrollbar="true">
-										<view class="product-item" v-for="(goods,idx) in item.relevance" :key="idx">
-											<view v-if="goods.spu" class="item-count acea-row"
-												@click="goDetail(goods.spu)">
-												<view class="picture">
-													<image class="image" :src="goods.spu.image"></image>
-												</view>
-												<view class="product-text">
-													<text class="name line1"
-														v-if="goods.spu && goods.spu.store_name.length>=12">{{goods.spu.store_name.slice(0,12)}}...</text>
-													<text class="name line1"
-														v-else>{{goods.spu && goods.spu.store_name}}</text>
-													<view class="product-price">
-														<view class="price"><text class="sm">¥</text><text
-																class="money">{{goods.spu.price}}</text>
-														</view>
-														<text class="buy-btn">购买</text>
-													</view>
-												</view>
-											</view>
-										</view>
-									</scroll-view>
-								</view>
-
-								<navigator v-if="item.topic" hover-class="none" class="product_cate"
-									:url="'/pages/plantGrass/plant_search_list/index?id='+item.topic.topic_id">
-									<view class="pro-view">
-										<text class="icon">#</text><text class="text">{{item.topic.topic_name}}</text>
-									</view>
-								</navigator>
-							</view>
-							<view class="userInfo">
-								<!-- 1.头像 -->
-								<navigator v-if="userInfo.uid != item.author.uid" hover-class="none"
-									:url="'/pages/plantGrass/plant_user/index?id='+item.uid" class="pictrue">
-									<image class="userAvatar" :src="item.author.avatar || '/static/images/f.png'"
-										mode="aspectFit">
-									</image>
-									<view v-if="!item.is_fans || userInfo.uid == 0" class="guanzhu"
-										@click.stop="followAuthor(item)"><text
-											class="iconfont icon-shangpinshuliang-jia">+</text></view>
-									<view v-else class="yiguanzhu"><text class="iconfont"></text></view>
-								</navigator>
-								<!-- 2.点赞 -->
-								<view @click="cLike(item);" style="margin-top: 5px;"
-									:class="{'likeNumActive':item.relevance_id}">
-									<image v-if="item.relevance_id" src="../static/img/index/xin.png"
-										style="width: 32px; height: 32px;">
-									</image>
-									<image v-if="!item.relevance_id" src="../static/img/index/xin-2.png"
-										style="width: 32px; height: 32px;"></image>
-									<text class="info-text">{{item.count_start > 0 ? item.count_start : '点赞'}}</text>
-								</view>
-								<!-- 3.评论 -->
-								<view v-if="community_reply_status == 1 && item.status == 1" class="comment"
-									@click="toComment(item,i)" style="margin-top: 18px;">
-									<image src="../static/img/index/evaluate.png" style="width: 54rpx; height: 50rpx;">
-									</image>
-									<text class="info-text">{{item.count_reply>0 ? item.count_reply : '评论'}}</text>
-								</view>
-								<!-- 4.分享 -->
-								<view v-if="item.status == 1" @click="appShare('WXSceneSession',item.community_id)"
-									style="margin-top: 17px;">
-									<image src="../static/img/index/share-fill.png" style="width: 40px; height: 40px;">
-									</image>
-									<text class="info-text">分享</text>
-								</view>
-								<!-- 5.自己的视频 -->
-								<view v-if="userInfo.uid == item.author.uid" style="margin-top: 17px;">
-									<view class="video-my" @click="showManage = !showManage">
-										<view class="video-dian">
-											<text class="dian"></text>
-											<text class="dian"></text>
-											<text class="dian"></text>
-										</view>
-									</view>
-								</view>
-								<!-- 提到的商品 -->
-								<view v-if="item.relevance.length>0 && k==i" @click="openMore(item)" class="mention"
-									style="opacity: 0.9; margin-top: 18px;">
-									<image class="image" src="../static/img/index/collection.png"></image>
-									<text class="count">{{item.relevance.length}}</text>
-								</view>
-							</view>
-							<view v-if="showManage == item.author.uid || showManage " class="manage"  :style="{'margin-top':item.relevance.length>0?'-115rpx':'0px'}">
-								<view class="manage-gou"></view>
-								<navigator hover-class="none"
-									:url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'"
-									class="items">
-									<image src="../static/img/index/video-edit.png" style="width: 16px; height: 16px;">
-									</image>
-									<text class="text" style="margin-left: 20rpx;">编辑</text>
-								</navigator>
-								<view class="items" @click.stop="deleteTopic(item)">
-									<image src="../static/img/index/video-delete.png"
-										style="width: 16px; height: 16px;"></image>
-									<text class="text" style="margin-left: 20rpx;">删除</text>
-								</view>
-							</view>
-							<!-- 1.视频预览时的图片，currenttimes：就是获取当前滑块的时间点，如果不需要，可以注释掉 -->
-							<!-- 2.如果使用下面的视频预览的话要注意的是视频链接最好是阿里云上的，因为
-									https://xxxxxxxxx.mp4?x-oss-process=video/snapshot,t_1000,f_jpg
-									这个是阿里云的东西，至于其他的视频截帧我还没有试过。
-									-->
-							<!-- 3.阿里云视频截帧地址：https://help.aliyun.com/document_detail/64555.html -->
-							<image v-if="item.isShowimage == true"
-								:src="item.src+'?x-oss-process=video/snapshot,t_'+ currenttimes +'000,f_jpg'"
-								mode="aspectFit"
-								:style="'width: 120upx; height: 160upx; border-radius: 10upx; position: absolute; bottom: '+ (ProgressBarBottom + 160) +'upx; left: '+ (currentPositions - 15) +'px;'">
-							</image>
-						</view>
-					</div>
-				</cell>
-			</list>
-		</view>
-
-		<waterfall class="video-list" v-if="currentNav === 3" column-gap="6" column-count="2" :show-scrollbar="false"
-			@loadmore="getGoods()" column-width="195px"
-			:style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
-			<cell class="goods_item" style="margin-bottom: 10px;" v-for="(item,index) in cateGoods" :key="item.uid"
-				@click="gogogo(item)">
-				<image class="goods_img" :src="item.image[0]" mode="aspectFit"></image>
-				<view class="botm">
-					<text class="title">{{item.title}}</text>
-					<view class="goods_info">
-						<view class="l_info">
-							<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFit"
-								class="g_img"></image>
-							<text class="g_name">{{item.author && item.author.nickname}}</text>
-						</view>
-						<view class="nice_box flex_a_c" @click.stop="giveStart(item)">
-							<text class="iconfont"
-								:class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
-							<text class="collect">{{item.count_start}}</text>
-
-						</view>
-					</view>
-				</view>
-			</cell>
-
-		</waterfall>
-
-		<!-- <waterfall class="video-list" v-if="currentNav == 3" column-gap="6" column-count="2" column-width="auto"
-      :style="'width: '+ windowWidth +'px; height: '+ boxStyle.height +'px;'">
-      <cell ref="cellRef" v-for="(item,index) in 10" :key="item.uid" class="goods_item" @click="gogogo(item)">
-        哈哈哈{{index}}
-      </cell>
-    </waterfall> -->
-		<!--	
-		请前往 douyin-scrollview.nvue 文件查看
-		已经全部注释
-		这里就是引入评论插件
-		-->
-		<uni-popup type="bottom" ref="pinglun" @touchmove.stop.prevent="moveHandle">
-			<view
-				:style="'width: '+ windowWidth +'px; height: '+ (boxStyle.height/heightNum) +'px; background-color: #fff; border-top-left-radius: 10px; border-top-right-radius: 10px;'">
-				<!-- 
-				 注意：
-				 deleteIOSHeight
-				 deleteAndroidHeight
-				 这两个参数用于控制评论等的高度
-				 -->
-				<douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15"   :userInfo="userInfo" 
-					@closeScrollview="closeScrollview" @successFul="pinlunFun"></douyin-scrollview>
-			</view>
-		</uni-popup>
-		<!-- 他提到的宝贝弹窗 -->
-		<uni-popup type="bottom" ref="pinglunMentioned"  style="background-color: rebeccapurple;">
-		
-		
-				<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid" ></mentioned>
-		
-		</uni-popup>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-		<view class="fixed-head">
-			<!-- <view class="sys-head" :style="{height:statusBarHeight}"></view> -->
-			<view class="tool-bar" @click='goBack()'>
-				<image class="icon-xiangzuo" src="../static/img/index/icon-back.png"></image>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	const app = getApp();
-	let sysHeight = uni.getSystemInfoSync().statusBarHeight
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from 'vuex';
-	import {
-		configMap
-	} from '@/utils';
-	/*
-	引入评论组件
-	*/
-	import douyinScrollview from '../components/douyin-scrollview/douyin-scrollview.nvue'
-	import mentioned from '../components/mentioned/mentioned.vue'
-	import authorize from '@/components/Authorize';
-	import {
-		deoList,
-		videoList,
-		myVideoList,
-		graphicStartApi,
-		followAuthorApi,
-		deletePlantApi,
-		focusArticleLst,
-		graphicLstApi
-	} from '@/api/community.js';
-	import {
-		HTTP_REQUEST_URL
-	} from '@/config/app.js';
-	import {
-		getUserInfo
-	} from '@/api/user.js';
-	import {
-		navigateBack
-	} from '../../../libs/uniApi';
-	export default {
-		computed: configMap({
-			statusBarHeight: 0,
-			community_reply_status: 0
-		}, mapGetters(['isLogin', 'uid'])),
-		data() {
-			return {
-				imgHost: HTTP_REQUEST_URL,
-				//下面打🌟号的是必须要的基础字段
-				//下面打💗号的是拥有滑动条的必须字段
-				dataList: [], //用于数据循环的列表🌟💗
-				wHeight: 0, //获取的屏幕高度🌟💗
-				boxStyle: { //视频，图片封面样式🌟💗
-					'height': 0,
-					'width': 0,
-				},
-				k: 0, //默认为0🌟💗
-				max: 2,
-				playIngIds: [], //正在播放的视频id列队，列队用于处理滑动过快导致的跳频问题🌟💗
-				ready: false, //可忽略
-				isDragging: false, //false代表停止滑动🌟💗
-				refreshing: true, //用于下拉刷新🌟💗
-				windowWidth: 0, //获取屏幕宽度🌟💗
-				windowHeight: 0,
-				dex: [0, 0], //用于判断是上滑还是下滑，第一个存旧值，第二个存新值【目前在1.0.7已经废弃】
-				currents: 0, //用于左右滑动，0代表视频界面，1代表右滑界面🌟💗
-				platform: '', //用于获取操作系统：ios、android🌟💗
-				playIng: false, //用于视频初始化时是否播放，默认不播放🌟💗
-				videoTime: '', //视频总时长，这个主要用来截取时间数值💗
-				videoTimes: '', //视频时长，用这个来获取时间值，例如：00:30这个时间值💗
-				changeTime: '', //显示滑动进度条时变化的时间💗
-				isShowimage: false, //是否显示封面【1.0.4已废弃，但是意思需要记住】
-				currenttimes: 0, //当前时间💗
-				isShowProgressBarTime: false, //是否拖动进度条，如果拖动（true）则显示进度条时间，否则不显示（false）【1.0.4已废弃，但是意思需要记住】
-				ProgressBarOpacity: 0.7, //进度条不拖动时的默认值，就是透明的💗
-				dotWidth: 0, //播放的小圆点，默认没有💗
-				deleteHeight: 0, //测试高度🌟💗
-				percent: 0, //百分小数💗
-				currentPosition: 0, //滑块当前位置💗//2.0已弃用，现已用于后端参数
-				currentPositions: 0, //滑块当前位置的副本💗//2.0已弃用，现已用于后端参数
-				newTime: 0, //跟手滑动后的最新时间💗
-				timeNumber: 0, //🌟💗
-				ProgressBarBottom: 20, //进度条离底部的距离💗
-				object_fit: 'contain', //视频样式默认包含🌟💗
-				mode: 'aspectFit', //图片封面样式🌟💗
-				timeout: "", //🌟用来阻止 setTimeout()方法
-				voice: "", //🌟用来阻止 setTimeout()方法
-				oldVideo: "",
-				isAutoplay: false, //是否开启自动播放(默认不开启)
-				autoplayText: "开启自动播放",
-				timers: "",
-				// 引入评论 - 参数
-				heightNum: 1.8,
-				// 双击点赞参数
-				touchNum: 0,
-				aixinLeft: 0,
-				aixinTop: 0,
-				showComment: false,
-				loadVideo: true,
-				Rotate: 0,
-				currentNav: 1,
-				limit: 6,
-				page: 1,
-				userInfo: {
-					uid: 0
-				},
-				moreList: [],
-				isShowAuth: false, //是否隐藏授权
-				isAuto: false, //没有授权的不会自动授权
-				authorUid: 0,
-				showManage: false,
-				isUser: false,
-				isSatrt: 0,
-				userUid: 0,
-				sysHeight: sysHeight,
-				cateGoods: [],
-				where: {
-					category_id: -1,
-					page: 1,
-					limit: 6
-				},
-			}
-		},
-		components: {
-			douyinScrollview,
-			mentioned,
-			authorize
-		},
-		watch: {
-			async k(new_k, old_k) { //监听 k 值的变化，可以控制视频的播放与暂停
-				const max = new_k + 2;
-				if (this.max < max) {
-					this.max = max;
-				}
-				// if (this.oldCurrent != this.currentNav) {
-				// 	this.oldCurrent = this.currentNav
-				// 	return false
-				// }
-				this.dataList[old_k].playIng = false //如果视频暂停，就加载封面
-				this.dataList[old_k].isplay = true
-				this.dataList[old_k].state = 'pause'
-				// console.log('预留第' + (old_k) + '个视频：' + this.dataList[old_k].community_id)
-				// 2.0版本已经去掉了下面这一句，视频不用暂停，只需要把声音禁止就行
-				uni.createVideoContext(this.dataList[old_k].community_id, this)
-					.pause() //如果视频暂停，那么旧视频停止，这里的this.dataList[old_k].id + '' + old_k，后面加 old_k 是为了每一个视频的 id 值不同，这样就可以大程度的避免串音问题
-				// console.log('已经暂停 --> 第' + (old_k) + '个视频～') //提示
-				this.dataList[new_k].state = 'play'
-				this.dataList[new_k].isplay = false
-				this.dataList[new_k].playIng = true
-				uni.createVideoContext(this.dataList[new_k].community_id, this).play()
-			}
-		},
-		onShow() {
-			uni.hideLoading();
-			// console.log('回到前台' + this.dataList.length);
-			if (this.dataList.length !== 0) {
-				this.dataList[this.k].state = 'play';
-				setTimeout(() => {
-					uni.createVideoContext(this.dataList[this.k].community_id, this).play()
-				}, 250)
-			}
-		},
-		onHide() {
-			this.dataList[this.k].state = 'pause'; //界面隐藏也要停止播放视频
-			setTimeout(() => {
-				uni.createVideoContext(this.dataList[this.k].community_id, this).pause(); //暂停以后继续播放
-			}, 250)
-			// console.log('到后台');
-		},
-		onLoad(options) {
-
-			this.videoID = options.id || 0;
-			this.isUser = options.user == 1 ? true : false;
-			this.userUid = options.uid ? options.uid : 0;
-			this.isSatrt = options.tab == 1 ? 1 : 0;
-			// if (options.pid) app.globalData.spid = options.pid;
-			// console.log('到后台');
-			this.platform = uni.getSystemInfoSync().platform
-			this.windowWidth = uni.getSystemInfoSync().screenWidth //获取屏幕宽度
-			this.boxStyle.width = this.windowWidth + 'px' //给宽度加px
-			this.wHeight = uni.getSystemInfoSync().screenHeight; //获取屏幕高度
-			this.boxStyle.height = this.wHeight; //改变视频高度
-			this.get() //这一步，加载视频数据
-			if (this.isLogin) this.getUserInfo()
-		},
-		onReady() {},
-		methods: {
-			giveStart(item) {
-				let status = item.relevance_id ? 0 : 1
-				graphicStartApi(item.community_id, {
-					status: status
-				}).then(res => {
-					if (item.relevance_id) {
-						item.count_start--;
-						item.count_start = item.count_start == 0 ? 0 : item.count_start
-						item.relevance_id = false
-					} else {
-						item.count_start++;
-						item.relevance_id = true
-					}
-				})
-			},
-			gogogo(item) {
-				this.videoID = item.community_id
-				this.navTap(1)
-			},
-			async getGoods(index) {
-				console.log(index);
-				const {
-					data
-				} = await graphicLstApi(this.where)
-				this.cateGoods.push(...data.list)
-				this.where.page++
-				console.log(this.where.page);
-
-			},
-			goBack: function() {
-				uni.navigateBack();
-			},
-			navTap(n) {
-				this.currentNav = n;
-				this.oldVideo = "";
-				this.k = 0;
-				this.page = 1;
-				this.dataList = [];
-				switch (n) {
-					case 1:
-						this.get()
-						break;
-					case 2:
-						this.getFocusList()
-						break;
-					case 3:
-						this.getGoods()
-						break;
-				}
-			},
-			pinlunFun(e) {
-				this.dataList[e]['count_reply']++
-			},
-			// #ifdef APP-PLUS
-			appShare(scene, id) {
-				let that = this
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				});
-				let uid = this.uid ? this.uid : 0;
-				let data = this.dataList[this.k];
-				let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-				let curRoute = routes[routes.length - 1].$page.fullPath // 获取当前页面路由，也就是最后一个打开的页面路由
-				uni.share({
-					provider: "weixin",
-					scene: scene,
-					type: 0,
-					href: `${HTTP_REQUEST_URL}/pages/short_video/nvueSwiper/index?&id=${id}`,
-					title: data.title || '',
-					summary: data.content || '',
-					imageUrl: data.image[0] || '',
-					success: function(res) {
-						uni.showToast({
-							title: '分享成功',
-							icon: 'success'
-						})
-						uni.hideLoading();
-					},
-					fail: function(err) {
-						uni.hideLoading();
-						uni.showToast({
-							title: '分享失败',
-							icon: 'none',
-							duration: 2000
-						})
-					}
-				});
-			},
-
-			// #endif
-			/**
-			 * 获取个人用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.userInfo = res.data;
-				});
-			},
-			// 关注作者
-			followAuthor: function(item) {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					let status = 1
-					followAuthorApi(item.uid, {
-						status: status
-					}).then(res => {
-						if (res.status === 200) {
-							item.is_fans = true
-						}
-						this.$util.Tips({
-							title: res.message
-						});
-					}).catch(err => {
-						return uni.showToast({
-							title: err,
-							icon: 'none',
-							duration: 2000
-						});
-					});
-				}
-			},
-			// 删除话题
-			deleteTopic(item) {
-				let that = this;
-				uni.showModal({
-					content: '确定要删除该话题么？',
-					success: function(res) {
-						if (res.confirm) {
-
-							deletePlantApi(item.community_id).then(res => {
-
-
-								if (res.status == 200) {
-
-									uni.navigateBack({
-										delta: 1,
-									})
-
-									that.$util.Tips({
-										title: res.message
-									});
-									// setTimeout(function() {
-									// 	uni.redirectTo({
-									// 		url: '/pages/plantGrass/plant_user/index?id=' +
-									// 			item.uid
-									// 	})
-									// }, 1000);
-									uni.navigateBack({
-										delta: 1,
-									})
-
-								}
-							})
-						} else if (res.cancel) {
-							// console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			// 授权回调
-			onLoadFun() {
-				this.isShowAuth = false
-				this.getUserInfo()
-			},
-			//授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			moreTap(item) {
-				item.isMore = !item.isMore;
-			},
-			autoPlay() {
-				this.isAutoplay = !this.isAutoplay;
-				if (!this.isAutoplay) {
-					this.autoplayText = "开启自动播放"
-					uni.showToast({
-						title: "关闭自动播放",
-						icon: 'none',
-						duration: 3000
-					})
-				} else {
-					this.autoplayText = "关闭自动播放"
-					uni.showToast({
-						title: "开启自动播放",
-						icon: 'none',
-						duration: 3000
-					})
-				}
-			},
-			getData() {
-				// 这里就是数据加载完以后再向后端发送数据的地方,
-				let that = this;
-				// if (!that.loadVideo) return
-				// that.loadVideo = true
-				// '
-				// 	deoList(that.videoID).then(res => {
-				// 	that.loadVideo = false
-				// 	that.getVideoData([res.data]);
-				// 				}).catch(err => {
-				// 					return uni.showToast({
-				// 						title: err,
-				// 						icon: 'none',
-				// 						duration: 2000
-				// 					});
-				// 				})'
-				// that.isUser ?
-				videoList({
-					page: that.page,
-					limit: that.limit,
-					id: this.videoID
-
-				}).then(res => {
-					that.getVideoData(res.data.list);
-				})
-
-
-				//:
-				// graphicLstApi({
-				// 	page: that.page,
-				// 	limit: that.limit,
-				// 	category_id: -1
-				// }).then(res => {
-				// 	that.getVideoData(res.data.list);
-				// }).catch(err => {
-				// 	return uni.showToast({
-				// 		title: err,
-				// 		icon: 'none',
-				// 		duration: 2000
-				// 	});
-				// })
-			},
-			getFocusList() {
-				let that = this;
-				focusArticleLst({
-					page: that.page,
-					limit: that.limit,
-				}).then(res => {
-					that.loadVideo = false
-					that.getVideoData(res.data.list)
-				}).catch(err => {
-					return uni.showToast({
-						title: err,
-						icon: 'none',
-						duration: 2000
-					});
-				})
-			},
-			getVideoData(list) {
-
-				if (list.length == 0) return
-				let that = this;
-				that.loadVideo = list.length == that.limit
-				that.page = that.page + 1
-				var msg = list
-				for (let i = 0; i < msg.length; i++) {
-					msg[i]['isMore'] = false
-					msg[i]['community_id'] = msg[i]['community_id'].toString()
-					that.dataList.push(msg[i])
-				}
-
-				if (that.dataList.length !== 0) {
-					that.dataList[that.k].state = 'play';
-					setTimeout(function() {
-						uni.createVideoContext(that.dataList[that.k].community_id, that).play()
-					}, 10);
-				}
-			},
-			touchstart(event) {
-				this.dataList[this.k].isShowimage = true //刚触摸的时候就要显示预览视频图片了
-				this.dataList[this.k].isShowProgressBarTime = true //显示时间线
-				this.ProgressBarOpacity = 1 //让滑块显示起来更明显一点
-				this.dotWidth = 10 //让点显示起来更明显一点
-			},
-			touchend() { //当手松开后，跳到最新时间
-				uni.createVideoContext(this.dataList[this.k].community_id, this).seek(this.newTime)
-				if (this.dataList[this.k].state == 'pause') {
-					this.dataList[this.k].state = 'play'
-					uni.createVideoContext(this.dataList[this.k].community_id, this).play()
-				}
-				this.dataList[this.k].isShowProgressBarTime = false //触摸结束后，隐藏时间线
-				this.dataList[this.k].isShowimage = false //触摸结束后，隐藏时间预览
-				this.ProgressBarOpacity = 0.5 //隐藏起来进度条，不那么明显了
-				this.dotWidth = 0 //隐藏起来进度条，不那么明显了
-			},
-			touchmove(event) { //当手移动滑块时，计算位置、百分小数、新的时间
-				var msg = []
-				if (this.videoTime !== '') {
-					msg = this.videoTime.split(':')
-				}
-				var timeNumber = Number(msg[0]) * 60 + Number(msg[1])
-				this.currentPositions = event.changedTouches[0].screenX
-				this.percent = this.currentPositions / this.windowWidth
-				this.newTime = this.percent * timeNumber
-				this.currenttimes = parseInt(this.newTime)
-				let theTime = this.newTime
-				let middle = 0; // 分
-				if (theTime > 60) {
-					middle = parseInt(theTime / 60);
-					theTime = parseInt(theTime % 60);
-				}
-				this.changeTime =
-					`${Math.round(middle)>9?Math.round(middle):'0'+Math.round(middle)}:${Math.round(theTime)>9?Math.round(theTime):'0'+Math.round(theTime)}`
-			},
-			timeupdate(event, index) { //计算滑块当前位置，计算当前百分小数
-				if (index == this.k) {
-					var currenttime = event.detail.currentTime
-					this.timeNumber = Math.round(event.detail.duration)
-					this.getTime()
-					this.percent = currenttime / this.timeNumber
-					this.currentPosition = this.windowWidth * this.percent
-					let theTime = currenttime
-					let middle = 0; // 分
-					if (theTime > 60) {
-						middle = parseInt(theTime / 60);
-						theTime = parseInt(theTime % 60);
-					}
-					this.changeTime =
-						`${Math.round(middle)>9?Math.round(middle):'0'+Math.round(middle)}:${Math.round(theTime)>9?Math.round(theTime):'0'+Math.round(theTime)}`
-					//自动切换视频
-					if (this.isAutoplay) { //true,代表自动播放
-						if (Math.round(currenttime) == this.timeNumber - 1) {
-							const dom = uni.requireNativePlugin('dom')
-							let doms = 'item' + (this.k + 1)
-							setTimeout(() => {
-								let el = this.$refs[doms][0]
-								dom.scrollToElement(el, {
-									offset: 0,
-									animated: true
-								})
-							}, 500)
-						}
-					}
-				}
-			},
-			getTime() { //得到时间函数
-				this.videoTime = this.formatSeconds(this.timeNumber);
-				var msg = []
-				if (this.videoTime !== '') {
-					msg = this.videoTime.split(':')
-				}
-				this.videoTimes = `${msg[0]>9?msg[0]:'0'+msg[0]}:${msg[1]>9?msg[1]:'0'+msg[1]}`;
-			},
-			formatSeconds(value) { //获取时间函数
-				let theTime = parseInt(value); // 秒
-				let middle = 0; // 分
-				if (theTime > 60) {
-					middle = parseInt(theTime / 60);
-					theTime = parseInt(theTime % 60);
-				}
-				return `${middle>9?middle:middle}:${theTime>9?theTime:theTime}`;
-			},
-			moreVideo(index) {
-
-			},
-			toVideo(index) {
-
-			},
-			scrolls(event) {
-
-				this.showManage = false;
-				this.isDragging = event.isDragging;
-				if (!event.isDragging) { //isDragging：判断用户是不是在滑动，滑动：true，停止滑动：false。我们要用户停止滑动时才给 k 赋值，这样就可以避免很多麻烦
-					var i = Math.round(Math.abs(event.contentOffset.y) / (this.wHeight - this.deleteHeight +
-						1)) //先用绝对值取出滑动的距离，然后除以屏幕高度，取一个整，就知道你现在滑动到哪一个视频了
-					if (i !== this.k) { //这里加判断是因为这个方法会执行很多次，会造成重复请求，所以这里写一个限制
-						if (uni.getSystemInfoSync().platform == 'ios') {
-							this.k = i //判断了用户没有滑动，确认了用户的确是在看这个视频，然后就赋值啦
-							this.dataList[this.k].state = 'play'
-							// console.log('正在播放 --> 第' + (this.k + 1) + '个视频～')
-						} else {
-							clearTimeout(this.timers);
-							this.timers = setTimeout(() => {
-								this.k = i //判断了用户没有滑动，确认了用户的确是在看这个视频，然后就赋值啦
-								this.dataList[this.k].state = 'play'
-								// console.log('正在播放 --> 第' + (this.k + 1) + '个视频～')
-							}, 80)
-						}
-					}
-				}
-			},
-			get() {
-				// if(!this.loadVideo) return
-				this.loadVideo = true
-				// 这个方法主要就是用来第一次进入视频播放时用来处理
-				deoList(this.videoID).then(async (res) => {
-					this.loadVideo = false
-					this.userUid = res.data.uid
-					this.page = this.page + 1;
-					var msg = [res.data];
-					for (let i = 0; i < msg.length; i++) {
-						msg[i]['isMore'] = false
-						msg[i]['playIng'] = false
-						msg[i]['state'] = false
-						msg[i]['isplay'] = false
-						msg[i]['loading'] = false
-						msg[i]['community_id'] = msg[i]['community_id'].toString()
-					}
-					this.dataList = msg;
-
-					if (this.dataList.length !== 0) {
-						this.dataList[this.k].state = 'play';
-						uni.createVideoContext(this.dataList[this.k].community_id, this).play()
-					}
-				}).catch(err => {
-					return uni.showToast({
-						title: err,
-						icon: 'none',
-						duration: 2000
-					});
-				})
-
-
-
-				// this.isUser ?
-				//   myVideoList(this.userUid, {
-				//     page: this.page,
-				//     limit: this.limit,
-				//     is_star: this.isSatrt,
-				//     community_id: this.videoID
-				//   }).then(async (res) => {
-				//     this.loadVideo = false
-				//     this.page = this.page + 1;
-				//     var msg = res.data.list;
-				//     for (let i = 0; i < msg.length; i++) {
-				//       msg[i]['isMore'] = false
-				//       msg[i]['playIng'] = false
-				//       msg[i]['state'] = false
-				//       msg[i]['isplay'] = false
-				//       msg[i]['loading'] = false
-				//       msg[i]['community_id'] = msg[i]['community_id'].toString()
-				//     }
-				//     this.dataList = msg;
-				//     if (this.dataList.length !== 0) {
-				//       this.dataList[this.k].state = 'play';
-				//       uni.createVideoContext(this.dataList[this.k].community_id, this).play()
-				//     }
-				//   }).catch(err => {
-				//     return uni.showToast({
-				//       title: err,
-				//       icon: 'none',
-				//       duration: 2000
-				//     });
-				//   }) :
-				//   graphicLstApi({
-				//     page: this.page,
-				//     limit: this.limit,
-				//     category_id: -1
-				//   }).then(async (res) => {
-				//     this.page = this.page + 1;
-				//     var msg = res.data.list;
-				//     for (let i = 0; i < msg.length; i++) {
-				//       msg[i]['isMore'] = false
-				//       msg[i]['playIng'] = false
-				//       msg[i]['state'] = false
-				//       msg[i]['isplay'] = false
-				//       msg[i]['community_id'] = msg[i]['community_id'].toString()
-				//     }
-				//     this.dataList = msg;
-				//   }).catch(err => {
-				//     return uni.showToast({
-				//       title: err,
-				//       icon: 'none',
-				//       duration: 2000
-				//     });
-				//   })
-			},
-			onpullingdown() {
-				this.refreshing = true
-			},
-			onrefresh() {
-				setTimeout(() => {
-					this.refreshing = false
-				}, 1000)
-			},
-			//点击播放&&暂停
-			tapVideoHover(state, event) {
-				this.dataList[this.k].isShowimage = false
-				this.dataList[this.k].isShowProgressBarTime = false
-				this.ProgressBarOpacity = 0.5
-				this.dotWidth = 0
-				this.touchNum++;
-				setTimeout(() => {
-					if (this.touchNum == 1) {
-						if (state == 'play' || state == 'continue') {
-							this.dataList[this.k].state = 'pause';
-						} else {
-							this.dataList[this.k].state = 'continue';
-						}
-						if (this.dataList[this.k].state == 'continue') {
-							uni.createVideoContext(this.dataList[this.k].community_id, this).play(); //暂停以后继续播放
-						}
-						if (this.dataList[this.k].state == 'pause') {
-							uni.createVideoContext(this.dataList[this.k].community_id, this).pause(); //暂停以后继续播放
-						}
-					}
-					this.touchNum = 0;
-				}, 200)
-			},
-			toComment(item, index) {
-				// 注意点击评论之后会执行这里
-				/*
-				（1）先加载缓冲
-				（2）获取当前视频 ID 信息
-				（3）🌟🌟🌟🌟重要🌟🌟🌟🌟
-					- 一定要记得看 index.vue 里面
-					 uni.setStorageSync("user",this.peopleList[i]);
-					 这个东西，用于存储当前用户信息。在 插件里面会使用到这个东西，
-					 记得写一下。
-					 
-				（4）打开评论
-				*/
-				uni.setStorageSync("videoList", item);
-				uni.setStorageSync("videoIndex", index);
-				this.$refs.pinglun.open('bottom')
-			},
-			cLike(item) {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					let status = item.relevance_id ? 0 : 1
-					graphicStartApi(item.community_id, {
-						status: status
-					}).then(res => {
-						if (item.relevance_id) {
-							item.count_start--;
-							item.count_start = item.count_start == 0 ? 0 : item.count_start
-							item.relevance_id = false
-						} else {
-							item.count_start++;
-							item.relevance_id = true
-						}
-					}).catch(err => {
-						return uni.showToast({
-							title: err,
-							icon: 'none',
-							duration: 2000
-						});
-					})
-				}
-			},
-			/*
-			收藏
-			*/
-			cCollect(item) {
-				markeVideo('collect', item.community_id).then(res => {
-					this.dataList[this.k].is_collect = !this.dataList[this.k].is_collect
-					const video = this.dataList[this.k];
-					item.is_collect ? video.collect_num += 1 : video.collect_num -= 1;
-				}).catch(err => {
-					return uni.showToast({
-						title: err,
-						icon: 'none',
-						duration: 2000
-					});
-				})
-			},
-			moveHandle() {},
-			closeScrollview() {
-				// 点击评论里面的叉叉，就会关闭评论 
-				this.$refs.pinglun.close();
-			},
-			/*查看提到的宝贝*/
-			openMore(item) {
-				this.$refs.pinglunMentioned.open('bottom');
-				this.moreList = item.relevance;
-				this.authorUid = item.uid
-			},
-			closePopup() {
-				this.$refs.pinglunMentioned.close();
-			},
-			goDetail(item) {
-				if (item.product_type === 1) {
-					uni.navigateTo({
-						url: `/pages/activity/goods_seckill_details/index?id=${item.product_id}&time=${item.stop_time}&spid=${this.uid}`
-					})
-				} else if (item.product_type === 2) {
-					uni.navigateTo({
-						url: `/pages/activity/presell_details/index?id=${item.activity_id}&spid=${this.uid}`
-					})
-				} else if (item.product_type === 0) {
-					uni.navigateTo({
-						url: `/pages/goods_details/index?id=${item.product_id}&spid=${this.uid}`
-					})
-				} else if (item.product_type === 4) {
-					uni.navigateTo({
-						url: `/pages/activity/combination_details/index?id=${item.activity_id}&spid=${this.uid}`
-					})
-				} else if (item.product_type === 40) {
-					uni.navigateTo({
-						url: `/pages/activity/combination_status/index?id=${item.activity_id}&spid=${this.uid}`
-					})
-				}
-			}
-		},
-		onReachBottom() {
-			uni.$emit('onReachBottom');
-		},
-	}
-</script>
-<style lang="scss" scoped>
-
-	// .video-list{
-	//   padding: 200rpx 28.07rpx 0 28.07rpx;
-	//   display: flex;
-	//   flex-direction: row; // 可以生效
-	//   direction: ltr;
-	//   flex-wrap: wrap;
-	//   justify-content: space-between;
-	//   .goods_item{
-	//     height: 87.72upx;
-	//     background-color: #999;
-	//   }
-	// }
-	.video-list {
-		// margin: 0 auto;
-		// width: 750rpx;
-		padding: 200rpx 28.07rpx 0 28.07rpx;
-		/* #ifdef MP */
-		padding-top: 200rpx;
-		/* #endif */
-	
-		// background-color: #000000;
-		background-color: #F5F5F5;
-
-		.goods_item {
-			width: 342.11rpx;
-			height: 491.23rpx;
-			border-radius: 8px;
-			overflow: hidden;
-			// background-color: #000;
-			display: flex;
-			flex-direction: column;
-			padding-bottom: 10px;
-
-			.goods_img {
-				width: 342.11rpx;
-				border-top-left-radius: 8px;
-				border-top-right-radius: 8px;
-				height: 294.74rpx;
-			}
-
-			.botm {
-				flex: 1;
-				padding: 0 14.04rpx;
-				padding-bottom: 21.05rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-				background-color: #fff;
-				border-radius: 0 0 8px 8px;
-
-				.title {
-					font-size: 26.32rpx !important;
-					margin: 12px 0;
-					width: 342.11rpx;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					lines: 2;
-				}
-
-				.goods_info {
-					display: flex;
-					flex-direction: row;
-					direction: ltr;
-					justify-content: space-between;
-
-					.l_info {
-						flex-direction: row; // 可以生效
-						direction: ltr;
-						display: flex;
-						align-items: center;
-					}
-
-					.g_img {
-						width: 60rpx;
-						height: 60rpx;
-						border-radius: 50%;
-					}
-
-					.g_name {
-						font-size: 26.32rpx !important;
-						margin-left: 8.77rpx;
-						width: 100.63rpx;
-						text-overflow: ellipsis;
-						lines: 1;
-					}
-
-					.nice_box {
-						flex-direction: row; // 可以生效
-						direction: ltr;
-						align-items: center;
-
-						.isshow {
-							color: #FE3530 !important;
-						}
-
-						.iconfont {
-							font-size: 30rpx;
-						}
-
-						.icon-shoucang1 {
-							color: #F84221;
-						}
-
-						.collect {
-							font-size: 24rpx;
-							margin-left: 5rpx;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	.noVideo {
-		position: fixed;
-		top: 400rpx;
-		z-index: 9;
-		width: 750rpx;
-		flex-direction: row;
-		justify-content: center;
-
-		.pictrue {
-			width: 414rpx;
-			height: 256rpx;
-		}
-
-		.tips {
-			text-align: center;
-			margin-top: 14rpx;
-			font-size: 26rpx;
-			color: #999;
-		}
-	}
-
-	.fixed-head {
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		position: fixed;
-		left: 0;
-		top: 70rpx;
-		height: 86rpx;
-		
-
-
-
-		.icon-xiangzuo {
-			
-			margin-left: 10px;
-			width: 20px;
-			height: 20px;
-			color: #ffffff;
-			
-		}
-		padding-right: 30rpx;
-	}
-
-	.header {
-		position: fixed;
-		z-index: 9;
-		width: 750rpx;
-		height: 186rpx;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		padding-top: 70rpx;
-
-		.items {
-			margin: 0 30rpx;
-
-			.tName {
-				color: #000;
-				font-size: 32rpx;
-
-				&.on {
-					font-size: 38rpx;
-				}
-			}
-		}
-	}
-
-	.container {
-		background-color: #F5F5F5;
-	}
-
-	.item {
-		position: relative;
-	}
-
-	.videoHover {
-		position: absolute;
-		top: 0;
-		left: 0;
-		flex: 1;
-		background-color: rgba(0, 0, 0, 0.1);
-		justify-content: center;
-		align-items: center;
-	}
-
-	.playState {
-		width: 160rpx;
-		height: 160rpx;
-		opacity: 0.2;
-	}
-
-	.video-status {
-		width: 690rpx;
-		position: absolute;
-		left: 30rpx;
-		// background: #000;
-		border-radius: 10rpx;
-		top: 150rpx;
-		padding: 30rpx;
-
-		.status-title {
-			flex-direction: row;
-			align-items: center;
-
-			.title {
-				margin-left: 20rpx;
-				color: #ffffff;
-				font-size: 28rpx;
-			}
-		}
-
-		.refusal {
-			color: #ffffff;
-			font-size: 22rpx;
-			margin: 15rpx 0 0 48rpx;
-		}
-
-		.image {
-			width: 28rpx;
-			height: 28rpx;
-		}
-	}
-
-	.userInfo {
-		position: absolute;
-		bottom: 400rpx;
-		right: 10px;
-		display: flex;
-		align-items: center;
-		flex-direction: column;
-
-		.pictrue {
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			position: relative;
-
-			// margin-bottom: 18rpx;
-			.guanzhu {
-				width: 42rpx;
-				height: 42rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				color: #fff;
-				background: #E93323;
-				border-radius: 100%;
-				position: relative;
-				top: -20rpx;
-				left: 3rpx;
-
-				.iconfont {
-					font-size: 30rpx;
-					color: #fff;
-				}
-			}
-
-			.yiguanzhu {
-				width: 42rpx;
-				height: 42rpx;
-			}
-		}
-	}
-
-	.video-my {
-		position: relative;
-		align-items: center;
-		justify-content: center;
-		flex-direction: row;
-
-	}
-
-	.video-dian {
-		position: relative;
-		width: 33px;
-		height: 33px;
-		align-items: center;
-		justify-content: center;
-		flex-direction: row;
-		left: 3px;
-
-		.dian {
-			width: 7px;
-			height: 7px;
-			background-color: #fff;
-			border-radius: 100%;
-			margin-right: 3px;
-
-			&:last-child {
-				margin-right: 0;
-			}
-		}
-	}
-
-	.manage {
-		width: 115px;
-		background: #ffffff;
-		box-shadow: 0 1px 8px rgba(0, 0, 0, 0.1);
-		padding: 0 8px;
-		position: absolute;
-		bottom: 185px;
-		right: 60px;
-		border-radius: 8px;
-
-		.manage-gou {
-			display: flex;
-			width: 13px;
-			height: 13px;
-			background: #ffffff;
-			transform: rotate(140deg);
-			position: absolute;
-			top: 30px;
-			right: -6px;
-			box-shadow: -1px -1px 1px rgba(0, 0, 0, 0.05);
-		}
-
-		.items {
-			border-bottom: 1px solid #EEEEEE;
-			padding: 10px 0;
-			display: flex;
-			align-items: center;
-			flex-direction: row;
-
-			.text {
-				color: #282828;
-				font-size: 13px;
-			}
-
-			&:last-child {
-				border-bottom-color: transparent;
-			}
-
-			.image {
-				width: 32rpx;
-				height: 32rpx;
-				margin: 0 16rpx 0;
-			}
-		}
-	}
-
-	.userAvatar {
-		border-radius: 500%;
-		border-style: solid;
-		border-width: 2px;
-		border-color: #ffffff;
-		width: 80rpx;
-		height: 80rpx;
-	}
-
-	.info-text {
-		display: flex;
-		margin-top: 10rpx;
-		color: #ffffff;
-		font-size: 22rpx;
-		text-align: center;
-
-		&.likeNumActive {
-			color: #E93323;
-		}
-	}
-
-	.likeIco,
-	.shareIco,
-	.commentIco {
-		width: 60rpx;
-		height: 60rpx;
-		margin-top: 15px;
-	}
-
-	.likeNum,
-	.commentNum,
-	.shareTex {
-		color: #ffffff;
-		font-size: 30rpx;
-		text-align: center;
-		margin: 5px;
-	}
-
-	.mention {
-		width: 46px;
-		height: 46px;
-		position: relative;
-
-		.image {
-			width: 30px;
-			height: 30px;
-			position: absolute;
-			right: 8px;
-		}
-
-		.count {
-			padding: 2px 6px;
-			background: #fff;
-			border-radius: 100%;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			color: #E93323;
-			position: absolute;
-			right: 6px;
-			top: 0;
-			font-size: 10px;
-		}
-	}
-
-	.content {
-		width: 325px;
-		position: absolute;
-		bottom: 15px;
-		/* justify-content: center; */
-		padding: 15rpx;
-		flex-direction: column;
-		justify-content: flex-start;
-		color: #ffffff;
-
-		.cart {
-			height: 48rpx;
-			flex-direction: row;
-
-			.cartName {
-				font-size: 24rpx;
-				color: #fff;
-			}
-		}
-
-		.product {
-			flex-direction: row;
-			margin-top: 27rpx;
-
-			.scroll-view {
-				flex-direction: row;
-			}
-
-			.product-item {
-				width: 444rpx;
-				height: 136rpx;
-				// background: rgba(0, 0, 0, .55);
-				background-color: #F4F4F4;
-				border-radius: 12rpx;
-				padding: 16rpx 15rpx;
-				margin-right: 30rpx;
-			}
-
-			.swiper {
-				width: 500rpx !important;
-				height: 136rpx !important;
-
-				.swiper-count {
-					width: 444rpx !important;
-					height: 136rpx !important;
-					background: rgba(0, 0, 0, .55);
-					border-radius: 12rpx;
-					padding: 16rpx 15rpx;
-				}
-
-				.swiper-item {
-					flex-direction: row;
-				}
-			}
-
-			.item-count {
-				flex-direction: row;
-				justify-content: space-between;
-
-				.picture {
-					width: 104rpx;
-					height: 104rpx;
-					border-radius: 10rpx;
-
-					.image {
-						width: 104rpx;
-						height: 104rpx;
-						border-radius: 10rpx;
-					}
-				}
-
-				.product-text {
-					width: 286rpx;
-					justify-content: space-between;
-
-					.name {
-						font-size: 24rpx;
-						width: 286rpx;
-						// color: #fff;
-						color: #000;
-					}
-
-					.product-price {
-						display: flex;
-						flex-direction: row;
-						justify-content: space-between;
-						align-items: center;
-
-						.price {
-							display: flex;
-							flex-direction: row;
-
-							.sm,
-							.money {
-								// color: #ffffff;
-								color: #000;
-								font-size: 24rpx;
-							}
-						}
-
-						.buy-btn {
-							padding: 6rpx 20rpx;
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							color: #fff;
-							border-radius: 26rpx;
-							background: #E93323;
-							font-size: 20rpx;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	.product_cate {
-		margin: 20rpx 0;
-		flex-direction: row;
-
-		.pro-view {
-			flex-direction: row;
-			align-items: center;
-			border-radius: 30rpx;
-			padding: 0 25rpx;
-			line-height: 40rpx;
-			border-radius: 29rpx;
-			border: 1rpx solid #ffffff;
-
-			.text {
-				color: #ffffff;
-				font-size: 24rpx;
-			}
-
-			.icon {
-				font-size: 26rpx;
-				font-weight: bold;
-				margin-right: 8rpx;
-				color: #ffffff;
-			}
-		}
-	}
-
-	.timeCon {
-		flex-direction: row;
-		align-items: center;
-
-		.userName {
-			font-size: 30rpx;
-			color: #ffffff;
-		}
-	}
-
-	.words {
-		margin-top: 20rpx;
-
-		.close {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			justify-content: flex-end;
-			margin-right: 20rpx;
-
-			.imgClose {
-				width: 18rpx;
-				height: 10rpx;
-				margin-left: 10rpx;
-			}
-		}
-
-		.wordsCon {
-			position: relative;
-
-			.more {
-				position: absolute;
-				bottom: 0;
-				right: 40rpx;
-				font-size: 26rpx;
-				color: #ffffff;
-				font-weight: bold;
-			}
-
-			.img {
-				width: 18rpx;
-				height: 10rpx;
-				margin-left: 4rpx;
-				position: absolute;
-				bottom: 7rpx;
-				right: 20rpx;
-			}
-		}
-
-		.info {
-			color: #fff;
-			font-size: 28rpx;
-		}
-
-		.more {
-			font-size: 26rpx;
-			color: #ffffff;
-			font-weight: bold;
-		}
-	}
-
-	.root {
-		// background-color: #000000;
-
-	}
-</style>
\ No newline at end of file
diff --git a/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue b/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue
deleted file mode 100644
index b918f45..0000000
--- a/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue
+++ /dev/null
@@ -1,498 +0,0 @@
-<template>
-	<view :style="viewColor">
-		<view class="container">
-			<view class="main_content">
-					<text class="title">评论 {{all}}</text>
-					<image @click="close" class="closeBnt" src="../static/img/index/close.png" mode=""></image>
-				<view class="main">
-					<scroll-view :scroll-y="true" class="scroll-view">
-						<view v-if="list.length > 0" @touchmove="onTouchmove" id="reply"> 
-							<view class="common_list" v-for="(item, index) in list" :key="index">
-								<view class="commen_one">
-									<image :src="(item.author&&item.author.avatar) || '/static/images/f.png'" class="image"></image>
-								</view>
-								<view class="info_count">
-									<view class="info">
-										<view class="message" @click="toReply(item,index)">
-											<text v-if="item.author" class="name">{{item.author.nickname}}</text>
-											<text class="desc">{{item.content}}</text>
-											<text class="time">{{item.create_time}}</text>
-										</view>
-										<view class="like" @click="starComment(item)">
-											<image v-if="item.relevance_id" class="dianzan" src="../static/img/index/zan02.png"></image>
-											<image v-else class="dianzan" src="../static/img/index/zan01.png"></image>
-											
-											<text class="like-text">{{item.count_start}}</text>
-										</view>
-									</view>
-									<view v-if="item.children && item.children.length > 0" class="reply_count">
-										<view v-for="(itemn,indexn) in item.children" :key="indexn" class="reply_list">
-											<view class="item">
-												<view class="item_count" @click.stop="toReply(itemn,index)">
-													<image class="image" :src="itemn.author && itemn.author.avatar || '/static/images/f.png'"></image>
-													<text v-if="itemn.author" class="name_two">{{itemn.author.nickname}}</text>
-													<view class="desc_two">
-														<text class="reply_user" v-if="itemn.reply">回复 @{{itemn.reply.nickname}} </text> 
-														<text class="reply_text">{{itemn.content}}</text>
-													</view>
-													<text class="time_two">{{itemn.create_time}}</text>
-												</view>
-												<text class="like_two" @click.stop="starComment(itemn)">
-													<text class="iconfont":class="itemn.relevance_id ? 'icon-yidianzan' : 'icon-dianzan1'"></text>
-													{{itemn.count_start}}
-												</text>
-											</view>
-										</view>								
-									</view>	
-								</view>	
-							</view>
-							<view class="end"><text class="before"></text><text class="text">到底了</text><text class="after"></text></view>
-						</view>
-						<Loading :loaded="loaded" :loading="loading"></Loading>
-						<view v-if="list.length == 0 && !loading" class="empty">
-							<image class="image" src="/static/images/no_commen.png"></image>
-							<text class="text">暂无评论，快去抢沙发吧~</text>
-						</view>	
-					</scroll-view>	
-				</view>	
-				<view class="release_bar" :style="'bottom:'+bottom+'px;'">
-					<image class="image" :src="userInfo.avatar || '/static/images/f.png'"></image>
-					<view class="input_count">
-						<textarea style="height: 20px; font-size: 15px; color: #000000;" type="text" 
-						:placeholder="placeholder"
-						 placeholder-style="color: #999999; font-size: 15px;"
-							v-model="content" :auto-focus="autoFocus" :focus="focus" confirm-type="search"></textarea>	
-					</view>
-					<text class="send" @click.stop="submitComment">发送</text>
-				</view>
-			</view>	
-		</view>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-	</view>	
-</template>
-
-<script>
-	import { replyLstApi, starCommentApi, replyCreateApi } from '@/api/community.js';
-	import Loading from '@/components/Loading/index.vue';
-	import { getUserInfo } from '@/api/user.js';
-	import authorize from '@/components/Authorize';
-	import { mapGetters } from "vuex";
-	import { configMap } from '@/utils';
-	export default {
-		props:{
-			bottom: {
-				type: Number,
-				default: 0
-			},
-			userInfo: {
-				type: Object,
-				default: {}
-			}
-		},
-		components: {
-		  Loading, authorize
-		},
-		computed: configMap({community_reply_auth:0},mapGetters(['isLogin', 'viewColor'])),
-		data() {
-			return {
-				content: '',
-				id: "",
-				list: [],
-				loaded: false,
-				loading: false,
-				where: {
-					page: 1,
-					limit: 10
-				},
-				reply_id: "",
-				placeholder: "快来说点儿什么吧...",
-				isChild: false,
-				index: 0,
-				listIndex: 0,
-				focus: false,
-				autoFocus: false,
-				all: 0,
-				isShowAuth: false, //是否隐藏授权
-				isAuto: false, //没有授权的不会自动授权
-			};
-		},
-		mounted() {
-			let that=this;
-			uni.$on('onReachBottom',function(data){  
-				that.getList()
-			});   
-		},
-		created() {
-			let item = uni.getStorageSync("videoList");
-			let index = uni.getStorageSync("videoIndex");
-			this.getData(item,index)
-		},
-		// 滚动监听
-		onPageScroll() {
-			uni.$emit('scroll');
-		},
-
-		methods: {
-			// 授权回调
-			onLoadFun() {
-				this.isShowAuth = false
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			// 点击关闭按钮
-			close() {
-				this.$emit('closeScrollview');
-			},
-			onTouchmove(e){
-				if (this.loadend || this.loading) return;
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#reply').boundingClientRect(data => {
-					if(data.bottom < 1500) {
-						this.getList();	
-					}
-				}).exec();
-				// 模拟触底刷新
-			},
-			getData(item,index){
-				this.id = item.community_id
-				this.loading = this.loaded = false
-				this.where.page = 1
-				this.list = []
-				this.getList()
-				this.listIndex = index
-			},
-			getList(){
-				let that = this;
-				if(that.loading || that.loaded) return;
-				that.loading = true;
-				replyLstApi(that.id,that.where).then(res => {
-				    that.loading = false;
-					that.all = res.data.all;
-				    that.loaded = res.data.list.length < that.where.limit;
-				    that.list.push.apply(that.list, res.data.list);
-				    that.where.page = that.where.page + 1;
-				  },
-				  error => {
-				    that.$util.Tips({
-				      title: error.msg
-				    })
-				  }
-				);
-			},
-			/*发表评论*/
-			submitComment(){
-				let that = this;
-				if (that.isLogin === false) {
-					that.isAuto = true;
-					that.isShowAuth = true;
-					uni.hideKeyboard();
-				}else{
-					that.getUserInfo();
-				}	
-			},
-			/**
-			 * 获取个人用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.userInfo = res.data;
-					/*判断是否绑定手机号*/
-					if(res.data.phone || that.community_reply_auth == 0){
-						that.createReply()
-					}else{
-						uni.showModal({
-							title: '提示',
-							 content: '请先绑定手机号',
-							 success: function (res) {
-								if (res.confirm) {							
-								 uni.navigateTo({
-									url: '/pages/users/user_phone/index?type=1'
-								 })
-								}else if (res.cancel) {
-									uni.showToast({
-										title: '已取消',
-										icon: 'none'
-									});
-								}							 					     	    				     	 					        
-							}   
-						});  
-					}
-				});
-			},
-			createReply() {
-				let that = this;
-				let reply_id = that.reply_id ? that.reply_id : 0
-				replyCreateApi(that.id,{content: that.content,reply_id: reply_id}).then(res => {
-					// console.log(res.message)
-					if(res.status == 1){
-						if(that.isChild){
-							if(that.list[that.index]['children']){
-								that.list[that.index]['children'].push(res.data)
-							}else{
-								that.list[that.index]['children'] = [res.data]
-							}
-						}else{
-							that.list.unshift(res.data)
-						}
-						that.all++
-					}	
-					that.content = ""	
-					that.$util.Tips({
-						title: res.message
-					});
-					that.loseFocus()
-				}).catch(err => {
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
-				});
-			},
-			toReply(item,index){
-				this.content = ""
-				this.placeholder = '回复：'+item.author.nickname
-				// console.log(this.placeholder)
-				this.reply_id = item.reply_id
-				this.isChild = true
-				this.index = index;
-				this.focus = true;
-				this.autoFocus = true;
-			},
-			loseFocus(){
-				this.focus = false;
-				this.autoFocus = false;
-				this.reply_id = 0;
-				this.placeholder = "快来说点儿什么吧..."
-				this.isChild = false
-				// this.content = ""
-			},
-			/*点赞评论*/
-			starComment(item){
-				let that = this;
-				let status = item.relevance_id ? 0 : 1
-				starCommentApi(item.reply_id,{status: status}).then(res => {
-					if (res.status === 200) {
-						if(item.relevance_id){
-							item.count_start--;
-							item.count_start = item.count_start == 0 ? 0 : item.count_start
-							item.relevance_id = false
-						}else{
-							item.count_start++;
-							item.relevance_id = true
-						}
-					}
-					that.$util.Tips({
-						title: res.message
-					});
-				}).catch(err => {
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
-				});
-			},
-			closepoup(){
-				this.$refs.bindmobile.close()
-			},
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-.main_content{
-	padding: 12px 15rpx;
-	border-bottom: 2px solid #F5F5F5;
-	position: relative;
-}
-.header{
-	width: 750rpx;
-	position: relative;
-	text-align: center;
-}
-.title{
-	text-align: center;
-	flex-direction: row;
-	color: #282828;
-	font-size: 36rpx;
-	font-weight: bold;
-}
-.closeBnt{
-	position: absolute;
-	right: 30rpx;
-	top: 30rpx;
-	width: 15px;
-	height: 15px;
-}	
-.scroll-view{
-	height: 600px;
-	padding-bottom: 240px;
-}
-.main{
-	margin-top: 30px;
-	padding-bottom: 10px;
-	// position: sticky;
-	.common_list{
-		position: relative;
-		padding-left: 50px;
-		margin-bottom: 15px;
-		.commen_one{
-			position: absolute;
-			top: 0;
-			left: 0;
-			.image{
-				width: 74rpx;
-				height: 74rpx;
-				border-radius: 100%;
-			}
-				
-		}
-		.info{
-			position: relative;
-			padding-right: 90rpx;
-			width: 630rpx;
-		}
-		.name,.name_two{
-			color: #999999;
-			font-size: 26rpx;
-		}
-		.desc,.desc_two{
-			color: #282828;
-			font-size: 28rpx;
-			margin-top: 10rpx;
-		}
-		.desc_two{
-			.reply_user{
-				font-size: 24rpx;
-				color: #4A8AC9;
-				margin: 0 6rpx;
-			}
-			.reply_text{
-				font-size: 26rpx;
-				color: #282828;
-			}
-		}
-		.time,.time_two{
-			color: #BBBBBB;
-			font-size: 22rpx;
-			margin-top: 15rpx;
-		}
-		.like,.like_two{
-			text-align: center;
-			position: absolute;
-			top: 0;
-			right: 0;
-			width: 75rpx;
-
-			.like-text{
-				color: #999999;
-				font-size: 13px;
-				margin-top: 2px;
-			}
-			.dianzan{
-				width: 13px;
-				height: 13px;
-			}
-		}
-		.reply_list{
-			margin-top: 20rpx;
-			.item{
-				padding-right: 140rpx;
-				position: relative;
-			}
-			.item_count{
-				position: relative;
-				padding-left: 56rpx;
-				.image{
-					width: 36rpx;
-					height: 36rpx;
-					border-radius: 100%;
-					position: absolute;
-					top: 0;
-					left: 0;
-				}
-			}
-		}
-	}
-	.end{
-		margin: 50rpx 0;
-		text-align: center;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		.text{
-			color: #999999;
-			font-size: 22rpx;
-			position: relative;
-			.before,.after{
-				display: flex;
-				width: 22rpx;
-				height: 1rpx;
-				background: #999999;
-				position: absolute;
-				top: 18rpx;
-				opacity: .5;
-			}
-			.before{
-				left: -30rpx;
-			}
-			.after{
-				right: -30rpx;
-			}
-		}
-	}
-}
-.release_bar{
-	position: fixed;
-	width: 100%;
-	left: 0;
-	background: #ffffff;
-	display: flex;
-	// align-items: center;
-	justify-content: space-between;
-	padding: 30rpx 60rpx;
-	padding-bottom: 100rpx;
-	border-top: 1rpx solid #F5F5F5;
-	flex-direction: row;
-	width:750rpx;
-	.image{
-		width: 54rpx;
-		height: 54rpx;
-		border-radius: 100%;
-	}
-	.input_count{
-		width: 480rpx;
-		background: #F7F7F7;
-		border-radius: 31rpx;
-		padding: 15rpx 30rpx;
-	}
-	.send{
-		font-size: 26rpx;
-		color: #ffffff;
-		padding: 12rpx 30rpx;
-		background: #E93323;
-		border-radius: 30rpx;
-		text-align: center;
-	}
-}
-.empty{
-	display: flex;
-	margin: 130rpx 0 150rpx;
-	text-align: center;
-	align-items: center;
-	// flex-direction: row;
-	.image{
-		display: flex;
-		width: 414rpx;
-		height: 305rpx;
-	}
-	.text{
-		display: flex;
-		color: #999999;
-		font-size: 26rpx;
-	}
-}
-</style>
diff --git a/pages/short_video/components/index/aixining.png b/pages/short_video/components/index/aixining.png
deleted file mode 100644
index 99404d3..0000000
Binary files a/pages/short_video/components/index/aixining.png and /dev/null differ
diff --git a/pages/short_video/components/index/close.png b/pages/short_video/components/index/close.png
deleted file mode 100644
index 8a09a82..0000000
Binary files a/pages/short_video/components/index/close.png and /dev/null differ
diff --git a/pages/short_video/components/index/collection.png b/pages/short_video/components/index/collection.png
deleted file mode 100644
index 640e390..0000000
Binary files a/pages/short_video/components/index/collection.png and /dev/null differ
diff --git a/pages/short_video/components/index/evaluate.png b/pages/short_video/components/index/evaluate.png
deleted file mode 100644
index 4e9320f..0000000
Binary files a/pages/short_video/components/index/evaluate.png and /dev/null differ
diff --git a/pages/short_video/components/index/icon-back.png b/pages/short_video/components/index/icon-back.png
deleted file mode 100644
index f1a635f..0000000
Binary files a/pages/short_video/components/index/icon-back.png and /dev/null differ
diff --git a/pages/short_video/components/index/logins.gif b/pages/short_video/components/index/logins.gif
deleted file mode 100644
index 559e4c0..0000000
Binary files a/pages/short_video/components/index/logins.gif and /dev/null differ
diff --git a/pages/short_video/components/index/pause.png b/pages/short_video/components/index/pause.png
deleted file mode 100644
index dda7762..0000000
Binary files a/pages/short_video/components/index/pause.png and /dev/null differ
diff --git a/pages/short_video/components/index/play.png b/pages/short_video/components/index/play.png
deleted file mode 100644
index a53edd2..0000000
Binary files a/pages/short_video/components/index/play.png and /dev/null differ
diff --git a/pages/short_video/components/index/share-fill.png b/pages/short_video/components/index/share-fill.png
deleted file mode 100644
index b9a9771..0000000
Binary files a/pages/short_video/components/index/share-fill.png and /dev/null differ
diff --git a/pages/short_video/components/index/video-delete.png b/pages/short_video/components/index/video-delete.png
deleted file mode 100644
index 71727c9..0000000
Binary files a/pages/short_video/components/index/video-delete.png and /dev/null differ
diff --git a/pages/short_video/components/index/video-edit.png b/pages/short_video/components/index/video-edit.png
deleted file mode 100644
index 0b14903..0000000
Binary files a/pages/short_video/components/index/video-edit.png and /dev/null differ
diff --git a/pages/short_video/components/index/video-failed.png b/pages/short_video/components/index/video-failed.png
deleted file mode 100644
index f93c539..0000000
Binary files a/pages/short_video/components/index/video-failed.png and /dev/null differ
diff --git a/pages/short_video/components/index/video-review.png b/pages/short_video/components/index/video-review.png
deleted file mode 100644
index f87b36b..0000000
Binary files a/pages/short_video/components/index/video-review.png and /dev/null differ
diff --git a/pages/short_video/components/index/we-chat.png b/pages/short_video/components/index/we-chat.png
deleted file mode 100644
index 6951e7b..0000000
Binary files a/pages/short_video/components/index/we-chat.png and /dev/null differ
diff --git a/pages/short_video/components/index/xin-2.png b/pages/short_video/components/index/xin-2.png
deleted file mode 100644
index 6ee5ec7..0000000
Binary files a/pages/short_video/components/index/xin-2.png and /dev/null differ
diff --git a/pages/short_video/components/index/xin.png b/pages/short_video/components/index/xin.png
deleted file mode 100644
index 1a66f8c..0000000
Binary files a/pages/short_video/components/index/xin.png and /dev/null differ
diff --git a/pages/short_video/components/index/zan01.png b/pages/short_video/components/index/zan01.png
deleted file mode 100644
index dba7d64..0000000
Binary files a/pages/short_video/components/index/zan01.png and /dev/null differ
diff --git a/pages/short_video/components/index/zan02.png b/pages/short_video/components/index/zan02.png
deleted file mode 100644
index 0646a89..0000000
Binary files a/pages/short_video/components/index/zan02.png and /dev/null differ
diff --git a/pages/short_video/components/mentioned/mentioned.vue b/pages/short_video/components/mentioned/mentioned.vue
deleted file mode 100644
index 6bc365c..0000000
--- a/pages/short_video/components/mentioned/mentioned.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-	<view :style="viewColor">
-		<view class="container">
-			<view class="header">
-				<text class="title">TA提到的宝贝</text>
-				<image @click="closePopup" class="closeBnt" src="../static/img/index/close.png" mode=""></image>
-			</view>
-			<view class="main_count" :class="isHome ? 'mb90' : ''">
-				<scroll-view scroll-y="true" class="scroll-view">
-					<view v-for="(item, index) in list" :key="index" @click="goDetail(item.spu)" class="list">
-						<view class="pro_list">
-							<view class="picture">
-								<image :src="item.spu && item.spu.image" class="image"></image>
-							</view>
-							<view class="info">
-								<text class="name line2" v-if="item.spu && item.spu.store_name.length>=32">{{item.spu.store_name.slice(0,32)}}...</text>
-								<text class="name line2" v-else>{{item.spu && item.spu.store_name}}</text>
-								<view class="bottom">
-									<view v-if="item.spu" class="price"><text class="sm">￥</text><text class="text">{{item.spu.price}}</text></view>
-									<text class="buy-btn">立即购买</text>
-								</view>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</view>	
-		</view>
-		<view class='mask' catchtouchmove="true" :hidden='popup.show==false' @tap="closePopup"></view>
-	</view>
-	
-</template>
-
-<script>
-	import { goShopDetail } from '@/libs/order.js'
-	import { mapGetters } from "vuex";
-	export default {
-		computed:{
-			...mapGetters(['viewColor']),
-		},
-		props:{
-			list: {
-				type: Array,
-				default: []
-			},
-			uid: {
-				type: Number,
-			},
-			isHome: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			
-			return {
-				popup: {
-					show: false
-				},
-				
-			};
-		},
-		methods: {
-			// 点击关闭按钮
-			closePopup() {
-				this.$emit('close');
-			},
-			goDetail(item){
-				if (item.product_type === 1) {
-					uni.navigateTo({
-						url: `/pages/activity/goods_seckill_details/index?id=${item.product_id}&time=${item.stop_time}&spid=${this.uid}`
-					})
-				} else if (item.product_type === 2) {
-					uni.navigateTo({
-						url: `/pages/activity/presell_details/index?id=${item.activity_id}&spid=${this.uid}`
-					})
-				} else if (item.product_type === 0) {
-					uni.navigateTo({
-						url: `/pages/goods_details/index?id=${item.product_id}&spid=${this.uid}`
-					})	
-				}else if (item.product_type === 4) {
-					uni.navigateTo({
-						url: `/pages/activity/combination_details/index?id=${item.activity_id}&spid=${this.uid}`
-					})
-				}else if (item.product_type === 40) {
-					uni.navigateTo({
-						url: `/pages/activity/combination_status/index?id=${item.activity_id}&spid=${this.uid}`
-					})
-				}	
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-.container{
-	width: 750rpx;
-	background-color: #ffffff;
-	border-radius: 16rpx 16rpx 0 0;	
-	
-	.header{
-		position: relative;
-		padding: 40rpx 30rpx;
-		.title{
-			// color: #282828;
-			font-size: 30rpx;
-		}
-		.closeBnt{
-			position: absolute;
-			right: 30rpx;
-			top: 30rpx;
-			width: 30rpx;
-			height: 30rpx;
-		}
-	}
-	.scroll-view{
-		max-height: 800rpx;
-	}
-	.main_count{
-		padding: 0 30rpx 30rpx;
-		max-height: 800rpx;
-		overflow-y: scroll;
-		.list{
-			margin-bottom: 40rpx;
-			flex-direction: row;
-			&:last-child{
-				margin-bottom: 0;
-			}
-		}
-		.pro_list{
-			display: flex;
-			flex-direction: row;
-			.picture,.image{
-				width: 200rpx;
-				height: 200rpx;
-				border-radius: 16rpx;
-			}
-			.info{
-				margin-left: 30rpx;
-				position: relative;	
-				.name{
-					color: #282828;
-					font-size: 30rpx;
-					line-height: 44rpx;		
-					display: flex;
-					width: 460rpx;
-				}
-				.bottom{
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					width: 460rpx;
-					position: absolute;
-					left: 0;
-					bottom: 10rpx;
-					flex-direction: row;
-				}
-				.price{	
-					flex-direction: row;
-					align-items: flex-end;
-					.sm{
-						font-weight: bold;
-						color: #FF6D20;
-						font-size: 26rpx;
-					}
-					.text{
-						font-weight: bold;
-						color: #FF6D20;
-						font-size: 34rpx;	
-					}
-				}
-				.buy-btn{	
-					border-radius: 26rpx;
-					padding: 10rpx 20rpx;
-					text-align: center;
-					align-items: center;
-					justify-content: center;
-					font-size: 24rpx;
-					color: #fff;
-					background: #FF6D20;
-				}
-			}
-		}
-	}
-}
-</style>
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
deleted file mode 100644
index f9b28e3..0000000
--- a/pages/short_video/nvueSwiper/index.nvue
+++ /dev/null
@@ -1,1966 +0,0 @@
-<template>
-	<view class="shortVideo" @click="showManage = false">
-		<!--  
-		注意：这是 H5、微信小程序界面，请勿和 new_index.nvue、index.nvue 混用
-		 
-		1. new_index.nvue、index.nvue这两个是App页面
-		 
-		2. 另外：data.js 是上一版本留下的假数据，这一版改成了 URL 请求了（如不需要可以删除，也可作为后端请求参考）
-		 
-		3. 请各位大神多多留手，我已经把请求内存开到最大了
-		 
-		4. 视频 id 切记是字符串类型  
-		 -->
-		<!-- 头部导航 -->
-		<!-- 头部导航 -->
-
-
-
-		<view class="header">
-			<view class="tool-bar">
-				<view class='xiangzuo' @tap='goBack'>
-					<!-- <image src="@/static/images/icon-back.png" mode="aspectFit"></image> -->
-				</view>
-			</view>
-			<!-- <view class="tool-bar">
-				<view class='iconfont icon-xiangzuo' @tap='goBack'></view>
-			</view>
-			<view class="items" @click.stop="navTap(2)">
-				<text class="tName" :class="currentNav==2?'on':''">关注</text>
-			</view>
-			<view class="items" @click.stop="navTap(1)">
-				<text class="tName" :class="currentNav==1?'on':''">推荐</text>
-			</view>
-			<view class="items" @click.stop="navTap(3)">
-				<text class="tName" :class="currentNav==3?'on':''">热点资讯</text>
-			</view>
-			<view class="items" @click.stop="navTap(4)">
-				<text class="tName" :class="currentNav==4?'on':''">社区</text>
-			</view> -->
-
-		</view>
-		<swiper v-show="currentNav !== 3&&currentNav != 4"
-			:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'" :vertical="true"
-			@animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false">
-			<swiper-item v-for="(list,index) in dataList">
-				<view v-if="max > index">
-
-
-
-
-					<!-- 		<view style="width: 100px;height: 100px;background-color: red;">
-
-						5666
-
-					</view> -->
-
-					<view>
-						<!-- 这种视频背景模糊的效果怎么做呢 -->
-						<!-- 
-						1.v-if：用于控制视频在节点的渲染数
-						2.muted的默认值是 false，代表默认是禁音视频的
-						3.http-cache默认开启视频缓存
-						4.poster（封面（方案一））：这里的封面默认处理存储在阿里云的视频
-						5.show-loading：这里默认去掉播放转圈的标志
-						v-if="Math.abs(k-index)<=1"
-						 -->
-						<video :id="list.community_id+''+index" :loop="true" :muted="list.isplay"
-							:autoplay="index == k && isRoutine" :controls="false" :http-cache="true"
-							:page-gesture="false" :show-fullscreen-btn="false" :show-loading="false"
-							:show-center-play-btn="false" :enable-progress-gesture="false" :src="list.video_link"
-							@ended="ended" @play="play(index)" @click="tapVideoHover(list.state,$event)"
-							@waiting="waiting(index)"
-							style="width: 100vw; height: 100vh;z-index: -1;transform: scale(4)">
-
-
-
-						</video>
-
-					</view>
-					<!-- 播放状态：pause 的时候就会暂停 -->
-					<!-- 	<view class="videoHover" @click="tapVideoHover(list.state,$event)"
-						:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'">
-						<image v-if="list.state=='pause'" class="playState" src="../static/img/index/play.png"></image>
-					</view> -->
-					<!--审核状态-->
-					<view v-if="list.status==-1 || list.status==0 || list.status==-2" class="video-status">
-						<view v-if="list.status == -1 || list.status == -2" class="status-title">
-							<image class="image" src="../static/img/index/video-failed.png"></image>
-							<text class="title">{{list.status == -1 ? '审核未通过' : '已下架'}}，内容仅自己可见</text>
-						</view>
-						<view v-else class="status-title">
-							<image class="image" src="../static/img/index/video-review.png"></image>
-							<text class="title">正在审核，内容仅自己可见</text>
-						</view>
-						<view class="status_info">
-							<text
-								class="refusal">{{(list.status == -1 || list.status == -2) ? list.refusal : '发布的内容审核通过后，将在首页展示！'}}</text>
-						</view>
-					</view>
-					<view>
-						<!-- 最底下的文字部分 -->
-						<view class="content">
-							<view class="cart">
-								<text class="cartName">@{{list.author && list.author.nickname}}</text>
-							</view>
-							<view class="words" :style="'width: '+ (windowWidth - 120) +'px;'">
-								<view v-if="list.isMore || list.content.length<=15">
-									<text class="info">{{list.content}}</text>
-									<view class="close">
-										<text v-if="list.isMore" class="more" @click="moreTap(list)">收起</text>
-									</view>
-								</view>
-								<view class="wordsCon" v-else>
-									<text class="info">{{list.content.slice(0,15)}}...</text>
-									<text class="more" @click.stop="moreTap(list)">展开</text>
-								</view>
-							</view>
-							<view v-if="list.relevance.length == 1 && k===index" class="product">
-								<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;"
-									scroll-with-animation show-scrollbar="true">
-									<view class="product-item" v-for="(goods,idx) in list.relevance" :key="idx"
-										v-if="goods.spu">
-										<view v-if="goods.spu" class="item-count acea-row" @click="goDetail(goods.spu)">
-											<view class="picture">
-												<image :src="goods.spu.image"></image>
-											</view>
-											<view class="product-text">
-												<view class="name line1">{{goods.spu.store_name}}</view>
-												<view class="product-price">
-													<view class="price">¥<text>{{goods.spu.price}}</text></view>
-													<view class="buy-btn">购买</view>
-												</view>
-											</view>
-										</view>
-									</view>
-								</scroll-view>
-							</view>
-							<view v-else-if="list.relevance.length > 1 && k===index" class="product">
-								<swiper :autoplay="true" :circular="circular" :interval="interval" :duration="duration"
-									:loop="true" next-margin="20rpx" previous-margin="20rpx">
-									<block v-for="(goods,idx) in list.relevance" :key="idx" v-if="goods.spu">
-										<swiper-item class="swiper-item">
-											<view class="swiper-count">
-												<view v-if="goods.spu" class="item-count acea-row"
-													@click="goDetail(goods.spu)">
-													<view class="picture">
-														<image :src="goods.spu.image"></image>
-													</view>
-													<view class="product-text">
-														<view class="name line1">{{goods.spu.store_name}}</view>
-														<view class="product-price">
-															<view class="price">¥<text>{{goods.spu.price}}</text></view>
-															<view class="buy-btn">购买</view>
-														</view>
-													</view>
-												</view>
-											</view>
-										</swiper-item>
-									</block>
-								</swiper>
-							</view>
-							<navigator v-if="list.topic" hover-class="none" class="product_cate"
-								:url="'/pages/plantGrass/plant_search_list/index?id='+list.topic.topic_id">
-								<view>
-									<text class="icon">#</text><text class="text">{{list.topic.topic_name}}</text>
-								</view>
-							</navigator>
-						</view>
-						<view class="userInfo">
-							<!-- 1.头像 -->
-							<navigator v-if="list.author && userInfo.uid != list.author.uid" hover-class="none"
-								:url="'/pages/plantGrass/plant_user/index?id='+list.uid" class="pictrue">
-								<image class="userAvatar"
-									:src="list.author&&list.author.avatar || '/static/images/f.png'" mode="aspectFill">
-								</image>
-								<view v-if="!list.is_fans || !userInfo.uid" class="guanzhu"
-									@click.stop="followAuthor(list)"><text
-										class="iconfont icon-shangpinshuliang-jia"></text></view>
-								<view v-else class="yiguanzhu"><text class="iconfont"></text></view>
-							</navigator>
-							<!-- 2.点赞 -->
-							<view @click="cLike(list);" style="margin-top: 5px;"
-								:class="{'likeNumActive':list.relevance_id}">
-								<text class="iconfont icon-shipindianzan-yidian"
-									:class="{'likeNumActive':list.relevance_id}"></text>
-								<text class="info-text">{{list.count_start > 0 ? list.count_start : '点赞'}}</text>
-							</view>
-							<!-- 3.评论 -->
-							<view v-if="community_reply_status == 1 && list.status == 1" class="comment"
-								@click="toComment(list,index)" style="margin-top: 18px;">
-								<text class="iconfont icon-pinglun2"></text>
-								<text class="info-text">{{list.count_reply>0 ? list.count_reply : '评论'}}</text>
-							</view>
-							<!-- 4.分享 -->
-							<view v-if="list.status == 1" @click="listenerActionSheet" style="margin-top: 17px;">
-								<text class="iconfont icon-fenxiang3"></text>
-								<text class="info-text">分享</text>
-							</view>
-							<!-- 5.自己的视频 -->
-							<view v-if="list.author && userInfo.uid == list.author.uid && isUser"
-								style="margin-top: 17px;">
-								<view class="video-my">
-									<view class="video-dian" @click.stop="showManage = !showManage">
-										<text class="dian"></text>
-										<text class="dian"></text>
-										<text class="dian"></text>
-									</view>
-
-									<view class="manage" v-show="showManage">
-										<navigator hover-class="none"
-											:url="'/pages/plantGrass/plant_release/index?id='+list.community_id+'&type=2'"
-											class="items">
-											<image class="image" src="../static/img/index/video-edit.png"></image>
-											<text>编辑</text>
-										</navigator>
-										<view class="items" @click.stop="deleteTopic(list)">
-											<image class="image" src="../static/img/index/video-delete.png"></image>
-											<text>删除</text>
-										</view>
-									</view>
-								</view>
-							</view>
-							<!-- 提到的商品 -->
-							<view v-if="list.relevance.length>0 && k === index" @click="openMore(list)" class="mention"
-								style="opacity: 0.9; margin-top: 18px;">
-								<image src="../static/img/index/collection.png"></image>
-								<text class="count">{{list.relevance.length}}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</swiper-item>
-		</swiper>
-		<scroll-view scroll-y="true" v-if="currentNav === 3" class="video-list"
-			:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'" :refresher-triggered="isTriggered"
-			@scrolltolower="getGoods()">
-			<block v-for="(item,index) in cateGoods" :key="index">
-				<view class="goods_item" @click="gogogo(item)">
-					<image class="goods_img" :src="item.image[0]" mode="aspectFill"></image>
-					<view class="botm">
-						<view class="title">{{item.title}}</view>
-						<view class="goods_info flex_a_c">
-							<view class="l_info flex_a_c">
-								<image :src="(item.author && item.author.avatar) || '/static/images/f.png'"
-									mode="aspectFill" class="g_img"></image>
-								<view class="g_name">{{item.author && item.author.nickname}}</view>
-							</view>
-							<view class="nice_box flex_a_c" @click.stop="giveStart(item)">
-								<text class="iconfont"
-									:class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
-								<text class="collect">{{item.count_start}}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</block>
-		</scroll-view>
-
-		<!-- <view class="video-list" v-if="currentNav === 3"
-      :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'">
-      
-    </view> -->
-		<view class="noVideo acea-row row-center-wrapper" v-if="!dataList.length && !loadVideo && currentNav !== 3">
-			<view>
-				<image :src="imgHost+'/static/no-video.png'" class="pictrue"></image>
-				<text class="tips">暂无短视频内容哦~</text>
-			</view>
-		</view>
-		<comment ref="comments" :bottom="0" :isShow="showComment" :userInfo="userInfo" @successFul="pinlunFun"
-			@close="closeScrollview"></comment>
-		<!-- 他提到的宝贝弹窗 -->
-		<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned>
-		<image v-if="H5ShareBox" class="shareImg" :src="imgHost + '/static/images/share-info.png'"
-			@click="H5ShareBox = false"></image>
-		<!-- 分享按钮 -->
-		<view class="generate-posters acea-row row-middle" :class="posters ? 'on' : ''">
-			<!-- #ifndef MP -->
-			<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' v-if="weixinStatus === true"
-				@click="H5ShareBox = true">
-				<view class="iconfont icon-weixin3"></view>
-				<view class="">发送给朋友</view>
-			</button>
-			<!-- #endif -->
-			<!-- #ifdef MP -->
-			<button class="item" :class="weixinStatus ? 'item3' : ''" open-type="share" hover-class='none'
-				@click="goFriend">
-				<view class="iconfont icon-weixin3"></view>
-				<view class="">发送给朋友</view>
-			</button>
-			<!-- #endif -->
-			<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="goPoster">
-				<view class="iconfont icon-haibao"></view>
-				<view class="">生成海报</view>
-			</button>
-		</view>
-		<view class="mask" v-if="posters" @click="listenerActionClose"></view>
-		<!-- 海报展示 -->
-		<view class='mask' v-if="posterImageStatus"></view>
-		<view class='poster-pop' v-if="posterImageStatus">
-			<image src='/static/images/poster-close.png' class='close' @click="posterImageClose"></image>
-			<image :src='posterImage' class="image"></image>
-			<!-- #ifndef H5 -->
-			<view class="keep" @click="savePosterPath">保存到相册</view>
-			<!-- #endif -->
-		</view>
-		<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-
-
-	</view>
-</template>
-
-<script>
-	const app = getApp();
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from 'vuex';
-	import {
-		configMap
-	} from '@/utils';
-	import comment from '@/components/comment.vue';
-	import mentioned from '@/components/mentioned.vue';
-
-	import {
-		HTTP_REQUEST_URL
-	} from '@/config/app';
-	import {
-		deoList,
-		videoList,
-		myVideoList,
-		graphicStartApi,
-		followAuthorApi,
-		getVideoCode,
-		deletePlantApi,
-		focusArticleLst,
-		graphicLstApi
-	} from '@/api/community.js';
-	import {
-		getUserInfo,
-		imgToBase
-	} from '@/api/user.js';
-	import authorize from '@/components/Authorize';
-	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
-	export default {
-		components: {
-			comment,
-			mentioned,
-			authorize,
-
-		},
-		computed: configMap({
-			community_reply_status: 0
-		}, mapGetters(['isLogin', 'uid'])),
-
-		data() {
-			return {
-				isTriggered: false,
-				imgHost: HTTP_REQUEST_URL,
-				videoID: 0,
-				pinlunNum: 0,
-				windowWidth: 0,
-				windowHeight: 0,
-				platform: "",
-				deleteHeight: 0,
-				dataList: [],
-				k: 0,
-				max: 2,
-				oldVideo: "",
-				voice: "",
-				timeout: "",
-				authorUid: 0,
-				current: 0,
-				boxStyle: { //视频，图片封面样式🌟💗
-					'height': 0,
-					'width': 0,
-				},
-				// 引入评论 - 参数
-				heightNum: 1.3,
-				// 双击点赞参数
-				touchNum: 0,
-				aixinLeft: 0,
-				aixinTop: 0,
-				Rotate: 0,
-				currentNav: 1,
-				limit: 10,
-				page: 1,
-				oldCurrent: 1,
-				H5ShareBox: false,
-				showComment: false,
-				loadVideo: true,
-				userInfo: {},
-				moreList: [],
-				posters: false,
-				weixinStatus: false,
-				isShowAuth: false, //是否隐藏授权
-				isAuto: false, //没有授权的不会自动授权
-				showManage: false,
-				isUser: false,
-				isSatrt: 0,
-				userUid: 0,
-				posterImageStatus: false,
-				storeImage: '', //海报产品图
-				PromotionCode: '', //二维码图片
-				canvasStatus: false, //海报绘图标签
-				posterImage: '', //海报路径
-				posterbackgd: '../static/img/index/posterbackgd.png',
-				avatar: '/static/images/f.png',
-				codeImg: "",
-				autoplay: false,
-				circular: true,
-				interval: 3000,
-				duration: 500,
-				actionSheetHidden: false,
-				// #ifdef MP
-				isRoutine: true,
-				// #endif
-				// #ifndef MP
-				isRoutine: false,
-				// #endif
-				// 视频列表相关 变量
-				cateGoods: [],
-				where: {
-					category_id: -1,
-					page: 1,
-					limit: 5
-				},
-				communityId: '',
-				Listcount: '',
-				loadMore: true,
-				videoshow: true
-			}
-		},
-		watch: {
-			k(new_k, old_k) {
-				const max = new_k + 2;
-				if (this.max < max) {
-					this.max = max;
-				}
-				if (this.oldCurrent != this.currentNav) {
-					this.oldCurrent = this.currentNav
-					return false
-				}
-				this.dataList[old_k].playIng = false //如果视频暂停，就加载封面
-				this.dataList[old_k].isplay = true
-				this.dataList[old_k].state = 'pause'
-				// console.log('预留第' + (old_k + 1) + '个视频：' + this.dataList[old_k].community_id + '' + old_k)
-				// 2.0版本已经去掉了下面这一句，视频不用暂停，只需要把声音禁止就行
-				uni.createVideoContext(this.dataList[old_k].community_id + '' + old_k, this)
-					.pause() //如果视频暂停，那么旧视频停止，这里的this.dataList[old_k].id + '' + old_k，后面加 old_k 是为了每一个视频的 id 值不同，这样就可以大程度的避免串音问题
-				// console.log('已经暂停 --> 第' + (old_k + 1) + '个视频～') //提示
-				// #ifdef MP
-				this.dataList[new_k].state = 'play'
-				this.dataList[new_k].isplay = false
-				this.dataList[new_k].playIng = true
-				if (this.currentNav !== 3) {
-					setTimeout(() => {
-						uni.createVideoContext(this.dataList[new_k].community_id + '' + new_k, this).play()
-					}, 250)
-				}
-				this.videoShare(this.dataList[new_k])
-				// #endif
-			}
-		},
-		onLoad(options) {
-			this.getOptions(options);
-			this.videoID = options.id;
-			this.isUser = options.user == 1 ? true : false;
-			this.userUid = options.uid ? options.uid : 0;
-			this.isSatrt = options.tab == 1 ? 1 : 0;
-			this.windowWidth = uni.getSystemInfoSync().windowWidth
-			this.windowHeight = uni.getSystemInfoSync().windowHeight
-			this.boxStyle.width = this.windowWidth + 'px' //给宽度加px
-			this.boxStyle.height = this.windowHeight - this.deleteHeight; //有 tabbar的 修改这里可以改变视频高度
-			this.get() //刚进入页面加载数据
-			if (this.isLogin) {
-				this.getUserInfo();
-			}
-			// #ifdef H5
-			this.setOpenShare();
-			// #endif
-		},
-		onShow() {},
-		onHide() {
-			this.dataList[this.k].state = 'pause'; //界面隐藏也要停止播放视频
-			uni.createVideoContext(this.dataList[this.k].community_id + '' + this.k, this).pause(); //暂停以后继续播放
-		},
-		onReady: function() {},
-		methods: {
-			giveStart(item) {
-				let status = item.relevance_id ? 0 : 1
-				graphicStartApi(item.community_id, {
-					status: status
-				}).then(res => {
-					if (item.relevance_id) {
-						item.count_start--;
-						item.count_start = item.count_start == 0 ? 0 : item.count_start
-						item.relevance_id = false
-					} else {
-						item.count_start++;
-						item.relevance_id = true
-					}
-				})
-			},
-			//#ifdef MP
-			videoShare(item) {
-				if (item && item.status == 1) {
-					let uid = this.uid ? this.uid : 0;
-					let data = this.dataList[0];
-					uni.showShareMenu({
-						withShareTicket: true,
-						menus: ['shareAppMessage', 'shareTimeline'],
-						title: data.title || '',
-						imageUrl: data.image[0] || '',
-						path: '/pages/short_video/nvueSwiper/index?id=' + data.community_id + '&pid=' + uid
-					})
-				} else {
-					uni.hideShareMenu()
-				}
-			},
-			// #endif
-			goBack: function() {
-				uni.navigateBack();
-			},
-			navTap(n) {
-				this.currentNav = n;
-				this.timeout = "";
-				this.k = 0;
-				this.page = 1;
-				this.loadVideo = true;
-				this.dataList = [];
-				this.loadMore = true;
-				n == 1 ? this.get() : '';
-				n == 2 ? this.getFocusList() : '';
-				n == 3 ? this.getGoods() : '';
-			},
-			/**
-			 * 视频列表相关方法
-			 * 获取视频列表
-			 */
-			gogogo(item) {
-				this.flag = true
-				this.videoID = item.community_id
-				this.navTap(1)
-			},
-			async getGoods() {
-				if (!this.loadMore) {
-					return;
-				}
-				const {
-					data
-				} = await graphicLstApi(this.where)
-				this.cateGoods.push(...data.list)
-				this.where.page++
-				if (data.list.length < this.where.limit) {
-					this.loadMore = false
-				}
-			},
-			/**
-			 * 获取个人用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.userInfo = res.data;
-				});
-			},
-			// 关注作者
-			followAuthor: function(item) {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					let status = 1
-					followAuthorApi(item.uid, {
-						status: status
-					}).then(res => {
-						if (res.status === 200) {
-							item.is_fans = true
-						}
-						this.$util.Tips({
-							title: res.message
-						});
-					}).catch(err => {
-						return uni.showToast({
-							title: err,
-							icon: 'none',
-							duration: 2000
-						});
-					});
-				}
-			},
-			// 删除话题
-			deleteTopic(item) {
-				let that = this;
-				uni.showModal({
-					content: '确定要删除该话题么？',
-					success: function(res) {
-						if (res.confirm) {
-							deletePlantApi(item.community_id).then(res => {
-								if (res.status === 200) {
-									that.$util.Tips({
-										title: res.message
-									});
-									setTimeout(function() {
-										uni.redirectTo({
-											url: '/pages/plantGrass/plant_user/index?id=' +
-												item.uid
-										})
-									}, 1000);
-								}
-							})
-						} else if (res.cancel) {
-							// console.log('用户点击取消');
-						}
-					}
-				});
-
-			},
-			// 授权回调
-			onLoadFun() {
-				this.isShowAuth = false
-				this.getUserInfo()
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			play(k) {
-				// console.log(' 播放了', k)
-				this.dataList[k].isplay = false
-				this.dataList[k].playIng = true
-				this.dataList[k].state = 'play'
-				this.dataList[k].loading = false
-			},
-			waiting(k) {
-				// console.log('视频缓冲了', k)
-				this.dataList[k].loading = true
-			},
-			pinlunFun(e) {
-				this.pinlunNum = e;
-				this.dataList.forEach(item => {
-					if (item.community_id == this.videoID) {
-						item.count_reply = e;
-					}
-				})
-			},
-			getOptions(options) {
-				let that = this;
-				// #ifdef MP
-				if (options.scene) {
-					let value = that.$util.getUrlParams(decodeURIComponent(options.scene));
-					//记录推广人uid
-					if (value.pid) app.globalData.spid = value.pid;
-				}
-				// #endif
-				if (options.pid) app.globalData.spid = options.pid;
-			},
-			// #ifdef H5
-			// 微信分享；
-			setOpenShare: function() {
-				let that = this;
-				let uid = this.uid ? this.uid : 0;
-				if (that.$wechat.isWeixin()) {
-					let data = this.dataList[0];
-					let configAppMessage = {
-						desc: data.content,
-						title: data.title,
-						link: location.href + '?pid=' + uid + '&id=' + this.videoID,
-						imgUrl: data.image
-					};
-					that.$wechat.wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData',
-							'onMenuShareAppMessage', 'onMenuShareTimeline'
-						],
-						configAppMessage);
-				}
-			},
-			// #endif
-			moreTap(item) {
-				item.isMore = !item.isMore;
-			},
-			moveHandle() {},
-			closeScrollview() {
-				// 点击评论里面的叉叉，就会关闭评论
-				this.showComment = false
-			},
-			toComment(item, index) {
-				// 注意点击评论之后会执行这里
-				/*
-				（1）先加载缓冲
-				（2）获取当前视频 ID 信息
-				（3）🌟🌟🌟🌟重要🌟🌟🌟🌟
-					- 一定要记得看 index.vue 里面
-					 uni.setStorageSync("user",this.peopleList[i]);
-					 这个东西，用于存储当前用户信息。在 插件里面会使用到这个东西，
-					 记得写一下。
-					 
-				（4）打开评论
-				*/
-				this.showComment = true
-				this.$refs.comments.getData(item, index);
-			},
-			ended() {
-				// 1.播放当前视频结束时触发，自动切换下一个视频
-				// this.current = this.k+1
-			},
-			//点击播放&&暂停
-			tapVideoHover(state, event) {
-				// console.log('state--', state);
-				// 1.启用双击点赞 --- start
-				this.touchNum++;
-				setTimeout(() => {
-					if (this.touchNum == 1) {
-						if (state == 'play' || state == 'continue') {
-							this.dataList[this.k].state = 'pause';
-						} else {
-							this.dataList[this.k].state = 'continue';
-						}
-						if (this.dataList[this.k].state == 'continue') {
-							uni.createVideoContext(this.dataList[this.k].community_id + '' + this.k, this)
-								.play(); //暂停以后继续播放
-						}
-						if (this.dataList[this.k].state == 'pause') {
-							uni.createVideoContext(this.dataList[this.k].community_id + '' + this.k, this)
-								.pause(); //暂停以后继续播放
-						}
-					}
-					this.touchNum = 0;
-				}, 200)
-			},
-			change(event) {
-				this.k = event.detail.current;
-				this.posterImage = false;
-				this.communityId = this.dataList[this.k]['community_id'];
-			},
-			animationfinish(event) {
-				let that = this
-				if (!that.loadVideo || !that.loadMore) return
-				if (this.k == this.dataList.length - 1 && this.currentNav == 1) {
-					that.loadVideo = false
-					this.get()
-				}
-				if (this.k == this.dataList.length - 1 && this.currentNav === 2) {
-					that.loadVideo = false
-					this.getFocusList()
-				}
-			},
-			get() {
-
-				let that = this
-
-				// 1.这里引入后端请求数据
-				if (that.videoshow) {
-					deoList(this.videoID).then(res => {
-						that.videoData([res.data])
-						if (res.data.list.length < that.limit) {
-							this.loadMore = false;
-						}
-					}).catch(err => {
-						return uni.showToast({
-							title: err,
-							icon: 'none',
-							duration: 2000
-						});
-					})
-					this.videoshow = false
-				} else {
-					// videoList().then(res=>{
-					//   that.videoData(res.data.list);
-					// })
-					// console.log(that.userUid,that.videoID)
-					videoList({
-						page: that.page,
-						limit: that.limit,
-						id: this.videoID
-					
-					}).then(res => {
-						that.videoData(res.data.list)
-						if (res.data.list.length < that.limit) {
-							this.loadMore = false;
-						}
-					}).catch(err => {
-						return uni.showToast({
-							title: err,
-							icon: 'none',
-							duration: 2000
-						});
-					})
-				}
-
-				// that.isUser ?
-				// 	myVideoList(that.userUid, {
-				// 		page: that.page,
-				// 		limit: that.limit,
-				// 		is_star: that.isSatrt,
-				// 		community_id: that.videoID
-				// 	}).then(res => {
-				// 		that.videoData(res.data.list)
-				// 		if (res.data.list.length < that.limit) {
-				// 			this.loadMore = false;
-				// 		}
-				// 	}).catch(err => {
-				// 		return uni.showToast({
-				// 			title: err,
-				// 			icon: 'none',
-				// 			duration: 2000
-				// 		});
-				// 	})
-				//:
-				// 	graphicLstApi({
-				// 		page: that.page,
-				// 		limit: that.limit,
-				// 		category_id: -1
-				// 	}).then(res => {
-				// 		that.videoData(res.data.list)
-				// 		if (res.data.list.length < that.limit) {
-				// 			this.loadMore = false;
-				// 		}
-				// 	}).catch(err => {
-				// 		return uni.showToast({
-				// 			title: err,
-				// 			icon: 'none',
-				// 			duration: 2000
-				// 		});
-				// 	})
-				that.loadVideo = true
-			},
-			getFocusList() {
-				let that = this;
-				focusArticleLst({
-					page: that.page,
-					limit: that.limit,
-					type: 2
-				}).then(res => {
-					that.loadVideo = true
-					that.videoData(res.data.list)
-					if (res.data.list.length < that.limit) {
-						this.loadMore = false;
-					}
-				}).catch(err => {
-					return uni.showToast({
-						title: err,
-						icon: 'none',
-						duration: 2000
-					});
-				})
-			},
-			videoData(list) {
-				this.communityId = list[0]['community_id']
-				if (list.length == 0) return
-				let that = this;
-				that.page = that.page + 1;
-				var msg = list
-				// 2.这里把视频添加到视频列表
-				for (let i = 0; i < msg.length; i++) {
-					msg[i]['isMore'] = false
-					msg[i]['playIng'] = false
-					msg[i]['state'] = 'pause'
-					msg[i]['isplay'] = true
-					msg[i]['loading'] = false
-					that.dataList.push(msg[i])
-					//#ifndef H5
-					if (i == 0 && that.k == 0) {
-						this.dataList[0].isplay = false
-						this.dataList[0].playIng = true
-						this.dataList[0].state = 'play'
-						this.dataList[0].loading = false
-						uni.createVideoContext(that.dataList[0].community_id + '' + 0, that).play()
-					}
-					//#endif
-				}
-				//#ifdef MP
-				if (this.k == 0) {
-					this.videoShare(this.dataList[0]);
-				}
-				// #endif
-				// #ifdef H5
-				if (that.isLogin) {
-					that.setOpenShare(that.videoID);
-				}
-				// #endif
-			},
-			share() {
-				this.H5ShareBox = true;
-			},
-			/**
-			 * 分享打开
-			 *
-			 */
-			listenerActionSheet: function() {
-				if (this.isLogin === false) {
-					this.isAuto = true;
-					this.isShowAuth = true
-				} else {
-					// #ifdef H5
-					if (this.$wechat.isWeixin() === true) {
-						this.weixinStatus = true;
-					}
-					// #endif
-					this.posters = true;
-				}
-			},
-			// 分享关闭
-			listenerActionClose: function() {
-				this.posters = false;
-			},
-			//隐藏海报
-			posterImageClose: function() {
-				this.posterImageStatus = false
-			},
-			// 小程序关闭分享弹窗；
-			goFriend: function() {
-				this.posters = false;
-			},
-			/* 获取产品分销二维码
-			 * @param function successFn 下载完成回调
-			 *
-			 */
-			downloadFilePromotionCode: function(id) {
-				let that = this;
-				let type;
-				// #ifndef MP
-				type = 'wechat'
-				// #endif
-				// #ifdef MP
-				type = 'routine'
-				// #endif
-				getVideoCode(id, {
-					type: type
-				}).then(async res => {
-					that.codeImg = res.data.url
-
-				}).catch(err => {
-					that.$set(that, 'PromotionCode', '');
-				});
-
-			},
-			/*
-			 * 保存到手机相册
-			 */
-			// #ifdef MP
-			savePosterPath: function() {
-				let that = this;
-				uni.getSetting({
-					success(res) {
-						if (!res.authSetting['scope.writePhotosAlbum']) {
-							uni.authorize({
-								scope: 'scope.writePhotosAlbum',
-								success() {
-									uni.saveImageToPhotosAlbum({
-										filePath: that.posterImage,
-										success: function(res) {
-											that.posterImageClose();
-											that.$util.Tips({
-												title: '保存成功',
-												icon: 'success'
-											});
-										},
-										fail: function(res) {
-											that.$util.Tips({
-												title: '保存失败'
-											});
-										}
-									})
-								}
-							})
-						} else {
-							uni.saveImageToPhotosAlbum({
-								filePath: that.posterImage,
-								success: function(res) {
-									that.posterImageClose();
-									that.$util.Tips({
-										title: '保存成功',
-										icon: 'success'
-									});
-								},
-								fail: function(res) {
-									that.$util.Tips({
-										title: '保存失败'
-									});
-								},
-							})
-						}
-					}
-				})
-			},
-			// #endif
-			/**
-			 * 生成海报
-			 */
-			async goPoster() {
-				let that = this;
-				if (!that.isLogin) {}
-				let type;
-				// #ifndef MP
-				type = 'wechat'
-				// #endif
-				// #ifdef MP
-				type = 'routine'
-				// #endif
-				getVideoCode(that.communityId, {
-					type: type
-				}).then(async res => {
-					if (res.status !== 200) {
-						that.$util.Tips({
-							title: '生成海报失败'
-						});
-						return false;
-					}
-					that.codeImg = res.data.url
-				}).catch(err => {
-					that.$set(that, 'PromotionCode', '');
-					that.$util.Tips({
-						title: '生成海报失败'
-					});
-					return false;
-				});
-
-				// console.log(this.posterImage)
-				if (this.posterImage) {
-					this.posterImageStatus = true
-					this.posters = false
-					return
-				}
-				let arr2
-				that.posters = false;
-				that.$set(that, 'canvasStatus', true);
-				uni.showLoading({
-					title: '海报生成中',
-					mask: true
-				});
-				// #ifdef MP || APP-PLUS
-				if (that.dataList[that.k].author.avatar) {
-					arr2 = [that.posterbackgd, await that.fileStoreImage(that.dataList[that.k].image[0]), await that
-						.fileStoreImage(
-							that.codeImg), await that.fileStoreImage(that.dataList[that.k].author.avatar)
-					];
-				} else {
-					arr2 = [that.posterbackgd, await that.fileStoreImage(that.dataList[that.k].image[0]), await that
-						.fileStoreImage(
-							that.codeImg), that.avatar
-					];
-				}
-				// #endif
-				// #ifdef H5
-				if (that.dataList[that.k].author.avatar) {
-					arr2 = [that.posterbackgd, await that.imgToBase(that.dataList[that.k].image[0]), await that
-						.imgToBase(that
-							.codeImg), await that.imgToBase(that.dataList[that.k].author.avatar)
-					];
-				} else {
-					arr2 = [that.posterbackgd, await that.imgToBase(that.dataList[that.k].image[0]), await that
-						.imgToBase(that
-							.codeImg), that.avatar
-					];
-				}
-				// #endif
-				//生成推广海报
-				that.$util.videoPosterCanvas(arr2, that.dataList[that.k].content, that.dataList[that.k].author
-					.nickname,
-					function(tempFilePath) {
-						that.$set(that, 'posterImage', tempFilePath);
-						that.$set(that, 'posterImageStatus', true);
-						that.$set(that, 'actionSheetHidden', !that.actionSheetHidden);
-						that.$set(that, 'canvasStatus', false);
-					}, (err) => {
-						that.$set(that, 'canvasStatus', false);
-					});
-			},
-			//图片转符合安全域名路径
-			fileStoreImage(url) {
-				let that = this;
-				// #ifdef MP  || APP-PLUS
-				let ishttps = url.split('//')[0] == 'https:'
-				if (!ishttps) {
-					url = 'https://' + url.split('//')[1]
-				}
-				// #endif
-				return new Promise((resolve, reject) => {
-					uni.downloadFile({
-						url,
-						success: function(res) {
-							resolve(res.tempFilePath);
-						},
-						fail: function() {
-							return that.$util.Tips({
-								title: ''
-							});
-						}
-					});
-				})
-			},
-			/*
-			 * 保存到手机相册
-			 */
-			// #ifdef MP
-			savePosterPath: function() {
-				let that = this;
-				uni.getSetting({
-					success(res) {
-						if (!res.authSetting['scope.writePhotosAlbum']) {
-							uni.authorize({
-								scope: 'scope.writePhotosAlbum',
-								success() {
-									uni.saveImageToPhotosAlbum({
-										filePath: that.posterImage,
-										success: function(res) {
-											that.posterImageClose();
-											that.$util.Tips({
-												title: '保存成功',
-												icon: 'success'
-											});
-										},
-										fail: function(res) {
-											that.$util.Tips({
-												title: '保存失败'
-											});
-										}
-									})
-								}
-							})
-						} else {
-							uni.saveImageToPhotosAlbum({
-								filePath: that.posterImage,
-								success: function(res) {
-									that.posterImageClose();
-									that.$util.Tips({
-										title: '保存成功',
-										icon: 'success'
-									});
-								},
-								fail: function(res) {
-									that.$util.Tips({
-										title: '保存失败'
-									});
-								},
-							})
-						}
-					}
-				})
-			},
-			// #endif
-			async imgToBase(url) {
-				let res = await imgToBase({
-					image: url
-				})
-				return res.data.image
-			},
-			cLike(item) {
-				if (this.isLogin) {
-					let status = item.relevance_id ? 0 : 1
-					graphicStartApi(item.community_id, {
-						status: status
-					}).then(res => {
-						if (item.relevance_id) {
-							item.count_start--;
-							item.count_start = item.count_start == 0 ? 0 : item.count_start
-							item.relevance_id = false
-						} else {
-							item.count_start++;
-							item.relevance_id = true
-						}
-					}).catch(err => {
-						return uni.showToast({
-							title: err,
-							icon: 'none',
-							duration: 2000
-						});
-					})
-				} else {
-					this.isAuto = true;
-					this.isShowAuth = true;
-				}
-
-			},
-			/*查看提到的宝贝*/
-			openMore(item) {
-				this.$refs.mentioned.showPopup()
-				this.moreList = item.relevance;
-				this.authorUid = item.uid
-			},
-			closePopup() {
-				this.$refs.mentioned.closePopup()
-			},
-			goDetail(item) {
-				if (item.product_type === 1) {
-					uni.navigateTo({
-						url: `/pages/activity/goods_seckill_details/index?id=${item.product_id}&time=${item.stop_time}&spid=${this.uid}`
-					})
-				} else if (item.product_type === 2) {
-					uni.navigateTo({
-						url: `/pages/activity/presell_details/index?id=${item.activity_id}&spid=${this.uid}`
-					})
-				} else if (item.product_type === 0) {
-					uni.navigateTo({
-						url: `/pages/goods_details/index?id=${item.product_id}&spid=${this.uid}`
-					})
-				} else if (item.product_type === 4) {
-					uni.navigateTo({
-						url: `/pages/activity/combination_details/index?id=${item.activity_id}&spid=${this.uid}`
-					})
-				} else if (item.product_type === 40) {
-					uni.navigateTo({
-						url: `/pages/activity/combination_status/index?id=${item.activity_id}&spid=${this.uid}`
-					})
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.video-list {
-		padding: 150rpx 28.07rpx 28.07rpx 28.07rpx;
-		/* #ifdef MP */
-		padding-top: 150rpx;
-		/* #endif */
-		background-color: #F5F5F5;
-
-		.goods_item {
-			width: 342.11rpx;
-			height: 491.23rpx;
-			border-radius: 8px;
-			overflow: hidden;
-			background-color: #fff;
-			display: inline-block;
-			flex-direction: column;
-			margin-bottom: 10.53rpx;
-			margin-right: 10.53rpx;
-
-			&:nth-child(2n) {
-				margin-right: 0;
-			}
-
-			.goods_img {
-				width: 100%;
-				height: 294.74rpx;
-			}
-
-			.botm {
-				flex: 1;
-				padding: 0 14.04rpx;
-				padding-bottom: 21.05rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-
-				.title {
-					margin: 12px 0;
-					width: 100%;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					-webkit-box-orient: vertical;
-				}
-
-				.goods_info {
-					flex-direction: initial;
-					justify-content: space-between;
-
-					.l_info {
-						flex-direction: initial;
-						align-items: center;
-					}
-
-					.g_img {
-						width: 60rpx;
-						height: 60rpx;
-						border-radius: 50%;
-					}
-
-					.g_name {
-						margin-left: 8.77rpx;
-						width: 100.63rpx;
-						text-overflow: ellipsis;
-						/* 溢出显示省略号 */
-						overflow: hidden;
-						/* 溢出隐藏 */
-						white-space: nowrap;
-						/* 强制不换行 */
-					}
-
-					.nice_box {
-						display: flex;
-						flex-direction: initial;
-						align-items: center;
-
-						.isshow {
-							color: #FE3530 !important;
-						}
-
-						.iconfont {
-							font-size: 30rpx;
-						}
-
-						.icon-shoucang1 {
-							color: #F84221;
-						}
-
-						.collect {
-							font-size: 24rpx;
-							margin-left: 5rpx;
-						}
-					}
-				}
-			}
-		}
-
-
-	}
-
-	.header {
-		position: fixed;
-		z-index: 9;
-		width: 750rpx;
-		height: 120rpx;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		padding-top: 20rpx;
-		/* #ifdef MP */
-		padding-top: 75rpx;
-		/* #endif */
-
-		.tool-bar {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 60rpx;
-			height: 86rpx;
-			display: flex;
-			justify-content: center;
-
-			.xiangzuo {
-				width: 23rpx;
-				height: 42rpx;
-				margin-right: 40rpx;
-				margin-left: 20rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-
-		.items {
-			margin: 0 30rpx;
-
-			image {
-				width: 58rpx;
-				height: 58rpx;
-
-			}
-
-			.tName {
-				font-size: 33rpx;
-				font-family: PingFang SC-Medium, PingFang SC;
-				font-weight: 500;
-				color: #737373;
-				line-height: 50px;
-
-				&.on {
-					font-size: 33rpx;
-					font-family: PingFang SC-Medium, PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-			}
-
-		}
-	}
-
-	.shareImg {
-		z-index: 1000;
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-	}
-
-	.shortVideo,
-	.container {
-		background: linear-gradient(180deg, rgba(0, 0, 0, .8) 0%, #000000 100%);
-
-	}
-
-	.item {
-		position: relative;
-	}
-
-	.video-status {
-		width: 690rpx;
-		position: absolute;
-		left: 30rpx;
-		background: #000;
-		border-radius: 10rpx;
-		top: 60rpx;
-		padding: 30rpx;
-
-		.status-title {
-			flex-direction: row;
-			align-items: center;
-
-			.title {
-				margin-left: 20rpx;
-				color: #ffffff;
-				font-size: 28rpx;
-			}
-		}
-
-		.refusal {
-			color: #ffffff;
-			font-size: 22rpx;
-			margin: 15rpx 0 0 48rpx;
-		}
-
-		.image {
-
-			width: 28rpx;
-			height: 28rpx;
-		}
-	}
-
-	.videoHover {
-		position: absolute;
-		top: 0;
-		left: 0;
-		flex: 1;
-		justify-content: center;
-		align-items: center;
-		// background-color: red;
-	}
-
-	.playState {
-		width: 160rpx;
-		height: 160rpx;
-		opacity: 0.2;
-	}
-
-	.userInfo {
-		position: absolute;
-		bottom: 420rpx;
-		right: 20rpx;
-		flex-direction: column;
-		text-align: center;
-
-		.pictrue {
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			position: relative;
-
-			// margin-bottom: 18rpx;
-			image {
-				width: 92rpx;
-				height: 92rpx;
-			}
-
-			.guanzhu {
-				width: 42rpx;
-				height: 42rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				color: #fff;
-				background: #E93323;
-				border-radius: 100%;
-				position: relative;
-				top: -20rpx;
-				left: 26rpx;
-
-				.iconfont {
-					font-size: 20rpx;
-				}
-			}
-
-			.yiguanzhu {
-				width: 42rpx;
-				height: 42rpx;
-			}
-		}
-
-		.mention {
-			width: 92rpx;
-			height: 92rpx;
-			position: relative;
-
-			image {
-				width: 58rpx;
-				height: 58rpx;
-				position: absolute;
-				right: 16rpx;
-			}
-
-			.count {
-				width: 30rpx;
-				height: 30rpx;
-				line-height: 30rpx;
-				background: #fff;
-				border-radius: 100%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				color: #E93323;
-				position: absolute;
-				right: 8rpx;
-				top: -12rpx;
-				font-size: 20rpx;
-			}
-		}
-
-		.iconfont {
-			color: #ffffff;
-
-			&.likeNumActive {
-				color: #E93323;
-			}
-		}
-	}
-
-	.icon-shipindianzan-yidian {
-		font-size: 64rpx;
-	}
-
-	.icon-pinglun2 {
-		font-size: 59rpx;
-	}
-
-	.icon-fenxiang3 {
-		font-size: 58rpx;
-	}
-
-	.info-text {
-		margin-top: 10rpx;
-		color: #ffffff;
-
-	}
-
-	.userAvatar {
-		border-radius: 500%;
-		border-style: solid;
-		border-width: 2px;
-		border-color: #ffffff;
-		width: 80rpx;
-		height: 80rpx;
-		display: block;
-	}
-
-	.video-dian {
-		position: relative;
-		width: 66rpx;
-		height: 66rpx;
-		align-items: center;
-		justify-content: center;
-		flex-direction: row;
-		left: 12rpx;
-
-		.dian {
-			width: 13rpx;
-			height: 13rpx;
-			background-color: #fff;
-			border-radius: 100%;
-			margin-right: 10rpx;
-
-			&:last-child {
-				margin-right: 0;
-			}
-		}
-	}
-
-	.manage {
-		width: 210rpx;
-		background: #ffffff;
-		box-shadow: 0 2rpx 15rpx rgba(0, 0, 0, 0.1);
-		padding: 0 15rpx;
-		position: absolute;
-		bottom: -50rpx;
-		right: 110rpx;
-		z-index: 90;
-		border-radius: 16rpx;
-
-		&::before {
-			content: "";
-			display: inline-block;
-			width: 26rpx;
-			height: 26rpx;
-			background: #ffffff;
-			transform: rotate(140deg);
-			position: absolute;
-			top: 60rpx;
-			right: -14rpx;
-			box-shadow: -1rpx -1rpx 1rpx rgba(0, 0, 0, 0.05);
-		}
-
-		.items {
-			border-bottom: 1px solid #EEEEEE;
-			color: #282828;
-			font-size: 26rpx;
-			padding: 20rpx 0;
-			display: flex;
-			align-items: center;
-			flex-direction: row;
-
-			&:last-child {
-				border-bottom: none;
-			}
-
-			.image {
-				width: 32rpx;
-				height: 32rpx;
-				margin: 0 16rpx 0;
-			}
-		}
-	}
-
-	.likeNumActive {
-		color: #E93323;
-	}
-
-	.content {
-		width: 590rpx;
-		position: absolute;
-		bottom: 30rpx;
-		bottom: calc(30rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		bottom: calc(30rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-		padding: 15rpx 0;
-		flex-direction: column;
-		justify-content: flex-start;
-		color: #ffffff;
-		left: 50%;
-		margin-left: -345rpx;
-
-		.time {
-			font-size: 24rpx;
-			color: rgba(255, 255, 255, 0.5);
-			margin-left: 12rpx;
-		}
-
-		.cart {
-			height: 48rpx;
-			flex-direction: row;
-
-			.cartName {
-				font-size: 24rpx;
-				color: #fff;
-			}
-		}
-	}
-
-	.canvas {
-		z-index: 300;
-		width: 750px;
-		height: 1036px;
-	}
-
-	.poster-pop {
-		width: 600rpx;
-		/*#ifdef H5*/
-		height: 820rpx;
-		/*#endif*/
-		/*#ifndef H5*/
-		height: 910rpx;
-		/*#endif*/
-		position: fixed;
-		left: 50%;
-		transform: translateX(-50%);
-		z-index: 399;
-		top: 50%;
-		margin-top: -410rpx;
-		border-radius: 30rpx;
-	}
-
-	.poster-pop .image {
-		width: 100%;
-		height: 100%;
-		display: block;
-		border-radius: 16rpx;
-	}
-
-	.poster-pop .close {
-		width: 46rpx;
-		height: 75rpx;
-		position: fixed;
-		right: 0;
-		top: -73rpx;
-		display: block;
-	}
-
-	.poster-pop .keep {
-		text-align: center;
-		width: 600rpx;
-		height: 70rpx;
-		line-height: 70rpx;
-		border-radius: 43rpx;
-		background: #E93323;
-		color: #ffffff;
-		font-size: 25rpx;
-		margin-top: 40rpx;
-	}
-
-	.mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.6);
-		z-index: 9;
-	}
-
-	.words {
-		margin-top: 12rpx;
-
-		.close {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			justify-content: flex-end;
-			margin-right: 20rpx;
-
-			.imgClose {
-				width: 18rpx;
-				height: 10rpx;
-				margin-left: 10rpx;
-			}
-		}
-
-		.wordsCon {
-			position: relative;
-
-			.more {
-				position: absolute;
-				bottom: 0;
-				right: 40rpx;
-				font-size: 26rpx;
-			}
-
-			.img {
-				width: 18rpx;
-				height: 10rpx;
-				margin-left: 4rpx;
-				position: absolute;
-				bottom: 7rpx;
-				right: 15rpx;
-			}
-		}
-
-		.info {
-			color: #fff;
-			font-size: 28rpx;
-		}
-
-		.more {
-			font-size: 26rpx;
-			color: #ffffff;
-			font-weight: 400;
-		}
-	}
-
-	.product {
-		display: block;
-		margin-top: 27rpx;
-
-		.product-item {
-			   display: inline-block;
-			width: 444rpx;
-			height: 136rpx;
-			background: rgba(0, 0, 0, .55);
-			border-radius: 12rpx;
-			padding: 16rpx 15rpx;
-			margin-right: 30rpx;
-		}
-
-		/deep/uni-swiper,
-		/deep/swiper {
-			display: block;
-			// width: 500rpx!important;
-			height: 136rpx !important;
-
-			.swiper-count {
-				display: block;
-				width: 444rpx !important;
-				height: 136rpx !important;
-				background: rgba(0, 0, 0, .55);
-				border-radius: 12rpx;
-				padding: 16rpx 15rpx;
-			}
-
-			.swiper-item {
-				display: block;
-				width: 480rpx !important;
-			}
-		}
-
-		.item-count {
-			width: 414rpx;
-			flex-direction: row;
-			justify-content: space-between;
-			border-radius: 12rpx;
-
-			.picture {
-				width: 104rpx;
-				height: 104rpx;
-				border-radius: 10rpx;
-
-				image {
-					width: 104rpx;
-					height: 104rpx;
-					border-radius: 10rpx;
-				}
-			}
-
-			.product-text {
-				width: 266rpx;
-				justify-content: space-between;
-
-				.name {
-					display: inline-block;
-					width: 266rpx;
-				}
-
-				.product-price {
-					display: flex;
-					flex-direction: row;
-					justify-content: space-between;
-					align-items: center;
-
-					.price {
-						display: flex;
-						flex-direction: row;
-						align-items: end;
-
-						text {
-							font-size: 34rpx;
-						}
-					}
-
-					.buy-btn {
-						width: 89rpx;
-						height: 36rpx;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						color: #fff;
-						border-radius: 26rpx;
-						background: #E93323;
-						font-size: 20rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.product_cate {
-		margin: 20rpx 0;
-		flex-direction: row;
-
-		>view {
-			display: inline-block;
-			flex-direction: row;
-			align-items: center;
-			border-radius: 30rpx;
-			padding: 0 25rpx;
-			line-height: 40rpx;
-			border-radius: 29rpx;
-			border: 1px solid #ffffff;
-
-			.text {
-				font-size: 24rpx;
-			}
-
-			.icon {
-				display: inline-block;
-				font-size: 26rpx;
-				font-weight: bold;
-				position: relative;
-				top: 2rpx;
-				margin-right: 8rpx;
-			}
-		}
-	}
-
-	.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;
-		align-content: center;
-		align-items: center;
-		flex-direction: row;
-	}
-
-	.generate-posters.on {
-		transform: translate3d(0, 0, 0);
-	}
-
-	.generate-posters .item {
-		/* #ifdef H5 */
-		flex: 100%;
-		/* #endif */
-		/* #ifndef H5 */
-		flex: 33.33%;
-		/* #endif */
-		text-align: center;
-		font-size: 30rpx;
-
-		&.item3 {
-			flex: 33.33%;
-		}
-	}
-
-	.generate-posters .item .iconfont {
-		font-size: 80rpx;
-		color: #5eae72;
-	}
-
-	.generate-posters .item .iconfont.icon-haibao {
-		color: #5391f1;
-	}
-
-	.mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.6);
-		z-index: 9;
-	}
-
-	.noVideo {
-		position: fixed;
-		top: 400rpx;
-		z-index: 9;
-		width: 750rpx;
-		flex-direction: row;
-		justify-content: center;
-
-		.pictrue {
-			width: 414rpx;
-			height: 256rpx;
-		}
-
-		.tips {
-			text-align: center;
-			margin-top: 14rpx;
-			font-size: 26rpx;
-			color: #999;
-		}
-	}
-
-	.videoa {
-		background-color: red;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/short_video/static/img/index/close.png b/pages/short_video/static/img/index/close.png
deleted file mode 100644
index 8a09a82..0000000
Binary files a/pages/short_video/static/img/index/close.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/collection.png b/pages/short_video/static/img/index/collection.png
deleted file mode 100644
index 640e390..0000000
Binary files a/pages/short_video/static/img/index/collection.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/evaluate.png b/pages/short_video/static/img/index/evaluate.png
deleted file mode 100644
index 4e9320f..0000000
Binary files a/pages/short_video/static/img/index/evaluate.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/icon-back.png b/pages/short_video/static/img/index/icon-back.png
deleted file mode 100644
index f1a635f..0000000
Binary files a/pages/short_video/static/img/index/icon-back.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/logins.gif b/pages/short_video/static/img/index/logins.gif
deleted file mode 100644
index 559e4c0..0000000
Binary files a/pages/short_video/static/img/index/logins.gif and /dev/null differ
diff --git a/pages/short_video/static/img/index/pause.png b/pages/short_video/static/img/index/pause.png
deleted file mode 100644
index dda7762..0000000
Binary files a/pages/short_video/static/img/index/pause.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/play.png b/pages/short_video/static/img/index/play.png
deleted file mode 100644
index a53edd2..0000000
Binary files a/pages/short_video/static/img/index/play.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/posterbackgd.png b/pages/short_video/static/img/index/posterbackgd.png
deleted file mode 100644
index 99e1f1c..0000000
Binary files a/pages/short_video/static/img/index/posterbackgd.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/share-fill.png b/pages/short_video/static/img/index/share-fill.png
deleted file mode 100644
index b9a9771..0000000
Binary files a/pages/short_video/static/img/index/share-fill.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/video-delete.png b/pages/short_video/static/img/index/video-delete.png
deleted file mode 100644
index 71727c9..0000000
Binary files a/pages/short_video/static/img/index/video-delete.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/video-edit.png b/pages/short_video/static/img/index/video-edit.png
deleted file mode 100644
index 0b14903..0000000
Binary files a/pages/short_video/static/img/index/video-edit.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/video-failed.png b/pages/short_video/static/img/index/video-failed.png
deleted file mode 100644
index f93c539..0000000
Binary files a/pages/short_video/static/img/index/video-failed.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/video-review.png b/pages/short_video/static/img/index/video-review.png
deleted file mode 100644
index f87b36b..0000000
Binary files a/pages/short_video/static/img/index/video-review.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/we-chat.png b/pages/short_video/static/img/index/we-chat.png
deleted file mode 100644
index 6951e7b..0000000
Binary files a/pages/short_video/static/img/index/we-chat.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/xin-2.png b/pages/short_video/static/img/index/xin-2.png
deleted file mode 100644
index 6ee5ec7..0000000
Binary files a/pages/short_video/static/img/index/xin-2.png and /dev/null differ
diff --git a/pages/short_video/static/img/index/xin.png b/pages/short_video/static/img/index/xin.png
deleted file mode 100644
index 1a66f8c..0000000
Binary files a/pages/short_video/static/img/index/xin.png and /dev/null differ
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
deleted file mode 100644
index 0838c02..0000000
--- a/pages/supply_chains/supply_chains.vue
+++ /dev/null
@@ -1,1027 +0,0 @@
-<template>
-	<view class="Circle_friends">
-		<view class="circle_friends_wrapper">
-			<view v-if="isFshow">
-				<view class="site-box flex_a_c_j_sb" :style="{'opacity':backColor}">
-
-					<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation">
-						<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="margin-left: 20rpx;">
-						</view>
-						<view class="town_name">{{street}}</view>
-					</view>
-					<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-						<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#fff;"></view>
-					</navigator>
-				</view>
-
-
-			</view>
-
-			<view class="" v-if="!isFshow">
-				<view class="site-box1 flex_a_c_j_sb">
-
-					<view class="place_wrapper flex_a_c"  @click="selectLocation">
-						<view class="iconfont icon-weizhi"></view>
-						<view class="town_name">{{street}}</view>
-					</view>
-					<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
-						<view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
-					</navigator>
-				</view>
-			</view>
-
-			<zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
-				@change="dchange">
-			</zbpSwiper>
-
-			<view class="list">
-				<navigator hover-class="none"
-					:url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}&townName=${town}`">
-					<view class="list-m">
-						<image src="@/static/images/f6.png" mode="aspectFit"></image>
-						<view class="list-title">
-							<view class="list-titlea">
-								<image src="@/static/images/p9.png" mode="aspectFit"></image>
-								<view class="titlea-con">
-									<view class="titlea">september</view>
-									<view class="titleb"> 9月 </view>
-								</view>
-							</view>
-							<view class="list-titleb">
-								<view class="titlea">
-									{{ town }}
-								</view>
-								<view class="titleb"> 综合供销云市场 </view>
-							</view>
-						</view>
-						<view class="list-title-info" style="color: #3a7331">
-							<view class=""> 点击查看 </view>
-
-							<view class="title-infoimg">
-								<image src="@/static/images/pj.png" mode="aspectFit"></image>
-							</view>
-						</view>
-					</view>
-				</navigator>
-
-				<view class="list-m" @click="go_shop">
-					<image src="@/static/images/f1.png" mode="aspectFit"></image>
-					<view class="list-title">
-						<view class="list-titlea">
-							<image src="@/static/images/p8.png" mode="aspectFit"></image>
-						</view>
-						<view class="list-titleb">
-							<view class="titlea"> 里海云仓 </view>
-							<view class="titleb"> 行业分类市场 </view>
-						</view>
-					</view>
-					<view class="list-title-info" style="color: #ff6b00">
-						<view class=""> 点击查看 </view>
-						<view class="title-infoimg">
-							<image src="@/static/images/pj1.png" mode="aspectFit"></image>
-						</view>
-					</view>
-				</view>
-			</view>
-
-			<view class="list-con">
-				<view class="list-con-left"
-					@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')">
-					<!-- <view class="list-con-title">
-						<view class="con-titlea">
-							名优特产
-						</view>
-						<view class="con-titleb">
-							精选当地特色特产
-						</view>
-					</view> -->
-					<image src="@/static/images/f5.png" mode="aspectFit"></image>
-				</view>
-				<view class="list-con-right">
-					<view class="con-right" style="margin-bottom: 20rpx"
-						@click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
-						<!-- <view class="list-con-title">
-							<view class="con-titlea">
-								当地美食
-							</view>
-							<view class="con-titleb">
-								美食线上一条街
-							</view>
-						</view> -->
-						<image src="@/static/images/f7.png" mode="aspectFit"></image>
-					</view>
-					<view class="con-right"
-						@click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
-						<!-- <view class="list-con-title">
-							<view class="con-titlea">
-								特色文旅
-							</view>
-							<view class="con-titleb">
-								热门景区，当地文化
-							</view>
-						</view> -->
-						<image src="@/static/images/f2.png" mode="aspectFit"></image>
-					</view>
-				</view>
-			</view>
-			<view class="list-bon">
-				<image src="@/static/images/f4.png" mode="aspectFit"></image>
-			</view>
-			<view class="goodslist">
-				<WaterfallsFlow :wfList="productList" :type="1" />
-			</view>
-			<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
-				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-			</view>
-			<view class="empty_wrapper" v-if="emptyShow">
-				<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
-			</view>
-		</view>
-
-		<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
-			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
-
-
-		<view class="location" v-if="isshow">
-			<view class="locationa"> 位置权限使用说明 </view>
-			<view class="locationb"> 用于向你推荐最近门店 </view>
-		</view>
-		<!-- <m-tabbar native>
-		      <template v-slot:tabbar_index_2>
-		        <view class="custom_style">
-		          <view class="custom_style_icon"></view>
-		          <view class="custom_style-txt"  style="color: #282828;">
-		              发布
-		          </view> </view>
-		      </template>
-		    </m-tabbar> -->
-	</view>
-</template>
-
-<script>
-	import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
-	import zbpSwiper from '@/components/zbpSwiper'
-	import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlowo.vue'
-	import Cache from '@/utils/cache';
-	import {
-		getSlideAPI
-	} from '@/api/lihai.js'
-	import {
-		graphicLstApi,
-		getTopicList,
-		graphicStartApi
-	} from '@/api/community.js'
-	import {
-		getIndexData,
-		getDiy,
-
-	} from '@/api/api.js'
-
-	import {
-		spuInfo
-	} from '@/api/product.js';
-	import {
-		getGeocoder,
-		merClassifly,
-		getProductHot
-	} from '@/api/store.js';
-	import {
-		getArea,
-		getStreet
-	} from '@/api/article.js';
-	import {
-		Toast
-	} from '@/libs/uniApi'
-	export default {
-		components: {
-			mTabbar,
-			zbpSwiper,
-			easyLoadimage,
-			WaterfallsFlow
-		},
-		data() {
-			return {
-				activeStyle: {
-
-					color: '#333333',
-					fontWeight: 'bold',
-					transform: 'scale(1.04)'
-				},
-				isshow: false,
-				locationArr: ({}),
-
-				bgColor: '',
-				showPicker: false,
-				columnData: [],
-				show: false,
-				tabsData: {
-					list: [],
-					tabsActive: 0
-				},
-				tabsData1: {
-					list: [],
-					tabsActive: 0
-				},
-				where: {
-					category_id: 0,
-					page: 1,
-					limit: 6
-				},
-
-				currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
-				keyword: '',
-				location: '',
-				emptyShow: false,
-				town: '',
-				productList: [],
-				recoList: [],
-				articleList: [],
-				street_id: '',
-				street: '',
-				bgColor: '',
-				isFshow: false,
-				backColor: 0,
-				loadend: false,
-				loading: false,
-				loadTitle: '加载更多',
-			}
-		},
-
-		onPullDownRefresh() {
-			this.list(true);
-			this.Area()
-			uni.stopPullDownRefresh()
-		},
-		onLoad() {
-
-			this.list()
-
-			this.Area()
-
-
-			// this.openTongZhi()
-			uni.$on('connectstatusChange', (connectstatus) => {
-				var connectstr = ''
-				if (connectstatus == true) {
-					connectstr = '已连接'
-					this.getRegistrationID()
-				} else {
-					connectstr = '未连接'
-				}
-				this.connectstatus = connectStr
-			})
-
-		},
-		onShow() {
-			this.list(true);
-		},
-		onReachBottom() {
-			if (this.productList.length > 0) {
-				setTimeout(() => {
-					this.list(false);
-				}, 500)
-			} else {
-				this.list()
-			}
-
-		},
-		beforeDestroy() {
-			// 销毁监听事件
-			this.$bus.$off('value-updated')
-		},
-		mounted() {
-
-			// #ifdef  H5
-			// 监听页面滚动事件
-			window.addEventListener("scroll", this.scrolling);
-			// #endif
-
-			this.$bus.$on('value-updated', (newValue) => {
-				// 更新父组件的值
-				this.street = newValue.split(',')[0]
-				this.town = newValue.split(',')[0]
-				this.street_id = newValue.split(',')[1]
-			});
-
-
-
-			if (this.street.length <= 0) {
-				this.selfLocation()
-			}
-
-		},
-		// #ifdef APP-PLUS
-		onPageScroll(e) {
-
-			const scrollTop = e.scrollTop;
-			if (scrollTop <= 20) {
-				this.backColor = 0
-				this.isFshow = false
-			} else if (20 < scrollTop && scrollTop <= 100) {
-				this.backColor = 0.5
-				this.isFshow = true
-			} else if (scrollTop > 100) {
-				this.backColor = 1
-				this.isFshow = true
-
-
-			}
-		},
-		// #endif
-		methods: {
-			navaction(val) {
-				uni.navigateTo({
-					url: '/pages/nongKe/supply_chain/suppliers?id=' + val
-				})
-
-			},
-			//获取商品列表
-			list(isPage, id) {
-
-				let that = this;
-				if (that.loadend) return;
-				if (that.loading) return;
-
-				if (isPage === true) that.$set(that, 'productList', []);
-
-				that.loading = true;
-				that.loadTitle = '';
-				getProductHot(that.where.page, that.where.limit).then(res => {
-					let list = res.data.list;
-					let productList = that.$util.SplitArray(list, that.productList);
-					let loadend = list.length < that.where.limit;
-					that.loadend = loadend;
-					that.loading = false;
-					that.loadTitle = loadend ? '已全部加载' : '加载更多';
-					that.$set(that, 'productList', productList);
-					// console.log(that.productList)
-					that.$set(that.where, 'page', that.where.page + 1);
-					if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
-				}).catch(err => {
-					that.loading = false;
-					that.loadTitle = '加载更多';
-				});
-
-
-
-
-			},
-			scrolling() {
-				// 滚动条距文档顶部的距离
-				let scrollTop =
-					window.pageYOffset ||
-					document.documentElement.scrollTop ||
-					document.body.scrollTop;
-				// 滚动条滚动的距离
-				let scrollStep = scrollTop - this.oldScrollTop;
-				// console.log("header 滚动距离 ", scrollTop);
-				// 更新——滚动前，滚动条距文档顶部的距离
-				this.oldScrollTop = scrollTop;
-
-				//变量windowHeight是可视区的高度
-				let windowHeight =
-					document.documentElement.clientHeight || document.body.clientHeight;
-				//变量scrollHeight是滚动条的总高度
-				let scrollHeight =
-					document.documentElement.scrollHeight || document.body.scrollHeight;
-
-				//滚动条到底部的条件
-				if (scrollTop + windowHeight == scrollHeight) {
-					//你想做的事情
-					// console.log("header  你已经到底部了");
-				}
-
-
-				if (scrollTop <= 20) {
-					this.backColor = 0
-					this.isFshow = false
-				} else if (20 < scrollTop && scrollTop <= 100) {
-					this.backColor = 0.5
-					this.isFshow = true
-				} else if (scrollTop > 100) {
-					this.backColor = 1
-					this.isFshow = true
-
-
-				}
-
-
-			},
-
-
-
-
-
-
-			getCloudShopMerId(id) {
-				get_cloud_shop(id).then(res => {
-					res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0
-				})
-			},
-			selectLocation() {
-
-				this.showPicker = true
-			},
-			confirm(e) {
-
-				this.street = e.value[1].name
-				this.street_id = e.value[1].code
-				this.town = e.value[1].name
-				this.productList = []
-				this.list(true, this.street_id)
-				this.$nextTick(() => {
-					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
-
-				})
-				this.showPicker = false
-			},
-			changeHandler(e) {
-				const {
-					columnIndex,
-					value,
-					values,
-					index,
-					picker = this.$refs.uPicker
-				} = e;
-				if (columnIndex === 0) {
-					getStreet({
-						area_code: value[0]['code']
-					}).then(res => {
-						this.$refs.uPicker.setColumnValues(1, res.data);
-					});
-				}
-			},
-			Area() {
-				getArea({
-					city_code: 510500
-				}).then(res => {
-					this.$refs.uPicker.setColumnValues(0, res.data);
-					this.Street(res.data[0]['code']);
-				});
-			},
-			Street(code) {
-				getStreet({
-					area_code: code
-				}).then(res => {
-					this.$refs.uPicker.setColumnValues(1, res.data);
-				});
-			},
-			gogogo(item) {
-				if (item.video_link.length > 0) {
-
-					uni.navigateTo({
-						// #ifdef MP || H5
-						url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}`
-						// #endif
-						// #ifdef APP
-						url: `/pages/short_video/appSwiper/index?id=${item.community_id}`
-						// #endif
-					})
-
-				} else {
-					uni.navigateTo({
-
-						url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
-					})
-				}
-			},
-			giveStart(item) {
-				let status = item.relevance_id ? 0 : 1
-				graphicStartApi(item.community_id, {
-					status: status
-				}).then(res => {
-					if (item.relevance_id) {
-						item.count_start--;
-						item.count_start = item.count_start == 0 ? 0 : item.count_start
-						item.relevance_id = false
-					} else {
-						item.count_start++;
-						item.relevance_id = true
-					}
-				})
-			},
-			go_shop() {
-				if (this.isYunCang == 0) {
-					return Toast('当前区域没有云仓库')
-				}
-				uni.navigateTo({
-					url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}`
-				})
-
-			},
-			navgo(url) {
-				uni.navigateTo({
-					url
-				})
-			},
-			dchange(e) {
-				this.street = e.value[1].name
-				this.street_id = e.value[1].code
-				this.town = e.value[1].name
-				this.productList = []
-				this.list(true, this.street_id)
-			},
-			selfLocation() {
-				if (uni.getStorageSync('loction') == true) {
-					this.isshow = false
-				} else {
-					this.isshow = true
-					uni.setStorageSync('loction', true);
-				}
-				uni.getLocation({
-					type: 'wgs84',
-					timeout: '10',
-					success: (res) => {
-
-						this.isshow = false
-						let latitude, longitude;
-						latitude = res.latitude.toString();
-						longitude = res.longitude.toString();
-						getGeocoder({
-							lat: latitude,
-							long: longitude
-						}).then(res => {
-							this.isshow = false
-							this.town = res.data.address_reference.town.title
-							this.street_id = res.data.address_reference.town.id
-							this.street = res.data.address_component.street
-							this.$nextTick(() => {
-								this.$bus.$emit('value-updated', this.street + ',' + this
-									.street_id);
-
-							})
-							this.list(this.street_id)
-						}).catch(err => {
-							this.isshow = false
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})
-						})
-					},
-					fail: (err) => {
-						this.isshow = false
-						// uni.showToast({
-						// 	title: "获取定位超时",
-						// 	icon: 'none',
-						// 	duration: 2000
-						// });
-					}
-				});
-			},
-
-
-
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	/deep/.color-lump {
-		display: none;
-	}
-
-	page {
-		background: #f4f7fe;
-
-		// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
-	}
-
-	.site-box1 {
-		width: 706rpx;
-		/* #ifdef MP || APP-PLUS */
-		height: 160rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		height: 120rpx;
-		/* #endif */
-		margin-bottom: 26.32rpx;
-		position: absolute;
-		top: 45rpx;
-		left: 20rpx;
-
-		z-index: 9999 !important;
-
-		// 位置
-		.place_wrapper {
-			color: #fff;
-			margin-right: 0rpx;
-
-			font-size: 30rpx;
-
-			.town_name {
-				margin-left: 21rpx;
-			}
-		}
-
-		.iconfont {
-			font-size: 35.09rpx;
-		}
-
-	}
-
-	.location {
-		background-color: #f6f6f6;
-		width: 680rpx;
-		height: 150rpx;
-		position: absolute;
-		top: 0;
-		z-index: 9999;
-		border-radius: 20rpx;
-		left: 50%;
-		margin-left: -340rpx;
-		margin-top: 80rpx;
-		padding-left: 20rpx;
-
-		.locationa {
-			font-size: 28rpx;
-			color: #000;
-			font-weight: 500;
-			margin-top: 30rpx;
-			margin-bottom: 15rpx;
-		}
-
-		.locationb {
-			font-size: 20rpx;
-			color: #5a5a5a;
-		}
-	}
-
-	.Circle_friends {
-		position: relative;
-		padding: 0 0 87.72rpx 0;
-	}
-
-	.sitebox {
-		animation-name: fadeIn;
-		animation-duration: 3s;
-		animation-fill-mode: forwards;
-	}
-
-	@keyframes fadeIn {
-		from {
-			opacity: 0;
-		}
-
-		to {
-			opacity: 1;
-		}
-	}
-
-	.site-box {
-		width: 100%;
-		/* #ifdef MP || APP-PLUS */
-		height: 160rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		height: 120rpx;
-		/* #endif */
-		margin-bottom: 26.32rpx;
-		position: absolute;
-		top: 0rpx;
-		position: fixed;
-		z-index: 999;
-		/* #ifdef MP || APP-PLUS */
-		padding-top: 75rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		padding-top: 25rpx;
-		/* #endif */
-		background: url('@/static/images/bg2.png') no-repeat;
-		background-size: 100% 100%;
-
-		padding-right: 20rpx;
-
-		// 位置
-		.place_wrapper {
-			color: #fff;
-			margin-right: 24.56rpx;
-			font-size: 30rpx;
-
-			opacity: 0;
-
-			.town_name {
-				margin-left: 21rpx;
-			}
-		}
-
-		.iconfont {
-			opacity: 0;
-			font-size: 30rpx;
-			font-size: 35.09rpx;
-		}
-	}
-
-	.circle_friends_wrapper {
-		position: relative;
-
-		z-index: 2;
-	}
-
-	/deep/.u-tabs__wrapper__nav__line {
-		width: 46rpx;
-	}
-
-	/deep/.u-tabs__wrapper__nav__item {
-		padding: 0 0px;
-		padding-right: 10rpx;
-	}
-
-	.search_wrapper {
-		width: 694.74rpx;
-		margin: 0 auto;
-	}
-
-	.tabs_wrapper {
-		width: 720rpx;
-		margin: 0 auto;
-		margin-bottom: 21.05rpx;
-		// margin-left: -20rpx;
-	}
-
-	.empty_wrapper {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.article_box {
-		height: 100%;
-		width: 694.74rpx;
-		margin: 0 auto;
-		background-color: #fff;
-		border-radius: 16rpx;
-		padding: 0 24.56rpx;
-		box-sizing: border-box;
-
-		.title-box {
-			height: 87.72rpx;
-
-			text {
-				font-size: 28.07rpx;
-			}
-		}
-
-		.article-item {
-			display: flex;
-			// height: 175.44rpx;
-			justify-content: space-between;
-			border-bottom: 1px solid #f0f0f0;
-			padding: 21.05rpx 0;
-
-			.text {
-				flex: 1;
-				height: 122.81rpx;
-				margin-right: 17.54rpx;
-				font-size: 24rpx;
-				color: #999;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-
-				.name {
-					font-size: 26.32rpx;
-					color: #282828;
-				}
-			}
-
-			.pictrue {
-				width: 175.44rpx;
-				height: 122.81rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 8px;
-				}
-			}
-		}
-	}
-
-	.tabs_wrapper {
-		width: 723rpx;
-		margin: 0rpx auto;
-		margin-bottom: 21.05rpx;
-
-		.title {
-			font-size: 31.58rpx;
-			font-weight: bold;
-
-			&::before {
-				content: "";
-				display: inline-block;
-				width: 3px;
-				height: 31.58rpx;
-				background-color: #f84221;
-				margin-right: 7.02rpx;
-			}
-		}
-	}
-
-	.list {
-		display: flex;
-		padding: 12rpx;
-		justify-content: space-between;
-
-		.list-m {
-			width: 356rpx;
-			height: 235rpx;
-			position: relative;
-
-			.list-title {
-				display: flex;
-				position: absolute;
-				top: 20rpx;
-
-				.list-titlea {
-					margin-left: 14rpx;
-					width: 96rpx;
-					height: 117rpx;
-					margin-right: 11rpx;
-					position: relative;
-
-					.titlea-con {
-						width: 96rpx;
-						height: 100rpx;
-
-						color: #f4f7fe;
-
-						.titlea {
-							position: absolute;
-							top: 32rpx;
-							margin-left: 12rpx;
-							font-size: 16rpx;
-							font-family: PingFang SC-Semibold, PingFang SC;
-						}
-
-						.titleb {
-							position: absolute;
-							bottom: 8rpx;
-							font-size: 37rpx;
-							font-family: PingFang SC-Semibold, PingFang SC;
-							font-weight: 600;
-							color: #ffffff;
-							margin-left: 20rpx;
-						}
-					}
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				.list-titleb {
-					.titlea {
-						font-size: 37rpx;
-						font-family: PingFang SC-Semibold, PingFang SC;
-						font-weight: 600;
-						color: #ffffff;
-						margin-top: 10rpx;
-					}
-
-					.titleb {
-						font-size: 33rpx;
-						font-family: PingFang SC-Medium, PingFang SC;
-						font-weight: 500;
-						color: #ffffff;
-					}
-				}
-			}
-
-			.list-title-info {
-				// width: 98rpx;
-				height: 30rpx;
-				line-height: 30rpx;
-				background: #ffffff;
-				padding: 2rpx 2rpx;
-				display: flex;
-
-				font-size: 18rpx;
-				font-family: PingFang SC-Medium, PingFang SC;
-				font-weight: 500;
-				color: #ff6b00;
-				border-radius: 19rpx 19rpx 19rpx 19rpx;
-				position: absolute;
-				bottom: 14rpx;
-				left: 50%;
-				margin-left: -49rpx;
-				padding-left: 15rpx;
-
-				.title-infoimg {
-					width: 18rpx;
-					height: 18rpx;
-					margin: auto 0;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-			}
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-
-	.list-con {
-		display: flex;
-		justify-content: space-between;
-		margin-top: -10rpx;
-		padding: 12rpx;
-
-
-		.list-con-left {
-			width: 357rpx;
-			height: 482rpx;
-			position: relative;
-
-			.list-con-title {
-				position: absolute;
-				top: 0;
-				z-index: 10;
-				padding-left: 14rpx;
-
-				.con-titlea {
-					font-size: 37rpx;
-					font-family: PingFang SC-Semibold, PingFang SC;
-					font-weight: 600;
-					color: #ffffff;
-					margin-top: 10rpx;
-				}
-
-				.con-titleb {
-					margin-top: 5rpx;
-					font-size: 33rpx;
-					font-family: PingFang SC-Medium, PingFang SC;
-					font-weight: 500;
-					color: #ffffff;
-				}
-			}
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.list-con-right {
-			width: 356rpx;
-
-			.con-right {
-				width: 356rpx;
-				height: 235rpx;
-				position: relative;
-
-				.list-con-title {
-					position: absolute;
-					top: 0;
-					z-index: 10;
-					padding-left: 14rpx;
-
-					.con-titlea {
-						font-size: 37rpx;
-						font-family: PingFang SC-Semibold, PingFang SC;
-						font-weight: 600;
-						color: #ffffff;
-						margin-top: 10rpx;
-					}
-
-					.con-titleb {
-						margin-top: 5rpx;
-						font-size: 33rpx;
-						font-family: PingFang SC-Medium, PingFang SC;
-						font-weight: 500;
-						color: #ffffff;
-					}
-				}
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-	}
-
-	.list-bon {
-		width: 724rpx;
-		height: 128rpx;
-		margin: 0 auto;
-		margin-bottom: 12rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.goodslist {
-		margin: 0 auto;
-		width: 725rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/static/images/diaohuo.png b/static/images/diaohuo.png
deleted file mode 100644
index 132b867..0000000
Binary files a/static/images/diaohuo.png and /dev/null differ
diff --git a/utils/uniMPevent.js b/utils/uniMPevent.js
index 19262b2..83795db 100644
--- a/utils/uniMPevent.js
+++ b/utils/uniMPevent.js
@@ -1,54 +1,62 @@
 const mp = uni.requireNativePlugin('uniMP');
 import {
-  uniMPgetLocation,
-  test
+	uniMPgetLocation,
+	test
 } from "@/utils/uniMPfunction.js"
 
 export const initEvent = () => {
-  mp.onUniMPEventReceive(async (ret) => {
-    console.log('小程序事件: ', ret);
-    if (ret.event == 'closeApp') {
-      mp.closeUniMP(ret.fromAppid, (ret) => {
-        console.log('closeUniMP: ' + JSON.stringify(ret));
-      });
-    }
-    if (ret.event == 'getLocation') {
-      try {
-        console.log('获取定位');
-        let res = await uniMPgetLocation();
-        console.log(res);
-		// plus.geolocation.getCurrentPosition(function(position) {
-		//   console.log('经度：' + position.coords.longitude);
-		//   console.log('纬度：' + position.coords.latitude);
-		//   // that.markers[1].latitude = position.coords.longitude;
-		//   // that.markers[1].longitude = position.coords.longitude;
-		//   mp.sendUniMPEvent(
-		//     ret.fromAppid,
-		//     'getLocation', {...position.coords},
-		//     (ret) => {
-		//       console.log('Host sendEvent: ' + JSON.stringify(ret));
-		//     });
-		// }, function(error) {
-		//   console.error('获取位置失败：', error.message);
-		// }, {provider:'gps'});
-        mp.sendUniMPEvent(
-          ret.fromAppid,
-          'getLocation', {...res},
-          (ret) => {
-            console.log('Host sendEvent: ' + JSON.stringify(ret));
-          });
-      } catch (e) {
-        console.log(e);
-      }
-    }
-    if (ret.event == 'test') {
-      console.log('测试');
-      mp.sendUniMPEvent(
-        ret.fromAppid,
-        'test', { 'key': 'value', 'name': 'data' },
-        (ret) => {
-          console.log('Host sendEvent: ' + JSON.stringify(ret));
-        });
-    }
-  });
+	mp.onUniMPEventReceive(async (ret) => {
+		console.log('小程序事件: ', ret);
+		if (ret.event == 'closeApp') {
+			mp.closeUniMP(ret.fromAppid, (ret) => {
+				console.log('closeUniMP: ' + JSON.stringify(ret));
+			});
+		}
+		if (ret.event == 'getLocation') {
+			try {
+				console.log('获取定位');
+				let res = await uniMPgetLocation();
+				console.log(res);
+				// plus.geolocation.getCurrentPosition(function(position) {
+				//   console.log('经度：' + position.coords.longitude);
+				//   console.log('纬度：' + position.coords.latitude);
+				//   // that.markers[1].latitude = position.coords.longitude;
+				//   // that.markers[1].longitude = position.coords.longitude;
+				//   mp.sendUniMPEvent(
+				//     ret.fromAppid,
+				//     'getLocation', {...position.coords},
+				//     (ret) => {
+				//       console.log('Host sendEvent: ' + JSON.stringify(ret));
+				//     });
+				// }, function(error) {
+				//   console.error('获取位置失败：', error.message);
+				// }, {provider:'gps'});
+				mp.sendUniMPEvent(
+					ret.fromAppid,
+					'getLocation', {
+						...res
+					},
+					(ret) => {
+						console.log('Host sendEvent: ' + JSON.stringify(ret));
+					});
+			} catch (e) {
+				console.log(e);
+			}
+		}
+		if (ret.event == 'test') {
+			console.log('测试');
+			mp.sendUniMPEvent(
+				ret.fromAppid,
+				'test', {
+					'key': 'value',
+					'name': 'data'
+				},
+				(ret) => {
+					console.log('Host sendEvent: ' + JSON.stringify(ret));
+				});
+		}
+		if (ret.event == 'log') {
+			console.log('收到小程序事件: ' + JSON.stringify(ret));
+		}
+	});
 }
\ No newline at end of file