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 ( - + {/* {`商品评价(${list.length})`} {list.length > 0 && ( - {/* 查看全部 */} )} - + */} {list.map((item) => ( - {item.username || '匿名用户'} + {'匿名用户' || item.username} {fortmatStr(item.item_spec_desc)} 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} > - + {item.type !== 'eva' ? : + + } { 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) { ) : } {/* 商品评价 */} - + + {/* */} {isArray(historyList) ? 浏览历史 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() + } }) } // 获取文件类型