购好物，添加网家家App在iPad内的判断和处理~

王强
1 parent 2c8778c6
Showing 8 changed files with 18 additions and 18 deletions
src/components/callAppBox/callAppBox.vue
src/components/h5AddressToast/h5AddressToast.vue
src/pages/common/common.vue
src/pages/goodDetails/goodDetails.vue
src/pages/healthGoodDetails/healthGoodDetails.vue
src/pages/mall2/mall2.vue
src/pages/newDaren/newDaren.vue
src/pages/pointsExchangeRecords/pointsExchangeRecords.vue
@@ -70,7 +70,7 @@ export default {
         // 设置下载参数
         this.$set(this.downLoadBtnData, 'data', 'channel_id=' + (this.mode === 'prod' ? 'cnlive_mall' : 'cnlive_mall_test') + '&type=shop' + '&shopData=' + shopData);
-        if (this.isiPhone.value) {
+        if (this.isiPhone.value || this.isiPad.value) {
           openAppOld.submitFn.call(this, this.downLoadBtnData);
         } else if (this.isAndroid.value) {
           if (this.isWeChat.value) {
@@ -60,7 +60,7 @@ export default {
   created () {
     // 判断 安卓还是ios获取回选的地址url地址
     let addressId;
-    if (this.isiPhone.value) {
+    if (this.isiPhone.value || this.isiPad.value) {
       addressId = this.$route.query.addressId;
     } else {
       addressId = window.localStorage.getItem("addressId") || this.$route.query.addressId;
@@ -107,7 +107,7 @@
             onBlur() {
                 // 判断iOS的WeChat内
-                if (this.isiPhone.value && (this.isCNLive.value || this.isWeChat.value)) {
+                if ((this.isiPhone.value || this.isiPad.value) && (this.isCNLive.value || this.isWeChat.value)) {
                     setTimeout(() => {
                         if(document.activeElement.tagName == 'INPUT' || document.activeElement.tagName == 'TEXTAREA') {
@@ -458,7 +458,7 @@
 				let jumpUrl = (this.mode == "prod" ? "https://managemall.cnlive.com/html/leaflet/appDownload.html" : "https://wjjshop.cnlive.com/html/leaflet/appDownloadTest.html");
 				// 系统判断
-				if (this.isiPhone.value) {
+				if (this.isiPhone.value || this.isiPad.value) {
 					// OpenInstall唤起
 					// window.location.href = jumpUrl;
@@ -768,7 +768,7 @@
 						}
                         // 如果在iOS内，重新设置OpenInstall参数
-                        if (this.isiPhone.value) {
+                        if (this.isiPhone.value || this.isiPad.value) {
                             // 判断openInstallReady函数是否存在
                             if (typeof openInstallReady === 'function') {
@@ -1005,12 +1005,12 @@
             callAppModalCallback(options) {
                 // 判断是否在Android WeChat内/在iOS QQ内/iOS WeChat内
-				// if ((this.isAndroid.value && this.isWeChat.value) || (this.isiPhone.value && this.isQQ.value) || (this.isiPhone.value && this.isWeChat.value)) {
-				if ((this.isAndroid.value && this.isWeChat.value) || (this.isiPhone.value && this.isQQ.value)) {
+				// if ((this.isAndroid.value && this.isWeChat.value) || ((this.isiPhone.value || this.isiPad.value) && this.isQQ.value) || ((this.isiPhone.value || this.isiPad.value) && this.isWeChat.value)) {
+				if ((this.isAndroid.value && this.isWeChat.value) || ((this.isiPhone.value || this.isiPad.value) && this.isQQ.value)) {
 					// 判断安卓或iOS，给出不同的图片
-					// if (this.isiPhone.value && (this.isQQ.value || this.isWeChat.value)) {
-					if (this.isiPhone.value && this.isQQ.value) {
+					// if ((this.isiPhone.value || this.isiPad.value) && (this.isQQ.value || this.isWeChat.value)) {
+					if ((this.isiPhone.value || this.isiPad.value) && this.isQQ.value) {
                         // 设置蒙层图片
                         this.$set(this, "maskLayers", {
@@ -414,7 +414,7 @@ export default {
               cancelButtonText: "取消"
             };
           }
-        } else if (this.isiPhone.value) {
+        } else if (this.isiPhone.value || this.isiPad.value) {
           if (this.version != "") {
             var version = this.version ? this.version.replace(/\.*/g, "") : "";
           }
@@ -446,7 +446,7 @@ export default {
     },
     // App升级跳转
     appUpdate () {
-      if (this.isiPhone.value) {
+      if (this.isiPhone.value || this.isiPad.value) {
         window.location.href = "http://itunes.apple.com/cn/app/id1337575478?mt=8"
       } else if (this.isAndroid.value) {
         window.location.href = "http://wjj.ys1.cnliveimg.com/download/ac/1733/strike-1.7.3.3-release.apk"
@@ -676,7 +676,7 @@ export default {
       this.getGoodsInfo(goodsId);
     }
     // ios从url获取安卓localStorage
-    if (this.isiPhone.value) {
+    if (this.isiPhone.value || this.isiPad.value) {
       this.pointsToast_control = this.$route.query.pointsToast_control;
     } else {
       let ext = window.localStorage.getItem("ext");
@@ -739,7 +739,7 @@ export default {
     //   }
     // }
     // // 地址回选原生回调
-    // if (this.isiPhone.value) {
+    // if (this.isiPhone.value || this.isiPad.value) {
     //   var that = this;
     //   function resolution (data) {
     //     that.appSelectAddressCallback();
@@ -519,7 +519,7 @@ export default {
       this.getGoodsInfo(goodsId);
     }
     // ios从url获取安卓localStorage
-    if (this.isiPhone.value) {
+    if (this.isiPhone.value || this.isiPad.value) {
       this.pointsToast_control = this.$route.query.pointsToast_control;
     } else {
       let ext = window.localStorage.getItem("ext");
@@ -569,7 +569,7 @@ export default {
     //   }
     // }
     // // 地址回选原生回调
-    // if (this.isiPhone.value) {
+    // if (this.isiPhone.value || this.isiPad.value) {
     //   var that = this;
     //   function resolution (data) {
     //     that.appSelectAddressCallback();
@@ -153,7 +153,7 @@
                     let version = this.$route.query.version;
                     // 根据平台，判断是否符合版本，显示搜索和其它导航菜单
-                    if ((this.isiPhone.value && this.$parent.compareVersion(version, '1.9.6')) || (this.isAndroid.value && this.$parent.compareVersion(version, '1.8.5.3'))) {
+                    if (((this.isiPhone.value || this.isiPad.value) && this.$parent.compareVersion(version, '1.9.6')) || (this.isAndroid.value && this.$parent.compareVersion(version, '1.8.5.3'))) {
                         // 设置显示导航模块
                         this.$set(this, 'showNavs', true);
@@ -184,7 +184,7 @@
                     let version = this.$route.query.version;
                     // 根据平台，判断是否符合版本，显示搜索和其它导航菜单
-                    if ((this.isiPhone.value && this.$parent.compareVersion(version, '1.9.6')) || (this.isAndroid.value && this.$parent.compareVersion(version, '1.8.5.3'))) {
+                    if (((this.isiPhone.value || this.isiPad.value) && this.$parent.compareVersion(version, '1.9.6')) || (this.isAndroid.value && this.$parent.compareVersion(version, '1.8.5.3'))) {
                         // 设置显示nav模块
                         this.$set(this, 'showBack', true);
@@ -248,7 +248,7 @@ export default {
   },
   //请求数据
   created () {
-    if (this.isiPhone.value) {
+    if (this.isiPhone.value || this.isiPad.value) {
       this.pointsToast_control = this.$route.query.pointsToast_control;
     } else {
       let ext = window.localStorage.getItem("ext");