Merge branch 'chronic-master' of…

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

public/UO4RaoZdBh.txt

+0a3e09905736ce5e82f4685709846d09
\ No newline at end of file

src/residentWX/ResidentWX.vue

 <template>
-    <van-config-provider :theme-vars="themeVars">
-        <div class="h-full resident-home">
-            <router-view v-slot="{ Component }">
-                <Transition name="route" mode="out-in">
-                    <component :is="Component" v-if="visible"/>
+    <van-config-provider :theme-vars='themeVars'>
+        <div class='h-full resident-home'>
+            <router-view v-slot='{ Component }'>
+                <Transition name='route' mode='out-in'>
+                    <component :is='Component' v-if='visible' />
                 </Transition>
             </router-view>
         </div>
@@ -13,6 +13,8 @@
 <script>
 import { getDict, getResidentByInfo } from '@/api/base.js'
 import { useStore } from './store/index.js'
+import { getQueryVariable } from '@/utils/common'
+import { showNotify } from 'vant'
 
 export default {
     data() {
@@ -40,7 +42,7 @@ export default {
                 fieldLabelColor: '#262626',
                 cellBorderColor: '#d9d9d9',
                 // 进度条
-                sliderActiveBackground: '#54CCBD',
+                sliderActiveBackground: '#54CCBD'
             }
         }
     },
@@ -56,15 +58,25 @@ export default {
             console.log(this.visible)
             const res = await getDict()
             this.store.$patch({ dict: res.data || {} })
-            const user = await getResidentByInfo({idCard: '620622196307194019'})
-            this.store.$patch({ userInfo: user.data || {} })
+            let idCard = getQueryVariable('idCard')
+            if (idCard) {
+                const user = await getResidentByInfo({ idCard: idCard })
+                if (!user.data) {
+                    showNotify({ type: 'warning', message: '未获取到慢病信息', duration: 0 })
+                    return
+                }
+                this.store.$patch({ userInfo: user.data || {} })
+                window.sessionStorage.setItem('userInfo', JSON.stringify(user.data))
+            } else {
+                let user = JSON.parse(window.sessionStorage.getItem('userInfo'))
+                this.store.$patch({ userInfo: user.data || {} })
+            }
             this.visible = true
-
-        },
+        }
     }
 }
 </script>
 
-<style lang="less" scoped>
+<style lang='less' scoped>
 
 </style>

src/residentWX/guide/Detail.vue

@@ -95,11 +95,6 @@ export default {
             info: {}
         }
     },
-    methods: {
-        onBack() {
-            this.$router.back()
-        },
-    },
     computed: {
         id() {
             return this.$route.params.id

src/residentWX/visit/List.vue

@@ -157,7 +157,6 @@ export default {
             this.load(false)
         },
         toDetail(item) {
-            debugger
             let par = {}
             let path = ``
             if (item.serveType == 5) {