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 3b9de85a..583ff927 100644
Binary files a/jiuyi2/static/footerMenuPlus1.png and b/jiuyi2/static/footerMenuPlus1.png differ
diff --git a/jiuyi2/static/userMenu.png b/jiuyi2/static/userMenu.png
index 90cb185b..1be92fa5 100644
Binary files a/jiuyi2/static/userMenu.png and b/jiuyi2/static/userMenu.png differ
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()],