Skip to content

P
pica-insurance
提交 7662caa3 编写于 作者: 张磊's avatar 张磊
浏览文件
操作

auto commit

上级 924486f5
隐藏空白字符变更
内嵌 并排
正在显示 包含 42 行增加 和 134 行删除
src/api/detection.js
浏览文件 @ 7662caa3
......@@ -9,10 +9,10 @@ export const getDetectionDetail = (id) => {
};
// 检测详情节点查询
export const getDetectionDetailProces = (id) => {
export const getDetectionDetailProces = (data) => {
return request({
method: 'get',
url: `/trade/detection/record/process/${id}`,
url: `/trade/detection/record/process/${data.id}?channel=${data.channel}`,
withCredentials: true,
});
};
......
src/plugins/httpExtension.js
浏览文件 @ 7662caa3
......@@ -17,8 +17,7 @@ $http.addBeforeHook(config => console.log('我是新增的前置钩子', config)
// 新增后置钩子
$http.addAfterHook(response => {
if (response.code !== '000000' ) {
if (response.data.code !== '000000') {
Toast(response.data.message);
}
console.log('我是新增的后置钩子', response);
......
src/router/index.js
浏览文件 @ 7662caa3
......@@ -3,6 +3,7 @@ import insuranceBindCode from '@/views/insurance-bind-code/insurance-bind-code';
import insuranceDetectionDetail from '@/views/insurance-detection-detail/insurance-detection-detail';
import insuranceBindCodeSuccess from '@/views/insurance-bindCode-success/insurance-bindCode-success';
import handleAllRouter from '../public_uat';
const routerConfig = [
{
path: '/insuranceBindCode',
......@@ -55,24 +56,9 @@ const routerConfig = [
component: () => import('@/views/pdf-preview/index.vue'),
},
];
// 无问卷-0001 有问卷未填写-0101 已填写问卷未出结果-0102 已出结果无需领用-0401 已出结果未预约-0201 已预约未采样-0301 已预约已采样-0302
const routerMap = {
'0001': null,
'0101': null,
'0102': null,
'0401': null,
'0201': '/appoint',
'0301': null,
'0302': null,
};
router.beforeEach(async (to, from, next) => {
console.log(to, from, next);
if (to.name === 'home') {
console.log(to.name, routerMap);
} else {
next();
}
});
router.addRoutes(routerConfig);
......
src/views/appoint/index.vue
浏览文件 @ 7662caa3
......@@ -187,7 +187,6 @@
</template>
<script>
import store from 'storejs';
import {getDetectionName, getOrderInfo, appointment, getHospitalList} from '@/api/appoint';
import SelectHospital from '@/components/selectHospital/index.vue';
import SelectTime from '@/components/selectTime/index.vue';
......@@ -323,9 +322,6 @@ export default {
});
geolocation.getCurrentPosition((status, result) => {
console.log('geolocation,', status, result);
if (geolocation.result) {
store.set('geolocation', geolocation.result.position);
}
that.position.latitude = result.position.lat || '';
that.position.longitude = result.position.lng || '';
const data = {
......@@ -364,7 +360,6 @@ export default {
this.dectionData = dectionData;
this.dectionForm.detectName = dectionData.detectionName;
this.dectionForm.goodsId = dectionData.goodsId;
this.$store.dispatch('setInsuranceInfo', dectionData);
}
});
......
src/views/appointDetails/index.vue
浏览文件 @ 7662caa3
......@@ -138,7 +138,6 @@
<script>
import {getDetailByYunOrderNo} from '@/api/appoint';
import { mapActions, mapGetters } from 'vuex';
import store from 'storejs';
export default {
data() {
return {
......@@ -150,7 +149,7 @@ export default {
style: 'backgroundColor:#ffffff;zIndex:100;',
background: '',
},
actions: [{ name: '高德地图', value:1 }, { name: '腾讯地图', value:2 }, { name: '百度地图', value:3}],
actions: [{ name: '高德地图', value:1 }, { name: '腾讯地图', value:1 }, { name: '百度地图', value:1}],
detailInfo: {},
showSsheet:false,
yunOrderNo: '',
......@@ -194,41 +193,10 @@ export default {
},
selectItem(item) {
const geolocation = store.get('geolocation');
const hospitalName = '上海市浦东新区兰花路333';
let url = '';
// lat<纬度>,lng<经度>
const latitude = '31.234527';
const longitude = '121.287689';
if (geolocation && geolocation.lat && geolocation.lng) {
// https://uri.amap.com/navigation
} else {
console.log(item);
switch (item.value) {
case 1:
// https://lbs.amap.com/api/uri-api/guide/mobile-web/point api地址
url = 'https://uri.amap.com/marker?&name=' + hospitalName + '&position=' + longitude + ',' + latitude + '&callnative=1';
break;
case 2:
// https://lbs.qq.com/webApi/uriV1/uriGuide/uriWebMarker api地址
url = 'https://apis.map.qq.com/uri/v1/geocoder?coord=' + latitude + ',' + longitude + '&referer=PICA';
break;
case 3:
// 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';
break;
default:
url = 'https://uri.amap.com/marker?&name=' + hospitalName + '&position=' + longitude + ',' + latitude + '&callnative=1';
break;
}
}
console.log('geolocation', url);
console.log(item);
const address = '上海市浦东新区兰花路333';
const url = 'https://uri.amap.com/marker?&name=' + address + '&callnative=1';
window.open(url);
},
bindingCode() {
this.$router.push({
......
src/views/home/index.vue
浏览文件 @ 7662caa3
<template>
<div>111</div>
</template>
<script>
export default {
data() {
return {
};
},
};
</script>
<style>
</style>
src/views/insurance-bind-code/insurance-bind-code.vue
浏览文件 @ 7662caa3
......@@ -18,14 +18,6 @@
>
{{ detectionData.checkName || '' }}
</div>
<div class="code-input-item-r">
<div
class="scan-qr-img-container"
@click="triggerEditModal"
>
修改
</div>
</div>
</div>
</div>
</div>
......@@ -113,10 +105,11 @@
提交
</div>
</div>
<van-overlay
z-index="11"
lock-scroll="false"
:show="showProtocol"
<van-popup
v-model="showProtocol"
position="bottom"
:style="{ height: '80%' }"
:transition-appear="true"
@click="showProtocol = false"
>
<div class="protocol-content">
......@@ -134,7 +127,7 @@
知情并提交
</van-button>
</div>
</van-overlay>
</van-popup>
<van-dialog
v-model="showBindingInfo"
confirm-button-color="#00BDA5"
......@@ -206,9 +199,8 @@ export default {
background: '',
},
showBindingInfo: false,
showEditModal: false,
isCheck: false,
barCode: '020987654321',
barCode: '',
protocolName: '',
prototypeId: '',
prototypeLogId: '',
......@@ -247,28 +239,11 @@ export default {
validateIdNo: 0,
};
this.detectionData = mock;
this.getProtocolName();
this.getRecordInfo();
const { pprotocolType, detectionRecordId } = this.$route.query;
this.getProtocolName(pprotocolType);
this.getRecordInfo(detectionRecordId);
},
methods: {
triggerEditModal() {
this.$dialog.confirm({
title: '确认提交',
message: '点击修改,将需要重新登记检测信息',
confirmButtonColor:'#00BDA5',
cancelButtonColor:'#00BDA5',
confirmButtonText:'确认',
cancelButtonText:'返回'
})
.then(() => {
// on confirm
})
.catch(() => {
// on cancel
});
this.showEditModal = true;
},
clearCode() {
this.barCode = '';
},
......@@ -280,13 +255,13 @@ export default {
scanType: ['barCode'], // 可以指定扫二维码还是一维码，默认二者都有
success: function (res) {
console.log('---res', res);
const s = res.resultStr;
that.barCode = s && s.spilt(',')[1];
}
};
this.$rocNative && this.$rocNative.scanQRCode(p, (res) => {
console.log('====', res);
if(res.resultStr) {
const s = String(res.resultStr).split(',');
that.barCode = s[1];
}
});
},
toggleBindingInfo() {
......@@ -336,9 +311,8 @@ export default {
if (res.code !== '000000') {
return this.$toast(res.message);
}
this.agreeText = res.data;
this.showProtocol = true;
const protoData = res.data;
this.agreeText = protoData;
});
},
getProtocolName() {
......
src/views/insurance-bindCode-success/insurance-bindCode-success.vue
浏览文件 @ 7662caa3
......@@ -136,7 +136,6 @@ export default {
document.execCommand('Copy');
document.body.removeChild(input);
this.$toast('已复制');
window.scrollTo(0, 1);
},
},
};
......
src/views/insurance-detection-detail/insurance-detection-detail.vue
浏览文件 @ 7662caa3
......@@ -168,18 +168,18 @@
</div>
<!-- v-if="[3].includes(dataDetail.status)"-->
<div
v-if="dataDetail.checkName"
class="submit-button"
@click="getJumpToWebapp"
>
<wx-open-launch-weapp
style="position: absolute; top: 0; left: 0; width: 100%; height: 100%"
username="gh_e92f58174364"
path="pages/health/detection-detail/index"
:env-version="VUE_APP_ENV != 'testing' ? 'release' : 'trial'"
:extra-data="{id: 113}"
:username="openWebAppConfig.username"
:path="openWebAppConfig.path"
env-version="trial"
:extra-data="openWebAppConfig.extraData"
>
<script type="text/wxtag-template">
<style>.btn {position:absolute; top: 0; left: 0; width:100%; height: 100%;}</style> <div class="btn">报告解读{{dataDetail.status}}</div>
<style>.btn {position:absolute; top: 0; color: #ffffff;text-align: center;line-height: 40px; left: 0; width:100%; height: 100%;}</style> <div class="btn">{{ dataDetail.checkName }}</div>
</script>
</wx-open-launch-weapp>
</div>
......@@ -187,7 +187,8 @@
</div>
</template>
<script>
const { VUE_APP_ENV } = process.env;
// const { VUE_APP_ENV } = process.env;
import { getDetectionDetail, getDetectionDetailProces, getJumpToWebapp } from '@/api/detection';
// UNCOMMITTED(0,"待完善信息"),
// UNDER_DETECTION(1,"待采样"),
......@@ -252,16 +253,20 @@ export default {
waitIcon: [0, 1, 6], // icon 显示等待状态
noShowBottomBtn: [0, 21, 22, 5, 1, 6, 2, 25, 27], // 这几种状态不显示底部操作按钮
openWebAppConfig:{
content:'<script' + ' type=text/wxtag-template><style>.btn {position:absolute; top: 0; left: 0; width:100%; height: 100%;}</style> <div class="btn"></div></' + 'script>', // 标签内容
content:'', // 标签内容
username:'gh_e92f58174364', // 小程序唯一username 1.gh_80d54796f2d5 云鹊助手 2. gh_e92f58174364 云鹊健康
path:'', // 打开页面
envVersion: VUE_APP_ENV != 'testing' ? 'release' : 'trial', // release 生产
extraData:''
path:'pagesInsurance/all-entrance/index', // 打开页面
extraData: JSON.stringify({})
},
};
},
created() {
this.id = this.$route.query.id || 11073;
this.openWebAppConfig.extraData = JSON.stringify({
channelSource: 'insurance_channel',
path: 'pagesInsurance/all-entrance/index',
query: {id:this.id,}
});
this.init();
},
mounted() {
......@@ -288,11 +293,10 @@ export default {
document.body.removeChild(input);
this.$toast('已复制');
console.log('已复制的内容：', val);
window.scrollTo(0, 1);
},
// 检测详情
getDetailProces() {
getDetectionDetailProces(this.id).then((res) => {
getDetectionDetailProces({id:this.id, channel: 4} ).then((res) => {
if (res.code === '000000') {
var flag = false;
const data = res.data || [];
......@@ -340,7 +344,7 @@ export default {
if(this.picaWechat == 'wechat') {
return false;
}
const p = {params:{path:'pages/health/myCheck/index', query:'zl---test'}, type: 2};
const p = {params:{path:'pagesInsurance/all-entrance/index', query:{channelSource:'insurance_channel', detectionRecordId:this.id }}, type: 2};
getJumpToWebapp(p).then(res => {
console.log('--res', res);
window.location.href = res.data;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或