natasha пре 7 месеци
родитељ
комит
38f90711a4

+ 13 - 2
src/icons/svg/zhuanji.svg

@@ -1,3 +1,14 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M21.0082 3C21.556 3 22 3.44495 22 3.9934V20.0066C22 20.5552 21.5447 21 21.0082 21H2.9918C2.44405 21 2 20.5551 2 20.0066V3.9934C2 3.44476 2.45531 3 2.9918 3H21.0082ZM20 5H4V19H20V5ZM18 15V17H6V15H18ZM12 7V13H6V7H12ZM18 11V13H14V11H18ZM10 9H8V11H10V9ZM18 7V9H14V7H18Z" fill="currentColor" fill-opacity="0.88"/>
-</svg>
+  <g id="&#228;&#184;&#147;&#232;&#190;&#145;icon">
+    <path id="Vector" d="M22 7L12 2L2 7V17L12 22L22 17V7Z" stroke="currentColor" stroke-width="2"
+      stroke-linejoin="round" />
+    <path id="Vector_2" d="M2 7L12 12" stroke="currentColor" stroke-width="2" stroke-linecap="round"
+      stroke-linejoin="round" />
+    <path id="Vector_3" d="M12 22V12" stroke="currentColor" stroke-width="2" stroke-linecap="round"
+      stroke-linejoin="round" />
+    <path id="Vector_4" d="M22 7L12 12" stroke="currentColor" stroke-width="2" stroke-linecap="round"
+      stroke-linejoin="round" />
+    <path id="Vector_5" d="M17 4.5L7 9.5" stroke="currentColor" stroke-width="2" stroke-linecap="round"
+      stroke-linejoin="round" />
+  </g>
+</svg>

+ 3 - 13
src/views/bookShelf/bookItem.vue

@@ -197,7 +197,7 @@
                     </div> -->
           </div>
           <div class="btn-box">
-            <template v-if="bookType === 'zhuanji' && isBuy === 'false'">
+            <template v-if="isBuy === 'false'">
               <a
                 class="el-button"
                 @click="handleChangeWay('wei')"
@@ -205,18 +205,8 @@
                 >立即购买</a
               >
             </template>
-            <template v-else>
-              <a class="continue" v-if="isBuy === 'true'" @click="handleLink"
-                >继续学习</a
-              >
-              <template v-else>
-                <a
-                  class="el-button"
-                  @click="handleChangeWay('wei')"
-                  :loading="createOrderLoading"
-                  >立即购买</a
-                >
-              </template>
+            <template v-else-if="isBuy === 'true' && bookType !== 'zhuanji'">
+              <a class="continue" @click="handleLink">继续学习</a>
               <!-- <a class="upgrade" @click="handleChangeWay('dui')">使用兑换码</a> -->
               <a
                 class="upgrade"

+ 12 - 0
src/views/bookShelf/index.vue

@@ -199,6 +199,12 @@ export default {
           number: 0,
           value: 3,
         },
+        {
+          label: "专辑",
+          img: "zhuanji",
+          number: 0,
+          value: 20,
+        },
         // ,
         // {
         //     label: '合刊',
@@ -446,6 +452,12 @@ export default {
                 number: res.count_iread,
                 value: 3,
               },
+              {
+                label: "专辑",
+                img: "zhuanji",
+                number: res.count_album,
+                value: 20,
+              },
               // ,
               // {
               //     label: '合刊',

+ 2 - 2
src/views/bookStore/all.vue

@@ -227,7 +227,7 @@
           </div>
         </template>
         <template v-if="itemType === 'zhuanji'">
-          <div class="filt-item">
+          <!-- <div class="filt-item">
             <label>年份</label>
             <ul>
               <li
@@ -243,7 +243,7 @@
                 {{ itemy.label }}
               </li>
             </ul>
-          </div>
+          </div> -->
           <div class="filt-item">
             <label>学段</label>
             <ul>