Browse Source

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

李磊 4 years ago
parent
commit
b105c580de
2 changed files with 14 additions and 5 deletions
  1. 13 1
      src/views/CouponStatistics/CouponStatisticsList.vue
  2. 1 4
      vue.config.js

+ 13 - 1
src/views/CouponStatistics/CouponStatisticsList.vue

@@ -173,8 +173,20 @@ export default {
             for (let i = 0; i < res.data.list.length; i++) {
               const _item = res.data.list[i]
               _item.no = no + i + 1
-            // _item.status = _item.status + '' === '1'
             }
+            res.data.list.map(item => {
+              if ((item.couponId == 229 && item.storeId == 100084) ||
+              (item.couponId == 229 && item.storeId == 100083) ||
+              (item.couponId == 227 && item.storeId == 100084) ||
+              (item.couponId == 227 && item.storeId == 100083)) {
+                item.hidden = true
+              } else {
+                item.hidden = false
+              }
+            })
+            res.data.list = res.data.list.filter(item => {
+              return !item.hidden
+            })
             return res.data
           }
         })

+ 1 - 4
vue.config.js

@@ -108,10 +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.102:8101/cw-coupon/',
-        // target: 'http://192.168.16.103:8104/cw-coupon/',
-        target: 'http://carwash-coupon.test.zyucgj.com/cw-coupon/',
-        // target: 'http://carwash.test.zyucgj.com/cw-coupon/',
+        // target: 'http://carwash-coupon.test.zyucgj.com/cw-coupon/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {