kevin_zhangl 2 年 前
コミット
869d76b7a2

+ 6 - 6
src/utils/request.js

@@ -79,12 +79,12 @@ service.interceptors.response.use(
   response => {
     const responseData = response.data
     const data = responseData.data
-    if ((responseData.success === false) || (responseData.code >= 400) || (responseData.status >= 400)) {
-      Message({
-        message: responseData.message || 'Error',
-        type: 'error',
-        duration: 5 * 1000
-      })
+    if ((responseData.success === false) || (responseData.code && responseData.code !== 200)) {
+      // Message({
+      //   message: responseData.message || 'Error',
+      //   type: 'error',
+      //   duration: 5 * 1000
+      // })
       return Promise.reject(responseData.message)
     } else {
       if (!data) {

+ 1 - 1
src/views/article/article-list.vue

@@ -29,7 +29,7 @@
     <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.pageSize" @pagination="getList" />
 
 		<el-dialog title="" :visible.sync="dialog" :width="screenWidth" v-loading="loading" center style="margin-top: -80px;">
-			<div class="white-box" style="margin-top: -20px;">
+			<div class="white-box" style="margin-top: -20px; padding: 0;">
 				<div class="white-box-title" style="text-align: center">
 					<h1>{{ article.TITLE }}</h1>
 					<span>{{ article.CREATED_AT | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>

+ 27 - 29
src/views/atlas/placement-network.vue

@@ -1,35 +1,33 @@
 <template>
   <div class="app-container">
-		<div class="white-box">
-			<div class="filter-user" @keyup.enter="getMainData()" style="margin: 5px">
-				<el-input v-model="mainUserName" size="small" class="top-member" style="width: 300px; margin-top: 10px;">
-					<template slot="prepend">{{ $t('atlas.topMember') }}</template>
-				</el-input>
-				<el-input v-model="expandDeep" size="small" style="width: 200px; margin-top: 10px;" class="spread-depth">
-					<template slot="prepend">{{ $t('atlas.spreadDepth') }}</template>
-				</el-input>
-				<el-input v-model="periodNum" size="small" style="width: 150px;" v-show="false">
-					<template slot="prepend">{{ $t('atlas.periodNumber') }}</template>
-				</el-input>
-				<el-button type="primary" size="small" @click="getMainData()" style=" margin-top: 10px;">{{ $t('common.confirm') }}</el-button>
-			</div>
-
-			<el-tree :props="props" :data="treeData" node-key="USER_ID" @node-click="getChildData" ref="tree" :indent="0" default-expand-all :height="tool.getTableHeight(true)" style="margin-top: 15px;">
-        <span :id="'node_'+data.USER_ID" :class="'custom-tree-node '+data.className" slot-scope="{ node, data }">
-          <span :class="'el-icon-loading '+ data.displayNone"></span>
-          <span :class="data.icon"></span>
-          <span>
-            <el-tag type="danger">{{countTopDeep(data.TOP_NETWORK_DEEP, topDeep)}}</el-tag>
-            <el-tag>{{ node.label }}</el-tag>
-            <el-tag>{{data.REAL_NAME}}</el-tag>
-            <el-tag type="danger">{{ $t('atlas.location') }}: {{ data.RELATIVE_LOCATION }}</el-tag>
-            <el-tag type="success">{{ data.DEC_LV_NAME }}</el-tag>
-            <el-tag type="warning">{{ $t('atlas.highest') }}: {{ data.EMP_LV_NAME }}, {{ data.CROWN_LV_NAME }}</el-tag>
-            <el-tag>{{ data.PERIOD_AT }}</el-tag>
-          </span>
-        </span>
-			</el-tree>
+		<div class="filter-user" @keyup.enter="getMainData()" style="margin: 5px 0">
+			<el-input v-model="mainUserName" size="small" class="top-member" style="width: 300px; margin-top: 10px;">
+				<template slot="prepend">{{ $t('atlas.topMember') }}</template>
+			</el-input>
+			<el-input v-model="expandDeep" size="small" style="width: 200px; margin-top: 10px;" class="spread-depth">
+				<template slot="prepend">{{ $t('atlas.spreadDepth') }}</template>
+			</el-input>
+			<el-input v-model="periodNum" size="small" style="width: 150px;" v-show="false">
+				<template slot="prepend">{{ $t('atlas.periodNumber') }}</template>
+			</el-input>
+			<el-button type="primary" size="small" @click="getMainData()" style=" margin-top: 10px;">{{ $t('common.confirm') }}</el-button>
 		</div>
+
+		<el-tree :props="props" :data="treeData" node-key="USER_ID" @node-click="getChildData" ref="tree" :indent="0" default-expand-all :height="tool.getTableHeight(true)" style="margin-top: 15px;">
+			<span :id="'node_'+data.USER_ID" :class="'custom-tree-node '+data.className" slot-scope="{ node, data }">
+				<span :class="'el-icon-loading '+ data.displayNone"></span>
+				<span :class="data.icon"></span>
+				<span>
+					<el-tag type="danger">{{countTopDeep(data.TOP_NETWORK_DEEP, topDeep)}}</el-tag>
+					<el-tag>{{ node.label }}</el-tag>
+					<el-tag>{{data.REAL_NAME}}</el-tag>
+					<el-tag type="danger">{{ $t('atlas.location') }}: {{ data.RELATIVE_LOCATION }}</el-tag>
+					<el-tag type="success">{{ data.DEC_LV_NAME }}</el-tag>
+					<el-tag type="warning">{{ $t('atlas.highest') }}: {{ data.EMP_LV_NAME }}, {{ data.CROWN_LV_NAME }}</el-tag>
+					<el-tag>{{ data.PERIOD_AT }}</el-tag>
+				</span>
+			</span>
+		</el-tree>
   </div>
 </template>
 

+ 24 - 26
src/views/atlas/sponsor-network.vue

@@ -1,32 +1,30 @@
 <template>
   <div class="app-container">
-		<div class="white-box">
-			<div class="filter-user" @keyup.enter="getMainData()" style="margin: 5px">
-				<el-input v-model="mainUserName" size="small" style="width:300px; margin-top: 10px;" class="top-member">
-					<template slot="prepend">{{ $t('atlas.topMember') }}</template>
-				</el-input>
-				<el-input v-model="expandDeep" size="small" style="width:200px; margin-top: 10px;" class="spread-depth">
-					<template slot="prepend">{{ $t('atlas.spreadDepth') }}</template>
-				</el-input>
-				<el-input v-model="periodNum" size="small" style="width:150px; margin-top: 10px;" v-show="false">
-					<template slot="prepend">{{ $t('atlas.periodNumber') }}</template>
-				</el-input>
-				<el-button type="primary" size="small" @click="getMainData()" style="margin-top: 10px;">{{ $t('common.confirm') }}</el-button>
-			</div>
-			<el-tree :props="props" :data="treeData" node-key="USER_ID" @node-click="getChildData" ref="tree" :indent="0" default-expand-all :height="tool.getTableHeight(true)" style="margin-top: 15px;">
-        <span :id="'node_'+data.USER_ID" :class="'custom-tree-node '+data.className" slot-scope="{ node, data }">
-          <span :class="'el-icon-loading '+ data.displayNone"></span>
-          <span :class="data.icon"></span>
-          <span>
-            <el-tag type="danger">{{ node.label }}</el-tag>
-            <el-tag>{{data.REAL_NAME}}</el-tag>
-            <el-tag type="success">{{data.DEC_LV_NAME}}</el-tag>
-            <el-tag type="warning">Highest: {{data.EMP_LV_NAME}}, {{data.CROWN_LV_NAME}}</el-tag>
-            <el-tag>{{data.PERIOD_AT}}</el-tag>
-          </span>
-        </span>
-			</el-tree>
+		<div class="filter-user" @keyup.enter="getMainData()" style="margin: 5px 0">
+			<el-input v-model="mainUserName" size="small" style="width:300px; margin-top: 10px;" class="top-member">
+				<template slot="prepend">{{ $t('atlas.topMember') }}</template>
+			</el-input>
+			<el-input v-model="expandDeep" size="small" style="width:200px; margin-top: 10px;" class="spread-depth">
+				<template slot="prepend">{{ $t('atlas.spreadDepth') }}</template>
+			</el-input>
+			<el-input v-model="periodNum" size="small" style="width:150px; margin-top: 10px;" v-show="false">
+				<template slot="prepend">{{ $t('atlas.periodNumber') }}</template>
+			</el-input>
+			<el-button type="primary" size="small" @click="getMainData()" style="margin-top: 10px;">{{ $t('common.confirm') }}</el-button>
 		</div>
+		<el-tree :props="props" :data="treeData" node-key="USER_ID" @node-click="getChildData" ref="tree" :indent="0" default-expand-all :height="tool.getTableHeight(true)" style="margin-top: 15px;">
+			<span :id="'node_'+data.USER_ID" :class="'custom-tree-node '+data.className" slot-scope="{ node, data }">
+				<span :class="'el-icon-loading '+ data.displayNone"></span>
+				<span :class="data.icon"></span>
+				<span>
+					<el-tag type="danger">{{ node.label }}</el-tag>
+					<el-tag>{{data.REAL_NAME}}</el-tag>
+					<el-tag type="success">{{data.DEC_LV_NAME}}</el-tag>
+					<el-tag type="warning">Highest: {{data.EMP_LV_NAME}}, {{data.CROWN_LV_NAME}}</el-tag>
+					<el-tag>{{data.PERIOD_AT}}</el-tag>
+				</span>
+			</span>
+		</el-tree>
   </div>
 </template>
 

+ 24 - 18
src/views/bonus/bonus-list.vue

@@ -48,24 +48,24 @@
 
 		<el-dialog :title="bonusPayCycle" :visible.sync="dialog" :width="screenWidth" v-if="bonusData" style="margin-top: -80px">
 			<el-descriptions title="" class="bonus-list" :column="column" border size="medium" style="width: 100%">
-				<el-descriptions-item class="bonus-item" :label="$t('shop.memberCode')">{{ bonusData.USER_NAME.value }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.payCycle')">{{ bonusData.PERIOD_NUM.value }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('profile.memberLevel')">{{ bonusData.LAST_DEC_LV.value }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.whetherActive')">{{ bonusData.IS_ACTIVE.value === 1 ? $t('common.yes') : $t('common.no') }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('profile.latestDirector')">{{ bonusData.LAST_EMP_LV.value }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('profile.latestCrown')">{{ bonusData.LAST_CROWN_LV.value }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.directorPGSPerformance')">{{ bonusData.DIRECTOR_BONUS_PGS.value | toThousandFilter }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.directorBonus')">{{ bonusData.ORI_BONUS_BS.value | toThousandFilter }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.welcomeBonus')" v-if="bonusData.ORI_BONUS_TG_SWITCH === 1">{{ bonusData.ORI_BONUS_TG.value | toThousandFilter }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.teamBonus')" v-if="bonusData.ORI_BONUS_QY_SWITCH === 1">{{ bonusData.ORI_BONUS_QY.value | toThousandFilter }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.quarterlyBonus')">{{ bonusData.ORI_BONUS_QUARTER.value | amountFilter }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.stockistCommission')" v-if="bonusData.BONUS_BD_SWITCH === 1">{{ bonusData.BONUS_BD.value | toThousandFilter }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.totalBonus')">{{ bonusData.BONUS_TOTAL.value | toThousandFilter }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.actualBonus')">{{ bonusData.BONUS_REAL.value | toThousandFilter }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.leftNewlyIncreasedPerformance')">{{ bonusData.PV_1L.value | toThousandFilter }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.leftSurplusPerformance')">{{ bonusData.SURPLUS_1L.value | toThousandFilter }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.rightNewlyIncreasedPerformance')">{{ bonusData.PV_2L.value | toThousandFilter }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.rightSurplusPerformance')">{{ bonusData.SURPLUS_2L.value | toThousandFilter }}</el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('shop.memberCode')"><span style="white-space: nowrap;">{{ bonusData.USER_NAME.value }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.payCycle')"><span style="white-space: nowrap;">{{ bonusData.PERIOD_NUM.value }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('profile.memberLevel')"><span style="white-space: nowrap;">{{ bonusData.LAST_DEC_LV.value }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.whetherActive')"><span style="white-space: nowrap;">{{ bonusData.IS_ACTIVE.value === 1 ? $t('common.yes') : $t('common.no') }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('profile.latestDirector')"><span style="white-space: nowrap;">{{ bonusData.LAST_EMP_LV.value }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('profile.latestCrown')"><span style="white-space: nowrap;">{{ bonusData.LAST_CROWN_LV.value }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.directorPGSPerformance')"><span style="white-space: nowrap;">{{ bonusData.DIRECTOR_BONUS_PGS.value | toThousandFilter }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.directorBonus')"><span style="white-space: nowrap;">{{ bonusData.ORI_BONUS_BS.value | toThousandFilter }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.welcomeBonus')" v-if="bonusData.ORI_BONUS_TG_SWITCH === 1"><span style="white-space: nowrap;">{{ bonusData.ORI_BONUS_TG.value | toThousandFilter }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.teamBonus')" v-if="bonusData.ORI_BONUS_QY_SWITCH === 1"><span style="white-space: nowrap;">{{ bonusData.ORI_BONUS_QY.value | toThousandFilter }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.quarterlyBonus')"><span style="white-space: nowrap;">{{ bonusData.ORI_BONUS_QUARTER.value | amountFilter }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.stockistCommission')" v-if="bonusData.BONUS_BD_SWITCH === 1"><span style="white-space: nowrap;">{{ bonusData.BONUS_BD.value | toThousandFilter }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.totalBonus')"><span style="white-space: nowrap;">{{ bonusData.BONUS_TOTAL.value | toThousandFilter }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.actualBonus')"><span style="white-space: nowrap;">{{ bonusData.BONUS_REAL.value | toThousandFilter }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.leftNewlyIncreasedPerformance')"><span style="white-space: nowrap;">{{ bonusData.PV_1L.value | toThousandFilter }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.leftSurplusPerformance')"><span style="white-space: nowrap;">{{ bonusData.SURPLUS_1L.value | toThousandFilter }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.rightNewlyIncreasedPerformance')"><span style="white-space: nowrap;">{{ bonusData.PV_2L.value | toThousandFilter }}</span></el-descriptions-item>
+				<el-descriptions-item label-class-name="labelClass" :label="$t('bonus.rightSurplusPerformance')"><span style="white-space: nowrap;">{{ bonusData.SURPLUS_2L.value | toThousandFilter }}</span></el-descriptions-item>
 			</el-descriptions>
 		</el-dialog>
 	</div>
@@ -123,3 +123,9 @@ export default {
   }
 }
 </script>
+<style>
+	.labelClass {
+		white-space: pre-wrap;
+		word-break: keep-all;
+	}
+</style>

+ 77 - 39
src/views/bonus/historical-cumulative-bonus.vue

@@ -1,43 +1,81 @@
 <template>
   <div class="app-container" v-loading="loading">
-    <el-table
-      :data="tableData"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%; margin-top: 25px;"
-    >
-			<el-table-column align="center" min-width="130px" :label="$t('bonus.welcomeBonus')" prop="BONUS_TG.value" v-show="welcomeBonusSwitch === 1">
-				<template slot-scope="{row}">
-					{{ row.BONUS_TG.value | toThousandFilter }}
-				</template>
-			</el-table-column>
-      <el-table-column align="center" min-width="120px" :label="$t('bonus.teamBonus')" prop="ORI_BONUS_QY.value" v-show="teamBonusSwitch === 1">
-				<template slot-scope="{row}">
-					{{ row.ORI_BONUS_QY.value | toThousandFilter }}
-				</template>
-			</el-table-column>
-      <el-table-column align="center" min-width="130px" :label="$t('bonus.directorBonus')" prop="ORI_BONUS_BS.value">
-				<template slot-scope="{row}">
-					{{ row.ORI_BONUS_BS.value | toThousandFilter }}
-				</template>
-			</el-table-column>
-      <el-table-column align="center" min-width="140px" :label="$t('bonus.quarterlyBonus')" prop="ORI_BONUS_QUARTER.value">
-				<template slot-scope="{row}">
-					{{ row.ORI_BONUS_QUARTER.value | toThousandFilter }}
-				</template>
-			</el-table-column>
-			<el-table-column align="center" min-width="170px" :label="$t('bonus.stockistCommission')" prop="BONUS_BD.value" v-show="stockistCommissionSwitch === 1">
-				<template slot-scope="{row}">
-					{{ row.BONUS_BD.value | toThousandFilter }}
-				</template>
-			</el-table-column>
-			<el-table-column align="center" min-width="120px" :label="$t('bonus.totalBonus')" prop="BONUS_TOTAL.value">
-				<template slot-scope="{row}">
-					{{ row.BONUS_TOTAL.value | toThousandFilter }}
-				</template>
-			</el-table-column>
-    </el-table>
+		<el-row :gutter="20">
+			<el-col :xs="24" :sm="12" :lg="6" :span="6" v-show="welcomeBonusSwitch === 1">
+				<el-card shadow="hover" style="margin: 10px auto;">
+					<el-result icon="success" :title="$t('bonus.welcomeBonus')" :subTitle="tableData.BONUS_TG.value | toThousandFilter"></el-result>
+				</el-card>
+			</el-col>
+
+			<el-col :xs="24" :sm="12" :lg="6" :span="6" v-show="teamBonusSwitch === 1">
+				<el-card shadow="hover" style="margin: 10px auto;">
+					<el-result icon="success" :title="$t('bonus.teamBonus')" :subTitle="tableData.ORI_BONUS_QY.value | toThousandFilter"></el-result>
+				</el-card>
+			</el-col>
+
+			<el-col :xs="24" :sm="12" :lg="6" :span="6">
+				<el-card shadow="hover" style="margin: 10px auto;">
+					<el-result icon="success" :title="$t('bonus.directorBonus')" :subTitle="tableData.ORI_BONUS_BS.value | toThousandFilter"></el-result>
+				</el-card>
+			</el-col>
+
+			<el-col :xs="24" :sm="12" :lg="6" :span="6">
+				<el-card shadow="hover" style="margin: 10px auto;">
+					<el-result icon="success" :title="$t('bonus.quarterlyBonus')" :subTitle="tableData.ORI_BONUS_QUARTER.value | toThousandFilter"></el-result>
+				</el-card>
+			</el-col>
+
+			<el-col :xs="24" :sm="12" :lg="6" :span="6" v-show="stockistCommissionSwitch === 1">
+				<el-card shadow="hover" style="margin: 10px auto;">
+					<el-result icon="success" :title="$t('bonus.stockistCommission')" :subTitle="tableData.BONUS_BD.value | toThousandFilter"></el-result>
+				</el-card>
+			</el-col>
+
+			<el-col :xs="24" :sm="12" :lg="6" :span="6" >
+				<el-card shadow="hover" style="margin: 10px auto;">
+					<el-result icon="success" :title="$t('bonus.totalBonus')" :subTitle="tableData.BONUS_TOTAL.value | toThousandFilter"></el-result>
+				</el-card>
+			</el-col>
+		</el-row>
+
+<!--    <el-table-->
+<!--      :data="tableData"-->
+<!--      border-->
+<!--      fit-->
+<!--      highlight-current-row-->
+<!--      style="width: 100%; margin-top: 25px;"-->
+<!--    >-->
+<!--			<el-table-column align="center" min-width="130px" :label="$t('bonus.welcomeBonus')" prop="BONUS_TG.value" v-show="welcomeBonusSwitch === 1">-->
+<!--				<template slot-scope="{row}">-->
+<!--					{{ row.BONUS_TG.value | toThousandFilter }}-->
+<!--				</template>-->
+<!--			</el-table-column>-->
+<!--      <el-table-column align="center" min-width="120px" :label="$t('bonus.teamBonus')" prop="ORI_BONUS_QY.value" v-show="teamBonusSwitch === 1">-->
+<!--				<template slot-scope="{row}">-->
+<!--					{{ row.ORI_BONUS_QY.value | toThousandFilter }}-->
+<!--				</template>-->
+<!--			</el-table-column>-->
+<!--      <el-table-column align="center" min-width="130px" :label="$t('bonus.directorBonus')" prop="ORI_BONUS_BS.value">-->
+<!--				<template slot-scope="{row}">-->
+<!--					{{ row.ORI_BONUS_BS.value | toThousandFilter }}-->
+<!--				</template>-->
+<!--			</el-table-column>-->
+<!--      <el-table-column align="center" min-width="140px" :label="$t('bonus.quarterlyBonus')" prop="ORI_BONUS_QUARTER.value">-->
+<!--				<template slot-scope="{row}">-->
+<!--					{{ row.ORI_BONUS_QUARTER.value | toThousandFilter }}-->
+<!--				</template>-->
+<!--			</el-table-column>-->
+<!--			<el-table-column align="center" min-width="170px" :label="$t('bonus.stockistCommission')" prop="BONUS_BD.value" v-show="stockistCommissionSwitch === 1">-->
+<!--				<template slot-scope="{row}">-->
+<!--					{{ row.BONUS_BD.value | toThousandFilter }}-->
+<!--				</template>-->
+<!--			</el-table-column>-->
+<!--			<el-table-column align="center" min-width="120px" :label="$t('bonus.totalBonus')" prop="BONUS_TOTAL.value">-->
+<!--				<template slot-scope="{row}">-->
+<!--					{{ row.BONUS_TOTAL.value | toThousandFilter }}-->
+<!--				</template>-->
+<!--			</el-table-column>-->
+<!--    </el-table>-->
 	</div>
 </template>
 
@@ -65,7 +103,7 @@ export default {
       this.loading = true
 			fetchHistoricalCumulativeBonus().then(response => {
 				const {tableData, bonusSwitch} = response.data
-				this.tableData = tableData
+				this.tableData = tableData.length > 0 ? tableData[0] : {}
 				this.welcomeBonusSwitch = bonusSwitch.welcomeBonusSwitch
 				this.teamBonusSwitch = bonusSwitch.teamBonusSwitch
 				this.stockistCommissionSwitch = bonusSwitch.stockistCommissionSwitch

+ 1 - 1
src/views/dashboard/admin/index.vue

@@ -56,7 +56,7 @@
     </el-row> -->
 
 		<el-dialog title="" :visible.sync="dialog" :width="screenWidth" center style="margin-top: -80px;">
-			<div class="white-box" style="margin-top: -20px;">
+			<div class="white-box" style="margin-top: -20px; padding: 0;">
 				<div class="white-box-title" style="text-align: center">
 					<h1>{{ article.TITLE }}</h1>
 					<span>{{ article.CREATED_AT | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>

+ 6 - 0
src/views/user/brand-ambassador.vue

@@ -613,6 +613,12 @@ export default {
 					this.payForm.metadata.custom_fields[0].value = response.data.SN
 					this.visible = true
 				}
+			}).catch(err => {
+				this.$message({
+					message: err,
+					type: 'error'
+				})
+				this.submitButtonStat = false
 			})
 		},
 		// 已选择商品

+ 6 - 0
src/views/user/member-upgrade.vue

@@ -607,6 +607,12 @@ export default {
 					this.payForm.metadata.custom_fields[0].value = response.data.SN
 					this.visible = true
 				}
+			}).catch(err => {
+				this.$message({
+					message: err,
+					type: 'error'
+				})
+				this.submitButtonStat = false
 			})
 		},
 		// 已选择商品

+ 6 - 0
src/views/user/welcome-pack.vue

@@ -689,6 +689,12 @@ export default {
 					}
 					this.visible = true
 				}
+			}).catch(err => {
+				this.$message({
+					message: err,
+					type: 'error'
+				})
+				this.submitButtonStat = false
 			})
 		},
 		// 已选择商品