From 17b259fd3a38066151bd12db393a5f74580959fc Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Mon, 14 Apr 2025 09:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jiuyi2/common/js/config.js               |  4 ++--
 jiuyi2/components/shop/detail/detail.vue |  4 ++++
 jiuyi2/manifest.json                     |  4 ++--
 jiuyi2/pages/release/commodity.vue       | 20 ++++++++++++++------
 jiuyi2/pages/shop/gift.vue               |  5 ++---
 jiuyi2/pages/shop/shop.vue               | 16 +++++++++++++---
 jiuyi2/vite.config.js                    |  4 ++--
 7 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index 7a0f6484..7b93c528 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -6,9 +6,9 @@ const config = {
 	// host: 'h5api',
 	// #endif
 	// #ifndef H5
-	// host: 'http://91f.xyz:8080',
+	host: 'http://91f.xyz:8080',
 	// host: 'http://liuyd.cpolar.top',
-	host: 'http://5vpc5z.natappfree.cc',
+	// host: 'http://5vpc5z.natappfree.cc',
 	// #endif
 	// 是否vivo显示
 	showVivo: true,
diff --git a/jiuyi2/components/shop/detail/detail.vue b/jiuyi2/components/shop/detail/detail.vue
index 748b73fa..9d4b36c6 100644
--- a/jiuyi2/components/shop/detail/detail.vue
+++ b/jiuyi2/components/shop/detail/detail.vue
@@ -362,6 +362,10 @@
 		<view class="content mt30">
 			<!-- <rich-text :nodes="infoRichText" v-if="infoRichText" /> -->
 			<parseRichText :imageProp="{'mode': 'widthFix',}" :content="infoRichText" v-if="infoRichText" />
+
+			<template v-if="giftPack">
+				<text class="f28 mt10 cFF4242">礼包商品不支持售后</text>
+			</template>
 		</view>
 	</view>
 </template>
diff --git a/jiuyi2/manifest.json b/jiuyi2/manifest.json
index 058e5ea3..bb227e8a 100644
--- a/jiuyi2/manifest.json
+++ b/jiuyi2/manifest.json
@@ -2,8 +2,8 @@
     "name" : "九亿",
     "appid" : "__UNI__08B31BC",
     "description" : "",
-    "versionName" : "1.0.17",
-    "versionCode" : 1017,
+    "versionName" : "1.0.18",
+    "versionCode" : 1018,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/jiuyi2/pages/release/commodity.vue b/jiuyi2/pages/release/commodity.vue
index b9dc729f..14841dff 100644
--- a/jiuyi2/pages/release/commodity.vue
+++ b/jiuyi2/pages/release/commodity.vue
@@ -33,7 +33,9 @@
 	// 分类下标
 	const categoryIndex = ref('')
 	// 当前选择的分类
-	const cateCurrent = computed(() => category[categoryIndex.value] || {categoryCode: ''})
+	const cateCurrent = computed(() => category[categoryIndex.value] || {
+		categoryCode: ''
+	})
 
 	onLoad((option) => {
 		if (option.id) {
@@ -184,9 +186,14 @@
 		let index = ev.detail.value
 		if (index === categoryIndex.value) return
 		categoryIndex.value = index
-		form.categoryId = category[categoryIndex.value].id
+		// 当前分类项
+		const cateItem = category[categoryIndex.value]
+		form.categoryId = cateItem.id
 		// 如果是礼包商品
-		if(category[categoryIndex.value].categoryCode !== 'GIFT_PACK') form.price = category[categoryIndex.value].offeringPrice
+		if (cateItem.categoryCode !== 'GIFT_PACK') {
+			form.price = cateItem.offeringPrice
+			form.commission = form.commission = cateItem.sharePrice
+		}
 	}
 
 	// 发布商品
@@ -214,7 +221,7 @@
 		}
 
 		// 如果不是礼包商品
-		if (!cateCurrent.categoryCode.startsWith('GIFT_PACK')) {
+		if (!cateCurrent.value.categoryCode.startsWith('GIFT_PACK')) {
 			if (!data.cost) {
 				util.alert('商品成本价不能为空')
 				return
@@ -348,8 +355,8 @@
 				<view class="line rows ptb20">
 					<view class="title w150">商品价格</view>
 					<view class="col f1">
-						<input type="text" v-model="form.price" placeholder="输入价格"
-							placeholder-class="placeholderStyle" :disabled="cateCurrent.categoryCode.startsWith('GIFT_PACK')" />
+						<input type="text" v-model="form.price" placeholder="输入价格" placeholder-class="placeholderStyle"
+							:disabled="cateCurrent.categoryCode.startsWith('GIFT_PACK')" />
 					</view>
 				</view>
 
@@ -361,6 +368,7 @@
 								placeholder-class="placeholderStyle" />
 						</view>
 					</view>
+
 					<view class="line rows ptb20">
 						<view class="title w150">出让佣金</view>
 						<view class="col f1">
diff --git a/jiuyi2/pages/shop/gift.vue b/jiuyi2/pages/shop/gift.vue
index 63b74346..cecadf3c 100644
--- a/jiuyi2/pages/shop/gift.vue
+++ b/jiuyi2/pages/shop/gift.vue
@@ -93,14 +93,13 @@
 
 <template>
 	<view class="app">
-
 		<!-- 公告 -->
-		<swiper class="notice c333 f28" vertical="true">
+		<!-- <swiper class="notice c333 f28" vertical="true">
 			<swiper-item class="item bsb rows plr20" v-for="(item, index) in 2" :key="index">
 				<image class="icon" src="/static/notice.png" mode="aspectFit" />
 				<view class="f1 mlr20">九亿商城上线啦~</view>
 			</swiper-item>
-		</swiper>
+		</swiper> -->
 
 		<!-- 礼包专区 -->
 		<view class="tab bfff">
diff --git a/jiuyi2/pages/shop/shop.vue b/jiuyi2/pages/shop/shop.vue
index d93cbcd6..572de530 100644
--- a/jiuyi2/pages/shop/shop.vue
+++ b/jiuyi2/pages/shop/shop.vue
@@ -122,12 +122,22 @@
 		// 重载列表
 		proxy.$refs.product.refreshList()
 	}
+
+	/**
+	 * 更新
+	 * @param {Object} item
+	 */
+	function handleGiftCate(item) {
+		uni.navigateTo({
+			url: '/pages/shop/gift'
+		})
+	}
 </script>
 
 <template>
 	<view class="appbw">
 		<!-- 轮播图 -->
-		<swiper class="banner oh" autoplay="true">
+		<!-- <swiper class="banner oh" autoplay="true">
 			<swiper-item v-for="(item, index) in 3" :key="index">
 				<view class="item">
 					<image class="poster"
@@ -135,10 +145,10 @@
 						mode="aspectFill" />
 				</view>
 			</swiper-item>
-		</swiper>
+		</swiper> -->
 
 		<view class="gift mtb30">
-			<view class="item fdc fmid" v-for="(item,index) in giftCateList" :key="index">
+			<view class="item fdc fmid" v-for="(item,index) in giftCateList" :key="index" @click="handleGiftCate(item)">
 				<image class="icon" :src="item.image" mode="aspectFill" />
 				<view class="mt10 c333 f28">{{item.name}}</view>
 			</view>
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index d4f39e1e..4d2dc155 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -3,9 +3,9 @@ import {
 } from 'vite';
 import uni from '@dcloudio/vite-plugin-uni';
 
-// let target = 'http://91f.xyz:8080'
+let target = 'http://91f.xyz:8080'
 // let target = 'http://liuyd.cpolar.top'
-let target = 'http://5vpc5z.natappfree.cc'
+// let target = 'http://7vs3pa.natappfree.cc'
 
 export default defineConfig({
 	plugins: [uni()],