From f87b3ca2eecb5693d4f147bc9faf2ea73e73dcc1 Mon Sep 17 00:00:00 2001
From: LGX <365820713@qq.com>
Date: Tue, 16 Jul 2024 18:20:03 +0800
Subject: [PATCH] 1

---
 pages/goods/detail.vue        | 9 ++++-----
 pages/news/caigou/notice1.vue | 2 +-
 pages/news/caigou/notice2.vue | 1 +
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index a992fc7..b5ccb8b 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -73,19 +73,18 @@
 				</view>
 			</view>
 			<view class="pro" v-if="userInfo.user_type==10">
-				<view class="proMem">
+			<!-- 	<view class="proMem">
 					<text v-if="userInfo.user_type==10">Plus</text>
-					<!-- <text v-if="userInfo.user_type==30">分销</text> -->
 					<view>会员</view>
 				</view>
 				<view class="proInfo">
-					开通<text v-if="userInfo.user_type==10">Plus</text>
-					<!-- <text v-if="userInfo.user_type==30">分销</text> -->会员预计再省<text style="color: #FF1D1D;">30</text>元
+					开通<text v-if="userInfo.user_type==10">Plus</text>会员预计再省<text style="color: #FF1D1D;">30</text>元
 				</view>
 				<view class="proBtn" @click="goMember()">
 					立即开通
 				</view>
-			</view>
+				-->
+			</view> 
 			<view class="goodsDetail">
 				<view class="goodsContent">
 					<view class="goodsName" @click="copyNum(goods.goods_name)">
diff --git a/pages/news/caigou/notice1.vue b/pages/news/caigou/notice1.vue
index 2338aab..b51f1bb 100644
--- a/pages/news/caigou/notice1.vue
+++ b/pages/news/caigou/notice1.vue
@@ -79,7 +79,7 @@
 					})
 					.then(result => {
 						if (result.data.detail && result.data.detail.content) {
-							app.info = app.formatRichText(result.data.detail.content)
+							app.info = result.data.detail.content
 						}else{
 							app.info = ""
 						}
diff --git a/pages/news/caigou/notice2.vue b/pages/news/caigou/notice2.vue
index cb6c80f..a806bbc 100644
--- a/pages/news/caigou/notice2.vue
+++ b/pages/news/caigou/notice2.vue
@@ -66,6 +66,7 @@
 				  sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
 				  success(res) {
 					console.log(res)
+					console.log('uni.getStorageSync',uni.getStorageSync('Store'));
 					uni.uploadFile({
 						url: (Config.get('apiUrl')+'upload/image').replace("index.php?s=/",""), // 仅为示例，非真实的接口地址
 						filePath: res.tempFiles[0].path,