Merge branch 'dev4.6.2.1' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.1

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -358,6 +358,7 @@ var vNode = {
         type: 'POST',
         url: urls,
         data: storageSet ? Object.assign(data, storageSet) : data,
+        timeout: 10000,
         success: function (res) {
           if (res.error_code == 0) {
             _this.loading.clear()
@@ -393,7 +394,13 @@ var vNode = {
         },
         error: function (error) {
           // _this.$toast('请求失败')
+          // 处理ios请求超时后 再次请求
           _this.loading.clear()
+          setTimeout(function(){
+            _this.getEntPortrait(function () {
+              _this.initChartsData()
+            })
+          }, 3000)
         }
       })
     },
@@ -403,6 +410,7 @@ var vNode = {
       $.ajax({
         type: "POST",
         url: "/bigmember/portrait/subVipPortrait/usage",
+        timeout: 5000,
         data: {
           entId: _this.entInfo.id
         },
@@ -416,6 +424,9 @@ var vNode = {
               _this.entvisit = res.data
             }
           }
+        },
+        error: function (error) {
+          console.log(error)
         }
       });
     },
@@ -458,6 +469,7 @@ var vNode = {
         type: 'POST',
         url: urls,
         data: storageSet ? Object.assign(data, storageSet) : data,
+        timeout: 8000,
         success: function (res) {
           if (res.error_code == 0) {
             _this.loading.clear()
@@ -478,6 +490,9 @@ var vNode = {
         error: function (error) {
           // _this.$toast('请求失败')
           _this.loading.clear()
+          setTimeout(function() {
+            _this.getProjectNews()
+          }, 3000)
         }
       })
     },
@@ -496,9 +511,9 @@ var vNode = {
         data: {
           entId: _this.entInfo.id
         },
+        timeout: 6000,
         success: function (res) {
           if (res.error_code == 0) {
-            _this.loading.clear()
             if (res.data && Object.keys(res.data).length !== 0) {
               _this.entInfo.name = res.data.entName
               for (var key in res.data) {
@@ -512,7 +527,9 @@ var vNode = {
         },
         error: function (error) {
           console.log(error)
-          _this.loading.clear()
+          setTimeout(function() {
+            _this.getEntBaseInfo()
+          }, 3000)
         }
       })
     },
@@ -526,6 +543,7 @@ var vNode = {
         data: {
           entId: _this.entInfo.id
         },
+        timeout: 5000,
         success: function (res) {
           if (res.error_code == 0) {
             _this.entInfo.followSearchFinish = true
@@ -568,6 +586,7 @@ var vNode = {
       $.ajax({
         type: 'GET',
         url: '/bigmember/use/isAdd',
+        timeout: 5000,
         success: function (res) {
           if (res.error_code == 0) {
             _this.conf.powerLoaded = true
@@ -647,6 +666,7 @@ var vNode = {
         data: {
           entId: _this.entInfo.id
         },
+        timeout: 5000,
         success: function (res) {
           if (res.error_code == 0) {
             // 清除上个页面缓存

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js

@@ -203,6 +203,7 @@ var vNode = {
             $.ajax({
               type: 'POST',
               url: '/bigmember/use/isAdd?t=' + Date.now(),
+              timeout: 6000,
               success: function (res) {
                   if (res.data) {
                     _this.power = res.data.power
@@ -237,6 +238,9 @@ var vNode = {
               },
               error: function (error) {
                 console.log(error)
+                setTimeout(function() {
+                  _this.getPowerInfo()
+                }, 3000)
               }
             })
         },
@@ -354,6 +358,7 @@ var vNode = {
             type:'POST',
             url:'/bigmember/portrait/buyer/getNewMsg',
             data: storageSet ? Object.assign(data, storageSet) : data,
+            timeout: 8000,
             success:function(res) {
               if(res.error_code == 0) {
                 if (res.data.list && res.data.list.length && res.data.list.length > 0) {
@@ -394,7 +399,9 @@ var vNode = {
               }
             },
             error:function(err) {
-              console.log(err)
+              setTimeout(function() {
+                that.getNewMsg()
+              }, 3000)
             }
           })
         },
@@ -409,6 +416,7 @@ var vNode = {
             type:'POST',
             url:'/bigmember/portrait/buyer/getData',
             data: storageSet ? Object.assign(data, storageSet) : data,
+            timeout: 10000,
             success:function(res) {
                 if(res.error_code == 0) {
                   if(res.data && Object.keys(res.data).length > 0) {
@@ -426,6 +434,9 @@ var vNode = {
             },
             error:function(err) {
               console.log(err)
+              setTimeout(function() {
+                that.getChartData()
+              }, 3000)
             }
           })
         },

src/jfw/modules/app/src/web/templates/commonPay/paySuccess.html

@@ -191,8 +191,8 @@
             cycleType = ' 年'
         }
 
-        var upgradeText = orderFilter.num === -1 ? '全国' : (orderFilter.num - orderFilter.OldNum)
-        var html = `${titleMap[orderFilter.ordertype]}省份数量：<span class="highlight-text">${upgradeText}</span>${orderFilter.num === -1 ? '' : ' 个省'}`
+        var buyText = orderFilter.num === -1 ? '全国' : (orderFilter.num - (orderFilter.OldNum || 0))
+        var html = `${titleMap[orderFilter.ordertype]}省份数量：<span class="highlight-text">${buyText}</span>${orderFilter.num === -1 ? '' : ' 个省'}`
         html += `&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;`
         html += `订阅周期：`
         if (orderFilter.ordertype == 2) {

src/web/staticres/common-module/big-member/js/high_set.js

@@ -368,7 +368,7 @@ var highSet = new Vue({
     },
     onKeywords: function (val) {
       // 过滤首个空格
-      this.conf.keywords = val.replace(/^\s\s*/,'')
+      this.conf.keywords = val.replace(/^\s\s*/,'').replace(/(\r\n)|(\n)/g, '')
     },
     onCancel: function (data) {
       if (!data) {

src/web/staticres/common-module/collection/js/history-project.js

@@ -97,6 +97,7 @@ var hisproComponent = {
         type: "POST",
         url: item.url,
         data:item.datas,
+        timeout: 6000,
         success: function(res) {
           if(res.error_code == 0) {
             loading.clear()

src/web/templates/weixin/commonPay/paySuccess.html

@@ -158,7 +158,8 @@
             cycleType = ' 年'
         }
 
-        var html = `${titleMap[orderFilter.ordertype]}省份数量：<span class="highlight-text">${orderFilter.num === -1 ? '全国' : orderFilter.num}</span>${orderFilter.num === -1 ? '' : ' 个省'}`
+        var buyText = orderFilter.num === -1 ? '全国' : (orderFilter.num - (orderFilter.OldNum || 0))
+        var html = `${titleMap[orderFilter.ordertype]}省份数量：<span class="highlight-text">${buyText}</span>${orderFilter.num === -1 ? '' : ' 个省'}`
         html += `&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;`
         html += `订阅周期：`
         if (orderFilter.ordertype == 2) {