Merge branch 'master' of http://39.101.143.165:8090/hxl13994548489/LocalLivingServicesUniapp into master-pro

pages/groupMeal/goods/list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page-container">
 		<!-- 导航栏 -->
-		<u-navbar :autoBack="true" :placeholder="true" :border-bottom="false">
+		<u-navbar :custom-back="goHome" :placeholder="true" :border-bottom="false">
 			<view class="navbar-title">团餐商品列表</view>
 			<view slot="right" class="navbar-right">
 				<text class="nav-btn" @click="addGoods">添加商品</text>
@@ -259,6 +259,12 @@ export default {
 		this.getData();
 	},
 	methods: {
+		// 返回首页
+		goHome() {
+			uni.switchTab({
+				url: '/pages/index/index'
+			});
+		},
 		// 商品数据
 		getData() {
 			uni.showLoading({

pages/groupMeal/orders/order-details.vue

@@ -13,11 +13,11 @@
 					<!-- <text>¥{{product.costPrice}}</text> -->
 				</view>
 				<!-- 退款中 -->
-				<view class="span" v-if="product.fundStatus == 2">
+				<!-- <view class="span" v-if="product.fundStatus == 2">
 					商家同意退款，处理时间：{{ product.refundTime }}
-				</view>
+				</view> -->
 				<!-- 退款失败 -->
-				<view class="span" v-else-if="product.fundStatus == 3">
+				<view class="span" v-if="product.fundStatus == 3">
 					商家拒绝退款，处理时间：{{ product.refundTime }}
 				</view>
 				<!-- 退款成功 -->
@@ -43,7 +43,7 @@
 					<view class="box">
 						<view class="name">{{ product.packageName }}</view>
 						<view class="price">
-							<text class="p">¥<text class="v">{{ product.price }}</text>/份</text>
+							<text class="p">¥<text class="v">{{ product.priceEach }}</text>/份</text>
 							<text class="r">实付款：<text class="p">¥<text class="v">{{ product.price }}</text></text></text>
 						</view>
 					</view>