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

assets/main.scss

@@ -5,7 +5,6 @@ html {
 }
 
 body {
-  min-width: 1200px;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }

layouts/custom.vue

@@ -3,7 +3,7 @@
  * @Author: 欧阳承珺
  * @LastEditors: 欧阳承珺
  * @Date: 2022-10-21 10:04:45
- * @LastEditTime: 2022-10-24 13:54:46
+ * @LastEditTime: 2022-11-15 10:10:52
 -->
 <template>
   <div>

layouts/default.vue

@@ -3,10 +3,10 @@
  * @Author: 欧阳承珺
  * @LastEditors: 欧阳承珺
  * @Date: 2022-10-17 15:11:18
- * @LastEditTime: 2022-11-11 19:18:17
+ * @LastEditTime: 2022-11-15 10:03:54
 -->
 <template>
-  <div class="font-primary">
+  <div class="font-primary min-w-1200px">
     <Navbar></Navbar>
     <Nuxt></Nuxt>
     <FooterBar></FooterBar>

layouts/userCenter.vue

@@ -3,10 +3,10 @@
  * @Author: 欧阳承珺
  * @LastEditors: 欧阳承珺
  * @Date: 2022-11-01 20:18:40
- * @LastEditTime: 2022-11-11 19:18:14
+ * @LastEditTime: 2022-11-15 10:04:42
 -->
 <template>
-  <div class="font-primary">
+  <div class="font-primary min-w-1200px">
     <Navbar></Navbar>
     <div class="flex mt-50px px-[10%] mb-30px justify-between">
       <div class="w-[27%] min-w-260px px-24px pb-80px mb-20px bg-[#fafafa]">

locales/en.json

@@ -0,0 +1,27 @@
+{
+  "info":{
+    "top":"17Member",
+    "describe":"Join to unlock more expanded features",
+    "pricing":"Subscribed",
+    "weixin":"Wechat",
+    "zhifubao":"Alipay",
+    "main":"Features",
+    "month":" Month",
+    "months":"Months",
+    "discount":"60% OFF",
+    "removeAD":"Remove Ads",
+    "explainAD":"Ads free to make page viewing safer and faster, reducing battery usage, offering a light reading experience.",
+    "exchange":"Convert Free",
+    "explainExchange":"PDF to Word, PPT, Excel, TXT, JPG/PNG are supported without any restriction.",
+    "trial":"Free Trial",
+    "login":"Login",
+    "subscription":"Subscribe Now",
+    "renew":"Re-subscribe Now",
+    "server":"《Service Terms》",
+    "and":"and",
+    "privacy":"《Privacy Policy》",
+    "know":"Get It",
+    "thank":"Thanks for your support!",
+    "pleace":"Please resubscribe after membership expires."
+  }
+}

locales/zh-cn.json

@@ -0,0 +1,26 @@
+{
+  "info":{
+    "top":"17会员",
+    "describe":"加入会员立即解锁更多高级功能",
+    "pricing":"17会员订阅",
+    "weixin":"微信支付",
+    "zhifubao":"支付宝支付",
+    "main":"主要功能",
+    "month":"个月",
+    "months":"个月",
+    "removeAD":"移除广告",
+    "explainAD":"PDF Reader会员拥有移除广告特权，尊享纯净版客户端，办公全程无干扰",
+    "exchange":"免费无限转换格式",
+    "explainExchange":"支持PDF to Word、PPT、Excel、TXT、JPG/PNG无限次数转换，高效稳定",
+    "login":"登录",
+    "subscription":"立即订阅",
+    "trial":"免费试用",
+    "renew":"立即续订",
+    "server":"《服务协议》",
+    "and":"及",
+    "privacy":"《隐私协议》",
+    "know":"我知道了",
+    "thank":"感谢您的支持！",
+    "pleace":"请在会员到期后续费"
+  }
+}

windi.config.js

@@ -3,7 +3,7 @@
  * @Author: 欧阳承珺
  * @LastEditors: 欧阳承珺
  * @Date: 2022-10-19 17:25:48
- * @LastEditTime: 2022-11-03 13:41:21
+ * @LastEditTime: 2022-11-15 09:56:22
  */
 import { defineConfig } from 'windicss/helpers'
 
@@ -15,7 +15,10 @@ export default defineConfig({
       'xl': '1280px',
       'lg': '1120px',
       'tiny': '960px',
-      'sm': '768px'
+      'sm': '768px',
+      'sm750':'750px',
+      'sm550':'550px',
+      'sm480':'480px',
     },
     extend: {
       fontFamily: {