6 Commity 62d4afff1a ... cb17a19e17

Autor SHA1 Wiadomość Data
  Darkhorsedamon cb17a19e17 问题修复 2 lat temu
  wuzhenlin 61262e10e5 Merge branch 'develop_wzl' of Server_Service/17pdf_front_end into master 2 lat temu
  wzl 8ea43dbf10 Merge branch 'master' into develop_wzl 2 lat temu
  ouyangchengjun 9e4754e7ba Merge branch 'develop_oycj' of Server_Service/17pdf_front_end into master 2 lat temu
  wzl c2c3ba8c1e menberInfo,FAQ页和pricing页修改 2 lat temu
  ouyangchengjun 05f82f6151 Merge branch 'develop_oycj' of Server_Service/17pdf_front_end into master 2 lat temu

+ 1 - 0
locales/en.json

@@ -6,6 +6,7 @@
     "weixin":"Wechat",
     "zhifubao":"Alipay",
     "main":"Features",
+    "renewal_discount_month_des": "30% Discount",
     "month":" Month",
     "months":"Months",
     "discount":"60% OFF",

+ 1 - 0
locales/zh-cn.json

@@ -6,6 +6,7 @@
     "weixin":"微信支付",
     "zhifubao":"支付宝支付",
     "main":"主要功能",
+    "renewal_discount_month_des": "续费优惠",
     "month":"个月",
     "months":"个月",
     "removeAD":"移除广告",

+ 1 - 1
pages/converter.vue

@@ -70,7 +70,7 @@ class="mt-20px text-[#4D4D4D] text-16px font-600 inline-flex items-center leadin
                               <div class="explorer-caption max-w-260px truncate block text-[#777]" title="test.pdf">{{ item.name }}</div>
                             </td>
                             <td class="file-details-cell text-[#999]">{{ getfilesize(item.size) }}</td>
-                            <td class="file-details-cell points">{{ userInfo.flag === 1 ? 0 : item.price }}</td>
+                            <td class="file-details-cell points">{{ userInfo.subscriberType === 1 ? 0 : item.price }}</td>
                             <td class="file-details-cell select w-106px">
                               <select v-if="item.status !== 6" v-model="item.output" class="transfer-select appearance-none" @change="changeOutput(item, index)">
                                 <option value="png">PNG</option>

+ 15 - 15
pages/members/me/expenses.vue

@@ -3,7 +3,7 @@
  * @Author: 欧阳承珺
  * @LastEditors: 欧阳承珺
  * @Date: 2022-11-01 19:27:42
- * @LastEditTime: 2022-11-17 09:06:01
+ * @LastEditTime: 2022-11-17 09:31:51
 -->
 <template>
   <div>
@@ -25,8 +25,8 @@
     <div class="py-15px">
       <p class="text-[20px] leading-28px text-[#333]">我的转档</p>
       <div class="mt-10px mb-16px">
-        <button class="btn btn-download" @click="downloadFiles" :disabled="isDownload">下载</button>
-        <button class="btn btn-delete" @click="deleteChangeFileRecord" :disabled="isDelete">删除</button>
+        <button class="btn btn-download" :disabled="isDownload" @click="downloadFiles">下载</button>
+        <button class="btn btn-delete" :disabled="isDelete" @click="deleteChangeFileRecord">删除</button>
       </div>
     </div>
 
@@ -63,7 +63,16 @@
 import { mapState } from 'vuex' 
 export default {
   layout: 'userCenter',
-  middleware: ['auth','user'],
+  middleware: ['auth'],
+  data() {
+    return {
+      tableData:[],
+      tableDataSelection: [],
+      totalNum: 0,
+      isDownload: true,
+      isDelete: true
+    }
+  },
   head() {
     return {
       title: '17PDF Reader - 个人中心',
@@ -79,15 +88,6 @@ export default {
       ]
     }
   },
-  data() {
-    return {
-      tableData:[],
-      tableDataSelection: [],
-      totalNum: 0,
-      isDownload: true,
-      isDelete: true
-    }
-  },
   computed: {
     ...mapState([
       'userInfo',
@@ -114,7 +114,7 @@ export default {
     // 计算文件大小函数(保留两位小数),Size为字节大小
     getfilesize (size) {
       if (!size) return ""
-      var num = 1024.00 //byte
+      const num = 1024.00 // byte
       if (size < num) {
         return size + "B"
       }
@@ -164,7 +164,7 @@ export default {
     },
     // 删除转档记录
     deleteChangeFileRecord () {
-      var data = new FormData()
+      const data = new FormData()
       for (const file of this.tableDataSelection) {
         data.append('ids', file.id)
       }

+ 8 - 8
pages/members/me/points.vue

@@ -3,7 +3,7 @@
  * @Author: 欧阳承珺
  * @LastEditors: 欧阳承珺
  * @Date: 2022-11-02 10:18:11
- * @LastEditTime: 2022-11-16 17:50:37
+ * @LastEditTime: 2022-11-17 09:32:10
 -->
 <template>
   <div>
@@ -29,7 +29,7 @@
 <script>
 export default {
   layout: 'userCenter',
-  middleware: ['auth', 'user'],
+  middleware: ['auth'],
   data() {
     return {
       tableData: []
@@ -39,14 +39,14 @@ export default {
     this.$axios.get("/members/getMemberInfo").then((res) => {
       if (res.code === 200) {
         console.log(res.result)
-        let change = []
+        const change = []
         res.result.pricingList.forEach(item => {
           console.log("数据",item)
-          let totalPoints = item.totalPoints + "张转换劵"
-          let price="¥"+item.price+".0"
-          let id= ''
-          let startDate=item.startDate
-          let all={totalPoints,price,id,startDate}
+          const totalPoints = item.totalPoints + "张转换劵"
+          const price="¥"+item.price+".0"
+          const id= ''
+          const startDate=item.startDate
+          const all={totalPoints,price,id,startDate}
           change.push(all)
         });
         this.tableData=change

+ 6 - 8
pages/pricing.vue

@@ -126,14 +126,12 @@ class="slider-wrapper header-detail w-full py-0 pr-0px pl-38px
               </div>
               <div class="badge-container flex justify-between">
                 <!-- 选择月份 -->
-                <div
-v-for="(items, index) in list"
-                  :key="index" class="swicth-items inline-block w-[33%] py-0px px-4px text-center relative" @click="changeMonth(index)">
-                  <div v-show="index === 0 && isVIP" class="discount-badge w-[60%]  absolute right-0 top-[-8px] z-88">
-                    <div
-v-show="language"
-                      class="badges-year w-full h-20px rounded-20px text-[10px] text-[#fff] leading-[20px]">
-                      续费优惠
+                <div class="swicth-items inline-block w-[33%] py-0px px-4px text-center relative"
+                  v-for="(items, index) in list" :key="index" @click="changeMonth(index)">
+                  <div class="discount-badge w-[60%]  absolute right-0 top-[-8px] z-88" v-show="index === 0 && isVIP">
+                    <div class="badges-year w-full h-20px rounded-20px text-[10px] text-[#fff] leading-[20px]"
+                      v-show="language">
+                      {{ info.renewal_discount_month_des}}
                     </div>
                     <div
 v-show="!language"