合并分支 'release' 到 'master'

Release

查看合并请求 !47

src/views/components/roleInfo/roleInfoPanel.vue

@@ -17,7 +17,7 @@
         <el-collapse v-model="collapseActive">
           <div
             v-for="(items, indexs) in roleList"
-            :key="indexs"
+            :key="items.role_id"
             class="contentItem"
           >
             <div class="title"></div>
@@ -170,6 +170,14 @@
                 </div>
                 <div class="item rowFlex columnCenter spaceBetween">
                   <div class="rowFlex columnCenter">
+                    <span class="label">主服开服天数:</span>
+                    <p class="text" v-if="items.main_server_open_day">
+                      {{ items?.main_server_open_day }}天
+                    </p>
+                  </div>
+                </div>
+                <div class="item rowFlex columnCenter spaceBetween">
+                  <div class="rowFlex columnCenter">
                     <span class="label">开/合服天数:</span>
                     <p class="text" v-if="items.server_day">
                       {{ items?.server_day }}天
@@ -305,6 +313,8 @@ export default {
           role_id: this.roleList[index].role_id,
         });
         this.roleList[index].server_day = res.data.data?.server_day;
+        this.roleList[index].main_server_open_day =
+          res.data.data?.main_server_open_day;
         this.roleList = [...this.roleList];
       }
     },