合并分支 'release' 到 'master'

Release

查看合并请求 !57

src/views/components/bindGameAccount/addUser.vue

@@ -14,6 +14,18 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item
+            label="请输入CP角色ID"
+            prop="username"
+          >
+            <el-input
+              v-model.trim="form.cp_role_id"
+              placeholder="请先选择主游戏"
+              :disabled="form.main_game_id==''"
+              class="input-with-select"
+            >
+            </el-input>
+          </el-form-item>
           <el-form-item label="请输入区服" prop="server_info">
             <el-select v-model.trim="form.server_info" filterable remote :disabled="form.main_game_id == ''" clearable
               style="width: 100%;" reserve-keyword placeholder="请先选择主游戏" :remote-method="remoteMethodServer"
@@ -23,7 +35,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="请输入角色名" prop="role_name">
-            <el-input v-model.trim="form.role_name" placeholder="请输入角色" class="input-with-select">
+            <el-input v-model.trim="form.role_name" :disabled="form.main_game_id==''" placeholder="请先选择主游戏" class="input-with-select">
             </el-input>
           </el-form-item>
           <el-form-item>
@@ -123,15 +135,14 @@
           member_id: '',
           username: '',
           role_name: '',
+          cp_role_id:'',
           main_game_id: '',
           server_info: ''
         },
         gameNameList: [],
         optionsList: [],
         serverNameList: [],
-        rules: {
-  
-        }
+        rules: {},
       }
     },
     computed: {
@@ -157,7 +168,8 @@
           username: this.form.username.trim(),
           role_name: this.form.role_name.trim(),
           main_game_id: this.form.main_game_id !== '' ? [this.form.main_game_id] : [],
-          server_info: this.form.server_info !== '' ? [this.form.server_info] : [],
+          zyo_server_id: this.form.server_info !== '' ? [this.form.server_info] : [],
+          cp_role_id: this.form.cp_role_id.trim() || '',
           search_type: 'bind',
           ...this.pageInfo
         }
@@ -232,10 +244,10 @@
             total: 0
           }
           if (valid) {
-            if (this.form.role_name == '' && this.form.username == '') {
-              this.$message.warning('请输入角色名或者w账号')
-              return
-            }
+            if (this.form.role_name == '' && this.form.username == '' && this.form.cp_role_id == '') {
+            this.$message.warning('请输入角色名或者w账号或者CP角色ID')
+            return
+          }
             this.requestRoleList()
           } else {
             console.log('error submit!!')
@@ -248,6 +260,7 @@
           member_id: '',
           username: '',
           role_name: '',
+          cp_role_id: '',
           main_game_id: '',
           server_info: ''
         }

src/views/components/bindGameAccount/bindUserList.vue

@@ -4,12 +4,13 @@
       <el-select v-model="bindAccount" placeholder="请选择关联账号" :clearable="false" @change="handleChange">
         <el-option label="新增关联账号" value="add" @click="addNewUser">
         </el-option>
-        <el-option v-for="(item, index) in bindGameUserList" :key="index" :label="item.username"
+        <el-option v-for="(item, index) in bindGameUserList" :key="index" :label="getOptionLabel(item)"
           :value="item.member_id">
           <div class="rowFlex columnCenter">
             <p class="text">{{ item.status_name
               ? `${item.username}/${item.status_name}`
               : item.username}}</p>
+              <span style="margin: 0 5px;color: #dc2626;font-weight: bold;" v-if="item.game_type_text && show_game_name(item)">({{item.game_type_text}})</span>
             <span v-if="item.account_type==2" class="account_type" style="color: red;font-weight: bold;"> (内)</span>
           </div>
         </el-option>
@@ -92,6 +93,28 @@ export default {
         this.set_accountSelect(value)
       }
     },
+    /**
+     * 获取选项的显示标签，包含游戏类型
+     * @param {Object} item - 选项数据
+     * @returns {String} 完整的标签文本
+     */
+    getOptionLabel(item) {
+      let label = item.status_name 
+        ? `${item.username}/${item.status_name}` 
+        : item.username
+      
+      // 如果满足条件，添加游戏类型文字
+      if (item.game_type_text && this.show_game_name(item)) {
+        label += ` (${item.game_type_text})`
+      }
+      
+      // 如果是内部账号，添加标识
+      if (item.account_type == 2) {
+        label += ' (内)'
+      }
+      
+      return label
+    },
     close(){
       this.bindAccount = this.accountSelect
     },
@@ -115,6 +138,13 @@ export default {
           }
       } 
     },
+    show_game_name(item){
+      if(process.env.NODE_ENV == 'production'){
+       return item.main_game_id == 187
+      }else{
+        return item.main_game_id == 174
+      }
+    },
     addNewUser() {
       console.log(11)
     },

src/views/components/bindGameAccount/userTable.vue

@@ -41,6 +41,18 @@
       >
       </el-table-column>
       <el-table-column
+      label="CP角色ID"
+      prop="cp_role_id"
+      width="140"
+    >
+    </el-table-column>
+    <el-table-column
+      label="马甲包"
+      prop="game_name"
+      width="140"
+    >
+    </el-table-column>
+      <el-table-column
         label="充值金额"
         prop="recharge_total"
       >

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

@@ -31,7 +31,7 @@
       <div class="item rowFlex columnCenter spaceBetween">
         <div class="rowFlex">
           <span class="label" style="min-width:40px;">账号:</span>
-          <p class="text rowFlex flexWarp">{{ gameUserInfo.username }} <span v-if="gameUserInfo.account_type==2" class="account_type">(内) 勿回，找组长!!!</span> <LastLogin/> </p> 
+          <p class="text rowFlex flexWarp">{{ gameUserInfo.username }} <span  style="margin: 0 5px;color: #dc2626;font-weight: bold;" v-if="bindGameUserInfo.game_type_text && show_game_name()">({{bindGameUserInfo.game_type_text}})</span> <span v-if="gameUserInfo.account_type==2" class="account_type">(内) 勿回，找组长!!!</span> <LastLogin/> </p> 
         </div>
       </div>
       <!-- 营销面板 -->
@@ -327,7 +327,12 @@ export default {
     };
   },
   computed: {
-    ...mapState('game', ['accountSelect']),
+    ...mapState('game', ['accountSelect', 'bindGameUserList']),
+    bindGameUserInfo: {
+      get() {
+        return this.bindGameUserList.find(item => item.member_id == this.accountSelect)
+      }
+    }
   },
   watch: {
     accountSelect: {
@@ -380,6 +385,13 @@ export default {
         }
       });
     },
+    show_game_name() {
+      if(process.env.NODE_ENV == 'production'){
+       return this.bindGameUserInfo.main_game_id == 187
+      }else{
+        return this.bindGameUserInfo.main_game_id == 174
+      }
+    },
     // 白名单
     changeNameFn() {
       const data = {