From 86b12b853719e3e3de16822fd41d17799b091144 Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Thu, 13 Feb 2025 22:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jiuyi2/common/js/config.js | 4 +---
jiuyi2/components/index/indexVideo.vue | 20 ++++++++++++--------
jiuyi2/pages/index/index.nvue | 10 +++++-----
jiuyi2/pages/login/lock.vue | 2 +-
jiuyi2/pages/mine/setting/secondPwd.vue | 12 ++++++++++--
jiuyi2/pages/release/commodity.vue | 5 ++++-
jiuyi2/vite.config.js | 4 ++--
7 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index f0a386bf..000f8b79 100644
--- a/jiuyi2/common/js/config.js
+++ b/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://nrpnpc.natappfree.cc',
- // host: 'http://6aa4a4c3.r24.cpolar.top',
+ // host: 'http://25f49356.r24.cpolar.top',
// #endif
// 支付方式配置
payType: {
diff --git a/jiuyi2/components/index/indexVideo.vue b/jiuyi2/components/index/indexVideo.vue
index d340b574..d6cbc10d 100644
--- a/jiuyi2/components/index/indexVideo.vue
+++ b/jiuyi2/components/index/indexVideo.vue
@@ -626,13 +626,17 @@
- {{item.productName}}
+ {{item.productName}}
- ¥{{item.productPrice}}
- 已售{{item.sales}}单
+ ¥{{item.productPrice}}
+ 已售{{item.sales}}单
+
+
+ 立即购买
+
@@ -743,20 +747,20 @@
// 底部
.panelBottom {
- padding-right: 150rpx;
+ padding-right: 100rpx;
// 图片
.image {
- width: 100rpx;
- height: 100rpx;
+ width: 200rpx;
+ 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;
diff --git a/jiuyi2/pages/index/index.nvue b/jiuyi2/pages/index/index.nvue
index efd7523f..8ab5db7c 100644
--- a/jiuyi2/pages/index/index.nvue
+++ b/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()
diff --git a/jiuyi2/pages/login/lock.vue b/jiuyi2/pages/login/lock.vue
index 250f14de..6af0b6b0 100644
--- a/jiuyi2/pages/login/lock.vue
+++ b/jiuyi2/pages/login/lock.vue
@@ -58,7 +58,7 @@
- 输入登录密码解锁未成年模式
+ 输入二级密码解锁未成年模式
当前账号: {{userinfo.phoneNumber}}
diff --git a/jiuyi2/pages/mine/setting/secondPwd.vue b/jiuyi2/pages/mine/setting/secondPwd.vue
index 3cb2c9ce..fc619bab 100644
--- a/jiuyi2/pages/mine/setting/secondPwd.vue
+++ b/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 @@
验证二级密码
请输入二级密码用于验证
-
-
+
+
+
+
+
验证
+
+ {{userinfo}}
diff --git a/jiuyi2/pages/release/commodity.vue b/jiuyi2/pages/release/commodity.vue
index 58c50b2c..9ca842cb 100644
--- a/jiuyi2/pages/release/commodity.vue
+++ b/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 @@
-
+
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index a03904ff..91f94ecf 100644
--- a/jiuyi2/vite.config.js
+++ b/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://6aa4a4c3.r24.cpolar.top'
+// let target = 'http://25f49356.r24.cpolar.top'
+// let target = 'http://25f49356.r24.cpolar.top'
export default defineConfig({
plugins: [uni()],