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

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

@@ -510,14 +510,16 @@ var vNode = {
             options.visualMap.min = 1;
             options.visualMap.max = maxNum < 100 ? 100 : maxNum;
             options.graphic[options.graphic.length - 1].children[0].style.text = maxNum > 100 ? maxNum : 100;
-            var colors =  ["#FFF4EB", "#FFE7CF", "#FFCF9F", "#FFB366", "#F58F5E", "#F06326"].reverse()
+            // echart获取的颜色 与实际定的颜色有出入，所以多存两个相近的颜色
+            var colors =  ["#F58F5E", "#F4885B", "#F48A5D", "#F06326"] 
             options.tooltip.formatter = function(params,ticket, callback) {
               var curColor = _this.rgbToHex(params.color)
-              // console.log(curColor, params.color)
+              console.log(curColor, params.color)
               if(params.data == null){
                   return params.name + '：0'
               }else{
-                if (_this.power.indexOf(10) == -1 && params.color && colors.indexOf(curColor) > -1 && colors.indexOf(curColor) < 2) {
+                // 如果没有月报权限 且点击的区域颜色为前二深的颜色 就将其值加上模糊遮罩
+                if (_this.power.indexOf(10) == -1 && params.color && colors.indexOf(curColor) > -1) {
                   return params.name + '：'+ '<span class="shade">' + params.value + '</span>'
                 }
                   return params.name + '：'+ params.value
@@ -532,13 +534,14 @@ var vNode = {
             options.visualMap.min = 1;
             options.visualMap.max = maxNum < 100 ? 100 : maxNum;
             options.graphic[options.graphic.length - 1].children[0].style.text = maxNum > 100 ? maxNum : 100
-            var colors =  ["#FFF4EB", "#FFE7CF", "#FFCF9F", "#FFB366", "#F58F5E", "#F06326"].reverse()
+            var colors =  ["#F58F5E", "#F4885B", "#F48A5D", "#F06326"] 
+            // echart获取的颜色 与实际定的颜色有出入，所以多存两个相近的颜色
             options.tooltip.formatter = function(params,ticket, callback) {
               var curColor = _this.rgbToHex(params.color)
               if(params.data == null){
                   return params.name + '：0'
               }else{
-                if (_this.power.indexOf(10) == -1 && params.color && colors.indexOf(curColor) > -1 && colors.indexOf(curColor) < 2) {
+                if (_this.power.indexOf(10) == -1 && params.color && colors.indexOf(curColor) > -1) {
                   return params.name + '：'+ '<span class="shade">' + params.value + '</span>'
                 }
                   return params.name + '：'+ params.value
@@ -574,7 +577,12 @@ var vNode = {
                     tip = tip + params[i].marker + params[i].seriesName + '：' + '<span class="shade">' + params[i].value + '%' + '</span><br/>';
                   }
                 } else {
+                  var status = datas && this.power.indexOf(10) == -1 && datas.indexOf(params[i].value) > -1 && datas.indexOf(params[i].value) <= 2 && params[i].value > 0
+                  if(status) {
+                    tip = tip + params[i].marker + params[i].seriesName + '：' + '<span class="shade">' + params[i].value + '万元' + '</span><br/>';
+                  } else {
                     tip = tip + params[i].marker + params[i].seriesName + '：' + params[i].value + '万元' + '<br/>';
+                  }
                 }
             }
             tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'
@@ -639,14 +647,22 @@ var vNode = {
             } else {
                 options.yAxis[1].axisLabel.show = false;
             }
+            var datas = JSON.parse(JSON.stringify(options.series[0].data))
+            if (datas.length > 0) {
+              datas.sort(function(a, b){return b - a})
+            }
             options.tooltip.formatter = function(params) {
-                return that.formatter(params)
+                return that.formatter(params, datas)
             }
             return options;
         },
         // 本月项目规模配置
         monthScaleConfig: function(options) {
           var that = this
+          var datas = JSON.parse(JSON.stringify(options.series[0].data))
+          if (datas.length > 0) {
+            datas.sort(function(a, b){return b - a})
+          }
           options.tooltip.formatter = function(params) {
             var tip = '';
             for (var i = 0; i < params.length; i++) {//这里是自己定义样式， params[i].marker 表示是否显示左边的那个小圆圈
@@ -661,7 +677,12 @@ var vNode = {
                     tip = tip + params[i].marker + params[i].seriesName + '：' + '<span class="shade">' + params[i].value + '%' + '</span><br/>';
                   }
                 } else {
+                  var status = datas && that.power.indexOf(10) == -1 && datas.indexOf(params[i].value) > -1 && datas.indexOf(params[i].value) <= 2 && params[i].value > 0
+                  if(status) {
+                    tip = tip + params[i].marker + params[i].seriesName + '：' + '<span class="shade">' + params[i].value + '万元' + '</span><br/>';
+                  } else {
                     tip = tip + params[i].marker + params[i].seriesName + '：' + params[i].value + '万元' + '<br/>';
+                  }
                 }
             }
             tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'

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

@@ -403,7 +403,7 @@ var renew = {
         })
         $('.vip-footer.renew .confirm').on('click', function () {
           var upgrade = renew.buyInfo.buyset.upgrade
-          var size = goodsSize.defaultSize
+          var size = JSON.parse(JSON.stringify(goodsSize.props.defaultSize))
           var sizeTime = ''
           var pId;
           if (size && size.period) {
@@ -697,7 +697,7 @@ var goodsSize = new Vue({
       // console.log(size, '恢复的商品规格')
       if (size) {
         this.$refs.goodsSize.goodsActive = size.index
-        this.defaultSize = size
+        this.props.defaultSize = size
         this.$nextTick(function(){
           goodsOrder.updatePrice(size.price/100)
         })
@@ -710,7 +710,7 @@ var goodsSize = new Vue({
       // console.log(data, '父组件接收子组件传来的商品规格')
       renew.checkOver3Years(this.getTimeSelect(data.period))
       sessionStorage.removeItem('$select-coupon')
-      this.defaultSize = data
+      this.props.defaultSize = data
       goodsCoupon.$refs.goodsCoupon.couponList = [] // 防止频繁切换商品规格时  能点击到上和规格可用的优惠券
       goodsOrder.updatePrice(data.price/100)
       // 查询有无满赠，无满赠执行回调查优惠券

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -554,8 +554,8 @@
           member_freeuse: '请完善个人信息，免费体验大会员全部功能！',
           ent_portrait_: '请完善个人信息，免费试用企业画像分析，透视企业！',
           buyer_portrait_: '请完善个人信息，免费试用采购单位画像分析，挖掘客户！',
-          month_project_: '请完善个人信息，免费获得市场分析周报/月报！',
-          week_project_: '请完善个人信息，免费获得市场分析周报/月报！',
+          month_: '请完善个人信息，免费获得市场分析周报/月报！',
+          week_: '请完善个人信息，免费获得市场分析周报/月报！',
           'jyapp-wxsearch-index': '请留下联系方式，我们会尽快联系您并预约演示时间。您将免费体验：市场分析周报/月报、竞对实时监控和分析、业主采购趋势/客户分析等',
           wx_reply_: '请完善个人信息，免费体验大会员全部功能！'
         }

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_purchase.html

@@ -1373,7 +1373,7 @@
         if (activeCode.toLowerCase() === "jianyu360" && $('.coupon-code-tx .info').text() === "支付成功赠送30天订阅周期") {
           activeCodes = "jianyu360";
         }
-        var size = goodsSize.props.defaultSize
+        var size = JSON.parse(JSON.stringify(goodsSize.props.defaultSize))
         var pId;
         if (size && size.period) {
           switch (size.period) {

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1108,9 +1108,7 @@
                             location.href = url
                         }
                     })
-                    if (window.isNoMember) {
-                        $('.atta-list').show()
-                    }
+                    $('.atta-list').show()
                 }else{
                     $('.atta-list').hide()
                     $('.atta-download-have').hide()
@@ -1277,10 +1275,6 @@
                 success:function(res){
                     if (res.data.memberStatus <= 0) {
                         window.isNoMember = true
-                        $('.atta-list').show()
-                    } else {
-                        $('.atta-list').hide()
-                        $('.atta-download-have').hide()
                     }
                     if(res.data.memberStatus <= 0 || hasServiceArr.indexOf(14) == -1){
                         if (hsn){

src/web/staticres/big-member/js/report_detail_month.js

@@ -503,27 +503,29 @@ var vNode = {
         },
         /* 以下为配置项部分 */
         mapCountConfig: function(options){
-            options.graphic[0].children[0].style.text = '单位：个'
-            var arr = this.mapCountData.rows;
-            var _this = this
-            var maxNum = Math.max.apply(Math, arr.map(function(o) {return o.value}));
-            options.visualMap.min = 1;
-            options.visualMap.max = maxNum < 100 ? 100 : maxNum;
-            options.graphic[options.graphic.length - 1].children[0].style.text = maxNum > 100 ? maxNum : 100;
-            var colors =  ["#FFF4EB", "#FFE7CF", "#FFCF9F", "#FFB366", "#F58F5E", "#F06326"].reverse()
-            options.tooltip.formatter = function(params,ticket, callback) {
-              var curColor = _this.rgbToHex(params.color)
-              // console.log(curColor, params.color)
-              if(params.data == null){
-                  return params.name + '：0'
-              }else{
-                if (_this.power.indexOf(10) == -1 && params.color && colors.indexOf(curColor) > -1 && colors.indexOf(curColor) < 2) {
-                  return params.name + '：'+ '<span class="shade">' + params.value + '</span>'
-                }
-                  return params.name + '：'+ params.value
+          options.graphic[0].children[0].style.text = '单位：个'
+          var arr = this.mapCountData.rows;
+          var _this = this
+          var maxNum = Math.max.apply(Math, arr.map(function(o) {return o.value}));
+          options.visualMap.min = 1;
+          options.visualMap.max = maxNum < 100 ? 100 : maxNum;
+          options.graphic[options.graphic.length - 1].children[0].style.text = maxNum > 100 ? maxNum : 100;
+          // echart获取的颜色 与实际定的颜色有出入，所以多存两个相近的颜色
+          var colors =  ["#F58F5E", "#F4885B", "#F48A5D", "#F06326"] 
+          options.tooltip.formatter = function(params,ticket, callback) {
+            var curColor = _this.rgbToHex(params.color)
+            console.log(curColor, params.color)
+            if(params.data == null){
+                return params.name + '：0'
+            }else{
+              // 如果没有月报权限 且点击的区域颜色为前二深的颜色 就将其值加上模糊遮罩
+              if (_this.power.indexOf(10) == -1 && params.color && colors.indexOf(curColor) > -1) {
+                return params.name + '：'+ '<span class="shade">' + params.value + '</span>'
               }
+                return params.name + '：'+ params.value
             }
-            return options;
+          }
+          return options;
         },
         mapScaleConfig: function(options){
             var arr = this.mapScaleData.rows;
@@ -532,13 +534,14 @@ var vNode = {
             options.visualMap.min = 1;
             options.visualMap.max = maxNum < 100 ? 100 : maxNum;
             options.graphic[options.graphic.length - 1].children[0].style.text = maxNum > 100 ? maxNum : 100
-            var colors =  ["#FFF4EB", "#FFE7CF", "#FFCF9F", "#FFB366", "#F58F5E", "#F06326"].reverse()
+            var colors =  ["#F58F5E", "#F4885B", "#F48A5D", "#F06326"] 
+            // echart获取的颜色 与实际定的颜色有出入，所以多存两个相近的颜色
             options.tooltip.formatter = function(params,ticket, callback) {
               var curColor = _this.rgbToHex(params.color)
               if(params.data == null){
                   return params.name + '：0'
               }else{
-                if (_this.power.indexOf(10) == -1 && params.color && colors.indexOf(curColor) > -1 && colors.indexOf(curColor) < 2) {
+                if (_this.power.indexOf(10) == -1 && params.color && colors.indexOf(curColor) > -1) {
                   return params.name + '：'+ '<span class="shade">' + params.value + '</span>'
                 }
                   return params.name + '：'+ params.value
@@ -574,7 +577,12 @@ var vNode = {
                     tip = tip + params[i].marker + params[i].seriesName + '：' + '<span class="shade">' + params[i].value + '%' + '</span><br/>';
                   }
                 } else {
+                  var status = datas && this.power.indexOf(10) == -1 && datas.indexOf(params[i].value) > -1 && datas.indexOf(params[i].value) <= 2 && params[i].value > 0
+                  if(status) {
+                    tip = tip + params[i].marker + params[i].seriesName + '：' + '<span class="shade">' + params[i].value + '万元' + '</span><br/>';
+                  } else {
                     tip = tip + params[i].marker + params[i].seriesName + '：' + params[i].value + '万元' + '<br/>';
+                  }
                 }
             }
             tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'
@@ -639,14 +647,22 @@ var vNode = {
             } else {
                 options.yAxis[1].axisLabel.show = false;
             }
+            var datas = JSON.parse(JSON.stringify(options.series[0].data))
+            if (datas.length > 0) {
+              datas.sort(function(a, b){return b - a})
+            }
             options.tooltip.formatter = function(params) {
-                return that.formatter(params)
+                return that.formatter(params, datas)
             }
             return options;
         },
         // 本月项目规模配置
         monthScaleConfig: function(options) {
           var that = this
+          var datas = JSON.parse(JSON.stringify(options.series[0].data))
+          if (datas.length > 0) {
+            datas.sort(function(a, b){return b - a})
+          }
           options.tooltip.formatter = function(params) {
             var tip = '';
             for (var i = 0; i < params.length; i++) {//这里是自己定义样式， params[i].marker 表示是否显示左边的那个小圆圈
@@ -661,7 +677,12 @@ var vNode = {
                     tip = tip + params[i].marker + params[i].seriesName + '：' + '<span class="shade">' + params[i].value + '%' + '</span><br/>';
                   }
                 } else {
+                  var status = datas && that.power.indexOf(10) == -1 && datas.indexOf(params[i].value) > -1 && datas.indexOf(params[i].value) <= 2 && params[i].value > 0
+                  if(status) {
+                    tip = tip + params[i].marker + params[i].seriesName + '：' + '<span class="shade">' + params[i].value + '万元' + '</span><br/>';
+                  } else {
                     tip = tip + params[i].marker + params[i].seriesName + '：' + params[i].value + '万元' + '<br/>';
+                  }
                 }
             }
             tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'

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

@@ -884,7 +884,7 @@ var vm = new Vue({
         } else {
           // 线上课程私有页面
           if (applybill_status === 0) {
-            return _this.goToLinkAndSaveState('/jyxsapp/invoice?code=' + orderCode)
+            return _this.goToLink('/jyxsapp/invoice?code=' + orderCode)
           } else if (applybill_status === 1 || applybill_status === 2) {
             return _this.goToLinkAndSaveState('/jyxsapp/invoiceDetail?code=' + orderCode + '&id=' + order.id)
           }
@@ -921,7 +921,7 @@ var vm = new Vue({
             // 开发票跳转
             var href = assetsConf.invokeLink.invoke[platform]
             if (href) {
-              _this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
+              _this.goToLink(`${href}?order_code=${orderCode}`)
             }
           } else {
             // 不能开发票跳转
@@ -1070,13 +1070,13 @@ var vm = new Vue({
             // 续费
             var href = assetsConf.vipSubLink.renew[platform]
             if (href) {
-              this.goToLinkAndSaveState(`${href}?orderCode=${orderCode}`)
+              this.goToLink(`${href}?orderCode=${orderCode}`)
             }
           } else if (buyState === 2) {
             // 升级
             var href = assetsConf.vipSubLink.buyAgain[platform]
             if (href) {
-              this.goToLinkAndSaveState(`${href}?orderCode=${orderCode}`)
+              this.goToLink(`${href}?orderCode=${orderCode}`)
             }
           }
           break
@@ -1132,111 +1132,119 @@ var vm = new Vue({
     toOrderDetail: function (order) {
       var productType = order.product_type
       var orderCode = order.order_code
+      var orderStatus = order.order_status
+      var applybill_status = order.applybill_status
       var platform = this.platform
+
+      var goToFn = this.goToLinkAndSaveState.bind(this)
+      if (orderStatus === 0 || applybill_status === 0) {
+        goToFn = this.goToLink.bind(this)
+      }
+
       // 不同产品进行判断
       switch (productType) {
         case '历史数据': {
           var href = assetsConf.dataExportLink.orderDetail[platform]
           if (href) {
-            this.goToLinkAndSaveState(`${href}?orderCode=${orderCode}`)
+            goToFn(`${href}?orderCode=${orderCode}`)
           }
           break
         }
         case 'VIP订阅': {
           var href = assetsConf.vipSubLink.orderDetail[platform]
           if (href) {
-            this.goToLinkAndSaveState(`${href}?orderCode=${orderCode}`)
+            goToFn(`${href}?orderCode=${orderCode}`)
           }
           break
         }
         case '中标必听课': {
           var href = assetsConf.courseLink.orderDetail[platform]
           if (href) {
-            this.goToLinkAndSaveState(`${href}?code=${orderCode}`)
+            goToFn(`${href}?code=${orderCode}`)
           }
           break
         }
         case '数据报告': {
           var href = assetsConf.dataReportLink.orderDetail[platform]
           if (href) {
-            this.goToLinkAndSaveState(`${href}/${orderCode}`)
+            goToFn(`${href}/${orderCode}`)
           }
           break
         }
         case '企业商机管理': {
           var href = assetsConf.entnicheLink.orderDetail[platform]
           if (href) {
-            this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
+            goToFn(`${href}?order_code=${orderCode}`)
           }
           break
         }
         case '大会员': {
           var href = assetsConf.bigMemberLink.orderDetail[platform]
           if (this.platform === 'wx') {
-            this.goToLinkAndSaveState(`${href}/${orderCode}`)
+            goToFn(`${href}/${orderCode}`)
           } else {
-            this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
+            goToFn(`${href}?order_code=${orderCode}`)
           }
           break
         }
         case '大会员-补充包': {
           var href = assetsConf.bigMemberSupplyPackLink.orderDetail[platform]
           if (this.platform === 'wx') {
-            this.goToLinkAndSaveState(`${href}/${orderCode}`)
+            goToFn(`${href}/${orderCode}`)
           } else {
-            this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
+            goToFn(`${href}?order_code=${orderCode}`)
           }
           break
         }
         case '大会员-AI中标预测包': {
           var href = assetsConf.bigMemberSupplyPackLink.orderDetail[platform]
           if (this.platform === 'wx') {
-            this.goToLinkAndSaveState(`${href}/${orderCode}`)
+            goToFn(`${href}/${orderCode}`)
           } else {
-            this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
+            goToFn(`${href}?order_code=${orderCode}`)
           }
           break
         }
         case '大会员-招标文件解读': {
           var href = assetsConf.bigMemberSupplyPackLink.orderDetail[platform]
           if (this.platform === 'wx') {
-            this.goToLinkAndSaveState(`${href}/${orderCode}`)
+            goToFn(`${href}/${orderCode}`)
           } else {
-            this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
+            goToFn(`${href}?order_code=${orderCode}`)
           }
           break
         }
         case '大会员-子账号': {
           var href = assetsConf.bigMemberSubAccountLink.orderDetail[platform]
           if (this.platform === 'wx') {
-            this.goToLinkAndSaveState(`${href}/${orderCode}`)
+            goToFn(`${href}/${orderCode}`)
           } else {
-            this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
+            goToFn(`${href}?order_code=${orderCode}`)
           }
           break
         }
         case '招标文件解读': {
           var href = assetsConf.zbFileAnalysisLink.orderDetail[platform]
           if (this.platform === 'wx') {
-            this.goToLinkAndSaveState(`${href}/${orderCode}`)
+            goToFn(`${href}/${orderCode}`)
           } else {
-            this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
+            goToFn(`${href}?order_code=${orderCode}`)
           }
           break
         }
         case '剑鱼币': {
           var href = assetsConf.jianyuCoinLink.orderDetail[platform]
           if (this.platform === 'wx') {
-            this.goToLinkAndSaveState(`${href}/${orderCode}`)
+            goToFn(`${href}/${orderCode}`)
           } else {
-            this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
+            goToFn(`${href}?order_code=${orderCode}`)
           }
           break
         }
         case '数据流量包': {
           var href = assetsConf.dataPackLink.orderDetail[platform]
           if (href) {
-            this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
+            goToFn(`${href}?order_code=${orderCode}`)
           }
           break
         }

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

@@ -736,27 +736,15 @@ $(function () {
         //刷新展示周期
         flushShowTime(state.isTrial, selectTime, stratFlag, endflag);
         // 初始化关键词
-        if (state.item) {
-            if (state.items.length === 0) {
-                $('.body-item.keywords .keywords-text').text('未分类')
-            } else {
-                var arr = []
-                state.items.forEach(function (item, index) {
-                    arr.push(item['s_item'])
-                })
-                $('.body-item.keywords .keywords-text').text(arr.join('、'))
-            }
-        } else {
-            $('.body-item.keywords .keywords-text').text('请设置关键词')
-        }
-
-
-        // 初始化信息类型
-        if (state.infotype && state.infotype.length === 0) {
-            $('.body-item.info-type .info-type-text').text('全部类型')
-        } else {
-            $('.body-item.info-type .info-type-text').text(state.infotype && state.infotype.join('、'))
-        }
+        // if (state.items.length === 0) {
+        //     $('.body-item.keywords .keywords-text').text('未分类')
+        // } else {
+        //     var arr = []
+        //     state.items.forEach(function (item, index) {
+        //         arr.push(item['s_item'])
+        //     })
+        //     $('.body-item.keywords .keywords-text').text(arr.join('、'))
+        // }
 
         if (state.matchway) {
             var ModeArr = ['按标题匹配', '按全文匹配']
@@ -798,6 +786,7 @@ $(function () {
             showGiveStatus(true)
           }
         }
+        $('[data-update-tips]').hide()
         // 如果购买的是升级版套餐 不显示升级提示 且如果是全国全行业 则不显示升级按钮
         if (state.buyset.upgrade === 1) {
           $('[data-update-tips]').hide()
@@ -816,145 +805,145 @@ $(function () {
 
     var subVipState = sessionStorage.getItem('sub_vip_state');
     var reqData = JSON.parse(subVipState);
-    if (subVipState) {
-        init(reqData);
-        subNode.initData = reqData
-        //判断是否修改
-        var IndustryNoChange = JSON.stringify(reqData.oldIndustry.sort()) === JSON.stringify(reqData.industry.sort());
-        var tmp1 = getAreaClassArr(reqData.oldArea);
-        var tmp2 = getAreaClassArr(reqData.area);
-        var areaNoChange = (JSON.stringify(tmp1[0].sort()) === JSON.stringify(tmp2[0].sort())) && (JSON.stringify(tmp1[1].sort()) === JSON.stringify(tmp2[1].sort()));
-        if (IndustryNoChange && areaNoChange && changeTime.length === 0) {
-            getDataWitXHR()
-            return
-        }
-
-        //判断是否需要升级
-        var status = getUpgradeFinalStatus(getBuySet(reqData.area, reqData.industry), {
-            "areacount": reqData.buyset.areacount,
-            "buyerclasscount": reqData.buyset.buyerclasscount,
-            "citys": reqData.buyset.newcitys
-        }, changeTime, reqData.endTime, reqData.renewList, reqData.isTrial);
-        // 双11.11活动
-        var giveT = [changeTime[1] === 1 ? 1 :changeTime[0], changeTime[1]]
-        if (!giveT[0] || !giveT[1]) {
-            giveT = []
-        }
-        var giveStatue = getUpgradeFinalStatus(getBuySet(reqData.area, reqData.industry), {
-            "areacount": reqData.buyset.areacount,
-            "buyerclasscount": reqData.buyset.buyerclasscount,
-            "citys": reqData.buyset.newcitys
-        }, giveT, reqData.endTime, reqData.renewList, reqData.isTrial);
-        var givePrice = giveStatue[0]
-        var giveCycle = changeTime[1] === 1 ? ('1年') : ((changeTime[0] ? changeTime[0] : 1) + '个月')
-
-        if (status[0] === -2) {
-            weui.toast('订单冲突', {
-                duration: 3000,
-                className: 'jy-toast',
-            });
-            return
-        }
-        if (status[0] === -1) {
-            //直接修改
-            $(".vip-footer.modify").show();
-            // doSubmit()
-            // initBack(1);
-            return
-        }
-
-        //区域需要升级
-        if (status[1]) {
-            if (reqData.isTrial) {
-                $(".area .tip").text("需购买");
-            }
-            $(".area .tip-need-upgrade").show();
-        }
-        //行业需要升级
-        if (status[2]) {
-            if (reqData.isTrial) {
-                $(".industry .tip").text("需购买");
-            }
-            $(".industry .tip-need-upgrade").show()
-        }
-        console.log(status[0],'111111')
-        if (status[0] > 0) {
-            //需要付钱
-            $(".vip-footer.upgrade").show();
-            //价格展示
-            var nowTime = new Date().getTime();
-            var startTime = live20200707.startTime;
-            var endTime = live20200707.endTime;
-            var activeDiscount = parseFloat(live20200707.activeDiscount);
-            var startTimes = parseInt(startTime) * 1000;
-            var endTimes = parseInt(endTime) * 1000;
-            if (nowTime >= startTimes && nowTime < endTimes) {
-                var price = status[0];
-                $(".price-num").text(price);
-                status[0] = parseFloat(price) * activeDiscount;
-                var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * activeDiscount);
-                $(".reduce-price").text(formatMoney(activePrice));
-                // for (var i=0;i<status.length;i++){
-                //   if(i===3){
-                //     for (var a in status[i]){
-                //       status[i][a].price = parseFloat(status[i][a].price) * activeDiscount;
-                //     }
-                //   }
-                // }
-            }
-            $(".vip-footer.upgrade .billing-price").text(formatMoney(status[0]));
-
-            submitPrice = status[0] * 10000 / 100
-
-            // 活动期间，则显示优惠码
-            if ($('.vip-upgrade').hasClass('live-20200707')) {
-                // 优惠码选项
-                $('.coupon-code-tx').show()
-                // 原价现价
-                $('.origin-price').css('display', 'flex')
-                // 优惠提示
-                $('.j-notice-bar.vip-bar').css('display', 'flex')
-            }
-            // coupon.updatePrice(status[0])
-        }
-
-        if (reqData.isTrial) {//试用购买
-            if ($("#giveTimeBox").hasClass('hasDoubleEleven')) {
-                $(".origin-price").css('display', 'flex')
-                $("#giveTimeBox").show()
-                $("#giveTimeText").text(giveCycle)
-                $('.origin-price .price-num').text(formatMoney(status[0] + givePrice));
-                // 优惠明细
-                $('.discount-price .dis-price').text(formatMoney(givePrice))
-                $('.now-price .dis-price').text(formatMoney(status[0]));
-            }
-            if (changeTime.length === 0) {
-                //刷新展示时间
-                changeTime = [1, 2];//
-                flushShowTime(true, "1个月");
-                sessionStorage.setItem("vip_trial_buy", true);
-                selectTime = "1个月"
-            }
-            initBack(4);
-            $(".vip-footer.upgrade .confirm").text("立即购买");
-            // coupon.$refs.couponRef.btnText = "立即购买"
-        } else if ((!status[1] && !status[2])) {//续费
-            initBack(2);
-        } else {//升级
-            //升级展示计价清单
-            if (!reqData.isTrial) {
-                $(".preview-label").text("需补差价：");
-                $(".billing-list-btn").text("计费清单");
-                $(".va-total-container .total-price").text("共计：￥" + formatMoney(status[0]));
-                flushSubtotal(status[3]);
-                console.log("subtotail", status[3])
-            }
-            // initBack(2);// 升级
-        }
-    } else {
-        getDataWitXHR()
-    }
-
+    // if (subVipState) {
+    //     init(reqData);
+    //     subNode.initData = reqData
+    //     //判断是否修改
+    //     var IndustryNoChange = JSON.stringify(reqData.oldIndustry.sort()) === JSON.stringify(reqData.industry.sort());
+    //     var tmp1 = getAreaClassArr(reqData.oldArea);
+    //     var tmp2 = getAreaClassArr(reqData.area);
+    //     var areaNoChange = (JSON.stringify(tmp1[0].sort()) === JSON.stringify(tmp2[0].sort())) && (JSON.stringify(tmp1[1].sort()) === JSON.stringify(tmp2[1].sort()));
+    //     if (IndustryNoChange && areaNoChange && changeTime.length === 0) {
+    //         getDataWitXHR()
+    //         return
+    //     }
+
+    //     //判断是否需要升级
+    //     var status = getUpgradeFinalStatus(getBuySet(reqData.area, reqData.industry), {
+    //         "areacount": reqData.buyset.areacount,
+    //         "buyerclasscount": reqData.buyset.buyerclasscount,
+    //         "citys": reqData.buyset.newcitys
+    //     }, changeTime, reqData.endTime, reqData.renewList, reqData.isTrial);
+    //     // 双11.11活动
+    //     var giveT = [changeTime[1] === 1 ? 1 :changeTime[0], changeTime[1]]
+    //     if (!giveT[0] || !giveT[1]) {
+    //         giveT = []
+    //     }
+    //     var giveStatue = getUpgradeFinalStatus(getBuySet(reqData.area, reqData.industry), {
+    //         "areacount": reqData.buyset.areacount,
+    //         "buyerclasscount": reqData.buyset.buyerclasscount,
+    //         "citys": reqData.buyset.newcitys
+    //     }, giveT, reqData.endTime, reqData.renewList, reqData.isTrial);
+    //     var givePrice = giveStatue[0]
+    //     var giveCycle = changeTime[1] === 1 ? ('1年') : ((changeTime[0] ? changeTime[0] : 1) + '个月')
+
+    //     if (status[0] === -2) {
+    //         weui.toast('订单冲突', {
+    //             duration: 3000,
+    //             className: 'jy-toast',
+    //         });
+    //         return
+    //     }
+    //     if (status[0] === -1) {
+    //         //直接修改
+    //         $(".vip-footer.modify").show();
+    //         // doSubmit()
+    //         // initBack(1);
+    //         return
+    //     }
+
+    //     //区域需要升级
+    //     if (status[1]) {
+    //         if (reqData.isTrial) {
+    //             $(".area .tip").text("需购买");
+    //         }
+    //         $(".area .tip-need-upgrade").show();
+    //     }
+    //     //行业需要升级
+    //     if (status[2]) {
+    //         if (reqData.isTrial) {
+    //             $(".industry .tip").text("需购买");
+    //         }
+    //         $(".industry .tip-need-upgrade").show()
+    //     }
+    //     console.log(status[0],'111111')
+    //     if (status[0] > 0) {
+    //         //需要付钱
+    //         $(".vip-footer.upgrade").show();
+    //         //价格展示
+    //         var nowTime = new Date().getTime();
+    //         var startTime = live20200707.startTime;
+    //         var endTime = live20200707.endTime;
+    //         var activeDiscount = parseFloat(live20200707.activeDiscount);
+    //         var startTimes = parseInt(startTime) * 1000;
+    //         var endTimes = parseInt(endTime) * 1000;
+    //         if (nowTime >= startTimes && nowTime < endTimes) {
+    //             var price = status[0];
+    //             $(".price-num").text(price);
+    //             status[0] = parseFloat(price) * activeDiscount;
+    //             var activePrice = formatMoney(parseFloat(price) - parseFloat(price) * activeDiscount);
+    //             $(".reduce-price").text(formatMoney(activePrice));
+    //             // for (var i=0;i<status.length;i++){
+    //             //   if(i===3){
+    //             //     for (var a in status[i]){
+    //             //       status[i][a].price = parseFloat(status[i][a].price) * activeDiscount;
+    //             //     }
+    //             //   }
+    //             // }
+    //         }
+    //         $(".vip-footer.upgrade .billing-price").text(formatMoney(status[0]));
+
+    //         submitPrice = status[0] * 10000 / 100
+
+    //         // 活动期间，则显示优惠码
+    //         if ($('.vip-upgrade').hasClass('live-20200707')) {
+    //             // 优惠码选项
+    //             $('.coupon-code-tx').show()
+    //             // 原价现价
+    //             $('.origin-price').css('display', 'flex')
+    //             // 优惠提示
+    //             $('.j-notice-bar.vip-bar').css('display', 'flex')
+    //         }
+    //         // coupon.updatePrice(status[0])
+    //     }
+
+    //     if (reqData.isTrial) {//试用购买
+    //         if ($("#giveTimeBox").hasClass('hasDoubleEleven')) {
+    //             $(".origin-price").css('display', 'flex')
+    //             $("#giveTimeBox").show()
+    //             $("#giveTimeText").text(giveCycle)
+    //             $('.origin-price .price-num').text(formatMoney(status[0] + givePrice));
+    //             // 优惠明细
+    //             $('.discount-price .dis-price').text(formatMoney(givePrice))
+    //             $('.now-price .dis-price').text(formatMoney(status[0]));
+    //         }
+    //         if (changeTime.length === 0) {
+    //             //刷新展示时间
+    //             changeTime = [1, 2];//
+    //             flushShowTime(true, "1个月");
+    //             sessionStorage.setItem("vip_trial_buy", true);
+    //             selectTime = "1个月"
+    //         }
+    //         initBack(4);
+    //         $(".vip-footer.upgrade .confirm").text("立即购买");
+    //         // coupon.$refs.couponRef.btnText = "立即购买"
+    //     } else if ((!status[1] && !status[2])) {//续费
+    //         initBack(2);
+    //     } else {//升级
+    //         //升级展示计价清单
+    //         if (!reqData.isTrial) {
+    //             $(".preview-label").text("需补差价：");
+    //             $(".billing-list-btn").text("计费清单");
+    //             $(".va-total-container .total-price").text("共计：￥" + formatMoney(status[0]));
+    //             flushSubtotal(status[3]);
+    //             console.log("subtotail", status[3])
+    //         }
+    //         // initBack(2);// 升级
+    //     }
+    // } else {
+        
+    // }
+    getDataWitXHR()
     //返回提示使用
     function pushHistory() {
         var state = {

src/web/staticres/vipsubscribe/js/vip_renew.js

@@ -405,7 +405,8 @@ var renew = {
         $('.vip-footer.renew .confirm').on('click', function () {
             $('.vip-footer.renew .confirm').prop('disabled', true)
             var upgrade = renew.buyInfo.buyset.upgrade
-            var size = goodsSize.defaultSize
+            var size = JSON.parse(JSON.stringify(goodsSize.props.defaultSize))
+            console.log(size,goodsSize.props.defaultSize, '111')
             var sizeTime = ''
             var pId;
             if (size && size.period) {
@@ -699,7 +700,7 @@ var goodsSize = new Vue({
       // console.log(size, '恢复的商品规格')
       if (size) {
         this.$refs.goodsSize.goodsActive = size.index
-        this.defaultSize = size
+        this.props.defaultSize = size
         this.$nextTick(function(){
           goodsOrder.updatePrice(size.price/100)
         })
@@ -712,7 +713,7 @@ var goodsSize = new Vue({
       // console.log(data, '父组件接收子组件传来的商品规格')
       renew.checkOver3Years(this.getTimeSelect(data.period))
       sessionStorage.removeItem('$select-coupon')
-      this.defaultSize = data
+      this.props.defaultSize = data
       goodsCoupon.$refs.goodsCoupon.couponList = [] // 防止频繁切换商品规格时  能点击到上和规格可用的优惠券
       goodsOrder.updatePrice(data.price/100)
       // 查询有无满赠，无满赠执行回调查优惠券

src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -574,8 +574,8 @@
           member_freeuse: '请完善个人信息，免费体验大会员全部功能！',
           ent_portrait_: '请完善个人信息，免费试用企业画像分析，透视企业！',
           buyer_portrait_: '请完善个人信息，免费试用采购单位画像分析，挖掘客户！',
-          month_project_: '请完善个人信息，免费获得市场分析周报/月报！',
-          week_project_: '请完善个人信息，免费获得市场分析周报/月报！',
+          month_: '请完善个人信息，免费获得市场分析周报/月报！',
+          week_: '请完善个人信息，免费获得市场分析周报/月报！',
           'jy-wxsearch-index-tap': '请留下联系方式，我们会尽快联系您并预约演示时间。您将免费体验：市场分析周报/月报、竞对实时监控和分析、业主采购趋势/客户分析等',
           wx_reply_: '请完善个人信息，免费体验大会员全部功能！'
         }

src/web/templates/weixin/vipsubscribe/vip_purchase.html

@@ -1330,7 +1330,7 @@
                     if (activeCode.toLowerCase() === couponInfo.code && $('.coupon-code-tx .info').text() === couponInfo.successTip) {
                         activeCodes = couponInfo.code;
                     }
-                    var size = goodsSize.props.defaultSize
+                    var size = JSON.parse(JSON.stringify(goodsSize.props.defaultSize))
                     var pId;
                     if (size && size.period) {
                       switch (size.period) {

src/web/templates/weixin/wxinfocontent_rec.html

@@ -1547,6 +1547,7 @@ function getAccountInfo () {
 									drainPower = res.data
 								    if (!res.data.member) {
 									  window.isNoMember = true
+										$(".atta-list").show()
 									} else {
 								    	$(".atta-list").hide()
 									}
@@ -1594,7 +1595,9 @@ function getAccountInfo () {
                             location.href = url
                         }
                     })
-                    $('.atta-list').show()
+                    if (window.isNoMember) {
+                        $('.atta-list').show()
+                    }
                 }else{
                     $('.atta-list').hide()
                     $('.atta-download-have').hide()