commit

components/freeMixin.js

@@ -13,8 +13,21 @@ export default {
   onShow() {
     this.isShowFreeButton();
   },
-  onLoad() {
-    this.userIsShowShare()
+  onLoad(optios) {
+    // console.log(optios,'kankan===============================');
+    // const page = this.$mp && this.$mp.page;
+    // console.log(page.route);
+    // uni.getSystemInfo({
+    //   success: function (res) {
+    //     if (page.route == "pages/pcWebViev/pcWebViev") return
+    //       if (res.windowWidth > 700) {
+    //         uni.reLaunch({
+    //           url: "/pages/pcWebViev/pcWebViev?path=" + optios.path + "&query=" + JSON.stringify(optios.query),
+    //         });
+    //       }
+    //   },
+    // });
+    this.userIsShowShare();
   },
   methods: {
     //免费标签的隐现
@@ -28,7 +41,7 @@ export default {
     async userIsShowShare() {
       const res = await FreeButton.userIsShowShare();
       if (res.Ret === 200) {
-       this.isHorzMobile = res.Data.IsShow;
+        this.isHorzMobile = res.Data.IsShow;
       }
     },
   },

pageMy/reportDetail/reportDetail.vue

@@ -44,8 +44,8 @@ export default {
       access_token: "", //用户标识
       isIphoneX: false, //判断机型
       reportInfo: "",
-      //linkurl:'https://details.hzinsights.com/raiReportDtl',//线上链接地址
-      linkurl: "http://advisoryadmin.brilliantstart.cn/xcx_h5/raiReportDtl", //链接地址
+      linkurl:'https://details.hzinsights.com/raiReportDtl',//线上链接地址
+      //linkurl: "http://advisoryadmin.brilliantstart.cn/xcx_h5/raiReportDtl", //链接地址
       showNav: false,
       id: "",
       isShowTip: false,

pages/index/index.vue

@@ -194,15 +194,15 @@ export default {
   },
   watch: {},
   onLoad(optios) {
-    uni.getSystemInfo({
-      success: function (res) {
-        if (res.windowWidth > 700) {
-          uni.reLaunch({
-            url: "/pages/pcWebViev/pcWebViev",
-          });
-        }
-      },
-    });
+    // uni.getSystemInfo({
+    //   success: function (res) {
+    //     if (res.windowWidth > 700) {
+    //       uni.reLaunch({
+    //         url: "/pages/pcWebViev/pcWebViev",
+    //       });
+    //     }
+    //   },
+    // });
     if (optios.topTabsActive) {
       this.topTabsActive = optios.topTabsActive;
       this.secondActive = optios.secondActive;

pages/pcWebViev/pcWebViev.vue

@@ -43,10 +43,23 @@ export default {
       this.titleShare = data.title;
     },
     initLoad(optios) {
-      let urlType = ["index", "reportForm", "activity", "themeActivity", "activityDetail", "reportDetail", "IndustryReport", "reportSecretDetail", "roadEssence"];
+      let urlType = [
+        "index",
+        "reportForm",
+        "activity",
+        "themeActivity",
+        "activityDetail",
+        "reportDetail",
+        "IndustryReport",
+        "reportSecretDetail",
+        "roadEssence",
+        "chartPage",
+        "specialDetail",
+        "specialResearchPage",
+      ];
       if (JSON.stringify(optios) !== "{}" && optios.path) {
         let pathUrl = optios.path.split("/")[2];
-        this.urlPath = urlType.includes(pathUrl) ? '/' + pathUrl : "/index";
+        this.urlPath = urlType.includes(pathUrl) ? "/" + pathUrl : "/index";
         this.queryList = optios.query || "";
       }
     },
@@ -55,9 +68,9 @@ export default {
     this.getToken();
     this.initLoad(optios);
   },
-  onShareAppMessage(op) {
+  onShareAppMessage() {
     return {
-      title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" :  this.titleShare,
+      title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : this.titleShare,
       path: this.urlShare,
     };
   },