Merge branch 'develop_wzl' of Server_Service/17pdf_front_end into master

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",

locales/zh-cn.json

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

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>

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"