Merge branch 'release' into cbl_6.9.1

src/api/game.js

@@ -1338,3 +1338,61 @@ export function getRoleRecentActivityNotPushNumApi(data) {
       });
   });
 }
+// 获取 w 账号下的等级最高的角色
+export function marketingMemberRoleGrade(data) {
+  return new Promise((resolve, reject) => {
+    cross_systemRequest({
+      system: 'zhangyou',
+      api: '/api/marketing_role_grade/marketingMemberRoleGrade',
+      params: data
+    }).then((res) => {
+      resolve(res)
+    }).catch((error) => {
+      reject(error)
+    })
+  })
+}
+
+// 获取角色对应的vip等级
+export function marketingRoleGrade(data) {
+  return new Promise((resolve, reject) => {
+    cross_systemRequest({
+      system: 'zhangyou',
+      api: '/api/marketing_role_grade/marketingRoleGrade',
+      params: data
+    }).then((res) => {
+      resolve(res)
+    }).catch((error) => {
+      reject(error)
+    })
+  })
+}
+
+// VIP 等级权益
+export function marketingRoleGradeBenefit(data) {
+  return new Promise((resolve, reject) => {
+    cross_systemRequest({
+      system: 'zhangyou',
+      api: '/api/marketing_role_grade/marketingRoleGradeBenefit',
+      params: data
+    }).then((res) => {
+      resolve(res)
+    }).catch((error) => {
+      reject(error)
+    })
+  })
+}
+// 发送vip等级海报链接
+export function marketingRoleGradeUrl(data) {
+  return new Promise((resolve, reject) => {
+    cross_systemRequest({
+      system: 'zhangyou',
+      api: '/api/marketing_role_grade/marketingRoleGradeUrl',
+      params: data
+    }).then((res) => {
+      resolve(res)
+    }).catch((error) => {
+      reject(error)
+    })
+  })
+}
\ No newline at end of file

src/assets/icon/svg/vip.svg

+<svg t="1678332723840" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2801" width="200" height="200"><path d="M897 47 122 47c-28.667 0-53.167 10-73.5 30S18 121.333 18 150l0 724c0 28.667 10.167 53 30.5 73s44.833 30 73.5 30l775 0c28.667 0 53-10 73-30s30-44.333 30-73L1000 150c0-18.667-4.5-36-13.5-52S965 69.5 949 60.5 915.667 47 897 47zM949 874c0 9.333-2.333 18-7 26s-11 14.333-19 19-16.667 7-26 7L122 926c-14.667 0-27-5.167-37-15.5S70 888 70 874L70 150c0-9.333 2.333-18 7-26s11-14.167 19-18.5 16.667-6.5 26-6.5l775 0c9.333 0 18 2.167 26 6.5s14.333 10.5 19 18.5 7 16.667 7 26L949 874zM256 678 138 377c-1.333-5.333-2-11.667-2-19 1.333-24 14.667-37.333 40-40 16 1.333 28 10.333 36 27l85 224 82-224c10-18 22.667-27 38-27 25.333 2.667 39.333 16 42 40-1.333 7.333-2.667 13.667-4 19L337 678c-10 18.667-23.333 28-40 28C277 706 263.333 696.667 256 678zM480 668 480 360c0-26.667 13.333-40.667 40-42 25.333 1.333 38.667 15.333 40 42l0 308c-1.333 25.333-14.667 38-40 38C493.333 706 480 693.333 480 668zM609 668 609 365c0-26.667 13.333-40.667 40-42l97 0c85.333 5.333 131 48 137 128-6 80-51 123-135 129l-59 0 0 88c-2 25.333-15.333 38-40 38C622.333 706 609 693.333 609 668zM689 394l0 114 54 0c34-1.333 52.333-20.333 55-57-2.667-35.333-21-54.333-55-57L689 394z" p-id="2802" ></path></svg>
\ No newline at end of file

src/views/components/quickSendGame/sendGame.vue

@@ -200,7 +200,7 @@ import {
 } from '@/api/game'
 import { getRecentSendLog, markTransScene, getZqCserGroup, getZqCserWxBelong, getMediaId, send_log_add } from '@/api/works'
 import { companyviewConfig } from '@/api/user'
-import { throttle, throttleStart, sendChatMessage } from '@/utils/index'
+import { throttle, throttleStart } from '@/utils/index'
 import createChannel from './sendGame/createChannel'
 import sendPage from './sendGame/SendTransPage.vue'
 import SendTransWxGame from './sendGame/SendTransWxGame.vue'

src/views/components/roleInfo/roleInfoPanel.vue

@@ -35,6 +35,7 @@
                           ? items.recharge_total + '元'
                           : '0元'
                       }}</span>
+                      <vip-level :role-info="items" />
                     </div>
                   </div>
                   <div class="flex-1 h-0 flex justify-end items-start pt-[10px]">
@@ -143,17 +144,19 @@
 
 <script>
 import { mapState, mapMutations, mapActions } from 'vuex';
-import { getRoleHoLo } from '@/api/game';
+import { getRoleHoLo,marketingRoleGrade } from '@/api/game';
 import noContent from '@/components/noContent.vue';
 import appeal from './layer/appeal.vue';
 import watchMember from '@/mixins/watchMember';
 import { createDetails } from '@/views/popup/RecentActivitiesPopup/index.js';
 import { createRoleRecentActivityNotPushNum } from '@/views/hooks/useGetCount.js';
+import vipLevel from '@/views/userInfo/components/gameInfo/vipLevel.vue';
 export default {
   name: 'roleInfo',
   components: {
     noContent,
     appeal,
+    vipLevel,
   },
   data() {
     return {
@@ -205,6 +208,28 @@ export default {
         this
       );
     },
+     async  handleRoleListLevel(roleList){
+    try {
+      const role_id_list = roleList.map((item) => item.role_id)
+      const res = await marketingRoleGrade({role_id:role_id_list})
+      if(res.status_code == 1 && res?.data?.data?.length > 0){
+        const levelList = res.data.data
+        roleList.forEach((item) => {
+          const levelItem = levelList.find((level) => level.role_id == item.role_id)
+          if(levelItem){
+            item.vip_level = levelItem.vip_level
+          }
+        })
+      }
+    } catch (error) {
+      console.log(error)
+    } finally {
+      this.roleList = roleList.sort((a, b) => {
+        return Number(b.recharge_total) - Number(a.recharge_total)
+      })
+    }
+    },
+
     handleChange() { },
     memberChange() {
       this.requestRoleList();
@@ -231,9 +256,7 @@ export default {
           this.loading = false;
           if (res.status_code == 1) {
             if (res.data.data.length > 0) {
-              this.roleList = res.data.data.sort((a, b) => {
-                return Number(b.recharge_total) - Number(a.recharge_total);
-              });
+              this.handleRoleListLevel(res.data.data)
             } else {
               this.roleList = [];
             }

src/views/quickSendGame.vue

@@ -20,6 +20,12 @@
         >
           <sendQrCode v-if="activeName === 'sendQrCode'"/>
         </el-tab-pane>
+        <el-tab-pane
+          label="发送 SVIP 海报"
+          name="sendVipPoster"
+        >
+          <sendVipPoster v-if="activeName === 'sendVipPoster'"/>
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -29,13 +35,15 @@
 import vipTools from './components/quickSendGame/vipTools.vue'
 import sendGame from './components/quickSendGame/sendGame.vue'
 import { mapActions } from 'vuex'
-import sendQrCode from './components/quickSendGame/ServiceMessageDialog.vue'
+import sendQrCode from './components/quickSendGame//ServiceMessageDialog.vue'
+import sendVipPoster from './components/quickSendGame/sendVipLevelPoster.vue'
 export default {
   name: 'quickSendGame',
   components: {
     vipTools,
     sendGame,
     sendQrCode,
+    sendVipPoster,
   },
   data() {
     return {

src/views/userInfo/components/Info.vue

@@ -53,13 +53,14 @@
                 chatUserDetails.add_way_text }}</span>
             </div>
             <!-- 游戏模块特有 -->
-            <div v-if="accountSelect && accountSelect !== ''" style="margin-top: 3px">
+            <div v-if="accountSelect && accountSelect !== ''" class="rowFlex columnCenter" style="margin-top: 3px">
+              <vipLevel :gameUserInfo="gameUserInfo" />
               <el-button-group>
-                <el-button size="mini" @click="zyouUnBindConfirm">解绑</el-button>
-                <!-- <el-button  size="mini" @click="autoResetPassword">修改密码</el-button>
-              <el-button  size="mini" @click="changePhoneClick">修改手机号</el-button> -->
-                <el-button v-if="!chatUserDetails.bind_cser" size="mini" @click="relationKfh">关联客服</el-button>
-                <el-button size="mini" v-if="false" @click="errorHandle">误操作</el-button>
+                <el-button  type="text" @click="zyouUnBindConfirm">解绑</el-button>
+                <!-- <el-button type="text"   size="mini" @click="autoResetPassword">修改密码</el-button>
+              <el-button type="text"   size="mini" @click="changePhoneClick">修改手机号</el-button> -->
+                <el-button v-if="!chatUserDetails.bind_cser" type="text"  @click="relationKfh">关联客服</el-button>
+                <el-button type="text"  v-if="false" @click="errorHandle">误操作</el-button>
               </el-button-group>
             </div>
           </div>
@@ -163,6 +164,7 @@ import selectTag from '@/components/selectTag.vue'
 import { getClientStatus, remarkSessionIntelTag, finishRest, client_session_rest, checkSingleAgree, checkUserPermit, sendComment, logout } from '@/api/user.js'
 import { sendChatMessage } from '@/utils/index.js'
 import { getToken, removeToken } from '@/utils/auth'
+import vipLevel from './gameInfo/vipLevel.vue'
 import Cookies from 'js-cookie'
 export default {
   name: 'info',
@@ -170,7 +172,8 @@ export default {
     gameDetails,
     changePhone,
     shareInfo,
-    selectTag
+    selectTag,
+    vipLevel
   },
   props: {
     // 用户详情

src/views/userInfo/components/gameInfo/vipLevel.vue

+<!--
+ * @Author: maoxiya 937667504@qq.com
+ * @Date: 2025-09-13 14:05:01
+ * @LastEditors: maoxiya 937667504@qq.com
+ * @LastEditTime: 2025-09-17 14:08:37
+ * @FilePath: /company_wx_frontend/src/views/works/component/gameInfo/vipLevel.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+    <div class="vipLevel" v-if="vip_role_info.role_id">
+        <el-popover 
+            v-model="popoverVisible" 
+            placement="top" 
+            :title="vipLevelBenefit.length > 0 ? 'VIP等级权益' : '暂无 vip 等级权益'" 
+            trigger="manual"
+            :disabled="loading"
+        >
+            <!-- 最大宽度 400px -->
+            <div class="vipLevelContent" style="max-width: 400px;max-height: 300px;overflow: auto;">
+                <div v-if="loading" class="loading-content">
+                    <i class="el-icon-loading"></i>
+                    <span>加载中...</span>
+                </div>
+                <div v-else>
+                    <div class="vipLevelItem rowFlex columnCenter" v-for="(item,index) in vipLevelBenefit" :key="index">
+                        <p class="vipLevelItemRow" v-if="item.num" :style="{color: item.target ? '#333333' : '#c9cdd4'}" >
+                            <span v-if="item.name"  class="label">{{item.name}} </span>
+                            <span v-if="item.num" :style="{color: item.target ? '#00bf8a' : '#c9cdd4'}" class="value"> {{item.num }} 次</span>
+                        </p>
+                    </div>
+                    <div v-if="vipLevelBenefit.length === 0" class="no-data">
+                        <span>暂无VIP等级权益</span>
+                    </div>
+                </div>
+            </div>
+             <div slot="reference">
+                <span class="vipLevelText" v-if="vip_role_info.vip_level" @click.stop="showVipLevel">{{ `SVIP等级${vip_role_info.vip_level}`  }}</span>
+             </div>
+        </el-popover>
+    </div>
+</template>
+<script>
+import { marketingRoleGradeBenefit,marketingMemberRoleGrade } from '@/api/game'
+import { mapState, mapMutations } from 'vuex'
+export default {
+    name: 'VipLevel',
+    data() {
+        return {
+            vip_role_info: {},
+            vipLevelBenefit: [],
+            popoverVisible: false,
+            loading: false
+        }
+    },
+    props: {
+        roleInfo: {
+            type: Object,
+            default: () => ({})
+        }
+    },
+    mounted() {
+        if(this.roleInfo && Object.keys(this.roleInfo).length > 0) {
+            this.vip_role_info = this.roleInfo
+            // 将VIP信息存储到Vuex中
+            this.set_vipRoleInfo(this.roleInfo)
+        } else {
+            this.marketingMemberRoleGrade()
+        }
+    },
+    watch: {
+        accountSelect(newVal, oldVal) {
+            if(newVal && newVal !== ''){
+                this.marketingMemberRoleGrade()
+            }
+        }
+    },
+    computed: {
+        ...mapState('game', ['accountSelect'])
+    },
+    methods: {
+        ...mapMutations('game', ['set_vipRoleInfo']),
+        async marketingMemberRoleGrade() {
+            if(this.accountSelect && this.accountSelect !== ''){
+                const res = await marketingMemberRoleGrade({ member_id:this.accountSelect})
+                if(res.data.data.role_id){
+                    this.vip_role_info = res.data.data
+                    // 将VIP信息存储到Vuex中，供其他组件使用
+                    this.set_vipRoleInfo(res.data.data)
+                }else{
+                    this.vip_role_info = {}
+                    this.set_vipRoleInfo({})
+                }
+            }
+        },
+        /**
+         * 获取VIP等级权益数据
+         */
+        async getVipLevel() {
+            try {
+                this.loading = true;
+                const levelBenefitRes = await marketingRoleGradeBenefit({
+                    main_game_id: this.vip_role_info.main_game_id, 
+                    role_id: this.vip_role_info.role_id,
+                    weixin_blongs_id: this.vip_role_info.weixin_blongs_id,
+                    vip_level: this.vip_role_info.vip_level
+                });
+                
+                if(levelBenefitRes.status_code === 1) {
+                    this.vipLevelBenefit = levelBenefitRes.data.data || [];
+                    // 数据获取成功后显示popover
+                    this.popoverVisible = true;
+                } else {
+                    this.vipLevelBenefit = [];
+                    this.$message({
+                        message: levelBenefitRes.data.msg || '获取VIP等级权益失败',
+                        type: 'error'
+                    });
+                }
+            } catch (error) {
+                console.error('获取VIP等级权益失败:', error);
+                this.vipLevelBenefit = [];
+                this.$message({
+                    message: '获取VIP等级权益失败，请重试',
+                    type: 'error'
+                });
+            } finally {
+                this.loading = false;
+            }
+        },
+        
+        /**
+         * 显示VIP等级权益弹窗
+         */
+        async showVipLevel() {
+            // 如果已经显示，则隐藏
+            if (this.popoverVisible) {
+                this.popoverVisible = false;
+                return;
+            }
+            
+            // 获取数据并显示popover
+            await this.getVipLevel();
+        }
+    }
+}
+</script>
+<style scoped lang="scss">
+.vipLevel{
+    .vipLevelText{
+        color: #409EFF;
+        cursor: pointer;
+        margin-right: 10px;
+        font-weight: 600;
+        position: relative;
+        top: -1px;
+    }
+    
+    .loading-content {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 20px;
+        color: #666;
+        
+        i {
+            margin-right: 8px;
+            font-size: 16px;
+        }
+    }
+    
+    .no-data {
+        text-align: center;
+        padding: 20px;
+        color: #c9cdd4;
+    }
+    
+    .vipLevelContent {
+        .vipLevelItem {
+            margin-bottom: 8px;
+            
+            .vipLevelItemRow {
+                margin: 0;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                
+                .label {
+                    flex: 1;
+                }
+                
+                .value {
+                    font-weight: bold;
+                }
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file