瀏覽代碼

feat:移动端市场分析报告跳推送设置增加传参

yangfeng 1 年之前
父節點
當前提交
32c97ff05e

+ 2 - 2
src/web/staticres/common-module/diy-report/js/report-list.js

@@ -73,7 +73,7 @@ var reportListTemplate = `
                         </div>
                     </div>
                 </div>
-                <div class="j-button-group" v-if="item.state === 1">
+                <div class="j-button-group" v-if="item.state === 1 || item.state === null">
                   <button class="j-button-cancel" @click="goDelete(item.id)">删除</button>
                   <button class="j-button-confirm" @click="goReport(item.id)">查看</button>
                 </div>
@@ -270,7 +270,7 @@ var reportListMobileComponent = {
           }
         },
         goSetPush: function () {
-          location.href = '/jy_mobile/push/pushsetting'
+          location.href = '/jy_mobile/push/pushsetting?active=1'
         },
         onRefresh: function () {
           this.listState.pageNum = 1

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

@@ -612,7 +612,7 @@ var vm = new Vue({
       return false
     },
     goToAnalysisHistory: function () {
-      location.href = './report_analysis_history'
+      location.replace('./report_analysis_history')
     },
     formatSelectTime (value) {
       if (!value) return '-'
@@ -894,7 +894,7 @@ var vm = new Vue({
                   if (action === 'confirm') {
                     if (!res.data.msgOpen) {
                       // 去开启  进到推送设置页面
-                      location.href = '/jy_mobile/push/pushsetting'
+                      location.href = '/jy_mobile/push/pushsetting?active=1'
                     } else {
                       // 我知道了 回到历史报告页面
                       this.goToAnalysisHistory()

+ 1 - 1
src/web/staticres/common-module/report-analysis/js/report_analysis_history.js

@@ -139,7 +139,7 @@ var vm = new Vue({
               }).then(function () {
                   // 未开启-去开启
                   if (!res.data.msgOpen) {
-                    location.href = '/jy_mobile/push/pushsetting'
+                    location.href = '/jy_mobile/push/pushsetting?active=1'
                   }
               })
               .catch(function(error) {