Merge branch 'dev4.5.6' of http://127.0.0.1:8080/qmx/jy into dev4.5.6

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

@@ -74,7 +74,7 @@ var vm = new Vue({
       productTypeList: assetsConf.productionTypeList,
       prodConf: {
         // 支持再次购买的产品product_type
-        canBuyAgain: assetsConf.cabBuyAgainProductions,
+        canBuyAgain: assetsConf.canBuyAgainProductions,
         // 支持开发票的产品product_type
         canInvoke: assetsConf.canInvokeProductions
       },

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

@@ -19,7 +19,7 @@ var assetsConf = {
     '数据流量包',
   ],
   // 支持再次购买的产品集合
-  cabBuyAgainProductions: [
+  canBuyAgainProductions: [
     '历史数据',
     '数据流量包',
   ],

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

@@ -8,7 +8,7 @@ var vm = new Vue({
     productTypeList: assetsConf.productionTypeList,
     prodConf: {
       // 支持再次购买的产品product_type
-      canBuyAgain: assetsConf.cabBuyAgainProductions,
+      canBuyAgain: assetsConf.canBuyAgainProductions,
       // 支持开发票的产品product_type
       canInvoke: assetsConf.canInvokeProductions,
       // 销售渠道产品product_type
@@ -279,7 +279,7 @@ var vm = new Vue({
     },
     onRefresh: function () {
       // 重置数据
-      this.tabState.pageNum = 0
+      this.tabState.pageNum = 1
       // 解除加载完成状态
       this.tabState.finished = false
       // 重新加载数据
@@ -745,8 +745,9 @@ var vm = new Vue({
           }
 
           // 不支持取消订单
-          if (courseStatus === 2 || courseStatus === 4) {
+          if (order.course_status === 2 || order.course_status === 4) {
             state.cancelOrderShow = false
+            state.payConfirmShow = false
           }
         }
 

src/web/staticres/common-module/pc-dialog/css/leave-info-dialog.css

@@ -390,4 +390,15 @@
 #export-dialog .custom-btn:disabled{
   opacity: 0.5;
   cursor:not-allowed;
+}
+#export-dialog  .export-close{
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAGgSURBVHgB7djNbYMwFAdwA0cuGaEjpCNkBA4IIQ4Nk9QZIROgHhACDoyQEdoNwgjcEaJ+EUQqjT+fq1aq/1KUL/z8Cw4YQ4iLi8s/SFVVT8RyiqLYqWznyzZommYfBMF727avxFKgVhiG17Is97JtPSLBsacLe9x+red5NI7jE0Hi5nmmy9thHMdDlmUfRBfYdd2ONb6uuHsDBHKDWzNM0/Scpmn/qA13iKMoGlix8/Zz6MBkuDk4qHfm4SDCIYbUdU3ZXvsG0tmTAtwpSRIqaisFYpEYnDLQFInFaQF1kTZw2kBVpC2cEVCGXCCUWMDdahLD8JCPYoqDGAMhKkgMDoICQkRILA4ivViQFvD92eQ71aD2IO9o/dIB8gLDGKiCu3eCQBoBRee5BYSau1FAlZOwjQsMI6DODGELqQw0mb5sIJWAmLkVi5QCbUz8GKT30zgskjuTwKKJQY7EAg4CbdbT0KbeUbRGFi6a2GrrwF72WJwA2UMfeZ4PvDbS/yDcVWAL9wsr/Iad+Ncsw/0CONGKTjmqtyl+u6aLi8tfzCdfoXwUD1ES1QAAAABJRU5ErkJggg==) no-repeat center center;
+  background-size: contain;
+  cursor: pointer;
 }

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

@@ -95,7 +95,9 @@ var temp = `
     <div id="export-dialog" v-show="showExport">
       <div class="mask"></div>
       <div class="export-dialog-container">
-        <div class="export-title"></div>
+        <div class="export-title">
+          <span class="export-close" @click="showExport = false"></span>
+        </div>
         <div class="export-content">您可以通过剑鱼标讯提供的全国招投标数据自助导出功能，指定关键词、发布时间、地区或行业等筛选条件，以Excel表格的形式打包下载，精准获取所需数据。</div>
         <div class="export-footer">
           <button type="button" class="custom-btn go-know" @click="dataExport">数据自动导出</button>
@@ -201,7 +203,7 @@ var vm = new Vue({
     }
     var validJob = function(rule,value,callback) {
       if(value === '') {
-        return callback(new Error('职位不能为空'));
+        return callback();
       } else {
         if (value === '其他' && vm.form.otherJob === '') {
           return callback(new Error('请输入职位'));

src/web/staticres/structuredata/pc/css/stucturedPc.css

@@ -223,6 +223,7 @@
   height: 60px;
 }
 .section-5 .section-item-list {
+  position: relative;
   padding-top: 40px;
   display: flex;
   align-items: center;
@@ -297,13 +298,44 @@
   color: #fff;
   background: #003396;
 }
+.i-need-more.fixed {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  z-index: 999;
+}
 .i-need-more .closed {
   cursor: pointer;
 }
 .i-need-more .i-n-m-bg {
-  width: 100%;
+  position: relative;
+  width: 1200px;
   height: 88px;
-  max-width: 1200px;
 }
 
+.i-need-more .get-data-example-button {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 400px;
+  height: 100%;
+  cursor: pointer;
+}
 
+.example-standard,
+.example-senior {
+  cursor: pointer;
+}
+.example-standard .example-pic,
+.example-senior .example-pic {
+  display: none;
+  position: absolute;
+  top: 100%;
+  left: 0;
+  width: 1200px;
+  background-color: #fff;
+}
+.example-pic > img {
+  width: 100%;
+}

src/web/templates/pc/myOrder.html

@@ -1249,7 +1249,7 @@
               break
             }
             case '大会员': {
-              href = '/front/entniche/orderPay/' + item.order_code
+              href = '/front/member/orderPay/' + item.order_code
               break
             }
             case '大会员-AI中标预测包': {

src/web/templates/structuredata/pc/index.html

@@ -77,6 +77,9 @@
         .i-need-more .i-n-m-bg {
             background-image: url('{{Msg "seo" "cdn"}}/structuredata/pc/image/bottom-fixed-ad.jpg');
         }
+        .i-need-more .get-data-example-button {
+            background-image: url('{{Msg "seo" "cdn"}}/structuredata/pc/image/bottom-fixed-button.png');
+        }
     </style>
 </head>
 <body class="indexpage">
@@ -208,13 +211,19 @@
         <div class="section-content s-bg center">
             <div class="section-title-bg s-bg center"></div>
             <div class="section-item-list">
-                <div class="section-item-card s-bg">
+                <div class="section-item-card s-bg example-standard">
                     <div class="item-card-title">标准数据导出服务</div>
                     <div class="item-card-content">适用场景：市场调研、竞争对手分析</div>
+                    <div class="example-pic">
+                        <img src='{{Msg "seo" "cdn"}}/structuredata/pc/image/example-standard.png' alt="">
+                    </div>
                 </div>
-                <div class="section-item-card s-bg">
+                <div class="section-item-card s-bg example-senior">
                     <div class="item-card-title">高级数据导出服务</div>
                     <div class="item-card-content">适用场景：商机获取、市场调研、竞争对手分析</div>
+                    <div class="example-pic">
+                        <img src='{{Msg "seo" "cdn"}}/structuredata/pc/image/example-senior.png' alt="">
+                    </div>
                 </div>
                 <div class="section-item-card s-bg">
                     <div class="item-card-title">自定义接口数据</div>
@@ -225,7 +234,7 @@
                 <div class="item-card-title">剑鱼提供30+信息字段包含</div>
                 <div class="item-card-content">
                     招标信息：省份、城市、公告标题、公告类别、公告内容、发布时间、公告地址、剑鱼标讯发布地址；<br />
-                    项目信息：项目名称、项目编号、项目范围、预算（元)、中标金额（元）、开标日期；<br />
+                    项目信息：项目名称、项目编号、项目范围、预算（元）、中标金额（元）、开标日期；<br />
                     采购单位信息：采购单位、采购单位联系人、采购单位联系电话；<br />
                     招标代理机构信息：招标代理机构名称；<br />
                     中标单位信息：中标单位、中标单位联系人、中标单位联系电话、中标企业电子邮箱等。
@@ -292,8 +301,10 @@
             </ul>
         </div>
     </div>
-    <div class="i-need-more">
-        <div class="i-n-m-bg s-bg center"></div>
+    <div class="i-need-more fixed">
+        <div class="i-n-m-bg s-bg center">
+            <div class="get-data-example-button s-bg" data-id="structedData"></div>
+        </div>
         <div class="closed el-icon-close"></div>
     </div>
 </div>
@@ -351,7 +362,7 @@
         // })
 
         // 获取数据样例
-        $('.get-data-example').on('click', function () {
+        $('.get-data-example, .get-data-example-button').on('click', function () {
             var id = $(this).attr('data-id')
             // 调用组件是否留资方法 传入一个来源对应模块 弹出弹框 （页面改版改为点击【获取数据样例】触发弹框）
             vm.isNeedSubmit(id, function(){})
@@ -363,6 +374,20 @@
         $('.i-need-more .closed').on('click', function () {
             $('.i-need-more').hide()
         })
+        $('.example-standard, .example-senior').on('mouseover', function () {
+            var pic = $(this).find('.example-pic')
+            if (!pic.is(':hidden')) return
+            pic.fadeIn()
+        }).on('mouseleave', function () {
+            var pic = $(this).find('.example-pic')
+            if (pic.is(':hidden')) return
+            pic.fadeOut()
+        })
+
+        // 底部ad
+        $('.i-need-more .closed').on('click', function () {
+            $('.i-need-more').fadeOut()
+        })
     })
     
     /******* 获取url参数（正则）********/