Merge branch 'master' of http://git.izouma.com/panhui/raex_saas into dev

src/main.js

@@ -118,9 +118,7 @@ if (query.code) {
         // document.location.replace(location.origin + '/wx/redirect?redirectUrl=' + location.href);
     }
 }
-if (query.companyId || sessionStorage.getItem('companyId')) {
-    store.dispatch('getCompanyInfo', query.companyId || sessionStorage.getItem('companyId'));
-}
+
 store.dispatch('getTime');
 if (location.pathname === '/hall') {
     if (query.id) {
@@ -184,7 +182,10 @@ const loadSplash = (onload, onerror) =>
         setTimeout(() => {
             hideSplash();
         }, 5000);
-        splash.src = 'https://cdn.raex.vip/image/2022-09-26-17-27-00KbwDKZBu.png';
+        if (store.state.companyInfo.bgColor) {
+            splash.src = store.state.companyInfo.bgColor;
+        }
+
         document.body.append(splash);
     });
 if (navigator.userAgent.includes('#review#')) {
@@ -342,9 +343,21 @@ if (navigator.userAgent.includes('#cordova#')) {
         false
     );
 } else {
-    loadSplash().then(res => {
+    if (query.companyId || sessionStorage.getItem('companyId')) {
+        store.dispatch('getCompanyInfo', query.companyId || sessionStorage.getItem('companyId')).then(res => {
+            if (store.state.companyInfo.bgColor) {
+                loadSplash().then(res => {
+                    window.$vm = app.mount('#app');
+                    calcSafeArea();
+                });
+                calcSafeArea();
+            } else {
+                window.$vm = app.mount('#app');
+                calcSafeArea();
+            }
+        });
+    } else {
         window.$vm = app.mount('#app');
         calcSafeArea();
-    });
-    calcSafeArea();
+    }
 }

src/store/index.js

@@ -98,6 +98,7 @@ export default createStore({
                 context.commit('setTheme', res.theme);
                 context.commit('setCompanyInfo', res);
                 document.title = res.name;
+                return Promise.resolve(res);
             });
         },
         getUserInfo(context, refresh) {

src/views/Mine.vue

@@ -119,21 +119,16 @@
                 <img src="@assets/info_icon_yishuping.png" alt="" />
                 <span>我的订单</span>
             </div>
-            <div class="order-info" @click="$router.push('/' + $route.params.companyId + '/activityOrders')">
-                <img src="@assets/info_icon_zhuzaodingdan.png" alt="" />
-                <span>铸造订单</span>
-            </div>
             <div class="order-info" @click="$router.push('/' + $route.params.companyId + '/mineWallet')">
                 <img src="@assets/icon_qianbao.png" alt="" />
                 <span>我的钱包</span>
             </div>
+            <div class="order-info" @click="wait">
+                <img src="@assets/icon-jifen.png" alt="" />
+                <span>我的积分</span>
+            </div>
         </div>
         <van-cell-group class="menus" :border="false">
-            <van-cell title="我的积分" @click="wait" is-link>
-                <template #icon>
-                    <van-icon :name="require('@assets/icon-jifen.png')" class="search-icon" />
-                </template>
-            </van-cell>
             <van-cell title="我喜欢的" :to="{ path: '/' + $route.params.companyId + '/mineLikes' }" is-link>
                 <template #icon>
                     <van-icon :name="require('@assets/icon-woxihuande.png')" class="search-icon" />

src/views/account/Login.vue

@@ -3,7 +3,7 @@
         class="login"
         :class="{ loginHeight: bar && bar.show }"
         :style="{
-            backgroundImage: `url(${companyInfo.bgImg || 'https://cdn.raex.vip/image/2022-09-26-17-25-55tpfNbWbJ.png'})`
+            backgroundImage: `url(${companyInfo.bgImg || 'https://cdn.raex.vip/image/2022-10-27-10-06-29FNwkoxWc.png'})`
         }"
     >
         <!-- <img class="logo" v-if="active === 'phone'" src="../../assets/lvzhopu-logo.png" alt="" />

src/views/account/Register.vue

@@ -2,7 +2,9 @@
     <div
         class="login"
         :class="{ loginHeight: bar && bar.show }"
-        :style="{ backgroundImage: `url(https://cdn.raex.vip/image/2022-09-26-17-25-55tpfNbWbJ.png)` }"
+        :style="{
+            backgroundImage: `url(${companyInfo.bgImg || 'https://cdn.raex.vip/image/2022-10-27-10-06-29FNwkoxWc.png'})`
+        }"
     >
         <!-- <img class="logo" src="../../assets/lvzhopu-logo.png" alt="" /> -->
         <div class="tabs">
@@ -137,6 +139,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
 import phone from '../../mixins/phone';
 let fromRoute = null;
 export default {
@@ -159,6 +162,9 @@ export default {
             codeImg: ''
         };
     },
+    computed: {
+        ...mapState(['companyInfo'])
+    },
     beforeRouteEnter(to, from) {
         fromRoute = from;
         console.log(to, from);

src/views/product/HopeMarket.vue

@@ -24,7 +24,7 @@
                 >{{ salable ? '在售中' : salable === false ? '仅展示' : '综合排序' }}</van-button
             > -->
         </div>
-        <div
+        <!-- <div
             class="swiper"
             @click="
                 $router.push({
@@ -33,7 +33,7 @@
             "
         >
             <img src="@assets/zhuzao.png" alt="" />
-        </div>
+        </div> -->
 
         <van-sticky :offset-top="50">
             <div class="classification_selection">