修改bug

config/api.js

@@ -6,9 +6,9 @@
 //const API_BASE = 'http://192.168.1.117:8089'
 
 // const API_BASE = 'http://192.168.1.145/newApi'
-// const API_BASE = 'http://192.168.1.117:8089'
+ //const API_BASE = 'http://192.168.1.117:8089'
 let API_BASE = 'https://starfire.jihengcc.cn/newApi'
-if(Date.parse(new Date())>1659571200000){
+if(Date.parse(new Date())>2660190400000){
 	API_BASE = 'https://xinghuolanqiu.com/newApi'
 }
 // const API_BASE = 'http://192.168.1.145/newApi'
@@ -126,9 +126,11 @@ module.exports = {
 	// 学员列表
 	giftStudentPage: API_BASE + '/v2/sale/center/giftStudentPage',
 	// 获取一级礼物
-	findVenueGiftOneList: API_BASE + '/v2/sale/center/findVenueGiftOneList',
+	findVenueGiftOneList: API_BASE + '/v2/sale/center/giftOneTypeList',
+	//findVenueGiftOneList: API_BASE + '/v2/sale/center/findVenueGiftOneList',
 	// 获取二级礼物
-	findVenueGiftTwoList: API_BASE + '/v2/sale/center/findVenueGiftTwoList',
+	findVenueGiftTwoList: API_BASE + '/v2/sale/center/giftTwoTypeList',
+	//findVenueGiftTwoList: API_BASE + '/v2/sale/center/findVenueGiftTwoList',
 	// 赠送
 	giveGiftStudent: API_BASE + '/v2/sale/center/giveGiftStudent',
 	// 不送

pagesMain/businessList.vue

@@ -26,7 +26,7 @@
 							<!-- <u-image width="28px" height="28px" :src="site.type == 2 ? iconPath1 : iconPath2"></u-image> -->
 						</view>
 						<view slot="foot" style="text-align: right;">
-							<u-button type="warning" :ripple="true" shape="circle" :custom-style="{...handleCustomStyle, marginRight: '5px'}" size="mini" @click="handleSaleShowClick(site)">分配</u-button>
+							<u-button v-if="applySaleFlag==2" type="warning" :ripple="true" shape="circle" :custom-style="{...handleCustomStyle, marginRight: '5px'}" size="mini" @click="handleSaleShowClick(site)">分配</u-button>
 <!-- 							<u-button type="warning" :ripple="true" shape="circle" :custom-style="{...handleCustomStyle, marginRight: '5px'}" size="mini" @click="handleUpdateClick(site)">修改</u-button>
 							<u-button type="warning" :ripple="true" shape="circle" :custom-style="handleCustomStyle" size="mini" @click="handleJumpSubscribeClick">预约体验</u-button> -->
 						</view>

pagesMain/giftApply.vue

@@ -58,9 +58,9 @@
 			</view>
 		</u-popup>
 		<!-- 商品 -->
-		<u-picker mode="selector" v-model="productShow" :range="productList" @confirm="handleSetProductClick" title="礼物" range-key="text"></u-picker>
+		<u-picker mode="selector" v-model="productShow" :range="productList" @confirm="handleSetProductClick" title="礼物" range-key="value"></u-picker>
 		<!-- 规格 -->
-		<u-picker mode="selector" v-model="specShow" :range="specList" @confirm="handleSetSpecClick" title="规格" range-key="text"></u-picker>
+		<u-picker mode="selector" v-model="specShow" :range="specList" @confirm="handleSetSpecClick" title="规格" range-key="value"></u-picker>
 		<u-top-tips ref="uTips" z-index="12000"></u-top-tips>
 	</view>
 </template>
@@ -164,7 +164,7 @@
 			},
 			handleSetProductClick(index) {
 				this.formInfo[this.giftIndex].signOneId = this.productList[index].id
-				this.formInfo[this.giftIndex].signOne = this.productList[index].text
+				this.formInfo[this.giftIndex].signOne = this.productList[index].value
 			},
 			handleShowSpecClick(index) {
 				this.giftIndex = index
@@ -175,10 +175,10 @@
 					})
 					return
 				}
-				const giftId = this.formInfo[this.giftIndex].signOneId
+				const id = this.formInfo[this.giftIndex].signOneId
 				const venueId = this.venueId
 				NET.request(API.findVenueGiftTwoList, {
-					giftId, venueId
+					id, venueId
 				}, 'POST').then(res => {
 					this.specList = res.data
 					this.specShow = true
@@ -186,7 +186,7 @@
 			},
 			handleSetSpecClick(index) {
 				this.formInfo[this.giftIndex].signTwoId = this.specList[index].id
-				this.formInfo[this.giftIndex].signTwo = this.specList[index].text
+				this.formInfo[this.giftIndex].signTwo = this.specList[index].value
 			},
 			handleGiftAddClick() {
 				this.formInfo.push({