2025.02.27 工作代码提交

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: {

jiuyi2/components/index/indexVideo.vue

@@ -586,11 +586,10 @@
 							</view>
 
 							<!-- 只有公开赞显示点赞数 -->
-							<view class="txt mt10" v-if="item.isLike && item.likeType == 0">
+							<view class="txt mt10">
-								<text class="text">{{ item.likeCount }}</text>
+								<text class="text" v-if="item.isLike == 0 && item.likeType == 0">{{ item.likeCount }}</text>
-							</view>
+								<text class="text" v-else-if="item.isLike == 0 && item.likeType == 1">隐私赞</text>
-							<view class="txt mt10" v-else>
+								<text class="text" v-else>点赞</text>
-								<text class="text">点赞</text>
 							</view>
 						</view>
 					</view>

jiuyi2/pages/index/index.nvue

@@ -163,20 +163,16 @@
 		util.getMyTask()
 
 		// 监听登录
-		uni.$on('login', () => {
+		// uni.$on('login', () => {
-			recList.data.length = 0
+		// 	// 获取列表
-			attList.data.length = 0
+		// 	tabCurrent.value.refreshList()
-			nextTick(() => {
+		// })
-				// 获取列表
-				tabCurrent.value.refreshList()
-			})
-		})
 
 		// 监听登录
-		uni.$on('logout', () => {
+		// uni.$on('logout', () => {
-			// 获取列表
+		// 	// 获取列表
-			tabCurrent.value.refreshList()
+		// 	tabCurrent.value.refreshList()
-		})
+		// })
 
 		// 视频数据被修改
 		uni.$on('updateVideo', (item) => {

jiuyi2/pages/index/videoHome.vue

@@ -356,7 +356,7 @@ function toCommentsList() {
 			<view class="btns df">
 				<template v-if="detail.isAttention == 0">
 					<view class="btn lg cancel f1" @click="handleAttention">已关注</view>
-					<view class="btn lg cancel f1 ml20" @click="handleMessage">私信</view>
+					<view class="btn lg cancel f1 ml20" @click="handleMessage" v-if="!userinfo.teenTime">私信</view>
 				</template>
 				<template v-else>
 					<view class="btn lg focus f1" @click="handleAttention">关注</view>
@@ -401,7 +401,7 @@ function toCommentsList() {
 					<view class="txt mt20 c111 f20">分享主页</view>
 				</view> -->
 
-				<view class="option ver jcc bfff br10" @click="handleMessage">
+				<view class="option ver jcc bfff br10" @click="handleMessage" v-if="!userinfo.teenTime">
 					<image class="wh50" src="/static/email.png" mode="aspectFit" />
 					<view class="txt mt20 c111 f20">私信Ta</view>
 				</view>

jiuyi2/pages/index/wallet/topUp.vue

@@ -20,8 +20,8 @@
 		totalAmount: '',
 	})
 
-	onLoad(() => {
+	onLoad((option) => {
-		// 
+		if(option.amount) form.totalAmount = option.amount
 	})
 
 	// 充值

jiuyi2/pages/release/commodity.vue

@@ -55,9 +55,11 @@
 				// 商品佣金
 				form.commission = detail.commission
 				// 商品详情
-				form.infoRichText = detail.infoRichText || ''
+				if (detail.infoRichText) {
-				// 富文本编辑器初始化
+					form.infoRichText = JSON.parse(detail.infoRichText)
-				proxy.$refs.editorAreaRef.init(form.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,

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 @@
 						<view class="df oh mtb20">
 							<view class="col oh df fdc jcsb f1 mr20">
 								<view class="name">{{form.productName}}</view>
-								<view class="price thd cFF9B27 f28">
+								<view class="price thd mt10 cFF9B27 f28">
 									<text class="price thd mr20">价格{{form.productPrice}}</text>
 									<text class="commission thd">佣金{{form.commission}}</text>
 								</view>

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'
+			})
+		})
 	}
 
 	/**

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,

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()],