Skip to content

P
pica-insurance
提交 dba5da05 编写于 作者: 张敬贤's avatar 张敬贤
浏览文件
操作

Feature/zjx

上级 a4a7375d
隐藏空白字符变更
内嵌 并排
正在显示 包含 145 行增加 和 49 行删除
.eslintrc.js
浏览文件 @ dba5da05
...@@ -13,6 +13,7 @@ module.exports = { ...@@ -13,6 +13,7 @@ module.exports = {
// 全局变量 // 全局变量
globals: { globals: {
'gdp': true, 'gdp': true,
'uni': true,
}, },
// add your custom rules here // add your custom rules here
//it is base on https://github.com/vuejs/eslint-config-vue //it is base on https://github.com/vuejs/eslint-config-vue
......
public/index.html
浏览文件 @ dba5da05
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<link rel="dns-prefetch" href="<%= process.env.VUE_APP_SERVICE_URL %>"> <link rel="dns-prefetch" href="<%= process.env.VUE_APP_SERVICE_URL %>">
<link rel="icon" type="image/x-icon" href="<%= VUE_APP_OSS_URL %>static/img/logo.png"> <link rel="icon" type="image/x-icon" href="<%= VUE_APP_OSS_URL %>static/img/logo.png">
<title>云鹊医</title> <title>云鹊医</title>
</head> </head>
<body> <body>
<noscript> <noscript>
...@@ -28,6 +29,8 @@ ...@@ -28,6 +29,8 @@
<script src="<%= VUE_APP_OSS_URL %>static/js/crypto.min-4.0.0.js"></script> <script src="<%= VUE_APP_OSS_URL %>static/js/crypto.min-4.0.0.js"></script>
<script src="<%= VUE_APP_OSS_URL %>static/js/vconsole-3.3.4.js"></script> <script src="<%= VUE_APP_OSS_URL %>static/js/vconsole-3.3.4.js"></script>
<script src="<%= VUE_APP_OSS_URL %>static/js/lodash-4.17.15.js"></script> <script src="<%= VUE_APP_OSS_URL %>static/js/lodash-4.17.15.js"></script>
<script type="text/javascript" src="https://unpkg.com/@dcloudio/uni-webview-js@0.0.3/index.js"></script>
<script> <script>
!(function(c,b,d,a){c[a]||(c[a]={});c[a].config= !(function(c,b,d,a){c[a]||(c[a]={});c[a].config=
{ {
......
src/components/selectTime/index.vue
浏览文件 @ dba5da05
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
</div> </div>
<div class="time-list-right"> <div class="time-list-right">
<div <div
v-show="currentItem.amTimeBegin !='' && currentItem.amTimeEnd !=''"
class="text" class="text"
:class="selectTimeBucket === 'amTimeBegin' ?'selected':''" :class="selectTimeBucket === 'amTimeBegin' ?'selected':''"
@click="selectTimeB('amTimeBegin')" @click="selectTimeB('amTimeBegin')"
...@@ -33,6 +34,7 @@ ...@@ -33,6 +34,7 @@
{{ currentItem.amTimeContent }} {{ currentItem.amTimeContent }}
</div> </div>
<div <div
v-if="currentItem.pmTimeBegin !='' && currentItem.pmTimeEnd!=''"
class="text" class="text"
:class="selectTimeBucket === 'pmTimeBegin' ?'selected':''" :class="selectTimeBucket === 'pmTimeBegin' ?'selected':''"
@click="selectTimeB('pmTimeBegin')" @click="selectTimeB('pmTimeBegin')"
...@@ -82,7 +84,7 @@ export default { ...@@ -82,7 +84,7 @@ export default {
}; };
}, },
watch: { watch: {
projectEquityNo: { hospitalId: {
handler(nv) { handler(nv) {
if (nv) { if (nv) {
this.getScheduling(); this.getScheduling();
...@@ -155,7 +157,7 @@ export default { ...@@ -155,7 +157,7 @@ export default {
if (!this.currentItem[item]) { if (!this.currentItem[item]) {
return; return;
} }
this.selectTimeBucket = item === 'amTimeBegin' ? this.currentItem['amTimeContent'] : this.currentItem['pmTimeContent']; this.selectTimeBucket = item === 'amTimeBegin' ? this.currentItem['amTimeBegin'] : this.currentItem['pmTimeBegin'];
this.selectItem(); this.selectItem();
} }
} }
......
src/router/index.js
浏览文件 @ dba5da05
...@@ -55,24 +55,20 @@ const routerConfig = [ ...@@ -55,24 +55,20 @@ const routerConfig = [
component: () => import('@/views/pdf-preview/index.vue'), component: () => import('@/views/pdf-preview/index.vue'),
}, },
]; ];
// 无问卷-0001 有问卷未填写-0101 已填写问卷未出结果-0102 已出结果无需领用-0401 已出结果未预约-0201 已预约未采样-0301 已预约已采样-0302 // // 无问卷-0001 有问卷未填写-0101 已填写问卷未出结果-0102 已出结果无需领用-0401 已出结果未预约-0201 已预约未采样-0301 已预约已采样-0302
const routerMap = { // const routerMap = {
'0001': null, // '0001': null,
'0101': null, // '0101': null,
'0102': null, // '0102': null,
'0401': null, // '0401': null,
'0201': '/appoint', // '0201': '/appoint',
'0301': null, // '0301': null,
'0302': null, // '0302': null,
}; // };
router.beforeEach(async (to, from, next) => { router.beforeEach(async (to, from, next) => {
console.log(to, from, next); console.log(to, from, next);
if (to.name === 'home') {
console.log(to.name, routerMap);
} else {
next(); next();
}
}); });
router.addRoutes(routerConfig); router.addRoutes(routerConfig);
......
src/views/appoint/index.vue
浏览文件 @ dba5da05
...@@ -145,6 +145,12 @@ ...@@ -145,6 +145,12 @@
</van-field> </van-field>
</van-form> </van-form>
</div> </div>
<van-button
@click="submit"
>
提交1
</van-button>
<van-button <van-button
round round
block block
...@@ -249,10 +255,10 @@ export default { ...@@ -249,10 +255,10 @@ export default {
longitude:'' longitude:''
}, },
locationAreaCode: [], locationAreaCode: [],
hospitalId: '12746', hospitalId: '',
projectEquityNo: '', projectEquityNo: '',
yunOrderNo: '', yunOrderNo: '',
externalData:{} externalData: {},
}; };
}, },
computed: { computed: {
...@@ -288,10 +294,27 @@ export default { ...@@ -288,10 +294,27 @@ export default {
this.getDetectionName(yunOrderNo); this.getDetectionName(yunOrderNo);
this.getOrderInfo(yunOrderNo); this.getOrderInfo(yunOrderNo);
this.initMap(); this.initMap();
// document.addEventListener('UniAppJSBridgeReady', function() {
// console.log('UniAppJSBridgeReady', uni);
// });
// if (uni) {
// this.uni = uni;
// }
}, },
methods: { methods: {
choose() {}, choose() {},
submit() { }, submit() {
console.log(1122334);
uni.postMessage({
data: {
action: 'message'
}
});
uni.navigateTo({
url: '/pagesInsurance/binding-code/index'
});
console.log(1122334);
},
// 高德地图导航只有在线上环境才能使用 // 高德地图导航只有在线上环境才能使用
initMap() { initMap() {
var that = this; var that = this;
...@@ -357,7 +380,6 @@ export default { ...@@ -357,7 +380,6 @@ export default {
// 目前是配置一个检测信息，可能会拓展，所以返回的是一个list // 目前是配置一个检测信息，可能会拓展，所以返回的是一个list
getDetectionName(yunOrderNo) { getDetectionName(yunOrderNo) {
getDetectionName(yunOrderNo).then(res => { getDetectionName(yunOrderNo).then(res => {
if (res.code === '000000' && res.data) { if (res.code === '000000' && res.data) {
const dectionData = res.data[0] || {}; const dectionData = res.data[0] || {};
console.log('getDetectionName', dectionData); console.log('getDetectionName', dectionData);
...@@ -424,7 +446,14 @@ export default { ...@@ -424,7 +446,14 @@ export default {
yunOrderNo:this.yunOrderNo, yunOrderNo:this.yunOrderNo,
}; };
appointment(data).then(res => { appointment(data).then(res => {
console.log('confirm', res); if (res.code === '000000') {
this.$router.push({
path: '/appoint-details',
query: {
yunOrderNo:this.yunOrderNo
}
});
}
}); });
}, },
......
src/views/appointDetails/index.vue
浏览文件 @ dba5da05
...@@ -155,14 +155,28 @@ export default { ...@@ -155,14 +155,28 @@ export default {
showSsheet:false, showSsheet:false,
yunOrderNo: '', yunOrderNo: '',
query:{}, query:{},
// 状态 0=待预约，1=已预约 ，2=已出报告 4=已取消 5=已过期 // 状态 代码 说明
// 0101 未填写问卷
// 0102 已填写问卷
// 0201 待预约
// 0202 已预约
// 0203 已取消待重新预约
// 0301 待采样
// 0302 已采样
// 0303 待重新采样
// 0304 已出报告
// 0401 已结束
statusMap: { statusMap: {
0: '待预约', '0101': '未填写问卷',
1: '已预约', '0102': '已填写问卷',
2: '已出报告', '0201': '待预约',
3: '已采样', '0202': '已预约',
4: '已取消', '0203': '已取消待重新预约',
5: '已过期', '0301': '待采样',
'0302': '已采样',
'0303': '待重新采样',
'0304': '已出报告',
'0401': '已结束',
}, },
}; };
}, },
...@@ -185,13 +199,16 @@ export default { ...@@ -185,13 +199,16 @@ export default {
getDetailByYunOrderNo(yunOrderNo) { getDetailByYunOrderNo(yunOrderNo) {
getDetailByYunOrderNo(yunOrderNo).then(res => { getDetailByYunOrderNo(yunOrderNo).then(res => {
console.log(res); console.log(res);
this.detailInfo = res.data;
}); });
}, },
checkDetail() { checkDetail() {
}, },
reAppoint() { reAppoint() {
this.$router.push({
});
}, },
selectItem(item) { selectItem(item) {
const geolocation = store.get('geolocation'); const geolocation = store.get('geolocation');
...@@ -218,7 +235,6 @@ export default { ...@@ -218,7 +235,6 @@ export default {
break; break;
case 3: case 3:
// https://lbsyun.baidu.com/index.php?title=uri/api/web api地址 // https://lbsyun.baidu.com/index.php?title=uri/api/web api地址
url = 'http://api.map.baidu.com/marker?location=' + latitude + ',' + longitude + '&title=' + hospitalName + '&output=html&src=webapp.baidu.openAPIdemo'; url = 'http://api.map.baidu.com/marker?location=' + latitude + ',' + longitude + '&title=' + hospitalName + '&output=html&src=webapp.baidu.openAPIdemo';
break; break;
default: default:
...@@ -228,10 +244,16 @@ export default { ...@@ -228,10 +244,16 @@ export default {
} }
console.log('geolocation', url); console.log('geolocation', url);
window.open(url); window.open(url);
}, },
bindingCode() { bindingCode() {
const {pprotocolType, detectionServiceRecordId} = this.detailInfo;
this.$router.push({ this.$router.push({
path:'/insuranceBindCode' path: '/insuranceBindCode',
query: {
pprotocolType,
detectionRecordId:detectionServiceRecordId,
}
}); });
}, },
navigation() { navigation() {
......
src/views/home/index.vue
浏览文件 @ dba5da05
<template> <template>
<div>111</div> <div />
</template> </template>
<script> <script>
import { getJumpPageStatus} from '@/api/question';
export default { export default {
data() { data() {
return { return {
// 无问卷-0001 有问卷未填写-0101 已填写问卷未出结果-0102 已出结果无需领用-0401 已出结果未预约-0201 已预约未采样-0301 已预约已采样-0302
routerMap:{
'0001': '/appoint',
'0101': null,
'0102': '/insuranceQuestionBack',
'0401': '/insuranceQuestionResult',
'0201': '/appoint',
'0301': '/appoint-details',
'0302': '/insuranceBindCode',
}
}; };
}, },
methods: {
// 获取跳转状态
getJumpPageStatus() {
getJumpPageStatus(this.orderNo, this.projectEquityNo).then(res => {
if (res.code == '000000') {
this.yunOrderNo = res.data.yunOrderNo;
this.query.yunOrderNo = res.data.yunOrderNo;
this.status = res.data.status;
switch (res.data.status) {
case '0001':
this.turnToPage(this.routerMap[ this.status], this.query);
break;
case '0101':
// this.turnToPage(this.routerMap[ this.status], this.query);
// 跳转到问卷页面
window.location.href = res.data.url;
break;
case '0102':
// 跳转到结果页面;
this.turnToPage(this.routerMap[this.status], this.query);
break;
case '0401':
this.query.needDetect = 1;
this.turnToPage(this.routerMap[this.status], this.query);
break;
case '0201':
this.turnToPage(this.routerMap[this.status], this.query);
break;
case '0301':
this.turnToPage(this.routerMap[this.status], this.query);
break;
case '0302':
this.turnToPage(this.routerMap[this.status], this.query);
break;
default:
break;
}
}
});
},
turnToPage(path, query) {
this.$router.push({
path, query
});
}
}
}; };
</script> </script>
......
src/views/insurance-question-result/insuranceQuestionResult.vue
浏览文件 @ dba5da05
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</template> </template>
<script> <script>
import {getButtonStatus, getJumpPageStatus} from '@/api/question'; import {getButtonStatus} from '@/api/question';
export default { export default {
data() { data() {
return { return {
...@@ -102,7 +102,7 @@ export default { ...@@ -102,7 +102,7 @@ export default {
console.log(11223); console.log(11223);
const { query } = this.$route; const { query } = this.$route;
this.query = query; this.query = query;
this.getJumpPageStatus(); this.getButtonStatus(query.yunOrderNo);
}, },
methods: { methods: {
statusMap(status) { statusMap(status) {
...@@ -116,26 +116,13 @@ export default { ...@@ -116,26 +116,13 @@ export default {
}; };
return m[status]; return m[status];
}, },
// 获取跳转状态
getJumpPageStatus() {
getJumpPageStatus(this.orderNo, this.projectEquityNo).then(res => {
// console.log('res', getJumpPageStatus);
if (res.code == '000000') {
this.yunOrderNo = res.data.yunOrderNo;
this.query.yunOrderNo = res.data.yunOrderNo;
this.status = res.data.status;
this.needDetect = this.status === '0401';
this.getButtonStatus(res.data.yunOrderNo);
}
});
},
// 去预约 // 去预约
toAppoint() { toAppoint() {
if (this.buttonStatus) { if (this.buttonStatus) {
const {projectEquityNo, orderNo, yunOrderNo} = this; const {projectEquityNo, orderNo, yunOrderNo} = this.query;
this.$router.push({ this.$router.push({
path: this.routerMap[this.status], path: '/appoint',
query: {projectEquityNo, orderNo, yunOrderNo}, query: {projectEquityNo, orderNo, yunOrderNo},
}); });
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或