合并分支 'release' 到 'master'

修改文本

查看合并请求 !65

src/views/components/bindGameAccount/addUser.vue

@@ -300,14 +300,15 @@
       },
       submit() {
         const data = {
-          userid: this.chatUserInfo.userid || this.userid, 
-          external_userid: this.chatUserInfo.external_userid || this.external_userid,
+          userid: this.userid || this.chatUserInfo.userid , 
+          external_userid:this.external_userid || this.chatUserInfo.external_userid ,
           member_id: this.userDetails.id && this.userDetails.id != '' ? this.userDetails.id : this.checkoutUser.member_id,
           username: this.userDetails.username,
           reg_game_id: this.userDetails.reg_game_id,
           main_game_id: this.userDetails.main_game_id,
           recharge_total: this.userDetails.recharge_total,
         }
+        console.log(this.chatUserInfo,'this.chatUserInfo',this.userid,this.external_userid)
         // 绑定掌游账号
         zyouBind(data).then(res => {
           if (res.status_code == 1) {

src/views/components/bindGameAccount/bindUserList.vue

@@ -154,8 +154,8 @@ export default {
         external_userid: this.external_userid
       }
       const res = await detailsInfoRequest(data)
+        console.log(res.data,'hahhahahahah')
       if (res.data && res.data.userid) {
-        console.log(res.data,'1231')
         this.chatUserDetails = res.data
         this.set_chatUserInfo(this.chatUserDetails) // 设置云端信息
         console.log(this.chatUserDetails,'哈哈哈')
@@ -169,6 +169,7 @@ export default {
         }
       } else {
         this.chatUserDetails = {}
+        this.set_chatUserInfo({external_userid:this.external_userid,userid:this.userid})
       }
       // 获取到用户的详情 储存在缓存里面
     },

src/views/userInfo/components/Info.vue

@@ -3,11 +3,7 @@
     <div class="userDetailsPanel columnFlex">
       <div class="content" v-loading="viewLoading">
         <div v-if="chatUserDetails.is_phishing_account == 1" class="warnText">
-          <p>高风险玩家,请立即通知组长！！！！</p>
-          <p>
-            ①千万不能推转游！！不要发送违禁词汇！！不要发送礼包和告知任何礼包信息！！
-          </p>
-          <p>②不能以任何形式推送APP/网页链接，也不可承认有APP/网页端口！！</p>
+          钓鱼号！警惕！找组长！在组长给出指导前不要做任何动作( 包括主动，被动发送消息)！
         </div>
         <div v-if="change_appraisal" class="warnText">
           <p>钓鱼号 禁止转端通知组长!</p>
@@ -789,12 +785,14 @@ export default {
     width: 100%;
     height: auto;
     font-weight: 600;
-    font-size: 18px;
-
-    p {
-      color: #f56c6c;
-      line-height: 25px;
-    }
+    background-color: rgba(255, 242, 240, 1);
+    font-size: 24px;
+    font-weight: 500;
+    font-family: 'PingFang SC';
+    color: rgba(245, 63, 63, 1);
+    margin-bottom: 4px;
+    line-height: normal;
+    padding: 8px 16px;
   }
 
   .cser_name {