Przeglądaj źródła

Signed-off-by: 1004749546@qq.com <1004749546@qq.com>
优惠券分页

1004749546@qq.com 4 lat temu
rodzic
commit
c214779ddb

+ 1 - 1
src/permission.js

@@ -10,7 +10,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['login', 'register', 'registerResult'] // no redirect whitelist
+const whiteList = ['login', 'register', 'registerResult', 'AvailableCoupon'] // no redirect whitelist
 const defaultRoutePath = '/home'
 
 router.beforeEach((to, from, next) => {

+ 19 - 4
src/views/AvailableCoupon/AvailableCoupon.vue

@@ -11,7 +11,7 @@
           <div>有效期:{{ item.validDateStr }}</div>
         </div>
         <div class="card-item-button">
-          <a-button size="large" @click="getCode(item)" ghost type="danger">生成领取码</a-button>
+          <a-button shape="round" size="large" @click="getCode(item)" ghost type="danger">生成领取码</a-button>
         </div>
       </div>
       <div class="listNone">
@@ -25,8 +25,8 @@
         :total="total"
         :current="pageNo"
         :pageSize="pageSize"
-        showQuickJumper
         showSizeChanger
+        @change="pageNoChange"
         @showSizeChange="onShowSizeChange" />
     </div>
     <coupon-code :data="itemData" :openModal="isShow" @close="isShow=false"></coupon-code>
@@ -97,6 +97,18 @@ export default {
           break
       }
     },
+    // 页码改变
+    pageNoChange (page, pageSize) {
+      this.pageNo = page
+      this.pageSize = pageSize
+      this.getList()
+    },
+    // 每页条数改变
+    onShowSizeChange (current, size) {
+      this.pageNo = current
+      this.pageSize = size
+      this.getList()
+    },
     // 打开优惠券码弹窗
     getCode (item) {
       this.itemData = item
@@ -145,10 +157,13 @@ export default {
       .card-item-head {
         background: #F5222D;
         color: #fff;
-
         >div {
           &:first-child {
-            font-size: 32px;
+            font-size: 28px;
+            height: 80px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
           }
         }
       }

+ 28 - 27
src/views/user/Login.vue

@@ -184,35 +184,36 @@ export default {
     },
     handleSubmit (e) {
       e.preventDefault()
-      const {
-        form: { validateFields },
-        state,
-        customActiveKey,
-        Login
-      } = this
+      this.$router.push({ name: 'AvailableCoupon' })
+      // const {
+      //   form: { validateFields },
+      //   state,
+      //   customActiveKey,
+      //   Login
+      // } = this
 
-      state.loginBtn = true
-      const validateFieldsKey = customActiveKey === 'tab1' ? ['username', 'password', 'rememberMe'] : ['mobile', 'captcha']
+      // state.loginBtn = true
+      // const validateFieldsKey = customActiveKey === 'tab1' ? ['username', 'password', 'rememberMe'] : ['mobile', 'captcha']
 
-      validateFields(validateFieldsKey, { force: true }, (err, values) => {
-        if (!err) {
-          const loginParams = { ...values }
-          delete loginParams.username
-          loginParams[!state.loginType ? 'email' : 'username'] = values.username
-          loginParams.password = values.password
-          console.log(loginParams, 'loginParams')
-          Login(loginParams)
-            .then((res) => this.loginSuccess(res))
-            .catch(err => this.requestFailed(err))
-            .finally(() => {
-              state.loginBtn = false
-            })
-        } else {
-          setTimeout(() => {
-            state.loginBtn = false
-          }, 600)
-        }
-      })
+      // validateFields(validateFieldsKey, { force: true }, (err, values) => {
+      //   if (!err) {
+      //     const loginParams = { ...values }
+      //     delete loginParams.username
+      //     loginParams[!state.loginType ? 'email' : 'username'] = values.username
+      //     loginParams.password = values.password
+      //     console.log(loginParams, 'loginParams')
+      //     Login(loginParams)
+      //       .then((res) => this.loginSuccess(res))
+      //       .catch(err => this.requestFailed(err))
+      //       .finally(() => {
+      //         state.loginBtn = false
+      //       })
+      //   } else {
+      //     setTimeout(() => {
+      //       state.loginBtn = false
+      //     }, 600)
+      //   }
+      // })
     },
     getCaptcha (e) {
       e.preventDefault()