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

src/components/order/OrderInfo.vue

@@ -132,7 +132,7 @@ export default {
     }
 
     .status {
-        color: var(--prim);
+        color: var(--primlight);
     }
 }
 
@@ -176,7 +176,7 @@ export default {
     .flex();
     span {
         &:last-child {
-            color: var(--prim);
+            color: var(--primlight);
             margin-left: 10px;
             font-size: 16px;
         }

src/components/product/productInfo.vue

@@ -154,7 +154,7 @@ export default {
         .price {
             font-size: @font4;
             font-family: OSP;
-            color: var(--prim);
+            color: var(--primlight);
             line-height: 18px;
             padding: 12px 0;
             .flex();
@@ -284,4 +284,10 @@ export default {
     background-color: fade(#000, 80%);
     padding: 0 10px;
 }
+
+.dark {
+    .price {
+        color: var(--prim);
+    }
+}
 </style>

src/main.js

@@ -118,8 +118,8 @@ if (query.code) {
         // document.location.replace(location.origin + '/wx/redirect?redirectUrl=' + location.href);
     }
 }
-if (query.companyId) {
-    store.dispatch('getCompanyInfo', query.companyId);
+if (query.companyId || sessionStorage.getItem('companyId')) {
+    store.dispatch('getCompanyInfo', query.companyId || sessionStorage.getItem('companyId'));
 }
 store.dispatch('getTime');
 if (location.pathname === '/hall') {

src/store/index.js

@@ -89,6 +89,7 @@ export default createStore({
     actions: {
         getCompanyInfo(context, companyId) {
             context.commit('setCompanyId', companyId);
+            sessionStorage.setItem('companyId', companyId);
             return http.http.get('/company/get/' + companyId).then(res => {
                 context.commit('setTheme', res.theme);
             });

src/views/Submit.vue

@@ -54,7 +54,6 @@
             title="请输入支付密码"
             confirmButtonText="立即支付"
             show-cancel-button
-            confirmButtonColor="#3ab200"
             @cancel="(showPwdDialog = false), $toast.clear()"
             @confirm="pay"
         >

src/views/account/Message.vue

@@ -87,6 +87,9 @@ export default {
 <style lang="less" scoped>
 .page {
     background-color: @bg3;
+    --van-tab-active-text-color: var(--primlight);
+    --van-tabs-bottom-bar-color: var(--primlight);
+    --van-button-primary-background-color: var(--primlight);
 }
 
 /deep/.van-tab {

src/views/order/Detail.vue

@@ -189,7 +189,7 @@ export default {
     .text1 {
         font-size: 24px;
         font-weight: bold;
-        color: var(--prim);
+        color: var(--primlight);
         line-height: 34px;
     }
     .text2 {
@@ -253,7 +253,7 @@ export default {
         }
 
         &.prim {
-            color: var(--prim);
+            color: var(--primlight);
         }
     }
 }

src/views/order/Orders.vue

@@ -142,7 +142,7 @@ export default {
             vertical-align: text-bottom;
 
             &.active {
-                color: var(--prim);
+                color: var(--primlight);
                 font-size: @font3;
                 font-weight: bold;
                 line-height: 30px;
@@ -186,7 +186,7 @@ export default {
 
 .title {
     padding: 16px 20px 8px;
-    color: var(--prim);
+    color: var(--primlight);
     font-size: 18px;
     font-weight: bold;
 }
@@ -199,6 +199,8 @@ export default {
 
 .discover {
     padding-bottom: 50px;
+    --van-tab-active-text-color: var(--primlight);
+    --van-tabs-bottom-bar-color: var(--primlight);
 }
 .van-tabs {
     background-color: @bg;

src/views/product/Search.vue

@@ -403,6 +403,8 @@ export default {
 .search {
     background-color: @bg3;
     padding-bottom: 100px;
+    --van-tab-active-text-color: var(--primlight);
+    --van-tabs-bottom-bar-color: var(--primlight);
 }
 .top {
     background-color: @bg3;

src/views/user/Likes.vue

@@ -27,6 +27,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
 import ProductInfo from '../../components/product/productInfo.vue';
 export default {
     components: { ProductInfo },
@@ -53,6 +54,7 @@ export default {
         };
     },
     computed: {
+        ...mapState(['companyId']),
         showList() {
             return [...this.list]
                 .map((item, index) => {
@@ -76,7 +78,11 @@ export default {
                 forbidClick: true
             });
             this.empty = false;
-            this.$http.get('/collection/myLikes').then(res => {
+            let form = {};
+            if (this.companyId) {
+                form.companyId = this.companyId;
+            }
+            this.$http.get('/collection/myLikes', form).then(res => {
                 this.list = res;
                 this.empty = res.length === 0;
                 this.$toast.clear();
@@ -93,6 +99,8 @@ export default {
 .follow {
     background-color: @bg3;
     padding-bottom: 100px;
+    --van-tab-active-text-color: var(--primlight);
+    --van-tabs-bottom-bar-color: var(--primlight);
 }
 .list {
     padding: 8px;