diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
index b2c1646..729a4b2 100644
--- a/pages/commissionedSales/receivedCommission/index.vue
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -74,10 +74,8 @@
 					已拒绝
 				</view>
 				<view class="contentgn">
-				<!-- 	<view class="contentgn_a" click="deleteOrder(item)">
-						删除
-					</view>
-					<span></span> -->
+				<!-- 
+				 -->
 					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue
index acaf1d9..d7a6d6f 100644
--- a/pages/plantGrass/plant_detail/index.vue
+++ b/pages/plantGrass/plant_detail/index.vue
@@ -1,45 +1,51 @@
 <template>
 	<view :style="viewColor">
-			<!-- #ifdef H5 -->
+		<!-- #ifdef H5 -->
 		<view class="head-menu">
-		  <view class='iconfont icon-xiangzuo' @click="returns"></view>
+			<view class='iconfont icon-xiangzuo' @click="returns"></view>
 		</view>
-			<!-- #endif -->
+		<!-- #endif -->
 		<view v-if="followDetail != null && followDetail" class="main" @click.stop="showManage = false">
-		<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 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>
 			<view class="tab-cont">
 				<view class="follow_count">
 					<view class="list_count">
 						<view v-if="followDetail.author" class="title">
 							<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 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">
 									<text>{{followDetail.author.nickname}}</text>
-									<image v-if="followDetail.author.member" class="level_icon" :src="followDetail.author.member.brokerage_icon" alt="">
+									<image v-if="followDetail.author.member" class="level_icon"
+										:src="followDetail.author.member.brokerage_icon" alt="">
 								</view>
 							</view>
 							<view class="author">
 								<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">
+										<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>
@@ -50,14 +56,18 @@
 									</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-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>
+								<button v-if="followDetail.status == 1" class="time iconfont icon-fenxiang2"
+									open-type="share" hover-class='none'></button>
 								<!-- #endif -->
 								<!-- #ifdef APP-PLUS -->
-								<button v-if="followDetail.status == 1" @click="appShare('WXSceneSession',followDetail.community_id)" class="time iconfont icon-fenxiang2" hover-class='none'></button>
+								<button v-if="followDetail.status == 1"
+									@click="appShare('WXSceneSession',followDetail.community_id)"
+									class="time iconfont icon-fenxiang2" hover-class='none'></button>
 								<!-- #endif -->
 							</view>
 						</view>
@@ -65,11 +75,14 @@
 							<productConSwiper :imgUrls="followDetail.image"></productConSwiper>
 						</view>
 						<view class="pro_describle">
-							<view class="mentioned" v-if="followDetail.relevance.length" @click="openMore(followDetail)">
+							<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>
+										<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>
@@ -79,9 +92,11 @@
 									{{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">
+							<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>
+									<text class="icon">#</text><text
+										class="text">{{followDetail.topic.topic_name}}</text>
 								</view>
 							</navigator>
 							<view class="create_time">{{followDetail.create_time}}</view>
@@ -93,7 +108,8 @@
 					<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>
+								<image :src="item.author.avatar ? item.author.avatar : '/static/images/f.png'"
+									class="image"></image>
 							</view>
 							<view class="info_count">
 								<view class="info">
@@ -103,7 +119,8 @@
 										<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>
+										<view class="iconfont"
+											:class="item.relevance_id ? 'icon-yidianzan' : 'icon-dianzan1'"></view>
 										{{item.count_start}}
 									</view>
 								</view>
@@ -111,16 +128,22 @@
 									<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>
+												<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}}
+													<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>
+												<view class="iconfont"
+													:class="itemn.relevance_id ? 'icon-yidianzan' : 'icon-dianzan1'">
+												</view>
 												{{itemn.count_start}}
 											</view>
 										</view>
@@ -139,7 +162,9 @@
 					<view v-if="followDetail.status == 1" 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}>
+								<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">
@@ -147,7 +172,8 @@
 						</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 class="iconfont"
+									:class="followDetail.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
 								<text>{{followDetail.count_start}}</text>
 							</view>
 							<view class="item acea-row">
@@ -163,11 +189,13 @@
 			<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>
+				<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" :list="followDetail.relevance" :uid="followDetail.uid"></mentioned>
+		<mentioned ref="mentioned" v-if="followDetail" @close="close" :list="followDetail.relevance"
+			:uid="followDetail.uid"></mentioned>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<!-- 绑定手机号 -->
 		<uni-popup ref="bindmobile" type="bottom">
@@ -187,17 +215,35 @@
 	// | 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 {
+		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';
+	import {
+		openPlantGrass
+	} from "@/config/app.js";
+	import {
+		configMap
+	} from '@/utils';
 	const app = getApp();
 	export default {
 		components: {
@@ -223,7 +269,7 @@
 				loaded: false,
 				loading: false,
 				loadTitle: '加载更多',
-				where:{
+				where: {
 					page: 1,
 					limit: 10
 				},
@@ -238,7 +284,9 @@
 			}
 		},
 		created() {},
-		computed: configMap({community_reply_status:0},mapGetters(['isLogin', 'uid', 'viewColor'])),
+		computed: configMap({
+			community_reply_status: 0
+		}, mapGetters(['isLogin', 'uid', 'viewColor'])),
 		watch: {},
 		onLoad: function(options) {
 			let that = this
@@ -253,7 +301,7 @@
 			//#endif
 			that.getDetail();
 			that.getReplyList();
-		
+
 		},
 		onShow() {
 			uni.hideLoading();
@@ -262,27 +310,27 @@
 		methods: {
 			// 后退
 			returns() {
-			  uni.navigateBack()
+				uni.navigateBack()
 			},
 			// 首页
 			goHome() {
-			  uni.switchTab({
-			    url: '/pages/index/index'
-			  });
+				uni.switchTab({
+					url: '/pages/index/index'
+				});
 			},
 			//分享
 			//#ifdef MP
-			plantShare(){
+			plantShare() {
 				let that = this;
-				if(that.followDetail.status == 1){
+				if (that.followDetail.status == 1) {
 					uni.showShareMenu({
 						withShareTicket: true,
-						menus: ['shareAppMessage','shareTimeline'],
+						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{
+				} else {
 					uni.hideShareMenu()
 				}
 			},
@@ -306,7 +354,7 @@
 				}
 			},
 			// #ifdef APP-PLUS
-			appShare(scene,id) {
+			appShare(scene, id) {
 				let that = this
 				uni.showLoading({
 					title: '加载中',
@@ -329,10 +377,10 @@
 							title: '分享成功',
 							icon: 'success'
 						})
-						uni.hideLoading();	
+						uni.hideLoading();
 					},
 					fail: function(err) {
-						uni.hideLoading();	
+						uni.hideLoading();
 						uni.showToast({
 							title: '分享失败',
 							icon: 'none',
@@ -350,17 +398,17 @@
 				getUserInfo().then(res => {
 					that.userInfo = res.data;
 					/*判断是否绑定手机号*/
-					if(res.data.phone){
+					if (res.data.phone) {
 						that.createReply()
-					}else{
+					} else {
 						that.$refs.bindmobile.open()
 					}
 				});
 			},
 			/*获取内容详情*/
-			getDetail(){
+			getDetail() {
 				let that = this;
-				if(that.loadData)return
+				if (that.loadData) return
 				that.loadData = true
 				uni.showLoading({
 					title: '加载中',
@@ -369,7 +417,7 @@
 				plantDetailApi(that.id).then(res => {
 					that.loadData = false
 					that.followDetail = res.data
-					that.followDetail.relevance=that.followDetail.relevance.filter(item=>{
+					that.followDetail.relevance = that.followDetail.relevance.filter(item => {
 						return item.spu
 					})
 					uni.hideLoading()
@@ -386,12 +434,12 @@
 				})
 			},
 			/*获取评论*/
-			getReplyList(){
+			getReplyList() {
 				let that = this;
 				if (that.loading || that.loaded) return;
 				that.loading = true;
 				that.loadTitle = '';
-				replyLstApi(that.id,that.where).then(res => {
+				replyLstApi(that.id, that.where).then(res => {
 					that.loading = false;
 					that.replyData = res.data
 					let list = res.data.list;
@@ -410,27 +458,30 @@
 				})
 			},
 			/*发表评论*/
-			submitComment(){
+			submitComment() {
 				let that = this;
 				if (that.isLogin === false) {
 					that.isAuto = true;
 					that.isShowAuth = true
-				}else{
+				} 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 => {
+				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']){
+						if (that.isChild) {
+							if (that.commList[that.index]['children']) {
 								that.commList[that.index]['children'].push(res.data)
-							}else{
+							} else {
 								that.commList[that.index]['children'] = [res.data]
 							}
-						}else{
+						} else {
 							that.commList.unshift(res.data)
 						}
 						that.replyData.all++
@@ -447,37 +498,39 @@
 					})
 				});
 			},
-			toReply(item,index){
-				this.placeholder = '回复：'+item.author.nickname
+			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(){
+			loseFocus() {
 				this.focus = false;
 				this.reply_id = 0;
 				this.placeholder = "快来说点儿什么吧..."
 				this.isChild = false
 			},
 			/*点赞评论*/
-			starComment(item){
+			starComment(item) {
 				let that = this;
 				if (that.isLogin === false) {
 					this.isAuto = true;
 					this.isShowAuth = true
-				}else{
+				} else {
 					let status = item.relevance_id ? 0 : 1
-					starCommentApi(item.reply_id,{status: status}).then(res => {
+					starCommentApi(item.reply_id, {
+						status: status
+					}).then(res => {
 						if (res.status === 200) {
-							if(item.relevance_id){
+							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{
+							} else {
 								item.count_start++;
 								item.relevance_id = true
 								that.replyData.start++
@@ -495,18 +548,21 @@
 				}
 			},
 			/*点赞文章*/
-			likeToggle(id){
+			likeToggle(id) {
 				if (this.isLogin === false) {
 					this.isAuto = true;
 					this.isShowAuth = true
-				}else{
+				} else {
 					let status = id ? 0 : 1
-					graphicStartApi(this.followDetail.community_id,{status: status}).then(res => {
-						if(id){
+					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.count_start = this.followDetail.count_start == 0 ? 0 : this
+								.followDetail.count_start
 							this.followDetail.relevance_id = false
-						}else{
+						} else {
 							this.followDetail.count_start++;
 							this.followDetail.relevance_id = true
 						}
@@ -518,9 +574,11 @@
 				if (this.isLogin === false) {
 					this.isAuto = true;
 					this.isShowAuth = true
-				}else{
+				} else {
 					let status = this.followDetail.is_fans == 0 ? 1 : 0
-					followAuthorApi(this.followDetail.uid,{status:status}).then(res => {
+					followAuthorApi(this.followDetail.uid, {
+						status: status
+					}).then(res => {
 						if (res.status === 200) {
 							this.followDetail.is_fans = this.followDetail.is_fans == 0 ? 1 : 0
 						}
@@ -531,36 +589,36 @@
 				}
 			},
 			// 删除话题
-			deleteTopic(){
+			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
-				      		});
+					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('用户点击取消');
-				    }
-				  }
+							})
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
 				});
 
 			},
 			/*查看提到的宝贝*/
-			openMore(item){
+			openMore(item) {
 				this.$refs.mentioned.showPopup()
 			},
-			close(){
+			close() {
 				this.$refs.mentioned.closePopup()
 				this.$refs.bindmobile.close()
 			}
@@ -568,432 +626,522 @@
 		onReachBottom() {
 			this.getReplyList()
 		},
-		onPullDownRefresh(){}
+		onPullDownRefresh() {}
 	}
 </script>
 
 <style lang="scss" scoped>
-page{
-	background: #ffffff;
-}
- .head-menu{
- 	height:50rpx;
- 	padding-left: 20rpx;
- 	line-height: 50rpx;
- 	font-weight: bold;
- }
-.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;
+	page {
+		background: #ffffff;
+	}
+
+	.head-menu {
+		height: 50rpx;
+		padding-left: 20rpx;
+		line-height: 50rpx;
+		font-weight: bold;
+	}
+
+	.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;
 			}
-		}
-		&.status1{
-			background: #FFF4EB;
-			.title{
+
+			&.status0 {
+				background: #FDF3F2;
+
+				.title {
+					color: #E93323;
+				}
+			}
+
+			&.status1 {
+				background: #FFF4EB;
+
+				.title {
+					color: #FC8327;
+				}
+			}
+
+			.iconfont {
+				font-size: 30rpx;
+			}
+
+			.icon-shijian {
 				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;
-		}
-	}
-}
-.follow_count{
-	padding: 20rpx;
-	border-bottom: 1px solid #F5F5F5;
-	.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;
-			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;
-				}
+
+			.icon-tishi {
+				color: #E93323;
 			}
-			&.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;
-				}
+
+			.status_info {
+				font-size: 22rpx;
+				color: #666666;
+				margin: 10rpx 0 0 36rpx;
 			}
 		}
 	}
-}
-.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;
+
+	.follow_count {
+		padding: 20rpx;
 		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{
+
+		.title {
 			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;
-			}
+			justify-content: space-between;
 		}
-	}
-}
 
-.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;
+		.author {
+			display: flex;
+			align-items: center;
 
-		.commen_one{
-			position: absolute;
-			top: 0;
-			left: 0;
-			.image,uni-image{
-				width: 74rpx;
-				height: 74rpx;
+			.picture,
+			uni-image {
+				width: 78rpx;
+				height: 78rpx;
 				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;
+			}
 		}
-		.info_count{
-			margin-bottom: 20rpx;
-		}
-		.info{
-			position: relative;
-			padding-right: 90rpx;
-		}
-		.name,.name_two{
-			color: #999999;
-			font-size: 26rpx;
-		}
-		.desc,.desc_two{
+
+		.time {
 			color: #282828;
-			font-size: 28rpx;
-			margin-top: 10rpx;
-			display: inline-block;
+			font-size: 46rpx;
 		}
-		.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{
+
+		.product {
 			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%;
+			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: 0;
-					left: 0;
+					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;
+					}
 				}
 			}
 		}
 	}
-}
-.no_content,.main{
-	min-height: 100vh;
-	background: #fff;
-	position: relative;
-	.count{
-		position: absolute;
-		text-align: center;
+
+	.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;
+		}
+	}
+
+	.release_bar {
+		align-items: center;
 		width: 100%;
-		top: 50%;
-		margin-top: -300rpx;
-		image,uni-image{
-			width: 424rpx;
+		background: #ffffff;
+		padding: 15rpx 20rpx;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 10;
+		border-top: 1px solid #F5F5F5;
+		justify-content: space-between;
+
+		.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;
+				}
+			}
+		}
+
+		.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{
+
+		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;
-	}
-}
-.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;
-	.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;
-			}
-		}
-	}
-	.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;
-	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index 3b090bf..c22cf0e 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -169,7 +169,7 @@
 					</checkbox-group>
 				</view>
 
-				<view v-if="setFormData.delivery_way.includes('2')" class="popup_group_item">
+				<!-- <view v-if="setFormData.delivery_way.includes('2')" class="popup_group_item">
 					<view class="popup_group_item_label">是否包邮</view>
 					<view class="popup_group_item_value">
 						<view class="popup_group_item_message">
@@ -177,7 +177,7 @@
 								style="transform:scale(0.8)" @change="deliveryFreeChange" disabled="true"/>
 						</view>
 					</view>
-				</view>
+				</view> -->
 
 				<view class="popup_group_item"
 					v-if="setFormData.delivery_way.includes('2') && setFormData.delivery_free == 0"
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 86fe838..f73454e 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -1,81 +1,89 @@
 <template>
-  <view>
-    <view class="order-index" ref="container">
-      <view class="header">
-        <div class="header_count">
-          <swiper indicator-dots="true" :circular="circular" indicator-color="#E4E4E4" indicator-active-color="#E93323"
-            previous-margin="0" next-margin="0" :current="swiperCur" @change="swiperChange">
-            <block>
-              <swiper-item :class="{ active: 0 == swiperCur }">
-                <view class="slide-navigator">
-                  <view class="item" hover-class='none' @click="jumpAddGoods">
-                    <image mode='widthFix' class="image" src="../static/images/product_add.png">
-                    </image>
-                    <text class="text">添加商品</text>
-                  </view>
-                  <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=1`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_sales.png">
-                    </image>
-                    <text class="text">在售商品</text>
-                  </navigator>
-                  <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=3`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_out.png">
-                    </image>
-                    <text class="text">售罄商品</text>
-                  </navigator>
-                  <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=5`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_recycle.png">
-                    </image>
-                    <text class="text">回收站</text>
-                  </navigator>
-                  <navigator class="item" :url="`/pages/product/storeClassification/index?mer_id=${mer_id}`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_cate.png">
-                    </image>
-                    <text class="text">店铺分类</text>
-                  </navigator>
-                </view>
-              </swiper-item>
-              <swiper-item :class="{ active: 1 == swiperCur }">
-                <view class="slide-navigator">
-                  <navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
+	<view>
+		<view class="order-index" ref="container">
+			<view class="header">
+				<div class="header_count">
+					<swiper indicator-dots="true" :circular="circular" indicator-color="#E4E4E4"
+						indicator-active-color="#E93323" previous-margin="0" next-margin="0" :current="swiperCur"
+						@change="swiperChange">
+						<block>
+							<swiper-item :class="{ active: 0 == swiperCur }">
+								<view class="slide-navigator">
+									<view class="item" hover-class='none' @click="jumpAddGoods">
+										<image mode='widthFix' class="image" src="../static/images/product_add.png">
+										</image>
+										<text class="text">添加商品</text>
+									</view>
+									<navigator class="item"
+										:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=1`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_sales.png">
+										</image>
+										<text class="text">在售商品</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=3`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_out.png">
+										</image>
+										<text class="text">售罄商品</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=5`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_recycle.png">
+										</image>
+										<text class="text">回收站</text>
+									</navigator>
+									<navigator class="item"
+										:url="`/pages/product/storeClassification/index?mer_id=${mer_id}`"
+										hover-class='none'>
+										<image mode='widthFix' class="image" src="../static/images/product_cate.png">
+										</image>
+										<text class="text">店铺分类</text>
+									</navigator>
+								</view>
+							</swiper-item>
+							<swiper-item :class="{ active: 1 == swiperCur }">
+								<view class="slide-navigator">
+									<!-- 隐藏暂时不需要 -->
+									<!--  <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 class="item" :url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
-                    hover-class='none'>
-                    <image mode='widthFix' class="image" src="../static/images/product_specification.png"></image>
-                    <text class="text">规格模板</text>
-                  </navigator>
-                  <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>
-                </view>
-              </swiper-item>
-            </block>
-          </swiper>
-        </div>
-      </view>
-      <view class="wrapper">
-        <view class='product_list acea-row row-between-wrapper'>
-          <block v-for="(item,index) in productList" :key="index">
-            <view class='item'>
-              <view class='image'>
-                <image :src='item.image'></image>
-                <text v-if="item.spec_type == 1" class="spec">多规格</text>
-              </view>
-              <view class='text'>
-                <view class='name'>
-                  <text v-if="item.is_gift_bag" class="font-org">礼包</text>
-                  <text class="text_name acea-row line1">{{item.store_name}}</text>
+                  </navigator> -->
+									<navigator class="item"
+										:url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
+										hover-class='none'>
+										<image mode='widthFix' class="image"
+											src="../static/images/product_specification.png"></image>
+										<text class="text">规格模板</text>
+									</navigator>
+									<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>
+								</view>
+							</swiper-item>
+						</block>
+					</swiper>
+				</div>
+			</view>
+			<view class="wrapper">
+				<view class='product_list acea-row row-between-wrapper'>
+					<block v-for="(item,index) in productList" :key="index">
+						<view class='item'>
+							<view class='image'>
+								<image :src='item.image'></image>
+								<text v-if="item.spec_type == 1" class="spec">多规格</text>
+							</view>
+							<view class='text'>
+								<view class='name'>
+									<text v-if="item.is_gift_bag" class="font-org">礼包</text>
+									<text class="text_name acea-row line1">{{item.store_name}}</text>
 
 								</view>
 								<view class="sales">
@@ -91,20 +99,33 @@
 								<!-- 插件无需手动引入，直接使用即可 -->
 								<!-- 里面···可以改为任意东西，图片也可以 -->
 								<!-- 参数$event不可修改，否则取不到点击事件详情 -->
-								<rudon-rowMenuDotDotDot :localdata="options"
-									@change="menuAction($event, item.attrValue)">
+								<!-- <rudon-rowMenuDotDotDot :localdata="options"
+									@change="menuAction($event, item.attrValue,item)">
 									. . .
-								</rudon-rowMenuDotDotDot>
+								</rudon-rowMenuDotDotDot> -->
+								<view class="" style='font-size: 30rpx;text-align: right;'
+									@click="menuActiona(item,index)">
+									...
+								</view>
+
+								<view class="muau-header" v-if='index==num'>
+									<view class="muau" v-for='(kk,i) in options'
+										@click='menuAction(kk, item.attrValue,item,index)'>
+										<view class="">
+											{{kk.text}}
+										</view>
+									</view>
+								</view>
 							</view>
 						</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>
-								<view class=""class="bnt" @click="Fline(item)" style="width:150rpx">
 									线上入库
 								</view>
+								<view class="" class="bnt" @click="Fline(item)" style="width:150rpx">
+									线下入库
+								</view>
 								<view v-if="item.is_show == 1 && item.status == 1" class="bnt"
 									@tap.stop="handleShelves(item,0)">下架
 								</view>
@@ -112,46 +133,47 @@
 									@tap.stop="handleShelves(item),1">上架
 								</view>
 								<view @click="editGoods(item)" class="bnt">编辑</view>
-								<view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除
-								</view>
+								<!-- <view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除
+								</view> -->
 								<!-- <view class="bnt bnt_recommend" v-if="item.is_show == 1"
 									@tap.stop="handleRecommend(item)">
 									{{item.is_good ? '取消推荐' : '店铺推荐'}}
 								</view> -->
 							</view>
 
-            </view>
-          </block>
-        </view>
-      </view>
-      <Loading :loaded="loaded" :loading="loading"></Loading>
-    </view>
-    <u-popup :show="show" @close="close" mode="center" bgColor='transparent'>
-      <image src="@/static/images/xianxia.png" mode="widthFix"></image>
-      <view class="popen">
-        <h4 v-if="this.on_line==1">线下入库</h4>
-        <h4 v-else>线上入库</h4>
-        <view class="guige">
-          <scroll-view scroll-y="true" class="scroll_y">
-            <view>
-              <u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
-                <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"
-                  @change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique" v-if="item.sku">
-                </u-radio>
-              </u-radio-group>
-            </view>
-          </scroll-view>
-        </view>
-        <view class="shuru" v-if="this.on_line == 1">
-          数量: <input type="number" v-model="data.number" placeholder="请输入">
-        </view>
-        <view class="btn">
-          <button class="btn_l" @click="close()">取消</button>
-          <button class="btn_r" @click="creat()">提交</button>
-        </view>
-      </view>
-    </u-popup>
-  </view>
+						</view>
+					</block>
+				</view>
+			</view>
+			<Loading :loaded="loaded" :loading="loading"></Loading>
+		</view>
+		<u-popup :show="show" @close="close" mode="center" bgColor='transparent'>
+			<image src="@/static/images/xianxia.png" mode="widthFix"></image>
+			<view class="popen">
+				<h4 v-if="this.on_line==1">线下入库</h4>
+				<h4 v-else>线上入库</h4>
+				<view class="guige">
+					<scroll-view scroll-y="true" class="scroll_y">
+						<view>
+							<u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+								<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"
+									@change="radioChange(item)" :key="index" :label="item.sku" :name="item.unique"
+									v-if="item.sku">
+								</u-radio>
+							</u-radio-group>
+						</view>
+					</scroll-view>
+				</view>
+				<view class="shuru" v-if="this.on_line == 1">
+					数量: <input type="number" v-model="data.number" placeholder="请输入">
+				</view>
+				<view class="btn">
+					<button class="btn_l" @click="close()">取消</button>
+					<button class="btn_r" @click="creat()">提交</button>
+				</view>
+			</view>
+		</u-popup>
+	</view>
 </template>
 
 <script>
@@ -202,19 +224,7 @@
 				swiperCur: 0,
 				circular: true,
 				attrValue: [],
-				options: [{
-						value: '0',
-						text: '取消推荐'
-					},
-					{
-						value: '1',
-						text: '店铺推荐'
-					},
-					{
-						value: '2',
-						text: '预览'
-					}
-				],
+				options: [],
 				//线下
 				show: false,
 				//单选示例
@@ -226,7 +236,10 @@
 					unique: "",
 					number: 1
 				},
-				on_line: ''
+				on_line: '',
+				isshow: false,
+				num: -1,
+				ll: 0
 			}
 		},
 		onLoad(options) {
@@ -235,7 +248,7 @@
 		},
 		onPullDownRefresh() {
 			this.where.page = 1
-			this.productList=[]
+			this.productList = []
 			this.loading = false
 			this.loaded = false
 			this.getList(this.mer_id);
@@ -249,31 +262,79 @@
 			this.getList(this.mer_id);
 		},
 		onHide() {
-			this.show = false
+			this.show = !this.show
 		},
 		methods: {
-			menuAction(action, rowId) {
-				// 忽略初始化时的传入的空操作
-				if (action === '') {
-					return
+			menuActiona(item, index) {
+				if (item.is_good) {
+					this.options = [{
+							value: '1',
+							text: '取消推荐'
+						},
+
+						{
+							value: '2',
+							text: '预览'
+						},
+						{
+							value: '3',
+							text: '删除'
+						}
+					]
+				} else {
+					this.options = [{
+							value: '5',
+							text: '店铺推荐'
+						},
+						{
+							value: '2',
+							text: '预览'
+						},
+						{
+							value: '3',
+							text: '删除'
+						}
+					]
 				}
-				 console.log(action, rowId)
-			
-				
-				if (action == 2) {
-					uni.navigateTo({
-						url: `/pages/admin/goods_details/index?product_id=${this.checkboxList1[0].product_id}&product_type=0`
-					})
-				}else{
-					this.handleRecommend(rowId)
+				this.ll++
+				// console.log(this.ll)
+				if (this.ll % 2 == 0) {
+					this.$set(this, 'num', -1);
+					this.ll = 0
+				} else {
+					this.num = index
 				}
 
+
+
+			},
+			menuAction(action, rowId, item, index) {
+				// console.log(action, rowId, item,'1111111')
+
+
+
+
+				if (action.value == 2) {
+					uni.navigateTo({
+						url: `/pages/admin/goods_details/index?product_id=${item.product_id}&product_type=0`
+					})
+				} else if (action.value == 1 || action.value == 5) {
+					this.handleRecommend(item, index)
+
+				} else {
+					this.handleRecycle(item, index)
+				}
+
+			},
+
+			fnChange(e) {
+				this.optionVal = e
 			},
 			close() {
 				this.show = false
 			},
 			//线上
-			Fonline(item){
+			Fonline(item) {
 				navigateTo(1, '/pages/users/online_warehousing/index', {
 					mer_id: this.mer_id,
 					product_id: item.attrValue[0].product_id,
@@ -281,14 +342,15 @@
 				});
 			},
 			//线下
-			Fline(item){
-			
-			
+			Fline(item) {
+				this.checkboxList1 = item.attrValue
+
+
 				this.data.product_id = item.attrValue[0].product_id
 				this.data.unique = item.attrValue[0].unique
-				this.on_line =1
+				this.on_line = 1
 				this.show = true
-				
+
 			},
 			//导入
 			creat() {
@@ -306,7 +368,7 @@
 							this.$util.Tips({
 								title: res.message
 							})
-							this.productList = []
+
 							this.getList(this.mer_id);
 						}).catch(err => {
 							this.show = false
@@ -329,59 +391,59 @@
 							product_id: this.data.product_id,
 							unique: this.data.unique,
 
-            });
-          }
+						});
+					}
 
-        }
+				}
 
-      },
-      //规格
-      checkboxChange(n) {
-        this.data.unique = n
-        console.log(n);
-      },
-      radioChange(n) {
-        this.data.product_id = n.product_id
-        console.log(this.data);
-      },
-      // 跳转添加商品界面
-      jumpAddGoods() {
-        const data = getStorage('addGoodsFormData');
-        if (data && data.product_id) {
-          let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
-            'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils'
-          ];
-          waitDeleteData.forEach(item => {
-            if (getStorage(item)) {
-              removeStorage(item);
-            }
-          })
-        }
-        navigateTo(1, '/pages/product/addGoods/index', {
-          mer_id: this.mer_id
-        });
-      },
-      // swiper
-      swiperChange(e) {
-        let {
-          current,
-          source
-        } = e.detail;
-        if (source === 'touch') {
-          //根据官方 source 来进行判断swiper的change事件是通过什么来触发的，autoplay是自动轮播。touch是用户手动滑动。其他的就是未知问题。抖动问题主要由于未知问题引起的，所以做了限制，只有在自动轮播和用户主动触发才去改变current值，达到规避了抖动bug
-          this.swiperCur = e.detail.current;
-        }
-      },
-      getList: function(mer_id) {
-        var that = this;
-        if (that.loading || that.loaded) return;
-        that.loading = true;
-        productLstApi(mer_id, that.where).then(
-          res => {
-            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;
+			},
+			//规格
+			checkboxChange(n) {
+				this.data.unique = n
+				console.log(n);
+			},
+			radioChange(n) {
+				this.data.product_id = n.product_id
+				console.log(this.data);
+			},
+			// 跳转添加商品界面
+			jumpAddGoods() {
+				const data = getStorage('addGoodsFormData');
+				if (data && data.product_id) {
+					let waitDeleteData = ['addGoodsFormData', 'singleSpecification', 'attrValue', 'modifyPriceData',
+						'addGoodsSecoundData', 'goodsDis', 'editGoodsDetils'
+					];
+					waitDeleteData.forEach(item => {
+						if (getStorage(item)) {
+							removeStorage(item);
+						}
+					})
+				}
+				navigateTo(1, '/pages/product/addGoods/index', {
+					mer_id: this.mer_id
+				});
+			},
+			// swiper
+			swiperChange(e) {
+				let {
+					current,
+					source
+				} = e.detail;
+				if (source === 'touch') {
+					//根据官方 source 来进行判断swiper的change事件是通过什么来触发的，autoplay是自动轮播。touch是用户手动滑动。其他的就是未知问题。抖动问题主要由于未知问题引起的，所以做了限制，只有在自动轮播和用户主动触发才去改变current值，达到规避了抖动bug
+					this.swiperCur = e.detail.current;
+				}
+			},
+			getList: function(mer_id) {
+				var that = this;
+				if (that.loading || that.loaded) return;
+				that.loading = true;
+				productLstApi(mer_id, that.where).then(
+					res => {
+						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;
 
 					},
 					error => {
@@ -424,8 +486,11 @@
 							}, () => {
 								that.productList.splice(index, 1);
 							});
+							this.$set(this, 'num', -1);
 						})
 						.catch(rej => {
+
+							this.$set(this, 'num', -1);
 							Toast(`${rej}, 加入回收站失败`);
 						});
 				});
@@ -471,12 +536,12 @@
 				});
 			},
 			//设置推荐
-			handleRecommend(item) {
+			handleRecommend(item, index) {
 				let that = this
-			
+
 				let is_good = item.is_good ? 0 : 1
-				
-				productRecommendApi(that.mer_id,  item[0].product_id, {
+
+				productRecommendApi(that.mer_id, item.product_id, {
 					is_good: is_good
 				}).then((res) => {
 					that.$util.Tips({
@@ -485,7 +550,9 @@
 					}, () => {
 						that.$set(item, 'is_good', item.is_good == 0 ? 1 : 0);
 					});
+					this.$set(this, 'num', -1);
 				}).catch(err => {
+					this.$set(this, 'num', -1);
 					return that.$util.Tips({
 						title: err
 					});
@@ -495,349 +562,375 @@
 				this.current = index
 			},
 		},
-	
+
 	}
 </script>
 
 <style scoped lang="scss">
-  page {
-    background-color: #F5F5F5;
-  }
+	page {
+		background-color: #F5F5F5;
+	}
 
-  .order-index {
-    background-image: url('data:image/png;base64,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');
-    background-repeat: no-repeat;
-    background-size: 100%;
-  }
+	.muau-header {
 
-  .popupn {
-    position: fixed;
-    width: 100%;
-    text-align: center;
-    top: 0;
-    left: 0;
-    background: transparent;
-    height: 90rpx;
-    line-height: 90rpx;
-    z-index: 5;
+		margin-top: 20rpx;
+		background-color: #ffffff;
+		height: 220rpx;
+		border-radius: 12px;
+		z-index: 10;
+		box-shadow: 0 0 7px #a3a3a3;
+		padding-top: 20rpx;
 
-    .spin {
-      display: block;
-      transform: rotate(180deg);
-      font-size: 36rpx;
-    }
+		.muau {
 
-    .title {
-      max-width: 560rpx;
-      margin: 0 auto;
-      position: relative;
-      display: inline;
-      padding: 10rpx 30rpx 10rpx 50rpx;
-      background-color: rgba(0, 0, 0, .25);
-      border-radius: 30rpx;
-      color: #FFFFFF;
-    }
+			height: 40rpx;
+			width: 160rpx;
+			text-align: center;
 
-    .iconfont {
-      display: inline-block;
-      position: relative;
-      top: 4rpx;
-      right: 0;
-    }
+			margin-top: 20rpx;
 
-    .mer_logo {
-      width: 34rpx;
-      height: 34rpx;
-      position: relative;
-      top: 6rpx;
-      right: 10px;
-    }
+			view:hover {
+				color: red
+			}
 
-    .mer_name {
-      display: inline-block;
-      max-width: 650rpx;
-    }
+		}
 
-    .invoice-content {
-      background-color: #ffffff;
-    }
-  }
+	}
 
-  /deep/.uni-swiper-slides {
-    inset: 0 !important;
-  }
+	.order-index {
+		background-image: url('data:image/png;base64,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');
+		background-repeat: no-repeat;
+		background-size: 100%;
+	}
 
-  uni-swiper,
-  swiper {
-    height: 200rpx;
-  }
+	.popupn {
+		position: fixed;
+		width: 100%;
+		text-align: center;
+		top: 0;
+		left: 0;
+		background: transparent;
+		height: 90rpx;
+		line-height: 90rpx;
+		z-index: 5;
 
-  .header {
-    padding-top: 40rpx;
-    margin: 0 20rpx;
+		.spin {
+			display: block;
+			transform: rotate(180deg);
+			font-size: 36rpx;
+		}
 
-    .header_count {
-      width: 710rpx;
-      padding: 30rpx 30rpx 0;
-      background: #ffffff;
-      border-radius: 10rpx;
-      position: relative;
-    }
+		.title {
+			max-width: 560rpx;
+			margin: 0 auto;
+			position: relative;
+			display: inline;
+			padding: 10rpx 30rpx 10rpx 50rpx;
+			background-color: rgba(0, 0, 0, .25);
+			border-radius: 30rpx;
+			color: #FFFFFF;
+		}
 
-    .item {
-      display: inline-block;
-      width: 130rpx;
-      text-align: center;
+		.iconfont {
+			display: inline-block;
+			position: relative;
+			top: 4rpx;
+			right: 0;
+		}
 
-      .image {
-        width: 84rpx;
-        height: 84rpx;
-      }
+		.mer_logo {
+			width: 34rpx;
+			height: 34rpx;
+			position: relative;
+			top: 6rpx;
+			right: 10px;
+		}
 
-      .text {
-        display: block;
-        text-align: center;
-        color: #666666;
-        font-size: 24rpx;
-        margin-top: 18rpx;
-      }
-    }
-  }
+		.mer_name {
+			display: inline-block;
+			max-width: 650rpx;
+		}
 
-  /deep/.uni-swiper-slides {
-    width: 650rpx;
-  }
+		.invoice-content {
+			background-color: #ffffff;
+		}
+	}
 
-  /deep/.uni-swiper-dot {
-    width: 15rpx;
-    height: 5rpx;
-  }
+	/deep/.uni-swiper-slides {
+		inset: 0 !important;
+	}
 
-  /deep/.uni-swiper-dots-horizontal .uni-swiper-dot {
-    margin-right: 0;
-  }
+	uni-swiper,
+	swiper {
+		height: 200rpx;
+	}
 
-  .product_list {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    width: 100%;
-    padding: 0 20rpx;
+	.header {
+		padding-top: 40rpx;
+		margin: 0 20rpx;
 
-    .item {
-      position: relative;
-      display: flex;
-      align-items: center;
-      width: 100%;
-      padding: 30rpx 20rpx;
-      border-radius: 0;
-      margin-bottom: 0;
-      background: #ffffff;
-      margin-top: 30rpx;
-      border-radius: 10rpx 10rpx 0 0;
+		.header_count {
+			width: 710rpx;
+			padding: 30rpx 30rpx 0;
+			background: #ffffff;
+			border-radius: 10rpx;
+			position: relative;
+		}
 
-      .image,
-      image {
-        width: 150rpx;
-        height: 150rpx;
-        border-radius: 16rpx;
-        position: relative;
+		.item {
+			display: inline-block;
+			width: 130rpx;
+			text-align: center;
 
-        .spec {
-          color: #ffffff;
-          background: rgba(0, 0, 0, 0.5);
-          border-radius: 16rpx 0 16rpx 0;
-          text-align: center;
-          font-size: 18rpx;
-          display: inline-block;
-          width: 84rpx;
-          line-height: 30rpx;
-          position: absolute;
-          bottom: 0;
-          right: 0;
-        }
+			.image {
+				width: 84rpx;
+				height: 84rpx;
+			}
 
-        uni-image {
-          width: 150rpx;
-          height: 150rpx;
-          border-radius: 16rpx;
-        }
-      }
+			.text {
+				display: block;
+				text-align: center;
+				color: #666666;
+				font-size: 24rpx;
+				margin-top: 18rpx;
+			}
+		}
+	}
 
-      .text {
-        position: relative;
-        flex: 1;
-        min-width: 0;
-        padding: 10rpx 10rpx 20rpx 30rpx;
+	/deep/.uni-swiper-slides {
+		width: 650rpx;
+	}
 
-        .name {
-          color: #282828;
-          font-size: 30rpx;
-          font-family: "PingFang SC";
-          display: flex;
-          align-items: center;
-        }
+	/deep/.uni-swiper-dot {
+		width: 15rpx;
+		height: 5rpx;
+	}
 
-        .text_name {
-          display: inline-block;
-          max-width: 400rpx;
-        }
+	/deep/.uni-swiper-dots-horizontal .uni-swiper-dot {
+		margin-right: 0;
+	}
 
-        .font-org {
-          background-color: #FC8327;
+	.product_list {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		width: 100%;
+		padding: 0 20rpx;
 
-          display: inline-block;
-          color: #fff;
-          font-size: 16rpx;
-          text-align: center;
-          border-radius: 5rpx;
-          padding: 0 4rpx;
-          line-height: 28rpx;
-          margin-right: 8rpx;
-        }
+		.item {
+			position: relative;
+			display: flex;
+			align-items: center;
+			width: 100%;
+			padding: 30rpx 20rpx;
+			border-radius: 0;
+			margin-bottom: 0;
+			background: #ffffff;
+			margin-top: 30rpx;
+			border-radius: 10rpx 10rpx 0 0;
 
-        .money-wrap {
-          margin-top: 20rpx;
+			.image,
+			image {
+				width: 150rpx;
+				height: 150rpx;
+				border-radius: 16rpx;
+				position: relative;
 
-          .price {
-            font-size: 30rpx;
-            display: inline-block;
-            margin-right: 15rpx;
-          }
+				.spec {
+					color: #ffffff;
+					background: rgba(0, 0, 0, 0.5);
+					border-radius: 16rpx 0 16rpx 0;
+					text-align: center;
+					font-size: 18rpx;
+					display: inline-block;
+					width: 84rpx;
+					line-height: 30rpx;
+					position: absolute;
+					bottom: 0;
+					right: 0;
+				}
 
-          .ot_price {
-            color: #bebebe;
-            font-size: 26rpx;
-            text-decoration: line-through;
-          }
-        }
+				uni-image {
+					width: 150rpx;
+					height: 150rpx;
+					border-radius: 16rpx;
+				}
+			}
 
-        .sales {
-          margin-top: 20rpx;
-          color: #868686;
-          font-size: 22rpx;
+			.text {
+				position: relative;
+				flex: 1;
+				min-width: 0;
+				padding: 10rpx 10rpx 20rpx 30rpx;
 
-          .num {
-            display: inline-block;
-            margin-right: 20rpx;
-          }
-        }
-      }
-    }
+				.name {
+					color: #282828;
+					font-size: 30rpx;
+					font-family: "PingFang SC";
+					display: flex;
+					align-items: center;
+				}
 
-    .operation {
-      padding: 20upx 10px;
-      background: #ffffff;
-      width: 100%;
-      border-radius: 0 0 10rpx 10rpx;
+				.text_name {
+					display: inline-block;
+					max-width: 400rpx;
+				}
 
-      .bnt {
-        font-size: 26rpx;
-        color: #999999;
-        width: 120rpx;
-        height: 58rpx;
-        border-radius: 30rpx;
-        border: 1px solid #999999;
-        text-align: center;
-        line-height: 58rpx;
+				.font-org {
+					background-color: #FC8327;
 
-        ~.bnt {
-          margin-left: 18rpx;
-        }
+					display: inline-block;
+					color: #fff;
+					font-size: 16rpx;
+					text-align: center;
+					border-radius: 5rpx;
+					padding: 0 4rpx;
+					line-height: 28rpx;
+					margin-right: 8rpx;
+				}
 
-        &.bnt_recommend {
-          width: 160rpx;
-          color: #ffffff;
-          background: linear-gradient(135deg, #FD6523 0%, #E93323 100%);
-          border-color: transparent;
-        }
-      }
-    }
+				.money-wrap {
+					margin-top: 20rpx;
 
-    .acea-row.row-between-wrapper {
-      justify-content: flex-end;
-    }
-  }
+					.price {
+						font-size: 30rpx;
+						display: inline-block;
+						margin-right: 15rpx;
+					}
 
-  .genduo {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border: 1px solid #999999;
-    border-radius: 10px;
-    width: 30px;
-    height: 10px;
+					.ot_price {
+						color: #bebebe;
+						font-size: 26rpx;
+						text-decoration: line-through;
+					}
+				}
 
-    .gen_sel {
-      font-size: 12px
-    }
-  }
+				.sales {
+					margin-top: 20rpx;
+					color: #868686;
+					font-size: 22rpx;
 
-  .popen {
-    position: absolute;
-    top: 110px;
-    width: 100%;
-    margin: auto;
-    padding: 10px;
-    z-index: 0;
+					.num {
+						display: inline-block;
+						margin-right: 20rpx;
+					}
+				}
+			}
+		}
 
-    h4 {
-      font-weight: 400;
-      font-size: 20px;
-      padding: 5px;
-      text-align: center;
-    }
+		.operation {
+			padding: 20upx 10px;
+			background: #ffffff;
+			width: 100%;
+			border-radius: 0 0 10rpx 10rpx;
 
-    .guige {
-      margin: 10px 0 10px 20px;
+			.bnt {
+				font-size: 26rpx;
+				color: #999999;
+				width: 120rpx;
+				height: 58rpx;
+				border-radius: 30rpx;
+				border: 1px solid #999999;
+				text-align: center;
+				line-height: 58rpx;
 
-      .scroll_y {
-        max-height: 150px;
-      }
-    }
+				~.bnt {
+					margin-left: 18rpx;
+				}
 
-    .guiges {
-      height: 100px;
-      margin: 10px 0 10px 20px;
-    }
+				&.bnt_recommend {
+					width: 160rpx;
+					color: #ffffff;
+					background: linear-gradient(135deg, #FD6523 0%, #E93323 100%);
+					border-color: transparent;
+				}
+			}
+		}
 
-    .shuru {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      padding: 5px;
-      margin-left: 20px;
+		.acea-row.row-between-wrapper {
+			justify-content: flex-end;
+		}
+	}
 
-      input {
-        background: #F5F5F5;
-        border-radius: 8px 8px 8px 8px;
-        border: 1px solid #999999;
-        padding-left: 3px;
-        margin-left: 3px;
-      }
+	.genduo {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border: 1px solid #999999;
+		border-radius: 10px;
+		width: 30px;
+		height: 10px;
 
-    }
+		.gen_sel {
+			font-size: 12px
+		}
+	}
 
-    .btn {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      margin: 10px;
+	.popen {
+		position: absolute;
+		top: 110px;
+		width: 100%;
+		margin: auto;
+		padding: 10px;
+		z-index: 0;
 
-      .btn_l {
-        padding: 5px;
-        width: 100px;
-        border-radius: 4px;
-      }
+		h4 {
+			font-weight: 400;
+			font-size: 20px;
+			padding: 5px;
+			text-align: center;
+		}
 
-      .btn_r {
-        width: 100px;
-        padding: 5px;
-        border-radius: 4px;
-        background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
-        border-radius: 27px 27px 27px 27px;
-        color: white;
-      }
-    }
-  }
+		.guige {
+			margin: 10px 0 10px 20px;
+
+			.scroll_y {
+				max-height: 150px;
+			}
+		}
+
+		.guiges {
+			height: 100px;
+			margin: 10px 0 10px 20px;
+		}
+
+		.shuru {
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			padding: 5px;
+			margin-left: 20px;
+
+			input {
+				background: #F5F5F5;
+				border-radius: 8px 8px 8px 8px;
+				border: 1px solid #999999;
+				padding-left: 3px;
+				margin-left: 3px;
+			}
+
+		}
+
+		.btn {
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin: 10px;
+
+			.btn_l {
+				padding: 5px;
+				width: 100px;
+				border-radius: 4px;
+			}
+
+			.btn_r {
+				width: 100px;
+				padding: 5px;
+				border-radius: 4px;
+				background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+				border-radius: 27px 27px 27px 27px;
+				color: white;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 8255da7..877bf14 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -539,7 +539,7 @@
 				this.street_id = e.value[1].code
 				this.town = e.value[1].name
 				this.productList=[]
-				this.list(this.street_id)
+				this.list(true,this.street_id)
 			},
 			selfLocation() {
 				if (uni.getStorageSync('loction') == true) {
diff --git a/pages/trading_hall/adddiscounts/index.vue b/pages/trading_hall/adddiscounts/index.vue
index 1dd6cfb..8a85112 100644
--- a/pages/trading_hall/adddiscounts/index.vue
+++ b/pages/trading_hall/adddiscounts/index.vue
@@ -373,14 +373,8 @@
 			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then(res => {
-
-
-
 					this.merId = res.data.service.mer_id
-
 				})
-
-
 			},
 			// 是否包邮选择
 			deliveryFreeChange(val) {
diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue
index 63577c1..55fe401 100644
--- a/pages/users/order_list/indexCopy.vue
+++ b/pages/users/order_list/indexCopy.vue
@@ -680,11 +680,11 @@
 				 * 提示
 				 */
 				dePay() {
-					
+
 					uni.showModal({
 						title: '提示',
-					title: '该订单属于先货后款的订单，等商户确认后才能支付',
-						success: function (res) {
+						title: '该订单属于先货后款的订单，等商户确认后才能支付',
+						success: function(res) {
 							if (res.confirm) {
 								console.log('用户点击确定');
 							} else if (res.cancel) {
@@ -692,7 +692,7 @@
 							}
 						}
 					});
-					
+
 				},
 				/**
 				 * 点击去评价