xiongzhu 3 жил өмнө
parent
commit
16547757aa
4 өөрчлөгдсөн 69 нэмэгдсэн , 35 устгасан
  1. 1 1
      config.xml
  2. 37 3
      package-lock.json
  3. 19 31
      www/index.html
  4. 12 0
      yarn.lock

+ 1 - 1
config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="vip.raex.nft" version="1.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" ios-CFBundleIdentifier="vip.raex.meta" ios-CFBundleVersion="141" android-versionCode="1161">
+<widget id="vip.raex.nft" version="1.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" ios-CFBundleIdentifier="vip.raex.meta" ios-CFBundleVersion="142" android-versionCode="1161">
 	<name>RAEX宇宙</name>
 	<description>
         A sample Apache Cordova application that responds to the deviceready event.

+ 37 - 3
package-lock.json

@@ -32,6 +32,7 @@
         "cordova-plugin-remote-injection": "git+https://github.com/x1ongzhu/cordova-plugin-remote-injection.git",
         "cordova-plugin-splashscreen": "^6.0.0",
         "cordova-plugin-statusbar": "^3.0.0",
+        "cordova-plugin-wechat": "^3.0.0",
         "cordova-plugin-whitelist": "^1.3.5",
         "cordova-plugin-wkwebview-engine": "^1.2.2",
         "cordova-plugin-x-socialsharing": "^6.0.3",
@@ -750,6 +751,39 @@
         }
       }
     },
+    "node_modules/cordova-plugin-wechat": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/cordova-plugin-wechat/-/cordova-plugin-wechat-3.0.0.tgz",
+      "integrity": "sha512-GZtQOaQAURvbi9rJU2HbQI9tHUhS4/i2TiH4R9k12jLY6rTJ4VmhSgEO3xAGBKlVn9bXofYnKZBWXtU3GvFP7A==",
+      "dev": true,
+      "dependencies": {
+        "shelljs": "^0.5.3"
+      },
+      "engines": {
+        "cordovaDependencies": {
+          "<2.0.0": {
+            "cordova": ">=3.5.0"
+          },
+          "2.0.0": {
+            "cordova": ">=6.1.0",
+            "cordova-android": ">=6.1.0",
+            "cordova-ios": ">=4.3.1"
+          }
+        }
+      }
+    },
+    "node_modules/cordova-plugin-wechat/node_modules/shelljs": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmmirror.com/shelljs/-/shelljs-0.5.3.tgz",
+      "integrity": "sha512-C2FisSSW8S6TIYHHiMHN0NqzdjWfTekdMpA2FJTbRWnQMLO1RRIXEB9eVZYOlofYmjZA7fY3ChoFu09MeI3wlQ==",
+      "dev": true,
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/cordova-plugin-whitelist": {
       "version": "1.3.5",
       "resolved": "https://registry.nlark.com/cordova-plugin-whitelist/download/cordova-plugin-whitelist-1.3.5.tgz",
@@ -4174,9 +4208,9 @@
       "integrity": "sha1-RXSirlb3qyBolvtDHq7tBm/fjwM="
     },
     "is-core-module": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.8.1.tgz",
-      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.9.0.tgz",
+      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"

+ 19 - 31
www/index.html

@@ -16,43 +16,31 @@
         if (flag === '1') {
             console.log('set flag 1');
             localStorage.setItem('flag', flag);
-            location.href = 'http://192.168.6.116:8082/';
+            location.href = 'https://www.raex.vip';
         }
 
-        var version = '1.0.2';
-        var iosCFBundleVersion = '145';
-        var androidVersionCode = '1145';
+        var version = '1.0.1';
+        var iosCFBundleVersion = '141';
+        var androidVersionCode = '1161';
         document.addEventListener('deviceready', function () {
-            if (/iphone|ipod|ipad|Macintosh/i.test(navigator.userAgent)) {
-                axios.get('http://192.168.6.116:8082//appVersion/getVersion?version=' + version + '&platform=' + cordova.platformId)
-                    .then(function (res) {
-                        if (res.data.review) {
-                            if ('ios' === cordova.platformId) {
-                                location.href = 'https://ios.raex.vip?review=true';
-                            } else {
-                                location.href = 'http://192.168.6.116:8082/?review=true';
-                            }
+            axios.get('https://www.raex.vip/appVersion/getVersion?version=' + version + '&platform=' + cordova.platformId)
+                .then(function (res) {
+                    if (res.data.review) {
+                        if ('ios' === cordova.platformId) {
+                            location.href = 'https://ios.raex.vip?review=true';
                         } else {
-                            location.href = 'http://192.168.6.116:8082/';
+                            location.href = 'https://www.raex.vip?review=true';
                         }
-                    })
-                    .catch(function (e) {
-                        location.href = 'http://192.168.6.116:8082/';
-                    });
-            } else {
-                axios.get('https://www.raex.vip/appVersion/checkAndroidReview?version=' + version)
-                    .then(function (res) {
-                        if (res.data.review) {
-                            location.href = 'https://www.raex.vip/9th/?review=true';
-                        } else {
-                            location.href = 'https://www.raex.vip';
-                        }
-                    })
-                    .catch(function (e) {
+                    } else {
                         location.href = 'https://www.raex.vip';
-                    });
-            }
-        })
+                    }
+                })
+                .catch(function (e) {
+                    location.href = 'https://www.raex.vip';
+                });
+        });
+
     </script>
 </body>
+
 </html>

+ 12 - 0
yarn.lock

@@ -408,6 +408,13 @@
   "resolved" "https://registry.npmmirror.com/cordova-plugin-statusbar/download/cordova-plugin-statusbar-3.0.0.tgz"
   "version" "3.0.0"
 
+"cordova-plugin-wechat@^3.0.0":
+  "integrity" "sha512-GZtQOaQAURvbi9rJU2HbQI9tHUhS4/i2TiH4R9k12jLY6rTJ4VmhSgEO3xAGBKlVn9bXofYnKZBWXtU3GvFP7A=="
+  "resolved" "https://registry.npmmirror.com/cordova-plugin-wechat/-/cordova-plugin-wechat-3.0.0.tgz"
+  "version" "3.0.0"
+  dependencies:
+    "shelljs" "^0.5.3"
+
 "cordova-plugin-whitelist@^1.3.5":
   "integrity" "sha1-E+GmA28clyE1rUjO3u3Yl7qt95c="
   "resolved" "https://registry.nlark.com/cordova-plugin-whitelist/download/cordova-plugin-whitelist-1.3.5.tgz"
@@ -1524,6 +1531,11 @@
   "resolved" "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz?cache=0&sync_timestamp=1628896304371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fshebang-regex%2Fdownload%2Fshebang-regex-3.0.0.tgz"
   "version" "3.0.0"
 
+"shelljs@^0.5.3":
+  "integrity" "sha512-C2FisSSW8S6TIYHHiMHN0NqzdjWfTekdMpA2FJTbRWnQMLO1RRIXEB9eVZYOlofYmjZA7fY3ChoFu09MeI3wlQ=="
+  "resolved" "https://registry.npmmirror.com/shelljs/-/shelljs-0.5.3.tgz"
+  "version" "0.5.3"
+
 "shelljs@^0.8.5":
   "integrity" "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow=="
   "resolved" "https://registry.npmmirror.com/shelljs/-/shelljs-0.8.5.tgz"