kevin_zhangl 3 лет назад
Родитель
Сommit
1ecdab08f0
7 измененных файлов с 14 добавлено и 15 удалено
  1. 1 0
      .env.development
  2. 1 0
      .env.production
  3. 1 0
      .env.staging
  4. 1 0
      src/lang/en.js
  5. 1 0
      src/lang/zh.js
  6. 1 1
      src/views/bonus/team-inquiry.vue
  7. 8 14
      src/views/finance/recharge-list.vue

+ 1 - 0
.env.development

@@ -4,6 +4,7 @@ ENV = 'development'
 # base api
 VUE_APP_BASE_API = 'http://local.ng.frontend.api.com'
 VUE_APP_CDN_API = 'http://16.163.228.151:8036'
+VUE_APP_BASE_WEBSITE = 'http://local.ng.frontend.ele.com:8080'
 VUE_APP_BASE_PAY_STACK_PUBLIC_KEY = 'pk_test_2eed10135c4a958c5073795b22854ded9d1a6c55'
 VUE_APP_ACCESS_TOKEN_PREFIX = 'Bearer '
 

+ 1 - 0
.env.production

@@ -4,6 +4,7 @@ ENV = 'production'
 # base api
 VUE_APP_BASE_API = '/prod-api'
 VUE_APP_CDN_API = '/prod-cdn'
+VUE_APP_BASE_WEBSITE = 'https://ngds.elken.com'
 VUE_APP_BASE_PAY_STACK_PUBLIC_KEY = 'pk_live_fae524f9d073d877beeb661fd825a37a9bc91f0a'
 ACCESS_TOKEN_PREFIX = 'Bearer '
 

+ 1 - 0
.env.staging

@@ -7,5 +7,6 @@ ENV = 'staging'
 # VUE_APP_BASE_API = '/stage-api'
 VUE_APP_BASE_API = 'http://16.163.228.151:8022'
 VUE_APP_CDN_API = 'http://16.163.228.151:8036'
+VUE_APP_BASE_WEBSITE = 'http://16.163.228.151:8035'
 VUE_APP_BASE_PAY_STACK_PUBLIC_KEY = 'pk_test_2eed10135c4a958c5073795b22854ded9d1a6c55'
 VUE_APP_ACCESS_TOKEN_PREFIX = 'Bearer '

+ 1 - 0
src/lang/en.js

@@ -247,6 +247,7 @@ export default {
     awaitData: 'Retrieving data, please wait.',
     switchLanguageHints: 'Switch Language Success',
     websiteTitle: 'Member Management System',
+    uploadHints: 'Uploading, please hold on. Do not close the window!',
   },
 
   shop: {

+ 1 - 0
src/lang/zh.js

@@ -246,6 +246,7 @@ export default {
     awaitData: '正在获取数据,请稍后',
     switchLanguageHints: '语言切换成功',
     websiteTitle: '会员管理系统',
+    uploadHints: '正在上传,请稍后。请勿关闭窗口!',
   },
   shop: {
     product: '商品',

+ 1 - 1
src/views/bonus/team-inquiry.vue

@@ -25,7 +25,7 @@
 		</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 :label="$t('bonus.teamDetails')">
 				<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>

+ 8 - 14
src/views/finance/recharge-list.vue

@@ -220,26 +220,20 @@ export default {
 		},
 		uploadAgain(id) {
 			this.viewVoucher = false
-			// this.handleUpload(id)
+			this.uploadVoucher = true
 		},
 		handleUpload(id) {
-			// 获取上传token
-			fetchToken().then(response => {
-				this.uploaderHeaders.Authorization = process.env.VUE_APP_ACCESS_TOKEN_PREFIX + response.data
-				this.uploaderData.uploadToken = response.data
-
-				setTimeout(() => {
-					this.auditId = id
-					this.uploadUrl = `${process.env.VUE_APP_BASE_API}/v1/finance/prove-add?id=${this.auditId}`
-					this.uploadVoucher = true
+			setTimeout(() => {
+				this.auditId = id
+				this.uploadUrl = `${process.env.VUE_APP_BASE_API}/v1/finance/prove-add?id=${this.auditId}`
+				this.uploadVoucher = true
 
-					this.listLoading = false
-				}, 0.5 * 1000)
-			})
+				this.listLoading = false
+			}, 0.5 * 1000)
 		},
 		uploaderHandleBefore() {
 			this.$message({
-				message: 'Uploading, please hold on. Do not close the window!', // 正在上传,请稍后。请勿关闭窗口!
+				message: this.$t('common.uploadHints'),
 				type: 'warning',
 				duration: 500,
 			})