From e912c7550213ce900c689dfde44439318171267c Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 28 Nov 2024 22:27:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                                           |  2 +-
 mixins/product.js                                   |  2 +-
 pages/index/index.vue                               | 16 +++++++++++++---
 pages/index/product.vue                             |  4 ++++
 pages_order/components/product/submit.vue           |  3 ++-
 pages_order/components/product/submitUnitSelect.vue | 13 ++++++++++---
 6 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/config.js b/config.js
index 3379f1a..ca65835 100644
--- a/config.js
+++ b/config.js
@@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置
diff --git a/mixins/product.js b/mixins/product.js
index fedb612..ddb3a82 100644
--- a/mixins/product.js
+++ b/mixins/product.js
@@ -11,7 +11,7 @@ export default {
 			return [2].includes(detail.className)
 		},
 		isProductPrice(detail){
-			return [0, 1].includes(detail.className)
+			return [0, 1, 3].includes(detail.className)
 		},
 	}
 }
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index aad3555..09d5290 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -76,7 +76,10 @@
 			<scroll-view scroll-x="true">
 				<view class="life">
 
-					<view class="mouse" @click="menuClick(item.url)" :key="index" v-for="(item, index) in menu">
+					<view class="mouse" 
+					@click="menuClick(item.url)" 
+					v-if="index < 9"
+					:key="index" v-for="(item, index) in menu">
 						<view class="RentingAhouseimg">
 							<image :src="item.icon" mode=""></image>
 						</view>
@@ -85,8 +88,15 @@
 						</view>
 					</view>
 
-					<view class="more"  @click="menuClick(item.url)" >
-						更多
+					<view class="more" 
+					v-if="menu.length > 8"
+					@click="menuClick(item.url)" >
+						<view class="RentingAhouseimg">
+							<image src="" mode=""></image>
+						</view>
+						<view class="RentingAhouse">
+							更多
+						</view>
 					</view>
 				</view>
 			</scroll-view>
diff --git a/pages/index/product.vue b/pages/index/product.vue
index 1dcd686..599ca56 100644
--- a/pages/index/product.vue
+++ b/pages/index/product.vue
@@ -143,6 +143,10 @@
 						name : '积分商城',
 						value : 2,
 					},
+					{
+						name : '二手集市',
+						value : 3,
+					},
 				],
 			}
 		},
diff --git a/pages_order/components/product/submit.vue b/pages_order/components/product/submit.vue
index 46d6951..def10d2 100644
--- a/pages_order/components/product/submit.vue
+++ b/pages_order/components/product/submit.vue
@@ -62,8 +62,9 @@
 			}
 		},
 		methods: {
+			// 美食商城、二手集市
 			submit(){
-				if(this.detail.className == 0){
+				if([0, 3].includes(this.detail.className)){
 					uni.navigateTo({
 						url: '/pages_order/gourmet/gourmetDetail?id=' + this.detail.shopId
 					})
diff --git a/pages_order/components/product/submitUnitSelect.vue b/pages_order/components/product/submitUnitSelect.vue
index 180f23a..bd2fa4c 100644
--- a/pages_order/components/product/submitUnitSelect.vue
+++ b/pages_order/components/product/submitUnitSelect.vue
@@ -33,13 +33,15 @@
 					mode=""></image>
 					
 					<view class="info">
-						<view class="price">
+						<view class="price"
+						v-if="isProductPrice(detail)">
 							价格￥<text>{{ detail.price }}</text>元
 						</view>
 						<!-- <view class="unit">
 							请选择规格
 						</view> -->
-						<view class="favorable" v-if="detail.points">
+						<view class="favorable"
+						v-if="isProductPoint(detail)">
 							<view class="t">
 								积分兑换
 							</view>
@@ -76,9 +78,14 @@
 				<view class="title">
 					费用明细
 				</view>
-				<view class="detail">
+				<view class="detail"
+				v-if="isProductPoint(detail)">
 					积分：{{ detail.points }}
 				</view>
+				<view class="detail"
+				v-if="isProductPrice(detail)">
+					金额：{{ detail.price }}
+				</view>
 			</view>