Merge branch '6.7' into 6.8

src/views/components/ApplyRecords/AreaTransferApply.vue

@@ -29,7 +29,7 @@
               <p><span class="label">新区角色:</span><span class="value">{{ item.role_name }}({{ item.server_name }})</span>
               </p>
               <p><span class="label">老区角色:</span><span class="value">{{ item.old_role_name }} ({{ item.old_server_name
-                  }}) </span></p>
+              }}) </span></p>
               <p>
                 <span class="label">登记时间:</span><span class="value">{{ item.create_time || '' }}</span>
               </p>
@@ -37,11 +37,12 @@
             <div class="terminaItemRight columnFlex columnCenter">
               <el-button v-if="item.approval_status == 4 && item.related_request_id == 0" type="primary" size="mini"
                 style="margin-bottom:15px;" @click.stop="resubmitApproval(item)">重新提交</el-button>
-              <img v-if="item.approval_status == 1" :src="shenpi1" class="icon" />
-              <img v-else-if="item.approval_status == 2" :src="shenpi2" class="icon" />
-              <img v-else-if="item.approval_status == 3" :src="shenpi3" class="icon" />
-              <img v-else-if="item.approval_status == 4" :src="shenpi4" class="icon" />
-              <img v-else-if="item.approval_status == 5" :src="shenpi5" class="icon" />
+              <!-- 改成 svg-icon 图标 -->
+              <svg-icon v-if="item.approval_status == 1" icon-class="shenpi1" class="icon" />
+              <svg-icon v-else-if="item.approval_status == 2" icon-class="shenpi2" class="icon" />
+              <svg-icon v-else-if="item.approval_status == 3" icon-class="shenpi3" class="icon" />
+              <svg-icon v-else-if="item.approval_status == 4" icon-class="shenpi4" class="icon" />
+              <svg-icon v-else-if="item.approval_status == 5" icon-class="shenpi5" class="icon" />
             </div>
           </div>
           <!-- 审批进度 -->

src/views/components/quickSendGame/sendGame.vue

@@ -15,11 +15,11 @@
           <el-collapse-item v-for="(item, index) in conversionGameList" :key="index" :name="item.game_type">
             <template slot="title">
               <div class="title-with-icon">
-                <img v-if="item.game_type == 1" src="@/assets/icon/svg/wxgame.svg" class="game-icon" alt="微信小游戏">
-                <img v-else-if="item.game_type == 5" src="@/assets/icon/svg/douyin.svg" class="game-icon" alt="抖音小游戏">
-                <img v-else-if="item.game_type == 3" src="@/assets/icon/svg/Android.svg" class="game-icon" alt="安卓游戏">
-                <img v-else-if="item.game_type == 4" src="@/assets/icon/svg/IOS.svg" class="game-icon" alt="IOS游戏">
-                <img v-else-if="item.game_type == 2" src="@/assets/icon/svg/H5.svg" class="game-icon" alt="H5游戏">
+                <svg-icon v-if="item.game_type == 1" icon-class="wxgame" class="game-icon" />
+                <svg-icon v-else-if="item.game_type == 5" icon-class="douyin" class="game-icon" />
+                <svg-icon v-else-if="item.game_type == 3" icon-class="Android" class="game-icon" />
+                <svg-icon v-else-if="item.game_type == 4" icon-class="IOS" class="game-icon" />
+                <svg-icon v-else-if="item.game_type == 2" icon-class="H5" class="game-icon" />
                 {{ item.game_text }}
               </div>
             </template>
@@ -62,11 +62,11 @@
             <el-collapse-item v-for="(item, index) in recallGameList" :key="index" :name="item.game_type">
               <template slot="title">
                 <div class="title-with-icon">
-                  <img v-if="item.game_type == 1" src="@/assets/icon/svg/wxgame.svg" class="game-icon" alt="微信小游戏">
-                  <img v-else-if="item.game_type == 5" src="@/assets/icon/svg/douyin.svg" class="game-icon" alt="抖音小游戏">
-                  <img v-else-if="item.game_type == 3" src="@/assets/icon/svg/Android.svg" class="game-icon" alt="安卓游戏">
-                  <img v-else-if="item.game_type == 4" src="@/assets/icon/svg/IOS.svg" class="game-icon" alt="IOS游戏">
-                  <img v-else-if="item.game_type == 2" src="@/assets/icon/svg/H5.svg" class="game-icon" alt="H5游戏">
+                  <svg-icon v-if="item.game_type == 1" icon-class="wxgame" class="game-icon" />
+                  <svg-icon v-else-if="item.game_type == 5" icon-class="douyin" class="game-icon" />
+                  <svg-icon v-else-if="item.game_type == 3" icon-class="Android" class="game-icon" />
+                  <svg-icon v-else-if="item.game_type == 4" icon-class="IOS" class="game-icon" />
+                  <svg-icon v-else-if="item.game_type == 2" icon-class="H5" class="game-icon" />
                   {{ item.game_text }}
                 </div>
               </template>
@@ -106,17 +106,14 @@
             <el-collapse-item v-for="(item, index) in regGameList" :key="index" :name="item.label">
               <template slot="title">
                 <div class="title-with-icon">
-                  <img v-if="item.label.includes('微信')" src="@/assets/icon/svg/wxgame.svg" class="game-icon"
-                    alt="微信小游戏">
-                  <img v-else-if="item.label.includes('抖音')" src="@/assets/icon/svg/douyin.svg" class="game-icon"
-                    alt="抖音小游戏">
-                  <img v-else-if="item.label.includes('安卓')" src="@/assets/icon/svg/Android.svg" class="game-icon"
-                    alt="安卓游戏">
-                  <img
+                  <svg-icon v-if="item.label.includes('微信')" icon-class="wxgame" class="game-icon" />
+                  <svg-icon v-else-if="item.label.includes('抖音')" icon-class="douyin" class="game-icon" />
+                  <svg-icon v-else-if="item.label.includes('安卓')" icon-class="Android" class="game-icon" />
+                  <svg-icon
                     v-else-if="item.label.includes('IOS') || item.label.includes('iOS') || item.label.includes('ios')"
-                    src="@/assets/icon/svg/IOS.svg" class="game-icon" alt="IOS游戏">
-                  <img v-else-if="item.label.includes('H5') || item.label.includes('h5')" src="@/assets/icon/svg/H5.svg"
-                    class="game-icon" alt="H5游戏">
+                    icon-class="IOS" class="game-icon" />
+                  <svg-icon v-else-if="item.label.includes('H5') || item.label.includes('h5')" icon-class="H5"
+                    class="game-icon" />
                   {{ item.label }}
                 </div>
               </template>

src/views/components/roleInfo/approval.vue

@@ -66,7 +66,7 @@
               </div>
               <p>
                 <span class="label">近一周充值:</span><span class="value">{{ formatNumber(item.recharge_week_amount)
-                }}元</span>
+                  }}元</span>
               </p>
               <p><span class="label">违规操作:</span><span class="value">{{ item.appeal_type_text }}</span></p>
             </div>
@@ -75,11 +75,11 @@
                 size="mini" style="margin-bottom:15px;" @click.stop="handleReport(item)">撤销</el-button>
               <el-button v-else-if="item.approval_status == 4" type="primary" size="mini" style="margin-bottom:15px;"
                 @click.stop="resubmitApproval(item)">重新提交</el-button>
-              <img v-if="item.approval_status == 1" :src="shenpi1" class="icon" />
-              <img v-else-if="item.approval_status == 2" :src="shenpi2" class="icon" />
-              <img v-else-if="item.approval_status == 3" :src="shenpi3" class="icon" />
-              <img v-else-if="item.approval_status == 4" :src="shenpi4" class="icon" />
-              <img v-else-if="item.approval_status == 5" :src="shenpi5" class="icon" />
+              <svg-icon v-if="item.approval_status == 1" icon-class="shenpi1" class="icon" />
+              <svg-icon v-else-if="item.approval_status == 2" icon-class="shenpi2" class="icon" />
+              <svg-icon v-else-if="item.approval_status == 3" icon-class="shenpi3" class="icon" />
+              <svg-icon v-else-if="item.approval_status == 4" icon-class="shenpi4" class="icon" />
+              <svg-icon v-else-if="item.approval_status == 5" icon-class="shenpi5" class="icon" />
             </div>
           </div>
           <!-- 审批进度 -->

src/views/components/roleInfo/report.vue

@@ -33,7 +33,7 @@
               </p>
               <p>
                 <span class="label">近一周充值:</span><span class="value">{{ formatNumber(item.recharge_week_amount)
-                  }}元</span>
+                }}元</span>
               </p>
               <p><span class="label">违规操作:</span><span class="value">{{ item.violation_type_text }}</span></p>
             </div>