Ana Sayfa Keşfet Yardım
Üye Ol Giriş Yap
guanli
/
ngds-backend-ele
1
0
Çatalla 0
Dosyalar Sorunlar 0 Değişiklik İstekleri 0 Wiki
Kaynağa Gözat

多语言功能

kevin_zhangl 2 yıl önce
ebeveyn
9707e39d8e
işleme
1eac62bbd3
10 değiştirilmiş dosya ile 28 ekleme ve 50 silme
Görünümü Böl Farklılık Durumunu Göster
  1. 2 2
      .env.development
  2. BIN
      public/favicon.ico
  3. 0 31
      public/ipay.html
  4. 2 2
      src/lang/en.js
  5. 9 2
      src/store/modules/app.js
  6. 3 3
      src/views/config/bonus-config.vue
  7. 3 3
      src/views/config/dec-level-config.vue
  8. 4 4
      src/views/config/stockist-config.vue
  9. 4 2
      src/views/user/member-network-move.vue
  10. 1 1
      vue.config.js

+ 2 - 2
.env.development
Dosyayı Görüntüle 

@@ -2,11 +2,11 @@
 
 ENV='development'
 
 
 # api请求地址
 
-VUE_APP_BASE_API='http://172.17.133.86:9970'
 
+VUE_APP_BASE_API=''
 
 # 文件下载地址
 
 VUE_APP_BASE_DO_API='http://local.ng.backend.api.com'
 
 # CDN文件地址
 
-VUE_APP_CDN_API='http://172.17.133.86:9970'
 
+VUE_APP_CDN_API='http://16.163.228.151:8041'
 
 # 页面地址
 
 VUE_APP_BASE_WEBSITE='http://local.ng.backend.ele.com'
 
 # 会员端地址

BIN
public/favicon.ico
Dosyayı Görüntüle


+ 0 - 31
public/ipay.html
Dosyayı Görüntüle 

@@ -1,31 +0,0 @@
 
-<!DOCTYPE html>
 
-<html>
 
-	<head>
 
-		<meta charset="utf-8">
 
-		<title></title>
 
-	</head>
 
-	<body>
 
-    <FORM method="post" name="ePayment"
 
-    action="https://sandbox.ipay88.co.id/epayment/entry.asp">
 
-    <INPUT type="hidden" name="MerchantCode"  value="M08669_S0002">
 
-    <INPUT type="hidden" name="PaymentId" value="2">
 
-    <INPUT type="hidden" name="RefNo" value="TEST123">
 
-    <INPUT type="hidden" name="Amount"  value="1.00">
 
-    <INPUT type="hidden" name="Currency"  value="MYR">
 
-    <INPUT type="hidden" name="ProdDesc"  value="This is a test product">
 
-    <INPUT type="hidden" name="UserName"  value="Technical Support">
 
-    <INPUT type="hidden" name="UserEmail" value="techsupp@ipay88.co.id">
 
-    <INPUT type="hidden" name="UserContact" value="081234567890">
 
-    <INPUT type="hidden" name="Remark"  value="Here is the description">
 
-    <INPUT type="hidden" name="Lang"  value="UTF-8">
 
-    <INPUT type="hidden" name="SignatureType" value="SHA256">
 
-    <INPUT type="hidden" name="Signature"
 
-    value="lMdndfLQobEF8a7KHPgtd9WSYok=">
 
-   <INPUT type="hidden" name="ResponseURL"
 
-    value="http://16.163.228.151:8040/v1/demo/ipayments">
 
-    <INPUT type="hidden" name="BackendURL"
 
-    value="http://16.163.228.151:8040/v1/demo/ipayments">
 
-    <INPUT type="submit" value="Proceed with Payment" name="Submit">
 
-    </FORM>
 
-	</body>
 
-</html>

+ 2 - 2
src/lang/en.js
Dosyayı Görüntüle 

@@ -554,8 +554,8 @@ export default {
 
     mobileMemberName: 'Mobile member name',
 
     originalSuperiorNo: 'Original superior No',
 
     originalSuperiorName: 'Original superior name',
 
-    moveToPlacementMemberCode: 'Move to placement member code',
 
-    moveToPlacementMemberName: 'Move to placement member name',
 
+    moveToPlacementMemberCode: 'To placement member code',
 
+    moveToPlacementMemberName: 'To placement member name',
 
     originalDeveloperNo: 'Original developer No',
 
     nameOfOriginalDeveloper: 'Name of original developer',
 
     moveToSponsorMemberCode: 'Move to sponsor member code',

+ 9 - 2
src/store/modules/app.js
Dosyayı Görüntüle 

@@ -2,6 +2,8 @@ import Cookies from 'js-cookie'
 
 import { getLanguage } from '@/lang'
 
 import usersInfo from "@/utils/usersInfo";
 
 import {changeLanguage} from "@/api/user";
 
+import {getBaseInfo} from "@/api/site";
 
+import baseInfo from "@/utils/baseInfo";
 
 
 const state = {
 
   sidebar: {
 
@@ -54,8 +56,13 @@ const actions = {
 
   setLanguage({ commit }, language) {
 
     commit('SET_LANGUAGE', language);
 
     return new Promise((resolve, reject) => {
 
-      changeLanguage({lang: language, adminName: usersInfo.adminName()}).then(response => {
 
-        resolve(response)
 
+      changeLanguage({lang: language, adminName: usersInfo.adminName()}).then(() => {
 
+        getBaseInfo().then(response => {
 
+          baseInfo.set(response.data)
 
+          resolve(response)
 
+        }).catch(error => {
 
+          reject(error)
 
+        })
 
       }).catch(error => {
 
         reject(error)
 
       })

+ 3 - 3
src/views/config/bonus-config.vue
Dosyayı Görüntüle 

@@ -243,9 +243,9 @@ export default {
 
       this.loading = true
 
       fetchBonusConfig().then(response => {
 
         this.configData = response.data.config
 
-        this.decLevelTableData = response.data.decLevel
 
-        this.empLevelTableData = response.data.empLevel
 
-        this.crownLevelTableData = response.data.crownLevel
 
+        this.decLevelTableData = Object.values(response.data.decLevel)
 
+        this.empLevelTableData = Object.values(response.data.empLevel)
 
+        this.crownLevelTableData = Object.values(response.data.crownLevel)
 
 
         setTimeout(() => {
 
           this.loading = false

+ 3 - 3
src/views/config/dec-level-config.vue
Dosyayı Görüntüle 

@@ -52,10 +52,10 @@
 
           <el-col :xs="24" :sm="24" :lg="12">
 
             <el-input v-show="false" v-model="editForm.ID" size="small" type="text" />
 
             <el-form-item :label="$t('config.levelName')" prop="LEVEL_NAME" required style="margin-bottom: 10px; width: 100%;">
 
-              <el-input v-model.trim="editForm.LEVEL_NAME" size="small" type="text" style="min-width: 300px;" />
 
+              <el-input v-model.trim="editForm.LEVEL_NAME" size="small" type="text" style="min-width: 300px;" readonly />
 
             </el-form-item>
 
             <el-form-item :label="$t('config.needPerf')" prop="PERF" required style="margin-bottom: 10px; width: 100%;">
 
-              <el-input v-model="editForm.PERF" size="small" type="text" />
 
+              <el-input v-model="editForm.PERF" size="small" type="text" style="min-width: 300px;" />
 
             </el-form-item>
 
           </el-col>
 
         </el-row>
 
@@ -113,7 +113,7 @@ export default {
 
     fetchDecLevelConfig() {
 
       this.loading = true
 
       fetchDecLevelConfig().then(response => {
 
-        this.tableData = response.data.list
 
+        this.tableData = Object.values(response.data.list)
 
 
         setTimeout(() => {
 
           this.loading = false

+ 4 - 4
src/views/config/stockist-config.vue
Dosyayı Görüntüle 

@@ -30,10 +30,10 @@
 
           <el-col :xs="24" :sm="24" :lg="12">
 
             <el-input v-show="false" v-model="editForm.ID" size="small" type="text" />
 
             <el-form-item :label="$t('config.levelName')" prop="ROLE_NAME" required style="margin-bottom: 10px; width: 100%;">
 
-              <el-input v-model.trim="editForm.ROLE_NAME" size="small" type="text" style="min-width: 300px;" />
 
+              <el-input v-model.trim="editForm.ROLE_NAME" size="small" type="text" style="min-width: 300px;" readonly />
 
             </el-form-item>
 
             <el-form-item :label="$t('financial.serviceCharge')" prop="FW_BONUS_PERCENT" required style="margin-bottom: 10px; width: 100%;">
 
-              <el-input v-model="editForm.FW_BONUS_PERCENT" size="small" type="text" />
 
+              <el-input v-model="editForm.FW_BONUS_PERCENT" size="small" type="text" style="min-width: 300px;" />
 
             </el-form-item>
 
           </el-col>
 
         </el-row>
 
@@ -79,8 +79,8 @@ export default {
 
     fetchData() {
 
       this.loading = true
 
       fetchStockistConfig().then(response => {
 
-        this.tableData = response.data.list
 
-        this.total = +response.data.totalCount
 
+        this.tableData = Object.values(response.data.list)
 
+        this.total = this.tableData.length
 
 
         setTimeout(() => {
 
           this.loading = false

+ 4 - 2
src/views/user/member-network-move.vue
Dosyayı Görüntüle 

@@ -58,7 +58,7 @@
 
 
 		<!-- 新建移网	-->
 
 		<el-dialog :title="$t('member.applyNetworkTransfer')" :visible.sync="dialogApplyFormVisible" :width="screenWidth" style="margin-top: -80px;">
 
-			<el-form :model="applyForm" label-width="230px" :label-position="labelPosition" v-loading="dialogApplyLoading" size="mini" style="padding: 10px 15px; margin-top: -25px; margin-bottom: -25px;">
 
+			<el-form :model="applyForm" :label-width="labelWidth" :label-position="labelPosition" v-loading="dialogApplyLoading" size="mini" style="padding: 10px 15px; margin-top: -25px; margin-bottom: -25px;">
 
 				<el-form-item :label="$t('member.networkTransferType')">
 
 					<el-select v-model="applyForm.type" :placeholder="$t('member.selectNetworkTransferType')" style="width: 100%;">
 
 						<el-option v-for="(item,key) in netType" :label="item.name" :value="item.id" :key="key"></el-option>
 
@@ -114,7 +114,7 @@
 
 
 		<!-- 修改移网	-->
 
     <el-dialog :title="$t('member.modifyNetworkTransfer')" :visible.sync="dialogEditFormVisible" :width="screenWidth" style="margin-top: -80px;">
 
-      <el-form :model="form" label-width="230px" :label-position="labelPosition" v-loading="dialogEditLoading" size="mini" style="padding: 10px 15px; margin-top: -25px; margin-bottom: -25px;">
 
+      <el-form :model="form" :label-width="labelWidth" :label-position="labelPosition" v-loading="dialogEditLoading" size="mini" style="padding: 10px 15px; margin-top: -25px; margin-bottom: -25px;">
 
         <el-form-item :label="$t('member.networkTransferType')">
 
           <el-select v-model="form.type" :placeholder="$t('member.selectNetworkTransferType')" style="width: 100%;">
 
             <el-option v-for="(item,key) in netType" :label="item.name" :value="item.id" :key="key"></el-option>
 
@@ -256,6 +256,7 @@
 
 		updateNetworkMovePass
 
 	} from "@/api/member";
 
 	import {getScreenWidth} from "@/utils";
 
+	import Cookies from "js-cookie";
 
 
   export default {
 
     name: 'memberNetworkMove',
 
@@ -330,6 +331,7 @@
 
 				toAlertType: 'success',
 
 				isRelation: false,
 
 				submitButtonStat: false,
 
+				labelWidth: Cookies.get('language') === 'en' ? '205px' : '140px',
 
       }
 
     },
 
     methods: {

+ 1 - 1
vue.config.js
Dosyayı Görüntüle 

@@ -39,7 +39,7 @@ module.exports = {
 
     },
 
     proxy: {
 
       [process.env.VUE_APP_BASE_API]:{
 
-        target:"http://172.17.133.86:9970",
 
+        target:"http://local.ng.backend.api.com",
 
         changeOrigin:true,
 
         pathRewrite:{
 
           ["^" + process.env.VUE_APP_BASE_API] : ""