等级

src/components/level/Level.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-overlay ref="overLay" :show="show" @click="close" z-index="99">
+    <van-overlay ref="overLay" :show="show" @click.stop="close" z-index="99">
         <div class="box" ref="box">
             <van-image width="260" height="220" :src="levelInfo.bg" fit="contain" />
             <div class="box-top">
@@ -27,7 +27,12 @@
             </div>
         </div>
     </van-overlay>
-    <div v-if="isLogin && !show && levelInfo.icon" ref="medal" class="medal-info" @click="$router.push('/mineLevel')">
+    <div
+        v-if="isLogin && !show && levelInfo.icon"
+        ref="medal"
+        class="medal-info"
+        @click.stop="$router.push('/mineLevel')"
+    >
         <div class="medal-icon">
             <van-image :src="levelInfo.icon" width="28" height="28" />
             <div class="text1" :style="{ color: levelInfo.color1 || levelInfo.color }">{{ levelInfo.level }}</div>

src/main.js

@@ -118,6 +118,9 @@ if (query.code) {
         // document.location.replace(location.origin + '/wx/redirect?redirectUrl=' + location.href);
     }
 }
+if (query.companyId) {
+    store.commit('setCompanyId', query.companyId);
+}
 store.dispatch('getTime');
 if (location.pathname === '/hall') {
     if (query.id) {

src/store/index.js

@@ -21,7 +21,8 @@ export default createStore({
         bankCard: null,
         showRoomId: null,
         platform: '',
-        theme: 'theme3'
+        theme: 'theme3',
+        companyId: ''
     },
     mutations: {
         setFinished(state, finished) {
@@ -77,6 +78,12 @@ export default createStore({
         },
         setPlatform(state, platform) {
             state.platform = platform;
+        },
+        setTheme(state, theme) {
+            state.theme = theme;
+        },
+        setCompanyId(state, companyId) {
+            state.companyId = companyId;
         }
     },
     actions: {

src/styles/common/common.less

@@ -127,7 +127,7 @@
 }
 
 .linear() {
-    background: linear-gradient(135deg, @prim, @warn);
+    background: var(--prim);
 }
 
 @keyframes flipY {

src/styles/font.less

@@ -24,10 +24,24 @@
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
 }
+.font_family-icon-phone:before {
+    content: '\e64b';
+    font-size: 20px;
+}
+
+.font_family-icon-weibiaoti--:before {
+    content: '\e616';
+    font-size: 20px;
+}
+
+.font_family-icon-yanzhengma:before {
+    content: '\e624';
+    font-size: 20px;
+}
 .font_family-icon-icon_gouxuan_pre:before {
-    content: "\e64a";
+    content: '\e64a';
     font-size: 24px;
-  }
+}
 
 .font_family-icon-tabbar_icon_02:before {
     content: '\e646';

src/views/Home.vue

@@ -112,7 +112,7 @@ export default {
         ProductSmall
     },
     computed: {
-        ...mapState(['userInfo', 'theme']),
+        ...mapState(['userInfo', 'theme', 'companyId']),
         isNewCollections() {
             let products = [...this.products];
             let flag = false;
@@ -284,7 +284,11 @@ export default {
             // this.getNews();
         },
         getProduct() {
-            return this.$http.get('/collection/recommend').then(res => {
+            let form = {};
+            if (this.companyId) {
+                form.companyId = this.companyId;
+            }
+            return this.$http.get('/collection/recommend', form).then(res => {
                 return Promise.resolve(res);
             });
         },
@@ -295,7 +299,8 @@ export default {
                     {
                         query: {
                             type: 'HOME',
-                            del: false
+                            del: false,
+                            companyId: this.companyId
                         },
                         sort: 'sort,asc;createdAt,desc'
                     },

src/views/Mine.vue

@@ -97,14 +97,6 @@
             </div>
         </div>
         <div class="userInfo" v-else>
-            <van-image
-                width="100%"
-                height="52vw"
-                :src="require('@assets/creatorBg.png')"
-                loading-icon=""
-                fit="cover"
-                class="top-img"
-            />
             <div class="userInfo-content">
                 <div class="userInfo-top" @click="$router.push('/login')">
                     <van-image

src/views/Store.vue

@@ -147,6 +147,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
 import AssetInfo from '../components/asset/assetInfo.vue';
 import AssetInfoSe from '../components/asset/assetInfoSe.vue';
 import ShowInfo from '../components/asset/showInfo.vue';
@@ -191,6 +192,7 @@ export default {
         };
     },
     computed: {
+        ...mapState(['companyId']),
         typeOptions() {
             if (this.active === 'explore') {
                 if (!this.$store.state.reviewPay) {
@@ -572,6 +574,10 @@ export default {
                 };
             }
 
+            if (this.companyId) {
+                form.companyId = this.companyId;
+            }
+
             return form;
         },
         changeActive(active) {

src/views/account/About.vue

@@ -113,6 +113,10 @@ export default {
 }
 .van-cell {
     padding: 23px 16px;
+
+    &:active {
+        background: #f5f7fa66;
+    }
 }
 .logout {
     padding: 50px 30px 50px;

src/views/account/Forget.vue

@@ -20,7 +20,8 @@
                 ]"
             >
                 <template #left-icon>
-                    <img :src="require('@assets/login_icon_zhanghao.png')" class="icon" />
+                    <van-icon class="icon" class-prefix="font_family" name="icon-phone" />
+                    <!-- <img :src="require('@assets/login_icon_zhanghao.png')" class="icon" /> -->
                 </template>
             </van-field>
 
@@ -33,7 +34,8 @@
                 :rules="[{ required: true, message: '请输入验证码' }]"
             >
                 <template #left-icon>
-                    <img :src="require('@assets/login_icon_mima (1).png')" class="icon" />
+                    <van-icon class="icon" class-prefix="font_family" name="icon-yanzhengma" />
+                    <!-- <img :src="require('@assets/login_icon_mima (1).png')" class="icon" /> -->
                 </template>
                 <template #button>
                     <van-button
@@ -57,7 +59,8 @@
                 :rules="[{ required: true, message: '请填写密码' }]"
             >
                 <template #left-icon>
-                    <img :src="require('@assets/login_icon_mima.png')" class="icon" />
+                    <van-icon class="icon" class-prefix="font_family" name="icon-weibiaoti--" />
+                    <!-- <img :src="require('@assets/login_icon_mima.png')" class="icon" /> -->
                 </template>
             </van-field>
 
@@ -81,19 +84,13 @@
                 ]"
             >
                 <template #left-icon>
-                    <img :src="require('@assets/login_icon_mima.png')" class="icon" />
+                    <van-icon class="icon" class-prefix="font_family" name="icon-weibiaoti--" />
+                    <!-- <img :src="require('@assets/login_icon_mima.png')" class="icon" /> -->
                 </template>
             </van-field>
 
             <div class="button">
-                <van-button
-                    round
-                    block
-                    native-type="submit"
-                    :color="`linear-gradient(to right, ${$colors.prim}, ${$colors.warn})`"
-                    class="sure"
-                    >确定修改</van-button
-                >
+                <van-button round block native-type="submit" type="primary" class="sure">确定修改</van-button>
                 <!-- <van-button
           class="del"
           round
@@ -179,6 +176,7 @@ export default {
     margin-top: 10px;
     width: 24px;
     height: 24px;
+    color: var(--prim);
 }
 /deep/ .van-form {
     margin-top: 28px;

src/views/account/Security.vue

@@ -61,6 +61,9 @@ export default {
 }
 .van-cell {
     padding: 23px 16px;
+    &:active {
+        background: #f5f7fa66;
+    }
 }
 .logout {
     padding: 50px 30px 50px;

src/views/account/TradingPassword.vue

@@ -16,7 +16,7 @@
                 :rules="[{ required: true, message: '请输入验证码' }]"
             >
                 <template #left-icon>
-                    <img :src="require('@assets/login_icon_mima (1).png')" class="icon" />
+                    <van-icon class="icon" class-prefix="font_family" name="icon-yanzhengma" />
                 </template>
                 <template #button>
                     <van-button
@@ -33,14 +33,7 @@
             </van-field>
 
             <div class="button">
-                <van-button
-                    round
-                    block
-                    native-type="submit"
-                    :color="`linear-gradient(to right, ${$colors.prim}, ${$colors.warn})`"
-                    class="sure"
-                    >下一步</van-button
-                >
+                <van-button round block native-type="submit" type="primary" class="sure">下一步</van-button>
             </div>
         </van-form>
 
@@ -74,14 +67,7 @@
             </div>
 
             <div class="button">
-                <van-button
-                    round
-                    block
-                    native-type="submit"
-                    :color="`linear-gradient(to right, ${$colors.prim}, ${$colors.warn})`"
-                    class="sure"
-                    >确定修改</van-button
-                >
+                <van-button round block native-type="submit" type="primary" class="sure">确定修改</van-button>
             </div>
         </van-form>
     </div>
@@ -202,6 +188,7 @@ export default {
     margin-top: 10px;
     width: 24px;
     height: 24pxx;
+    color: var(--prim);
 }
 /deep/ .van-form {
     margin-top: 28px;

src/views/creator/Detail.vue

@@ -69,7 +69,7 @@
                         <div class="text2">关注</div>
                     </div> -->
 
-                    <van-button
+                    <!-- <van-button
                         class="follow"
                         @click="follow"
                         plain
@@ -79,7 +79,7 @@
                         :class="{ followed: info.follow }"
                     >
                         {{ info.follow ? '已关注' : '关注' }}
-                    </van-button>
+                    </van-button> -->
                     <!-- <van-button
             plain
             @click="$router.push('/setting')"
@@ -521,7 +521,7 @@ export default {
         }
 
         .follow {
-            border: solid 1px @prim;
+            border: solid 1px var(--prim);
             &.followed {
                 color: @text3;
                 border-color: @text3;
@@ -627,7 +627,7 @@ export default {
         line-height: 24px;
         margin-right: 0px;
         &.active {
-            color: @prim;
+            color: var(--prim);
             font-weight: bold;
         }
     }
@@ -674,7 +674,7 @@ export default {
         &.van-checkbox__icon--checked {
             .van-icon {
                 border-width: 0;
-                .linear();
+                background: var(--prim);
                 &::before {
                     color: #fff;
                 }

src/views/order/Orders.vue

@@ -36,6 +36,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
 import OrderInfo from '../../components/order/OrderInfo.vue';
 import list from '../../mixins/list';
 export default {
@@ -69,6 +70,9 @@ export default {
             url: '/order/all'
         };
     },
+    computed: {
+        ...mapState(['companyId'])
+    },
     mounted() {
         if (this.$route.query.status) {
             this.status = this.$route.query.status;
@@ -82,7 +86,8 @@ export default {
                     status: this.status,
                     type: this.type,
                     hide: false,
-                    del: false
+                    del: false,
+                    companyId: this.companyId
                 }
             };
         },

src/views/product/HopeMarket.vue

@@ -190,6 +190,7 @@ import product from '../../mixins/product';
 import list from '../../mixins/list';
 import banner from '../../mixins/banner';
 import { useWindowSize } from '@vant/use';
+import { mapState } from 'vuex';
 export default {
     name: 'productList',
     components: { ProductInfo },
@@ -250,6 +251,7 @@ export default {
         };
     },
     computed: {
+        ...mapState(['companyId']),
         pageName() {
             return this.getLabelName(this.source, this.sourceOptions) || this.getLabelName(this.type, this.typeOptions);
         },
@@ -493,7 +495,8 @@ export default {
                     minterId: this.minterId,
                     salable: this.salable,
                     minPrice: 0,
-                    notLike: this.notLike
+                    notLike: this.notLike,
+                    companyId: this.companyId
                 },
                 sort: this.sort === 'id,desc' ? this.sortOptions[this.title] || sort : sort
             };

src/views/product/Search.vue

@@ -163,6 +163,7 @@ import { Swiper, SwiperSlide } from 'swiper/vue';
 
 import 'swiper/swiper.min.css';
 import 'swiper/swiper-bundle.min.css';
+import { mapState } from 'vuex';
 export default {
     name: 'productSearch',
     components: { ProductInfo },
@@ -224,6 +225,7 @@ export default {
         }
     },
     computed: {
+        ...mapState(['companyId']),
         actions() {
             let list = [{ name: '综合排序' }, { name: '在售中' }, { name: '仅展示' }];
             if (this.salable === '') {
@@ -343,7 +345,8 @@ export default {
                     source: this.source,
                     minterId: this.minterId,
                     del: false,
-                    salable: this.salable
+                    salable: this.salable,
+                    companyId: this.companyId
                 },
                 search: this.search,
                 sort: this.sort === 'id,desc' ? this.sortOptions[this.title] || sort : sort

src/views/user/Likes.vue

@@ -20,7 +20,7 @@
             <van-empty
                 v-if="showList.length === 0"
                 description="你还没有点赞哦~"
-                :image="require('@assets/kong_black.png')"
+                :image="require('@assets/kong.png')"
             />
         </div>
     </div>