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

# Conflicts:
#	target/www-0.0.1-SNAPSHOT.jar

src/main/resources/static/css/product/qualityauthorize.css

@@ -20,8 +20,8 @@ ul{margin:0;padding:0;list-style-type:none}
 .container-content .content-top-left{width:50%;float:left;height:100%}
 .container-main{width:1184px;height:590px;margin:0 auto;padding:25px;background:#FFF;border-radius:2px;-webkit-box-sizing:border-box;box-sizing:border-box}
 .container-main .img-box{float:left;position:relative;width:540px;height:540px;border:1px solid #ececec;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden}
-.container-main .img-box .origin-logo-box{text-align:center;width:140px;position:absolute;top:45px;left:26px;z-index:10}
-.container-main .img-box .product-brand{max-width:140px;height:auto}
+.container-main .img-box .origin-logo-box{text-align:center;width:80px;position:absolute;top:26px;left:26px;z-index:10}
+.container-main .img-box .product-brand{max-width:80px;height:auto}
 .container-main .img-box .product-img{width:100%;height:100%}
 .container-main .img-box .product-authorize{width:72px;height:72px;position:absolute;bottom:20px;right:30px;z-index:10}
 .product-desc{width:570px;line-height:30px;color:#101010;float:right}
@@ -30,6 +30,7 @@ ul{margin:0;padding:0;list-style-type:none}
 .product-desc .pink-box a{color:#bc1724}
 .product-desc .default-box{padding:10px 0;border-top:1px solid #eee;border-bottom:1px solid #eee}
 .product-desc .dls{color:#999}
+.product-desc .statement{padding-right: 15px;text-align: right}
 .product-desc .statement a{color:#bc1724}
 .product-desc .statement a .icon-wenhao{font-weight: bold;margin-left: 5px}
 /*.product-desc .statement a::after{content:'?';display:inline-block;width:14px;height:14px;text-align:center;line-height:16px;font-size:14px;border:1px solid #bc1724;border-radius:50%;margin-left:5px}*/
@@ -72,14 +73,14 @@ ul{margin:0;padding:0;list-style-type:none}
 .container-main{width:100vw}
 .container-main .img-box{width:100vw;position:relative}
 .container-main .product-img{width:100vw}
-.container-main .img-box .origin-logo-box{position:absolute;top:4vw;left:4vw;max-width:30vw;text-align:center;z-index:9}
-.container-main .img-box .origin-logo-box img{max-width:30vw}
+.container-main .img-box .origin-logo-box{position:absolute;top:4vw;left:4vw;max-width:16vw;text-align:center;z-index:9}
+.container-main .img-box .origin-logo-box img{max-width:16vw}
 .container-main .img-box .product-authorize{width:13.8vw;height:13.8vw;position:absolute;bottom:3.2vw;right:4vw}
 .product-desc a{color:#bc1724}
 .product-desc h3{background:-o-linear-gradient(left,#101010,#404040);background:-webkit-gradient(linear,left top,right top,from(#101010),to(#404040));background:linear-gradient(to right,#101010,#404040);color:#fefefe;padding:4vw;font-size:4.4vw}
 .product-desc .pink-box{padding:3.2vw 4vw;background:rgb(251,241,242);color:#bc1724;line-height:8vw}
 .product-desc .default-box{width:92.3vw;margin:0 auto;padding:3.2vw 0;border-bottom:0.4vw solid #eee;line-height:8vw}
-.product-desc .statement a{display:block;padding-right:20px;width:23.6vw;}
+.product-desc .statement a{display:block;text-align: right}
 .product-desc .statement a .icon-wenhao{font-weight: bold;margin-left: 5px;}
 .product-desc p{padding:3.2vw 4vw;line-height:6vw}
 .product-desc .sn-number{padding:3.2vw 0;background:#f5f5f5}

src/main/resources/static/js/index.js

@@ -321,16 +321,17 @@ var homeData = new Vue({
         $('#advertising').on('click','.close',function () {
             $(this).parents('.item').hide();
         });
-        var isActivityStatus =  localStorage.getItem('isActivityStatus');
-        //新加优惠券弹窗
-        if(isActivityStatus){
-            var  lockTime = localStorage.getItem('lockTime');
-            _this.popupFlag = this.diffTime(lockTime);
-        }else{
-            setTimeout(function () {
-                 _this.popupFlag = true;
-            },1000);
-        }
+        // var isActivityStatus =  localStorage.getItem('isActivityStatus');
+        // //新加优惠券弹窗
+        // if(isActivityStatus){
+        //     var  lockTime = localStorage.getItem('lockTime');
+        //     var  eTime = this.diffTime(lockTime);
+        //     _this.showflag = eTime;
+        // }else{
+        //     setTimeout(function () {
+        //          _this.showflag = true;
+        //     },1000);
+        // }
     }
 });
 

src/main/resources/static/js/product/instruement.js

@@ -14,7 +14,8 @@
             userId:'',
             source:1
          },
-         nav_linkName:''
+         nav_linkName:'',
+         isPC:window.isPC
     },
     filters:{
          NumFormat:function(value) {//处理金额

src/main/resources/static/js/product/qualityauthorize.js

@@ -7,7 +7,7 @@ var qualityAuthorize = new Vue({
         //是否显示声明对话框
         showStatement:false,
         //是否为手机屏幕
-        isMobile:false,
+        isPC:window.isPC,
         //产品id
         productId:'5',
         //产品参数对象
@@ -41,6 +41,9 @@ var qualityAuthorize = new Vue({
                 if(res.code === 0){
                     _that.parameters = res.data;
                     console.log(_that.parameters)
+                }else{
+                    //如果该产品不存在，跳转到404页面
+                    window.location.href = '/404.html'
                 }
            });
         },

src/main/resources/static/js/user-center/setting/information.js

@@ -306,6 +306,7 @@ var informationPage = new Vue({
             var inputDOM = _self.$refs.businessLicenseImage;
             var file = inputDOM.files;
             _self.formData.append('file', file[0]);
+            console.log(file)
             PublicApi.uploadimg(_self.formData,function(response){
                 _self.clubUpgradeUser.businessLicense = response.data;
                 event.target.value = '';

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

@@ -53,7 +53,7 @@
                                     <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
                                         <a  class="img01 page_main_item" :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
                                         :class="page.floorContent.adsLink1!='' ? '' : 'default' " >
-                                        <img :src="page.floorContent.pcAdsImage1"/></a>
+                                        <img :src="isPC?page.floorContent.pcAdsImage1:page.floorContent.appletsAdsImage1"/></a>
                                         <a class="productItem" :href="pros.link" v-for="(pros,index) in page.floorImageList" >
                                             <img :src="pros.image ? pros.image : '/img/base/placeholder.png'" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
@@ -124,8 +124,8 @@
                                     <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
                                         <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
                                         class="img01 page_main_item" :class="page.floorContent.adsLink1!='' ? '' : 'default' ">
-                                        <img  :src="page.floorContent.pcAdsImage1" alt=""> </a>
-                                        <a :href="page.floorContent.adsLink2" class="img02 page_main_item"><img  :src="page.floorContent.pcAdsImage2" alt=""> </a>
+                                        <img  :src="isPC?page.floorContent.pcAdsImage1:page.floorContent.appletsAdsImage1" alt=""> </a>
+                                        <a :href="page.floorContent.adsLink2" class="img02 page_main_item"><img  :src="isPC?page.floorContent.pcAdsImage2:page.floorContent.appletsAdsImage2" alt=""> </a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
@@ -195,9 +195,9 @@
                                 <div class="hotList">
                                     <div class="section_page_main type clear mfw" :class="page.isPageMore ? '' : 'max'">
                                         <a class='imgbaner page_main_item' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
-                                         :class="page.floorContent.adsLink1!='' ? '' : 'default' "><img :src="page.floorContent.pcAdsImage1"></a>
+                                         :class="page.floorContent.adsLink1!='' ? '' : 'default' "><img :src="isPC?page.floorContent.pcAdsImage1:page.floorContent.appletsAdsImage1"></a>
                                         <a class="img01 page_main_item" :href="page.floorContent.adsLink2!='' ? page.floorContent.adsLink2 : 'javascript:void(0)'"
-                                        :class="page.floorContent.adsLink2!='' ? '' : 'default' "><img :src="page.floorContent.pcAdsImage2"/></a>
+                                        :class="page.floorContent.adsLink2!='' ? '' : 'default' "><img :src="isPC?page.floorContent.pcAdsImage2:page.floorContent.appletsAdsImage2"/></a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
@@ -268,13 +268,13 @@
                                     <div class="section_page_main type clear mfw"  :class="page.isPageMore ? '' : 'max'">
                                         <a class='imgbaner page_main_item' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
                                          :class="page.floorContent.adsLink1!='' ? '' : 'default' ">
-                                         <img :src="page.floorContent.pcAdsImage1"></a>
+                                         <img :src="isPC?page.floorContent.pcAdsImage1:page.floorContent.appletsAdsImage1"></a>
                                         <a class="img01 page_main_item" :href="page.floorContent.adsLink2!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
                                         :class="page.floorContent.adsLink2!='' ? '' : 'default' ">
-                                        <img :src="page.floorContent.pcAdsImage2"/></a>
+                                        <img :src="isPC?page.floorContent.pcAdsImage2:page.floorContent.appletsAdsImage2"/></a>
                                         <a class="img02 page_main_item" :href="page.floorContent.adsLink3!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
                                         :class="page.floorContent.adsLink3!='' ? '' : 'default' ">
-                                        <img :src="page.floorContent.pcAdsImage3"/></a>
+                                        <img :src="isPC?page.floorContent.pcAdsImage3:page.floorContent.appletsAdsImage3"/></a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
@@ -344,7 +344,7 @@
                                 <div class="hotList">
                                     <div class="section_page_main type clear mfw" :class="page.isPageMore ? '' : 'max'">
                                         <a class='imgbaner page_main_item' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
-                                        :class="page.floorContent.adsLink1!='' ? '' : 'default' "><img :src="page.floorContent.pcAdsImage1"></a>
+                                        :class="page.floorContent.adsLink1!='' ? '' : 'default' "><img :src="isPC?page.floorContent.pcAdsImage1:page.floorContent.appletsAdsImage1"></a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
@@ -474,7 +474,7 @@
                                         </a>
                                     </div>
                                      <a class='imgbaner page_main_item' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
-                                     :class="page.floorContent.adsLink1!='' ? '' : 'default' "><img :src="page.floorContent.pcAdsImage1"></a>
+                                     :class="page.floorContent.adsLink1!='' ? '' : 'default' "><img :src="isPC?page.floorContent.pcAdsImage1:page.floorContent.appletsAdsImage1"></a>
                                     <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>
                                 </div>
                              </div>

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

@@ -25,31 +25,36 @@
             <div class="container-main fl-clear">
                 <!-- 图片区域 -->
                 <div class="img-box">
-                    <img class="product-img" :src="parameters.image">
+                    <img class="product-img" :src="isPC?parameters.pcImage:parameters.appletsImage">
                     <div class="origin-logo-box"><img class="product-brand" :src="parameters.authLogo"></div>
                     <img class="product-authorize" src="/img/quality/pro-authorization.png">
-                    <img class="sq-book" @click="showSqBookModal" v-show="!isShowSqBookModal" :src="parameters.certificateImage">
+                    <img class="sq-book" @click="showSqBookModal" v-show="!isShowSqBookModal" :src="isPC?parameters.pcCertificateImage:parameters.appletsCertificateImage">
                 </div>
                 <!-- 商品介绍区域 -->
                 <div class="product-desc">
                     <!-- 商品介绍区域 -->
-                    <h3>{{parameters.name}}</h3>
+                    <h3>{{parameters.productName}}</h3>
                     <div class="pink-box">
                         <div class="item-row"><span>品牌：{{parameters.brandName}}</span></div>
                         <div class="fl-clear">
                             <span class="fl-left">产地：{{parameters.productionPlace}}</span>
-                            <a class="fl-right" target="_blank" :href="parameters.securityLink" v-if="parameters.securityLink">防伪官网>></a></div>
+                            <a class="fl-right" target="_blank" :href="parameters.securityLink" v-if="parameters.securityLink">官网认证>></a></div>
                     </div>
                     <!-- 代理声明区域-->
-                    <div class="default-box" v-if="parameters.agentFlag === 1">
-                        <div class="item-row"><span class="dls">代理商：</span><span>{{parameters.agentName}}</span></div>
+                    <div class="default-box" v-if="parameters.shopType === 2">
+                        <div class="item-row"><span class="dls">代理商：</span><span>{{parameters.shopName}}</span></div>
                         <div class="item-row statement">
-                            <!-- 链接 -->
-                            <a :href="parameters.statementLink" v-if="parameters.statementType === 2">代理声明<i class="iconfont icon-wenhao"></i></a>
                             <!-- 弹窗 -->
-                            <a href="#" @click.prevent="openStatementDialog(1)" v-else>代理声明<i class="iconfont icon-wenhao"></i></a></div>
+                            <a href="#" @click.prevent="openStatementDialog(1)" v-if="parameters.statementType === 1">代理声明>></a>
+                            <!-- 链接 -->
+                            <a :href="parameters.statementLink" target="_blank" v-if="parameters.statementType === 2">代理声明>></a>
+                            <!-- 图片 -->
+                            <a :href="parameters.statementImage" target="_blank" v-if="parameters.statementType === 3">代理声明>></a>
+                            <!-- 文件 -->
+                            <a :href="parameters.statementFile.url" target="_blank" v-if="parameters.statementType === 4" :download="parameters.statementFile.name">代理声明>></a>
+                        </div>
                     </div>
-                    <p>该仪器由{{parameters.agentFlag !== 0 ? parameters.agentName : parameters.brandName}}授予{{parameters.authParty}}正品拥有</p>
+                    <p>该仪器由{{parameters.agentFlag !== 0 ? parameters.shopName : parameters.brandName}}授予{{parameters.authParty}}正品拥有</p>
                     <div class="pink-box sn-number">
                         <div class="item-row"><span>SN码：{{parameters.snCode | snCode}}</span></div>
                     </div>
@@ -61,7 +66,7 @@
                 <table class="params mobile">
                     <tbody>
                     <tr v-for="(item , index) in parameters.paramList" :key="index">
-                        <td style="width: 80px;">{{item.name}}</td>
+                        <td style="width: 80px;">{{item.name}}：</td>
                         <td>{{item.content}}</td>
                     </tr>
                     </tbody>
@@ -100,7 +105,7 @@
         <transition enter-active-class="myZoomIn" leave-active-class="myZoomOut">
             <div class="sq-book-img myZoomIn"  v-show="isShowSqBookModal">
                     <i class="close" @click="hideSqBookModal"></i>
-                    <img :src="parameters.certificateImage">
+                    <img :src="isPC?parameters.pcCertificateImage:parameters.appletsCertificateImage">
             </div>
         </transition>
     </template>