Browse Source

绑卡限制

xiongzhu 2 năm trước cách đây
mục cha
commit
2c2c820230

+ 1 - 1
android/app/build.gradle

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

+ 2 - 2
ios/App/App.xcodeproj/project.pbxproj

@@ -352,7 +352,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 105;
+				CURRENT_PROJECT_VERSION = 106;
 				DEFINES_MODULE = NO;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_TEAM = 72P5Y6N578;
 				DEVELOPMENT_TEAM = 72P5Y6N578;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_FILE = App/Info.plist;
@@ -377,7 +377,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 105;
+				CURRENT_PROJECT_VERSION = 106;
 				DEFINES_MODULE = NO;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_TEAM = 72P5Y6N578;
 				DEVELOPMENT_TEAM = 72P5Y6N578;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_FILE = App/Info.plist;

+ 1 - 1
src/locales/en.json

@@ -39,7 +39,7 @@
         "addBankCard": "Add Bank Account",
         "addBankCard": "Add Bank Account",
         "bank": "Bank",
         "bank": "Bank",
         "deleteBankCard": "Delete Bank Account",
         "deleteBankCard": "Delete Bank Account",
-        "deletePrompt": "Are you sure you want to delete this bank account?",
+        "deletePrompt": "This account won't be able to added again until 7 days later, are you sure to delete it?",
         "deleteSuccess": "Bank account deleted successfully",
         "deleteSuccess": "Bank account deleted successfully",
         "editBankCard": "Edit Bank Account",
         "editBankCard": "Edit Bank Account",
         "invalidAccount": "Invalid Account",
         "invalidAccount": "Invalid Account",

+ 1 - 1
src/locales/zh.json

@@ -39,7 +39,7 @@
         "addBankCard": "添加银行卡",
         "addBankCard": "添加银行卡",
         "bank": "银行",
         "bank": "银行",
         "deleteBankCard": "删除银行卡",
         "deleteBankCard": "删除银行卡",
-        "deletePrompt": "确定删除该银行卡吗?",
+        "deletePrompt": "此账号7天以内将无法被任何人添加,确定删除该银行卡吗?",
         "deleteSuccess": "删除成功",
         "deleteSuccess": "删除成功",
         "editBankCard": "编辑银行卡",
         "editBankCard": "编辑银行卡",
         "invalidBank": "无效的银行名称",
         "invalidBank": "无效的银行名称",

+ 3 - 3
src/version.json

@@ -1,12 +1,12 @@
 {
 {
     "ios": {
     "ios": {
         "version": "1.0.0",
         "version": "1.0.0",
-        "build": 105
+        "build": 106
     },
     },
     "android": {
     "android": {
         "version": "1.0.0",
         "version": "1.0.0",
-        "build": 103,
+        "build": 104,
         "versionCode": 12
         "versionCode": 12
     },
     },
-    "www": 1088
+    "www": 1089
 }
 }

+ 11 - 1
src/views/EditBankPage.vue

@@ -120,6 +120,16 @@ export default {
                 .filter(i => i.name.includes('Gcash'))
                 .filter(i => i.name.includes('Gcash'))
         }
         }
     },
     },
+    // created() {
+    //     this.formData = {
+    //         bankName: 'Gcash',
+    //         bankCode: 'gcash',
+    //         account: '09065504992',
+    //         name: 'xiong',
+    //         phone: '9065504992',
+    //         mail: 'xiongzhu1@gmail.com'
+    //     }
+    // },
     methods: {
     methods: {
         selectBank(item) {
         selectBank(item) {
             this.formData.bankName = item.name
             this.formData.bankName = item.name
@@ -163,7 +173,7 @@ export default {
                     this.$router.back()
                     this.$router.back()
                 })
                 })
                 .catch(e => {
                 .catch(e => {
-                    this.$toast.error(this.$t('common.saveFailed'))
+                    this.$toast.error(e.error || this.$t('common.saveFailed'))
                 })
                 })
         }
         }
     }
     }

+ 1 - 1
src/views/OrderDetailPage.vue

@@ -166,7 +166,7 @@ import { showDialog } from 'vant'
 import { create, all } from 'mathjs'
 import { create, all } from 'mathjs'
 import { AppsFlyer } from 'appsflyer-capacitor-plugin'
 import { AppsFlyer } from 'appsflyer-capacitor-plugin'
 import { Capacitor } from '@capacitor/core'
 import { Capacitor } from '@capacitor/core'
-import { ConfigProvider as VantConfigProvider, showConfirmDialog } from 'vant'
+import { showConfirmDialog } from 'vant'
 
 
 const math = create(all, {})
 const math = create(all, {})
 
 

+ 14 - 6
src/views/ProductDetailPage.vue

@@ -141,22 +141,19 @@
 </template>
 </template>
 
 
 <script setup>
 <script setup>
-import { Swiper, SwiperSlide } from 'swiper/vue'
-import 'swiper/swiper.min.css'
 import { ref, onMounted, computed } from 'vue'
 import { ref, onMounted, computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useRoute, useRouter } from 'vue-router'
 import { useWindowSize } from '@vueuse/core'
 import { useWindowSize } from '@vueuse/core'
 import toast from '@/utils/toast'
 import toast from '@/utils/toast'
 import { http } from '@/plugins/http'
 import { http } from '@/plugins/http'
 import { useI18n } from 'vue-i18n'
 import { useI18n } from 'vue-i18n'
-import { IonButton, alertController } from '@ionic/vue'
 import { useUserStore } from '@/stores/user'
 import { useUserStore } from '@/stores/user'
-import { mapState } from 'pinia'
 import { useSystemStore } from '../stores/system'
 import { useSystemStore } from '../stores/system'
 import { accAdd, accMul } from '../plugins/calc'
 import { accAdd, accMul } from '../plugins/calc'
 import ProductBanner from '../components/ProductBanner.vue'
 import ProductBanner from '../components/ProductBanner.vue'
 import ProductTitle from '../components/ProductTitle.vue'
 import ProductTitle from '../components/ProductTitle.vue'
 import { closeOutline } from 'ionicons/icons'
 import { closeOutline } from 'ionicons/icons'
+import { showConfirmDialog } from 'vant'
 
 
 const route = useRoute()
 const route = useRoute()
 const router = useRouter()
 const router = useRouter()
@@ -221,8 +218,19 @@ const pay = () => {
             })
             })
         })
         })
         .catch(e => {
         .catch(e => {
-            console.log(e)
-            toast.error(e.error)
+            if (e.code == -2) {
+                showConfirmDialog({
+                    title: this.$t('common.alert'),
+                    message: e.error,
+                    confirmButtonText: this.$t('balance.recharge')
+                })
+                    .then(() => {
+                        this.$router.push({ name: 'wallet' })
+                    })
+                    .catch(() => {})
+            } else {
+                toast.error(e.error)
+            }
         })
         })
 }
 }
 </script>
 </script>