From adbc8d2e9c193ca60cda796639588184f2318eff Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Sat, 15 Jul 2023 12:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/orderGoods/index.vue          |  2 +-
 pages/columnGoods/goods_search/index.vue |  6 ++---
 pages/plantGrass/plant_detail/index.vue  | 22 +++++++++++++++++++
 pages/plant_release/index.vue            |  2 +-
 pages/product/addGoods/secound.vue       |  6 +++--
 pages/users/embody/embody.vue            |  5 +++++
 pages/users/gather_list/index.vue        | 23 +++++++++++++++++--
 pages/users/order_list/index.vue         | 28 ++++++++++++++++++++----
 8 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index a9fc3b5..7365404 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -73,7 +73,7 @@
 					<view class="right-btn-box">
 						<view class="btn-item err" v-if="item.is_refund ==1">退款中 x {{item.product_num - item.refund_num}}</view>
 						<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}</view>
-						<view class="btn-item" v-if="item.is_refund ==0 && evaluate!=9 && orderData.refund_status || item.refund_num > 0" @click.stop="refund(item)">申请退款</view>
+						<view class="btn-item" v-if="(item.is_refund ==0 && evaluate!=9 && orderData.refund_status || item.refund_num > 0)&& evaluate!=3" @click.stop="refund(item)">申请退款</view>
 						<view class='btn-item' v-if='item.is_reply==0 && evaluate==2 && item.refund_num > 0' @click.stop="evaluateTap(item.order_product_id,orderId)">去评价</view>
 						<view class='btn-item on' v-else-if="item.is_reply==1 && evaluate==2">已评价</view>
 					</view>
diff --git a/pages/columnGoods/goods_search/index.vue b/pages/columnGoods/goods_search/index.vue
index 3d663eb..4442f82 100644
--- a/pages/columnGoods/goods_search/index.vue
+++ b/pages/columnGoods/goods_search/index.vue
@@ -158,9 +158,9 @@
 				} else {
 					this.$set(this, 'searchValue', event);
 				}
-				this.$nextTick(() => {
-					this.focus = true
-				})
+				// this.$nextTick(() => {
+				// 	this.focus = true
+				// })
 				this.searchBut()
 			},
 			setValue: function(event) {
diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue
index 37d7269..f2d2d7f 100644
--- a/pages/plantGrass/plant_detail/index.vue
+++ b/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;
diff --git a/pages/plant_release/index.vue b/pages/plant_release/index.vue
index 7b601ae..e80428a 100644
--- a/pages/plant_release/index.vue
+++ b/pages/plant_release/index.vue
@@ -720,7 +720,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      z-index: 0;
+      z-index: 999;
 
       .iconfont {
         color: #ffffff;
diff --git a/pages/product/addGoods/secound.vue b/pages/product/addGoods/secound.vue
index 49f6306..646f8d5 100644
--- a/pages/product/addGoods/secound.vue
+++ b/pages/product/addGoods/secound.vue
@@ -199,8 +199,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')];
diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue
index 035d3b9..7b37327 100644
--- a/pages/users/embody/embody.vue
+++ b/pages/users/embody/embody.vue
@@ -443,6 +443,11 @@
 					console.log(res);
 				}).catch(err => {
 					Toast(err)
+					setTimeout(()=>{
+						uni.navigateBack({
+							delta: 1
+						})}, 1000)
+					
 				})
 			},
 			async postCreate(price) {
diff --git a/pages/users/gather_list/index.vue b/pages/users/gather_list/index.vue
index 1da4b49..48a6b72 100644
--- a/pages/users/gather_list/index.vue
+++ b/pages/users/gather_list/index.vue
@@ -8,7 +8,7 @@
 						<h3>提现次数</h3>
 					</view>
 					<view class="sum">
-						<u-count-to :startVal="0" :endVal="sum"></u-count-to>
+						<u-count-to :startVal="0" :endVal="sumTofixed" :decimals="2"></u-count-to>
 						<h3>提现总额</h3>
 					</view>
 				</view>
@@ -66,7 +66,11 @@
 				UserApplylist:[]
 			}
 		},
-		computed: {},
+		computed: {
+			sumTofixed(){
+				return this.returnFloat(this.sum)
+			}
+		},
 		watch: {
 
 		},
@@ -79,6 +83,21 @@
 			// })
 		},
 		methods: {
+			/**数字强制转为两位小数*/
+			 returnFloat(value){
+				var value=Math.round(parseFloat(value)*100)/100;
+				var xsd=value.toString().split(".");
+				if(xsd.length==1){
+				value=value.toString()+".00";
+				return value;
+				}
+				if(xsd.length>1){
+				if(xsd[1].length<2){
+					value=value.toString()+"0";
+				}
+				return value;
+			 }
+			},
 			tixian() {
 				uni.navigateBack({
 					delta: 1
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index c9812be..fa35b9e 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -1,7 +1,11 @@
 <template>
 	<view :style="viewColor">
+		<view class="head-menu">
+		  <view class='iconfont icon-xiangzuo' @click="returns"></view>
+		</view>
 		<view class='my-order'>
 			<view class='header'>
+				
 				<view class='picTxt acea-row row-between-wrapper'>
 					<view class='text'>
 						<view class='name'>订单信息</view>
@@ -217,18 +221,18 @@
 									<view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view>
 								</block>
 								<block v-if="item.status == 2">
-									<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
+								<!-- 	<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
 										<text class="iconfont icon-fabu"></text>
 										发布种草
-									</navigator>
+									</navigator> -->
 									<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价</view>
 								</block>
 								<block v-if="item.status == 3">
 									<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">查看详情</view>
-									<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
+									<!-- <navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
 										<text class="iconfont icon-fabu"></text>
 										发布种草
-									</navigator>
+									</navigator> -->
 									<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-else>再次购买</view>
 								</block>
 							</view>
@@ -371,6 +375,16 @@
 		mounted: function() {
 		},
 		methods: {
+			// 后退
+			returns() {
+			  uni.navigateBack()
+			},
+			// 首页
+			goHome() {
+			  uni.switchTab({
+			    url: '/pages/index/index'
+			  });
+			},
 			// 去商铺
 			goMall(item){
 				if(this.hide_mer_status == 0){
@@ -733,6 +747,12 @@
 </script>
 
 <style scoped lang="scss">
+	.head-menu{
+		height:50rpx;
+		padding-left: 20rpx;
+		line-height: 50rpx;
+		font-weight: bold;
+	}
 	.my-order .header {
 		height: 260rpx;
 		padding: 0 30rpx;