Merge branch 'develop' of ssh://16.162.42.175:8013/guanli/ngds-backend-ele into feature/3387-change-highest-emp-level

.env.development

@@ -19,18 +19,16 @@ ENV='development'
 # VUE_APP_SYSTEM_JS='http://ng-upload.elken.com'
 
 # api请求地址
-VUE_APP_BASE_API='http://16.163.228.151:8042'
+VUE_APP_BASE_API=''
 # 文件下载地址
 VUE_APP_BASE_DO_API='http://16.163.228.151:8042'
 # CDN文件地址
-VUE_APP_CDN_API='http://16.163.228.151:8042'
-# 区域js文件地址
-VUE_APP_SYSTEM_JS='http://ng-upload.elken.com'
-# 结算页面地址
-VUE_APP_BASE_WEBSITE='http://16.163.228.151:8042'
-# 会员页面地址
-VUE_APP_FRONTEND_WEBSITE='http://16.163.228.151:8045'
-# PayStack支付key
+VUE_APP_CDN_API='http://172.17.133.86:9970'
+# 页面地址
+VUE_APP_BASE_WEBSITE='http://local.ng.backend.ele.com'
+# 会员端地址
+VUE_APP_FRONTEND_WEBSITE='http://local.ng.frontend.ele.com'
+# PayStack
 VUE_APP_BASE_PAY_STACK_PUBLIC_KEY='pk_test_2eed10135c4a958c5073795b22854ded9d1a6c55'
 # 请求token前缀
 VUE_APP_ACCESS_TOKEN_PREFIX='Bearer '

src/api/shop.js

@@ -165,6 +165,36 @@ export function deleteOrder(query) {
   })
 }
 
+// 订单期数调整
+export function orderPeriodAdjustList(query) {
+  return request({
+    url: '/v1/shop/order-period-adjust',
+    method: 'get',
+    data: query,
+    params: query
+  })
+}
+
+// 订单期数调整
+export function orderPeriodAdjust(query) {
+  return request({
+    url: '/v1/shop/order-period-adjust',
+    method: 'post',
+    data: query,
+    params: query
+  })
+}
+
+// 订单详情
+export function orderDetail(query) {
+  return request({
+    url: '/v1/shop/order-detail',
+    method: 'get',
+    data: query,
+    params: query
+  })
+}
+
 
 
 

src/api/user.js

@@ -49,3 +49,11 @@ export function noLoginModifyPassword(data) {
   })
 }
 
+// 切换语言
+export function changeLanguage(data) {
+  return request({
+    url: '/v1/admin/change-language',
+    method: 'post',
+    data
+  })
+}

src/lang/en.js

@@ -87,7 +87,7 @@ export default {
     shopOrderShopList:'External mall order list',
     shopFlowRemainPv:'Remain BV Flow',
     shopRemainPv:'Remain BV',
-    shopOrderlList:'Order list',
+    shopOrderList:'Order List',
     moveNetworkManagement:'Move Network Management',
     memberLevelAdjustmentList:'Member Level Adjustment List',
     modifyStockistLevel:'Modify Stockist Level',
@@ -114,6 +114,7 @@ export default {
     metaAdminHandle:'Administrator operation log',
     metaUserHandle:'Member operation log',
     metaSystemLog:'System log',
+    metaOrderPeriodAdjust: 'Order Period Adjust',
   },
   navbar: {
     dashboard: 'Dashboard',
@@ -464,6 +465,7 @@ export default {
     remainBVFlow: 'Remain BV Flow',
     externalMallOrderList: 'External Mall Order List',
     externalMallEntryList: 'External Mall Entry List',
+    shopOrderPeriodAdjust: 'Order Period Adjust',
     // Second level menu/interface-memberManagement
     memberList: 'Member List',
     emptyOrderOperation: 'Empty Order Operation',
@@ -566,8 +568,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',
@@ -675,9 +677,9 @@ export default {
     tourBonusPercent: 'Travel Fund Ratio',
     carFundBonusPercent: 'Car Fund Ratio',
     villaFundBonusPercent: 'Villa Fund ratio',
-    achieveMemberNo: 'The number of recommended members reaching the standard',
+    achieveMemberNo: 'The number of sponsor members reaching the standard',
     achievePerfBV: 'Recommended to meet the standard and pass the bonus BV',
-    achieveBV: 'Awarded for failing to meet the recommended standards BV',
+    achieveBV: 'Awarded for failing to meet the sponsor standards BV',
     crownStarConfig: 'Crown star configuration',
     levelScore: 'Level points(BV)',
     upgradeScore: 'Upgrade points(BV)',
@@ -829,7 +831,14 @@ export default {
     courierNumber: 'courier number',
     selectOrderExportNotice: 'Please select an order to export',
     pdfOnlyOneOrderExported: 'Only one order can be exported at a time',
-    sureDeleteOrder: 'Are you sure to delete the order? Order number:'
+    sureDeleteOrder: 'Are you sure to delete the order? Order number:',
+    orderNumber: 'Order No.',
+    orderType: 'Order Type',
+    orderAmount: 'Order Amount',
+    afterAdjustmentPcNo: 'After adjust Pc No.',
+    pleaseSelectPcNo: 'Please select Period No.',
+    modifyOrderPcNoHits: 'Do you want to modify the order period No.？',
+    consignee: 'consignee',
   },
 
   // Administrator management

src/lang/zh.js

@@ -87,7 +87,7 @@ export default {
     shopOrderShopList:'外部商城订单列表',
     shopFlowRemainPv:'剩余BV流水',
     shopRemainPv:'剩余BV',
-    shopOrderlList:'订单列表',
+    shopOrderList:'订单列表',
     moveNetworkManagement:'移网管理',
     memberLevelAdjustmentList:'会员级别调整列表',
     modifyStockistLevel:'修改报单中心级别',
@@ -114,6 +114,7 @@ export default {
     metaAdminHandle:'管理员操作日志',
     metaUserHandle:'会员操作日志',
     metaSystemLog:'系统日志',
+    metaOrderPeriodAdjust: '订单期数调整',
   },
   navbar: {
     dashboard: '首页',
@@ -465,6 +466,7 @@ export default {
     remainBVFlow: '剩余BV流水',
     externalMallOrderList: '外部商城订单列表',
     externalMallEntryList: '外部商城报单列表',
+    shopOrderPeriodAdjust: '订单期数调整',
     // 二级菜单/接口-memberManagement
     memberList: '会员列表',
     emptyOrderOperation: '空单操作',
@@ -822,7 +824,13 @@ export default {
     courierNumber: '快递单号',
     selectOrderExportNotice: '请选择一条订单导出',
     pdfOnlyOneOrderExported: '每次只能导出一条订单',
-    sureDeleteOrder: '确定要删除订单吗？订单编号：'
+    sureDeleteOrder: '确定要删除订单吗？订单编号：',
+    orderNumber: '订单编号',
+    orderType: '订单类型',
+    orderAmount: '订单金额',
+    afterAdjustmentPcNo: '调整后期数',
+    pleaseSelectPcNo: '请选择要调整到的期数',
+    modifyOrderPcNoHits: '是否要修改当前订单期数？',
   },
 
   // 管理员管理

src/router/index.js

@@ -209,10 +209,16 @@ export const constantRoutes = [
         meta: {title: 'shopRemainPv',},
       },
       {
-        path: '/shop/order-list',
+        path: '/shop/order-list', // 订单列表
         component: () => import('@/views/shop/order-list'),
         name: 'shop_order-list',
-        meta: {title: 'shopOrderlList',},
+        meta: {title: 'shopOrderList',},
+      },
+      {
+        path: '/shop/order-period-adjust',  // 订单期数调整
+        component: () => import('@/views/shop/order-period-adjust'),
+        name: 'shop_order-period-adjust',
+        meta: {title: 'metaOrderPeriodAdjust',},
       },
     ]
   },

src/store/modules/app.js

@@ -1,5 +1,9 @@
 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: {
@@ -50,7 +54,19 @@ const actions = {
     commit('TOGGLE_DEVICE', device)
   },
   setLanguage({ commit }, language) {
-    commit('SET_LANGUAGE', language)
+    commit('SET_LANGUAGE', language);
+    return new Promise((resolve, reject) => {
+      changeLanguage({lang: language, adminName: usersInfo.adminName()}).then(() => {
+        getBaseInfo().then(response => {
+          baseInfo.set(response.data)
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      }).catch(error => {
+        reject(error)
+      })
+    })
   },
   setSize({ commit }, size) {
     commit('SET_SIZE', size)

src/store/modules/user.js

@@ -5,6 +5,7 @@ import router, { resetRouter } from '@/router'
 import { Message } from 'element-ui'
 import { getBaseInfo } from '@/api/site'
 import baseInfo from '@/utils/baseInfo'
+import Cookies from "js-cookie";
 
 const state = {
   token: getToken(),
@@ -38,7 +39,8 @@ const actions = {
     const requestData = {
       adminName: userInfo.username,
       password: userInfo.password,
-      verifyCode: userInfo.verifyCode
+      verifyCode: userInfo.verifyCode,
+      lang: userInfo.lang,
     }
     return new Promise((resolve, reject) => {
       login({ LoginForm: requestData }, userInfo.pageId).then(response => {
@@ -65,6 +67,9 @@ const actions = {
         usersInfo.userId(result.ID)
         usersInfo.adminName(result.ADMIN_NAME)
         usersInfo.baseData({ roleId: result.ROLE_ID })
+        // 设置语言标识
+        const lang = result.LANG ? (result.LANG === 'zh-CN' ? 'zh' : 'en') : 'zh'
+        Cookies.set('language', lang)
         resolve(result)
       }).catch(error => {
         reject(error)

src/views/config/bonus-config.vue

@@ -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

src/views/config/dec-level-config.vue

@@ -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

src/views/config/stockist-config.vue

@@ -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

src/views/finance/change-balance-opt.vue

@@ -38,10 +38,12 @@
               <el-form-item :label="$t('common.note')"><!--备注-->
                 <el-input v-model="form.remark"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('financial.forgeDisplayRemark')" v-show="false"><!--备注前台显示-->
+              <!--备注前台显示-->
+              <!-- <el-form-item :label="$t('financial.forgeDisplayRemark')">
+              <el-form-item :label="$t('financial.forgeDisplayRemark')" v-show="false">
                 <el-switch v-model="form.isShow" active-value="1" inactive-value="0">
                 </el-switch>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item>
                 <el-button type="primary" :loading="submitButtonStat" :disabled="getCodeStat" @click="onSubmit">{{ $t('common.confirm') }}<!-- 提交 --></el-button>
               </el-form-item>

src/views/login/index.vue

@@ -75,6 +75,7 @@ import SocialSign from './components/SocialSignin'
 import { daysDiff } from '@/api/site'
 import baseInfo from '@/utils/baseInfo'
 import usersInfo from '@/utils/usersInfo'
+import Cookies from "js-cookie";
 
 export default {
   name: 'Login',
@@ -84,7 +85,8 @@ export default {
       loginForm: {
         username: '',
         password: '',
-        verifyCode: ''
+        verifyCode: '',
+				lang: '',
       },
 
       passwordType: 'password',
@@ -110,7 +112,15 @@ export default {
     // }
   },
   beforeCreate() {
-    this.$store.dispatch('settings/getPageData', {})
+		// 获取浏览器语言类型
+		let lang = navigator.language
+		if (lang === 'zh-CN') {
+			Cookies.set('language', 'zh')
+		} else {
+			Cookies.set('language', 'en')
+		}
+
+		this.$store.dispatch('settings/getPageData', {})
       .then(response => {
         this.pageId = response.data.pageId
         this.captchaUrl = process.env.VUE_APP_BASE_API + '/v1/site/captcha?page_id=' + this.pageId + '&v=' + Math.random()
@@ -177,7 +187,8 @@ export default {
             username: this.loginForm.username,
             password: this.loginForm.password,
             verifyCode: this.loginForm.verifyCode,
-            pageId: this.pageId
+            pageId: this.pageId,
+						lang: Cookies.get('language')
           }
 
           if (!baseInfo.daysDiff()) {
@@ -197,7 +208,9 @@ export default {
           let loginName = this.loginForm.username;
           // 登录
           this.$store.dispatch('user/login', loginData)
-            .then(() => {})
+            .then(() => {
+							Cookies.remove('language')
+						})
             .then(() => {
               return this.$store.dispatch('user/getUserInfo', {})
             }).then(() => {
@@ -205,7 +218,10 @@ export default {
             }).then(() => {
               this.loading = false
               this.$router.push({ path: this.redirect || '/dashboard/index', query: this.otherQuery })
-            }).catch(error => {
+            }).then(() => {
+							// 强制刷新页面
+							location.reload()
+						}).catch(error => {
               this.loading = false
               let msg = error + '  '
               console.log('error-------->'+error)

src/views/shop/order-period-adjust.vue

@@ -0,0 +1,209 @@
+<template>
+  <div v-loading="loading">
+    <div class="white-box">
+      <div class="filter-box">
+        <filter-user :filter-types="filterTypes" @select-value="handleFilterUser"></filter-user>
+      </div>
+      <el-table class="table-box" ref="multipleTable" :data="tableData" stripe style="width: 100%;" :height="tool.getTableHeight()">
+        <el-table-column v-for="(tableHeader, key) in tableHeaders" :key="key" :label="tableHeader.header" :width="tableHeader.other.width ? tableHeader.other.width : ''" :prop="tableHeader.other.prop ? tableHeader.other.prop : null">
+          <template slot-scope="scope">
+            <template v-if="scope.row[tableHeader.index].other.tag" >
+              <el-tag :type="scope.row[tableHeader.index].other.tag.type ? scope.row[tableHeader.index].other.tag.type : null" :size="scope.row[tableHeader.index].other.tag.size ? scope.row[tableHeader.index].other.tag.size : null">{{scope.row[tableHeader.index].value}}</el-tag>
+            </template>
+            <template v-else>
+              <div v-html="scope.row[tableHeader.index].value"></div>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="white-box-footer">
+        <el-button type="primary" size="small" @click="visible = true" v-show="permission.hasPermission(`shop/order-adjust-period`)">{{ $t('menu.shopOrderPeriodAdjust') }}</el-button>
+        <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
+      </div>
+    </div>
+
+    <el-dialog :title="$t('menu.shopOrderPeriodAdjust')" :visible.sync="visible" :width="screenWidth" style="margin-top: -80px">
+      <el-form ref="form" :model="form" label-width="150px" :label-position="labelPosition">
+        <el-form-item :label="$t('shop.orderNumber')" required clearable>
+          <el-input v-model.trim="form.orderSn" @change="handleOrderSnChange"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('member.memberCode')" v-show="order.USER_NAME">
+          <el-input v-model="order.USER_NAME" disabled></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('shop.orderType')" v-show="order.ORDER_TYPE">
+          <el-input v-model="order.ORDER_TYPE" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="PV" v-show="order.PV">
+          <el-input v-model="order.PV" disabled></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('shop.orderAmount')" v-show="order.PAY_AMOUNT">
+          <el-input v-model="order.PAY_AMOUNT" disabled></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('Administrator.creatUser')" v-show="order.CREATE_USER">
+          <el-input v-model="order.CREATE_USER" disabled></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('bonus.periodNo')" v-show="order.PERIOD_NUM">
+          <el-input v-model="order.PERIOD_NUM" disabled></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('shop.afterAdjustmentPcNo')" required>
+          <el-select v-model="form.modernPeriod" :placeholder="$t('shop.pleaseSelectPcNo')" style="width: 100%;">
+            <el-option v-for="item in availablePeriod" :key="item.PERIOD_NUM" :label="item.PERIOD_NUM" :value="item.PERIOD_NUM" :disabled="item.disabled"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">{{ $t('common.confirm') }}</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import tool from '@/utils/tool'
+  import FilterUser from '@/components/FilterUser'
+  import permission from '@/utils/permission'
+  import Pagination from '@/components/Pagination'
+  import filterHelper from '@/utils/filterHelper'
+  import {orderPeriodAdjustList, orderDetail, orderPeriodAdjust} from '@/api/shop'
+	import {getScreenWidth} from "@/utils";
+
+  export default {
+    name: 'shop_order-period-adjust',
+    components: {FilterUser, Pagination},
+    mounted () {
+      this.getData()
+    },
+    data () {
+      return {
+        tableHeaders: null,
+        tableData: null,
+        tableHeight: window.innerHeight - 310,
+        loading: true,
+        currentPage: 1,
+        totalPages: 1,
+        totalCount: 1,
+        pageSize: 20,
+        tool: tool,
+        permission: permission,
+        filterTypes: null,
+        filterModel: {},
+        submitButtonStat: false,
+        visible: false,
+        form: {
+          orderSn: '',
+          modernPeriod: '',
+        },
+        order: {},
+        availablePeriod: null,
+				screenWidth: getScreenWidth() > 500 ? '500px' : getScreenWidth() + 'px',
+				labelPosition: getScreenWidth() >= 500 ? 'right' : 'top',
+      }
+    },
+    methods: {
+      handleCurrentChange(page) {
+        this.getData(page, this.pageSize)
+      },
+      handleSizeChange(pageSize) {
+        this.getData(this.currentPage, pageSize)
+      },
+      handleFilterUser(filterData) {
+        filterHelper.handleFilterUser(this, filterData)
+      },
+      getData(page, pageSize) {
+        let filterData = this.filterModel
+        let vueObj=this
+        const paramsData = Object.assign({
+          page: (page === null || page == undefined) ? 1 : page,
+          pageSize: (pageSize === null || pageSize == undefined) ? vueObj.pageSize : pageSize
+        }, filterData)
+        orderPeriodAdjustList(paramsData).then( response => {
+          vueObj.tableHeaders = response.data.columnsShow ? response.data.columnsShow : []
+          vueObj.tableData = response.data.list
+          vueObj.filterTypes = response.data.filterTypes
+          vueObj.currentPage = page
+          vueObj.totalPages = parseInt(response.data.totalPages)
+          vueObj.totalCount = parseInt(response.data.totalCount)
+          vueObj.pageSize = pageSize
+          this.loading = false
+        }).catch( err => {
+          this.loading = false
+          this.$message({
+              message: err,
+              type: 'error'
+          })
+        })
+      },
+      handleOrderSnChange() {
+        if (this.form.orderSn) {
+          this.submitButtonStat = true
+
+          let getData = {
+            orderSn: this.form.orderSn
+          }
+          orderDetail(getData).then( response => {
+            this.order = response.data.order
+            this.availablePeriod = response.data.availablePeriod
+            if (response.data.availablePeriod && response.data.availablePeriod[0]) {
+              for (let period of response.data.availablePeriod) {
+                if (!period['disabled']) {
+                  this.form.modernPeriod = period['PERIOD_NUM']
+                  break
+                }
+              }
+            }
+            this.submitButtonStat = false
+          }).catch( error => {
+            this.$message({
+              message: error,
+              type: 'error'
+            })
+            this.submitButtonStat = false
+          })
+        }
+      },
+      onSubmit() {
+        this.$confirm(this.$t('shop.modifyOrderPcNoHits'), this.$t('common.hint'), {
+					confirmButtonText: this.$t('common.confirm'),
+					cancelButtonText: this.$t('common.cancel'),
+          type: 'warning'
+        }).then(() => {
+          this._handleSubmit()
+        }).catch(error => {
+          this.$message({
+            message: error,
+            type: 'error'
+          })
+          this.submitButtonStat = false
+        })
+      },
+      _handleSubmit() {
+        this.submitButtonStat = true
+        let paramsData = this.form
+        orderPeriodAdjust(paramsData).then( res => {
+          this.$message({
+            message: res.data,
+            type: 'success'
+          })
+          this.submitButtonStat = false
+          this._clearData()
+        }).catch( error => {
+          this.$message({
+            message: error,
+            type: 'error'
+          })
+          this.submitButtonStat = false
+        })
+      },
+      _clearData(){
+        this.form = {}
+        this.order = {}
+        this.visible = false
+        this.getData()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/user/member-network-move.vue

@@ -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: {

vue.config.js

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