优化UI、团队查询功能发布

package.json

@@ -28,6 +28,7 @@
     "js-cookie": "2.2.0",
     "jsonlint": "1.6.3",
     "jszip": "3.2.1",
+    "moment": "^2.29.4",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",

src/api/bonus.js

@@ -44,3 +44,12 @@ export function fetchHistoricalCumulativeBonus() {
     params: {}
   })
 }
+
+// 团队查询
+export function fetchTeamInquiry() {
+  return request({
+    url: '/v1/bonus/teams',
+    method: 'get',
+    params: {}
+  })
+}

src/filters/index.js

@@ -1,4 +1,6 @@
 // import parseTime, formatTime and set to filter
+import {formatAmount} from "@/utils";
+
 export { parseTime, formatTime } from '@/utils'
 
 /**
@@ -66,3 +68,23 @@ export function toThousandFilter(num) {
 export function uppercaseFirst(string) {
   return string.charAt(0).toUpperCase() + string.slice(1)
 }
+
+/**
+ * 金额千分符
+ * @param amount
+ * @returns {string}
+ */
+export function amountFilter(amount) {
+  amount = parseFloat(amount)
+  if (amount === 0.00) {
+    return '0.00';
+  }
+
+  amount = String(amount);
+  let left = amount.split('.')[0]
+  let right = amount.split('.')[1]
+  right = right ? '.' + (right.length < 2 ? right + '0' : right) : '.00'
+  let temp = left.split('').reverse().join('').match(/(\d{1,3})/g)
+
+  return (Number(amount) < 0 ? '-' : '') + temp.join(',').split('').reverse().join('') + right
+}

src/lang/en.js

@@ -245,6 +245,7 @@ export default {
     note: 'Note',
     awaitData: 'Retrieving data, please wait.',
     switchLanguageHints: 'Switch Language Success',
+    websiteTitle: 'Member Management System',
   },
 
   shop: {
@@ -409,6 +410,13 @@ export default {
     remark: 'Remark',
     whetherActive: 'Whether Active',
     directorPGSPerformance: 'Director PGS Performance',
+    personalDetails: 'Personal Details',
+    status: 'Status',
+    personalBV: 'Personal BV',
+    PGS: 'PGS',
+    teamDetails: 'Team Details',
+    latestCalculationTime: 'Latest calculation time',
+    totalBV: 'Total BV',
   },
   finance: {
     applyTransfer: 'Apply For Transfer',

src/lang/zh.js

@@ -244,6 +244,7 @@ export default {
     note: '备注',
     awaitData: '正在获取数据，请稍后',
     switchLanguageHints: '语言切换成功',
+    websiteTitle: '会员管理系统',
   },
   shop: {
     product: '商品',
@@ -405,6 +406,13 @@ export default {
     remark: '备注',
     whetherActive: '是否活跃',
     directorPGSPerformance: '管理奖个人小组业绩',
+    personalDetails: '个人情况',
+    status: '状态',
+    personalBV: '个人业绩',
+    PGS: '累计业绩',
+    teamDetails: '团队情况',
+    latestCalculationTime: '最新计算时间',
+    totalBV: '合计',
   },
   finance: {
     applyTransfer: '转账',

src/main.js

@@ -7,6 +7,8 @@ import 'normalize.css/normalize.css' // a modern alternative to CSS resets
 import Element from 'element-ui'
 import './styles/element-variables.scss'
 
+import moment from 'moment'
+
 import '@/styles/index.scss' // global css
 
 import App from './App'
@@ -27,7 +29,7 @@ import * as filters from './filters' // global filters
  *
  * Currently MockJs will be used in the production environment,
  * please remove it before going online ! ! !
- 
+
 if (process.env.NODE_ENV === 'production') {
   const { mockXHR } = require('../mock')
   mockXHR()
@@ -45,6 +47,7 @@ Object.keys(filters).forEach(key => {
 })
 
 Vue.config.productionTip = false
+Vue.prototype.$moment = moment
 
 new Vue({
   el: '#app',

src/utils/request.js

@@ -77,15 +77,10 @@ service.interceptors.request.use(
 // response interceptor
 service.interceptors.response.use(
   response => {
-    // console.log(response)
+    console.log('response', response)
     const responseData = response.data
     const data = responseData.data
     if (responseData.success === false) {
-    // const err = new Error(data.message)
-    // err.data = data
-    // err.message = data.message
-    // err.response = response
-    // throw err
       Message({
         message: data.message || 'Error',
         type: 'error',

src/views/bonus/account-list.vue

@@ -3,7 +3,7 @@
 		<el-row :gutter="20">
 			<el-col :xs="24" :sm="12" :lg="6" :span="6" v-for="item in walletData" :key="item.walletType">
 				<el-card shadow="hover" style="margin: 10px auto;">
-					<el-result icon="info" :title="item.walletName" :subTitle="item.amount | amountFilter">
+					<el-result icon="info" :title="item.walletName" :subTitle="item.amount | toThousandFilter">
 <!--						<template slot="icon">-->
 <!--							<el-image fit="cover" :src="tool.getArImage(item.walletType + '.png', '/files/')" style="width: 100px; height: 100px; border-radius: 50%;"></el-image>-->
 <!--						</template>-->
@@ -113,11 +113,6 @@ import {formatAmount, getScreenWidth} from "@/utils"
 export default {
   name: 'memberAccount',
 	components: { Pagination },
-	filters: {
-		amountFilter(amount) {
-			return formatAmount(amount)
-		},
-	},
   data() {
     return {
 			tool: tool,
@@ -134,7 +129,7 @@ export default {
 			total: 0,
 			listQuery: {
 				page: 1,
-				pageSize: 20,
+				pageSize: 10,
 				walletType: '',
 				createAt: [],
 				remark: '',

src/views/bonus/bonus-list.vue

@@ -7,12 +7,36 @@
       highlight-current-row
     >
       <el-table-column align="center" min-width="100px" :label="$t('bonus.payCycle')" prop="PERIOD_NUM.value"></el-table-column>
-			<el-table-column align="center" min-width="150px" :label="$t('bonus.welcomeBonus')" prop="BONUS_TG.value" v-show="welcomeBonusSwitch === 1"></el-table-column>
-      <el-table-column align="center" min-width="130px" :label="$t('bonus.teamBonus')" prop="ORI_BONUS_QY.value" v-show="teamBonusSwitch === 1"></el-table-column>
-      <el-table-column align="center" min-width="130px" :label="$t('bonus.directorBonus')" prop="ORI_BONUS_BS.value"></el-table-column>
-      <el-table-column align="center" min-width="150px" :label="$t('bonus.quarterlyBonus')" prop="ORI_BONUS_QUARTER.value"></el-table-column>
-			<el-table-column align="center" min-width="170px" :label="$t('bonus.stockistCommission')" prop="BONUS_BD.value" v-show="stockistCommissionSwitch === 1"></el-table-column>
-			<el-table-column align="center" min-width="120px" :label="$t('bonus.actualBonus')" prop="BONUS_REAL.value"></el-table-column>
+			<el-table-column align="center" min-width="150px" :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="130px" :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="150px" :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.actualBonus')" prop="BONUS_REAL.value">
+				<template slot-scope="{row}">
+					{{ row.BONUS_REAL.value | toThousandFilter }}
+				</template>
+			</el-table-column>
       <el-table-column align="center" min-width="100px" :label="$t('common.action')">
         <template slot-scope="{row}">
 					<el-button-group>
@@ -30,18 +54,18 @@
 				<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 }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.directorBonus')">{{ bonusData.ORI_BONUS_BS.value }}</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 }}</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 }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.quarterlyBonus')">{{ bonusData.ORI_BONUS_QUARTER.value }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.stockistCommission')" v-if="bonusData.BONUS_BD_SWITCH === 1">{{ bonusData.BONUS_BD.value }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.totalBonus')">{{ bonusData.BONUS_TOTAL.value }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.actualBonus')">{{ bonusData.BONUS_REAL.value }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.leftNewlyIncreasedPerformance')">{{ bonusData.PV_1L.value }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.leftSurplusPerformance')">{{ bonusData.SURPLUS_1L.value }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.rightNewlyIncreasedPerformance')">{{ bonusData.PV_2L.value }}</el-descriptions-item>
-				<el-descriptions-item class="bonus-item" :label="$t('bonus.rightSurplusPerformance')">{{ bonusData.SURPLUS_2L.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>
 		</el-dialog>
 	</div>
@@ -53,11 +77,6 @@ import {formatAmount, getOperatingSystem, getScreenWidth} from "@/utils";
 
 export default {
   name: 'previousBonus',
-	filters: {
-		amountFilter(amount) {
-			return formatAmount(amount)
-		},
-	},
   data() {
     return {
 			tableData: [],

src/views/bonus/historical-cumulative-bonus.vue

@@ -7,12 +7,36 @@
       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"></el-table-column>
-      <el-table-column align="center" min-width="120px" :label="$t('bonus.teamBonus')" prop="ORI_BONUS_QY.value" v-show="teamBonusSwitch === 1"></el-table-column>
-      <el-table-column align="center" min-width="130px" :label="$t('bonus.directorBonus')" prop="ORI_BONUS_BS.value"></el-table-column>
-      <el-table-column align="center" min-width="140px" :label="$t('bonus.quarterlyBonus')" prop="ORI_BONUS_QUARTER.value"></el-table-column>
-			<el-table-column align="center" min-width="170px" :label="$t('bonus.stockistCommission')" prop="BONUS_BD.value" v-show="stockistCommissionSwitch === 1"></el-table-column>
-			<el-table-column align="center" min-width="120px" :label="$t('bonus.totalBonus')" prop="BONUS_TOTAL.value"></el-table-column>
+			<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>

src/views/bonus/team-inquiry.vue

@@ -1,36 +1,73 @@
 <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" :label="$t('bonus.welcomeBonus')" prop="BONUS_TG.value" v-show="welcomeBonusSwitch === 1"></el-table-column>
-      <el-table-column align="center" :label="$t('bonus.teamBonus')" prop="ORI_BONUS_QY.value" v-show="teamBonusSwitch === 1"></el-table-column>
-      <el-table-column align="center" :label="$t('bonus.directorBonus')" prop="ORI_BONUS_BS.value"></el-table-column>
-      <el-table-column align="center" :label="$t('bonus.quarterlyBonus')" prop="ORI_BONUS_QUARTER.value"></el-table-column>
-			<el-table-column align="center" :label="$t('bonus.stockistCommission')" prop="BONUS_BD.value" v-show="stockistCommissionSwitch === 1"></el-table-column>
-			<el-table-column align="center" :label="$t('bonus.totalBonus')" prop="BONUS_TOTAL.value"></el-table-column>
-    </el-table>
+		<el-table border :data="userData" style="width: 100%" :cell-style="tableCellStyle">
+			<el-table-column :label="$t('bonus.personalDetails')">
+				<el-table-column type="index" :index="indexMethod" width="60px" label=""></el-table-column>
+				<el-table-column min-width="120px" prop="number" :label="$t('shop.memberCode')"></el-table-column>
+				<el-table-column min-width="210px" prop="name" :label="$t('shop.memberName')"></el-table-column>
+				<el-table-column min-width="70px" prop="perf_status_name" :label="$t('bonus.status')"></el-table-column>
+				<el-table-column min-width="120px" prop="user_perf" :label="$t('bonus.personalBV')">
+					<template slot-scope="{row}">
+						{{ row.user_perf | toThousandFilter }}
+					</template>
+				</el-table-column>
+				<el-table-column min-width="120px" prop="team_perf" :label="$t('bonus.PGS')">
+					<template slot-scope="{row}">
+						{{ row.team_perf | toThousandFilter }}
+					</template>
+				</el-table-column>
+				<el-table-column min-width="120px" prop="total_perf" :label="$t('bonus.totalBV')">
+					<template slot-scope="{row}">
+						{{ row.total_perf | toThousandFilter }}
+					</template>
+				</el-table-column>
+			</el-table-column>
+		</el-table>
+
+		<el-table border :data="tableData" style="width: 100%;margin-top:20px;" :cell-style="tableCellStyle">
+			<el-table-column label="Team Details">
+				<el-table-column type="index" :index="indexMethod" width="60px" label=""></el-table-column>
+				<el-table-column min-width="120px" prop="number" :label="$t('shop.memberCode')"></el-table-column>
+				<el-table-column min-width="210px" prop="name" :label="$t('shop.memberName')"></el-table-column>
+				<el-table-column min-width="70px" prop="perf_status_name" :label="$t('bonus.status')"></el-table-column>
+				<el-table-column min-width="120px" prop="user_perf" :label="$t('bonus.personalBV')">
+					<template slot-scope="{row}">
+						{{ row.user_perf | toThousandFilter }}
+					</template>
+				</el-table-column>
+				<el-table-column min-width="120px" prop="team_perf" :label="$t('bonus.PGS')">
+					<template slot-scope="{row}">
+						{{ row.team_perf | toThousandFilter }}
+					</template>
+				</el-table-column>
+				<el-table-column min-width="120px" prop="total_perf" :label="$t('bonus.totalBV')">
+					<template slot-scope="{row}">
+						{{ row.total_perf | toThousandFilter }}
+					</template>
+				</el-table-column>
+			</el-table-column>
+		</el-table>
+
+		<el-descriptions  :column="2">
+			<el-descriptions-item :label="$t('bonus.latestCalculationTime')">{{ getWatTime(calcTime) }}</el-descriptions-item>
+		</el-descriptions>
 	</div>
 </template>
 
 <script>
-import {fetchHistoricalCumulativeBonus} from '@/api/bonus'
+import {fetchTeamInquiry} from '@/api/bonus'
+import tool from "@/utils/tool"
 
 export default {
   name: 'teamInquiry',
   data() {
     return {
+			calcTime: '',
+			userData: [],
 			tableData: [],
-      total: 0,
 			loading: true,
 
-			welcomeBonusSwitch: 0,
-			teamBonusSwitch: 0,
-			stockistCommissionSwitch: 0,
+			tool: tool,
     }
   },
   created() {
@@ -39,16 +76,94 @@ export default {
 	methods: {
     getList() {
       this.loading = true
-			fetchHistoricalCumulativeBonus().then(response => {
-				const {tableData, bonusSwitch} = response.data
-				this.tableData = tableData
-				this.welcomeBonusSwitch = bonusSwitch.welcomeBonusSwitch
-				this.teamBonusSwitch = bonusSwitch.teamBonusSwitch
-				this.stockistCommissionSwitch = bonusSwitch.stockistCommissionSwitch
+			fetchTeamInquiry().then(response => {
+				this.calcTime = response.data.calcAt
+				this.tableData = response.data.team
+				this.userData = response.data.user
 
 				this.loading = false
       })
     },
+		tableCellStyle ({row, column, rowIndex, columnIndex}) {
+			if (row.perf_status === '0' && columnIndex === 3) {
+				return 'background-color:rgb(225, 25, 98);font-weight:bold'
+			} else if (row.perf_status === '1' && columnIndex === 3) {
+				return 'background-color:rgb(31, 156, 18);font-weight:bold'
+			}
+		},
+		indexMethod(index) {
+			return index + 1
+		},
+		getWatTime(ts) {
+			ts = parseInt(ts)
+			if (ts) {
+				return this.$moment(ts * 1000).utcOffset('+0100').format('YYYY-MM-DD HH:mm:ss')
+			} else {
+				return ''
+			}
+		}
   }
 }
 </script>
+<style scoped>
+.leo-filter {
+	padding: 0 0 15px 0;
+}
+
+.leo-filter .filter-hidden {
+	display: none;
+}
+
+.filter-item {
+	margin-right: 10px;
+}
+
+@media (min-width: 768px) {
+	.leo-filter {
+	}
+
+	.leo-filter .filter-item {
+		display: inline-block;
+		max-width: 200px;
+	}
+
+	.leo-filter .filter-item.filter-date-month-picker {
+		display: inline-block;
+		max-width: 220px;
+	}
+
+	.leo-filter .filter-item.filter-date-range-picker {
+		display: inline-block;
+		max-width: 380px;
+	}
+
+	.leo-filter .filter-item.filter-filter-btn {
+		height: 38px;
+		width: 80px;
+	}
+
+	.leo-filter .filter-hidden {
+		display: none;
+	}
+}
+.dialog-footer:after{content: '';
+	clear: both;display: table;
+}
+.el-table .warning-row {
+	background: oldlace;
+}
+
+.el-table .success-row {
+	background: #f0f9eb;
+	/* color:rgb(225, 25, 98)   */
+}
+.el-descriptions {
+	margin-top:20px;
+}
+/deep/ .el-descriptions-item__container {
+	margin-top:10px;
+}
+/deep/ .el-descriptions-item__label.has-colon {
+	margin-left:10px;
+}
+</style>

src/views/finance/recharge-list.vue

@@ -8,7 +8,7 @@
 			</el-table-column>
 			<el-table-column align="center" min-width="160px" :label="$t('finance.rechargeAmount')" prop="AMOUNT">
 				<template slot-scope="{row}">
-					{{ row.AMOUNT | amountFilter }}
+					{{ row.AMOUNT | toThousandFilter }}
 				</template>
 			</el-table-column>
 			<el-table-column align="center" min-width="150px" :label="$t('finance.rechargeStatus')" prop="STATUS_NAME">
@@ -106,9 +106,6 @@ export default {
 			}
 			return statusEnums[status] || 'warning'
 		},
-		amountFilter(amount) {
-			return formatAmount(amount)
-		},
 	},
 	data() {
 		return {

src/views/finance/transfer-list.vue

@@ -61,17 +61,17 @@
 			<el-table-column align="center" min-width="170px" :label="$t('finance.transferIntoAccount')" prop="IN_WALLET_NAME"></el-table-column>
 			<el-table-column align="center" min-width="150px" :label="$t('finance.transferAmount')" prop="ORI_AMOUNT">
 				<template slot-scope="{row}">
-					<span>{{ tool.formatPrice(row.ORI_AMOUNT) | amountFilter }}</span>
+					<span>{{ tool.formatPrice(row.ORI_AMOUNT) | toThousandFilter }}</span>
 				</template>
 			</el-table-column>
 			<el-table-column align="center" min-width="150px" :label="$t('finance.serviceCharge')" prop="FEE" v-if="showFee">
 				<template slot-scope="{row}">
-					<span>{{ tool.formatPrice(row.FEE) | amountFilter}}</span>
+					<span>{{ tool.formatPrice(row.FEE) | toThousandFilter}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column align="center" min-width="150px" :label="$t('finance.actualAmountTransferredInto')" prop="AMOUNT" v-if="showFee">
 				<template slot-scope="{row}">
-					<span>{{ tool.formatPrice(row.AMOUNT) | amountFilter}}</span>
+					<span>{{ tool.formatPrice(row.AMOUNT) | toThousandFilter}}</span>
 				</template>
 			</el-table-column>
 			<el-table-column min-width="160px"  align="center" :label="$t('finance.transferTime')" prop="CREATED_AT">
@@ -164,11 +164,6 @@ export default {
 	name: 'Transfer',
 	components: { Pagination },
 	directives: { waves },
-	filters: {
-		amountFilter(amount) {
-			return formatAmount(amount)
-		},
-	},
 	data() {
 		return {
 			tool: tool,

src/views/shop/ba-dec-order-list.vue

@@ -29,17 +29,17 @@
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.productPrice')">
 									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row.REAL_PRICE | amountFilter }}</span>
+										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row.REAL_PRICE | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalPrice')">
 									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | priceAmountFilter | amountFilter }}</span>
+										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | priceAmountFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalBV')">
 									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ row | bvFilter | amountFilter }}</span>
+										<span style="white-space: nowrap;">{{ row | bvFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.taxRate')">
@@ -49,7 +49,7 @@
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalTaxAmount')">
 									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | taxAmountFilter | amountFilter }}</span>
+										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | taxAmountFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 							</el-table>
@@ -134,9 +134,6 @@ export default {
 		priceAmountFilter(row) {
 			return tool.formatPrice(row.REAL_PRICE * row.BUY_NUMS)
 		},
-		amountFilter(amount) {
-			return formatAmount(amount)
-		},
 		statusFilter(status) {
 			const statusMap = {
 				Unpaid: 'info',

src/views/shop/car-fund-products.vue

@@ -18,7 +18,7 @@
 								</el-col>
 								<el-col :xs="24" :sm="24" :lg="5">
 								<span style="font-size: 13px;">
-									<span style="font-weight: bold; color: tomato;">{{ $t('shop.productPrice') }}：{{ row.SELL_PRICE | amountFilter }}</span>
+									<span style="font-weight: bold; color: tomato;">{{ $t('shop.productPrice') }}：{{ row.SELL_PRICE | toThousandFilter }}</span>
 								</span>
 								</el-col>
 								<el-col :xs="24" :sm="24" :lg="4">
@@ -41,8 +41,8 @@
 				<el-button type="primary" size="small" @click="settlement()" style="float: left;">{{ $t('shop.checkOut') }}</el-button>
 			</div>
 			<div class="flex data" style="float: right; display: inline-block; line-height: 28px; font-size: 14px; margin-top: 10px; border: 1px solid #dcdfe6; border-radius: 4px; padding: 0 5px;">
-				<div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ sellPriceSum | amountFilter }}</div>
-				<div style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ taxSum | amountFilter }}</div>
+				<div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ sellPriceSum | toThousandFilter }}</div>
+				<div style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ taxSum | toThousandFilter }}</div>
 			</div>
 		</div>
 
@@ -66,13 +66,13 @@
 												<span style="color: #9c9c9c; cursor: pointer;">{{ row.GOODS_NO }}</span>
 											</el-col>
 											<el-col :xs="16" :sm="4" :lg="4">
-												<span style="font-weight: bold;">{{ row.member_price | amountFilter }}</span>
+												<span style="font-weight: bold;">{{ row.member_price | toThousandFilter }}</span>
 											</el-col>
 											<el-col :xs="8" :sm="3" :lg="3">
 												<span style="">x {{ row.chose_num }}</span>
 											</el-col>
 											<el-col :xs="24" :sm="5" :lg="5">
-												<span style="color: tomato; font-weight: bold;">{{ row.member_price_plus | amountFilter }}</span>
+												<span style="color: tomato; font-weight: bold;">{{ row.member_price_plus | toThousandFilter }}</span>
 											</el-col>
 										</el-row>
 									</el-main>
@@ -89,7 +89,7 @@
 									<span style="font-weight: bold; word-break: normal; white-space: normal; line-height: 28px;">{{ $t('shop.totalOrders') }}：</span>
 								</el-col>
 								<el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="14" style="word-break: normal; white-space: nowrap; line-height: 28px;">
-									<span>{{ $t('shop.total') }}：{{ parseFloat(pointsSum) | amountFilter }}</span>
+									<span>{{ $t('shop.total') }}：{{ parseFloat(pointsSum) | toThousandFilter }}</span>
 									<span style="margin-left: 15px;">{{ $t('shop.freight') }}：{{ pointFreight }}</span>
 								</el-col>
 							</el-row>
@@ -104,7 +104,7 @@
 									<el-radio-group v-model="payType" @change='chosePayType'>
 										<div v-for="(item, index) in payList" :key='index' class="address">
 											<el-radio :label="item.label" border>
-												{{ item.name }}<span v-if="item.label === payType" style="color: tomato;">({{ userBalance[payType] | amountFilter }})</span>
+												{{ item.name }}<span v-if="item.label === payType" style="color: tomato;">({{ userBalance[payType] | toThousandFilter }})</span>
 											</el-radio>
 										</div>
 									</el-radio-group>
@@ -160,9 +160,9 @@
 					<div style="text-align: left; line-height: 50px; font-size: 16px;">
 						<span style="font-weight: bold; font-size: 20px;">{{ product.GOODS_NAME }}</span><br />
 						<span style="font-weight: bold; font-size: 15px;">{{ $t('shop.productCode') }}：{{ product.GOODS_NO }}</span><br />
-						<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ product.SELL_PRICE | amountFilter }}</span><br />
+						<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ product.SELL_PRICE | toThousandFilter }}</span><br />
 						<span>{{ $t('shop.taxRate') }}：{{ product.TAX_RATE / 100 }}</span><br />
-						<span>{{ $t('shop.taxAmount') }}：{{ product.taxAmount | amountFilter }}</span><br />
+						<span>{{ $t('shop.taxAmount') }}：{{ product.taxAmount | toThousandFilter }}</span><br />
 						<span>{{ $t('shop.inventory') }}：{{ product.STORE_NUMS }}</span>
 					</div>
 				</el-col>
@@ -197,9 +197,6 @@ export default {
 			}
 			return statusMap[status]
 		},
-		amountFilter(amount) {
-			return formatAmount(amount)
-		},
 	},
 	data() {
 		return {

src/views/shop/dec-order-list.vue

@@ -29,17 +29,17 @@
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.productPrice')">
 									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row.REAL_PRICE | amountFilter }}</span>
+										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row.REAL_PRICE | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalPrice')">
 									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | priceAmountFilter | amountFilter }}</span>
+										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | priceAmountFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalBV')">
 									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ row | bvFilter | amountFilter }}</span>
+										<span style="white-space: nowrap;">{{ row | bvFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.taxRate')">
@@ -49,7 +49,7 @@
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalTaxAmount')">
 									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | taxAmountFilter | amountFilter }}</span>
+										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | taxAmountFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 							</el-table>
@@ -134,9 +134,6 @@ export default {
 		priceAmountFilter(row) {
 			return tool.formatPrice(row.REAL_PRICE * row.BUY_NUMS)
 		},
-		amountFilter(amount) {
-			return formatAmount(amount)
-		},
 		statusFilter(status) {
 			const statusMap = {
 				Unpaid: 'info',

src/views/shop/order-list.vue

@@ -29,17 +29,17 @@
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.productPrice')" min-width="150px">
 									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row.REAL_PRICE | amountFilter }}</span>
+										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row.REAL_PRICE | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalPrice')">
 									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | priceAmountFilter | amountFilter }}</span>
+										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | priceAmountFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalBV')">
 									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ row | bvFilter | amountFilter }}</span>
+										<span style="white-space: nowrap;">{{ row | bvFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.taxRate')">
@@ -49,7 +49,7 @@
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalTaxAmount')">
 									<template slot-scope="{row}">
-										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | taxAmountFilter | amountFilter }}</span>
+										<span style="white-space: nowrap;">{{ $t('currency.sign') }} {{ row | taxAmountFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 							</el-table>
@@ -130,9 +130,6 @@ export default {
 		priceAmountFilter(row) {
 			return tool.formatPrice(row.REAL_PRICE * row.BUY_NUMS)
 		},
-		amountFilter(amount) {
-			return formatAmount(amount)
-		},
     statusFilter(status) {
       const statusMap = {
         Unpaid: 'info',

src/views/shop/standard-products.vue

@@ -20,8 +20,8 @@
 							<el-col :xs="24" :sm="24" :lg="5">
 								<span style="font-size: 13px;">
 									<span style="font-weight: bold; color: tomato;">
-										{{ $t('currency.sign') }} {{ row.SELL_PRICE | amountFilter }}
-										<span style="font-weight:normal; color: #606266;">({{ row.PRICE_PV | amountFilter }}{{ $t('shop.productBV') }})</span>
+										{{ $t('currency.sign') }} {{ row.SELL_PRICE | toThousandFilter }}
+										<span style="font-weight:normal; color: #606266;">({{ row.PRICE_PV | toThousandFilter }}{{ $t('shop.productBV') }})</span>
 									</span>
 								</span>
 							</el-col>
@@ -45,9 +45,9 @@
 			<el-button type="primary" size="small" @click="settlement()" style="float: left;">{{ $t('shop.checkOut') }}</el-button>
 		</div>
 		<div class="flex data" style="float: right; display: inline-block; line-height: 28px; font-size: 14px; margin-top: 10px; border: 1px solid #dcdfe6; border-radius: 4px; padding: 0 5px;">
-			<div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ sellPriceSum | amountFilter }}</div>
-			<div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productBV') }}：{{ pricePvSum | amountFilter }}</div>
-			<div style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ taxSum | amountFilter }}</div>
+			<div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ sellPriceSum | toThousandFilter }}</div>
+			<div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productBV') }}：{{ pricePvSum | toThousandFilter }}</div>
+			<div style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ taxSum | toThousandFilter }}</div>
 		</div>
 	</div>
 
@@ -71,13 +71,13 @@
 											<span style="color: #9c9c9c; cursor: pointer;">{{ row.GOODS_NO }}</span>
 										</el-col>
 										<el-col :xs="16" :sm="4" :lg="4">
-											<span style="font-weight: bold;">{{ $t('currency.sign') }} {{ row.member_price | amountFilter }}</span>
+											<span style="font-weight: bold;">{{ $t('currency.sign') }} {{ row.member_price | toThousandFilter }}</span>
 										</el-col>
 										<el-col :xs="8" :sm="3" :lg="3">
 											<span style="">x {{ row.chose_num }}</span>
 										</el-col>
 										<el-col :xs="24" :sm="5" :lg="5">
-											<span style="color: tomato; font-weight: bold;">{{ $t('currency.sign') }} {{ row.member_price_plus | amountFilter }}</span>
+											<span style="color: tomato; font-weight: bold;">{{ $t('currency.sign') }} {{ row.member_price_plus | toThousandFilter }}</span>
 										</el-col>
 									</el-row>
 								</el-main>
@@ -94,7 +94,7 @@
 								<span style="font-weight: bold; word-break: normal; white-space: normal; line-height: 28px;">{{ $t('shop.totalOrders') }}：</span>
 							</el-col>
 							<el-col :xs="24" :sm="16" :md="14" :lg="14" :xl="14" style="word-break: normal; white-space: nowrap; line-height: 28px;">
-								<span>{{ $t('shop.total') }}：{{ $t('currency.sign') }} {{ parseFloat(cashSum) | amountFilter }}</span>
+								<span>{{ $t('shop.total') }}：{{ $t('currency.sign') }} {{ parseFloat(cashSum) | toThousandFilter }}</span>
 								<span style="margin-left: 15px;">{{ $t('shop.freight') }}：{{ $t('currency.sign') }} {{ pointFreight }}</span>
 							</el-col>
 						</el-row>
@@ -109,7 +109,7 @@
 								<el-radio-group v-model="payType" @change='chosePayType'>
 									<div v-for="(item, index) in payList" :key='index' class="address">
 										<el-radio :label="item.label" border>
-											{{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">({{ $t('currency.sign') }} {{ userBalance.cash | amountFilter }})</span>
+											{{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">({{ $t('currency.sign') }} {{ userBalance.cash | toThousandFilter }})</span>
 										</el-radio>
 									</div>
 								</el-radio-group>
@@ -120,10 +120,10 @@
 					<!-- 收货地址 -->
 					<div class="box address_box" style="margin: 15px 0;">
 						<el-row :gutter="20" type="flex" style="flex-wrap: wrap;">
-							<el-col :xs="24" :sm="24" :md="4" :lg="4" :xl="4">
+							<el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="16">
 								<span style="font-weight: bold; word-break: normal; white-space: normal; line-height: 28px;">{{ $t('shop.selectAddress') }}：</span>
 							</el-col>
-							<el-col :xs="24" :sm="24" :md="20" :lg="20" :xl="20" style="word-break: normal; white-space: nowrap;">
+							<el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8" style="word-break: normal; white-space: nowrap;">
 								<el-radio-group v-model="addressId" @change='choseAddress'>
 									<div class="address">
 										<el-radio :label="selfPickUpAddressId">{{ $t('shop.selfPickUp') }}</el-radio>
@@ -206,10 +206,10 @@
 				<div style="text-align: left; line-height: 50px; font-size: 16px;">
 					<span style="font-weight: bold; font-size: 20px;">{{ product.GOODS_NAME }}</span><br />
 					<span style="font-weight: bold; font-size: 15px;">{{ $t('shop.productCode') }}：{{ product.GOODS_NO }}</span><br />
-					<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ product.SELL_PRICE | amountFilter }}</span><br />
-					<span>{{ $t('shop.productBV') }}：{{ product.PRICE_PV | amountFilter }}</span><br />
+					<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ product.SELL_PRICE | toThousandFilter }}</span><br />
+					<span>{{ $t('shop.productBV') }}：{{ product.PRICE_PV | toThousandFilter }}</span><br />
 					<span>{{ $t('shop.taxRate') }}：{{ product.TAX_RATE / 100 }}</span><br />
-					<span>{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ product.taxAmount | amountFilter }}</span><br />
+					<span>{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ product.taxAmount | toThousandFilter }}</span><br />
 					<span>{{ $t('shop.inventory') }}：{{ product.STORE_NUMS }}</span>
 				</div>
 			</el-col>
@@ -245,9 +245,6 @@
 				}
 				return statusMap[status]
 			},
-			amountFilter(amount) {
-				return formatAmount(amount)
-			},
 		},
     data() {
       return {
@@ -530,13 +527,13 @@
 				let amountBalance = this.userBalance[this.payType]
 				// 账户类型提示信息
 				let accountType = this.currency[this.payType].name
-				if (amountBalance < 0 || !accountType) {
-					this.$message({
-						message: this.$t('shop.paymentError'),
-						type: 'error'
-					})
-					return false
-				}
+				// if (amountBalance < 0 || !accountType) {
+				// 	this.$message({
+				// 		message: this.$t('shop.paymentError'),
+				// 		type: 'error'
+				// 	})
+				// 	return false
+				// }
 				// 支付方式处理
 				if (['cash', 'pay_stack'].includes(this.payType)) {
 					let payObj = this.payList.find((item) => {
@@ -604,6 +601,7 @@
 							})
 							this.$router.push({path: `/shop/order-list`})
 						}).catch(err => {
+							console.log('standardError', err)
 							this.$message({
 								message: err,
 								type: 'error',

src/views/shop/villa-fund-products.vue

@@ -18,7 +18,7 @@
 								</el-col>
 								<el-col :xs="24" :sm="24" :lg="5">
 								<span style="font-size: 13px;">
-									<span style="font-weight: bold; color: tomato;">{{ $t('shop.productPrice') }}：{{ row.SELL_PRICE | amountFilter }}</span>
+									<span style="font-weight: bold; color: tomato;">{{ $t('shop.productPrice') }}：{{ row.SELL_PRICE | toThousandFilter }}</span>
 								</span>
 								</el-col>
 								<el-col :xs="24" :sm="24" :lg="4">
@@ -41,8 +41,8 @@
 				<el-button type="primary" size="small" @click="settlement()" style="float: left;">{{ $t('shop.checkOut') }}</el-button>
 			</div>
 			<div class="flex data" style="float: right; display: inline-block; line-height: 28px; font-size: 14px; margin-top: 10px; border: 1px solid #dcdfe6; border-radius: 4px; padding: 0 5px;">
-				<div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ sellPriceSum | amountFilter }}</div>
-				<div style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ taxSum | amountFilter }}</div>
+				<div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ sellPriceSum | toThousandFilter }}</div>
+				<div style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ taxSum | toThousandFilter }}</div>
 			</div>
 		</div>
 
@@ -66,13 +66,13 @@
 												<span style="color: #9c9c9c; cursor: pointer;">{{ row.GOODS_NO }}</span>
 											</el-col>
 											<el-col :xs="16" :sm="4" :lg="4">
-												<span style="font-weight: bold;">{{ row.member_price | amountFilter }}</span>
+												<span style="font-weight: bold;">{{ row.member_price | toThousandFilter }}</span>
 											</el-col>
 											<el-col :xs="8" :sm="3" :lg="3">
 												<span style="">x {{ row.chose_num }}</span>
 											</el-col>
 											<el-col :xs="24" :sm="5" :lg="5">
-												<span style="color: tomato; font-weight: bold;">{{ row.member_price_plus | amountFilter }}</span>
+												<span style="color: tomato; font-weight: bold;">{{ row.member_price_plus | toThousandFilter }}</span>
 											</el-col>
 										</el-row>
 									</el-main>
@@ -89,7 +89,7 @@
 									<span style="font-weight: bold; word-break: normal; white-space: nowrap; line-height: 28px;">{{ $t('shop.totalOrders') }}：</span>
 								</el-col>
 								<el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16" style="word-break: normal; white-space: nowrap; line-height: 28px;">
-									<span>{{ $t('shop.total') }}：{{ parseFloat(pointsSum) | amountFilter }}</span>
+									<span>{{ $t('shop.total') }}：{{ parseFloat(pointsSum) | toThousandFilter }}</span>
 									<span style="margin-left: 15px;">{{ $t('shop.freight') }}：{{ pointFreight }}</span>
 								</el-col>
 							</el-row>
@@ -104,7 +104,7 @@
 									<el-radio-group v-model="payType" @change='chosePayType'>
 										<div v-for="(item, index) in payList" :key='index' class="address">
 											<el-radio :label="item.label" border>
-												{{ item.name }}<span v-if="item.label === payType" style="color: tomato;">({{ userBalance[payType] | amountFilter }})</span>
+												{{ item.name }}<span v-if="item.label === payType" style="color: tomato;">({{ userBalance[payType] | toThousandFilter }})</span>
 											</el-radio>
 										</div>
 									</el-radio-group>
@@ -160,9 +160,9 @@
 					<div style="text-align: left; line-height: 50px; font-size: 16px;">
 						<span style="font-weight: bold; font-size: 20px;">{{ product.GOODS_NAME }}</span><br />
 						<span style="font-weight: bold; font-size: 15px;">{{ $t('shop.productCode') }}：{{ product.GOODS_NO }}</span><br />
-						<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ product.SELL_PRICE | amountFilter }}</span><br />
+						<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ product.SELL_PRICE | toThousandFilter }}</span><br />
 						<span>{{ $t('shop.taxRate') }}：{{ product.TAX_RATE / 100 }}</span><br />
-						<span>{{ $t('shop.taxAmount') }}：{{ product.taxAmount | amountFilter }}</span><br />
+						<span>{{ $t('shop.taxAmount') }}：{{ product.taxAmount | toThousandFilter }}</span><br />
 						<span>{{ $t('shop.inventory') }}：{{ product.STORE_NUMS }}</span>
 					</div>
 				</el-col>
@@ -197,9 +197,6 @@ export default {
 			}
 			return statusMap[status]
 		},
-		amountFilter(amount) {
-			return formatAmount(amount)
-		},
 	},
 	data() {
 		return {

src/views/user/brand-ambassador.vue

@@ -30,8 +30,8 @@
 														<div style="text-align: left; line-height: 25px;">
 															<span style="font-weight: bold; cursor: pointer;" @click="handleProduct(row)">{{ row.GOODS_NAME }}</span><br />
 															<span>{{ row.GOODS_NO }}</span><br />
-															<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ row.SELL_PRICE | amountFilter}}</span><br />
-															<span>{{ $t('shop.productBV') }}：{{ row.PRICE_PV | amountFilter }}</span><br />
+															<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ row.SELL_PRICE | toThousandFilter}}</span><br />
+															<span>{{ $t('shop.productBV') }}：{{ row.PRICE_PV | toThousandFilter }}</span><br />
 															<span style="display: inline-block; float: right; ">
 																<el-input-number size="mini" v-model="storeNums[$index]" :min="1" :max="Number(row.STORE_NUMS)" @change="handleInputNumber($event, row)"></el-input-number>
 															</span>
@@ -45,9 +45,9 @@
 
 									<div class="white-box-footer">
 										<div class="flex data" style="display: inline-block; line-height: 30px; font-size: 14px; margin-top: 15px; border: 1px solid #dcdfe6; border-radius: 4px; padding: 0 5px;">
-											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ sellPriceSum | amountFilter }}</div>
-											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productBV') }}：{{ pricePvSum | amountFilter }}</div>
-											<div style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ taxSum | amountFilter }}</div>
+											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ sellPriceSum | toThousandFilter }}</div>
+											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productBV') }}：{{ pricePvSum | toThousandFilter }}</div>
+											<div style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ taxSum | toThousandFilter }}</div>
 										</div>
 									</div>
 								</el-tab-pane>
@@ -107,7 +107,7 @@
 						<el-form-item :label="$t('shop.paymentMethod')" required>
 							<el-radio-group v-model="form.payType" @change="chosePayType">
 								<el-radio border v-for="(item, index) in payList" :key='index' :label="item.label" style="margin: 5px;">
-									{{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">（{{ $t('currency.sign') }} {{ userBalance.cash | amountFilter }}）</span>
+									{{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">（{{ $t('currency.sign') }} {{ userBalance.cash | toThousandFilter }}）</span>
 								</el-radio>
 							</el-radio-group>
 						</el-form-item>
@@ -171,10 +171,10 @@
 					<div style="text-align: left; line-height: 50px; font-size: 16px;">
 						<span style="font-weight: bold; font-size: 20px;">{{ product.GOODS_NAME }}</span><br />
 						<span style="font-weight: bold; font-size: 15px;">{{ $t('shop.productCode') }}：{{ product.GOODS_NO }}</span><br />
-						<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ product.SELL_PRICE | amountFilter }}</span><br />
-						<span>{{ $t('shop.productBV') }}：{{ product.PRICE_PV | amountFilter }}</span><br />
+						<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ product.SELL_PRICE | toThousandFilter }}</span><br />
+						<span>{{ $t('shop.productBV') }}：{{ product.PRICE_PV | toThousandFilter }}</span><br />
 						<span>{{ $t('shop.taxRate') }}：{{ product.TAX_RATE / 100 }}</span><br />
-						<span>{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ product.taxAmount | amountFilter }}</span><br />
+						<span>{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ product.taxAmount | toThousandFilter }}</span><br />
 						<span>{{ $t('shop.inventory') }}：{{ product.STORE_NUMS }}</span>
 					</div>
 				</el-col>
@@ -208,9 +208,6 @@ export default {
 		priceAmountFilter(row) {
 			return tool.formatPrice(row.REAL_PRICE * row.BUY_NUMS)
 		},
-		amountFilter(amount) {
-			return formatAmount(amount)
-		},
 		statusFilter(status) {
 			const statusMap = {
 				Unpaid: 'info',
@@ -362,8 +359,6 @@ export default {
     }
   },
   created() {
-			let regionInfo = this.$store.getters.regionInfo
-		// console.log(this.$store.state.region)
     this.fetchBrandAmbassador()
   },
 	mounted() {

src/views/user/member-upgrade.vue

@@ -46,8 +46,8 @@
 																<div style="text-align: left; line-height: 25px;">
 																	<span style="font-weight: bold; cursor: pointer;" @click="handleProduct(row)">{{ row.GOODS_NAME }}</span><br />
 																	<span>{{ row.GOODS_NO }}</span><br />
-																	<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ row.SELL_PRICE | amountFilter }}</span><br />
-																	<span>{{ $t('shop.productBV') }}：{{ row.PRICE_PV | amountFilter }}</span><br />
+																	<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ row.SELL_PRICE | toThousandFilter }}</span><br />
+																	<span>{{ $t('shop.productBV') }}：{{ row.PRICE_PV | toThousandFilter }}</span><br />
 																	<span style="display: inline-block; float: right; ">
 																	<el-input-number size="mini" v-model="storeNums[$index]" :min="1" :max="Number(row.STORE_NUMS)" @change="handleInputNumber($event, row)"></el-input-number>
 																</span>
@@ -63,8 +63,8 @@
 
 									<div class="white-box-footer">
 										<div class="flex data" style="float: right; display: inline-block; line-height: 30px; font-size: 14px; margin-top: 15px; margin-bottom: 10px; border: 1px solid #dcdfe6; border-radius: 4px; padding: 0 5px;">
-											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ sellPriceSum | amountFilter }}</div>
-											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productBV') }}：{{ pricePvSum | amountFilter }}</div>
+											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ sellPriceSum | toThousandFilter }}</div>
+											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productBV') }}：{{ pricePvSum | toThousandFilter }}</div>
 											<div style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ taxSum }}</div>
 										</div>
 									</div>
@@ -96,7 +96,7 @@
 						<el-form-item v-if="!isMax" :label="$t('shop.paymentMethod')" required style="padding-left: 0;">
 							<el-radio-group v-model="form.payType" @change="chosePayType">
 								<el-radio border v-for="(item, index) in payList" :key='index' :label="item.label" style="margin: 5px;">
-									{{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">({{ $t('currency.sign') }} {{ userBalance.cash | amountFilter }})</span>
+									{{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">({{ $t('currency.sign') }} {{ userBalance.cash | toThousandFilter }})</span>
 								</el-radio>
 							</el-radio-group>
 						</el-form-item>
@@ -160,10 +160,10 @@
 					<div style="text-align: left; line-height: 50px; font-size: 16px;">
 						<span style="font-weight: bold; font-size: 20px;">{{ product.GOODS_NAME }}</span><br />
 						<span style="font-weight: bold; font-size: 15px;">{{ $t('shop.productCode') }}：{{ product.GOODS_NO }}</span><br />
-						<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ product.SELL_PRICE | amountFilter }}</span><br />
-						<span>{{ $t('shop.productBV') }}：{{ product.PRICE_PV | amountFilter }}</span><br />
+						<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ product.SELL_PRICE | toThousandFilter }}</span><br />
+						<span>{{ $t('shop.productBV') }}：{{ product.PRICE_PV | toThousandFilter }}</span><br />
 						<span>{{ $t('shop.taxRate') }}：{{ product.TAX_RATE / 100 }}</span><br />
-						<span>{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ product.taxAmount | amountFilter }}</span><br />
+						<span>{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ product.taxAmount | toThousandFilter }}</span><br />
 						<span>{{ $t('shop.inventory') }}：{{ product.STORE_NUMS }}</span>
 					</div>
 				</el-col>
@@ -197,9 +197,6 @@ export default {
 		priceAmountFilter(row) {
 			return tool.formatPrice(row.REAL_PRICE * row.BUY_NUMS)
 		},
-		amountFilter(amount) {
-			return formatAmount(amount)
-		},
 		statusFilter(status) {
 			const statusMap = {
 				Unpaid: 'info',

src/views/user/welcome-pack.vue

@@ -45,8 +45,8 @@
 																<div style="text-align: left; line-height: 25px;">
 																	<span style="font-weight: bold; cursor: pointer;" @click="handleProduct(row)">{{ row.GOODS_NAME }}</span><br />
 																	<span>{{ row.GOODS_NO }}</span><br />
-																	<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ row.SELL_PRICE | amountFilter }}</span><br />
-																	<span>{{ $t('shop.productBV') }}：{{ row.PRICE_PV | amountFilter }}</span><br />
+																	<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ row.SELL_PRICE | toThousandFilter }}</span><br />
+																	<span>{{ $t('shop.productBV') }}：{{ row.PRICE_PV | toThousandFilter }}</span><br />
 																	<span style="display: inline-block; float: right; ">
 																	<el-input-number size="mini" v-model="storeNums[$index]" :min="1" :max="Number(row.STORE_NUMS)" @change="handleInputNumber($event, row)"></el-input-number>
 																</span>
@@ -62,8 +62,8 @@
 
 									<div class="white-box-footer">
 										<div class="flex data" style="float: right; display: inline-block; line-height: 30px; font-size: 14px; margin-top: 15px; margin-bottom: 10px; border: 1px solid #dcdfe6; border-radius: 4px; padding: 0 5px;">
-											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ sellPriceSum | amountFilter }}</div>
-											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productBV') }}：{{ pricePvSum | amountFilter }}</div>
+											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{ $t('currency.sign') }} {{ sellPriceSum | toThousandFilter }}</div>
+											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productBV') }}：{{ pricePvSum | toThousandFilter }}</div>
 											<div style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ taxSum }}</div>
 										</div>
 									</div>
@@ -260,9 +260,6 @@ export default {
 		priceAmountFilter(row) {
 			return tool.formatPrice(row.REAL_PRICE * row.BUY_NUMS)
 		},
-		amountFilter(amount) {
-			return formatAmount(amount)
-		},
 		statusFilter(status) {
 			const statusMap = {
 				Unpaid: 'info',