From 3581889d7aa2e1a4b820a54b4f925bc093b0af24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E9=BE=99?= <wenlong@Windows-12.local>
Date: Wed, 28 Feb 2024 19:18:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/item/comps/comp-evaluation.js   |  7 +++----
 src/pages/item/comps/comp-evaluation.scss |  1 +
 src/pages/item/espier-detail.js           | 16 +++++++++-------
 src/subpage/pages/trade/invoice-info.js   |  5 +++++
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/pages/item/comps/comp-evaluation.js b/src/pages/item/comps/comp-evaluation.js
index 44db3e7..a82acd9 100755
--- a/src/pages/item/comps/comp-evaluation.js
+++ b/src/pages/item/comps/comp-evaluation.js
@@ -43,21 +43,20 @@ function CompEvaluation (props) {
 
   return (
     <View className={classNames('comp-evaluation', className)}>
-      <View className='evaluation-hd'>
+      {/* <View className='evaluation-hd'>
         <View className='title'>{`商品评价（${list.length}）`}</View>
         {list.length > 0 && (
           <View className='extra-more' onClick={onViewMore}>
-            {/* 查看全部  */}
             <Text className='iconfont icon-qianwang-01'></Text>
           </View>
         )}
-      </View>
+      </View> */}
       <View className='evaluation-bd'>
         {list.map((item) => (
           <View className='evaluation-item-wrap'>
             <View className='item-hd'>
               <SpImage src={item.avatar} className='evaluation-icon' width={50} height={50} />
-              <Text className='evaluation-name'>{item.username || '匿名用户'}
+              <Text className='evaluation-name'>{'匿名用户' || item.username}
                 <Text style={{ marginLeft: '10rpx' }}>{fortmatStr(item.item_spec_desc)}</Text>
               </Text>
             </View>
diff --git a/src/pages/item/comps/comp-evaluation.scss b/src/pages/item/comps/comp-evaluation.scss
index 945cea4..db820d5 100755
--- a/src/pages/item/comps/comp-evaluation.scss
+++ b/src/pages/item/comps/comp-evaluation.scss
@@ -23,6 +23,7 @@
     // padding: 24px 0;
     .evaluation-item-wrap {
       margin-bottom: 20px;
+      margin-top: 20px;
       // &:not(:last-child) {
       //   margin-bottom: 20px;
       // }
diff --git a/src/pages/item/espier-detail.js b/src/pages/item/espier-detail.js
index 5ae0d8c..51db618 100755
--- a/src/pages/item/espier-detail.js
+++ b/src/pages/item/espier-detail.js
@@ -291,16 +291,15 @@ function EspierDetail (props) {
         }
       })
     }
-    // console.log("🚀 ~ data.introList:", data)
     setState((draft) => {
       draft.info = {
         ...data,
         subscribe,
       }
-      draft.introList = (data.introList || []).map((item) => {
+      draft.introList = (data.introList || []).concat([{ isOpen: false, id: '99999999', type: 'eva', title: '商品评价' }]).map((item) => {
         return {
           ...item,
-          isOpen: false
+          isOpen: false,
         }
       })
       draft.promotionActivity = data.promotionActivity
@@ -785,13 +784,15 @@ function EspierDetail (props) {
                   })
                   // if (!item.isOpen) {
                   //   setState((draft) => {
-                  //     draft.scrollTop = 742 + Math.random()
+                  //     draft.scrollTop = 1042 + Math.random() / 10
                   //   })
                   // }
                 }}
                 title={item.title}
               >
-                <SpHtml content={item.content} />
+                {item.type !== 'eva' ? <SpHtml content={item.content} /> :
+                  <CompEvaluation list={evaluationList} itemId={info.itemId}></CompEvaluation>
+                }
               </AtAccordion>
               <View onClick={() => {
                 setState((draft) => {
@@ -803,7 +804,7 @@ function EspierDetail (props) {
                 })
                 // if (!item.isOpen) {
                 //   setState((draft) => {
-                //     draft.scrollTop = 742 + Math.random()
+                //     draft.scrollTop = 1042 + Math.random() / 10
                 //   })
                 // }
               }}>
@@ -813,7 +814,8 @@ function EspierDetail (props) {
               </View>
             </View>) : <View style={{ height: `calc(100% - 380px)` }}></View>}
             {/* 商品评价 */}
-            <CompEvaluation list={evaluationList} itemId={info.itemId}></CompEvaluation>
+
+            {/* <CompEvaluation list={evaluationList} itemId={info.itemId}></CompEvaluation> */}
             {isArray(historyList) ? <View className='bottom-box'>
               <View className="bottom-box-tit">浏览历史</View>
               <ScrollView scrollX scrollWithAnimation showScrollbar={true} scrollLeft={0} className="shop-box">
diff --git a/src/subpage/pages/trade/invoice-info.js b/src/subpage/pages/trade/invoice-info.js
index a8cddd4..ee2fccb 100755
--- a/src/subpage/pages/trade/invoice-info.js
+++ b/src/subpage/pages/trade/invoice-info.js
@@ -227,11 +227,13 @@ function InvoiceInfo (props) {
 
   // 预览文件
   const preview = (url, fileName) => {
+    Taro.showLoading({ title: '正在加载中', mask: true })
     Taro.downloadFile({
       url: url,
       success: function (res) {
         console.log("下载：", res)
         var filePath = res.tempFilePath
+        Taro.hideLoading()
         Taro.openDocument({
           filePath: filePath,
           fileType: getFileType(url),
@@ -241,6 +243,9 @@ function InvoiceInfo (props) {
           },
         })
       },
+      fail: function (_) {
+        Taro.hideLoading()
+      }
     })
   }
   // 获取文件类型