Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/store/followup/planManage.js

@@ -38,7 +38,7 @@ export default {
     templateOptions: [ // 获取随访计划模板
       {
         id: 0,
-        name: '目前请选择自定义模板作为测试'
+        name: '自定义模板'
       }
     ],
     followStartTimeList: [], //随访时间
@@ -103,7 +103,7 @@ export default {
       state.templateOptions = [
         {
           id: 0,
-          name: '目前请选择自定义模板作为测试'
+          name: '自定义模板'
         }
       ]
       state.templateOptions = state.templateOptions.concat(payload)

src/utils/env-config.js

@@ -46,7 +46,7 @@ export const envConfig = {
     workApiUrl: 'https://test1-work.yunqueyi.com/web',
   },
   test2: {
-    baseUrl: 'https://test2-work.yunqueyi.com/sc',
+    baseUrl: 'https://test2-work.yunqueyi.com/sc/',
     qiniuFileUrl: "https://test1-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
     qiniuImgUrl: "https://test1-file.yunqueyi.com",

src/views/followup/plan-manage/dialog/set-time-node.vue

@@ -608,6 +608,12 @@
         return flag
       },
       goSelectCartoon() {
+        const activeTabId = this.setTimeNodeList[this.activeTab].comentMsg.id;
+        if(activeTabId){
+          this.activeComentId = String(activeTabId);
+        }else{
+          this.activeComentId = '';
+        }
         this.isSelectCartoon = true;
       },
       //关闭漫画
@@ -617,11 +623,11 @@
       // 确认选择漫画
       confirmSelectComent(val){
         this.isSelectCartoon = false;
-        console.log('当前的漫画选择组件的信息',val)
-        console.log('当前的tab是',this.activeTab)
-        console.log('当前是否固定模板',this.isStandedTemplate)
-        console.log('当前的时间list',this.setTimeNodeList)
-        this.activeComentId = String(val.id);
+//        console.log('当前的漫画选择组件的信息',val)
+//        console.log('当前的tab是',this.activeTab)
+//        console.log('当前是否固定模板',this.isStandedTemplate)
+//        console.log('当前的时间list',this.setTimeNodeList)
+
         this.setTimeNodeList[this.activeTab].hasSelected = true;
         this.setTimeNodeList[this.activeTab].comentMsg = val;
         const comdata = this.setTimeNodeList[this.activeTab];
@@ -712,7 +718,7 @@
 //        }else{
 //
 //        }
-        console.log(item)
+//        console.log(item)
         if(item.timeNo>=0 && item.timeNo!==''){
           str = '开始后' + String(item.timeNo) + this.timeUnitStr
         }else{