feat：三轮修复

.env

@@ -3,9 +3,9 @@ VITE_STORE_DOMIN = http://test-store.kdan.cn:3018
 VITE_PRO_WEB = http://test-pdf-pro.kdan.cn:3021
 VITE_APP = PDFReaderPro_
 VITE_MAC_APP_VERSION = v4.0.3
-VITE_WINDOWS_APP_VERSION = v4.2.0
+VITE_WINDOWS_APP_VERSION = v4.3.0
 VITE_EDITOR = LynxPDF_Editor_
-VITE_MAC_EDITOR_VERSION = v1.0.1
-VITE_WINDOWS_EDITOR_VERSION = v1.1.0
+VITE_MAC_EDITOR_VERSION = v1.1.1
+VITE_WINDOWS_EDITOR_VERSION = v1.1.1
 VITE_KEY_DATA = AS9-y4jfmKr6YrlOGQmAy42kkLAEZ1eaH2Y1-TUht0o0S0Yze6w_ZVDulAVzClbCI6bnlR1zXBCBhyPW
 VITE_VENDOR_DATA = 2760

.env.preparing

@@ -3,9 +3,9 @@ VITE_STORE_DOMIN = http://test-store.kdan.cn:3018
 VITE_PRO_WEB = http://test-pdf-pro.kdan.cn:3021
 VITE_APP = PDFReaderPro_
 VITE_MAC_APP_VERSION = v4.0.3
-VITE_WINDOWS_APP_VERSION = v4.2.0
+VITE_WINDOWS_APP_VERSION = v4.3.0
 VITE_EDITOR = LynxPDF_Editor_
-VITE_MAC_EDITOR_VERSION = v1.0.1
-VITE_WINDOWS_EDITOR_VERSION = v1.1.0
+VITE_MAC_EDITOR_VERSION = v1.1.1
+VITE_WINDOWS_EDITOR_VERSION = v1.1.1
 VITE_KEY_DATA = AS9-y4jfmKr6YrlOGQmAy42kkLAEZ1eaH2Y1-TUht0o0S0Yze6w_ZVDulAVzClbCI6bnlR1zXBCBhyPW
 VITE_VENDOR_DATA = 2760

.env.production

@@ -3,9 +3,9 @@ VITE_STORE_DOMIN = https://store.pdfreaderpro.com
 VITE_PRO_WEB = https://www.pdfreaderpro.com
 VITE_APP = PDFReaderPro_
 VITE_MAC_APP_VERSION = v4.0.3
-VITE_WINDOWS_APP_VERSION = v4.2.0
+VITE_WINDOWS_APP_VERSION = v4.3.0
 VITE_EDITOR = LynxPDF_Editor_
-VITE_MAC_EDITOR_VERSION = v1.0.1
-VITE_WINDOWS_EDITOR_VERSION = v1.1.0
+VITE_MAC_EDITOR_VERSION = v1.1.1
+VITE_WINDOWS_EDITOR_VERSION = v1.1.1
 VITE_KEY_DATA = AZlF7BTjlelPeQJ7sNlvhHpsUdYc12_C3EsLG9Nkr0hn6gtco_BrpUNLNUoAOkGF0aNcPNphEKbgTi8b
 VITE_VENDOR_DATA = 134050

src/components/sideMenu.vue

@@ -127,7 +127,7 @@ export default {
             <Dashboard />
             <span>Home</span>
           </el-menu-item>
-          <el-menu-item index="/product">
+          <el-menu-item :index="isNoAdmin ? '/product?type=isNoAdmin' : '/product'">
             <Product />
             <span>Products</span>
           </el-menu-item>
@@ -168,7 +168,7 @@ export default {
             <span>Manage License</span>
           </el-menu-item>
         </div>
-        <el-menu-item index="/download">
+        <el-menu-item :index="isNoAdmin ? '/download?type=isNoAdmin' : '/download'">
           <Download />
           <span>Download</span>
         </el-menu-item>

src/router/index.js

@@ -80,7 +80,7 @@ const router = new VueRouter({
       name: "productCustom",
       component: () => import("../views/Product/Custom.vue"),
       meta: {
-        title: 'Product | PDF Tech Console'
+        title: 'Product | Admin Console'
       }
     },
     {
@@ -88,7 +88,7 @@ const router = new VueRouter({
       name: "productPay",
       component: () => import("../views/Product/Pay.vue"),
       meta: {
-        title: 'Product | PDF Tech Console'
+        title: 'Product | Admin Console'
       }
     },
     {
@@ -96,7 +96,7 @@ const router = new VueRouter({
       name: "productCode",
       component: () => import("../views/Product/ID.vue"),
       meta: {
-        title: 'Product | PDF Tech Console'
+        title: 'Product | Admin Console'
       }
     },
     {
@@ -117,7 +117,7 @@ const router = new VueRouter({
           name: "product",
           component: () => import("../views/Product/Index.vue"),
           meta: {
-            title: 'Product | PDF Tech Console'
+            title: 'Product | Admin Console'
           }
         },
         {

src/views/Product/Custom.vue

@@ -619,13 +619,15 @@ onUnmounted(() => {
                 </div>
                 <div class="recommend-icon text-14px leading-20px text-[#808185] cursor-pointer">
                   <span v-show="commodityInfo.next_number">
-                    Authorize another <span class="text-[#232A40]">{{ commodityInfo.next_number }} device</span> to
-                    upgrade
-                    to
+                    Authorize another <span class="text-[#232A40]">{{ commodityInfo.next_number }}
+                      <span v-if="commodityInfo.next_number !== 1">devices</span>
+                      <span v-else>device</span>
+                    </span> to upgrade to
                     <span class="text-[#232A40]">{{ commodityInfo.next_discount }} OFF</span>
                   </span>
                   <span v-show="!commodityInfo.next_number">
-                    <a href="mailto:support@pdfreaderpro.com" class="text-[#1460F3] hover:underline">Contact us</a> for a
+                    <a href="mailto:support@pdfreaderpro.com?subject=Feedback from Admin Console"
+                      class="text-[#1460F3] hover:underline">Contact us</a> for a
                     higher discount.
                   </span>
                   <Info class="ml-8px inline-block mb-4px" />
@@ -667,7 +669,8 @@ onUnmounted(() => {
                 <div v-show="payMethod === 'wxpay' || payMethod === 'alipay'"
                   class="text-28px leading-40px font-700 text-[#232A40]">
                   <span class="text-16px font-400 text-[#808185] line-through">￥{{ commodityInfo.cny_price }}</span>
-                  ￥{{ commodityInfo.discount_cny_price }}</div>
+                  ￥{{ commodityInfo.discount_cny_price }}
+                </div>
               </template>
               <div v-else class="h-40px"></div>
             </div>

src/views/Product/ID.vue

@@ -411,19 +411,22 @@ onUnmounted(() => {
           </div>
           <div class="recommend-icon text-14px leading-20px text-[#808185] cursor-pointer">
             <span v-show="commodityInfo.next_number">
-              Authorize another <span class="text-[#232A40]">{{ commodityInfo.next_number }} device</span> to upgrade to
+              Authorize another <span class="text-[#232A40]">{{ commodityInfo.next_number }}
+                <span v-if="commodityInfo.next_number !== 1">devices</span>
+                <span v-else>device</span></span> to upgrade to
               <span class="text-[#232A40]">{{ commodityInfo.next_discount }} OFF</span>
             </span>
             <span v-show="!commodityInfo.next_number">
-              <a href="mailto:support@pdfreaderpro.com" class="text-[#1460F3] hover:underline">Contact us</a> for a higher discount.
+              <a href="mailto:support@pdfreaderpro.com?subject=Feedback from Admin Console"
+                class="text-[#1460F3] hover:underline">Contact us</a> for a higher discount.
             </span>
             <Info class="ml-8px inline-block mb-4px" />
             <div class="tip">
               You have currently authorized {{ commodityInfo.purchase_quantity }} devices
-              <div>Authorize 2 devices cumulatively:  15% OFF</div>
-              <div>Authorize 5 devices cumulatively:  25% OFF</div>
-              <div>Authorize 10 devices cumulatively:  30% OFF</div>
-              <div>Authorize 30 devices cumulatively:  35% OFF</div>
+              <div>Authorize 2 devices cumulatively: 15% OFF</div>
+              <div>Authorize 5 devices cumulatively: 25% OFF</div>
+              <div>Authorize 10 devices cumulatively: 30% OFF</div>
+              <div>Authorize 30 devices cumulatively: 35% OFF</div>
               <div>Authorize 100 devices cumulatively:: 45% OFF</div>
             </div>
           </div>

src/views/Product/Index.vue

@@ -63,6 +63,7 @@ const freeTry = () => {
         message: 'Trial Successfully',
         type: 'success'
       })
+      window.location.href = '/product'
       isOwnTry()
     }
   })
@@ -189,7 +190,7 @@ const getOverview = () => {
           <el-table-column prop="Quantity" label="Quantity" width="360">
             <template slot-scope="scope">
               {{ scope.row.assignedCodeNumber }}/{{ scope.row.codeNumber }}
-              <span v-if="scope.row.codeNumber">Licenses</span>
+              <span v-if="scope.row.codeNumber !== 1">Licenses</span>
               <span v-else>License</span>
             </template>
           </el-table-column>
@@ -232,7 +233,7 @@ const getOverview = () => {
     <!-- 试用弹窗 -->
     <el-dialog title="" :visible.sync="dialogVisible" width="376px" top="30vh" center :show-close="false">
       <!-- <Warning /> -->
-      <p class="mt-16px">Are you sure to apply for the 7-day free trial of LynxPDF Editor (Enterprise)?</p>
+      <p class="mt-16px">Are you sure to apply for the 14-day free trial of LynxPDF Editor (Enterprise)?</p>
       <p>The License code will be sent to the Admin Console after applying successfully.</p>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="freeTry">