Ver código fonte

Merge branch 'deploy' of chelingzhu-web/qhsxKx-cardSend-html into master

李磊 4 anos atrás
pai
commit
abffe44efb
3 arquivos alterados com 18 adições e 16 exclusões
  1. 3 3
      src/config/router.config.js
  2. 14 12
      src/views/AvailableCoupon/couponCode.vue
  3. 1 1
      vue.config.js

+ 3 - 3
src/config/router.config.js

@@ -6,7 +6,7 @@ export const asyncRouterMap = [
     name: 'index',
     component: BasicLayout,
     meta: {
-      title: '首页'
+      title: '发券中心'
     },
     redirect: '/home',
     children: [{
@@ -47,7 +47,7 @@ export const asyncRouterMap = [
       component: PageView,
       name: 'AvailableCoupon',
       meta: {
-        title: '可用优惠券',
+        title: '发放优惠券',
         icon: 'gift',
         permission: 'M_coupon_0'
       },
@@ -57,7 +57,7 @@ export const asyncRouterMap = [
           path: '/AvailableCoupon/AvailableCoupon',
           name: 'AvailableCoupon',
           component: () => import(/* webpackChunkName: "gift" */ '@/views/AvailableCoupon/AvailableCoupon.vue'),
-          meta: { title: '可用优惠券', icon: 'gift' }
+          meta: { title: '优惠券列表', icon: 'gift' }
         }
       ]
     }

+ 14 - 12
src/views/AvailableCoupon/couponCode.vue

@@ -5,6 +5,7 @@
       width="50%"
       @cancel="cansel"
       :footer="null"
+      centered
       :maskClosable="false"
     >
       <div class="pay-box">
@@ -19,12 +20,12 @@
         <div class="pay-video">
           <div class="pay-flash">
             <img v-show="codeImg" :src="codeImg">
-            <a-spin class="spin" v-show="status=='loading'" tip="Loading...">
+            <a-spin class="spin" v-show="status=='loading'" tip="正在加载...">
             </a-spin>
           </div>
         </div>
         <div class="pay-button">
-          <a-button icon="sync" type="dashed" block @click="getCodeUrl(key)">刷新二维码</a-button>
+          <a-button icon="sync" type="primary" @click="getCodeUrl(key)">刷新二维码</a-button>
         </div>
       </div>
     </a-modal>
@@ -82,6 +83,7 @@ export default {
     getCodeUrl (type) {
       this.key = type || this.key
       this.status = 'loading'
+      this.codeImg = ''
       couponCode({
         couponId: this.data.id,
         customerType: this.key == 1 ? 'normal' : 'cardholder'
@@ -112,7 +114,7 @@ export default {
     }
     .pay-video{
       text-align: center;
-      padding: 20px 0 40px;
+      padding: 20px 0;
       p.red{
         span{
           color: #FF4500;
@@ -126,18 +128,19 @@ export default {
       }
       .pay-flash{
         width: 100%;
-        min-height: 260px;
         position: relative;
+        min-height: 220px;
         img{
-          width: 60%;
-          max-width: 530px;
-          // border: 1px solid #eee;
+          width: 50%;
+          max-width: 500px;
         }
         .spin{
           position: absolute;
-          top: 42%;
-          left: 47%;
+          top: 50%;
+          left: 50%;
           z-index: 999;
+          margin-left: -30px;
+          margin-top: -30px;
         }
       }
     }
@@ -152,10 +155,9 @@ export default {
     }
     .pay-button{
       text-align: center;
-      padding: 20px 0 10px;
+      padding: 0 0 20px;
       button{
-        width: 80%;
-        margin: 0 10px;
+        width: 50%;
       }
     }
   }

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.16.104:8104/cw-coupon/',
+        // target: 'http://192.168.16.103:8104/cw-coupon/',
         target: 'http://carwash-store.test.zyucgj.com/cw-store/',
         ws: false,
         changeOrigin: true,