Merge remote-tracking branch 'origin/feature/v4.9.27' into dev/v4.9.27_fu

src/web/staticres/common-module/order-list/js/order-list-config.js

@@ -480,8 +480,8 @@ var assetsConf = {
       app: '/jyapp/pay/checkout_docMember'
     },
     renew: {
-      wx: '/jy_mobile/order/create/docMember',
-      app: '/jy_mobile/order/create/docMember'
+      wx: '/jy_mobile/order/create/docsvip',
+      app: '/jy_mobile/order/create/docsvip'
     },
     orderDetail: {
       wx: '/weixin/common/docMember/orderDetail',

src/web/staticres/common-module/pc-dialog/js/pc-collect-user-info.js

@@ -447,6 +447,7 @@ var vm = new Vue({
         'pc_briefinghomepage_dzhfxbg': '帮您透视行业，轻松把握行业核心需求',
         'pc_briefinglist_dzhfxbg': '帮您透视行业，轻松把握行业核心需求',
         'pc_briefingdetails_dzhfxbg': '帮您透视行业，轻松把握行业核心需求',
+        'pc_Library_details_free': '此文档为剑鱼文库的付费下载内容，提交资料后可免费下载。'
       },
       isRefresh: false, // 留完资是否需要刷新页面
       sourceDescMap: {
@@ -537,6 +538,9 @@ var vm = new Vue({
         if (this.source === 'pc_briefinghomepage_dzhfxbg' || this.source === 'pc_briefinglist_dzhfxbg' || this.source === 'pc_briefingdetails_dzhfxbg') {
           return '我们会快马加鞭的与您联系，请您保持电话畅通。'
         }
+        if (this.source === 'pc_Library_details_free') {
+          return '请返回文档页面免费下载，如需获取更多文档，请开通剑鱼文库会员。'
+        }
         return '我们会尽快联系您并预约演示时间，请耐心等待～<br>您将获得免费体验大会员全部功能！'
       }
     }
@@ -633,6 +637,9 @@ var vm = new Vue({
         } else if (source === 'pc_briefinghomepage_dzhfxbg' || source === 'pc_briefinglist_dzhfxbg' || source === 'pc_briefingdetails_dzhfxbg') {
           this.dialogTitle = text
           this.dialogTitleTop = '免费获取行业分析报告'
+        } else if (source === 'pc_Library_details_free') {
+          this.dialogTitle = text
+          this.dialogTitleTop = '申请免费下载文档'
         }
         // else if (source.indexOf("article_collection") > -1){
         //   this.dialogTitle = text

src/web/staticres/common-module/perfect-info/js/perfect-info.js

@@ -163,6 +163,10 @@ var titleMap = {
   app_article_CustomerRecommend: '申请客户推荐权限',
   wx_article_CustomerRecommend: '申请客户推荐权限',
   h5_article_CustomerRecommend: '申请客户推荐权限',
+  // 文库
+  h5_library_details_free: '申请免费下载文档',
+  app_library_details_free: '申请免费下载文档',
+  wx_library_details_free: '申请免费下载文档'
 }
 
 // tip
@@ -368,6 +372,10 @@ var tipMap = {
   app_article_CustomerRecommend: '请升级大会员，为您推荐潜在业务需求客户并提供联系方式。',
   wx_article_CustomerRecommend: '请升级大会员，为您推荐潜在业务需求客户并提供联系方式。',
   h5_article_CustomerRecommend: '请升级大会员，为您推荐潜在业务需求客户并提供联系方式。',
+    // 文库
+  h5_library_details_free: '此文档为剑鱼文库的付费下载内容，提交资料后可免费下载。',
+  app_library_details_free: '此文档为剑鱼文库的付费下载内容，提交资料后可免费下载。',
+  wx_library_details_free: '此文档为剑鱼文库的付费下载内容，提交资料后可免费下载。'
 }
 
 // 留资来源（数据库新增字段，记录留资对应的来源，之前未记录的不考虑，新增的source要记录）
@@ -478,6 +486,10 @@ var sourceDescMap = {
   app_article_cqxmmore: '标讯详情页-申请查看更多超前项目',
   wx_article_cqxmmore: '标讯详情页-申请查看更多超前项目',
   h5_article_cqxmmore: '标讯详情页-申请查看更多超前项目',
+      // 文库
+  h5_library_details_free: '文库详情-免费下载',
+  app_library_details_free: '文库详情-免费下载',
+  wx_library_details_free: '文库详情-免费下载'
 }
 
 var vNode = {
@@ -1660,6 +1672,14 @@ var vNode = {
                  },'提交成功')
                   break
                 }
+                case 'h5_library_details_free':
+                case 'app_library_details_free':
+                case 'wx_library_details_free':{
+                    _this.showMessage('请返回文档页面免费下载，如需获取更多文档，请开通剑鱼文库会员。', '我知道了', function () {
+                      history.back()
+                    },'提交成功')
+                    break
+              }    // 文库
               default: {
                 var biaoshu = source === 'bid_document_Introduction_page' || source.indexOf('article_BidPreparation') > -1
                 // 标书制作或者三方认证(case语句满足不了条件，放default中做更多判断)

src/web/staticres/pccss/index_pc.css

@@ -240,6 +240,19 @@
   font-size: 11px;
   line-height: 14px;
 }
+.doc-card-list-item-img.good::after{
+  content: '精品';
+  padding: 2px 6px;
+  position: absolute;
+  left: 0;
+  top: 0;
+  border-radius: 4px 0px 9px 0;
+  background: linear-gradient(to right,rgba(255, 124, 50, 1), rgba(243, 56, 56, 1));
+  color: #FFF;
+  text-align: center;
+  font-size: 11px;
+  line-height: 14px;
+}
 .doc-card-list-item .doc-main-img{
   width: 100%;
   height: 100%;

src/web/templates/frontRouter/pc/docs/sess/index.html

@@ -44,8 +44,8 @@
     <link rel="preload" href="https://cdn-common.jianyu360.com/cdn/lib/single-spa/4.3.7/lib/system/single-spa.min.js" as="script" crossorigin="anonymous" />
     <link rel="preload" href="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js" as="script" crossorigin="anonymous" />
     <script src="https://cdn-common.jianyu360.com/cdn/lib/import-map-overrides/2.2.0/dist/import-map-overrides.js"></script>
-    <script src="https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266//build/pdf.min.js"></script>
-    <script src="https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266//web/pdf_viewer.js"></script>
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266/build/pdf.min.js"></script>
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266/web/pdf_viewer.js"></script>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/system.min.js"></script>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/extras/amd.min.js"></script>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/extras/named-exports.js"></script>
@@ -74,6 +74,7 @@
 <body class="page--docs--index">
 {{include "/site/common/pc-school-head.html"}}
 <!-- S-注入  -->
+<div id="vue-collect-user-info"></div>
 <div class="w-box page-container">
     <div class="w1200">
         <div id="single-spa-app"></div>
@@ -87,6 +88,7 @@
     Promise.all([System.import('single-spa'), System.import('vue'), System.import('vue-router')]).then(function (modules) {
       var singleSpa = modules[0];
       var Vue = modules[1];
+      window.Vue = Vue
       var VueRouter = modules[2];
 
       Vue.use(VueRouter)

src/web/templates/order/pc/paySuccess.html

@@ -144,7 +144,7 @@
                 <a class="check_order sm-size" id="goBack2" style="display: none;">立即返回</a>
                 <a class="check_order sm-size default" href="/front/integral/integralDetail?order_code={{.T.orderCode}}">查看订单</a>
             {{else if eq .T.orderType "docMember"}}
-            <a class="check_order default" href="/front/integral/integralDetail?order_code={{.T.orderCode}}">查看订单</a>
+            <a class="check_order default" href="/front/docMember/orderDetail?order_code={{.T.orderCode}}">查看订单</a>
             <a class="check_order" href="javascript:;" onclick="getDocsJumpUrl()">获取文档</a>
             {{end}}
             </div>

src/web/templates/pc/invoice.html

@@ -209,6 +209,7 @@
                 history.back()
             }
         })
+        var regExpPhone = /^(1[3|4|5|6|7|8|9])\d{9}$|^0\d{2,3}-?\d{7,8}$|^400[016789]\d{6}$|^400-[016789]\d{2}-\d{4}$/
         var invoiceNode = new Vue({
           el: '#invoice',
           delimiters: ['${', '}'],
@@ -386,12 +387,12 @@
               }
             },
             validatePhone: (rule, value, callback) => {
-              const regPhone = /^1[3-9]\d{9}$/; // 手机号正则
-              const regTel = /^0\d{2,3}-?\d{7,8}$/ // 座机号码正则
+              // const regPhone = /^1[3-9]\d{9}$/; // 手机号正则
+              // const regTel = /^0\d{2,3}-?\d{7,8}$/ // 座机号码正则
               if(!value) {
                 return callback(new Error('请输入手机号'));
               } else {
-                if (regPhone.test(value) || regTel.test(value)) {
+                if (regExpPhone.test(value)) {
                   return callback()
                 } else {
                   return callback(new Error('联系电话格式不正确'))
@@ -399,10 +400,10 @@
               }
             },
             validateTelPhone: (rule, value, callback) => {
-              const regPhone = /^1[3-9]\d{9}$/; // 手机号正则
-              const regTel = /^0\d{2,3}-?\d{7,8}$/ // 座机号码正则
+              // const regPhone = /^1[3-9]\d{9}$/; // 手机号正则
+              // const regTel = /^0\d{2,3}-?\d{7,8}$/ // 座机号码正则
               if(invoiceNode.ruleForm.invoice_variety === '电子专用发票') {
-                if (regPhone.test(value) || regTel.test(value)) {
+                if (regExpPhone.test(value)) {
                   return callback()
                 } else {
                   return callback(new Error('电话号码格式不正确'))
@@ -412,7 +413,7 @@
                 if(!value) {
                   return callback()
                 } else {
-                  if(regPhone.test(value) || regTel.test(value)) {
+                  if(regExpPhone.test(value)) {
                     return callback()
                   } else {
                     return callback(new Error('电话号码格式不正确'))

src/web/templates/pc/template/index/doc-card-module.html

@@ -16,16 +16,18 @@
           <ul class="bidding-desc-card-column clearfix">
             {{range $kk,$vv := $v}}
             <li class="doc-card-list-item">
-              <div class='doc-card-list-item-img {{if not $vv.productType}}{{else}}free{{end}}'>
+              <div class='doc-card-list-item-img {{if not $vv.productType}}{{else if Eq $vv.productType 1}}free{{else if Eq $vv.productType 2}}good{{end}}'>
                 <img class="doc-main-img" src="{{$vv.previewImg}}" alt="doc-name">
-                {{if or (eq $vv.docFileSuffix ".doc") (eq $vv.docFileSuffix ".docx") (eq $vv.docFileSuffix "doc")}}
+                {{if or (eq $vv.docFileSuffix "doc") (eq $vv.docFileSuffix "docx")}}
                 <img class="doc-type-img" src='/images/pc/word.png' alt="doc-type">
-                {{else if  eq $vv.docFileSuffix ".pdf"}}
+                {{else if  eq $vv.docFileSuffix "pdf"}}
                 <img class="doc-type-img" src='/images/pc/pdf.png' alt="doc-type">
-                {{else if  eq $vv.docFileSuffix ".ppt"}}
+                {{else if  eq $vv.docFileSuffix "ppt"}}
                 <img class="doc-type-img" src='/images/pc/ppt.png' alt="doc-type">
-                {{else if  eq $vv.docFileSuffix ".excel"}}
+                {{else if  eq $vv.docFileSuffix "xls"}}
                 <img class="doc-type-img" src='/images/pc/excel.png' alt="doc-type">
+                {{else if  eq $vv.docFileSuffix "txt"}}
+                <img class="doc-type-img" src='/images/pc/txt.png' alt="doc-type">
                 {{end}}
               </div>
               <a class="doc-card-list-item-title cms-link ellipsis-2" target="_blank" href="/swordfish/docs/content/{{$vv.id}}" title="{{$vv.docName}}">{{$vv.docName}}</a>