w-front-end / select_good · Commits

Commit 84402b956f8a085fe697b98d65f9a2acdfc11b3e

Authored by 王强
1 parent 2c8778c6

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

Inline Side-by-side
Showing 8 changed files with 18 additions and 18 deletions
src/components/callAppBox/callAppBox.vue
  View file @84402b9
... ... @@ -70,7 +70,7 @@ export default {
70 70 // 设置下载参数
71 71 this.$set(this.downLoadBtnData, 'data', 'channel_id=' + (this.mode === 'prod' ? 'cnlive_mall' : 'cnlive_mall_test') + '&type=shop' + '&shopData=' + shopData);
72 72  
73   - if (this.isiPhone.value) {
  73 + if (this.isiPhone.value || this.isiPad.value) {
74 74 openAppOld.submitFn.call(this, this.downLoadBtnData);
75 75 } else if (this.isAndroid.value) {
76 76 if (this.isWeChat.value) {
... ...
src/components/h5AddressToast/h5AddressToast.vue
  View file @84402b9
... ... @@ -60,7 +60,7 @@ export default {
60 60 created () {
61 61 // 判断 安卓还是ios获取回选的地址url地址
62 62 let addressId;
63   - if (this.isiPhone.value) {
  63 + if (this.isiPhone.value || this.isiPad.value) {
64 64 addressId = this.$route.query.addressId;
65 65 } else {
66 66 addressId = window.localStorage.getItem("addressId") || this.$route.query.addressId;
... ...
src/pages/common/common.vue
  View file @84402b9
... ... @@ -107,7 +107,7 @@
107 107 onBlur() {
108 108  
109 109 // 判断iOS的WeChat内
110   - if (this.isiPhone.value && (this.isCNLive.value || this.isWeChat.value)) {
  110 + if ((this.isiPhone.value || this.isiPad.value) && (this.isCNLive.value || this.isWeChat.value)) {
111 111  
112 112 setTimeout(() => {
113 113 if(document.activeElement.tagName == 'INPUT' || document.activeElement.tagName == 'TEXTAREA') {
... ... @@ -458,7 +458,7 @@
458 458 let jumpUrl = (this.mode == "prod" ? "https://managemall.cnlive.com/html/leaflet/appDownload.html" : "https://wjjshop.cnlive.com/html/leaflet/appDownloadTest.html");
459 459  
460 460 // 系统判断
461   - if (this.isiPhone.value) {
  461 + if (this.isiPhone.value || this.isiPad.value) {
462 462  
463 463 // OpenInstall唤起
464 464 // window.location.href = jumpUrl;
... ... @@ -768,7 +768,7 @@
768 768 }
769 769  
770 770 // 如果在iOS内，重新设置OpenInstall参数
771   - if (this.isiPhone.value) {
  771 + if (this.isiPhone.value || this.isiPad.value) {
772 772  
773 773 // 判断openInstallReady函数是否存在
774 774 if (typeof openInstallReady === 'function') {
... ... @@ -1005,12 +1005,12 @@
1005 1005 callAppModalCallback(options) {
1006 1006  
1007 1007 // 判断是否在Android WeChat内/在iOS QQ内/iOS WeChat内
1008   - // if ((this.isAndroid.value && this.isWeChat.value) || (this.isiPhone.value && this.isQQ.value) || (this.isiPhone.value && this.isWeChat.value)) {
1009   - if ((this.isAndroid.value && this.isWeChat.value) || (this.isiPhone.value && this.isQQ.value)) {
  1008 + // 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)) {
  1009 + if ((this.isAndroid.value && this.isWeChat.value) || ((this.isiPhone.value || this.isiPad.value) && this.isQQ.value)) {
1010 1010  
1011 1011 // 判断安卓或iOS，给出不同的图片
1012   - // if (this.isiPhone.value && (this.isQQ.value || this.isWeChat.value)) {
1013   - if (this.isiPhone.value && this.isQQ.value) {
  1012 + // if ((this.isiPhone.value || this.isiPad.value) && (this.isQQ.value || this.isWeChat.value)) {
  1013 + if ((this.isiPhone.value || this.isiPad.value) && this.isQQ.value) {
1014 1014  
1015 1015 // 设置蒙层图片
1016 1016 this.$set(this, "maskLayers", {
... ...
src/pages/goodDetails/goodDetails.vue
  View file @84402b9
... ... @@ -414,7 +414,7 @@ export default {
414 414 cancelButtonText: "取消"
415 415 };
416 416 }
417   - } else if (this.isiPhone.value) {
  417 + } else if (this.isiPhone.value || this.isiPad.value) {
418 418 if (this.version != "") {
419 419 var version = this.version ? this.version.replace(/\.*/g, "") : "";
420 420 }
... ... @@ -446,7 +446,7 @@ export default {
446 446 },
447 447 // App升级跳转
448 448 appUpdate () {
449   - if (this.isiPhone.value) {
  449 + if (this.isiPhone.value || this.isiPad.value) {
450 450 window.location.href = "http://itunes.apple.com/cn/app/id1337575478?mt=8"
451 451 } else if (this.isAndroid.value) {
452 452 window.location.href = "http://wjj.ys1.cnliveimg.com/download/ac/1733/strike-1.7.3.3-release.apk"
... ... @@ -676,7 +676,7 @@ export default {
676 676 this.getGoodsInfo(goodsId);
677 677 }
678 678 // ios从url获取安卓localStorage
679   - if (this.isiPhone.value) {
  679 + if (this.isiPhone.value || this.isiPad.value) {
680 680 this.pointsToast_control = this.$route.query.pointsToast_control;
681 681 } else {
682 682 let ext = window.localStorage.getItem("ext");
... ... @@ -739,7 +739,7 @@ export default {
739 739 // }
740 740 // }
741 741 // // 地址回选原生回调
742   - // if (this.isiPhone.value) {
  742 + // if (this.isiPhone.value || this.isiPad.value) {
743 743 // var that = this;
744 744 // function resolution (data) {
745 745 // that.appSelectAddressCallback();
... ...
src/pages/healthGoodDetails/healthGoodDetails.vue
  View file @84402b9
... ... @@ -519,7 +519,7 @@ export default {
519 519 this.getGoodsInfo(goodsId);
520 520 }
521 521 // ios从url获取安卓localStorage
522   - if (this.isiPhone.value) {
  522 + if (this.isiPhone.value || this.isiPad.value) {
523 523 this.pointsToast_control = this.$route.query.pointsToast_control;
524 524 } else {
525 525 let ext = window.localStorage.getItem("ext");
... ... @@ -569,7 +569,7 @@ export default {
569 569 // }
570 570 // }
571 571 // // 地址回选原生回调
572   - // if (this.isiPhone.value) {
  572 + // if (this.isiPhone.value || this.isiPad.value) {
573 573 // var that = this;
574 574 // function resolution (data) {
575 575 // that.appSelectAddressCallback();
... ...
src/pages/mall2/mall2.vue
  View file @84402b9
... ... @@ -153,7 +153,7 @@
153 153 let version = this.$route.query.version;
154 154  
155 155 // 根据平台，判断是否符合版本，显示搜索和其它导航菜单
156   - if ((this.isiPhone.value && this.$parent.compareVersion(version, '1.9.6')) || (this.isAndroid.value && this.$parent.compareVersion(version, '1.8.5.3'))) {
  156 + 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'))) {
157 157  
158 158 // 设置显示导航模块
159 159 this.$set(this, 'showNavs', true);
... ...
src/pages/newDaren/newDaren.vue
  View file @84402b9
... ... @@ -184,7 +184,7 @@
184 184 let version = this.$route.query.version;
185 185  
186 186 // 根据平台，判断是否符合版本，显示搜索和其它导航菜单
187   - if ((this.isiPhone.value && this.$parent.compareVersion(version, '1.9.6')) || (this.isAndroid.value && this.$parent.compareVersion(version, '1.8.5.3'))) {
  187 + 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'))) {
188 188  
189 189 // 设置显示nav模块
190 190 this.$set(this, 'showBack', true);
... ...
src/pages/pointsExchangeRecords/pointsExchangeRecords.vue
  View file @84402b9
... ... @@ -248,7 +248,7 @@ export default {
248 248 },
249 249 //请求数据
250 250 created () {
251   - if (this.isiPhone.value) {
  251 + if (this.isiPhone.value || this.isiPad.value) {
252 252 this.pointsToast_control = this.$route.query.pointsToast_control;
253 253 } else {
254 254 let ext = window.localStorage.getItem("ext");
... ...