Merge branch 'develop' of http://192.168.32.253:3000/Software/android-cloud-H5 into develop

pages/activity/invite-user/guide-pc.vue

@@ -79,9 +79,8 @@ export default {
     },
     async getAdInfoByAdPlace() {
       const data = {
-        id: 1,
         adPlace: 20,
-        os: 1
+        os: 0
       }
       const res = await this.$axios.$post('/public/v5/advertising/getAdInfoByAdPlace', data);
       this.topADList = res.data;
@@ -106,7 +105,7 @@ export default {
       if (item.actionType === '1' || item.actionType === '3' || item.actionType === '5' || item.actionType === '6') {
         window.open(item.clickUrl, '_blank')
       } else if (item.actionType === '4') {
-        window.open(item.clickUrl, '_blank')
+        window.open(item.deeplink, '_blank')
       }
     },
     submit(item, ele, flag) {

pages/activity/invite-user/guide.vue

@@ -77,9 +77,8 @@ export default {
     },
     async getAdInfoByAdPlace() {
       const data = {
-        id: 1,
         adPlace: 20,
-        os: 1
+        os: this.$userAgent.isAndroid ? 0 : this.$userAgent.isIos ? 1 : 3
       }
       const res = await this.$axios.$post('/public/v5/advertising/getAdInfoByAdPlace', data);
       this.topADList = res.data;
@@ -106,9 +105,9 @@ export default {
         if (this.$userAgent.isIos) {
           window.open(item.deeplink, '_blank')
         } else if (this.$userAgent.isAndroid) {
-          window.open('qq://' + item.clickUrl, '_blank')
+          window.open('qq://' + item.deeplink, '_blank')
         } else {
-          window.open(item.clickUrl, '_blank')
+          window.open(item.deeplink, '_blank')
         }
       }
       this.submit(item, '', 2)