Merge branch 'dev' of github.com:JX3BOX/pvx into dev

JX3BOX · Jun 21, 2024 · f2b34e8 · f2b34e8
2 parents df0f0fc + c30ff1c
commit f2b34e8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/src/assets/css/face/item.less b/src/assets/css/face/item.less
@@ -2,6 +2,7 @@
     .flex;
     .pointer;
     .r(10px);
+    .pr();
     height: 280px;
     flex-shrink: 0;
     flex-direction: column;
@@ -28,6 +29,11 @@
         .size(auto,160px);
         .r(10px);
     }
+    .u-pinch__marker {
+        .pa();
+        .rt(25px);
+        .size(20px);
+    }
     .m-tags {
         .flex;
         .h(20px);

diff --git a/src/assets/img/face/bxs_barcode.svg b/src/assets/img/face/bxs_barcode.svg
diff --git a/src/components/face/item.vue b/src/components/face/item.vue
@@ -6,6 +6,7 @@
         v-reporter="{ data: { href: '/face/' + item.id, ...reporter }, caller: 'face_index' }"
     >
         <el-image class="u-img" :src="showThumb(imgLink)" fit="cover"></el-image>
+        <img v-if="item.code_mode" class="u-pinch__marker" src="@/assets/img/face/bxs_barcode.svg" alt="" />
         <div class="m-tags">
             <div class="m-tag-left">
                 <template v-if="client === 'std'">

diff --git a/src/components/face/tabs.vue b/src/components/face/tabs.vue
@@ -24,9 +24,15 @@
                             <el-checkbox-button v-model="price_type" class="u-filter">免费</el-checkbox-button>
                             <el-checkbox-button v-model="is_unlimited" class="u-filter">可新建</el-checkbox-button>
                         </p>
-                        <el-radio-group v-model="filter_empty_images">
+                        <p style="margin-top: 0;">
+                            <el-radio-group v-model="filter_empty_images">
+                                <el-radio-button class="u-filter" :label="0">全部</el-radio-button>
+                                <el-radio-button class="u-filter" :label="1">有图</el-radio-button>
+                            </el-radio-group>
+                        </p>
+                        <el-radio-group v-model="code_mode">
                             <el-radio-button class="u-filter" :label="0">全部</el-radio-button>
-                            <el-radio-button class="u-filter" :label="1">有图</el-radio-button>
+                            <el-radio-button class="u-filter" :label="1">捏脸码</el-radio-button>
                         </el-radio-group>
                     </div>
                     <img svg-inline src="@/assets/img/filter.svg" slot="reference" />
@@ -79,6 +85,7 @@ export default {
             price_type: false,
             filter_empty_images: -1,
             is_new_face: -1,
+            code_mode: -1,
             title: "",
             filterOpen: false,
             screenWidth: window.innerWidth,
@@ -94,6 +101,7 @@ export default {
             if (this.filter_empty_images) _params.filter_empty_images = true;
             _params.is_new_face = this.is_new_face;
             _params.body_type = this.active;
+            _params.code_mode = this.code_mode;
             return _params;
         },
         client() {