Merge branch 'dev4.5.5' of ssh://192.168.3.207:10022/qmx/jy into dev4.5.5

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/change_industry.js

@@ -48,9 +48,9 @@ function initData() {
         $('.result_name').html(buyCount + '个行业')
     }
     if(!data.data.isvip) {
-      if(data.data.isnew == 1) {
+//      if(data.data.isnew == 1) {
         $('.alr_purchase').hide()
-      }
+//      }
     } else {
       if(data.data.buyset.upgrade == 1) {
         $('.alr_purchase').hide()

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js

@@ -232,6 +232,9 @@ $(function () {
   function getDataWitXHR() {
       $DoPost('/subscribepay/vipsubscribe/getSubBuyMsg', {}, function (res) {
           if (!res.success) return;
+          if(!res.data.industry) {
+              res.data.industry = []
+          }
           res.data.oldArea = res.data.area;
           res.data.oldIndustry = res.data.industry;
 
@@ -241,6 +244,8 @@ $(function () {
           globalState = JSON.parse(globalStateStr);
           sessionStorage.removeItem("vip_change_time");
           reqData = JSON.parse(globalStateStr);
+          sessionStorage.removeItem('industryNull')
+          sessionStorage.removeItem('areaNull')
           subNode.initData = res.data
           init(res.data)
       })

src/jfw/modules/subscribepay/src/service/afterPay.go

@@ -690,7 +690,7 @@ func (a *AfterPay) GetUserInfo() error {
 					a_key := (*tmp)["a_key"].([]interface{})
 					for _, n := range a_key {
 						ntmp := qutil.ObjToMap(n.(interface{}))
-						if (*ntmp)["appendkey"] != nil {
+						if (*ntmp)["appendkey"] != nil && (*ntmp)["updatetime"] == nil {
 							appendkey := qutil.ObjArrToStringArr((*ntmp)["appendkey"].([]interface{}))
 							if len(appendkey) > 0 {
 								appendK_bl = true

src/web/staticres/vipsubscribe/js/change_industry.js

@@ -48,9 +48,9 @@ function initData() {
         $('.result_name').html(buyCount + '个行业')
     }
     if(!data.data.isvip) {
-      if(data.data.isnew == 1) {
+//      if(data.data.isnew == 1) {
         $('.alr_purchase').hide()
-      }
+//      }
     } else {
       if(data.data.buyset.upgrade == 1) {
         $('.alr_purchase').hide()

src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -271,6 +271,9 @@ $(function () {
     function getDataWitXHR() {
         $DoPost('/subscribepay/vipsubscribe/getSubBuyMsg', {}, function (res) {
             if (!res.success) return;
+            if(!res.data.industry) {
+                res.data.industry = []
+            }
             res.data.oldArea = res.data.area;
             res.data.oldIndustry = res.data.industry;
 
@@ -279,6 +282,8 @@ $(function () {
             sessionStorage.setItem('vip_index_read', true);
             globalState = JSON.parse(globalStateStr);
             reqData = JSON.parse(globalStateStr);
+            sessionStorage.removeItem('industryNull')
+            sessionStorage.removeItem('areaNull')
             subNode.initData = res.data
             init(res.data)
         })