From 366793e9cccb175dd90469edb48fe90b368fdc5a Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 27 Oct 2023 17:57:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/admin/goods_details/index.vue | 69 ++++++++++++++++++++++++++---
 pages/goods_details/index.vue       | 24 ++++++----
 2 files changed, 79 insertions(+), 14 deletions(-)

diff --git a/pages/admin/goods_details/index.vue b/pages/admin/goods_details/index.vue
index f0c5d5f..bd2454e 100644
--- a/pages/admin/goods_details/index.vue
+++ b/pages/admin/goods_details/index.vue
@@ -264,14 +264,22 @@
         </view>
         <view class='product-intro' id="past3">
           <view class='title'>产品介绍</view>
-          <jyf-parser v-if="description.type == 0" :domain='domain' :html="description.content.replace(/<br\/>/ig, '')"
-            ref="article" :tag-style="tagStyle"></jyf-parser>
+          <!-- #ifndef APP-PLUS -->
+          <jyf-parser v-if="description.type == 0 && typeof description.content == 'string'" :domain='domain'
+          	:html="description.content.replace(/<br\/>/ig, '')" ref="article"
+          	:tag-style="tagStyle"></jyf-parser>
+          <!-- #endif -->
+          <!-- #ifdef APP-PLUS -->
+          <view v-if="description.type == 0 && typeof description.content == 'string'" class="description"
+          	v-html="description.content.replace(/<br\/>/ig, '')"></view>
+          <!-- #endif -->
           <view v-else class="product_content">
-            <view v-if="description.content && description.content.title" class="title">{{description.content.title}}
-            </view>
-            <view v-if="description.content && description.content.image" class="pictures">
-              <image v-for="(item,index) in description.content.image" :key="index" :src="item"></image>
+            <view v-if="description.content && description.content.title" class="product_content_title">{{description.content.title}}
             </view>
+            <block v-if="description.content && description.content.image">
+            	<image v-for="(item,index) in description.content.image" :key="index" :src="item"  mode="widthFix" style="background-color: #fff;width: 100vw;">
+            	</image>
+            </block>
           </view>
         </view>
         <view style='height:120rpx;'></view>
@@ -558,6 +566,23 @@
           }
           that.$set(that, 'storeInfo', storeInfo);
           that.$set(that, 'description', storeInfo.content);
+          if(typeof that.description.content == 'string'){
+            try{
+              that.description.content = JSON.parse(that.description.content);
+            }catch(e){
+              console.log(e);
+            }
+          }
+          if (that.description.type == 0 && typeof that.description.content == 'string') {
+          	that.description.content = that.description.content.replace(
+          		/<img/gi,
+          		'<img style="max-width:100%;height:auto;float:left;display:block" '
+          	);
+          	that.description.content = that.description.content.replace(
+          		/<video/gi,
+          		'<video style="width:100%;height:300px;display:block" '
+          	);
+          }
           that.$set(that, 'reply', res.data.topReply ? [res.data.topReply] : []);
           that.$set(that.attr, 'productAttr', res.data.attr);
           that.$set(that, 'productValue', res.data.sku);
@@ -608,6 +633,23 @@
           }
           that.$set(that, 'storeInfo', storeInfo);
           that.$set(that, 'description', storeInfo.content);
+          if(typeof that.description.content == 'string'){
+            try{
+              that.description.content = JSON.parse(that.description.content);
+            }catch(e){
+              console.log(e);
+            }
+          }
+          if (that.description.type == 0 && typeof that.description.content == 'string') {
+          	that.description.content = that.description.content.replace(
+          		/<img/gi,
+          		'<img style="max-width:100%;height:auto;float:left;display:block" '
+          	);
+          	that.description.content = that.description.content.replace(
+          		/<video/gi,
+          		'<video style="width:100%;height:300px;display:block" '
+          	);
+          }
           that.$set(that.description, 'type', storeInfo.content.type || 0);
           that.$set(that, 'reply', res.data.topReply ? [res.data.topReply] : []);
           that.$set(that.attr, 'productAttr', res.data.attr);
@@ -1592,4 +1634,19 @@
       }
     }
   }
+  .product_content{
+    background-color: #fff;
+    &_title{
+      width: 100%;
+      height: auto;
+      line-height: 50rpx;
+      padding: 28rpx;
+      word-wrap: break-word;
+      text-align: center;
+    }
+    image{
+      width: 750rpx;
+      // height: 750rpx;
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index cad92c0..943d57c 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -278,22 +278,22 @@
 						<view class='title'>产品介绍</view>
 						<view class='conter' v-if="description" style="min-height:50rpx;">
 							<!-- #ifndef APP-PLUS -->
-							<jyf-parser v-if="description.type == 0" :domain='domain'
+							<jyf-parser v-if="description.type == 0 && typeof description.content == 'string'" :domain='domain'
 								:html="description.content.replace(/<br\/>/ig, '')" ref="article"
 								:tag-style="tagStyle"></jyf-parser>
 							<!-- #endif -->
 							<!-- #ifdef APP-PLUS -->
-							<view v-if="description.type == 0" class="description"
+							<view v-if="description.type == 0 && typeof description.content == 'string'" class="description"
 								v-html="description.content.replace(/<br\/>/ig, '')"></view>
 							<!-- #endif -->
 							<view v-else class="product_content">
 								<view v-if="description.content && description.content.title" class="product_content_title">
-                  {{description.content.title}}
+						      {{description.content.title}}
 								</view>
-								<view v-if="description.content && description.content.image" class="pictures" style="background-color: #fff;">
-									<image v-for="(item,index) in description.content.image" :key="index" :src="item"  mode="aspectFit">
+								<block v-if="description.content && description.content.image">
+									<image v-for="(item,index) in description.content.image" :key="index" :src="item"  mode="widthFix" style="background-color: #fff;width: 100vw;">
 									</image>
-								</view>
+								</block>
 							</view>
 						</view>
 						<!-- 价格说明 -->
@@ -1059,7 +1059,14 @@
 					}
 					that.$set(that, 'storeInfo', storeInfo);
 					that.$set(that, 'description', storeInfo.content);
-					if (that.description.type == 0) {
+          if(typeof that.description.content == 'string'){
+            try{
+              that.description.content = JSON.parse(that.description.content);
+            }catch(e){
+              console.log(e);
+            }
+          }
+					if (that.description.type == 0 && typeof that.description.content == 'string') {
 						that.description.content = that.description.content.replace(
 							/<img/gi,
 							'<img style="max-width:100%;height:auto;float:left;display:block" '
@@ -2533,7 +2540,8 @@
     }
     image{
       width: 750rpx;
-      height: 750rpx;
+      // height: auto;
+      // height: 750rpx;
     }
   }
 </style>
\ No newline at end of file