From 4402fdd67af1572a95cfe07fe14934120abad82c Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Thu, 27 Feb 2025 14:53:04 +0800
Subject: [PATCH] =?UTF-8?q?2025.02.27=20=E5=B7=A5=E4=BD=9C=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jiuyi2/common/js/config.js | 3 ++-
jiuyi2/components/index/indexVideo.vue | 9 ++++-----
jiuyi2/pages/index/index.nvue | 20 ++++++++------------
jiuyi2/pages/index/videoHome.vue | 4 ++--
jiuyi2/pages/index/wallet/topUp.vue | 4 ++--
jiuyi2/pages/release/commodity.vue | 16 +++++++++++-----
jiuyi2/pages/release/video.vue | 16 +++++++++++++++-
jiuyi2/pages/shop/commodity/index.vue | 13 +++++++++++--
jiuyi2/pages/shop/commodity/payment.vue | 8 ++++++++
jiuyi2/static/footerMenuPlus1.png | Bin 386 -> 773 bytes
jiuyi2/static/userMenu.png | Bin 865 -> 2807 bytes
jiuyi2/vite.config.js | 3 ++-
12 files changed, 65 insertions(+), 31 deletions(-)
diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index d9448b2f..bce99ca0 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -6,7 +6,8 @@ const config = {
// host: 'h5api',
// #endif
// #ifndef H5
- host: 'http://91f.xyz:8080',
+ // host: 'http://91f.xyz:8080',
+ host: 'http://chi9fe.natappfree.cc',
// #endif
// 支付方式配置
payType: {
diff --git a/jiuyi2/components/index/indexVideo.vue b/jiuyi2/components/index/indexVideo.vue
index bbf1b54f..647df013 100644
--- a/jiuyi2/components/index/indexVideo.vue
+++ b/jiuyi2/components/index/indexVideo.vue
@@ -586,11 +586,10 @@
-
- {{ item.likeCount }}
-
-
- 点赞
+
+ {{ item.likeCount }}
+ 隐私赞
+ 点赞
diff --git a/jiuyi2/pages/index/index.nvue b/jiuyi2/pages/index/index.nvue
index 605bf838..9c596671 100644
--- a/jiuyi2/pages/index/index.nvue
+++ b/jiuyi2/pages/index/index.nvue
@@ -163,20 +163,16 @@
util.getMyTask()
// 监听登录
- uni.$on('login', () => {
- recList.data.length = 0
- attList.data.length = 0
- nextTick(() => {
- // 获取列表
- tabCurrent.value.refreshList()
- })
- })
+ // uni.$on('login', () => {
+ // // 获取列表
+ // tabCurrent.value.refreshList()
+ // })
// 监听登录
- uni.$on('logout', () => {
- // 获取列表
- tabCurrent.value.refreshList()
- })
+ // uni.$on('logout', () => {
+ // // 获取列表
+ // tabCurrent.value.refreshList()
+ // })
// 视频数据被修改
uni.$on('updateVideo', (item) => {
diff --git a/jiuyi2/pages/index/videoHome.vue b/jiuyi2/pages/index/videoHome.vue
index 7cce3588..9f14f3e1 100644
--- a/jiuyi2/pages/index/videoHome.vue
+++ b/jiuyi2/pages/index/videoHome.vue
@@ -356,7 +356,7 @@ function toCommentsList() {
已关注
- 私信
+ 私信
关注
@@ -401,7 +401,7 @@ function toCommentsList() {
分享主页
-->
-
+
私信Ta
diff --git a/jiuyi2/pages/index/wallet/topUp.vue b/jiuyi2/pages/index/wallet/topUp.vue
index d098955d..b992576a 100644
--- a/jiuyi2/pages/index/wallet/topUp.vue
+++ b/jiuyi2/pages/index/wallet/topUp.vue
@@ -20,8 +20,8 @@
totalAmount: '',
})
- onLoad(() => {
- //
+ onLoad((option) => {
+ if(option.amount) form.totalAmount = option.amount
})
// 充值
diff --git a/jiuyi2/pages/release/commodity.vue b/jiuyi2/pages/release/commodity.vue
index 8fe153e8..bea5f729 100644
--- a/jiuyi2/pages/release/commodity.vue
+++ b/jiuyi2/pages/release/commodity.vue
@@ -55,9 +55,11 @@
// 商品佣金
form.commission = detail.commission
// 商品详情
- form.infoRichText = detail.infoRichText || ''
- // 富文本编辑器初始化
- proxy.$refs.editorAreaRef.init(form.infoRichText)
+ if (detail.infoRichText) {
+ form.infoRichText = JSON.parse(detail.infoRichText)
+ // 富文本编辑器初始化
+ proxy.$refs.editorAreaRef.init(form.infoRichText)
+ }
// 规格
form.specs = detail.specs.map(item => {
return {
@@ -176,7 +178,7 @@
*/
function handleCate(ev) {
let index = ev.detail.value
- if (index == categoryIndex.value) return
+ if (index === categoryIndex.value) return
categoryIndex.value = index
form.categoryId = category[categoryIndex.value].id
}
@@ -228,7 +230,11 @@
// 轮播图
data.sliderImage = data.sliderImage.join(',')
-
+ // 商品详情
+ // if (data.infoRichText) data.infoRichText = Buffer.from(data.infoRichText, 'utf8').toString('base64');
+ // if (data.infoRichText) data.infoRichText = JSON.stringify(data.infoRichText)
+ console.log(btoa, data.infoRichText)
+ return
//
api.shop.saveProduct({
data,
diff --git a/jiuyi2/pages/release/video.vue b/jiuyi2/pages/release/video.vue
index ee730f20..1bb16ae9 100644
--- a/jiuyi2/pages/release/video.vue
+++ b/jiuyi2/pages/release/video.vue
@@ -111,6 +111,20 @@
form.description = detail.description
// //视频状态 0草稿 1待审核 2审核失败 3已发布 4已下架
form.status = detail.status
+ // 第几秒展示
+ if (detail.popupTime) form.popupTime = detail.popupTime
+ // 关联视频的商品id
+ if (detail.productId) {
+ form.productId = detail.productId
+ // 商品名称
+ form.productName = detail.productName
+ // 商品价格
+ form.productPrice = detail.productPrice
+ // 商品图片
+ form.productImage = detail.productImage
+ // 商品佣金
+ form.commission = detail.commission
+ }
// 回显话题列表
if (detail.tagsList) labelSelect.push(...detail.tagsList)
// 匹配用户id
@@ -527,7 +541,7 @@
{{form.productName}}
-
+
价格{{form.productPrice}}
佣金{{form.commission}}
diff --git a/jiuyi2/pages/shop/commodity/index.vue b/jiuyi2/pages/shop/commodity/index.vue
index e1faffba..e6f9ede5 100644
--- a/jiuyi2/pages/shop/commodity/index.vue
+++ b/jiuyi2/pages/shop/commodity/index.vue
@@ -94,7 +94,10 @@
if (rs.code == 200) {
//
const result = rs.data
- if (result.infoRichText) result.infoRichText = util.imgReplace(result.infoRichText)
+ if (result.infoRichText) {
+ result.infoRichText = JSON.parse(result.infoRichText)
+ result.infoRichText = util.imgReplace(result.infoRichText)
+ }
Object.assign(detail, {}, result)
return
}
@@ -131,7 +134,13 @@
// 拉起订单
function showMakeOrder() {
- proxy.$refs.makeOrderRef.open()
+ util.isLogin(() => {
+ proxy.$refs.makeOrderRef.open()
+ }).then(rs => {
+ uni.navigateTo({
+ url: '/pages/login/loginPhone'
+ })
+ })
}
/**
diff --git a/jiuyi2/pages/shop/commodity/payment.vue b/jiuyi2/pages/shop/commodity/payment.vue
index 4687a71c..4c73aef3 100644
--- a/jiuyi2/pages/shop/commodity/payment.vue
+++ b/jiuyi2/pages/shop/commodity/payment.vue
@@ -149,6 +149,14 @@
uni.$off('updateOrderDetail')
uni.navigateBack()
return
+ } else if (res.code === 501) {
+ util.alert(res.msg)
+ uni.navigateTo({
+ url: util.setUrl('/pages/index/wallet/topUp', {
+ amount: detail.totalPrice,
+ }),
+ })
+ return
}
util.alert({
content: res.msg,
diff --git a/jiuyi2/static/footerMenuPlus1.png b/jiuyi2/static/footerMenuPlus1.png
index 3b9de85adb900f7ec1049f723052de02c8a45d3d..583ff927e4e1865f35e66da2fde2a9edbe1aafb6 100644
GIT binary patch
delta 756
zcmZo-Ze>&K4DfU3<&xrJU|`_&^l%9R(je@`!3HEXRx;;KRFto0TJP!N7*a9k?VO7f
zXB!AO%wO3c6yjvnVQo=fpm$I<;LucuOOETBmo)9>Tfn@o`HAy{gOenh(*=dz%)WR-
zV#9QE?g*xDM~u!L&`$Uj_AQsc=IdHkyTngt$yDM#(Nu%dmXOp>rdEzltKKBnV;+_sk9R&EvjY*Le1Xk
z><|?D6_A!uzV2rDGu@>}tT^62b6j=ckiTp~`6(TH)jF>0ACu0s1*FaT$h7WlU-J8N
z!Bc)bpHO9U`RuXiKN6cCcFiwo_^T~EXQ9udw5K~6;^ws0x$tSZ*I8a(&-&qP{m&2n
zOA?Bn-JNOnVEM{Usi1ihbL?NR{<|5Ob0g#Uj=odE*IvvB2C8^|E_!3ANVT&o*FvS%
zfQe2kJQPEg2xtX$$hgF9*t>pR{d}Ew4yjo^?LTJqCQBAS*KMEYyXs@+`7~azG7eGA
zmM#$|B;DHtEWgZsUVrb-OQZ6=FKR#EsC_%*`=a$X&G-Lat7~NR?CHG~=1oV>o!~Cq
zv?=j!Y_xlQ%Y}>cO_8jIn5o1*@$HM+OXdfc)x}o7;9Pq*IMS=kc6P|cd1s|yj)dDD
zC{Q7j)9qk%xcW_itDSp5O8x7aj72Sz%-=1(nd`CSx5A!BpYP86$Fg6<*~@&-@~j
zpEjnCrR=xm?09%z>hu2@k&n}t&MT>L63txok%_H7W>cS3lH3kX@iqM+4^OYT)5>>7
z$v!IOTzcU|%NcsrHww?Z3JG6!+F_Qv_Uz87>CVS!HS2}Igv{XS>gTe~DWM4fmN#Ds
delta 366
zcmV-!0g?WN27&`2iBL{Q4GJ0x0000DNk~Le0000f0000b2nGNE0N
zL_t(oh3%L-4#F@DK%Xkqg`T4m6UX69T^V{C79=*RT94w
zpC?hx-~}ir67x}thh`LTC(sPee=Vq#^ch`)yI4D1szai}dDY;m>TVnm`VF6;Z!=RB
z$+zV6?djfTLZk({Y;KEhNRn1qOBTREmMPYSqrblvq{1;JNm?;hQmc6AU$!#z+Ni3J
zB9kz_1r;Cm^R*z~XME_bMe36#L?O8_-md_T#(M(x*JQ!(1>)mxg=0x7L>zO1zgx_J
zvpl()&u0+zIcLC59&F}u@uEIEh-4N75lqz}lKG^H20iJ0B)FOR4XA12oUSf^r~m)}
M07*qoM6N<$f|PEbJpcdz
diff --git a/jiuyi2/static/userMenu.png b/jiuyi2/static/userMenu.png
index 90cb185b33690ba9c38d1b25cce9e2d662f035c0..1be92fa5ff242821ba8e2b7e5e863ea35d62bdf4 100644
GIT binary patch
delta 2806
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
bMbh^FWKq5hIjdV!00000NkvXXu0mjft=*WV
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index fc5535df..d8647819 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -3,7 +3,8 @@ 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://chi9fe.natappfree.cc'
export default defineConfig({
plugins: [uni()],