From 3a3dcb8750271b7c355b43f5c8acf16289e99d9e Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Sun, 1 May 2022 14:41:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json        | 2 +-
 src/settings.js     | 2 +-
 src/views/login.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index f3e67b0..d323eff 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "yshop-web",
   "version": "2.4.0",
-  "description": "yshop3.0 前端源码",
+  "description": "yshop3.3 前端源码",
   "author": "Zheng Jie",
   "license": "Apache-2.0",
   "scripts": {
diff --git a/src/settings.js b/src/settings.js
index dccd193..72e6855 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -2,7 +2,7 @@ module.exports = {
   /**
    * @description 网站标题
    */
-  title: 'YSHOP-3.2',
+  title: 'YSHOP-3.3',
   /**
    * @description 是否显示 tagsView
    */
diff --git a/src/views/login.vue b/src/views/login.vue
index 31777e0..428c4cf 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -19,7 +19,7 @@
       </div>
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-        YSHOP后台管理系统-3.2
+        YSHOP后台管理系统-3.3
       </h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">

From ad39e41f705af75982acb57a7253c3205ecb2480 Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Thu, 4 Aug 2022 23:29:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=80=80=E6=AC=BE=E4=B8=AD=E3=80=81=E5=B7=B2?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/order/index.vue  | 12 ++++++------
 src/views/shop/order/indext.vue | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue
index cdcf3bb..5c2c5bb 100644
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@@ -21,12 +21,12 @@
         <el-tab-pane name="4">
           <span slot="label"><i class="el-icon-circle-check"></i> 交易完成</span>
         </el-tab-pane>
-        <el-tab-pane name="-1">
-          <span slot="label"><i class="el-icon-back"></i> 退款中</span>
-        </el-tab-pane>
-        <el-tab-pane name="-2">
-          <span slot="label"><i class="el-icon-finished"></i> 已退款</span>
-        </el-tab-pane>
+        <!--<el-tab-pane name="-1">-->
+        <!--  <span slot="label"><i class="el-icon-back"></i> 退款中</span>-->
+        <!--</el-tab-pane>-->
+        <!--<el-tab-pane name="-2">-->
+        <!--  <span slot="label"><i class="el-icon-finished"></i> 已退款</span>-->
+        <!--</el-tab-pane>-->
       </el-tabs>
       <!--工具栏-->
       <div class="head-container">
diff --git a/src/views/shop/order/indext.vue b/src/views/shop/order/indext.vue
index 1c749d6..f8f9869 100644
--- a/src/views/shop/order/indext.vue
+++ b/src/views/shop/order/indext.vue
@@ -17,12 +17,12 @@
       <el-tab-pane name="4">
         <span slot="label"><i class="el-icon-circle-check"></i> 交易完成</span>
       </el-tab-pane>
-      <el-tab-pane name="-1">
-        <span slot="label"><i class="el-icon-back"></i> 退款中</span>
-      </el-tab-pane>
-      <el-tab-pane name="-2">
-        <span slot="label"><i class="el-icon-finished"></i> 已退款</span>
-      </el-tab-pane>
+      <!--<el-tab-pane name="-1">-->
+      <!--  <span slot="label"><i class="el-icon-back"></i> 退款中</span>-->
+      <!--</el-tab-pane>-->
+      <!--<el-tab-pane name="-2">-->
+      <!--  <span slot="label"><i class="el-icon-finished"></i> 已退款</span>-->
+      <!--</el-tab-pane>-->
     </el-tabs>
     <!--工具栏-->
     <div class="head-container">