Home Explore Help
Sign In
qmx
/
jy
14
0
Fork 0
Files Issues 2 Pull Requests 0 Wiki
Browse Source

Merge branch 'dev4.5.2' of http://172.16.10.252:8080/qmx/jy into dev4.5.2

TANGSHIZHE 4 years ago
parent
c1e7a8a88e fb180cdefd
commit
7ae7a9848b
8 changed files with 72 additions and 69 deletions
Unified View Show Diff Stats
  1. 0 35
      src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
  2. 24 11
      src/web/staticres/common-module/portraitRecord/js/index-wx.js
  3. 24 11
      src/web/staticres/common-module/portraitRecord/js/index.js
  4. 3 2
      src/web/staticres/frontRouter/pc/seeHistory/js/index-pc.js
  5. 12 5
      src/web/staticres/js/ent-search-index-pc.js
  6. 2 2
      src/web/templates/frontRouter/pc/seeHistory/sess/index.html
  7. 6 2
      src/web/templates/pc/biddetail_rec.html
  8. 1 1
      src/web/templates/pc/supsearch.html

+ 0 - 35
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html
View File 

@@ -1,40 +1,5 @@
 
 <html>
 
 <html>
 
 <head>
 
 <head>
 
-    <script>
 
-        try {
 
-            window.onlyUserID = {{session "userId"}}
 
-        } catch (e) {
 
-            console.log('获取ID失败')
 
-        }
 
-        function clearOtherUserLocalStorage () {
 
-            var readUserID = JSON.parse(localStorage.getItem('big_member_full_video_play_reads') || '[]')
 
-            if (readUserID.length) {
 
-                try {
 
-                    var oCookie = window.onlyUserID || null
 
-                    var isUserNext = readUserID.indexOf(oCookie) === -1
 
-                    if (isUserNext) {
 
-                        localStorage.removeItem('big_member_full_video_play')
 
-                    } else {
 
-                        localStorage.setItem('big_member_full_video_play', 'true')
 
-                    }
 
-                } catch (e) {
 
-                    console.log('cookie 获取失败02')
 
-                }
 
-            } else {
 
-                localStorage.removeItem('big_member_full_video_play')
 
-            }
 
-        }
 
-        clearOtherUserLocalStorage()
 
-        if (localStorage.getItem('big_member_full_video_play')) {
 
-            console.log('已经播放')
 
-        } else {
 
-          console.log('应该跳转')
 
-          window.onload = function () {
 
-            history.pushState({state: 'full'}, null)
 
-            location.href = '/jyapp/big/page/full'
 
-          }
 
-        }
 
-    </script>
 
     {{include "/common/meta.html"}}
 
     {{include "/common/meta.html"}}
 
     <!--S-当前页必定需要预加载的资源-->
 
     <!--S-当前页必定需要预加载的资源-->
 
     <link rel="preload" as="script" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/swiper.min.js' />
 
     <link rel="preload" as="script" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/swiper.min.js' />

+ 24 - 11
src/web/staticres/common-module/portraitRecord/js/index-wx.js
View File 

@@ -90,7 +90,7 @@ var vm = new Vue({
 
       }).done(res => {
 
       }).done(res => {
 
         if (res.error_code == 0) {
 
         if (res.error_code == 0) {
 
           this.points = res.data
 
           this.points = res.data
 
-          if (res.data.total == 0) {
 
+          if (res.data.provin === -1 && res.data.total == 0) {
 
             this.contracted = true
 
             this.contracted = true
 
             this.$dialog.alert({
 
             this.$dialog.alert({
 
               message: '每订购1个省，可查看50个企业画像/月。 您订购全国的企业画像查看权限已用完，如需更多权益，请联系客服。',
 
               message: '每订购1个省，可查看50个企业画像/月。 您订购全国的企业画像查看权限已用完，如需更多权益，请联系客服。',
 
@@ -159,16 +159,29 @@ var vm = new Vue({
 
     },
 
     },
 
     helpTiped() {
 
     helpTiped() {
 
       let _this = this
 
       let _this = this
 
-      this.$dialog.alert({
 
-        message: '每订购1个省，可查看50个企业画像/月。 您当前订阅了' + `<span style="color:#2ABED1">${_this.points.provin}</span>` + '个省，如需更多权益，请订购更多省份。',
 
-        className: 'pro-log',
 
-        messageAlign: 'left',
 
-        confirmButtonColor: '#2ABED1',
 
-        confirmButtonText: '前往升级',
 
-        closeOnClickOverlay: true
 
-      }).then(() => {
 
-        location.href = '/front/vipsubscribe/toSubVipSetPage'
 
-      })
 
+      if (_this.points.provin === -1) {
 
+        this.$dialog.alert({
 
+          message: '每订购1个省，可查看50个企业画像/月。 您当前订阅了全国。',
 
+          className: 'pro-log',
 
+          messageAlign: 'left',
 
+          confirmButtonColor: '#2ABED1',
 
+          confirmButtonText: '我知道了',
 
+          closeOnClickOverlay: true
 
+        }).then(() => {
 
+          // location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
 
+        })
 
+      } else {
 
+        this.$dialog.alert({
 
+          message: '每订购1个省，可查看50个企业画像/月。 您当前订阅了' + `<span style="color:#2ABED1">${_this.points.provin}</span>` + '个省，如需更多权益，请订购更多省份。',
 
+          className: 'pro-log',
 
+          messageAlign: 'left',
 
+          confirmButtonColor: '#2ABED1',
 
+          confirmButtonText: '前往升级',
 
+          closeOnClickOverlay: true
 
+        }).then(() => {
 
+          location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
 
+        })
 
+      }
 
     },
 
     },
 
     confirmed(val) {
 
     confirmed(val) {
 
       this.years = val.getFullYear()
 
       this.years = val.getFullYear()

+ 24 - 11
src/web/staticres/common-module/portraitRecord/js/index.js
View File 

@@ -90,7 +90,7 @@ var vm = new Vue({
 
       }).done(res => {
 
       }).done(res => {
 
         if (res.error_code == 0) {
 
         if (res.error_code == 0) {
 
           this.points = res.data
 
           this.points = res.data
 
-          if (res.data.total == 0) {
 
+          if (res.data.provin === -1 && res.data.total == 0) {
 
             this.contracted = true
 
             this.contracted = true
 
             this.$dialog.alert({
 
             this.$dialog.alert({
 
               message: '每订购1个省，可查看50个企业画像/月。 您订购全国的企业画像查看权限已用完，如需更多权益，请联系客服。',
 
               message: '每订购1个省，可查看50个企业画像/月。 您订购全国的企业画像查看权限已用完，如需更多权益，请联系客服。',
 
@@ -159,16 +159,29 @@ var vm = new Vue({
 
     },
 
     },
 
     helpTiped() {
 
     helpTiped() {
 
       let _this = this
 
       let _this = this
 
-      this.$dialog.alert({
 
-        message: '每订购1个省，可查看50个企业画像/月。 您当前订阅了' + `<span style="color:#2ABED1">${_this.points.provin}</span>` + '个省，如需更多权益，请订购更多省份。',
 
-        className: 'pro-log',
 
-        messageAlign: 'left',
 
-        confirmButtonColor: '#2ABED1',
 
-        confirmButtonText: '前往升级',
 
-        closeOnClickOverlay: true
 
-      }).then(() => {
 
-        location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
 
-      })
 
+      if (_this.points.provin === -1) {
 
+        this.$dialog.alert({
 
+          message: '每订购1个省，可查看50个企业画像/月。 您当前订阅了全国。',
 
+          className: 'pro-log',
 
+          messageAlign: 'left',
 
+          confirmButtonColor: '#2ABED1',
 
+          confirmButtonText: '我知道了',
 
+          closeOnClickOverlay: true
 
+        }).then(() => {
 
+          // location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
 
+        })
 
+      } else {
 
+        this.$dialog.alert({
 
+          message: '每订购1个省，可查看50个企业画像/月。 您当前订阅了' + `<span style="color:#2ABED1">${_this.points.provin}</span>` + '个省，如需更多权益，请订购更多省份。',
 
+          className: 'pro-log',
 
+          messageAlign: 'left',
 
+          confirmButtonColor: '#2ABED1',
 
+          confirmButtonText: '前往升级',
 
+          closeOnClickOverlay: true
 
+        }).then(() => {
 
+          location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
 
+        })
 
+      }
 
     },
 
     },
 
     confirmed(val) {
 
     confirmed(val) {
 
       this.years = val.getFullYear()
 
       this.years = val.getFullYear()

+ 3 - 2
src/web/staticres/frontRouter/pc/seeHistory/js/index-pc.js
View File 

@@ -41,7 +41,7 @@ var vm = new Vue({
 
             statusEnum: ['存续', '吊销', '注销', '撤销'],
 
             statusEnum: ['存续', '吊销', '注销', '撤销'],
 
             statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
 
             statusColors: ['#2CB7CA', '#F5AF5C', '#58A1E7', '#51CEA2'],
 
             seeList: {
 
             seeList: {
 
-                pageNum: 1, // 当前页
 
+                pageNum: 0, // 当前页
 
                 pageSize: 50, // 每页多少条数据
 
                 pageSize: 50, // 每页多少条数据
 
                 total: 0, // 总页数
 
                 total: 0, // 总页数
 
                 list: [] // 返回的数据
 
                 list: [] // 返回的数据
 
@@ -94,7 +94,8 @@ var vm = new Vue({
 
                     res.data.list.forEach(v => {
 
                     res.data.list.forEach(v => {
 
                         const arrs = {
 
                         const arrs = {
 
                             name: v.company_name,
 
                             name: v.company_name,
 
-                            abbr: getShortName(v.company_name),
 
+                            abbr1: getShortName(v.company_name).substring(0,2),
 
+                            abbr2: getShortName(v.company_name).substring(2,4),
 
                             color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
 
                             color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
 
                             legal: v.legal_person,
 
                             legal: v.legal_person,
 
                             money: v.capital,
 
                             money: v.capital,

+ 12 - 5
src/web/staticres/js/ent-search-index-pc.js
View File 

@@ -504,12 +504,19 @@ var vm = new Vue({
 
             $('#go-customer-4').trigger('click')
 
             $('#go-customer-4').trigger('click')
 
         },
 
         },
 
         toDetail: function (id) {
 
         toDetail: function (id) {
 
-            if (this.powerInfo.vip > 1) {
 
-                // 去超级订阅画像
 
-                window.open('/swordfish/page_big_pc/svip/ent_ser_portrait/' + id)
 
+            // 去超级订阅画像
 
+            var svipLink = '/swordfish/page_big_pc/svip/ent_ser_portrait/' + id
 
+            // 大会员画像
 
+            var memberLink = '/swordfish/page_big_pc/ent_portrait/' + id
 
+
 
+            if (this.powerInfo.member) {
 
+                if (this.powerInfo.vip > 0) {
 
+                    window.open(svipLink)
 
+                } else {
 
+                    window.open(memberLink)
 
+                }
 
             } else {
 
             } else {
 
-                // 去大会员画像
 
-                window.open('/swordfish/page_big_pc/ent_portrait/' + id)
 
+                window.open(svipLink)
 
             }
 
             }
 
         },
 
         },
 
         calcListItemForCap: function (p) {
 
         calcListItemForCap: function (p) {

+ 2 - 2
src/web/templates/frontRouter/pc/seeHistory/sess/index.html
View File 

@@ -47,9 +47,9 @@
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
         <div class="see-content w" v-show="seeList.length !== 0">
 
         <div class="see-content w" v-show="seeList.length !== 0">
 
-            <div class="lists flex" v-for="item in seeList" :key="item._id">
 
+            <div class="lists flex" v-for="item in seeList.list" :key="item._id">
 
                 <div class="words-img" :style="{'background-color': item.color}" @click="detailed(item._id)">
 
                 <div class="words-img" :style="{'background-color': item.color}" @click="detailed(item._id)">
 
-                    <span>{item.abbr.substring(0,2)}</span><span class="xin-xi">{item.abbr.substring(2,4)}</span>
 
+                    <span>{item.abbr1}</span><span class="xin-xi">{item.abbr2}</span>
 
                 </div>
 
                 </div>
 
                 <div class="r-conts flex">
 
                 <div class="r-conts flex">
 
                     <h3 class="flex" @click="detailed(item._id)">{item.name}<span v-show="item.status >= 0" :class="'status-' + item.status">{item.statusWord}</span></h3>
 
                     <h3 class="flex" @click="detailed(item._id)">{item.name}<span v-show="item.status >= 0" :class="'status-' + item.status">{item.statusWord}</span></h3>

+ 6 - 2
src/web/templates/pc/biddetail_rec.html
View File 

@@ -59,7 +59,7 @@ function isWechat() {
 
         <div class="tags-inputs">
 
         <div class="tags-inputs">
 
           <div class="tag-input">
 
           <div class="tag-input">
 
             <div class="tag-labels"></div>
 
             <div class="tag-labels"></div>
 
-            <input type="text" class="clear-input">
 
+            <input type="text" class="clear-input" maxlength="5" oninput="this.value=this.value.replace(/\s+/g,'')">
 
             <div class="tag-placeholder">新增标签回车保存</div>
 
             <div class="tag-placeholder">新增标签回车保存</div>
 
           </div>
 
           </div>
 
           <div class="add-tag-button">添加并使用</div>
 
           <div class="add-tag-button">添加并使用</div>
 
@@ -483,7 +483,11 @@ function isWechat() {
 
 							<td class="tab-type">中标单位</td>
 
 							<td class="tab-type">中标单位</td>
 
 							<td class="tab-cont">
 
 							<td class="tab-cont">
 
                                 {{if .T.isMember}}
 
                                 {{if .T.isMember}}
 
+                                  {{if .T.isVip}}
 
+                                    <div class="cont-cont portrait_img" {{if .T.obj.entId}} href-data="/swordfish/page_big_pc/svip/ent_ser_portrait/{{.T.obj.entId}}"  tip-data="查看企业画像"{{end}}>{{.T.obj.winner}}</div>
 
+                                  {{else}}
 
                                     <div class="cont-cont portrait_img" {{if .T.obj.entId}} href-data="/swordfish/page_big_pc/ent_portrait/{{.T.obj.entId}}"  tip-data="查看企业画像"{{end}}>{{.T.obj.winner}}</div>
 
                                     <div class="cont-cont portrait_img" {{if .T.obj.entId}} href-data="/swordfish/page_big_pc/ent_portrait/{{.T.obj.entId}}"  tip-data="查看企业画像"{{end}}>{{.T.obj.winner}}</div>
 
+                                  {{end}}
 
                                 {{else}}
 
                                 {{else}}
 
                                     <div class="cont-cont portrait_img" {{if .T.obj.entId}} href-data="/swordfish/page_big_pc/svip/ent_ser_portrait/{{.T.obj.entId}}"  tip-data="查看企业画像"{{end}}>{{.T.obj.winner}}</div>
 
                                     <div class="cont-cont portrait_img" {{if .T.obj.entId}} href-data="/swordfish/page_big_pc/svip/ent_ser_portrait/{{.T.obj.entId}}"  tip-data="查看企业画像"{{end}}>{{.T.obj.winner}}</div>
 
                                 {{end}}
 
                                 {{end}}
 
@@ -569,7 +573,7 @@ function isWechat() {
 
 						infoId:{{.T.obj._id}}
 
 						infoId:{{.T.obj._id}}
 
 					},
 
 					},
 
 					success:function(data){
 
 					success:function(data){
 
-						if(data.data.attachment !=null && data.data.attachment.length!==0){
 
+						if(data.data && data.data.attachment !=null && data.data.attachment.length!==0){
 
 							var html = ''
 
 							var html = ''
 
 							for(var i=0;i<data.data.attachment.length;i++) {
 
 							for(var i=0;i<data.data.attachment.length;i++) {
 
 								html += "<div class='downs'>"+"<a class='menu_list' style='text-decoration:underline;color: #2CB7CA' href="+data.data.attachment[i].downurl+">"+(i+1)+"."+data.data.attachment[i].filename+"</a></div>"
 
 								html += "<div class='downs'>"+"<a class='menu_list' style='text-decoration:underline;color: #2CB7CA' href="+data.data.attachment[i].downurl+">"+(i+1)+"."+data.data.attachment[i].filename+"</a></div>"

+ 1 - 1
src/web/templates/pc/supsearch.html
View File 

@@ -1176,7 +1176,7 @@ $(function(){
 
         <div class="tags-inputs">
 
         <div class="tags-inputs">
 
           <div class="tag-input">
 
           <div class="tag-input">
 
             <div class="tag-labels"></div>
 
             <div class="tag-labels"></div>
 
-            <input type="text" class="clear-input">
 
+            <input type="text" class="clear-input" maxlength="5" oninput="this.value=this.value.replace(/\s+/g,'')">
 
             <div class="tag-placeholder">新增标签回车保存</div>
 
             <div class="tag-placeholder">新增标签回车保存</div>
 
           </div>
 
           </div>
 
           <div class="add-tag-button">添加并使用</div>
 
           <div class="add-tag-button">添加并使用</div>