提交

8e442e1d · zhangmeng · b7d61ecb · 8e442e1d · 8e442e1d · 8e442e1d
Commit 8e442e1d authored Dec 03, 2018 by zhangmeng
10 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.37191374e6e1aa52ac9be99b063a2a42.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.80af2d9a94fe8d73e265.js></script><script type=text/javascript src=/marketing/static/js/app.c3884b68f191bf245864.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.9671a259948d12f536aa86dc23395860.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.d0b698b7b2e1419bf4f3.js></script><script type=text/javascript src=/marketing/static/js/app.c3315d4e750a94a53c72.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.37191374e6e1aa52ac9be99b063a2a42.css
+++ b/dist/static/css/app.37191374e6e1aa52ac9be99b063a2a42.css
--- a/dist/static/js/app.c3315d4e750a94a53c72.js
+++ b/dist/static/js/app.c3315d4e750a94a53c72.js
--- a/dist/static/js/app.c3884b68f191bf245864.js
+++ b/dist/static/js/app.c3884b68f191bf245864.js
--- a/dist/static/js/vendor.80af2d9a94fe8d73e265.js
+++ b/dist/static/js/vendor.80af2d9a94fe8d73e265.js
--- a/src/components/libs/cardTemp/index.vue
+++ b/src/components/libs/cardTemp/index.vue
@@ -80,9 +80,9 @@ export default {
  computed:{
    limitTips() {
      if (this.cardLimitType === 2) {
-        return '领取限制领取 1~100的卡券，系统已过滤，符合条件共';
+        return '领取限制领取1~100的卡券，系统已过滤，符合条件共';
      } else if (this.cardLimitType === 3) {
-        return '领取限制领取>=100 的卡券，系统已过滤，符合条件共';
+        return '领取限制领取<100的卡券不支持选择，系统已过滤，符合条件共';
      } else {
        return '领取限制>1的卡券不支持选择，系统已过滤，符合条件共';
      }

--- a/src/components/linktools/linktoolspage.vue
+++ b/src/components/linktools/linktoolspage.vue
@@ -1285,9 +1285,10 @@ export default {
      that.axios.post(that.baseUrl+'/api-plug/list-link-data',qs.stringify(para))
      .then((res) => {
        console.log(res,res.data,res.data.errorCode)
-        var resData = res.data
+        let resData = res.data;
+        let result = res.data.result && res.data.result.filter(v => v.name !== '自定义页面');
        if (resData.errorCode == 0) {
-          that.setLevelListOptions(parentId,resData.result,num,twoType)
+          that.setLevelListOptions(parentId,result,num,twoType)
          return;
        }

@@ -2179,7 +2180,7 @@ export default {
      display: inline-block;
      width: 310px;
      padding: 10px 10px;
-      /*height: 110px;*/
+      height: 110px;
      border: 1px solid #e7e7eb;
      margin-right: 7px;
      margin-bottom: 10px;
@@ -2187,6 +2188,7 @@ export default {
      -webkit-box-sizing: border-box;
      -moz-box-sizing: border-box;
      box-sizing: border-box;
+      overflow: hidden;
    }
    .goods-link-item img {
      width: 80px;

--- a/src/test/component/dm-card/index.vue
+++ b/src/test/component/dm-card/index.vue
@@ -137,9 +137,9 @@ const formateDateTimeByType = (date, type = 'yyyy-MM-dd-HH-mm-ss') => {
    computed:{
      limitTips() {
        if (this.cardLimitType === 2) {
-          return '领取限制领取 1~100的卡券，系统已过滤，符合条件共';
+          return '领取限制领取1~100的卡券，系统已过滤，符合条件共';
        } else if (this.cardLimitType === 3) {
-          return '领取限制领取>=100 的卡券，系统已过滤，符合条件共';
+          return '领取限制领取<100的卡券不支持选择，系统已过滤，符合条件共';
        } else {
          return '领取限制>1的卡券不支持选择，系统已过滤，符合条件共';
        }

--- a/src/test/component/marketingEvent/components/lib-card.vue
+++ b/src/test/component/marketingEvent/components/lib-card.vue
@@ -54,11 +54,11 @@ export default {
  computed:{
    limitTips() {
      if (this.cardLimitType === 2) {
-        return '领取限制领取 1~100的卡券，系统已过滤。';
+        return '领取限制领取1~100的卡券，系统已过滤，符合条件共';
      } else if (this.cardLimitType === 3) {
-        return '领取限制领取>=100 的卡券，系统已过滤。';
+        return '领取限制领取<100的卡券不支持选择，系统已过滤，符合条件共';
      } else {
-        return '领取限制>1的卡券不支持选择，系统已过滤。';
+        return '领取限制>1的卡券不支持选择，系统已过滤，符合条件共';
      }
    }
  },

--- a/src/views/ecm/marketing-event/components/lib-card.vue
+++ b/src/views/ecm/marketing-event/components/lib-card.vue
@@ -64,9 +64,9 @@ export default {
  computed:{
    limitTips() {
      if (this.cardLimitType === 2) {
-        return '领取限制领取 1~100的卡券，系统已过滤，符合条件共';
+        return '领取限制领取1~100的卡券，系统已过滤，符合条件共';
      } else if (this.cardLimitType === 3) {
-        return '领取限制领取>=100 的卡券，系统已过滤，符合条件共';
+        return '领取限制领取<100的卡券不支持选择，系统已过滤，符合条件共';
      } else {
        return '领取限制>1的卡券不支持选择，系统已过滤，符合条件共';
      }