和原生联调

zhiyangdu
1 parent 624810d5
Showing 3 changed files with 66 additions and 6 deletions
src/components/giftGivingItem/giftGivingItem.vue
src/components/receivingGiftsItem/receivingGiftsItem.vue
src/pages/myGiftBox/myGiftBox.vue
@@ -4,6 +4,7 @@
             class="giftItem_box"
             v-for="(item, index) in giftGivingItem"
             :key="index"
+            @click="onGiftGiving(item)"
         >
             <!--用户信息-->
             <div class="user_info">
@@ -52,8 +53,9 @@ export default {
     props: ["giftGivingItem"],
     created() {},
     methods: {
-        giftInReturn(item) {
-            this.$emit("giftInReturn", item);
+         // 跳转到礼物详情页
+        onGiftGiving(item){
+             this.$emit('onGiftGiving',item)
         }
     }
 };
@@ -4,12 +4,13 @@
             class="giftItem_box"
             v-for="(item, index) in receivingGiftsInfo"
             :key="index"
+            @click="onReceivingGifts(item)"
         >
             <!--用户信息-->
             <div class="user_info">
                 <img v-lazy="item.user.img" />
                 <div class="name">{{ item.user.username }}(赠礼)</div>
-                <div @click="giftInReturn(item)" class="btn">回赠礼物</div>
+                <div v-on:click.stop="giftInReturn(item)" class="btn">回赠礼物</div>
                 <div class="gift_active"></div>
             </div>
             <!--商品信息-->
@@ -136,8 +137,13 @@ export default {
     props: ["receivingGiftsInfo"],
     created() {},
     methods: {
+        // 回赠礼物跳转到商城
         giftInReturn(item){
             this.$emit('giftInReturn',item)
+        },
+        // 跳转到礼物详情页
+        onReceivingGifts(item){
+             this.$emit('onReceivingGifts',item)
         }
     }
 };
@@ -18,15 +18,17 @@
             infinite-scroll-disabled="loading"
             :infinite-scroll-distance="50"
         >
-            <!-- 送礼列表 -->
+            <!-- 收礼列表 -->
             <receiving-gifts-item
                 v-show="active != 1 && active == 0"
                 @giftInReturn="giftInReturn"
+                @onReceivingGifts="onReceivingGifts"
                 :receivingGiftsInfo="receivingGiftsInfo"
             ></receiving-gifts-item>
-            <!-- 收礼列表 -->
+            <!-- 送礼列表 -->
             <giftGivingItem
-                v-show="active != 0 && active == 1"
+                @onGiftGiving="onGiftGiving"
+                 v-show="active != 0 && active == 1"
                 :giftGivingItem="giftGivingItem"
             >
             </giftGivingItem>
@@ -65,11 +67,33 @@ export default {
         this.getorderGiftList();
         // 送礼订单列表
         this.getorderGiveGiftList();
+        // 联调
+        this.setGiftBottomVisibleBySwitchTab();
     },
     methods: {
         onTap(active) {
             this.active = active;
         },
+             /**
+             * 显示和隐藏聊天
+             */
+            setGiftBottomVisibleBySwitchTab() {
+
+                // App内
+                if (this.isCNLive.value) {
+
+                    // 调用App，返回按键
+                    if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.setGiftBottomVisibleBySwitchTab) {
+
+                        // App内，iOS销毁WebView
+                        window.webkit.messageHandlers.setGiftBottomVisibleBySwitchTab.postMessage({body: {visible: 1}});
+                    } else if (window.obj && window.obj.setGiftBottomVisibleBySwitchTab) {
+
+                        // App内，Android销毁WebView
+                        window.obj.setGiftBottomVisibleBySwitchTab(1);
+                    }
+                }
+            },
         /**
          * 获取收礼礼物列表
          */
@@ -145,6 +169,34 @@ export default {
                 this.$parent.gotoDetail(item);
             }
         },
+         // 收礼商品跳转到详情页
+        onReceivingGifts(item) {
+            // 判断并调用通用跳转
+            if (typeof this.$parent.gotoDetail === "function") {
+                // 临时，设置跳转商品详情参数
+                Object.assign(item, {
+                    type: "26",
+                    to: "",
+                    shop_type: ""
+                });
+
+                this.$parent.gotoDetail(item);
+            }
+        },
+         // 送礼商品跳转到详情页
+        onGiftGiving(item) {
+            // 判断并调用通用跳转
+            if (typeof this.$parent.gotoDetail === "function") {
+                // 临时，设置跳转商品详情参数
+                Object.assign(item, {
+                    type: "36",
+                    to: "",
+                    shop_type: ""
+                });
+
+                this.$parent.gotoDetail(item);
+            }
+        },
         /**
          * 获取送礼礼物列表
          */