feat: NG-6: 前端 - 新会员注册时增加国家与语言选项

.env.development

@@ -12,9 +12,21 @@ ENV='development'
 
 
 # base api
-VUE_APP_BASE_API=''
-VUE_APP_BASE_DO_API='http://16.163.228.151:8043'
-VUE_APP_CDN_API='http://16.163.228.151:8041'
-VUE_APP_BASE_WEBSITE='http://16.163.228.151:8045'
-VUE_APP_BASE_PAY_STACK_PUBLIC_KEY='pk_test_2eed10135c4a958c5073795b22854ded9d1a6c55'
-VUE_APP_ACCESS_TOKEN_PREFIX='Bearer '
+#VUE_APP_BASE_API=''
+#VUE_APP_BASE_DO_API='http://16.163.228.151:8043'
+#VUE_APP_CDN_API='http://16.163.228.151:8041'
+#VUE_APP_BASE_WEBSITE='http://16.163.228.151:8045'
+#VUE_APP_BASE_PAY_STACK_PUBLIC_KEY='pk_test_2eed10135c4a958c5073795b22854ded9d1a6c55'
+#VUE_APP_ACCESS_TOKEN_PREFIX='Bearer '
+
+# test
+# # api请求地址
+ VUE_APP_BASE_API='http://16.163.228.151:8018'
+ # 文件下载地址
+ VUE_APP_BASE_DO_API='http://16.163.228.151:8018'
+ # CDN文件地址
+ VUE_APP_CDN_API='http://16.163.228.151:8021'
+ # 会员页面地址
+ VUE_APP_BASE_WEBSITE='http://16.163.228.151:8017'
+ VUE_APP_BASE_PAY_STACK_PUBLIC_KEY='pk_test_2eed10135c4a958c5073795b22854ded9d1a6c55'
+ VUE_APP_ACCESS_TOKEN_PREFIX='Bearer '

package.json

@@ -7,6 +7,7 @@
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",
     "build:prod": "vue-cli-service build",
+    "build:dev": "vue-cli-service build --mode development",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "new": "plop",

src/api/config.js

@@ -36,11 +36,11 @@ export function deleteAddress(data) {
   })
 }
 
-export function getRegionList(data) {
+export function getRegionList(query) {
   return request({
     url: '/v1/config/region-list',
     method: 'get',
-    data
+    params: query
   })
 }
 

src/api/user.js

@@ -151,6 +151,14 @@ export function fetchFullInfo(data) {
   })
 }
 
+export function fetchInspectNetwork(data) {
+  return request({
+    url: '/v1/user/inspect-network',
+    method: 'get',
+    params: data
+  })
+}
+
 // 用户升级查询
 export function fetchUpgrade(data) {
   return request({

src/lang/en.js

@@ -305,7 +305,8 @@ export default {
     websiteTitle: 'Member Management System',
     uploadHints: 'Uploading, please hold on. Do not close the window!',
     canNotBeBlank: ' cannot be blank',
-    require: 'is required'
+    require: 'is required',
+    language: "Language"
   },
 
   shop: {
@@ -370,7 +371,9 @@ export default {
     cityName: 'City',
     address: 'Detailed Address',
     memberNotFound: 'Member Not Found',
-    declarationCenterNumber:'Sponsor Code'
+    declarationCenterNumber:'Sponsor Code',
+    salesPrice: 'DP',
+    marketPrice: 'RP',
   },
 
   user: {
@@ -387,7 +390,12 @@ export default {
     BAUpgrade: 'BA Upgrade',
     entryLevel: 'Entry Level',
     selectEntryLevel: 'Select entry level',
-    stockistCode: 'Stockist Code'
+    stockistCode: 'Stockist Code',
+    selectCountry: 'Select Country',
+    selectLanguage: 'Select Language',
+    recommenderName: 'Sponsor ID',
+    recommenderActualName: 'Placement Sponsor ID',
+
   },
 
   atlas: {

src/lang/zh.js

@@ -115,8 +115,8 @@ export default {
     // 二级菜单/接口-networkChart
     placementNetwork: '安置网络',
     placementNetworkEx: '安置网络Ex',
-    sponsorNetwork: '推荐网路',
-    sponsorNetworkEx: '推荐网路Ex',
+    sponsorNetwork: '推荐网络',
+    sponsorNetworkEx: '推荐网络Ex',
     brandAmbassadorList: 'BA会员',
     // 二级菜单/接口-bonusManagement
     myAccount: '我的账户',
@@ -304,7 +304,8 @@ export default {
     websiteTitle: '会员管理系统',
     uploadHints: '正在上传，请稍后。请勿关闭窗口！',
     canNotBeBlank: '不能为空',
-    require: '必须填写'
+    require: '必须填写',
+    language: '语言'
   },
   shop: {
     product: '商品',
@@ -368,9 +369,11 @@ export default {
     cityName: '城市',
     address: '详细地址',
     memberNotFound: '找不到这个用户',
-    declarationCenterNumber:'报单中心编号',
+    declarationCenterNumber: '报单中心编号',
     country: '国家',
-    paymentCurrency: '支付币种'
+    paymentCurrency: '支付币种',
+    salesPrice: 'DP',
+    marketPrice: 'RP',
   },
   user: {
     email: '电子邮箱',
@@ -386,7 +389,11 @@ export default {
     BAUpgrade: 'BA会员升级',
     entryLevel: '报单级别',
     selectEntryLevel: '请选择报单级别',
-    stockistCode: '报单中心编号'
+    stockistCode: '报单中心编号',
+    selectCountry: '请选择国家',
+    selectLanguage: '请选择语言',
+    recommenderName: '推荐人编号',
+    recommenderActualName: '实际推荐人编号',
   },
 
   atlas: {

src/store/modules/user.js

@@ -129,9 +129,8 @@ const actions = {
     return new Promise((resolve, reject) => {
       getBaseInfo({version: 'v2'}).then(response => {
         let ret = response.data
-        console.log(ret)
-        ret.menu[3].child[2].routePath = 'atlas/network-ex'
-        ret.menu[3].child[3].routePath = 'atlas/relation-ex'
+        // ret.menu[3].child[2].routePath = 'atlas/network-ex'
+        ret.menu[3].child[1].routePath = 'atlas/relation-ex'
         usersInfo.clearBaseInfo()
         usersInfo.setBaseInfo(ret)
         resolve(response)

src/views/config/shipping-address-list.vue

@@ -182,15 +182,7 @@ export default {
   methods: {
     getRegion(){
       getRegionList().then(response => {
-        let obj = response.data
-        let list = []
-        Object.keys(obj).forEach(function(key) {
-          list.push({
-            label: obj[key],
-            value: key,
-          })
-        });
-        this.regionData = list
+        this.regionData = response.data
       })
     },
     getList() {

src/views/finance/transfer-list.vue

@@ -98,22 +98,22 @@
 						</el-form-item>
 						<el-form-item :label="$t('finance.currentAvailableBonus')">
 							<el-input v-model="balance" readonly>
-								<template slot="append">{{ $t('currency.naira') }}</template>
+<!--								<template slot="append">{{ $t('currency.naira') }}</template>-->
 							</el-input>
 						</el-form-item>
 						<el-form-item :label="$t('finance.currentAvailableEcoin')">
 							<el-input v-model="cash" readonly>
-								<template slot="append">{{ $t('currency.naira') }}</template>
+<!--								<template slot="append">{{ $t('currency.naira') }}</template>-->
 							</el-input>
 						</el-form-item>
 						<el-form-item :label="$t('finance.currentTransferRatio')" v-if="false">
 							<el-input v-model="transferProp" readonly>
-								<template slot="append">{{ $t('currency.naira') }}</template>
+<!--								<template slot="append">{{ $t('currency.naira') }}</template>-->
 							</el-input>
 						</el-form-item>
 						<el-form-item :label="$t('finance.maximumTransferAmount')" v-if="false">
 							<el-input v-model="maxAmount" readonly>
-								<template slot="append">{{ $t('currency.naira') }}</template>
+<!--								<template slot="append">{{ $t('currency.naira') }}</template>-->
 							</el-input>
 						</el-form-item>
 						<el-form-item :label="$t('finance.memberCode')" prop="toUserName" required>
@@ -129,7 +129,7 @@
 							<el-tag type="info">{{ fee }}%</el-tag>
 						</el-form-item>
 						<el-form-item :label="$t('finance.actualAmountTransferredInto')" v-show="fee > 0">
-							<el-tag type="warning">{{ realAmount }} {{ $t('currency.naira') }}</el-tag>
+							<el-tag type="warning">{{ realAmount }}</el-tag>
 						</el-form-item>
 						<el-form-item :label="$t('finance.remark')" prop="remark">
 							<el-input size="small" v-model="form.remark" type="text"></el-input>

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

@@ -29,12 +29,12 @@
 								</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 | toThousandFilter }}</span>
+										<span style="white-space: nowrap;"> {{ 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 | toThousandFilter }}</span>
+										<span style="white-space: nowrap;"> {{ row | priceAmountFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalBV')">
@@ -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 | toThousandFilter }}</span>
+										<span style="white-space: nowrap;"> {{ row | taxAmountFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 							</el-table>

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

@@ -41,8 +41,8 @@
         <el-button type="primary" size="small" style="float: left;" @click="settlement()">{{ $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 | toThousandFilter }}</div>
-        <div style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ taxSum | toThousandFilter }}</div>
+        <div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productPrice') }}： {{ sellPriceSum | toThousandFilter }}</div>
+        <div style="display: inline-block;">{{ $t('shop.taxAmount') }}： {{ taxSum | toThousandFilter }}</div>
       </div>
     </div>
 

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

@@ -29,12 +29,12 @@
 								</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 | toThousandFilter }}</span>
+										<span style="white-space: nowrap;"> {{ 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 | toThousandFilter }}</span>
+										<span style="white-space: nowrap;"> {{ row | priceAmountFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalBV')">
@@ -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 | toThousandFilter }}</span>
+										<span style="white-space: nowrap;"> {{ row | taxAmountFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 							</el-table>

src/views/shop/order-list.vue

@@ -29,12 +29,12 @@
 								</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 | toThousandFilter }}</span>
+										<span style="white-space: nowrap;"> {{ 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 | toThousandFilter }}</span>
+										<span style="white-space: nowrap;"> {{ row | priceAmountFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column align="center" :label="$t('shop.totalBV')">
@@ -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 | toThousandFilter }}</span>
+										<span style="white-space: nowrap;"> {{ row | taxAmountFilter | toThousandFilter }}</span>
 									</template>
 								</el-table-column>
 							</el-table>

src/views/shop/reconsume.vue

@@ -3,7 +3,7 @@
     <div class="noList">
       <el-input
           v-model.trim="memberDetails.number"
-          placeholder="请输入内容"
+          :placeholder="$t('user.enterMemberCode')"
           clearable
           @change="memberRemoteMethod"
           style="max-width: 50%"
@@ -23,18 +23,21 @@
                 <el-col :xs="24" :sm="24" :lg="6">
                   <span style="cursor: pointer;" @click="handleProduct(row)">{{ row.GOODS_NAME }}</span>
                 </el-col>
-                <el-col :xs="24" :sm="24" :lg="4">
+                <el-col :xs="24" :sm="24" :lg="3">
                   <span style="color: #9c9c9c; cursor: pointer;">{{ row.GOODS_NO }}</span>
                 </el-col>
-                <el-col :xs="24" :sm="24" :lg="5">
+                <el-col :xs="24" :sm="24" :lg="4">
                   <span style="font-size: 13px;">
                     <span style="font-weight: bold; color: tomato;">
-                      {{ $t('currency.sign') }} {{ row.SELL_PRICE | toThousandFilter }}
+                       DP：{{row.COIN}} {{ row.SELL_PRICE | toThousandFilter }}
                       <span style="font-weight:normal; color: #606266;">({{ row.PRICE_PV | toThousandFilter }}{{ $t('shop.productBV') }})</span>
                     </span>
                   </span>
                 </el-col>
-                <el-col :xs="24" :sm="24" :lg="4">
+                <el-col :xs="24" :sm="24" :lg="3">
+                  <span style="font-size: 13px;">RP：{{row.COIN}} {{ row.MARKET_PRICE }}</span>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="3">
                   <span style="font-size: 13px;">{{ $t('shop.inventory') }}：{{ row.STORE_NUMS }}</span>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="5">
@@ -54,9 +57,9 @@
         <el-button type="primary" size="small" style="float: left;" @click="settlement()">{{ $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 | toThousandFilter }}</div>
+        <div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{currencyUnitCode}} {{ 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 style="display: inline-block;">{{ $t('shop.taxAmount') }}： {{currencyUnitCode}} {{ taxSum | toThousandFilter }}</div>
       </div>
     </div>
 
@@ -73,22 +76,22 @@
                   </el-aside>
                   <el-main style="padding: 10px 5px; text-align: left;">
                     <el-row :gutter="10">
-                      <el-col :xs="24" :sm="8" :lg="8">
+                      <el-col :xs="24" :sm="8" :lg="7">
                         <span style="cursor: pointer;" @click="handleProduct(row)">{{ row.GOODS_NAME }}</span>
                       </el-col>
-                      <el-col :xs="24" :sm="4" :lg="4">
+                      <el-col :xs="24" :sm="4" :lg="3">
                         <span style="color: #9c9c9c; cursor: pointer;">{{ row.GOODS_NO }}</span>
                       </el-col>
-                      <el-col :xs="20" :sm="8" :lg="8">
-                        <span style="font-weight: bold;">{{ $t('currency.sign') }} {{ row.member_price | toThousandFilter }}</span>
+                      <el-col :xs="20" :sm="8" :lg="6">
+                        <span style="font-weight: bold;"> {{currencyUnitCode}} {{ row.member_price | toThousandFilter }}</span>
                         <!-- <span style="font-weight:normal; color: #606266;">({{ row.PRICE_PV | toThousandFilter }}{{ $t('shop.productBV') }})</span> -->
                         <span>({{ row.PRICE_PV | toThousandFilter }}{{ $t('shop.productBV') }})</span><br>
                       </el-col>
-                      <el-col :xs="8" :sm="3" :lg="3">
+                      <el-col :xs="8" :sm="3" :lg="2">
                         <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 | toThousandFilter }}</span>
+                      <el-col :xs="24" :sm="5" :lg="4">
+                        <span style="color: tomato; font-weight: bold;"> {{currencyUnitCode}} {{ row.member_price_plus | toThousandFilter }}</span>
                         <span>({{ row.PRICE_PV | toThousandFilter }}{{ $t('shop.productBV') }})</span><br>
                       </el-col>
                     </el-row>
@@ -106,8 +109,8 @@
                   <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" :lg="21" style="word-break: normal; white-space: nowrap; line-height: 28px;">
-                  <span>{{ $t('shop.total') }}：{{ $t('currency.sign') }} {{ parseFloat(cashSum) | toThousandFilter }}({{ pricePvSum | toThousandFilter }}{{ $t('shop.productBV') }})</span><br>
-                  <span>{{ $t('shop.freight') }}：{{ $t('currency.sign') }} {{ pointFreight }}</span>
+                  <span>{{ $t('shop.total') }}： {{currencyUnitCode}} {{ parseFloat(cashSum) | toThousandFilter }}({{ pricePvSum | toThousandFilter }}{{ $t('shop.productBV') }})</span><br>
+                  <span>{{ $t('shop.freight') }}： {{currencyUnitCode}} {{ pointFreight }}</span>
                 </el-col>
               </el-row>
             </div>
@@ -176,7 +179,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 | toThousandFilter }})</span>
+                        {{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">( {{currencyUnitCode}} {{ userBalance.cash | toThousandFilter }})</span>
                       </el-radio>
                     </div>
                   </el-radio-group>
@@ -249,10 +252,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 | toThousandFilter }}</span><br>
+            <span style="color: tomato;">{{ $t('shop.productPrice') }}：{{currencyUnitCode}} {{ 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 | toThousandFilter }}</span><br>
+            <span>{{ $t('shop.taxAmount') }}： {{ product.taxAmount | toThousandFilter }}</span><br>
             <span>{{ $t('shop.inventory') }}：{{ product.STORE_NUMS }}</span>
           </div>
         </el-col>
@@ -349,7 +352,7 @@ export default {
       payType: 'cash',
       payStackLoading: false,
       channels: ['card', 'bank', 'ussd', 'qr'],
-      regionData: region.regionInfo.regionData,
+      regionData: [],
       areaDisabled: false,
       form: {
         publicKey: process.env.VUE_APP_BASE_PAY_STACK_PUBLIC_KEY,
@@ -413,6 +416,7 @@ export default {
       memberDetails: {
         number: '',
       },
+      currencyUnitCode: ""
     }
   },
   computed: {
@@ -435,15 +439,7 @@ export default {
   methods: {
     getRegion(){
       getRegionList({countryId: this.memberDetails.countryId}).then(response => {
-        let obj = response.data
-        let list = []
-        Object.keys(obj).forEach(function(key) {
-          list.push({
-            label: obj[key],
-            value: key,
-          })
-        });
-        this.regionData = list
+        this.regionData = response.data
       })
     },
     memberRemoteMethod(e){
@@ -487,7 +483,9 @@ export default {
           this.storeNums[i] = 1
           settingObj[i].chose_num = 0
         }
-
+        if(this.list && this.list.length > 0){
+          this.currencyUnitCode = this.list[0].COIN
+        }
         this.tableData = Object.values(settingObj)
         const pageList = this.multipleSelection[this.currentPage]
         this.$nextTick(function() {
@@ -606,7 +604,7 @@ export default {
             }
           }, 0)
           if (index !== 2) {
-            sums[index] = this.$t('currency.sign') + ' ' + sums[index]
+            sums[index] = sums[index]
           }
         }
       })
@@ -641,6 +639,7 @@ export default {
         this.freeShipping = response.data.freeShipping
         // 运费
         this.freight = response.data.freight
+
       })
     },
     // 支付

src/views/shop/standard-products.vue

@@ -14,18 +14,21 @@
                 <el-col :xs="24" :sm="24" :lg="6">
                   <span style="cursor: pointer;" @click="handleProduct(row)">{{ row.GOODS_NAME }}</span>
                 </el-col>
-                <el-col :xs="24" :sm="24" :lg="4">
+                <el-col :xs="24" :sm="24" :lg="3">
                   <span style="color: #9c9c9c; cursor: pointer;">{{ row.GOODS_NO }}</span>
                 </el-col>
-                <el-col :xs="24" :sm="24" :lg="5">
+                <el-col :xs="24" :sm="24" :lg="4">
                   <span style="font-size: 13px;">
                     <span style="font-weight: bold; color: tomato;">
-                      {{ $t('currency.sign') }} {{ row.SELL_PRICE | toThousandFilter }}
+                       DP：{{row.COIN}} {{ row.SELL_PRICE | toThousandFilter }}
                       <span style="font-weight:normal; color: #606266;">({{ row.PRICE_PV | toThousandFilter }}{{ $t('shop.productBV') }})</span>
                     </span>
                   </span>
                 </el-col>
-                <el-col :xs="24" :sm="24" :lg="4">
+                <el-col :xs="24" :sm="24" :lg="3">
+                  <span style="font-size: 13px;">RP：{{row.COIN}} {{ row.MARKET_PRICE }}</span>
+                </el-col>
+                <el-col :xs="24" :sm="24" :lg="3">
                   <span style="font-size: 13px;">{{ $t('shop.inventory') }}：{{ row.STORE_NUMS }}</span>
                 </el-col>
                 <el-col :xs="24" :sm="24" :lg="5">
@@ -45,9 +48,9 @@
         <el-button type="primary" size="small" style="float: left;" @click="settlement()">{{ $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 | toThousandFilter }}</div>
+        <div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productPrice') }}： {{currencyUnitCode}} {{ 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 style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{currencyUnitCode}}  {{ taxSum | toThousandFilter }}</div>
       </div>
     </div>
 
@@ -71,14 +74,14 @@
                         <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 | toThousandFilter }}</span>
+                        <span style="font-weight: bold;"> {{currencyUnitCode}} {{ row.member_price | toThousandFilter }}</span>
                         <span>({{ row.PRICE_PV | toThousandFilter }}{{ $t('shop.productBV') }})</span><br>
                       </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 | toThousandFilter }}</span>
+                        <span style="color: tomato; font-weight: bold;">{{currencyUnitCode}} {{ row.member_price_plus | toThousandFilter }}</span>
                         <span style="color: tomato;">({{ row.PRICE_PV | toThousandFilter }}{{ $t('shop.productBV') }})</span><br>
                       </el-col>
                     </el-row>
@@ -96,8 +99,8 @@
                   <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" :lg="21" style="word-break: normal; white-space: nowrap; line-height: 28px;">
-                  <span>{{ $t('shop.total') }}：{{ $t('currency.sign') }} {{ parseFloat(cashSum) | toThousandFilter }}({{ pricePvSum | toThousandFilter }}{{ $t('shop.productBV') }})</span><br>
-                  <span>{{ $t('shop.freight') }}：{{ $t('currency.sign') }} {{ pointFreight }}</span>
+                  <span>{{ $t('shop.total') }}：{{currencyUnitCode}} {{ parseFloat(cashSum) | toThousandFilter }}({{ pricePvSum | toThousandFilter }}{{ $t('shop.productBV') }})</span><br>
+                  <span>{{ $t('shop.freight') }}：{{currencyUnitCode}} {{ pointFreight }}</span>
                 </el-col>
               </el-row>
             </div>
@@ -107,7 +110,7 @@
                 <el-input v-model="recUserName" :disabled="isDec == '1'" />
               </el-form-item>
             </el-form>
-            
+
             <!-- 支付方式/账户余额 {{ cashCurrency }}:  -->
             <div class="" style="margin: 15px 0;">
               <el-row :gutter="20" type="flex" style="flex-wrap: wrap;">
@@ -118,7 +121,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 | toThousandFilter }})</span>
+                        {{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">( {{currencyUnitCode}} {{ userBalance.cash | toThousandFilter }})</span>
                       </el-radio>
                     </div>
                   </el-radio-group>
@@ -215,10 +218,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 | toThousandFilter }}</span><br>
+            <span style="color: tomato;">{{ $t('shop.productPrice') }}：{{currencyUnitCode}} {{ 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 | toThousandFilter }}</span><br>
+            <span>{{ $t('shop.taxAmount') }}：{{ product.taxAmount | toThousandFilter }}</span><br>
             <span>{{ $t('shop.inventory') }}：{{ product.STORE_NUMS }}</span>
           </div>
         </el-col>
@@ -328,7 +331,7 @@ export default {
             }
           ]
         },
-        
+
       },
       payStackScreenWidth: getScreenWidth() > 500 ? '450px' : getScreenWidth() + 'px',
 
@@ -355,7 +358,8 @@ export default {
       recRealName:null,
       // recUserName:usersInfo.userName(),
       recUserName:null,
-      isDec:null
+      isDec:null,
+      currencyUnitCode: ""
     }
   },
   computed: {
@@ -507,7 +511,7 @@ export default {
             }
           }, 0)
           if (index !== 2) {
-            sums[index] = this.$t('currency.sign') + ' ' + sums[index]
+            sums[index] = sums[index]
           }
         }
       })
@@ -544,6 +548,9 @@ export default {
         this.freight = response.data.freight
         //是否是报单中心
         this.isDec = response.data.isDec
+        //货币单位
+        this.currencyUnitCode = response.data.coin
+
       })
     },
     // 支付

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

@@ -41,8 +41,8 @@
         <el-button type="primary" size="small" style="float: left;" @click="settlement()">{{ $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 | toThousandFilter }}</div>
-        <div style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ taxSum | toThousandFilter }}</div>
+        <div style="margin-right: 2rem; display: inline-block;">{{ $t('shop.productPrice') }}： {{ sellPriceSum | toThousandFilter }}</div>
+        <div style="display: inline-block;">{{ $t('shop.taxAmount') }}： {{ taxSum | toThousandFilter }}</div>
       </div>
     </div>
 

src/views/user/brand-ambassador.vue

@@ -30,7 +30,7 @@
 														<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 | toThousandFilter}}</span><br />
+															<span style="color: tomato;">{{ $t('shop.productPrice') }}：{{ 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>
@@ -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 | toThousandFilter }}</div>
+											<div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productPrice') }}： {{ 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 style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{ 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 | toThousandFilter }}）</span>
+									{{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">（ {{ 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 | toThousandFilter }}</span><br />
+						<span style="color: tomato;">{{ $t('shop.productPrice') }}： {{ 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 | toThousandFilter }}</span><br />
+						<span>{{ $t('shop.taxAmount') }}： {{ product.taxAmount | toThousandFilter }}</span><br />
 						<span>{{ $t('shop.inventory') }}：{{ product.STORE_NUMS }}</span>
 					</div>
 				</el-col>

src/views/user/member-order.vue

@@ -29,12 +29,12 @@
                 </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 | toThousandFilter }}</span>
+                    <span style="white-space: nowrap;"> {{ 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 | toThousandFilter }}</span>
+                    <span style="white-space: nowrap;"> {{ row | priceAmountFilter | toThousandFilter }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column align="center" :label="$t('shop.totalBV')">
@@ -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 | toThousandFilter }}</span>
+                    <span style="white-space: nowrap;">  {{ row | taxAmountFilter | toThousandFilter }}</span>
                   </template>
                 </el-table-column>
               </el-table>

src/views/user/member-upgrade.vue

@@ -46,8 +46,9 @@
                                 <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 | toThousandFilter }}</span><br>
+                                  <span style="color: tomato;">{{ $t('shop.salesPrice') }}：{{row.CODE}} {{ row.SELL_PRICE | toThousandFilter }}</span><br>
                                   <span>{{ $t('shop.productBV') }}：{{ row.PRICE_PV | toThousandFilter }}</span><br>
+                                  <span>{{ $t('shop.marketPrice') }}：{{row.CODE}} {{ row.MARKET_PRICE | toThousandFilter }}</span><br>
                                   <span style="display: inline-block; float: right; ">
                                     <el-input-number v-model="storeNums[$index]" size="mini" :min="1" :max="Number(row.STORE_NUMS)" @change="handleInputNumber($event, row)" />
                                   </span>
@@ -63,9 +64,9 @@
 
                   <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 | toThousandFilter }}</div>
+                      <div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productPrice') }}：{{currencyUnitCode}} {{ 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 style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{currencyUnitCode}} {{ taxSum }}</div>
                     </div>
                   </div>
                 </el-tab-pane>
@@ -96,7 +97,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 v-for="(item, index) in payList" :key="index" border :label="item.label" style="margin: 5px;">
-                  {{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">({{ $t('currency.sign') }} {{ userBalance.cash | toThousandFilter }})</span>
+                  {{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">( {{currencyUnitCode}} {{ userBalance.cash | toThousandFilter }})</span>
                 </el-radio>
               </el-radio-group>
             </el-form-item>
@@ -160,10 +161,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 | toThousandFilter }}</span><br>
+            <span style="color: tomato;">{{ $t('shop.productPrice') }}：{{currencyUnitCode}} {{ 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 | toThousandFilter }}</span><br>
+            <span>{{ $t('shop.taxAmount') }}：{{currencyUnitCode}} {{ product.taxAmount | toThousandFilter }}</span><br>
             <span>{{ $t('shop.inventory') }}：{{ product.STORE_NUMS }}</span>
           </div>
         </el-col>
@@ -218,7 +219,7 @@ export default {
       toLevel: '',
       currentRow: null,
       decWay: '2',
-      regionData: region.regionInfo.regionData,
+      regionData: [],
       form: {
         address: '',
         areaSelected: [],
@@ -320,7 +321,8 @@ export default {
         cash: 0
       },
 
-      activeName: 'product'
+      activeName: 'product',
+      currencyUnitCode: ""
     }
   },
   computed: {
@@ -351,13 +353,16 @@ export default {
         this.decUserName = response.data.decUserName
         this.allDecPackage = response.data.allDecPackage
         this.allGoods = response.data.allGoods
+        this.regionData = response.data.region
 
         const settingObj = this.allGoods
         for (const i in this.allGoods) {
           this.storeNums[i] = 1
           settingObj[i].goodsNum = 0
         }
-
+        if(response.data.allGoods && response.data.allGoods.length > 0){
+          this.currencyUnitCode = response.data.allGoods[0].CODE
+        }
         this.tableData = Object.values(settingObj)
         const pageList = this.multipleSelection
         this.$nextTick(function() {

src/views/user/welcome-pack.vue

@@ -1,11 +1,11 @@
 <template>
   <div v-loading="loading">
     <div class="white-box" style="padding: 0 25px; margin-top: 25px;">
-      <div class="noList">
-        <el-select ref="select" @change="countriesChange" v-model="countries" filterable placeholder="请选择">
-          <el-option v-for="(item, index) in countriesList" :key="item.ID" :label="item.NAME" :value="item.ID" />
-        </el-select>
-      </div>
+<!--      <div class="noList">-->
+<!--        <el-select ref="select" @change="countriesChange" v-model="countries" filterable placeholder="">-->
+<!--          <el-option v-for="(item, index) in countriesList" :key="item.ID" :label="item.NAME" :value="item.ID" />-->
+<!--        </el-select>-->
+<!--      </div>-->
       <el-row :gutter="20">
         <el-col :xs="24" :sm="24" :lg="14">
 
@@ -17,8 +17,18 @@
 <!--              </el-radio-group>-->
 <!--            </el-form-item>-->
             <el-divider content-position="left">{{ $t('user.accountInformation') }}</el-divider>
+            <el-form-item :label="$t('shop.country')">
+              <el-select ref="select" @change="countriesChange" v-model="form.countryId" filterable :placeholder="$t('user.selectCountry')" style="width: 100%;">
+                <el-option v-for="(item, index) in countriesList" :key="item.ID" :label="item.NAME" :value="item.ID" />
+              </el-select>
+            </el-form-item>
+            <el-form-item :label="$t('common.language')">
+              <el-select ref="select" v-model="form.languageId" filterable :placeholder="$t('user.selectLanguage')" style="width: 100%;">
+                <el-option v-for="(item, index) in languageList" :key="item.ID" :label="item.NAME" :value="item.ID" />
+              </el-select>
+            </el-form-item>
             <el-form-item :label="$t('user.newMemberCode')">
-              <el-input v-model="form.insertUserName" :readonly="userReadOnly" @blur="checkBaUser" />
+              <el-input v-model="form.insertUserName" :readonly="userReadOnly" @blur="checkBaUser" :placeholder="$t('user.enterMemberCode')" />
             </el-form-item>
             <el-form-item :label="$t('user.entryLevel')">
               <el-select v-model="form.decLv" :placeholder="$t('user.selectEntryLevel')" style="width: 100%;">
@@ -49,8 +59,10 @@
                                 <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 | toThousandFilter }}</span><br>
+                                  <span style="color: tomato;">{{ $t('shop.salesPrice') }}：{{row.CODE}} {{ row.SELL_PRICE | toThousandFilter }}</span><br>
                                   <span>{{ $t('shop.productBV') }}：{{ row.PRICE_PV | toThousandFilter }}</span><br>
+                                  <span>{{ $t('shop.marketPrice') }}：{{row.CODE}} {{ row.MARKET_PRICE | toThousandFilter }}</span><br>
+
                                   <span style="display: inline-block; float: right; ">
                                     <el-input-number v-model="storeNums[$index]" size="mini" :min="1" :max="Number(row.STORE_NUMS)" @change="handleInputNumber($event, row)" />
                                   </span>
@@ -66,9 +78,9 @@
 
                   <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 | toThousandFilter }}</div>
+                      <div style="margin-right: 1rem; display: inline-block;">{{ $t('shop.productPrice') }}： {{currencyUnitCode}} {{ 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 style="display: inline-block;">{{ $t('shop.taxAmount') }}：{{currencyUnitCode}} {{ taxSum }}</div>
                     </div>
                   </div>
                 </el-tab-pane>
@@ -76,34 +88,34 @@
             </el-form-item>
 
             <el-divider content-position="left">{{ $t('atlas.networkInformation') }}</el-divider>
-            <el-form-item :label="$t('shop.sponsorCode')">
+            <el-form-item :label="$t('user.recommenderName')">
               <el-input v-model="form.recUserName" :readonly="recReadOnly" @change="handleChkRecUser" />
             </el-form-item>
             <el-form-item>
               <el-input v-model="recRealName" :disabled="true" />
             </el-form-item>
-            <el-form-item :label="$t('atlas.placementCode')">
-              <el-input v-model="form.conUserName" @change="handleChkConUser" />
+            <el-form-item :label="$t('user.recommenderActualName')">
+              <el-input v-model="form.conUserName" @change="handleChkRecommenderActualName" />
             </el-form-item>
             <el-form-item>
               <el-input v-model="conRealName" type="textarea" :rows="2" :disabled="true" />
             </el-form-item>
-            <el-form-item :label="$t('atlas.placementTree')">
-              <el-radio-group v-model="form.location" border>
-                <el-radio :label="1">{{ $t('atlas.left') }}</el-radio>
-                <el-radio :label="2">{{ $t('atlas.right') }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item><!--自动安置区位-->
-              <el-row :gutter="5">
-                <el-col :xs="24" :sm="12" :lg="12">
-                  <el-button size="small" type="primary" @click="setAutoPlace('left')">{{ $t('atlas.placementAutoLeft') }}</el-button>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="12">
-                  <el-button size="small" type="primary" @click="setAutoPlace('right')">{{ $t('atlas.placementAutoRight') }}</el-button>
-                </el-col>
-              </el-row>
-            </el-form-item>
+<!--            <el-form-item :label="$t('atlas.placementTree')">-->
+<!--              <el-radio-group v-model="form.location" border>-->
+<!--                <el-radio :label="1">{{ $t('atlas.left') }}</el-radio>-->
+<!--                <el-radio :label="2">{{ $t('atlas.right') }}</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item>&lt;!&ndash;自动安置区位&ndash;&gt;-->
+<!--              <el-row :gutter="5">-->
+<!--                <el-col :xs="24" :sm="12" :lg="12">-->
+<!--                  <el-button size="small" type="primary" @click="setAutoPlace('left')">{{ $t('atlas.placementAutoLeft') }}</el-button>-->
+<!--                </el-col>-->
+<!--                <el-col :xs="24" :sm="12" :lg="12">-->
+<!--                  <el-button size="small" type="primary" @click="setAutoPlace('right')">{{ $t('atlas.placementAutoRight') }}</el-button>-->
+<!--                </el-col>-->
+<!--              </el-row>-->
+<!--            </el-form-item>-->
 
             <el-divider content-position="left">{{ $t('profile.personalInformation') }}</el-divider>
             <el-form-item :label="$t('shop.memberName')">
@@ -163,7 +175,7 @@
             <el-form-item :label="$t('shop.paymentMethod')" required>
               <el-radio-group v-model="form.payType" @change="chosePayType">
                 <el-radio v-for="(item, index) in payList" :key="index" border :label="item.label" style="margin: 5px;">
-                  {{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">（{{ $t('currency.sign') }} {{ userBalance.cash }}）</span>
+                  {{ item.name }}<span v-if="item.label === 'cash'" style="color: tomato;">（ {{currencyUnitCode}} {{ userBalance.cash }}）</span>
                 </el-radio>
               </el-radio-group>
             </el-form-item>
@@ -227,10 +239,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 }}</span><br>
+            <span style="color: tomato;">{{ $t('shop.productPrice') }}：{{currencyUnitCode}} {{ product.SELL_PRICE }}</span><br>
             <span>{{ $t('shop.productBV') }}：{{ product.PRICE_PV }}</span><br>
             <span>{{ $t('shop.taxRate') }}：{{ product.TAX_RATE / 100 }}</span><br>
-            <span>{{ $t('shop.taxAmount') }}：{{ $t('currency.sign') }} {{ product.taxAmount }}</span><br>
+            <span>{{ $t('shop.taxAmount') }}：{{currencyUnitCode}} {{ product.taxAmount }}</span><br>
             <span>{{ $t('shop.inventory') }}：{{ product.STORE_NUMS }}</span>
           </div>
         </el-col>
@@ -241,7 +253,14 @@
 
 <script>
 import { deleteApproachOrder } from '@/api/shop'
-import { createWelcomePack, fetchAutoPlace, fetchBrandAmbassadorInfo, fetchFullInfo, fetchWelcomePack } from '@/api/user'
+import {
+  createWelcomePack,
+  fetchAutoPlace,
+  fetchBrandAmbassadorInfo,
+  fetchFullInfo,
+  fetchInspectNetwork,
+  fetchWelcomePack
+} from '@/api/user'
 import Pagination from '@/components/Pagination'
 import waves from '@/directive/waves'
 import region from '@/store/modules/region'
@@ -364,7 +383,7 @@ export default {
       imageStyle: 'margin-top: -50px;',
 
       decWay: '2',
-      regionData: region.regionInfo.regionData,
+      regionData: [],
       form: {
         decType: 'normal',
         realName: '',
@@ -414,7 +433,8 @@ export default {
       activeName: 'product',
       isDec:null,
 
-      countries: null
+      countries: null,
+      currencyUnitCode: ""
     }
   },
   computed: {
@@ -430,6 +450,9 @@ export default {
     countriesList() {
       return this.$store.getters.getCountriesList
     },
+    languageList() {
+      return this.$store.getters.languageList
+    },
     language() {
       return this.$store.getters.language
     },
@@ -450,6 +473,7 @@ export default {
     this.getCountries()
   },
   methods: {
+
     countriesChange(e){
       this.fetchWelcomePack()
     },
@@ -460,13 +484,17 @@ export default {
     // 会员报单/BA升级
     fetchWelcomePack() {
       this.loading = true
-      fetchWelcomePack({countryId: this.countries}).then(response => {
+      fetchWelcomePack({countryId: this.form.countryId}).then(response => {
         this.form.insertUserName = response.data.userName
         this.allOpenBank = response.data.allOpenBank
         this.allDecPackage = response.data.allDecPackage
         this.allGoods = response.data.allGoods
         this.userBalance = response.data.userBalance
+        this.regionData = response.data.region
         this.categoryType = 1
+        if(response.data.allGoods && response.data.allGoods.length > 0){
+          this.currencyUnitCode = response.data.allGoods[0].CODE
+        }
         //是否是报单中心
         this.isDec = response.data.isDec
         const settingObj = this.allGoods
@@ -702,11 +730,11 @@ export default {
         packageId: this.form.packageId,
         goodsId: this.form.goodsId,
         goodsNum: this.form.goodsNum,
-        location: this.form.location,
+        location: 1, //自动安置
         decWay: this.decWay,
         payType: this.form.payType,
-        countryId: this.countries,
-        languageId: this.languageId
+        countryId: this.form.countryId,
+        languageId: this.form.languageId
       }
       createWelcomePack(params).then(response => {
         if (this.form.payType !== 'pay_stack') {
@@ -789,6 +817,19 @@ export default {
         })
       }
     },
+      // 查询安置人
+      handleChkRecommenderActualName() {
+          if (this.form.conUserName) {
+              this.loading = true
+            fetchInspectNetwork({ recommenderName: this.form.recUserName, recommenderActualName: this.form.conUserName }).then(response => {
+                  this.conRealName = response.data.REAL_NAME
+                  this.loading = false
+              }).catch(() => {
+                  this.conRealName = '-'
+                  this.loading = false
+              })
+          }
+      },
     // 自动设置区位
     setAutoPlace(side) {
       if (this.recRealName !== '-') {