合并代码

jiuyi2/common/js/config.js

@@ -7,9 +7,7 @@ const config = {
 	// #endif
 	// #ifndef H5
 	host: 'http://91f.xyz:8080',
-	// host: 'http://6t42vi.natappfree.cc',
+	// host: 'http://25f49356.r24.cpolar.top',
-	// host: 'http://nrpnpc.natappfree.cc',
-	// host: 'http://6aa4a4c3.r24.cpolar.top',
 	// #endif
 	// 支付方式配置
 	payType: {

jiuyi2/components/index/indexVideo.vue

@@ -626,13 +626,17 @@
 
 				<view class="df fdc jcsb f1">
 					<view class="name">
-						<text class="text cfff f28">{{item.productName}}</text>
+						<text class="text c333 f30">{{item.productName}}</text>
 					</view>
 					<view class="info df fdr aic mr10">
-						<text class="price mr10 cfff f28 b">￥{{item.productPrice}}</text>
+						<text class="price mr10 c333 f28 b">￥{{item.productPrice}}</text>
-						<text class="cfff f1 f20">已售{{item.sales}}单</text>
+						<text class="c666 f1 f20">已售{{item.sales}}单</text>
 						<!-- <uni-icons type="close" color="#fff" /> -->
 					</view>
+
+					<view class="btn sm warm">
+						<text class="cfff f24 tac">立即购买</text>
+					</view>
 				</view>
 			</view>
 
@@ -743,20 +747,20 @@
 
 	// 底部
 	.panelBottom {
-		padding-right: 150rpx;
+		padding-right: 100rpx;
 
 		// 图片
 		.image {
-			width: 100rpx;
+			width: 200rpx;
-			height: 100rpx;
+			height: 200rpx;
 		}
 
 		// 产品
 		.goods {
 			padding: 10rpx;
-			width: 480rpx;
+			width: 550rpx;
 			margin-bottom: 20rpx;
-			background-color: rgba(0, 0, 0, .3);
+			background-color: #fff;
 			opacity: 0;
 			transition-duration: .5s;
 

jiuyi2/pages/index/index.nvue

@@ -80,7 +80,7 @@
 		},
 	])
 	// tab下标
-	const tabIndex = ref(1)
+	const tabIndex = ref('')
 	// 起始值
 	const startY = ref(0)
 	// 上一个播放索引
@@ -143,8 +143,8 @@
 		discOffsetTop.value = systemInfo.safeAreaInsets.top + 44 + 30
 		// 特效完成高度
 		complete2Top.value = systemInfo.safeAreaInsets.top + 44 + 150
-		// 获取列表
+		// 推荐
-		tabCurrent.value.getList()
+		handle_tab(1)
 
 		// 判断是否提醒过闹铃
 		if (!uni.getStorageSync('alarmAlt')) {
@@ -258,7 +258,6 @@
 
 	// 重载推荐列表
 	function refreshRecList() {
-		console.log('refreshRecList')
 		recList.pageNum = 1
 		recList.total = 0
 		getRecList()
@@ -282,7 +281,7 @@
 				pageSize: recList.pageSize,
 			}
 		}).then(rs => {
-			console.log('getRecList then')
+			console.log('getRecList then', rs)
 			handleListData(rs, recList)
 		})
 	}
@@ -521,6 +520,7 @@
 			readSecondAdd()
 		}
 		tabIndex.value = index
+		console.log('load', tab[tabIndex.value].load)
 		// 根据是否加载过判断 播放还是获取
 		if (tabCurrent.value.load && proxy.$refs[`videoRef${index}`]) proxy.$refs[`videoRef${index}`][current[index]]
 			.play()

jiuyi2/pages/login/lock.vue

@@ -58,7 +58,7 @@
 
 <template>
 	<view class="container pr fmid fdc">
-		<view class="title f40 b">输入登录密码解锁未成年模式</view>
+		<view class="title f40 b">输入二级密码解锁未成年模式</view>
 
 		<view class="account mtb20 c666 f32">当前账号: {{userinfo.phoneNumber}}</view>
 

jiuyi2/pages/mine/setting/secondPwd.vue

@@ -41,6 +41,7 @@
 	const userinfo = computed(() => {
 		let result = store.state.userinfo
 		if (result.hasSecondCipher) mode.value = 'check'
+		console.log('userinfo', result)
 		return result
 	})
 
@@ -187,12 +188,19 @@
 		<view class="container ver mt10p" v-if="mode === 'check'">
 			<view class="title c333 f54">验证二级密码</view>
 			<view class="content mt50 c666 f32">请输入二级密码用于验证</view>
-			<view class="inputBox mt50 ptb10 plr30">
+
-				<input type="number" :maxlength="6" v-model="form.pwd" :focus="true" placeholder="六位数字密码" />
+			<view class="pwd">
+				<codeInput v-model:modelValue="form.rePwd" />
 			</view>
 
+<!-- 			<view class="inputBox mt50 ptb10 plr30">
+				<input type="number" :maxlength="6" v-model="form.pwd" :focus="true" placeholder="六位数字密码" />
+			</view> -->
+
 			<view class="btn lg black mtb50 plr50" @click="handleCheck">验证</view>
 		</view>
+
+		<view v-show="false">{{userinfo}}</view>
 	</view>
 
 	<!-- 安全键盘 -->

jiuyi2/pages/release/commodity.vue

@@ -38,6 +38,8 @@
 				form.id = detail.id
 				// 商品规格
 				form.categoryId = detail.categoryId
+				// 
+				form.categoryCode = detail.categoryCode
 				// 商品价格
 				form.price = detail.price
 				// 商品名称
@@ -167,6 +169,7 @@
 		if (index == categoryIndex.value) return
 		categoryIndex.value = index
 		form.categoryId = category[categoryIndex.value].id
+		form.categoryCode = category[categoryIndex.value].categoryCode
 	}
 
 	// 发布商品
@@ -208,7 +211,7 @@
 				<view class="imgList mt20">
 					<view class="imgs" v-for="(item,index) in form.sliderImage">
 						<image class="wh120 br10" :src="item" mode="aspectFill" />
-						<view class="close">
+						<view class="close" @click="removeImage(index)">
 							<uni-icons type="clear" color="#f00" size="40rpx" />
 						</view>
 					</view>

jiuyi2/vite.config.js

@@ -4,8 +4,8 @@ import {
 import uni from '@dcloudio/vite-plugin-uni';
 
 let target = 'http://91f.xyz:8080'
-// let target = 'http://nrpnpc.natappfree.cc'
+// let target = 'http://25f49356.r24.cpolar.top'
-// let target = 'http://6aa4a4c3.r24.cpolar.top'
+// let target = 'http://25f49356.r24.cpolar.top'
 
 export default defineConfig({
 	plugins: [uni()],