Merge branch 'bugfix' of http://223.93.170.82:10080/zhouna/platformFront into bugfix

# Conflicts:
#	src/api/index.js

src/api/index.js

@@ -3,7 +3,7 @@ import config from './config.js';
 
 axios.default.timeout = 5000;
 axios.defaults.headers.post['Content-Type'] = "application/json;charset=utf-8";
-// axios.defaults.baseURL = 'http://192.168.2.236:88';
+//axios.defaults.baseURL = 'http://192.168.2.236:88';
 
 const urls = config.urls;
 export default {

src/components/preTreat/SimpleQuestion.vue

@@ -163,7 +163,7 @@
           if(res.data.code === '0') {
             this.Adscriptions = res.data.data[1];
             this.tagTypes =  res.data.data[2];
-            this.tagTypes =  this.tagTypes.filter(item => item.val != 0)  //去掉名称为默认值的填写单类型
+            this.tagTypes =  this.tagTypes.filter(item => item.val != 0&&item.val != 6&&item.val != 7)  //去掉名称为默认值的填写单类型
 
           }