Skip to content

C
contraceptives_app
Commit 963b5d97 authored by gengchunlei's avatar gengchunlei
Browse files
Options

修改

parent 3c0c0909
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 102 deletions
.env.dev
View file @ 963b5d97
NODE_ENV=dev
VUE_APP_BASE_URL=https://beta-yaojuapp.yiboshi.com/
VUE_APP_BASE_URL = https://beta-yjservice.yiboshi.com
.env.prod
View file @ 963b5d97
NODE_ENV=prod
VUE_APP_PATH=https://ynfymds-service.yiboshi.com
VUE_APP_BASE_URL = https://beta-yaojuapp.yiboshi.com/
VUE_APP_PATH = https://ynfymds-service.yiboshi.com
VUE_APP_BASE_URL = https://beta-yjservice.yiboshi.com
.env.test
View file @ 963b5d97
NODE_ENV=test
VUE_APP_PATH=https://beta-yaojuapp.yiboshi.com/
VUE_APP_PATH = https://beta-yjservice.yiboshi.com
VUE_APP_BASE_URL = https://beta-yjservice.yiboshi.com
public/index.html
View file @ 963b5d97
......@@ -12,15 +12,15 @@
src="https://webapi.amap.com/maps?v=1.4.15&key=8830df3ce60e0b6348e0854a939ffa9d"></script>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<link rel="stylesheet" href="path/to/font-awesome/css/font-awesome.min.css">
<!--<script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>-->
<script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
<title><%= htmlWebpackPlugin.options.title %></title>
</head>
<body>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
<!--<script>
<script>
var vConsole =new VConsole();
console.log('Hello world');
</script>-->
</script>
</html>
src/utils/api.js
View file @ 963b5d97
import axios from 'axios';
import {callMobile} from "./common";
// baseURL: process.env.VUE_APP_BASE_URL,
var apiInstance=axios.create({
baseURL: '',
baseURL: process.env.VUE_APP_BASE_URL,
timeout:10000,
withCredentials:true
})
/*为请求添加请求头中的token*/
apiInstance.interceptors.request.use(config=>{
if(sessionStorage.token){
/*sessionStorage.getItem('tokenMobile')*/
config.headers.Authorization= '';
if(typeof(config.params) == "undefined"){
config.params={}
let tokenInfo = JSON.parse(window.sessionStorage.getItem('mobileTokenIno')).token
if (tokenInfo) {
config.headers.Authorization = tokenInfo;
if (typeof (config.params) == "undefined") {
config.params = {}
}
return config;//赋值完后把config返回回去
} else {
callMobile("goIndex", {});
return
}
return config;//赋值完后把config返回回去
// return config;//赋值完后把config返回回去
},error => {
// 请求错误后把我们的error返回回去
return Promise.reject(error);
})
//拦截请求结果判断token是否失效
apiInstance.interceptors.response.use( res =>{
let data = res
let result = res.data
//比如响应一些报错信息
if (result.code == 'BIZ.TOKEN_EXPIRATION') {
callMobile("goIndex", {});
return
}
return data
})
/*获取网点*/
export const getNetworkInfo = params =>{
return apiInstance.get(`/api/basic-info/v1/basic-info/basic-network-info/get-network-info`,{params});
return apiInstance.get(`/basic-info/v1/api/phone-h5/basic-network-info/get-network-info`,{params});
};
//获取用领取记录
export const getUserCollectRecord = params => {
return apiInstance.get(`/api/stock-info/v1/stock-info/stock-provide-record`, {params})
return apiInstance.get(`/stock-info/v1/api/phone-h5/stock-provide-record/page`, {params})
}
//根据领取单号获取领取记录
export const getUserCollectRecordByNo = params => {
return apiInstance.get(`/api/stock-info/v1/stock-info/stock-provide-record/query-by-no`, {params})
return apiInstance.get(`/stock-info/v1/api/phone-h5/stock-provide-record/query-by-no/${params.no}`, {params})
}
//获取库存信息
export const getStockInfo = params => {
return apiInstance.get(`/api/stock-info/v1/stock-info/stock-basic-info/basic-info`, {params})
return apiInstance.get(`/stock-info/v1/api/phone-h5/stock-basic-info/basic-info`, {params})
}
//判断用户首次领取是否已填随访
export const getUserReceiveNum = params => {
return apiInstance.get(`/api/stock-info/v1/stock-info/stock-provide-record/number/${params.residentId}`, {params})
return apiInstance.get(`/stock-info/v1/api/phone-h5/stock-provide-record/number/${params.residentId}`, {params})
}
//填写随访记录
export const addVisitRecord = params => {
return apiInstance.post(`/api/stock-info/v1/stock-info/stock-visit-info`, params)
return apiInstance.post(`/stock-info/v1/api/phone-h5/stock-visit-info/add-visit-record`, params)
}
//确认领取药具
export const addMedicalRecord = params => {
return apiInstance.post(`/api/stock-info/v1/stock-info/stock-provide-record`, params)
return apiInstance.post(`/stock-info/v1/api/phone-h5/stock-provide-record/add-medical-record`, params)
}
//获取人工网点药具信息
export const getManualNetworkMedical = params => {
return apiInstance.get(`/api/stock-info/v1/stock-info/stock-basic-info/phone-network-stock-info`, {params})
return apiInstance.get(`/stock-info/v1/api/phone-h5/stock-basic-info/phone-network-stock-info`, {params})
}
//人工网点领取
export const addManualMedicalRecord = params => {
return apiInstance.post(`/api/stock-info/v1/stock-info/stock-provide-record/artificial-receive`, params)
return apiInstance.post(`/stock-info/v1/api/phone-h5/admin/stock-provide-record/artificial-receive`, params)
}
src/views/choiceContraceptives.vue
View file @ 963b5d97
......@@ -92,7 +92,7 @@
},
methods:{
getStockListInfo(callBack) {
this.routerDetail = JSON.parse(this.$route.query)
this.routerDetail = this.$route.query
let par = {
relationId: this.routerDetail.id,
...this.param
......
src/views/collectRecords.vue
View file @ 963b5d97
......@@ -19,15 +19,15 @@
<div class="details">
<div class="item">
<label class="item-left">规格:</label>
<label class="item-right">{{item.productSpecs || '--'}}</label>
<label class="item-right">{{item.specs || '--'}}</label>
</div>
<div class="item">
<label class="item-left">领取数量：</label>
<label class="item-right">{{item.number || '--'}}</label>
<label class="item-right">{{item.number || '--'}} {{item.unit}}</label>
</div>
<div class="item">
<label class="item-left">领取时间：</label>
<label class="item-right">{{item.createDate || '--'}}</label>
<label class="item-right">{{item.created || '--'}}</label>
</div>
<div class="item">
<label class="item-left">领取站点：</label>
......
src/views/component/noData.vue
View file @ 963b5d97
......@@ -3,7 +3,7 @@
<div class="success-img">
<img src="./../../assets/img/noHave.png"/>
<div class="tips">
暂无数据...
<slot name="content">暂无数据...</slot>
</div>
</div>
<div class="backHome">
......
src/views/medicalCollection/manualCollection.vue
View file @ 963b5d97
......@@ -10,9 +10,9 @@
<div class="flex_center top_info" >
<div>
<div class="netType_div"
:style="{background: (dataInfo.netType == 1 ? '#1890FF': '#13C2C2')}"
:style="{background: (dataInfo.netType == 1 ? '#13C2C2': '#1890FF')}"
>
<span style="margin: 0 auto">{{routerDetail.typeName}}</span>
<span style="margin: 0 auto">{{routerDetail.netTypeName}}</span>
</div>
<div class="netNameTitle">{{routerDetail.netName || '未知'}}</div>
</div>
......@@ -73,7 +73,11 @@
<mt-button type="primary" style="width: 200px" @click="onSubmit">申领药具</mt-button>
</div>
<div v-if="noDataShow">
<NoData></NoData>
<NoData>
<template v-slot:content>
<span>该网点暂时没有可领用的药具，请与网点管理员联系</span>
</template>
</NoData>
</div>
</div>
......@@ -114,7 +118,7 @@
getRecordInfo(callBack) {
let par = {
relationId: this.routerDetail.id,
telephone: this.sessionInfo.phone || '18987175004',
telephone: this.sessionInfo.phone,
...this.param
}
getManualNetworkMedical(par).then(({data = {}}) => {
......@@ -267,6 +271,12 @@
item['expireDate'] = item.expireDate + ' '+'00:00:00'
})
let result = []
for (let i= 0; i< this.detailInfo.length; i++) {
if (this.detailInfo[i].number != '' || this.detailInfo[i].number != null || typeof this.detailInfo[i].number != 'undefined') {
result.push(this.detailInfo[i])
}
}
if (avali == 0) {
return Toast({
message: '请先输入数量！',
......@@ -274,7 +284,7 @@
});
}
let par = {
dataList: this.detailInfo
dataList: result
}
addManualMedicalRecord(par).then(({data}) => {
if (data.code == 'SUCCESS') {
......@@ -299,7 +309,7 @@
<style scoped lang="less">
.content {
width: 93%;
width: 90%;
margin: 20px auto 0px;
padding: 10px;
border: 1px solid #F3F3F3;
......@@ -350,11 +360,13 @@
.content .details .item .item-right {
/*float: right;*/
font-size: 11px;
margin-left: 8px;
color: #262626;
}
.content .details .item .item-left {
color: #595959;
font-size: 11px;
}
.list-data{
/*height: calc(100% - 40px);*/
......@@ -381,13 +393,13 @@
box-shadow: darkgrey 0px 2px 20px -10px;
}
.netType_div {
text-align: center;
color: white;
border-radius: 8px 2px;
padding: 4px 9px;
width: 70px;
width: 50px;
font-size: 10px
}
.netNameTitle {
font-size: 14px!important;
font-weight: 500;
......
src/views/medicalCollection/manualSuccess.vue
View file @ 963b5d97
......@@ -14,9 +14,6 @@
<div
class="list-data"
v-infinite-scroll="loadMore"
:infinite-scroll-disabled="loading"
infinite-scroll-distance="10"
>
<div class="content" v-for="item in detailInfo" :key="item.id">
<div class="title_bor flex_baseline">
......@@ -55,7 +52,7 @@
<script>
import {getUserCollectRecordByNo} from "../../utils/api";
import NoData from '../component/noData';
import { Toast } from 'mint-ui';
import { Toast,Indicator } from 'mint-ui';
export default {
components: {NoData},
......@@ -75,42 +72,33 @@
},
created() {
this.routerDetail = this.$route.query
this.getRecordInfo()
},
methods: {
getRecordInfo(callBack) {
getRecordInfo() {
Indicator.open()
let pars = {
no: this.routerDetail.info,
...this.param
}
getUserCollectRecordByNo(pars).then(({data = {}}) => {
const {dataList = []} = data.data
this.detailInfo = this.detailInfo.concat(dataList)
Indicator.close()
this.detailInfo = data.data
console.log(this.detailInfo)
if (this.detailInfo.length == 0) {
this.noDataShow = true
} else {
this.noDataShow = false
}
if (dataList.length < this.param.pageSize) {
this.loadText = '暂无更多数据'
} else {
this.loading = false
}
// callBack && callBack()
}).catch(res => {
Toast({
message: '系统异常，请联系客服！',
duration: 2000
});
this.loading = false
Indicator.close()
}).finally(() => {
this.loading = false
Indicator.close()
})
},
loadMore() {
this.loading = true
this.param.pageIndex += 1
this.getRecordInfo()
},
goBack() {
window.history.go(-1)
},
......@@ -123,7 +111,7 @@
<style scoped lang="less">
.content {
width: 93%;
width: 90%;
margin: 20px auto 0px;
padding: 10px;
border: 1px solid #F3F3F3;
......@@ -157,9 +145,11 @@
/*float: right;*/
margin-left: 8px;
color: #262626;
font-size: 11px;
}
.content .details .item .item-left {
color: #595959;
font-size: 11px;
}
.list-data{
/*height: calc(100% - 40px);*/
......@@ -172,30 +162,4 @@
text-align: center;
}
.listTitle {
margin: 20px 0px 0px 12px;
.listTitle_span {
font-weight: 600;
font-size: 16px;
}
}
.top_info {
border: 1px solid #F3F3F3;
border-radius: 0px 0px 16px 16px;
padding: 12px;
box-shadow: darkgrey 0px 2px 20px -10px;
}
.netType_div {
color: white;
border-radius: 8px 2px;
padding: 4px 9px;
width: 70px;
font-size: 10px
}
.netNameTitle {
font-size: 14px!important;
font-weight: 500;
margin-top: 11px
}
</style>
src/views/myMap.vue
View file @ 963b5d97
......@@ -14,14 +14,14 @@
<div class="img" @click="toCollectRecords">
<img src="../assets/img/personal.png"/>
</div>
<label>个人信息</label>
<label>领取记录</label>
</div>
<div class="item">
<!-- <div class="item">
<div class="img">
<img src="../assets/img/artificial.png"/>
</div>
<label>人工网点</label>
</div>
</div>-->
<div class="item">
<div class="img" @click="toRealHome">
<img src="../assets/img/homePage.png"/>
......@@ -40,7 +40,7 @@
import presonImg from '../assets/img/preson.png';
import sharpImg from '../assets/img/sharp.png';
import {getNetworkInfo, getUserReceiveNum} from '../utils/api';
import {callMobile, getQueryVariable} from "../utils/common";
import {callMobile, getQueryVariable, isIOSWebKit} from "../utils/common";
import {MessageBox} from 'mint-ui';
export default {
......@@ -94,12 +94,23 @@
})
},
subscanQRCallBack(result) {
result = {id: 20, type: 2, typeName: '人工发放', netName: '昆明市官渡区医学会'}
if (result.type == 2){
this.$router.push({path: `/manualCollection`, query: result});
subscanQRCallBack(val) {
// result = {id: 20, type: 2, typeName: '人工发放', netName: '昆明市官渡区医学会'}
// let result = val
let result = {}
let ios = isIOSWebKit()
if (ios) {
result = JSON.parse(val)
} else {
this.$router.push({path: `/choiceContraceptives`, query: result});
result = val
}
if (!result.netType) {
return
}
if (result.netType == 2){
this.$router.push({path: `/manualCollection`, query: result});
} else {
this.$router.push({path: `/choiceContraceptives`, query: result});
}
},
toCollectRecords() {
......@@ -131,9 +142,9 @@
this.$router.push('/collectRecords');
},
toRealHome() {
// callMobile("goIndex", {});
let resultT = {id: 20, type: 2, typeName: '人工发放', netName: '昆明市官渡区医学会'}
this.$router.push({path:'/manualCollection', query: resultT})
callMobile("goIndex", {});
// let resultT = {id: 4, type: 2, typeName: '人工发放', netName: '昆明市官渡区医学会'}
// this.$router.push({path:'/manualCollection', query: resultT})
},
createMap() {
let self = this
......@@ -330,7 +341,7 @@
position: absolute;
z-index: 2;
right: 15px;
top: 50%
top: 60%
}
.right_item .item .img {
......@@ -438,9 +449,11 @@
div.info-top div {
color: #ffffff;
background: #000000;
margin-right: 20px;
}
div.info-top {
width: 196px;
background: #000000;
}
......
test/index.html 0 → 100644
View file @ 963b5d97
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" /> <meta name = "format-detection" content = "telephone=yes">
<link rel="icon" href="favicon.ico">
<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
<link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_2002967_absxhdgm27r.css">
<!--
<script type="text/css" src="//at.alicdn.com/t/font_2002967_absxhdgm27r.css"></script>
-->
<link rel="stylesheet" href="https://a.amap.com/jsapi_demos/static/demo-center/css/demo-center.css" />
<script type="text/javascript"
src="https://webapi.amap.com/maps?v=1.4.15&key=8830df3ce60e0b6348e0854a939ffa9d"></script>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<link rel="stylesheet" href="path/to/font-awesome/css/font-awesome.min.css">
<!--<script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>-->
<title>contraceptives_app</title>
</head>
<body>
<div id="app"></div>
<!-- built files will be auto injected -->
<script type="text/javascript" src="js/app.202121210.js"></script></body>
<!--<script>
var vConsole =new VConsole();
console.log('Hello world');
</script>-->
</html>
test/js/app.202121210.js 0 → 100644
View file @ 963b5d97
This diff is collapsed.
test/static/test.html 0 → 100644
View file @ 963b5d97
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
<style>
html,
body,
#container {
width: 100%;
height: 100%;
}
</style>
<title>位置经纬度 + 获取步行规划数据</title>
<link rel="stylesheet" href="https://a.amap.com/jsapi_demos/static/demo-center/css/demo-center.css" />
<script src="https://webapi.amap.com/maps?v=1.4.15&key=8830df3ce60e0b6348e0854a939ffa9d&plugin=AMap.Walking"></script>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
</head>
<body>
<div id="container"></div>
<div id="panel"></div>
<script type="text/javascript">
var endlngLat;
var map;
function addText(end) {
endlngLat=end;
map = new AMap.Map("container", {
zoom: 14
});
AMap.plugin('AMap.Geolocation', function() {
var geolocation = new AMap.Geolocation({
enableHighAccuracy: true,//是否使用高精度定位，默认:true
timeout: 10000, //超过10秒后停止定位，默认：5s
buttonPosition:'RB', //定位按钮的停靠位置
buttonOffset: new AMap.Pixel(10, 20),//定位按钮与设置的停靠位置的偏移量，默认：Pixel(10, 20)
zoomToAccuracy: true, //定位成功后是否自动调整地图视野到定位点
});
map.addControl(geolocation);
geolocation.getCurrentPosition(function(status,result){
if(status=='complete'){
onComplete(result)
}else{
onError(result)
}
});
});
}
function onComplete(data) {
var walkOption = {
map: map,
panel: "panel",
hideMarkers: false,
isOutline: true,
outlineColor: '#ffeeee',
autoFitView: true
}
// 步行导航
var walking = new AMap.Walking(walkOption)
var startlngLat=[data.position.lng,data.position.lat];
//根据起终点坐标规划步行路线
walking.search(startlngLat,endlngLat, function(status, result) {
// result即是对应的不行路线数据信息，相关数据结构文档请参考 https://lbs.amap.com/api/javascript-api/reference/route-search#m_RidingResult
if (status === 'complete') {
drawRoute(result.routes[0])
log.success('步行路线数据查询成功')
} else {
log.error('步行路线数据查询失败' + result)
}
});
}
//解析定位错误信息
function onError(data) {
document.getElementById('status').innerHTML='定位失败'
}
function drawRoute (route) {
var path = []
for (var i = 0, l = route.steps.length; i < l; i++) {
var step = route.steps[i]
for (var j = 0, n = step.path.length; j < n; j++) {
path.push(step.path[j])
}
}
}
</script>
</body>
</html>
\ No newline at end of file
vue.config.js
View file @ 963b5d97
......@@ -24,25 +24,25 @@ module.exports = {
productionSourceMap: IsProd ? false : true,
lintOnSave:false,
devServer: {
port: 8082,
// port: 8082,
open: true,
overlay: {
warning: false,
errors: false
},
https:true,
proxy: { //配置跨域
/* proxy: { //配置跨域
'/api': {
target: 'https://beta-yjservice.yiboshi.com', //真实的后台接口
changOrigin: true, //允许跨域
pathRewrite: {
/* 重写路径，当我们在浏览器中看到请求的地址为：http://localhost:8080/api/core/getData/userInfo 时
/!* 重写路径，当我们在浏览器中看到请求的地址为：http://localhost:8080/api/core/getData/userInfo 时
实际上访问的地址是：http://121.121.67.254:8185/core/getData/userInfo,因为重写了 /api
*/
*!/
'^/api': ''
}
},
}
}*/
},
chainWebpack:(config)=> {
config.plugins.delete('preload');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment