Browse Source

修改匹配\r\n, 修改默认模板处理

asd123a20 1 year ago
parent
commit
2bc52974cd
3 changed files with 4 additions and 3 deletions
  1. 2 1
      src/components/heads/nav/index.vue
  2. 1 1
      src/views/list.vue
  3. 1 1
      src/views/templates/ztjy/list.vue

+ 2 - 1
src/components/heads/nav/index.vue

@@ -76,7 +76,8 @@ export default {
       if (env.type == '0') window.open(env.url);
       // 类型为1(栏目)进入列表页
       if (env.type == '1') {
-        if (!env.template || env.template == '') {
+        console.log(env);
+        if (!env.template || env.template == '' || env.template == 'defalut') {
           this.$router.push(`/list/${this.activeIndex}?parentCode=${parentCode}`);
           return;
         }

+ 1 - 1
src/views/list.vue

@@ -121,7 +121,7 @@ export default {
       return moment(e).format('YYYY-MM-DD');
     },
     titles(e) {
-      return e.replace(/\n/g, '');
+      return e.replace(/\n|\r/g, '');
     }
   }
 };

+ 1 - 1
src/views/templates/ztjy/list.vue

@@ -59,7 +59,7 @@ export default {
       return moment(e).format('YYYY-MM-DD');
     },
     titles(e) {
-      return e.replace(/\n/g, "");
+      return e.replace(/\n|\r/g, '');
     }
   }
 };