laosan2382995021@163.com 3 anni fa
parent
commit
c487cc71b0

+ 1 - 1
src/pages/talking/components/room-queue-gift/mixins/handle.ts

@@ -13,7 +13,7 @@ export default {
         // 播放礼物动画
         pushGift(item,uid:Array<string | number> | string | number,sendUid){
 
-            if (item.play_image){
+            if (item.pcplay_image || item.play_image){
 
                 let type = item.gift_type.toString();
 

+ 1 - 0
src/popup/popup-chat/components/chat-content/data/control.ts

@@ -14,6 +14,7 @@ export default [
         icon:require('../images/report.png'),
         trigger: new FunctionTrigger(function (){
             if (this.userInfo.uid) {
+
                 popup.$open(PopupExportComponent.report,{
                     uid: this.userInfo.uid
                 });

+ 3 - 1
src/popup/popup-chat/components/chat-content/data/userContral.ts

@@ -1,6 +1,7 @@
 import { FunctionTrigger } from '$mixins/trigger/class/index';
 
 import personalDetail from '$utils/control/personal-detail/index';
+import popup, {PopupExportComponent} from "$utils/tool/popup";
 
 export default [
     {
@@ -17,6 +18,7 @@ export default [
         where:'is_player',
         trigger:new FunctionTrigger(function (){
             if (this.userInfo && this.userInfo.uid && this.userInfo.pid) {
+                popup.$close(PopupExportComponent.detail);
                 personalDetail.openDetail(this.userInfo);
             }
         })
@@ -30,4 +32,4 @@ export default [
             this.toggleFollow();
         })
     }
-]
+]

+ 5 - 0
src/utils/tool/popup.ts

@@ -15,6 +15,11 @@ export default <Record<string, LibMixinsMethod | any>>{
         return this.$popup && this.$popup.open(name,option);
     },
 
+    //
+    $close(name:PopupExportComponent) {
+        return this.$popup && this.$popup.close(name);
+    },
+
     // 关闭所有弹窗
     $closeAll(){
         return this.$popup && this.$popup.closeAll();