Merge branch 'chronic-master' of…

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

src/residentWX/ResidentWX.vue

@@ -78,7 +78,7 @@ export default {
                 window.sessionStorage.setItem('userInfo', JSON.stringify(user.data))
             } else {
                 let user = JSON.parse(window.sessionStorage.getItem('userInfo'))
-                this.store.$patch({ userInfo: user.data || {} })
+                this.store.$patch({ userInfo: user || {} })
             }
             this.visible = true
         }

src/residentWX/guide/Detail.vue

@@ -25,8 +25,8 @@
         </div>
         <div class="p-3 grow cont-box">
             <div class="p-3 h-full cont-inner">
-                <div class="flex justify-between collapse-head">
-                    <span class="text-16">全部内容</span>
+                <div class="flex justify-between collapse-head mt-2">
+                    <span class="text-16 font-semibold">全部内容</span>
                     <!-- <span @click="toggleAll">
                         <span v-if="!collapseAll">展开全部</span>
                         <span v-else>展开收起</span>

src/residentWX/guide/List.vue

@@ -28,15 +28,15 @@
                                 <span>{{ item.visitDate }}</span>
                             </div>
                             <div>
-                                <span class="label">筛查单位</span>
+                                <span class="label">指导单位</span>
                                 <span>{{ item.visitUnitName }}</span>
                             </div>
                             <div>
-                                <span class="label">筛查科室</span>
+                                <span class="label">指导科室</span>
                                 <span>{{ item.visitOfficeName }}</span>
                             </div>
-                            <span class="tag tag-orange" v-show="item.visitWayRules.includes('2')">健康指导</span>
-                            <span class="tag tag-green" v-show="item.visitWayRules.includes('3')">健康宣教</span>
+                            <span class="tag tag-orange" v-show="activeTab=='2'">健康指导</span>
+                            <span class="tag tag-green" v-show="activeTab=='3'">健康宣教</span>
                         </div>
                     </div>
                 </van-list>
@@ -60,7 +60,7 @@ export default {
             store: useStore(),
             activeTab: '',
             tabList: [
-                { title: '全部', name: '' },
+                // { title: '全部', name: '' },
                 { title: '健康指导', name: '2' },
                 { title: '健康宣教', name: '3' },
             ],

src/residentWX/nim/FileView.vue

@@ -14,6 +14,8 @@
 </template>
 
 <script>
+import { showDialog } from 'vant'
+import { copyToClip } from '@/utils/common.js'
 
 export default {
     props: {
@@ -31,7 +33,20 @@ export default {
     },
     methods: {
         onDown() {
-            window.open(this.file.url, '_blank')
+            console.log(this.file)
+            let wx = window.sessionStorage.getItem('embed')
+            if (wx == 'wx') {
+                // 复制链接到浏览器下载
+                if (copyToClip(this.file.url)) {
+                    showDialog({
+                        message: '链接复制成功，请在浏览器中打开下载'
+                    }).then(() => {})
+                } else {
+                    console.warn('链接复制失败')
+                }
+            } else {
+                window.open(this.file.url, '_blank')
+            }
         },
         viewImage() {
             this.$emit('view-image', this.file)

src/residentWX/nim/Index.vue

@@ -98,7 +98,8 @@ export default {
             this.$router.push({
                 path,
                 query: {
-                    name: item.serviceDoctorName
+                    name: item.serviceDoctorName,
+                    gender: this.userInfo.gender || 0
                 }
             })
         }

src/residentWX/nim/Session.vue

@@ -26,7 +26,10 @@
                             @viewImage="viewImage"/>
                     </div>
                     <div class="shrink-0 avatar">
-                        <img src="@/assets/image/residentWX/avatar-man.png" alt="" v-show="item.from === accountId">
+                        <div v-show="item.from === accountId">
+                            <img src="@/assets/image/residentWX/avatar-woman.png" alt="" v-if="targetGender == 2">
+                            <img src="@/assets/image/residentWX/avatar-man.png" alt="" v-else>
+                        </div>
                     </div>
                 </div>
             </van-list>
@@ -118,6 +121,10 @@ export default {
         targetName() {
             return this.$route.query.name
         },
+        // 聊天对象性别
+        targetGender() {
+            return this.$route.query.gender
+        },
         targetId() {
             return `doc_${this.$route.params.id}`.toLocaleLowerCase()
         }
@@ -399,7 +406,7 @@ export default {
     }
     .avatar {
         width: 38px;
-        >img {
+        img {
             width: 100%;
             height: 100%;
             object-fit: cover;

src/residentWX/screening/detail/FirstDetail.vue

@@ -22,8 +22,8 @@
         </div>
         <div class="p-3 grow cont-box">
             <div class="p-3 h-full cont-inner">
-                <div class="flex justify-between collapse-head">
-                    <span class="text-16">全部内容</span>
+                <div class="flex justify-between collapse-head mt-2">
+                    <span class="text-16 font-semibold">全部内容</span>
                     <span @click="toggleAll">
                         <span v-if="!collapseAll">展开全部</span>
                         <span v-else>展开收起</span>

src/residentWX/screening/detail/SecondDetail.vue

@@ -35,8 +35,8 @@
         </div>
         <div class='p-3 grow cont-box'>
             <div class='p-3 h-full cont-inner'>
-                <div class='flex justify-between collapse-head'>
-                    <span class='text-16'>全部内容</span>
+                <div class='flex justify-between collapse-head mt-2'>
+                    <span class='text-16 font-semibold'>全部内容</span>
                     <span @click='toggleAll'>
                         <span v-if='!collapseAll'>展开全部</span>
                         <span v-else>展开收起</span>

src/residentWX/utils/common.less

@@ -34,6 +34,7 @@
     .van-cell {
         padding: .1rem 0;
         color: #8C8C8C;
+        font-weight: 600;
         background: transparent;
         &::after {
             display: none;

src/residentWX/visit/detail/GeneralFUDetail.vue

@@ -9,7 +9,9 @@
         </div>
         <div class='px-4 py-3 flex shrink-0 base-info'>
             <div class='flex w-full'>
-                <div class='grow flex flex-col justify-between'>
+                <img src='@/assets/image/residentWX/avatar.png' alt='' class='shrink-0'
+                     style='width: .56rem;height: .56rem'>
+                <div class='grow flex flex-col justify-between pl-3'>
                     <div class='flex justify-between'>
                         <span class='name'>{{ residentInfo.residentName }}</span>
                     </div>
@@ -357,7 +359,6 @@ export default {
         }
     },
     created() {
-        document.title = '随访详情'
         this.load()
     },
     methods: {
@@ -497,4 +498,4 @@ table {
     border-radius: 4px;
     color: #4D5665;
 }
-</style>
+</style>
\ No newline at end of file

src/residentWX/visit/detail/components/AbnormalBloodLipidsDetail.vue

 <template>
     <div class="p-3 grow cont-box">
         <div class="p-3 h-full cont-inner">
-            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+            <div class="flex justify-between collapse-head mt-2">
+                <span class="text-16 font-semibold">全部内容</span>
                 <span @click="toggleAll">
                     <span v-if="!collapseAll">展开全部</span>
                     <span v-else>收起全部</span>

src/residentWX/visit/detail/components/CerebralApoplexyDetail.vue

 <template>
     <div class="p-3 grow cont-box">
         <div class="p-3 h-full cont-inner">
-            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+            <div class="flex justify-between collapse-head mt-2">
+                <span class="text-16 font-semibold">全部内容</span>
                 <span @click="toggleAll">
                     <span v-if="!collapseAll">展开全部</span>
                     <span v-else>收起全部</span>

src/residentWX/visit/detail/components/ChronicKidneyDiseaseDetail.vue

 <template>
     <div class="p-3 grow cont-box">
         <div class="p-3 h-full cont-inner">
-            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+            <div class="flex justify-between collapse-head mt-2">
+                <span class="text-16 font-semibold">全部内容</span>
                 <span @click="toggleAll">
                     <span v-if="!collapseAll">展开全部</span>
                     <span v-else>收起全部</span>

src/residentWX/visit/detail/components/CopdDetail.vue

 <template>
     <div class="p-3 grow cont-box">
         <div class="p-3 h-full cont-inner">
-            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+            <div class="flex justify-between collapse-head mt-2">
+                <span class="text-16 font-semibold">全部内容</span>
                 <span @click="toggleAll">
                     <span v-if="!collapseAll">展开全部</span>
                     <span v-else>收起全部</span>

src/residentWX/visit/detail/components/CoronaryHeartDiseaseDetail.vue

 <template>
     <div class="p-3 grow cont-box">
         <div class="p-3 h-full cont-inner">
-            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+            <div class="flex justify-between collapse-head mt-2">
+                <span class="text-16 font-semibold">全部内容</span>
                 <span @click="toggleAll">
                     <span v-if="!collapseAll">展开全部</span>
                     <span v-else>收起全部</span>

src/residentWX/visit/detail/components/DiabetesDetail.vue

 <template>
     <div class="p-3 grow cont-box">
         <div class="p-3 h-full cont-inner">
-            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+            <div class="flex justify-between collapse-head mt-2">
+                <span class="text-16 font-semibold">全部内容</span>
                 <span @click="toggleAll">
                     <span v-if="!collapseAll">展开全部</span>
                     <span v-else>收起全部</span>

src/residentWX/visit/detail/components/HypertensionDetail.vue

 <template>
     <div class="p-3 grow cont-box">
         <div class="p-3 h-full cont-inner">
-            <div class="flex justify-between collapse-head">
-                <span class="text-16">全部内容</span>
+            <div class="flex justify-between collapse-head mt-2">
+                <span class="text-16 font-semibold">全部内容</span>
                 <span @click="toggleAll">
                     <span v-if="!collapseAll">展开全部</span>
                     <span v-else>收起全部</span>

src/residentWX/visit/detail/components/HypertensionDetailV2.vue

@@ -38,8 +38,8 @@
         </div>
         <div class="p-3 grow cont-box">
             <div class="p-3 h-full cont-inner">
-                <div class="flex justify-between collapse-head">
-                    <span class="text-16">全部内容</span>
+                <div class="flex justify-between collapse-head mt-2">
+                    <span class="text-16 font-semibold">全部内容</span>
                     <span @click="toggleAll">
                         <span v-if="!collapseAll">展开全部</span>
                         <span v-else>收起全部</span>

src/utils/common.js

@@ -66,6 +66,26 @@ export function debounce(fu, wait = 300) {
     }
 }
 
+// 复制文本
+export function copyToClip(content) {
+    if (!content) {
+        console.warn('copyToClip content 为空')
+    }
+    if (navigator.clipboard) {
+        return navigator.clipboard.writeText(content)
+    }
+    if (document.execCommand) {
+        let dom = document.createElement('textarea')
+        dom.value = content
+        document.body.appendChild(dom)
+        dom.select()
+        document.execCommand('copy')
+        document.body.removeChild(dom)
+        return true
+    }
+    return
+}
+
 /**
  * 请求参数处理
  * @param {Object} source 原数据