xiongzhu %!s(int64=4) %!d(string=hai) anos
pai
achega
7d5dc27cc7
Modificáronse 5 ficheiros con 121 adicións e 84 borrados
  1. 4 1
      .eslintrc.js
  2. 108 78
      src/main.js
  3. 5 1
      src/store/index.js
  4. 2 2
      src/views/Discover.vue
  5. 2 2
      src/views/Mine.vue

+ 4 - 1
.eslintrc.js

@@ -5,7 +5,10 @@ module.exports = {
     },
     extends: ['plugin:vue/vue3-essential', 'eslint:recommended', '@vue/prettier'],
     parserOptions: {
-        parser: 'babel-eslint'
+        parser: 'babel-eslint',
+        ecmaFeatures: {
+            globalReturn: true
+        }
     },
     rules: {
         'no-console': 'off',

+ 108 - 78
src/main.js

@@ -67,96 +67,126 @@ if (navigator.userAgent.includes('#cordova#')) {
     document.addEventListener(
         'deviceready',
         function () {
-            window.$vm = app.mount('#app');
-            StatusBar.overlaysWebView(false);
-            StatusBar.hide();
-            setTimeout(() => {
-                navigator.splashscreen.hide();
-                StatusBar.show();
-                StatusBar.backgroundColorByHexString('#F5F7FA');
-                StatusBar.styleDefault();
-            }, 2000);
+            http.http.get(`/appVersion/checkIosReview?version=${navigator.appInfo.version}`).then(res => {
+                store.commit('setReview', res.review);
+                if (res.review) {
+                    if (location.host !== 'test.raex.vip') {
+                        // location.href = 'https://test.raex.vip';
+                        // return;
+                    }
+                }
+                window.$vm = app.mount('#app');
+                StatusBar.overlaysWebView(false);
+                StatusBar.hide();
+                setTimeout(() => {
+                    navigator.splashscreen.hide();
+                    StatusBar.show();
+                    StatusBar.backgroundColorByHexString('#F5F7FA');
+                    StatusBar.styleDefault();
+                }, 2000);
 
-            if (/iphone|ipad|ipod/i.test(navigator.userAgent)) {
-                style.setProperty('--safe-top', 'env(safe-area-inset-top)');
-                style.setProperty('--safe-bottom', 'env(safe-area-inset-bottom)');
-                style.setProperty('--safe-left', 'env(safe-area-inset-left)');
-                style.setProperty('--safe-right', 'env(safe-area-inset-right)');
-            } else {
-                if (window.AndroidNotch) {
-                    window.AndroidNotch.getInsetTop(
-                        px => {
-                            style.setProperty('--safe-top', px + 'px');
-                        },
-                        err => console.error('Failed to get insets top:', err)
-                    );
+                if (/iphone|ipad|ipod/i.test(navigator.userAgent)) {
+                    style.setProperty('--safe-top', 'env(safe-area-inset-top)');
+                    style.setProperty('--safe-bottom', 'env(safe-area-inset-bottom)');
+                    style.setProperty('--safe-left', 'env(safe-area-inset-left)');
+                    style.setProperty('--safe-right', 'env(safe-area-inset-right)');
+                } else {
+                    if (window.AndroidNotch) {
+                        window.AndroidNotch.getInsetTop(
+                            px => {
+                                style.setProperty('--safe-top', px + 'px');
+                            },
+                            err => console.error('Failed to get insets top:', err)
+                        );
 
-                    window.AndroidNotch.getInsetRight(
-                        px => {
-                            style.setProperty('--safe-right', px + 'px');
-                        },
-                        err => console.error('Failed to get insets right:', err)
-                    );
+                        window.AndroidNotch.getInsetRight(
+                            px => {
+                                style.setProperty('--safe-right', px + 'px');
+                            },
+                            err => console.error('Failed to get insets right:', err)
+                        );
 
-                    window.AndroidNotch.getInsetBottom(
-                        px => {
-                            style.setProperty('--safe-bottom', px + 'px');
-                        },
-                        err => console.error('Failed to get insets bottom:', err)
-                    );
+                        window.AndroidNotch.getInsetBottom(
+                            px => {
+                                style.setProperty('--safe-bottom', px + 'px');
+                            },
+                            err => console.error('Failed to get insets bottom:', err)
+                        );
 
-                    window.AndroidNotch.getInsetLeft(
-                        px => {
-                            style.setProperty('--safe-left', px + 'px');
-                        },
-                        err => console.error('Failed to get insets left:', err)
-                    );
+                        window.AndroidNotch.getInsetLeft(
+                            px => {
+                                style.setProperty('--safe-left', px + 'px');
+                            },
+                            err => console.error('Failed to get insets left:', err)
+                        );
+                    }
                 }
-            }
 
-            let t = 0;
-            document.addEventListener(
-                'backbutton',
-                e => {
-                    if (window.$vm.$route.matched.find(i => i.name === 'index')) {
-                        e.preventDefault();
-                        let t1 = new Date().getTime();
-                        console.log(t1 - t);
-                        if (t1 - t < 1000) {
-                            navigator.app.exitApp();
+                let t = 0;
+                document.addEventListener(
+                    'backbutton',
+                    e => {
+                        if (window.$vm.$route.matched.find(i => i.name === 'index')) {
+                            e.preventDefault();
+                            let t1 = new Date().getTime();
+                            console.log(t1 - t);
+                            if (t1 - t < 1000) {
+                                navigator.app.exitApp();
+                            } else {
+                                t = t1;
+                                window.$vm.$toast('再按一次退出');
+                            }
                         } else {
-                            t = t1;
-                            window.$vm.$toast('再按一次退出');
+                            window.$vm.$router.go(-1);
                         }
-                    } else {
-                        window.$vm.$router.go(-1);
-                    }
-                },
-                false
-            );
+                    },
+                    false
+                );
 
-            if (
-                !(
-                    location.host === 'www.raex.vip' ||
-                    location.host === 'test.raex.vip' ||
-                    /^http:\/\/192\.168\.\d{1,3}\.\d{1,3}((:\d+)?)$/.test(location.host)
-                )
-            ) {
-                if (!/iphone|ipad|ipod/i.test(navigator.userAgent)) {
-                    window.$vm.$dialog.alert({
-                        message: '检测到新版本,请下载更新',
-                        confirmButtonText: '下载更新',
-                        beforeClose(action, done) {
-                            console.log(action);
-                            if (/iphone|ipad|ipod/.test(navigator.userAgent)) {
-                                //location.href = 'https://apps.apple.com/cn/app/id1598469798';
-                            } else {
-                                location.href = 'http://download.raex.vip';
+                if (
+                    !(
+                        location.host === 'www.raex.vip' ||
+                        location.host === 'test.raex.vip' ||
+                        /^http:\/\/192\.168\.\d{1,3}\.\d{1,3}((:\d+)?)$/.test(location.host)
+                    )
+                ) {
+                    if (!/iphone|ipad|ipod/i.test(navigator.userAgent)) {
+                        window.$vm.$dialog.alert({
+                            message: '检测到新版本,请下载更新',
+                            confirmButtonText: '下载更新',
+                            beforeClose(action, done) {
+                                console.log(action);
+                                if (/iphone|ipad|ipod/.test(navigator.userAgent)) {
+                                    //location.href = 'https://apps.apple.com/cn/app/id1598469798';
+                                } else {
+                                    location.href = 'http://download.raex.vip';
+                                }
                             }
-                        }
+                        });
+                    }
+                }
+
+                if (window.store && /iphone|ipad|ipod/i.test(navigator.userAgent)) {
+                    window.store.register({
+                        id: '358',
+                        alias: 'my_consumable1',
+                        type: window.store.CONSUMABLE
+                    });
+
+                    window.store.error(function (error) {
+                        console.log('ERROR ' + error.code + ': ' + error.message);
                     });
+                    window.store
+                        .when('358')
+                        .updated(res => {
+                            console.log(res, 'updated');
+                        })
+                        .approved(p => {
+                            console.log('approved', res);
+                        });
+                    window.store.refresh();
                 }
-            }
+            });
         },
         false
     );

+ 5 - 1
src/store/index.js

@@ -7,7 +7,8 @@ export default createStore({
         userInfo: null,
         firstUrl: '',
         couponInfo: null,
-        invitor: null
+        invitor: null,
+        review: false
     },
     mutations: {
         setFinished(state, finished) {
@@ -24,6 +25,9 @@ export default createStore({
         },
         setInvitor(state, invitor) {
             state.invitor = invitor;
+        },
+        setReview(state, review) {
+            state.review = review;
         }
     },
     actions: {

+ 2 - 2
src/views/Discover.vue

@@ -17,7 +17,7 @@
             </swiper-slide>
         </swiper>
 
-        <van-grid :border="false" column-num="5">
+        <van-grid :border="false" :column-num="$store.state.review ? 4 : 5">
             <van-grid-item text="精选推荐" :to="{ path: '/productList' }">
                 <template v-slot:icon>
                     <img class="grid-img" src="@assets/info_icon_jingxuanxilie.png" />
@@ -33,7 +33,7 @@
                     <img class="grid-img" src="@assets/info_icon_zhuzaozhe.png" />
                 </template>
             </van-grid-item>
-            <van-grid-item text="拍卖系列" @click="wait">
+            <van-grid-item text="拍卖系列" @click="wait" v-if="!$store.state.review">
                 <template v-slot:icon>
                     <img class="grid-img" src="@assets/info_icon_paimaixilie.png" />
                 </template>

+ 2 - 2
src/views/Mine.vue

@@ -120,7 +120,7 @@
                     <van-icon :name="require('@assets/icon_yinhangka.png')" class="search-icon" />
                 </template>
             </van-grid-item>
-            <van-grid-item text="我的积分" @click="wait">
+            <van-grid-item text="我的积分" @click="wait" v-if="!$store.state.review">
                 <template #icon>
                     <van-icon :name="require('@assets/icon-jifen.png')" class="search-icon" />
                 </template>
@@ -130,7 +130,7 @@
                     <van-icon :name="require('@assets/icon-dianzan1.png')" class="search-icon" />
                 </template>
             </van-grid-item>
-            <van-grid-item text="地址管理" @click="wait">
+            <van-grid-item text="地址管理" @click="wait" v-if="!$store.state.review">
                 <template #icon>
                     <van-icon :name="require('@assets/icon_dizhi.png')" class="search-icon" />
                 </template>