Merge remote-tracking branch 'remotes/origin/developerA' into developer

# Conflicts:
#	src/main/resources/templates/product/detail.html

src/main/resources/templates/product/detail.html

@@ -26,7 +26,7 @@
                 <div v-if="isPC" class="bigImage">
                     <img :src="images[0]">
                     <span class="mask"></span>
-                    <span class="cm-product-cover-tag" v-if="pcActType === 1 && isPC">云上美博会</span>
+                    <span class="cm-product-cover-tag" v-if="isPC && pcActType === 1">云上美博会</span>
                 </div>
                 <div id="swiperImage" class="smallImage swiper-container">
                     <ul class="swiper-wrapper clear">
@@ -57,15 +57,18 @@
                 <div class="detail" v-if="!isNoneDisabled">
                     <div class="WeChat" v-if="isPC">
                         <i class="icon"></i>微信客服
-                        <div class="WechatBg"><img src="/img/base/Wecha.png"><p>扫码添加采美微信客服咨询更快捷</p> </div>
+                        <div class="WechatBg"><img src="/img/base/Wecha.png">
+                            <p>扫码添加采美微信客服咨询更快捷</p></div>
                     </div>
                     <div class="row price"><span class="l">采美价</span><i>：</i>
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                             <em v-if="priceObj.priceFlag==1" v-text="'￥价格未公开'"></em>
                             <em v-else-if="priceObj.priceFlag==2 && priceObj.userIdentity==4" v-text="'￥会员可见'"></em>
-                            <template v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID)">
-                                <em v-if="priceObj.actStatus==1 && promotions && promotions.type==1 && promotions.mode==1" class="p">
+                            <template
+                                    v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID)">
+                                <em v-if="priceObj.actStatus==1 && promotions && promotions.type==1 && promotions.mode==1"
+                                    class="p">
                                     <del v-text="'￥'+parseFloat(priceObj.originalPrice).toFixed(2)"></del>
                                 </em>
                                 <em v-else class="p" v-text="'￥'+parseFloat(priceObj.price).toFixed(2)"></em>
@@ -74,13 +77,19 @@
                         </template>
                         <em v-else>￥<i th:attr="class=${'icon mIcon i'+product.priceGrade}"></i></em>
                     </div>
-                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.normalPrice>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID))">
-                        <div class="row"> <span class="l">市场价</span><i>：</i>
-                             <em><del v-text="'￥'+priceObj.normalPrice.toFixed(2)"></del></em>
+                    <template
+                            v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.normalPrice>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID))">
+                        <div class="row"><span class="l">市场价</span><i>：</i>
+                            <em>
+                                <del v-text="'￥'+priceObj.normalPrice.toFixed(2)"></del>
+                            </em>
                         </div>
                     </template>
-                    <div class="row actStatus" v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.actStatus==1||priceObj.ladderPriceFlag==1" ><span class="l">促销</span><i>：</i>
-                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID))">
+                    <div class="row actStatus"
+                         v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.actStatus==1||priceObj.ladderPriceFlag==1">
+                        <span class="l">促销</span><i>：</i>
+                        <template
+                                v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID))">
                             <!-- 阶梯价 -->
                             <div v-if="priceObj.ladderPriceFlag==1" class="priceTag">
                                 <i class="tag icon mIcon" @click="toggleThisLadder($event)">阶梯价格</i>
@@ -97,17 +106,27 @@
                             </div>
                             <!-- 促销活动 -->
                             <div v-if="priceObj.actStatus==1 && promotions" class="priceTag">
-                                <i v-if="promotions.type==1 && promotions.mode==1 &&priceObj.priceFlag!=1" @click="toggleThisLadder($event)" class="tag icon mIcon" v-text="promotions.name+'：¥'+toFloat(promotions.touchPrice)"></i>
-                                <i v-else class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="promotions.name"></i>
+                                <i v-if="promotions.type==1 && promotions.mode==1 &&priceObj.priceFlag!=1"
+                                   @click="toggleThisLadder($event)" class="tag icon mIcon"
+                                   v-text="promotions.name+'：¥'+toFloat(promotions.touchPrice)"></i>
+                                <i v-else class="tag icon mIcon" @click="toggleThisLadder($event)"
+                                   v-text="promotions.name"></i>
                                 <div class="promotion mFixed">
                                     <div>
                                         <p class="t">
-                                            <em v-if="promotions.type==1 && promotions.mode==1" v-text="priceObj.priceFlag==1?'价格未公开':(promotions.name+'：¥'+toFloat(promotions.touchPrice))"></em>
-                                            <em v-if="promotions.mode==2" v-text="promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 减 ¥'+toFloat(promotions.reducedPrice)"></em>
-                                            <em v-if="promotions.mode==3" v-text="promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 赠送商品'"></em>
+                                            <em v-if="promotions.type==1 && promotions.mode==1"
+                                                v-text="priceObj.priceFlag==1?'价格未公开':(promotions.name+'：¥'+toFloat(promotions.touchPrice))"></em>
+                                            <em v-if="promotions.mode==2"
+                                                v-text="promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 减 ¥'+toFloat(promotions.reducedPrice)"></em>
+                                            <em v-if="promotions.mode==3"
+                                                v-text="promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 赠送商品'"></em>
+                                        </p>
+                                        <p>促销时间：<em v-if="promotions.status==1">不限时</em><em v-else
+                                                                                            v-text="promotions.beginTime.substr(0,10)+' ~ '+promotions.endTime.substr(0,10)"></em>
+                                        </p>
+                                        <p v-if="promotions.type==2" class="r"><a class="more"
+                                                                                  :href="'/product/promotions.html?id='+promotions.id">更多凑单商品>>></a>
                                         </p>
-                                        <p>促销时间：<em v-if="promotions.status==1">不限时</em><em v-else v-text="promotions.beginTime.substr(0,10)+' ~ '+promotions.endTime.substr(0,10)"></em></p>
-                                        <p v-if="promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+promotions.id">更多凑单商品>>></a></p>
                                         <template v-if="promotions.mode==3">
                                             <p>赠品：</p>
                                             <p>
@@ -118,7 +137,8 @@
                                                 </span>
                                             </p>
                                         </template>
-                                        <p class="c"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                        <p class="c"><a class="close" @click="hideThisLadder($event)"
+                                                        href="JavaScript:void(0);">了解</a></p>
                                     </div>
                                 </div>
                             </div>
@@ -126,18 +146,24 @@
                         <!-- 登录 -->
                         <template v-else>
                             <div v-if="priceObj.ladderPriceFlag==1 || priceObj.actStatus==1" class="priceTag">
-                                <i v-if="priceObj.ladderPriceFlag==1" class="tag icon mIcon" @click="toggleThisLadder($event)">阶梯价格</i>
-                                <i v-if="priceObj.actStatus==1" class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="promotions?promotions.name:''"></i>
+                                <i v-if="priceObj.ladderPriceFlag==1" class="tag icon mIcon"
+                                   @click="toggleThisLadder($event)">阶梯价格</i>
+                                <i v-if="priceObj.actStatus==1" class="tag icon mIcon" @click="toggleThisLadder($event)"
+                                   v-text="promotions?promotions.name:''"></i>
                                 <div class="promotion mFixed">
                                     <div v-if="!GLOBAL_USER_ID">
                                         <p v-if="priceObj.ladderPriceFlag==1"><em @click="toLogin">登录</em>，享受阶梯价格优惠</p>
                                         <p v-if="priceObj.actStatus==1"><em @click="toLogin">登录</em>，参与促销活动</p>
-                                        <p class="c"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                        <p class="c"><a class="close" @click="hideThisLadder($event)"
+                                                        href="JavaScript:void(0);">了解</a></p>
                                     </div>
                                     <div v-else>
-                                        <p v-if="priceObj.ladderPriceFlag==1 && priceObj.userIdentity==4"><em @click="toUpgrade">升级会员</em>，享受阶梯价格优惠</p>
-                                        <p v-if="priceObj.actStatus==1 && priceObj.userIdentity==4"><em @click="toUpgrade">升级会员</em>，参与促销活动</p>
-                                        <p class="c"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                        <p v-if="priceObj.ladderPriceFlag==1 && priceObj.userIdentity==4"><em
+                                                @click="toUpgrade">升级会员</em>，享受阶梯价格优惠</p>
+                                        <p v-if="priceObj.actStatus==1 && priceObj.userIdentity==4"><em
+                                                @click="toUpgrade">升级会员</em>，参与促销活动</p>
+                                        <p class="c"><a class="close" @click="hideThisLadder($event)"
+                                                        href="JavaScript:void(0);">了解</a></p>
                                     </div>
                                 </div>
                             </div>
@@ -147,19 +173,26 @@
                         <span class="l">优惠券</span>
                         <i>：</i>
                         <span class="coupon-tags">
-                            <em class="couponTag" v-for="(coupon, index) in productCoupon" :key="index" v-text="'满'+coupon.touchPrice+'减'+coupon.couponAmount"></em>
+                            <em class="couponTag" v-for="(coupon, index) in productCoupon" :key="index"
+                                v-text="'满'+coupon.touchPrice+'减'+coupon.couponAmount"></em>
                             <em class="couponTag-more" @click="showPopup">更多></em>
                         </span>
                     </div>
-                    <div th:if="not${#strings.isEmpty(product.brandName)}" class="row"><span class="l">品牌</span><i>：</i><em th:text="*{brandName}"></em></div>
-                    <div class="row" th:if="not${#strings.isEmpty(product.unit)}"><span class="l">包装规格</span><i>：</i><em th:text="*{unit}"></em></div>
-                    <div class="row" th:if="not${#strings.isEmpty(product.productCode)}"><span class="l">商品编码</span><i>：</i><em th:text="*{productCode}"></em></div>
-                    <div class="row" th:if="not${#strings.isEmpty(product.stock)}"><span class="l">库存</span><i>：</i><em th:text="*{stock}"></em></div>
-                    <div class="row" th:if="not${#strings.isEmpty(product.minBuyNumber)}"><span class="l">起订量</span><i>：</i><em th:text="*{minBuyNumber}"></em></div>
+                    <div th:if="not${#strings.isEmpty(product.brandName)}" class="row"><span class="l">品牌</span><i>：</i><em
+                            th:text="*{brandName}"></em></div>
+                    <div class="row" th:if="not${#strings.isEmpty(product.unit)}"><span class="l">包装规格</span><i>：</i><em
+                            th:text="*{unit}"></em></div>
+                    <div class="row" th:if="not${#strings.isEmpty(product.productCode)}"><span
+                            class="l">商品编码</span><i>：</i><em th:text="*{productCode}"></em></div>
+                    <div class="row" th:if="not${#strings.isEmpty(product.stock)}"><span class="l">库存</span><i>：</i><em
+                            th:text="*{stock}"></em></div>
+                    <div class="row" th:if="not${#strings.isEmpty(product.minBuyNumber)}"><span
+                            class="l">起订量</span><i>：</i><em th:text="*{minBuyNumber}"></em></div>
                     <div v-show="GLOBAL_USER_ID && GLOBAL_USER_ID>0" class="row"><span class="l">采购量</span><i>：</i>
                         <span class="number">
                             <em class="sub" @click="numberSub()">-</em>
-                            <input type="number" :value="number" v-model="number" maxlength='6' @change="numberChange()">
+                            <input type="number" :value="number" v-model="number" maxlength='6'
+                                   @change="numberChange()">
                             <em class="add" @click="numberAdd()">+</em>
                         </span>
                         <input type="hidden" th:value="*{step}">
@@ -175,19 +208,25 @@
                     <img class="none-image" src="/img/base/icon-none.svg" alt="">
                     <p class="none-text">此商品已{{disabledText}},请浏览以下推荐商品~</p>
                 </div>
-                <div v-if="!isPC" class="wechatH5 btnBox"><img src="/img/base/wechat.h5.png" style="padding: 2.7vw 0"></div>
+                <div v-if="!isPC" class="wechatH5 btnBox"><img src="/img/base/wechat.h5.png" style="padding: 2.7vw 0">
+                </div>
                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
-                    <div  class="btnBox" v-if="priceObj.priceFlag==2 && priceObj.userIdentity==4">
-                        <a class="upgrade" href="/user/setting/upgrade.html" onclick="_czc.push(['_trackEvent','商品详情','点击','升级查看价格','','Um_Event_ProductUpgrade'])">升级会员查看价格</a>
+                    <div class="btnBox" v-if="priceObj.priceFlag==2 && priceObj.userIdentity==4">
+                        <a class="upgrade" href="/user/setting/upgrade.html"
+                           onclick="_czc.push(['_trackEvent','商品详情','点击','升级查看价格','','Um_Event_ProductUpgrade'])">升级会员查看价格</a>
                     </div>
-                    <div class="btnBox" v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2)">
-                        <a href="javascript:void(0);" class="cart icon" @click='addShopCart()' v-if="!isNoneDisabled" onclick="_czc.push(['_trackEvent','商品详情','点击','加入购物车','','Um_Event_ProductAddCart'])">加入购物车</a>
-                        <a href="javascript:void(0);" class="buy" @click="buyNowSubmit()" v-if="!isNoneDisabled" onclick="_czc.push(['_trackEvent','商品详情','点击','立即购买','','Um_Event_ProductBuyConfirm'])">立即购买</a>
+                    <div class="btnBox"
+                         v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2)">
+                        <a href="javascript:void(0);" class="cart icon" @click='addShopCart()' v-if="!isNoneDisabled"
+                           onclick="_czc.push(['_trackEvent','商品详情','点击','加入购物车','','Um_Event_ProductAddCart'])">加入购物车</a>
+                        <a href="javascript:void(0);" class="buy" @click="buyNowSubmit()" v-if="!isNoneDisabled"
+                           onclick="_czc.push(['_trackEvent','商品详情','点击','立即购买','','Um_Event_ProductBuyConfirm'])">立即购买</a>
                     </div>
                 </template>
                 <template v-else>
-                    <div  class="btnBox">
-                        <a href="javascript:void(0);" class="upgrade" @click="toLogin" v-if="!isNoneDisabled" onclick="_czc.push(['_trackEvent','商品详情','点击','登录查看价格','','Um_Event_ProductLoginPrice'])">登录查看价格</a>
+                    <div class="btnBox">
+                        <a href="javascript:void(0);" class="upgrade" @click="toLogin" v-if="!isNoneDisabled"
+                           onclick="_czc.push(['_trackEvent','商品详情','点击','登录查看价格','','Um_Event_ProductLoginPrice'])">登录查看价格</a>
                     </div>
                 </template>
             </div>
@@ -199,7 +238,8 @@
                     <li class="swiper-slide mfc" v-for="p in recommends">
                         <div class="item">
                             <a class="image" :href="'/product-'+p.productId+'.html'" target="_blank">
-                                <img :src="p.image" :alt="p.name" onerror="javascript:this.src='/img/base/placeholder.png';">
+                                <img :src="p.image" :alt="p.name"
+                                     onerror="javascript:this.src='/img/base/placeholder.png';">
                                 <span v-html="p.name"></span>
                             </a>
                         </div>
@@ -219,7 +259,8 @@
     <div class="wrap clear">
         <div v-if="!isPC" class="mShopBox">
             <a th:href="@{'/supplier-'+${product.shopId}+'.html'}">
-                <span class="name"><em th:text="${product.shopTitle}"></em><i th:if="not${#strings.isEmpty(product.license)}" class="icon mIcon shop"></i></span>
+                <span class="name"><em th:text="${product.shopTitle}"></em><i
+                        th:if="not${#strings.isEmpty(product.license)}" class="icon mIcon shop"></i></span>
                 <span>经营范围：<em th:text="${product.businessScope}"></em></span>
                 <span>所在地区：<em th:text="${product.shopAddress}"></em></span>
                 <span>满意度：<em><i th:each="i:${#numbers.sequence(1,5)}" class="mIcon heart"></i></em></span>
@@ -228,9 +269,13 @@
         <div class="productInfo">
             <div class="tabTit">
                 <span :class="tabsIndex == 0 ? 'on' : ''" @click="detailsClicktab(0)">商品详情</span>
-                <span :class="tabsIndex == 1 ? 'on' : ''" v-if="parameters.length>0 && !isNoneDisabled" @click="detailsClicktab(1)">相关参数</span>
-                <span :class="tabsIndex == 2 ? 'on' : ''" v-if="isServiceInfo && !isNoneDisabled" @click="detailsClicktab(2)">服务项目</span>
-                <span :class="tabsIndex == 3 ? 'on' : ''" v-if="isTrainingMethod" @click="detailsClicktab(3)">培训方案</span>
+                <span :class="tabsIndex == 1 ? 'on' : ''" v-if="parameters.length>0 && !isNoneDisabled"
+                      @click="detailsClicktab(1)">相关参数</span>
+                <span :class="tabsIndex == 2 ? 'on' : ''" v-if="isServiceInfo && !isNoneDisabled"
+                      @click="detailsClicktab(2)">服务项目</span>
+                <span :class="tabsIndex == 3 ? 'on' : ''" v-if="isTrainingMethod"
+                      @click="detailsClicktab(3)">培训方案</span>
+                <span v-if="archiveId !== 0" :class="tabsIndex == 4 ? 'on' : ''" @click="detailsClicktab(4)">相关资料</span>
                 <!--<span>评价</span>-->
             </div>
             <div class="tabCon">
@@ -260,18 +305,105 @@
                     <div><p class="tl">培训方式: <span class="sm" v-text="trainingMethodText"></span></p></div>
                     <div><p class="tl">培训费用: <span class="sm" v-text="trainingType"></span></p></div>
                 </div>
-<!--                <div class="item">-->
-<!--                <div style="text-align: left;margin: 10px 0">-->
-<!--                        <span>商品评分：</span>-->
-<!--                        <i th:each="i:${#numbers.sequence(1,5)}" class="icon mIcon comment"></i>-->
-<!--                        <span class="comment-right">评价（）</span>-->
-<!--                    </div>-->
-<!--                    <div class="pingjia">-->
-<!--                        <input type="text" class="commtext"   placeholder="对已购商品进行评论！"/>-->
-<!--                        <button>评价</button>-->
-<!--                    </div>-->
-<!--                    <p class="comment">该商品暂无评价!</p>-->
-<!--                </div>-->
+                <!-- 资料列表 -->
+                <div class="item cm-database" v-if="archiveId !== 0 && tabsIndex == 4">
+                    <!-- 提示 -->
+                    <div class="cm-goLogin" v-if="TipStatus">
+                        <span v-text="TipStatus.text"></span>
+                        <span v-text="TipStatus.btn" v-if="TipStatus.btn" @click="handleClickToPage(TipStatus.redirect)"></span>
+                    </div>
+                    <!-- 图片区域 -->
+                    <div class="cm-category cm-image">
+                        <div class="cm-category-title">图片资料</div>
+                        <div class="cm-content">
+                            <div class="cm-none" v-if="imageArchiveList.length <= 0">暂无相关资料</div>
+                            <template v-else>
+                                <div class="cm-section" v-for="(item, index) in imageArchiveList" :key="index">
+                                    <div class="cm-title" v-html="item.title"></div>
+                                    <div class="cm-time">{{ item.addTime | formatTime }} </div>
+                                    <div class="cm-detail  clear cm-images" :class="{'cm-one':item.imageNum === 1,'cm-two':item.imageNum === 2,'cm-list':item.imageNum>2   }">
+                                        <!--可查看图片列表-->
+                                        <template v-if="item.imageList">
+                                            <div class="cm-img-box" @click="handleShowImage" v-for="(image, i) in formatImage(item.imageList)" :key="i">
+                                                <img :src="image.imageUrl"/>
+                                            </div>
+                                        </template>
+                                        <!--不可查看图片列表 默认图片-->
+                                        <template v-else>
+                                            <div class="cm-img-box" @click="handleShowImage" v-for="(image, i) in item.imageNum" :key="i">
+                                                <img :src="defaultImage" width="100%" height="100%">
+                                            </div>
+                                        </template>
+                                    </div>
+                                </div>
+                            </template>
+                        </div>
+                    </div>
+                    <!-- 视频区域 -->
+                    <div class="cm-category">
+                        <div class="cm-category-title">视频资料</div>
+                        <div class="cm-content">
+                            <div class="cm-none" v-if="videoArchiveList.length<=0">暂无相关资料</div>
+                            <template v-else>
+                                <div class="cm-section" v-for="(item, index) in videoArchiveList" :key="index">
+                                    <div class="cm-title" v-html="item.title"></div>
+                                    <div class="cm-time">{{ item.addTime | formatTime }}</div>
+                                    <div class="cm-detail clear">
+                                        <div class="cm-video-box">
+                                            <span class="cm-player-btn" @click="handleShowPlayer(item.fileUrl)"></span>
+                                            <video :src="item.fileUrl && item.fileUrl" :poster="item.fileUrl ? '' : videoCover ">
+                                                您的浏览器不支持Video标签。
+                                            </video>
+                                        </div>
+                                    </div>
+                                </div>
+                            </template>
+                        </div>
+                        <!-- 弹出播放窗口 -->
+                        <div class="cm-player" v-if="showVideoDialog" @click="handleClosePlayer">
+                            <span class="cm-player-btn" @click.stop="handlePlayer" v-if="!isPlayer"></span>
+                            <video controls ref="videoRef" autoplay>
+                                <source :src="currentVideoUrl" type="video/mp4">
+                                您的浏览器不支持Video标签。
+                            </video>
+                        </div>
+                    </div>
+                    <!-- 文件区域 -->
+                    <div class="cm-category cm-file">
+                        <div class="cm-category-title">文件资料</div>
+                        <div class="cm-content">
+                            <div class="cm-none" v-if="fileArchiveList.length<=0">暂无相关资料</div>
+                            <template v-else>
+                                <div class="clear cm-section" v-for="(item, index) in fileArchiveList">
+                                    <div class="cm-cover">
+                                        <img src="/img/info/PC-pdf.png" v-if="/\.pdf/.test(item.fileName)">
+                                        <img src="/img/info/PC-doc.png" v-else-if="/\.doc/.test(item.fileName)">
+                                        <img src="/img/info/PC-ppt.png" v-else>
+                                    </div>
+                                    <div class="cm-detail">
+                                        <div class="cm-title" v-html="item.title"></div>
+                                        <div class="cm-row clear">
+                                            <span class="cm-time">{{ item.addTime | formatTime }}</span>
+                                            <span class="cm-view" @click="handlePreviewOffice(item)">预览文件</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </template>
+                        </div>
+                    </div>
+                </div>
+                <!--                <div class="item">-->
+                <!--                <div style="text-align: left;margin: 10px 0">-->
+                <!--                        <span>商品评分：</span>-->
+                <!--                        <i th:each="i:${#numbers.sequence(1,5)}" class="icon mIcon comment"></i>-->
+                <!--                        <span class="comment-right">评价（）</span>-->
+                <!--                    </div>-->
+                <!--                    <div class="pingjia">-->
+                <!--                        <input type="text" class="commtext"   placeholder="对已购商品进行评论！"/>-->
+                <!--                        <button>评价</button>-->
+                <!--                    </div>-->
+                <!--                    <p class="comment">该商品暂无评价!</p>-->
+                <!--                </div>-->
             </div>
         </div>
         <div v-if="isPC" class="rgt">
@@ -279,18 +411,20 @@
                 <div class="hd">供应商信息</div>
                 <div class="bd">
                     <a th:href="@{'/supplier-'+ ${product.shopId} +'.html'}">
-                        <div class="name"><span th:text="${product.shopTitle}"></span><i th:if="not${#strings.isEmpty(product.license)}" class="icon shop"></i></div>
+                        <div class="name"><span th:text="${product.shopTitle}"></span><i
+                                th:if="not${#strings.isEmpty(product.license)}" class="icon shop"></i></div>
                     </a>
                     <template th:if="not${#strings.isEmpty(product.businessScope)}">
                         <div class="tit">经营范围：</div>
                         <div class="con" th:text="${product.businessScope}"></div>
                     </template>
-                    <template  th:if="not${#strings.isEmpty(product.shopAddress)}">
+                    <template th:if="not${#strings.isEmpty(product.shopAddress)}">
                         <div class="tit">所在地区：</div>
                         <div class="con" th:text="${product.shopAddress}"></div>
                     </template>
                     <div class="tit">满意度：<i th:each="i:${#numbers.sequence(1,5)}" class="icon heart"></i></div>
-                    <a th:href="@{'/supplier-'+ ${product.shopId} +'.html'}" class="btn" onclick="_czc.push(['_trackEvent','商品详情','点击','查看主页','','Um_Event_ProductShopHome'])">查看主页</a>
+                    <a th:href="@{'/supplier-'+ ${product.shopId} +'.html'}" class="btn"
+                       onclick="_czc.push(['_trackEvent','商品详情','点击','查看主页','','Um_Event_ProductShopHome'])">查看主页</a>
                 </div>
             </div>
             <div class="contact">
@@ -309,8 +443,10 @@
                 <div class="title"><p>优惠券</p><i class="icon mIcon" @click="hidePopup"></i></div>
                 <div class="coupon-popup-main">
                     <div class="coupon-popup-tabs">
-                        <div class="popup-tabs-cell" :class="currentTab == 1 ? 'active' : ''" @click="queryCouponTabs(1)"><span>未领取</span></div>
-                        <div class="popup-tabs-cell" :class="currentTab == 2 ? 'active' : ''" @click="queryCouponTabs(2)"><span>已领取</span></div>
+                        <div class="popup-tabs-cell" :class="currentTab == 1 ? 'active' : ''"
+                             @click="queryCouponTabs(1)"><span>未领取</span></div>
+                        <div class="popup-tabs-cell" :class="currentTab == 2 ? 'active' : ''"
+                             @click="queryCouponTabs(2)"><span>已领取</span></div>
                     </div>
                     <div class="coupon-popup-content">
                         <div class="empty" v-if="isCouponEmpty">
@@ -318,14 +454,16 @@
                             <div class="msg"><p>暂无可领的优惠券</p></div>
                         </div>
                         <div class="coupon-popup-scroll" v-else>
-                            <div class="coupon-list-cell" v-for="(coupon, index) in productCouponList" :key="index" :class="currentTab == 2 ? 'none' : ''">
+                            <div class="coupon-list-cell" v-for="(coupon, index) in productCouponList" :key="index"
+                                 :class="currentTab == 2 ? 'none' : ''">
                                 <div class="coupon-list-le">
                                     <div class="coupon-list-money">
-                                        <p>￥<span class="maxMoney">{{ coupon.couponAmount }}</span><span class="minMoney">满{{ coupon.touchPrice }}可用</span></p>
+                                        <p>￥<span class="maxMoney">{{ coupon.couponAmount }}</span><span
+                                                class="minMoney">满{{ coupon.touchPrice }}可用</span></p>
                                     </div>
                                     <div class="coupon-list-name">
                                         <p v-if="coupon.couponType == 0">
-                                            {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : '仅可购买指定商品'  }}
+                                            {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : '仅可购买指定商品' }}
                                         </p>
                                         <p v-if="coupon.couponType == 1">
                                             {{ coupon.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
@@ -352,8 +490,12 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script src="https://cdn.bootcdn.net/ajax/libs/moment.js/2.29.1/moment.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/magnifier.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/viewer.min.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/beautyArchive.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/document/beautyArchiveDetailMixin.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/product/detail.js(v=${version})}"></script>
 </body>
 </html>