Merge remote-tracking branch 'remotes/old/zmj' into old

pages/plantGrass/plant_detail/index.vue

@@ -1,5 +1,8 @@
 <template>
 	<view :style="viewColor">
+		<view class="head-menu">
+		  <view class='iconfont icon-xiangzuo' @click="returns"></view>
+		</view>
 		<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'">
@@ -255,6 +258,16 @@
 		},
 		mounted: function() {},
 		methods: {
+			// 后退
+			returns() {
+			  uni.navigateBack()
+			},
+			// 首页
+			goHome() {
+			  uni.switchTab({
+			    url: '/pages/index/index'
+			  });
+			},
 			//分享
 			//#ifdef MP
 			plantShare(){
@@ -354,6 +367,9 @@
 				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();
@@ -558,6 +574,12 @@
 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;

pages/product/addGoods/secound.vue

@@ -249,8 +249,10 @@
           video_link: this.addGoodsSecoundData.video_link
         };
 
-        postData.attrValue = attrValue.filter(item => item != '');
-        postData.attrValue[0].bar_code  
+       if(attrValue){
+       postData.attrValue = attrValue.filter(item => item != '');
+       postData.attrValue[0].bar_code 
+       }
 		// console.log(postData);
         if (getStorage('addGoodsFormData').spec_type == 0) {
           // postData.attr = [getStorage('singleSpecification')];

pages/users/embody/embody.vue

@@ -447,6 +447,11 @@
 					console.log(res);
 				}).catch(err => {
 					Toast(err)
+					setTimeout(()=>{
+						uni.navigateBack({
+							delta: 1
+						})}, 1000)
+					
 				})
 			},
 			async postCreate(price) {