Merge branch 'dev' of panhui/raex_saas into master

src/views/Discover.vue

@@ -18,6 +18,7 @@
                 </div>
             </div>
         </van-sticky>
+
         <!-- <swiper :slides-per-view="3" :space-between="16" class="mySwiper" :autoplay="{ delay: 3500 }">
             <swiper-slide v-for="(item, index) in banners" :key="item.id">
                 <van-image

src/views/Mine.vue

@@ -119,16 +119,21 @@
                 <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/activity/List1.vue

@@ -39,12 +39,13 @@
                 </router-link>
             </template>
 
-            <van-empty v-if="empty" description="暂无活动哦~" :image="require('@assets/kong_png_wusousuo.png')" />
+            <van-empty v-if="empty" description="暂无活动哦~" :image="require('@assets/kong_black.png')" />
         </van-list>
     </van-pull-refresh>
 </template>
 
 <script>
+import { mapState } from 'vuex';
 import list from '../../mixins/list';
 export default {
     name: 'Search',
@@ -57,6 +58,7 @@ export default {
         };
     },
     computed: {
+        ...mapState(['companyId']),
         filterBg() {
             if (this.list.length > 0) {
                 return this.list[0].cover;
@@ -69,7 +71,8 @@ export default {
         beforeData() {
             return {
                 query: {
-                    del: false
+                    del: false,
+                    companyId: this.companyId
                 }
             };
         },

src/views/order/ActivityOrders.vue

@@ -93,6 +93,7 @@ export default {
             return {
                 query: {
                     userId: this.$store.state.userInfo.id,
+                    companyId: this.$store.state.companyId,
                     status: this.status,
                     // type: this.type,
                     hide: false,

src/views/product/HopeMarket.vue

@@ -1,12 +1,41 @@
 <template>
     <div class="follow">
-        <div ref="top" class="list-top" :style="{ top: barShow ? barHeight + 'px' : 0 }">
+        <div ref="top" class="list-top">
             <div class="top">
                 <div class="search" @click="$router.push('/' + this.$route.params.companyId + '/productSearch')">
                     <img src="@assets/icon-sosuo.png" alt="" />
                     <span>搜索你要的精彩</span>
                 </div>
             </div>
+
+            <!-- <van-checkbox v-if="source == 'TRANSFER' && !title" @change="getData(true)" class="sala" v-model="salable"
+                >仅看在售</van-checkbox
+            > -->
+            <!-- <van-button
+                @click="changeSort"
+                v-if="source == 'TRANSFER' && !title"
+                class="sala"
+                color="#F5F7FA"
+                type="primary"
+                size="mini"
+                icon="arrow-down"
+                icon-position="right"
+                round
+                >{{ salable ? '在售中' : salable === false ? '仅展示' : '综合排序' }}</van-button
+            > -->
+        </div>
+        <div
+            class="swiper"
+            @click="
+                $router.push({
+                    path: '/' + $route.params.companyId + '/activityList'
+                })
+            "
+        >
+            <img src="@assets/zhuzao.png" alt="" />
+        </div>
+
+        <van-sticky :offset-top="50">
             <div class="classification_selection">
                 <van-tabs
                     v-model:active="sort"
@@ -46,64 +75,7 @@
                     <img src="@assets/icon-quanbuleimuone@3x.png" alt="" class="allCategories_img" v-else />
                 </div> -->
             </div>
-            <div class="series_selection" v-if="categorySelection == true">
-                <div
-                    class="series_selection_con"
-                    :class="[
-                        selectCategoryOne ? 'series_selection_cons' : '',
-                        activeSettingIndex === index ? 'active' : ''
-                    ]"
-                    ref="zombie"
-                    v-for="(item, index) in settings"
-                    :key="item.id"
-                    @click="showBanner(item.id, index)"
-                    :style="{ order: 2 * Math.ceil((index + 1) / 2) - 1 }"
-                >
-                    {{ item.name }}
-                </div>
-                <div
-                    class="banner-box"
-                    :style="{ height: bannerHeight + 'px', order: 2 * Math.ceil((activeSettingIndex + 1) / 2) }"
-                >
-                    <img src="../../assets/iocn-jiantou.png" :style="{ left: moreLeft + 'px' }" class="more" alt="" />
-                    <div class="banner-list" :style="{ maxHeight: maxBannerHeight + 'px' }">
-                        <div
-                            class="banner-item"
-                            v-for="(item, index) in banners"
-                            :key="item.id"
-                            :class="activeSettingIndexOne === index ? 'actives' : ''"
-                            @click="goNextOne(item, '&source=TRANSFER', index)"
-                        >
-                            {{ item.name }}
-                            <!-- <van-image
-                                    width="calc(20vw - 19.2px)"
-                                    height="calc(20vw - 19.2px)"
-                                    radius="8"
-                                    :src="getImg(item.pic)"
-                                    fit="cover"
-                                /> -->
-                            <!-- <div class="name">{{ item.name }}</div> -->
-                        </div>
-                    </div>
-                </div>
-                <!-- <div class="banner-wrapper" v-if="showSetting" @touchstart="touchEvent"></div> -->
-            </div>
-            <!-- <van-checkbox v-if="source == 'TRANSFER' && !title" @change="getData(true)" class="sala" v-model="salable"
-                >仅看在售</van-checkbox
-            > -->
-            <!-- <van-button
-                @click="changeSort"
-                v-if="source == 'TRANSFER' && !title"
-                class="sala"
-                color="#F5F7FA"
-                type="primary"
-                size="mini"
-                icon="arrow-down"
-                icon-position="right"
-                round
-                >{{ salable ? '在售中' : salable === false ? '仅展示' : '综合排序' }}</van-button
-            > -->
-        </div>
+        </van-sticky>
         <!-- <van-action-sheet
             v-model:show="showAction"
             @select="selectAction"
@@ -570,48 +542,48 @@ export default {
 .van-tabs {
     background-color: #222426;
 }
-
-.list-top {
+.classification_selection {
+    height: 50px;
+    padding: 13px 16px;
+    box-sizing: border-box;
+    background: #222426;
+    border-top: 1px solid #272b2e;
+    display: flex;
+    justify-content: space-between;
     position: relative;
-    .classification_selection {
-        height: 50px;
-        padding: 13px 16px;
-        box-sizing: border-box;
-        background: #222426;
-        border-top: 1px solid #272b2e;
+    .allCategories {
         display: flex;
-        justify-content: space-between;
-        position: relative;
-        .allCategories {
-            display: flex;
-            .allCategories_con {
-                font-size: 14px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #939599;
-                line-height: 24px;
-            }
-            .allCategories_con_one {
-                font-weight: bold;
-                color: #43ce00;
-            }
-            .allCategories_img {
-                width: 18px;
-                height: 18px;
-                margin-left: 2px;
-                padding-top: 3px;
-            }
+        .allCategories_con {
+            font-size: 14px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #939599;
+            line-height: 24px;
         }
-
-        .van-checkbox {
-            position: absolute;
-            right: 0;
-            top: 12px;
-            --van-checkbox-label-color: #fff;
-            --van-checkbox-size: 12px;
-            --van-checkbox-checked-icon-color: var(--prim);
+        .allCategories_con_one {
+            font-weight: bold;
+            color: #43ce00;
+        }
+        .allCategories_img {
+            width: 18px;
+            height: 18px;
+            margin-left: 2px;
+            padding-top: 3px;
         }
     }
+
+    .van-checkbox {
+        position: absolute;
+        right: 0;
+        top: 12px;
+        --van-checkbox-label-color: #fff;
+        --van-checkbox-size: 12px;
+        --van-checkbox-checked-icon-color: var(--prim);
+    }
+}
+.list-top {
+    position: relative;
+
     .series_selection {
         width: 100%;
         margin-top: -1px;
@@ -789,4 +761,13 @@ export default {
 /deep/ .van-overlay {
     z-index: 6;
 }
+
+.swiper {
+    padding: 10px 16px;
+    img {
+        width: 100%;
+        height: auto;
+        display: block;
+    }
+}
 </style>