no message

3 years ago · eb45cad19b
parent 1f48b020cc
commit eb45cad19b
1 changed files with 0 additions and 21 deletions
--- a/pages/insight/pages/editTheme/index.js
+++ b/pages/insight/pages/editTheme/index.js
@ -1,7 +1,6 @@
 import moment from "moment"
 const app = getApp();
 Page({
-<<<<<<< HEAD
    data: {
        steps: [
            {
@ -155,26 +154,6 @@ Page({
            wjList: that.data.wjList
        });
    },
-=======
-  data: {
-    steps: [{
-        text: '名称设置',
-        inactiveIcon: 'more-o',
-        activeIcon: 'more',
-      },
-      {
-        text: '分析词设置',
-        inactiveIcon: 'more-o',
-        activeIcon: 'more',
-      },
-      {
-        text: '定向监测',
-        inactiveIcon: 'more-o',
-        activeIcon: 'more',
-      }
-    ],
-    Guid: '',
->>>>>>> f31422d9a6ef710dd2dce3250a76e567c8c34ad3
    //表单
    Name: '',
    StartTime: '',