更新页面

api/serve/index.js

@@ -86,7 +86,7 @@ x.fn = x.prototype = {
             if(Cache.get(newMsg).data){
 				if(newMsg!='_user_walletImage'&& newMsg!='_user_getAuthInfo' && newMsg!='_user_withdrawalBalance'
 				&& newMsg!='_wallet_getBalance' && newMsg!='_contract_getMarketInfo'&& newMsg!='_contract_openNum'
-				&& newMsg!='_user_primaryAuth'
+				&& newMsg!='_user_primaryAuth' && newMsg!='_user_subscribeTokenList' && newMsg!='_user_subscribeRecords'
 				 && newMsg!='_indexList'&& newMsg!='_user_subscribe'&& newMsg!='_contract_getSymbolDetail' && newMsg!='_user_withdrawalRecord'){
 					
 					resolve(Cache.get(newMsg).data);

i18n/lang/de.json

@@ -360,7 +360,8 @@
     "b6": "Details des Projekts",
     "b7": "Verwenden oder nicht",
     "b8": "Kauf",
-    "b9": "Erfolgreicher Kauf"
+    "b9": "Erfolgreicher Kauf",
+		"availableBalance":"Verfügbarer Saldo"
   },
   "reg": {
     "a0": "Registrieren Sie Ihr Telefon",

i18n/lang/en.json

@@ -410,7 +410,8 @@
 		"b6": "Project Details",
 		"b7": "Whether to use",
 		"b8": "Buy",
-		"b9": "Subscription is successful"
+		"b9": "Subscription is successful",
+		"availableBalance":"Available"
 	},
 	"reg": {
 		"a0": "Mobile registration",

i18n/lang/fra.json

@@ -360,7 +360,8 @@
     "b6": "Détails du projet",
     "b7": "Oui Non",
     "b8": "Achats",
-    "b9": "Souscription réussie"
+    "b9": "Souscription réussie",
+		"availableBalance":"Solde disponible"
   },
   "reg": {
     "a0": "Enregistrement mobile",

i18n/lang/it.json

@@ -360,7 +360,8 @@
     "b6": "Dettagli del progetto",
     "b7": "Uso o no",
     "b8": "acquisto",
-    "b9": "Acquisto riuscito"
+    "b9": "Acquisto riuscito",
+		"availableBalance":"Bilancio disponibile"
   },
   "reg": {
     "a0": "Registrazione mobile",

i18n/lang/jp.json

@@ -360,7 +360,8 @@
     "b6": "プロジェクトの詳細",
     "b7": "使用するかどうか",
     "b8": "買います",
-    "b9": "申し込み成功"
+    "b9": "申し込み成功",
+		"availableBalance":"利用可能残高"
   },
   "reg": {
     "a0": "携帯電話の登録",

i18n/lang/kor.json

@@ -360,7 +360,8 @@
     "b6":"프로젝트 정보",
     "b7":"사용 여부",
     "b8":"구입 하 다.",
-    "b9":"구 매 신청 성공"
+    "b9":"구 매 신청 성공",
+		"availableBalance":"사용 가능 잔액"
   },
   "reg": {
     "a0":"휴대폰 등록",

i18n/lang/pt.json

@@ -360,7 +360,8 @@
     "b6":"Detalhes do projecto",
     "b7":"Utilização ou não",
     "b8":"Compra",
-    "b9":"Compra BEM sucedida"
+    "b9":"Compra BEM sucedida",
+		"availableBalance":"Saldo disponível"
   },
   "reg": {
   "a0":"Registo móvel",

i18n/lang/spa.json

@@ -360,7 +360,8 @@
     "b6":"Detalles del proyecto",
     "b7":"Usar o no",
     "b8":"Comprar",
-    "b9":"éxito de la compra"
+    "b9":"éxito de la compra",
+		"availableBalance":"Saldo disponible"
   },
   "reg": {
   "a0":"Registro de teléfonos móviles",

i18n/lang/tr.json

@@ -360,7 +360,8 @@
     "b6": "Proje Ayrıntıları",
     "b7": "Kullanılıp kullanılmayacağı",
     "b8": "Satın Al",
-    "b9": "Abonelik başarılı"
+    "b9": "Abonelik başarılı",
+		"availableBalance":"Kalan bakiye"
   },
   "reg": {
     "a0": "Mobil kayıt",

i18n/lang/zh-TW.json

@@ -410,7 +410,8 @@
 		"b6": "項目詳情",
 		"b7": "是否使用",
 		"b8": "購買",
-		"b9": "申購成功"
+		"b9": "申購成功",
+		"availableBalance":"可用餘額"
 	},
 	"reg": {
 		"a0": "手機註冊",

pages/base/home.vue

@@ -239,8 +239,8 @@
 					<image src="../../assets/img/bg/bg7.png" mode=""></image>
 				</view>
 				<view class="d-flex btn-group1">
-					<!-- <view>{{$t("ybgcoins3.a1")}}</view> -->
-					<navigator url="/pages/assets/recharge">{{$t("xtzcoins3.a1")}}</navigator>
+					<view @click="toRecharge">{{$t("xtzcoins3.a1")}}</view>
+					<!-- <navigator url="/pages/assets/recharge">{{$t("xtzcoins3.a1")}}</navigator> -->
 					<navigator class="theme-color-a" url="/pages/base/index?tel=exchange-operation">{{$t("xtzcoins3.a2")}}</navigator>
 				</view>
 			</view>
@@ -1030,6 +1030,17 @@
 					this.detail = res.data
 				})
 			},
+			toRecharge(){
+				if(!this.detail.primary_status){
+					uni.navigateTo({
+						url: "/pages/auth/primary"
+					})
+					return;
+				}
+				uni.navigateTo({
+					url: "/pages/assets/recharge"
+				})
+			}
 		},
 		mounted() {
 			this.getCollegeList()

pages/purchase/index.vue

@@ -105,9 +105,8 @@
                     </v-picker>
                     <view class="tips m-t-xs fn-sm d-flex justify-between color-sell">
                         <view>
-                            {{ num || 1 }} {{ activeCoin.coin_name }} ≈
-                            <!-- {{ omitTo(activeCoin.proportion_amount, 4) }} -->
-                            {{ omitTo((1 / detail.issue_price * activeCoin.CurrentPrice * num), 4) }}
+                            {{ 1 }} {{ activeCoin.coin_name }} ≈
+                            {{ omitTo((1 / detail.issue_price * activeCoin.CurrentPrice * 1), 4) }}
                             {{ detail.coin_name }}
                         </view>
                         <!--<view class="color-sell">-->
@@ -117,11 +116,18 @@
                         <!--    {{ detail.coin_name }}-->
                         <!--</view>-->
                     </view>
+                    <view class="tips m-t-xs fn-sm d-flex justify-between color-sell">
+                        <view>
+                            {{ num }} {{ activeCoin.coin_name }} ≈
+                            {{ omitTo((1 / detail.issue_price * activeCoin.CurrentPrice * num), 4) }}
+                            {{ detail.coin_name }}
+                        </view>
+                    </view>
                 </view>
                 <view class="m-y-md">
                     <view class="label">{{ $t("purchase.a7") }}</view>
                     <view class="border-b p-y-xs color-light">
-                        <v-input type="number" v-model="num" :placeholder="$t('purchase.a8')">
+                        <v-input type="text" v-model="num" :placeholder="$t('purchase.a8')">
                             <template #right>
                                 <view
                                     class="color-success"
@@ -133,6 +139,12 @@
                         </v-input>
                     </view>
                 </view>
+								<view class="m-y-md d-flex">
+								    <view class="label">{{ $t("purchase.availableBalance")+'：' }}</view>
+								    <view class="color-light">
+								        {{ activeCoin.usable_balance * 1 || 0 }}
+								    </view>
+								</view>
                 <v-button
                     block
                     class="w-max rounded-lg"
@@ -332,6 +344,10 @@ export default {
                     if (res) {
                         this.$toast.success(this.$t("purchase.b9"));
                         this.num = "";
+												setTimeout(()=>{
+													this.subscribeTokenList();
+													this.getInfo();
+												}, 1000)
                     }
                 })
                 .catch(() => {