diff --git a/.env.localhost b/.env.localhost
index f379283..301cdf9 100644
--- a/.env.localhost
+++ b/.env.localhost
@@ -1,5 +1,6 @@
MP_API_BASE_URL=http://192.168.60.2:8080
+MP_IMAGE_URL=https://patient.youcan365.com
MP_CACHE_PREFIX=development
MP_WX_APP_ID=wx93af55767423938e
MP_CORP_ID=wwe3fb2faa52cf9dfb
-MP_TIM_SDK_APP_ID=1600072268
+MP_TIM_SDK_APP_ID=1600123876
diff --git a/pages.json b/pages.json
index db3eeeb..12530b2 100644
--- a/pages.json
+++ b/pages.json
@@ -103,6 +103,18 @@
"navigationBarTitleText": "我的团队"
}
},
+ {
+ "path": "pages/work/team/edit/team-edit",
+ "style": {
+ "navigationBarTitleText": "修改团队信息"
+ }
+ },
+ {
+ "path": "pages/work/team/detail/team-detail",
+ "style": {
+ "navigationBarTitleText": "团队信息"
+ }
+ },
{
"path": "pages/work/service/contact-service",
"style": {
diff --git a/pages/message/components/consult-accept.vue b/pages/message/components/consult-accept.vue
index c593baa..a32bec6 100644
--- a/pages/message/components/consult-accept.vue
+++ b/pages/message/components/consult-accept.vue
@@ -13,7 +13,6 @@
+
\ No newline at end of file
diff --git a/pages/work/team/edit/team-edit.vue b/pages/work/team/edit/team-edit.vue
new file mode 100644
index 0000000..93e5cd7
--- /dev/null
+++ b/pages/work/team/edit/team-edit.vue
@@ -0,0 +1,106 @@
+
+
+
+ 团队名称:
+
+
+
+ 团队名称:
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/team/invite/invite-patient.vue b/pages/work/team/invite/invite-patient.vue
index 8aa8c83..9b80748 100644
--- a/pages/work/team/invite/invite-patient.vue
+++ b/pages/work/team/invite/invite-patient.vue
@@ -56,10 +56,10 @@ import { onLoad } from "@dcloudio/uni-app";
import useAccountStore from "@/store/account.js";
import useGuard from '@/hooks/useGuard';
import api from "@/utils/api.js";
+import { toast } from "@/utils/widget";
import emptyData from "@/components/empty-data.vue";
import renamePopup from "./rename-popup.vue";
-import { toast } from "../../../../utils/widget";
const options = { margin: 10 }
@@ -136,7 +136,6 @@ useShow(() => {
}
.edit-sub {
-
width: 36rpx;
height: 36rpx;
}
diff --git a/pages/work/team/invite/invite-teammate.vue b/pages/work/team/invite/invite-teammate.vue
index ab452a4..223167d 100644
--- a/pages/work/team/invite/invite-teammate.vue
+++ b/pages/work/team/invite/invite-teammate.vue
@@ -1,3 +1,52 @@
- 邀请成员
-
\ No newline at end of file
+
+
+
+ {{ team.name }}
+
+
+ 成员邀请码
+
+
+
+
+
+ 微信扫一扫上面的二维码
+
+
+ 加入我的团队,协同开展患者管理服务
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/work/team/list/team-list.vue b/pages/work/team/list/team-list.vue
index e7e5e10..052ec85 100644
--- a/pages/work/team/list/team-list.vue
+++ b/pages/work/team/list/team-list.vue
@@ -4,27 +4,31 @@
-
+
- 133****2365服务团队133****2365服务团队133****2365服务团队133****2365服务团队133****2365服务团队133****2365服务团队133****2365服务团队
+ {{ i.name }}
创建
加入
- 成员: 20
- 患者: 200
+
+ 成员: {{ i.memberList && i.memberList.length ? i.memberList.length : 0 }}
+
+
+ 患者: 200
+
-
+
邀请患者
-
+
@@ -40,31 +44,44 @@ import emptyData from "@/components/empty-data.vue";
import fullPage from '@/components/full-page.vue';
const { useShow } = useGuard();
-const { doctorInfo } = storeToRefs(useAccountStore());
+const { doctorInfo, account } = storeToRefs(useAccountStore());
const list = ref([]);
function invitePatient(team) {
uni.navigateTo({ url: `/pages/work/team/invite/invite-patient?teamId=${team.teamId || ''}` })
}
+function toCreate() {
+ uni.navigateTo({ url: '/pages/work/team/edit/team-edit' })
+}
+
+function toDetail(team) {
+ uni.navigateTo({ url: `/pages/work/team/detail/team-detail?teamId=${team.teamId || ''}` })
+}
+
async function getTeams() {
const res = await api('getJoinedTeams', { corpId: account.value?.corpId, mateId: doctorInfo.value?.userid });
const arr = res && Array.isArray(res.data) ? res.data.map(i => ({
id: i._id,
teamId: i.teamId,
name: i.name,
- qrcode: i.qrcodes && i.qrcodes[0] && i.qrcodes[0].qrcode ? i.qrcodes[0].qrcode : ''
+ memberList: i.memberList,
+ creator: i.creator
})) : [];
list.value = arr;
}
+
useShow(() => {
- console.log(111111)
getTeams();
})
\ No newline at end of file
+.icon-filter {
+ width: 42rpx;
+ height: 42rpx;
+}
+
+.bg-opacity {
+ position: relative;
+}
+
+.bg-opacity::after {
+ content: '';
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ opacity: 0.2;
+ background: currentColor;
+}
+
+.py-3 {
+ padding-top: 6rpx;
+ padding-bottom: 6rpx;
+}
+
\ No newline at end of file
diff --git a/routes/index.js b/routes/index.js
index b294b03..34dc08a 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -38,7 +38,7 @@ export default [
},
{
path: 'pages/work/profile',
- meta: { title: '完善个人信息' }
+ meta: { title: '完善个人信息', login: true }
},
{
path: 'pages/work/department-select',
@@ -58,16 +58,24 @@ export default [
},
{
path: 'pages/work/team/invite/invite-patient',
- meta: { title: '邀请患者' }
+ meta: { title: '邀请患者', login: true }
},
{
path: 'pages/work/team/invite/invite-teammate',
- meta: { title: '邀请成员' }
+ meta: { title: '邀请成员', login: true }
},
{
path: 'pages/work/team/list/team-list',
- meta: { title: '我的团队' }
+ meta: { title: '我的团队', login: true }
},
+ {
+ path: 'pages/work/team/edit/team-edit',
+ meta: { title: '修改团队信息', login: true }
+ },
+ {
+ path: 'pages/work/team/detail/team-detail',
+ meta: { title: '团队信息', login: true }
+ },
{
path: 'pages/work/service/contact-service',
meta: { title: '联系企微客服' }
diff --git a/static/work/icon-filter.svg b/static/work/icon-filter.svg
new file mode 100644
index 0000000..8a328a9
--- /dev/null
+++ b/static/work/icon-filter.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/static/work/icon-filtered.svg b/static/work/icon-filtered.svg
new file mode 100644
index 0000000..f316c40
--- /dev/null
+++ b/static/work/icon-filtered.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/utils/api.js b/utils/api.js
index ef19d80..d6c7b3d 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -17,7 +17,10 @@ const urlsConfig = {
submitCertProfile: 'submitCertProfile',
getMemberVerifyStatus: "getMemberVerifyStatus",
getJoinedTeams: "getJoinedTeams",
- updateTeamInfo: "updateTeamInfo"
+ updateTeamInfo: "updateTeamInfo",
+ createOwnTeam: 'createOwnTeam',
+ removeTeammate: "removeTeammate",
+ toggleTeamLeaderRole: "toggleTeamLeaderRole"
},
knowledgeBase: {
@@ -40,7 +43,7 @@ const urlsConfig = {
getArticle: 'getArticle',
addArticleSendRecord: 'addArticleSendRecord'
},
-
+
survery: {
getSurveyCateList: 'getSurveryCateList',
getSurveyList: 'getList',