feat: NG-22: 多国家

src/views/finance/transfer-list.vue

@@ -97,12 +97,12 @@
 							</el-select>
 						</el-form-item>
 						<el-form-item :label="$t('finance.currentAvailableBonus')">
-							<el-input v-model="balance" readonly>
+							<el-input v-model="balance" readonly disabled>
 <!--								<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>
+							<el-input v-model="cash" readonly disabled>
 <!--								<template slot="append">{{ $t('currency.naira') }}</template>-->
 							</el-input>
 						</el-form-item>

src/views/shop/reconsume.vue

@@ -180,6 +180,7 @@
                     <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;">( {{currencyUnitCode}} {{ userBalance.cash | toThousandFilter }})</span>
+                          <span v-if="item.label === 'prp'" style="color: tomato;">( {{currencyUnitCode}} {{ userBalance.prp | toThousandFilter }})</span>
                       </el-radio>
                     </div>
                   </el-radio-group>
@@ -252,7 +253,8 @@
           <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') }}：{{currencyUnitCode}} {{ product.SELL_PRICE | toThousandFilter }}</span><br>
+            <span style="color: tomato;">{{ $t('shop.salesPrice') }}：{{currencyUnitCode}} {{ product.SELL_PRICE }}</span><br>
+            <span>{{ $t('shop.marketPrice') }}：{{currencyUnitCode}} {{ product.MARKET_PRICE }}</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') }}： {{ product.taxAmount | toThousandFilter }}</span><br>
@@ -394,7 +396,7 @@ export default {
       selfPickUpAddressId: '100000000000000000',
       shippingAddressList: [],
 
-      screenWidth: getScreenWidth() > 600 ? '80%' : getScreenWidth() + 'px',
+      screenWidth: getScreenWidth() > 600 ? '50%' : getScreenWidth() + 'px',
       labelPosition: getScreenWidth() > 600 ? 'right' : 'top',
       dialog: false,
       dialogLoading: false,
@@ -409,7 +411,7 @@ export default {
         TAX_RATE: 0,
         taxAmount: 0
       },
-      imageStyle: 'margin-top: -50px;',
+      imageStyle: 'margin-top: 0px;',
       countries: null,
       memberLoading: false,
       memberList: [],
@@ -634,7 +636,7 @@ export default {
           }
         }
         // 支付方式的第一项默认选中
-        this.payType = Object.values(this.payList)[1]['label']
+        this.payType = Object.values(this.payList)[0]['label']
         // 免运费阈值
         this.freeShipping = response.data.freeShipping
         // 运费

src/views/shop/standard-products.vue

@@ -122,6 +122,7 @@
                     <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;">( {{currencyUnitCode}} {{ userBalance.cash | toThousandFilter }})</span>
+                          <span v-if="item.label === 'prp'" style="color: tomato;">( {{currencyUnitCode}} {{ userBalance.prp | toThousandFilter }})</span>
                       </el-radio>
                     </div>
                   </el-radio-group>
@@ -218,7 +219,8 @@
           <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') }}：{{currencyUnitCode}} {{ product.SELL_PRICE | toThousandFilter }}</span><br>
+            <span style="color: tomato;">{{ $t('shop.salesPrice') }}：{{currencyUnitCode}} {{ product.SELL_PRICE }}</span><br>
+            <span>{{ $t('shop.marketPrice') }}：{{currencyUnitCode}} {{ product.MARKET_PRICE }}</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') }}：{{ product.taxAmount | toThousandFilter }}</span><br>
@@ -339,7 +341,7 @@ export default {
       selfPickUpAddressId: '100000000000000000',
       shippingAddressList: [],
 
-      screenWidth: getScreenWidth() > 600 ? '80%' : getScreenWidth() + 'px',
+      screenWidth: getScreenWidth() > 600 ? '50%' : getScreenWidth() + 'px',
       labelPosition: getScreenWidth() > 600 ? 'right' : 'top',
       dialog: false,
       dialogLoading: false,
@@ -541,7 +543,7 @@ export default {
           }
         }
         // 支付方式的第一项默认选中
-        this.payType = Object.values(this.payList)[1]['label']
+        this.payType = Object.values(this.payList)[0]['label']
         // 免运费阈值
         this.freeShipping = response.data.freeShipping
         // 运费

src/views/user/member-upgrade.vue

@@ -161,7 +161,8 @@
           <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') }}：{{currencyUnitCode}} {{ product.SELL_PRICE | toThousandFilter }}</span><br>
+            <span style="color: tomato;">{{ $t('shop.salesPrice') }}：{{currencyUnitCode}} {{ product.SELL_PRICE }}</span><br>
+            <span>{{ $t('shop.marketPrice') }}：{{currencyUnitCode}} {{ product.MARKET_PRICE }}</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') }}：{{currencyUnitCode}} {{ product.taxAmount | toThousandFilter }}</span><br>
@@ -304,9 +305,9 @@ export default {
         TAX_RATE: 0,
         taxAmount: 0
       },
-      imageStyle: 'margin-top: -50px;',
+      imageStyle: 'margin-top: 0px;',
 
-      screenWidth: getScreenWidth() > 600 ? '600px' : getScreenWidth() + 'px',
+      screenWidth: getScreenWidth() > 600 ? '50%' : getScreenWidth() + 'px',
       labelPosition: getScreenWidth() > 500 ? 'right' : 'top',
       payStackScreenWidth: getScreenWidth() > 500 ? '450px' : getScreenWidth() + 'px',
 

src/views/user/welcome-pack.vue

@@ -239,7 +239,8 @@
           <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') }}：{{currencyUnitCode}} {{ product.SELL_PRICE }}</span><br>
+            <span style="color: tomato;">{{ $t('shop.salesPrice') }}：{{currencyUnitCode}} {{ product.SELL_PRICE }}</span><br>
+            <span>{{ $t('shop.marketPrice') }}：{{currencyUnitCode}} {{ product.MARKET_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') }}：{{currencyUnitCode}} {{ product.taxAmount }}</span><br>
@@ -302,7 +303,7 @@ export default {
       categoryType: '',
       sellType: [],
       payList: [],
-      screenWidth: getScreenWidth() > 600 ? '500px' : getScreenWidth() + 'px',
+      screenWidth: getScreenWidth() > 600 ? '50%' : getScreenWidth() + 'px',
       labelPosition: getScreenWidth() > 600 ? 'right' : 'top',
       payStackScreenWidth: getScreenWidth() > 500 ? '450px' : getScreenWidth() + 'px',
 
@@ -380,7 +381,7 @@ export default {
         TAX_RATE: 0,
         taxAmount: 0
       },
-      imageStyle: 'margin-top: -50px;',
+      imageStyle: 'margin-top: 0px;',
 
       decWay: '2',
       regionData: [],
@@ -427,7 +428,7 @@ export default {
 
       userReadOnly: true,
       recReadOnly: false,
-      allDecLevel: usersInfo.getBaseInfo().decLevels,
+      allDecLevel: [],
       allOpenBank: [],
 
       activeName: 'product',
@@ -491,6 +492,7 @@ export default {
         this.allGoods = response.data.allGoods
         this.userBalance = response.data.userBalance
         this.regionData = response.data.region
+        this.allDecLevel = response.data.decLevel
         this.categoryType = 1
         if(response.data.allGoods && response.data.allGoods.length > 0){
           this.currencyUnitCode = response.data.allGoods[0].CODE
@@ -533,7 +535,7 @@ export default {
     // 商品详情
     handleProduct(row) {
       this.product = row
-      this.product.taxAmount = tool.calculateTax(row.SELL_PRICE, row.TAX_RATE)
+      this.product.taxAmount = tool.calculateTax(row.MARKET_PRICE, row.TAX_RATE)
       this.visibleProduct = true
     },
     // 选择商品计数
@@ -557,9 +559,9 @@ export default {
       if (this.multipleSelection.length > 0) {
         let accumulatorSellPrice = 0; let accumulatorPricePv = 0; let accumulatorTax = 0
         this.multipleSelection.forEach(accumulator => {
-          accumulatorSellPrice += accumulator.SELL_PRICE * accumulator.goodsNum
+          accumulatorSellPrice += accumulator.MARKET_PRICE * accumulator.goodsNum
           accumulatorPricePv += Number(accumulator.PRICE_PV) * Number(accumulator.goodsNum)
-          accumulatorTax += tool.calculateTax(Number(accumulator.SELL_PRICE), Number(accumulator.TAX_RATE), Number(accumulator.goodsNum))
+          accumulatorTax += tool.calculateTax(Number(accumulator.MARKET_PRICE), Number(accumulator.TAX_RATE), Number(accumulator.goodsNum))
         })
 
         this.sellPriceSum = tool.formatPrice(accumulatorSellPrice)
@@ -773,7 +775,7 @@ export default {
       this.multipleSelection.map((item) => {
         this.form.goodsId.push(item.ID)
         this.form.goodsNum.push(item.goodsNum)
-        this.payAmount += item.goodsNum * item.SELL_PRICE
+        this.payAmount += item.goodsNum * item.MARKET_PRICE
       })
     },
     // 报单方式