diff --git a/.env.development b/.env.development index 4593667..f057aa8 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,8 @@ VUE_APP_NODE_ENV=development -VUE_APP_BASE_URL=https://www.tall.wiki -VUE_APP_API_URL=https://www.tall.wiki/gateway -VUE_APP_MSG_URL=ws://www.tall.wiki/websocket/message/v4.0/ws -VUE_APP_PROJECT_PATH=https://www.tall.wiki/carBasicTall -VUE_APP_QUESTION_PATH=https://www.tall.wiki/carbasics +VUE_APP_BASE_URL=https://test.tall.wiki +VUE_APP_API_URL=https://test.tall.wiki/gateway +VUE_APP_MSG_URL=ws://test.tall.wiki/websocket/message/v4.0/ws +VUE_APP_PROJECT_PATH=https://test.tall.wiki/carBasicTall +VUE_APP_QUESTION_PATH=https://test.tall.wiki/carbasics VUE_APP_VERSION=v3.1.0 VUE_APP_PUBLIC_PATH=/carBasicCalendar/ diff --git a/.env.production b/.env.production index 158f804..c7b1a17 100644 --- a/.env.production +++ b/.env.production @@ -1,8 +1,8 @@ VUE_APP_NODE_ENV=production -VUE_APP_BASE_URL=https://www.tall.wiki -VUE_APP_API_URL=https://www.tall.wiki/gateway -VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws -VUE_APP_PROJECT_PATH=https://www.tall.wiki/carBasicTall -VUE_APP_QUESTION_PATH=https://www.tall.wiki/carbasics +VUE_APP_BASE_URL=https://test.tall.wiki +VUE_APP_API_URL=https://test.tall.wiki/gateway +VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws +VUE_APP_PROJECT_PATH=https://test.tall.wiki/carBasicTall +VUE_APP_QUESTION_PATH=https://test.tall.wiki/carbasics VUE_APP_VERSION=v3.1.0 VUE_APP_PUBLIC_PATH=/carBasicCalendar/ diff --git a/src/App.vue b/src/App.vue index ddfcacd..91399ef 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,7 +5,6 @@ export default { async onLaunch(options) { // const obj = { title: '暴风眼Typhoneye' }; // uni.showShareMenu(obj); - console.log('options: ', options); this.checkNetwork(); // 监听网络状态 this.getSystemInfo(); // 获取系统设备信息 this.autoUpdate(); diff --git a/src/components/PatientList/PatientList.vue b/src/components/PatientList/PatientList.vue index c456987..1952ce8 100644 --- a/src/components/PatientList/PatientList.vue +++ b/src/components/PatientList/PatientList.vue @@ -198,7 +198,6 @@ export default { }, // 退出急救 quitTips(id) { - console.log('id: ', id); this.quitId = id; this.show1 = true; }, @@ -207,7 +206,6 @@ export default { try { const param = { firstAidId: this.quitId, projectId: this.projectId }; const res = await uni.$u.api.quitAid(param); - console.log('res: ', res); this.getData(true); this.visible1 = false; } catch (error) { @@ -226,7 +224,6 @@ export default { if (!(recordUserId - 0)) { this.changeShow(firstAidId, caseType, demonstrate); } else { - console.log('firstAidId: ', firstAidId); this.setFirstAidId(firstAidId); this.setDetailValueType(demonstrate); // this.$router.push(`/patient-line`); @@ -311,7 +308,6 @@ export default { try { const param = { firstAidId: this.delFirstAidId }; const res = await this.$u.api.delDemo(param); - console.log('res: ', res); this.getData(true); } catch (error) { console.log('error: ', error); @@ -345,7 +341,6 @@ export default { } this.total = data.page.total; this.role = data.role; - console.log('this.role: ', this.role); } else { this.$t.ui.showToast('没有更多数据'); } diff --git a/src/pages.json b/src/pages.json index 59cece0..78a57de 100644 --- a/src/pages.json +++ b/src/pages.json @@ -58,7 +58,7 @@ { "path": "pages/inner/inner", "style": { - "navigationBarTitleText": "信息录入", + "navigationBarTitleText": "", "enablePullDownRefresh": true } }, @@ -77,7 +77,7 @@ { "path": "pages/outside/outside", "style": { - "navigationBarTitleText": "信息录入" + "navigationBarTitleText": "" } }, { diff --git a/src/pages/inner/inner.vue b/src/pages/inner/inner.vue index ec2d2bd..a9d56c3 100644 --- a/src/pages/inner/inner.vue +++ b/src/pages/inner/inner.vue @@ -303,7 +303,12 @@ export default { }, // 页面周期函数--监听页面加载 - onLoad() { + onLoad(query) { + if (query.name) { + uni.setNavigationBarTitle({ + title: query.name, + }); + } this.type = this.InputCode; // if (this.type === 'RYPG') { // this.afterStr = '主要治疗'; diff --git a/src/pages/patientLine/patientLine.vue b/src/pages/patientLine/patientLine.vue index 2702c9b..e86599f 100644 --- a/src/pages/patientLine/patientLine.vue +++ b/src/pages/patientLine/patientLine.vue @@ -12,7 +12,7 @@ {{ item.time }} -
+
{{ item.name }} @@ -115,9 +115,9 @@ export default { }, methods: { ...mapMutations('carbasics', ['setInputCode']), - jump(code, path) { + jump(code, path, name) { this.setInputCode(code ? code : 'RYPG'); - uni.navigateTo({ url: path }); + uni.navigateTo({ url: `${path}?name=${name}` }); }, }, watch: {},