diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82e31f6..6a18803 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2022-02-10)
+# 0.1.0 (2022-02-11)
### 🌟 新功能
范围|描述|commitId
@@ -208,6 +208,7 @@
- | 卸载stylus | [610b465](https://101.201.226.163:50022/DIGITAL_MEDICAL/yanyuan/commits/610b465)
- | 新建长者信息清除数据 | [df5d3f4](https://101.201.226.163:50022/DIGITAL_MEDICAL/yanyuan/commits/df5d3f4)
- | 修改报错 | [531c14d](https://101.201.226.163:50022/DIGITAL_MEDICAL/yanyuan/commits/531c14d)
+ - | 修改部分bug | [a44ce6f](https://101.201.226.163:50022/DIGITAL_MEDICAL/yanyuan/commits/a44ce6f)
修改部分bug | 修改部分bug | [92bdab1](https://101.201.226.163:50022/DIGITAL_MEDICAL/yanyuan/commits/92bdab1)
- | 修改定期任务状态0和4时不加载圆圈 | [30e352f](https://101.201.226.163:50022/DIGITAL_MEDICAL/yanyuan/commits/30e352f)
- | 修改合并手机号逻辑 | [5d391a3](https://101.201.226.163:50022/DIGITAL_MEDICAL/yanyuan/commits/5d391a3)
diff --git a/src/components/Info/Info.vue b/src/components/Info/Info.vue
index 6a49ba4..7e3f9e8 100644
--- a/src/components/Info/Info.vue
+++ b/src/components/Info/Info.vue
@@ -393,11 +393,14 @@ export default {
this.$emit('setEmptyInfo');
setTimeout(() => {
const info = this.$t.storage.getStorageSync('infoList');
- console.log('info: ', info);
if (info !== 'null') {
this.infoList = JSON.parse(info);
}
}, 300);
+ } else {
+ setTimeout(() => {
+ this.setDate(this.personalInfo);
+ }, 300);
}
});
},
@@ -1036,6 +1039,7 @@ export default {
destroyed() {
this.setEmptyInfo();
+ // this.$t.storage.setStorageSync('infoList', null);
},
};
diff --git a/src/pagesProject/project/components/ConfigInfo/ConfigInfo.vue b/src/pagesProject/project/components/ConfigInfo/ConfigInfo.vue
index e3bfff4..aa9f168 100644
--- a/src/pagesProject/project/components/ConfigInfo/ConfigInfo.vue
+++ b/src/pagesProject/project/components/ConfigInfo/ConfigInfo.vue
@@ -33,8 +33,8 @@
-
-
+
+
@@ -72,6 +72,7 @@ export default {
width: '100%',
},
personalInfo: null,
+ showAdd: false,
};
},
@@ -130,18 +131,24 @@ export default {
// 添加
add(index) {
- if (index === 1) {
- if (this.itemList[index].open) {
+ this.changeCloseAdd(true);
+ if (!this.itemList[index].open) {
+ this.changeOpen(index);
+ } else {
+ if (index === 1) {
this.$refs.medicineChild[0].add();
}
- }
- if (index === 2) {
- if (this.itemList[index].open) {
+ if (index === 2) {
this.$refs.caregiverChild[0].add();
}
}
},
+ // 点击展开还是添加
+ changeCloseAdd(show) {
+ this.showAdd = show;
+ },
+
/**
* 查询个人信息
*/
diff --git a/src/pagesProject/project/components/ConfigInfo/components/Caregiver.vue b/src/pagesProject/project/components/ConfigInfo/components/Caregiver.vue
index 5c7eea6..49c2b28 100644
--- a/src/pagesProject/project/components/ConfigInfo/components/Caregiver.vue
+++ b/src/pagesProject/project/components/ConfigInfo/components/Caregiver.vue
@@ -1,6 +1,13 @@
-
+
@@ -21,7 +28,7 @@
-
+
@@ -35,6 +42,7 @@ import CaregiverDetail from './CaregiverDetail';
export default {
name: 'Info',
components: { CaregiverDetail },
+ props: { showAdd: { type: Boolean, default: false } },
data() {
return {
show: false,
@@ -63,14 +71,20 @@ export default {
...mapGetters('project', ['projectId']),
},
- mounted() {
- this.queryZaritList();
+ async mounted() {
+ if (!this.showAdd) {
+ this.queryZaritList();
+ } else {
+ await this.queryZaritList();
+ this.add();
+ }
},
methods: {
...mapMutations('yanyuan', ['setIsTest']),
// 切换手风琴
changeOpen(index) {
+ this.$emit('changeCloseAdd', false);
this.index = index;
this.show = false;
this.itemList.forEach((item, i) => {
@@ -104,6 +118,11 @@ export default {
console.log('关闭添加窗口');
this.show = false;
await this.queryZaritList();
+ this.$emit('changeCloseAdd', false);
+ },
+
+ changeAdd() {
+ this.$emit('changeCloseAdd', false);
},
/**
@@ -119,13 +138,15 @@ export default {
await this.queryZaritHistory();
} else {
this.show = false;
- date.forEach((item, index) => {
- if (index === this.index) {
- item.open = true;
- } else {
- item.open = false;
- }
- });
+ if (!this.showAdd) {
+ date.forEach((item, index) => {
+ if (index === this.index) {
+ item.open = true;
+ } else {
+ item.open = false;
+ }
+ });
+ }
this.itemList = date;
}
} catch (error) {
@@ -149,6 +170,11 @@ export default {
this.$t.ui.showToast(error.msg || '负担量表历史记录查询失败');
}
},
+
+ destroyed() {
+ console.log('555d');
+ this.$emit('changeCloseAdd', false);
+ },
},
};
diff --git a/src/pagesProject/project/components/ConfigInfo/components/CaregiverDetail.vue b/src/pagesProject/project/components/ConfigInfo/components/CaregiverDetail.vue
index 658daaf..b5112bf 100644
--- a/src/pagesProject/project/components/ConfigInfo/components/CaregiverDetail.vue
+++ b/src/pagesProject/project/components/ConfigInfo/components/CaregiverDetail.vue
@@ -229,6 +229,7 @@ export default {
const params = this.params;
params.projectId = this.projectId;
const data = await this.$u.api.addZarit(params);
+ this.$emit('changeAdd', false);
this.loading = false;
if (data) {
await this.handleFinishNum(data);
diff --git a/src/pagesProject/project/components/ConfigInfo/components/Medicine.vue b/src/pagesProject/project/components/ConfigInfo/components/Medicine.vue
index 2519eeb..74ca324 100644
--- a/src/pagesProject/project/components/ConfigInfo/components/Medicine.vue
+++ b/src/pagesProject/project/components/ConfigInfo/components/Medicine.vue
@@ -5,9 +5,7 @@
-
- {{ item.createAt }}
-
+ {{ item.createAt }}
@@ -29,6 +27,7 @@ import MedicineDetail from './MedicineDetail';
export default {
name: 'Info',
components: { MedicineDetail },
+ props: { showAdd: { type: Boolean, default: false } },
data() {
return {
show: false,
@@ -45,13 +44,19 @@ export default {
computed: mapGetters('project', ['projectId']),
- mounted() {
- this.queryMedicine();
+ async mounted() {
+ if (!this.showAdd) {
+ this.queryMedicine();
+ } else {
+ await this.queryMedicine();
+ this.add();
+ }
},
methods: {
// 切换手风琴
changeOpen(index) {
+ this.$emit('changeCloseAdd', false);
this.index = index;
this.show = false;
this.itemList.forEach((item, i) => {
@@ -81,9 +86,9 @@ export default {
// 关闭添加窗口
async closeAdd() {
- console.log('关闭添加窗口');
this.show = false;
await this.queryMedicine();
+ this.$emit('changeCloseAdd', false);
},
/**
@@ -99,13 +104,15 @@ export default {
this.show = true;
} else {
this.show = false;
- date.forEach((item, index) => {
- if (index === this.index) {
- item.open = true;
- } else {
- item.open = false;
- }
- });
+ if (!this.showAdd) {
+ date.forEach((item, index) => {
+ if (index === this.index) {
+ item.open = true;
+ } else {
+ item.open = false;
+ }
+ });
+ }
this.itemList = [...date];
}
} catch (error) {
@@ -113,6 +120,10 @@ export default {
}
},
},
+
+ destroyed() {
+ this.$emit('changeCloseAdd', false);
+ },
};
diff --git a/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue b/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue
index 36837bf..2c3fae0 100644
--- a/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue
+++ b/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue
@@ -13,6 +13,11 @@
{{ showMore ? '查看更多' : '收起' }}
+
+
+
+
+
@@ -29,16 +34,11 @@
}}
- {{ detail.content }}
+
-
-
-
-
-
-
-
-
+
+
+
@@ -124,6 +124,22 @@ export default {
checkShowMore() {
this.showMore = !this.showMore;
},
+
+ clickImg(src) {
+ wx.previewImage({
+ urls: [src], //需要预览的图片http链接列表,多张的时候,url直接写在后面就行了
+ current: '', // 当前显示图片的http链接,默认是第一个
+ success: function (res) {
+ console.log('success res: ', res);
+ },
+ fail: function (res) {
+ console.log('fail res: ', res);
+ },
+ complete: function (res) {
+ console.log('complete res: ', res);
+ },
+ });
+ },
},
};
diff --git a/src/pagesProject/project/project.vue b/src/pagesProject/project/project.vue
index b875e1e..3b583d7 100644
--- a/src/pagesProject/project/project.vue
+++ b/src/pagesProject/project/project.vue
@@ -83,7 +83,7 @@ export default {
this.templateCode = options.code;
if (options.share && options.share === '1') {
// TODO: 判断用户第一次进来才会显示引导页
- this.queryGuide(options.code);
+ // this.queryGuide(options.code);
this.shareInit(options);
} else {
if ((this.scene === 1007 || this.scene === 1008) && !this.showGuide) {
@@ -96,7 +96,7 @@ export default {
}, 300);
} else {
// TODO: 判断用户第一次进来才会显示引导页
- this.queryGuide(options.code);
+ // this.queryGuide(options.code);
this.init(options);
}
}
@@ -411,6 +411,9 @@ export default {
// 根据项目id获取角色列表
this.getRoles({ projectId: options.p, num: 0, templateCode: options.code });
+
+ // TODO: 判断用户第一次进来才会显示引导页
+ await this.queryGuide(options.code);
}
},