From c4a23be60c90e4067632e95af119cc5d897e73bd Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Fri, 21 Feb 2025 10:03:50 +0800
Subject: [PATCH] =?UTF-8?q?2025.02.20=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                  |  1 -
 jiuyi2/common/js/util.js                    | 10 ++--
 jiuyi2/components/public/editor/editor.vue  | 45 +++++++++++++---
 jiuyi2/manifest.json                        |  4 +-
 jiuyi2/pages/login/freezeAccount.vue        |  2 +-
 jiuyi2/pages/login/unfreezeAccount.vue      |  2 +-
 jiuyi2/pages/mine/setting/safeCenter.vue    |  2 +-
 jiuyi2/pages/mine/setting/usePay.vue        |  1 -
 jiuyi2/pages/mine/switch-accounts/index.vue |  1 -
 jiuyi2/pages/release/commodity.vue          | 57 +++++++++++++++++++--
 jiuyi2/pages/shop/commodity/index.vue       |  5 +-
 jiuyi2/pages/shop/store/commodities.vue     | 23 ++++++++-
 jiuyi2/readme.md                            |  2 +-
 jiuyi2/vite.config.js                       |  3 +-
 14 files changed, 128 insertions(+), 30 deletions(-)

diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index 6522293b..d9448b2f 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -7,7 +7,6 @@ const config = {
 	// #endif
 	// #ifndef H5
 	host: 'http://91f.xyz:8080',
-	host: 'https://b433d23.r24.cpolar.top/',
 	// #endif
 	// 支付方式配置
 	payType: {
diff --git a/jiuyi2/common/js/util.js b/jiuyi2/common/js/util.js
index ff57358a..76099e25 100644
--- a/jiuyi2/common/js/util.js
+++ b/jiuyi2/common/js/util.js
@@ -260,11 +260,11 @@ const util = {
 		})
 	},
 
-	//	替换图片的宽度为最大宽度100% (移动端解析html富文本专用)
-	imgReplace(value, th) {
-		if (!th) {
-			value = value.replace(/<img src="/ig, '<img src="' + util.config.host);
-		}
+	/**
+	 * 替换图片的宽度为最大宽度100% (移动端解析html富文本专用)
+	 * @param {Object} value 富文本
+	 */
+	imgReplace(value) {
 		return value.replace(/<p([\s\w"=\/\.:;]+)((?:(style="[^"]+")))/ig, '<p')
 			.replace(/<p>/ig, '<p style="font-size: 15px; line-height: 25px;">')
 			.replace(/<img([\s\w"-=\/\.:;]+)((?:(height="[^"]+")))/ig, '<img$1')
diff --git a/jiuyi2/components/public/editor/editor.vue b/jiuyi2/components/public/editor/editor.vue
index 94e059e3..47a9317f 100644
--- a/jiuyi2/components/public/editor/editor.vue
+++ b/jiuyi2/components/public/editor/editor.vue
@@ -7,6 +7,7 @@
 		getCurrentInstance,
 		defineProps,
 		defineEmits,
+		defineExpose,
 	} from 'vue'
 	// 工具库
 	import util from '@/common/js/util'
@@ -16,8 +17,11 @@
 	const {
 		proxy
 	} = getCurrentInstance()
-
-	const emits = defineEmits(['update:modelValue']);
+	const props = defineProps({
+		modelValue: String
+	})
+	// 
+	const emit = defineEmits(['update:modelValue']);
 	// 编辑器内容
 	const formats = reactive({})
 	// 编辑器上下文对象
@@ -33,17 +37,33 @@
 	const colorKey = ref('forecolor')
 
 	onMounted(() => {
-		// 初始化
+		// 创建编辑器上下文对象
 		onEditorReady()
 	})
 
-	// 初始化
+	// 创建编辑器上下文对象
 	function onEditorReady() {
 		uni.createSelectorQuery().select('#editor').context((res) => {
 			editorCtx.value = res.context
 		}).exec()
 	}
 
+	// 初始化编辑器上下文对象
+	function init(html) {
+		editorCtx.value.setContents({
+			html,
+		})
+	}
+
+	// 获取内容
+	function getEditorContents() {
+		editorCtx.value.getContents({
+			success: rs => {
+				return rs
+			}
+		})
+	}
+
 	// 撤销
 	function undo() {
 		editorCtx.value.undo()
@@ -65,7 +85,7 @@
 		} = event.target.dataset
 		if (!name) return
 		editorCtx.value.format(name, value)
-	}
+	}	
 
 	/**
 	 * 编辑器状态被变化
@@ -158,6 +178,16 @@
 			}
 		})
 	}
+
+	// 富文本编辑
+	function handleEditorInput(event) {
+		emit('update:modelValue', event.detail.html)
+	}
+
+	defineExpose({
+		init,
+		getEditorContents,
+	})
 </script>
 
 <template>
@@ -221,9 +251,8 @@
 
 		<!-- 内容 -->
 		<view class="main">
-			<editor id="editor" class="ql-container" placeholder="在此输入产品详情" showImgSize
-				showImgToolbar showImgResize @statuschange="onStatusChange" @ready="onEditorReady"
-				@input="$emit('update:modelValue', $event.target.value)">
+			<editor id="editor" class="ql-container" placeholder="在此输入产品详情" showImgSize showImgToolbar showImgResize
+				@statuschange="onStatusChange" @ready="onEditorReady" @input="handleEditorInput">
 			</editor>
 		</view>
 	</view>
diff --git a/jiuyi2/manifest.json b/jiuyi2/manifest.json
index 5ecd2de4..216590c9 100644
--- a/jiuyi2/manifest.json
+++ b/jiuyi2/manifest.json
@@ -2,8 +2,8 @@
     "name" : "九亿",
     "appid" : "__UNI__08B31BC",
     "description" : "",
-    "versionName" : "1.0.6",
-    "versionCode" : 1006,
+    "versionName" : "1.0.7",
+    "versionCode" : 1007,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/jiuyi2/pages/login/freezeAccount.vue b/jiuyi2/pages/login/freezeAccount.vue
index 57ae4670..67a67585 100644
--- a/jiuyi2/pages/login/freezeAccount.vue
+++ b/jiuyi2/pages/login/freezeAccount.vue
@@ -1,6 +1,6 @@
 <script setup>
 	/**
-	 * 账号挂失
+	 * 账号冻结
 	 */
 	import {
 		ref,
diff --git a/jiuyi2/pages/login/unfreezeAccount.vue b/jiuyi2/pages/login/unfreezeAccount.vue
index d7950707..747878cc 100644
--- a/jiuyi2/pages/login/unfreezeAccount.vue
+++ b/jiuyi2/pages/login/unfreezeAccount.vue
@@ -1,6 +1,6 @@
 <script setup>
 	/**
-	 * 账号挂失
+	 * 账号解冻
 	 */
 	import {
 		ref,
diff --git a/jiuyi2/pages/mine/setting/safeCenter.vue b/jiuyi2/pages/mine/setting/safeCenter.vue
index 220b6e48..8945a367 100644
--- a/jiuyi2/pages/mine/setting/safeCenter.vue
+++ b/jiuyi2/pages/mine/setting/safeCenter.vue
@@ -65,7 +65,7 @@
 			</view>
 
 			<view class="line" @click="link('/pages/login/unfreezeAccount')">
-				<view class="title">解冻账号</view>
+				<view class="title">账号解冻</view>
 				<view class="content">风险解除后，可选择解除冻结</view>
 			</view>
 
diff --git a/jiuyi2/pages/mine/setting/usePay.vue b/jiuyi2/pages/mine/setting/usePay.vue
index 9987d642..a77631b9 100644
--- a/jiuyi2/pages/mine/setting/usePay.vue
+++ b/jiuyi2/pages/mine/setting/usePay.vue
@@ -36,7 +36,6 @@
 		screenHeight,
 		bottomSafeAreaHeight
 	} from '@/components/public/Mixins.js'
-	import JyCommonHead from '@/components/public/jy-common-head'
 
 	const PayUse = ref(false)
 	// 我是关闭服务
diff --git a/jiuyi2/pages/mine/switch-accounts/index.vue b/jiuyi2/pages/mine/switch-accounts/index.vue
index 1bb2ff8e..4eb9953e 100644
--- a/jiuyi2/pages/mine/switch-accounts/index.vue
+++ b/jiuyi2/pages/mine/switch-accounts/index.vue
@@ -39,7 +39,6 @@
 		ref,
 		inject
 	} from 'vue'
-	import JyCommonHead from '@/components/public/jy-common-head'
 	import {
 		useStore
 	} from 'vuex'
diff --git a/jiuyi2/pages/release/commodity.vue b/jiuyi2/pages/release/commodity.vue
index b212da98..8fe153e8 100644
--- a/jiuyi2/pages/release/commodity.vue
+++ b/jiuyi2/pages/release/commodity.vue
@@ -2,7 +2,9 @@
 	// 发布商品
 	import {
 		ref,
-		reactive
+		reactive,
+		getCurrentInstance,
+		nextTick
 	} from 'vue'
 	// 
 	import {
@@ -14,13 +16,16 @@
 	import util from '@/common/js/util.js'
 	// 编辑器
 	import editorArea from '@/components/public/editor/editor'
-
+	const {
+		proxy
+	} = getCurrentInstance()
 	// 表单
 	const form = reactive({
 		id: '',
 		categoryId: '',
 		sliderImage: [],
 		specs: [],
+		infoRichText: '',
 	})
 	// 分类
 	const category = reactive([])
@@ -49,6 +54,10 @@
 				form.cost = detail.cost
 				// 商品佣金
 				form.commission = detail.commission
+				// 商品详情
+				form.infoRichText = detail.infoRichText || ''
+				// 富文本编辑器初始化
+				proxy.$refs.editorAreaRef.init(form.infoRichText)
 				// 规格
 				form.specs = detail.specs.map(item => {
 					return {
@@ -177,6 +186,45 @@
 		const data = {
 			...form
 		}
+		console.log('data', data)
+
+		if (!data.sliderImage[0]) {
+			util.alert('商品图片不能为空')
+			return
+		}
+		if (!data.categoryId) {
+			util.alert('商品类目不能为空')
+			return
+		}
+		if (!data.specs[0]) {
+			util.alert('商品规格不能为空')
+			return
+		}
+		if (!data.price) {
+			util.alert('商品价格不能为空')
+			return
+		}
+		if (!data.cost) {
+			util.alert('商品成本价不能为空')
+			return
+		}
+
+		// 查找规格是否有空值
+		for (let i = 0; i < data.specs.length; i++) {
+			let item = data.specs[i]
+			if (!item.image) {
+				util.alert('规格图片不能为空')
+				return
+			}
+			if (!item.sku) {
+				util.alert('规格名称不能为空')
+				return
+			}
+			if (!item.stock) {
+				util.alert('规格库存不能为空')
+				return
+			}
+		}
 
 		// 轮播图
 		data.sliderImage = data.sliderImage.join(',')
@@ -190,6 +238,7 @@
 					content: '商品发布成功，请等待后台审核',
 					showCancel: false,
 				}).then(() => {
+					uni.$emit('updateUserProduct')
 					uni.navigateBack()
 				})
 				return
@@ -211,7 +260,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>
@@ -327,7 +376,7 @@
 			</view>
 
 			<view class="main area editor">
-				<!-- <editorArea v-model="form.infoRichText" /> -->
+				<editorArea ref="editorAreaRef" v-model="form.infoRichText" />
 			</view>
 		</view>
 
diff --git a/jiuyi2/pages/shop/commodity/index.vue b/jiuyi2/pages/shop/commodity/index.vue
index 240c9bbc..e1faffba 100644
--- a/jiuyi2/pages/shop/commodity/index.vue
+++ b/jiuyi2/pages/shop/commodity/index.vue
@@ -92,7 +92,10 @@
 			}
 		}).then(rs => {
 			if (rs.code == 200) {
-				Object.assign(detail, {}, rs.data)
+				// 
+				const result = rs.data
+				if (result.infoRichText) result.infoRichText = util.imgReplace(result.infoRichText)
+				Object.assign(detail, {}, result)
 				return
 			}
 			util.alert({
diff --git a/jiuyi2/pages/shop/store/commodities.vue b/jiuyi2/pages/shop/store/commodities.vue
index c60a2783..d5b456a6 100644
--- a/jiuyi2/pages/shop/store/commodities.vue
+++ b/jiuyi2/pages/shop/store/commodities.vue
@@ -6,6 +6,7 @@
 	} from 'vue'
 	import {
 		onLoad,
+		onUnload,
 		onReachBottom,
 		onPullDownRefresh
 	} from "@dcloudio/uni-app"
@@ -26,8 +27,15 @@
 	onLoad(() => {
 		// 获取列表
 		getList()
+		// 开启监听
+		addListener()
 	})
-
+	
+	onUnload(() => {
+		// 关闭监听
+		removeListener()
+	})
+	
 	onReachBottom(() => {
 		// 获取更多商品
 		getMoreList()
@@ -38,6 +46,19 @@
 		refeshList()
 	})
 
+	// 开启监听
+	function addListener() {
+		uni.$on('updateUserProduct', () => {
+			// 重载商品列表
+			refeshList()
+		})
+	}
+
+	// 关闭监听
+	function removeListener() {
+		uni.$off('updateUserProduct')
+	}
+
 	// 重载商品列表
 	function refeshList() {
 		if (product.list.length >= product.total) return
diff --git a/jiuyi2/readme.md b/jiuyi2/readme.md
index ccd95322..20f473c9 100644
--- a/jiuyi2/readme.md
+++ b/jiuyi2/readme.md
@@ -63,7 +63,7 @@ deleteVideo 删除视频
 selectAddress 选择地址
 updateOrderList 更新订单列表
 updateOrderDetail 更新订单详情
-
+updateUserProduct 更新用户商品
 
 缓存
 ---
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index 47c96de2..fc5535df 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -3,8 +3,7 @@ import {
 } from 'vite';
 import uni from '@dcloudio/vite-plugin-uni';
 
-// let target = 'http://91f.xyz:8080'
-let target = 'https://b433d23.r24.cpolar.top/'
+let target = 'http://91f.xyz:8080'
 
 export default defineConfig({
 	plugins: [uni()],