浏览代码

fix:移动端留资跳转、金额展示修改

tangshizhe 2 年之前
父节点
当前提交
b97affbeff

+ 1 - 1
src/jfw/modules/app/src/web/templates/big-member/page_report_analysis.html

@@ -8,7 +8,7 @@
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}'/>
-    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/report-analysis/css/report_analysis.css?v={{Msg "seo" "version"}}' />
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/report-analysis/css/report_analysis.css?v={{Msg "seo" "version"}}1' />
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
     <style>
         /* fix: --- 弹窗组件不能显示底部问题  */

+ 15 - 1
src/web/staticres/common-module/chart-module/js/chart-common.js

@@ -84,6 +84,20 @@ var vComponentChart = function (el, chartData, config, type) {
       }
     },
     methods: {
+      IsPC () {
+        var userAgentInfo = navigator.userAgent
+        var Agents = ["Android", "iPhone",
+        "SymbianOS", "Windows Phone",
+        "iPad", "iPod"]
+        var flagPc = true
+        for (var v = 0; v < Agents.length; v++) {
+          if (userAgentInfo.indexOf(Agents[v]) > 0) {
+            flagPc = false;
+            break;
+          }
+        }
+        return flagPc;
+      },
       // 判断类型,取对应配置
       getChartConfig () {
         if (this.type === 've-histogram') {
@@ -401,7 +415,7 @@ var vComponentChart = function (el, chartData, config, type) {
                   formatter: function (params) {
                     var newParamsName = "";
                     var paramsNameNumber = params.length;
-                    var provideNumber = 4; // 一行显示几个字 然后就超过字数就会自动换行
+                    var provideNumber = this.IsPc ? 20 : 5; // 一行显示几个字 然后就超过字数就会自动换行
                     var rowNumber = Math.ceil(paramsNameNumber / provideNumber);
                     if (paramsNameNumber > provideNumber) {
                       for (var p = 0; p < rowNumber; p++) {

+ 2 - 2
src/web/staticres/common-module/collection/js/analysis-report-example.js

@@ -216,7 +216,7 @@ var chartExample = {
           location.href = '/jyapp/free/customer' // 客服
         } else if (this.getTextMap.btnText == '去开通') {
           // location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
-          location.href = '/jy_mobile/common/order/create/svip?type=buy'
+          location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + source
         } else if (this.getTextMap.btnText == '前往升级') {
           //跳转清除旧套餐缓存,防止计算价格出错
           sessionStorage.removeItem('vipSub_oldBuySet')
@@ -261,7 +261,7 @@ var chartExample = {
           location.href = '/big/wx/page/customer'
         } else if (this.getTextMap.btnText == '去开通') {
           // location.href = '/front/vipsubscribe/vipsubscribe_new'
-          location.href = '/jy_mobile/common/order/create/svip?type=buy'
+          location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=' + source
         } else if (this.getTextMap.btnText == '前往升级') {
           // location.href = '/front/vipsubscribe/upgradePage'
           location.href = '/jy_mobile/common/order/create/svip?type=upgrade'

+ 7 - 4
src/web/staticres/common-module/report-analysis/css/report_analysis.css

@@ -192,12 +192,15 @@
   line-height: .48rem;
   font-size: .28rem;
 }
-.keys-popup .popup-header {
-  padding-top: .24rem;
-  padding-bottom: .24rem;
-  height: auto;
+.j-popup .keys-popup .popup-header {
+  /* padding-top: .24rem;
+  padding-bottom: .24rem; */
+  display: flex;
   flex-direction: column;
   align-items: flex-start;
+  justify-content: center;
+  height: 1.28rem;
+  padding: 0 .32rem;
 }
 .keys-popup .header-top {
   display: flex;

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

@@ -1135,7 +1135,7 @@ var IframeOnClick = {
             <!-- 定制化分析报告 -->
             <!-- 定制化分析报告 -->
             <div class="custom-analysis-report">
-              <div class="c-a-r-top" v-if="nowModuleName === '定制化分析报告'">
+              <div class="c-a-r-top" v-if="nowModuleName === '超前项目推荐'">
                 <div class="c-a-r-title">
                   <div class="r-title-text">定制化分析报告</div>
                   <div class="r-title-tip">