před 2 roky · 13396dbe08
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -17,5 +17,5 @@ module.exports = {
 
															         tidioChatApi: true,
														
 
															         $: true
														
 
															     },
														
 
															-    ignorePatterns: ['index.html']
														
 
															+    ignorePatterns: ['index.html', 'public/error.html']
														
 
															 }
														
--- a/android/app/src/main/assets/cdvasset.manifest
+++ b/android/app/src/main/assets/cdvasset.manifest
--- a/android/capacitor.settings.gradle
+++ b/android/capacitor.settings.gradle
@@ -60,4 +60,4 @@ include ':capacitor-codepush'
 
															 project(':capacitor-codepush').projectDir = new File('../node_modules/capacitor-codepush/android')
														
 
															 include ':capacitor-facebook'
														
 
															-project(':capacitor-facebook').projectDir = new File('../node_modules/capacitor-facebook/android')
														
 
															+project(':capacitor-facebook').projectDir = new File('../../../capacitor/capacitor-facebook/android')
														
--- a/capacitor.config.json
+++ b/capacitor.config.json
@@ -2,7 +2,9 @@
 
															     "appId": "com.bigauction.mobile",
														
 
															     "appName": "FirstCash",
														
 
															     "webDir": "dist",
														
 
															-    "bundledWebRuntime": false,
														
 
															+    "bundledWebRuntime": true,
														
 
															+    "backgroundColor": "#1C1C1C",
														
 
															+    "errorPath": "error.html",
														
 
															     "android": {
														
 
															         "buildOptions": {
														
 
															             "keystorePath": "../zouma.jks",
														
@@ -13,6 +15,9 @@
 
															         },
														
 
															         "releaseType": "APK"
														
 
															     },
														
 
															+    "ios": {
														
 
															+        "allowsLinkPreview": false
														
 
															+    },
														
 
															     "plugins": {
														
 
															         "SplashScreen": {
														
 
															             "launchAutoHide": false
														
@@ -22,9 +27,5 @@
 
															             "ANDROID_DEPLOY_KEY": "ZrEsHcngd89oYtHZYQxLRUSMJ8trafzoNUVDN",
														
 
															             "SERVER_URL": "https://codepush.appcenter.ms/"
														
 
															         }
														
 
															-    },
														
 
															-    "server": {
														
 
															-        "url": "http://192.168.6.215:5173/h5/",
														
 
															-        "clearText": true
														
 
															     }
														
 
															 }
														
--- a/ios/App/Podfile
+++ b/ios/App/Podfile
@@ -30,7 +30,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 => '../../node_modules/capacitor-facebook'
														
 
															+  pod 'CapacitorFacebook', :path => '../../../../capacitor/capacitor-facebook'
														
 
															 end
														
 
															 target 'App' do
														
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
 
															     "appsflyer-capacitor-plugin": "^6.9.2",
														
 
															     "axios": "^1.2.0",
														
 
															     "capacitor-codepush": "https://github.com/x1ongzhu/capacitor-codepush.git",
														
 
															-    "capacitor-facebook": "https://github.com/x1ongzhu/capacitor-facebook.git",
														
 
															+    "capacitor-facebook": "link:/Users/drew/Projects/capacitor/capacitor-facebook",
														
 
															     "cordova-plugin-android-notch": "^1.0.3",
														
 
															     "date-fns": "^2.29.3",
														
 
															     "eruda": "^2.6.1",
														
--- a/public/error.html
+++ b/public/error.html
@@ -0,0 +1,17 @@
 
															+<!DOCTYPE html>
														
 
															+<html lang="en">
														
 
															+
														
 
															+<head>
														
 
															+    <meta charset="UTF-8">
														
 
															+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
														
 
															+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
														
 
															+    <title>ERROR</title>
														
 
															+    <script src="capacitor.js"></script>
														
 
															+</head>
														
 
															+
														
 
															+<body>
														
 
															+    <h3>Please Upgrade Android System WebView</h3>
														
 
															+    <h4>Your Webview version is not longger supported</h4>
														
 
															+</body>
														
 
															+
														
 
															+</html>
														
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,7 +25,6 @@ const ionRouter = useIonRouter()
 
															 const route = useRoute()
														
 
															 const promptLogin = async () => {
														
 
															-    console.log('onpromptLogin')
														
 
															     const confirm = await showConfirmDialog({
														
 
															         title: t('common.alert'),
														
 
															         message: t('user.notLogin')
														
--- a/src/main.js
+++ b/src/main.js
@@ -151,7 +151,7 @@ document.addEventListener('deviceready', () => {
 
															             codePush
														
 
															                 .sync(
														
 
															                     {
														
 
															-                        updateDialog: true,
														
 
															+                        updateDialog: false,
														
 
															                         installMode: InstallMode.IMMEDIATE,
														
 
															                         ignoreFailedUpdates: false
														
 
															                     },
														
@@ -181,11 +181,10 @@ document.addEventListener('deviceready', () => {
 
															         })
														
 
															     }
														
 
															 })
														
 
															-Facebook.init({ appId: '683776590201632' }).then(() => {
														
 
															-    console.log('Facebook init success')
														
 
															+Facebook.init({ appId: '683776590201632', pixelId: '557748303040652' }).then(() => {
														
 
															+    console.log('FacebookSDK initialized')
														
 
															 })
														
 
															 if (useStorage('showConsole', 0).value > new Date().getTime()) {
														
 
															     initEruda()
														
 
															 }
														
 
															-console.log(8)
														
--- a/src/views/SettingPage.vue
+++ b/src/views/SettingPage.vue
@@ -66,12 +66,7 @@
 
															                 <van-cell-group inset>
														
 
															                     <van-cell :title="$t('mine.bindPhone')" class="not" :value="(user || {}).phone"> </van-cell>
														
 
															                     <!-- <van-cell title="修改密码" is-link></van-cell> -->
														
 
															-                    <van-cell
														
 
															-                        class="not"
														
 
															-                        :title="`${$t('mine.user')}ID`"
														
 
															-                        :value="(user || {}).id"
														
 
															-                        @click="showConsoleEve"
														
 
															-                    />
														
 
															+                    <van-cell class="not" :title="`${$t('mine.user')}ID`" :value="(user || {}).id" />
														
 
															                 </van-cell-group>
														
 
															                 <!-- <van-cell-group :border="false">
														
--- a/yarn.lock
+++ b/yarn.lock
@@ -2079,9 +2079,9 @@ caniuse-lite@^1.0.30001400:
 
															   dependencies:
														
 
															     code-push "^4.0.2"
														
 
															-"capacitor-facebook@https://github.com/x1ongzhu/capacitor-facebook.git":
														
 
															-  version "0.0.1"
														
 
															-  resolved "https://github.com/x1ongzhu/capacitor-facebook.git#607b440cf855ac95b69e0b8793072c0b389771f6"
														
 
															+"capacitor-facebook@link:/Users/drew/Projects/capacitor/capacitor-facebook":
														
 
															+  version "0.0.0"
														
 
															+  uid ""
														
 
															 caw@^2.0.0, caw@^2.0.1:
														
 
															   version "2.0.1"