xiongzhu 2 년 전
부모
커밋
22af928f0f
6개의 변경된 파일21개의 추가작업 그리고 9개의 파일을 삭제
  1. 1 1
      android/app/build.gradle
  2. BIN
      android/app/src/main/assets/cdvasset.manifest
  3. 1 1
      ios/App/Podfile
  4. 0 1
      src/router/index.js
  5. 2 2
      src/version.json
  6. 17 4
      src/views/WalletPage.vue

+ 1 - 1
android/app/build.gradle

@@ -6,7 +6,7 @@ android {
         applicationId "com.bigauction.mobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 102
+        versionCode 100
         versionName "1.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {

BIN
android/app/src/main/assets/cdvasset.manifest


+ 1 - 1
ios/App/Podfile

@@ -31,7 +31,7 @@ def capacitor_pods
   pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
   pod 'AppsflyerCapacitorPlugin', :path => '../../node_modules/appsflyer-capacitor-plugin'
   pod 'CapacitorCodepush', :path => '../../node_modules/capacitor-codepush'
-  pod 'CapacitorFacebook', :path => '../../../../capacitor/capacitor-facebook'
+  pod 'CapacitorFacebook', :path => '../../node_modules/capacitor-facebook'
   pod 'CapacitorPluginSafeArea', :path => '../../node_modules/capacitor-plugin-safe-area'
   pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
 end

+ 0 - 1
src/router/index.js

@@ -249,7 +249,6 @@ const router = createRouter({
 })
 router.beforeEach(async (to, from, next) => {
     const { user, get: getUser } = useUserStore()
-    console.log(to.meta.allowGuest, user)
     if (!to.meta.allowGuest && !user) {
         try {
             await getUser()

+ 2 - 2
src/version.json

@@ -1,12 +1,12 @@
 {
     "ios": {
         "version": "1.0.0",
-        "build": 102
+        "build": 100
     },
     "android": {
         "version": "1.0.0",
         "build": 102,
         "versionCode": 12
     },
-    "www": 1087
+    "www": 1085
 }

+ 17 - 4
src/views/WalletPage.vue

@@ -39,7 +39,7 @@
                         <span class="sym">{{ $t('balance.symbol') }}</span>
                         {{ item }}
                     </div>
-                    <div class="input-wrapper">
+                    <!-- <div class="input-wrapper">
                         <span class="sym">{{ $t('balance.symbol') }}</span>
                         <ion-input
                             color="dark"
@@ -52,7 +52,7 @@
                             :min="50"
                             :max="100000"
                         ></ion-input>
-                    </div>
+                    </div> -->
                 </div>
             </div>
         </ion-content>
@@ -95,6 +95,8 @@
                             inputmode="decimal"
                             :size="36"
                             clearInput
+                            @ionBlur="formatAmount"
+                            autofocus
                         ></ion-input>
                     </div>
                     <div class="item">
@@ -140,7 +142,7 @@ export default {
             },
             showRecharge: false,
             rechargeAmount: 100,
-            amountOptions: [100, 200, 300, 600, 800, 1000],
+            amountOptions: [50, 100, 200, 500, 1000, 2000, 3000, 5000, 10000],
             customAmount: null,
             showWithdrawModal: false,
             withdrawAmount: null,
@@ -247,7 +249,18 @@ export default {
                     this.$toast.error(e.error)
                 })
         },
+        formatAmount() {
+            console.log('formatAmount', this.withdrawAmount)
+            if (this.withdrawAmount && Number(this.withdrawAmount)) {
+                let amount = Math.floor(this.withdrawAmount / 100) * 100
+                if (amount === 100) {
+                    amount = 120
+                }
+                this.withdrawAmount = amount
+            }
+        },
         withdraw() {
+            this.formatAmount()
             const amount = Number(this.withdrawAmount)
             if (!amount || this.withdrawAmount <= 0 || this.withdrawAmount > this.balance.balance) {
                 this.$toast.error(this.$t('balance.withdrawAmountError'))
@@ -399,7 +412,7 @@ export default {
                 line-height: 40px;
                 margin-bottom: 16px;
                 border-radius: 2px;
-                font-size: 26px;
+                font-size: 24px;
                 .f();
                 justify-content: center;
                 align-items: baseline;