Merge branch 'chronic-master' of…

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master

src/doctor/Doctor.vue

@@ -20,9 +20,9 @@ export default {
         return {
             visible: false,
             themeVars: {
-                primaryColor: '#54CCBD',
-                buttonPrimaryBackground: '#54CCBD',
-                buttonPrimaryBorderColor: '#54CCBD',
+                primaryColor: '#607FF0',
+                buttonPrimaryBackground: '#607FF0',
+                buttonPrimaryBorderColor: '#607FF0',
                 buttonDefaultBorderColor: '#BFBFBF',
                 buttonNormalFontSize: '16px',
                 // 表单相关

src/doctor/followUp/List.vue

@@ -57,9 +57,9 @@
                         <div class='detail-left' :style="{marginTop: item.diseaseList.length ? '0px': '12px'}">
                             慢病标签
                         </div>
-                        <div class='detail-right'>
-                            <div class='flex items-center'
-                                 style='flex-wrap: wrap;justify-content: center;align-content: center'>
+                        <div class='detail-right' style='flex: 1'>
+                            <div class='flex items-center '
+                                 style='flex-wrap: wrap;'>
                                 <div v-for='item1 in item.diseaseList' :class='`mt-3 ill-tabs ill-tabs-${item1.id}`'>
                                     {{ item1.name }}
                                 </div>
@@ -197,12 +197,12 @@ export default {
         },
         toGeneralDetail() {
             this.$router.push({
-                path: `/followUp/generalFU/detail`
+                path: `/doctor/followUp/generalFU/detail`
             })
         },
         toAddGeneral() {
             this.$router.push({
-                path: `/followUp/generalFU/add`
+                path: `/doctor/followUp/generalFU/add`
             })
         }
     }

src/doctor/followUp/generalFU/form/Index.vue

@@ -2,8 +2,7 @@
     <div>
         <van-nav-bar title='新增通用随访' left-text='' left-arrow>
         </van-nav-bar>
-
-        <div class='p-4'>
+        <div class='p-4 h-overflow'>
             <base-info :info="resident"></base-info>
         </div>
     </div>
@@ -59,4 +58,8 @@ export default {
 :deep(.van-nav-bar .van-icon) {
     color: #000000;
 }
+.h-overflow {
+    height: calc(100vh - 60px);
+    overflow-y: auto;
+}
 </style>
\ No newline at end of file

src/router/index.js

@@ -29,17 +29,17 @@ const routes = [
         component: () => import(/* webpackChunkName: "page-resident" */ '@/doctor/Doctor'),
         children: [
             {
-                path: '/followUp/list',
+                path: 'followUp/list',
                 name: 'followUp-list',
                 component: () => import(/* webpackChunkName: "page-resident" */ '@/doctor/followUp/List')
             },
             {
-                path: '/followUp/generalFU/detail',
+                path: 'followUp/generalFU/detail',
                 name: 'followUp-generalFU-detail',
                 component: () => import(/* webpackChunkName: "page-resident" */ '@/doctor/followUp/generalFU/detail/Detail')
             },
             {
-                path: '/followUp/generalFU/add',
+                path: 'followUp/generalFU/add',
                 name: 'followUp-generalFU-add',
                 component: () => import(/* webpackChunkName: "page-resident" */ '@/doctor/followUp/generalFU/form/Index')
             },