Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	pages/Healthitem/Healthitem.vue
#	pages/Personal/Personal.vue
#	pages/homepage/homepage.vue
This commit is contained in:
纪寒 2023-02-24 17:23:04 +08:00
commit cccf65dfab
16 changed files with 384 additions and 320 deletions

View File

@ -96,7 +96,7 @@
"navigationBarTitleText": "医路优品",
"navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 40, // px
"enablePullDownRefresh": true ,//true
"enablePullDownRefresh": true, //true
"navigationStyle": "custom"
}
}, {
@ -342,7 +342,13 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
}
}, {
"path": "pages/geriatricdisease/geriatricdisease",
"style": {
"navigationBarTitleText": "国家老年病中心",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
}
}
],
"globalStyle": {

View File

@ -12,7 +12,7 @@
{{goodsPrice}}
</view>
</view>
<view class="choice common" @tap="buyshow=true">
<view class="choice common" @tap="buyshowtrue">
<view class="selected">
已选
</view>
@ -51,7 +51,7 @@
<!-- <image v-for="(item,index) in info" :src="item.image" mode=""></image> -->
</view>
<view class="Purchasecolumn">
<view class="buy" @tap="buyshow=true">
<view class="buy" @tap="buyshowtrue">
立即购买
</view>
</view>
@ -237,6 +237,27 @@
url: '/pages/information/information'
})
},
buyshowtrue() {
var that = this
const value = uni.getStorageSync('openid');
const value2 = uni.getStorageSync('patientId');
if (value && value2) {
that.buyshow = true
} else {
that.$refs.uToast.show({
title: '未登录,请先登录',
type: 'error'
})
if (that.timer) {
clearTimeout(that.timer)
}
that.timer = setTimeout(e => {
uni.navigateTo({
url: '/pages/login/login'
})
}, 1000)
}
},
//
tapbuy() {
var that = this
@ -529,27 +550,32 @@
this.baseurl = baseurl
this.usershow = false
this.goodsDetailsinfo(this.goodsInfoId)
goodPatientInfo(this.updata.patientId).then(res => {
var user = res.data.filter(e => e.id == this.userid)
if (user.length >= 1) {
// user[0].address = user[0].provinceName + user[0].cityName + user[0].regionName + user[0]
// .streetName + user[0].receiveAddress
this.updata.receiver = user[0].receiveName
this.updata.receiveAddress = user[0].areaName + user[0].receiveAddress
this.updata.phone = user[0].receivePhone
this.userid = user[0].id
} else {
// res.data.forEach(e => {
// e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e
// .receiveAddress
// })
this.updata.receiver = res.data[0].receiveName
// this.updata.receiveAddress = res.data[0].address
this.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress
this.updata.phone = res.data[0].receivePhone
this.userid = res.data[0].id
}
})
const value = uni.getStorageSync('patientId');
if (value) {
goodPatientInfo(value).then(res => {
if (res.code == 200) {
var user = res.data.filter(e => e.id == this.userid)
if (user.length >= 1) {
// user[0].address = user[0].provinceName + user[0].cityName + user[0].regionName + user[0]
// .streetName + user[0].receiveAddress
this.updata.receiver = user[0].receiveName
this.updata.receiveAddress = user[0].areaName + user[0].receiveAddress
this.updata.phone = user[0].receivePhone
this.userid = user[0].id
} else {
// res.data.forEach(e => {
// e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e
// .receiveAddress
// })
this.updata.receiver = res.data[0].receiveName
// this.updata.receiveAddress = res.data[0].address
this.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress
this.updata.phone = res.data[0].receivePhone
this.userid = res.data[0].id
}
}
})
} else {}
let useritem = null
uni.$on('updata', function(data) {
that.updata = JSON.parse(data.updata)

View File

@ -26,6 +26,24 @@
// console.log(this.item.informationContent)
},
onReady() {}, //
//1.
onShareAppMessage(res) {
let pages = getCurrentPages();
let url = pages[pages.length - 1].$page.fullPath
return {
title: '泉医到家',
path: url,
}
},
//2.
onShareTimeline(res) {
let pages = getCurrentPages();
let url = pages[pages.length - 1].$page.fullPath
return {
title: '泉医到家',
path: url,
}
},
}
</script>

View File

@ -91,6 +91,24 @@
uni.stopPullDownRefresh();
}, 1000);
},
//1.
onShareAppMessage(res) {
let pages = getCurrentPages();
let url = pages[pages.length - 1].$page.fullPath
return {
title: '泉医到家',
path: url,
}
},
//2.
onShareTimeline(res) {
let pages = getCurrentPages();
let url = pages[pages.length - 1].$page.fullPath
return {
title: '泉医到家',
path: url,
}
},
}
</script>

View File

@ -1,261 +1,143 @@
<template>
<view class="app">
<view class="user">
<image v-if="appPersonallist.headPictureUrl" class="img" :src="baseurl+appPersonallist.headPictureUrl"
mode=""></image>
<image class="img" v-else src="../../static/user.png" mode=""></image>
<image class="bjimg" src="../../static/userbeijing.png" mode=""></image>
<view class="phone" v-if="appPersonallist.patientName">
{{appPersonallist.patientName}}
</view>
<view class="nickname">
{{appPersonallist.phone}}
</view>
<view class="modify" @tap='updatainfo()'>
修改信息
<image src="../../static/xg.png" mode=""></image>
<view class="item" @tap='gouser'>
<image src="../../static/user.png" mode=""></image>
<view class="title">
个人信息
</view>
</view>
<view class="userinfo">
<view class="item">
<image src="../../static/jkda.png" mode=""></image>
<view class="text">
健康档案
</view>
</view>
<view class="item">
<image src="../../static/jifen.png" mode=""></image>
<view class="text">
积分
</view>
</view>
<view class="item">
<image src="../../static/yhj.png" mode=""></image>
<view class="text">
优惠卷
</view>
<view class=" item" @tap='goorder'>
<image src="../../static/dingdan.png" mode=""></image>
<view class="title">
我的订单
</view>
</view>
<view class="content">
<view class="CommodityOrder" @tap="goorder">
<view class="title">
商品订单
</view>
<view class="text">
查看全部
<image src="../../static/huijiantou.png" mode=""></image>
</view>
</view>
<view class="center">
<view class="OrderStatus" @tap="gopaid('WAIT_PAY')">
<image src="/static/Tobepaid.png" mode=""></image>
<view class="title">待付款</view>
<view class="orderCount" v-if="list.waitPayCount>0&&list.waitPayCount<100">
{{list.waitPayCount}}
</view>
<view class="orderCount" style="font-size :14rpx;" v-if="list.waitPayCount>=100">
99+
</view>
</view>
<view class="OrderStatus" @tap="goreceive('WAIT_RECEIVED_GOODS')">
<image src="/static/received.png" mode=""></image>
<view class="title">待收货</view>
<view class="orderCount" v-if="list.waitReceivedGoodsCount>0&&list.waitReceivedGoodsCount<100">
{{list.waitReceivedGoodsCount}}
</view>
<view class="orderCount" style="font-size :14rpx;" v-if="list.waitReceivedGoodsCount>=100">
99+
</view>
</view>
<view class="OrderStatus" @tap="gocompleted('RECEIVED_GOODS')">
<image src="/static/evaluated.png" mode=""></image>
<view class="title">待评价</view>
<view class="orderCount" v-if="list.receivedGoodsCount>0&&list.receivedGoodsCount<100">
{{list.receivedGoodsCount}}
</view>
<view class="orderCount" style="font-size :14rpx;" v-if="list.receivedGoodsCount>=100">
99+
</view>
</view>
<view class="OrderStatus" @tap="goEVALUATED('EVALUATED')">
<image src="/static/finished.png" mode=""></image>
<view class="title">已完成</view>
<!-- <view class="orderCount" v-if="list.evaluatedCount>0&&list.evaluatedCount<100">
{{list.evaluatedCount}}
</view>
<view class="orderCount" v-if="list.evaluatedCount>=100">
99+
</view> -->
</view>
</view>
</view>
<view class="service" @tap="gonursestation">
<view class="serviceorder">护理站服务订单</view>
<image src="../../static/huijiantou.png" mode=""></image>
</view>
<view class="service" style="top:1100rpx">
<view class="serviceorder">设置</view>
<image src="../../static/huijiantou.png" mode=""></image>
</view>
<u-toast ref="uToast" />
</view>
</template>
<script>
import {
appPersonal,
} from '@/api/user/user.js';
import {
existPatientInfo
} from '@/api/startup/index.js'
import {
orderCount
} from '@/api/order/index.js'
import baseurl from '@/api/baseurl.js'
export default {
data() {
return {
baseurl: '',
appPersonallist: [], //
timer: null,
list: {},
}
return {};
},
onShow() {
let that = this
this.baseurl = baseurl
this.myInfo()
const value = uni.getStorageSync('patientId');
if (value) {
orderCount(value).then(res => {
this.list = res.data
})
} else {
that.$refs.uToast.show({
title: '请登录',
type: 'error',
duration: '1000',
url: '/pages/login/login'
})
}
},
onLoad(options) {},
onLoad() {},
methods: {
remove() {
let that = this
uni.showModal({
title: '提示',
content: '确认要退出此账号吗',
success: function(res) {
if (res.confirm) {
uni.removeStorageSync('patientId');
uni.removeStorageSync('openid');
uni.removeStorageSync('phone');
uni.removeStorageSync('token');
that.$refs.uToast.show({
title: '退出账号成功',
type: 'success',
duration: '1000'
})
if (that.timer) {
clearTimeout(that.timer)
goorder() {
var that = this
try {
const value = uni.getStorageSync('openid');
const value3 = uni.getStorageSync('token');
var that = this
if (value && value3) {
existPatientInfo(value).then(res => {
if (res.code == 200 && res.msg == 'LOGIN') {
const value2 = uni.getStorageSync('patientId');
if (value2) {
uni.navigateTo({
url: '/pages/order/order'
})
} else {
that.remove()
}
} else {
that.remove()
}
that.timer = setTimeout(e => {
uni.navigateBack({
delta: 1
})
}, 1000)
} else if (res.cancel) {
that.$refs.uToast.show({
title: '退出账号失败',
type: 'error',
duration: '1000'
})
}
})
} else {
that.remove()
}
});
} catch {
that.remove()
}
},
removes() {
//
gouser() {
try {
const value = uni.getStorageSync('openid');
const value3 = uni.getStorageSync('token');
var that = this
if (value && value3) {
existPatientInfo(value).then(res => {
if (res.code == 200 && res.msg == 'LOGIN') {
const value2 = uni.getStorageSync('patientId');
if (value2) {
uni.navigateTo({
url: '/pages/user/user'
})
} else {
that.remove()
}
} else {
that.remove()
}
})
} else {
that.remove()
}
} catch {
that.remove()
}
},
remove() {
uni.removeStorageSync('patientId');
uni.removeStorageSync('openid');
uni.removeStorageSync('phone');
uni.removeStorageSync('Refresh');
uni.removeStorageSync('token');
uni.navigateBack({
delta: 1
})
},
//
myInfo() {
var that = this
const value = uni.getStorageSync('openid');
const value2 = uni.getStorageSync('patientId');
if (value && value2) {
existPatientInfo(value).then(res => {
if (res.code == 200 && res.msg == 'LOGIN') {
appPersonal(value2).then(Response => {
if (Response.code == 200) {
that.appPersonallist = Response.data
that.appPersonallist.homeLatitude = Number(that.appPersonallist
.homeLatitude)
that.appPersonallist.homeLongitude = Number(that.appPersonallist
.homeLongitude)
} else if (Response.code == 9999) {} else {
that.removes();
}
})
} else {
that.removes();
}
})
} else {
that.removes();
}
},
updatainfo() {
uni.navigateTo({
url: `/pages/modify/modify`
})
},
//
gonursestation() {
uni.navigateTo({
url: '/pages/Nursingstationserviceorder/Nursingstationserviceorder'
})
},
//
goreceive(item) {
uni.navigateTo({
url: `/pages/CommodityOrder/CommodityOrder?orderStatus=${item}`
})
},
//
goorder() {
uni.navigateTo({
url: '/pages/CommodityOrder/CommodityOrder'
})
},
//
goEVALUATED(item) {
uni.navigateTo({
url: `/pages/CommodityOrder/CommodityOrder?orderStatus=${item}`
})
},
//
gocompleted(item) {
uni.navigateTo({
url: `/pages/CommodityOrder/CommodityOrder?orderStatus=${item}`
})
},
//
gopaid(item) {
uni.navigateTo({
url: `/pages/CommodityOrder/CommodityOrder?orderStatus=${item}`
url: '/pages/login/login'
})
},
},
//1.
onShareAppMessage(res) {
let pages = getCurrentPages();
let url = pages[pages.length - 1].$page.fullPath
return {
title: '泉医到家',
path: url,
}
},
//2.
onShareTimeline(res) {
let pages = getCurrentPages();
let url = pages[pages.length - 1].$page.fullPath
return {
title: '泉医到家',
path: url,
}
},
}
</script>
<style lang="scss">
@import "./Personal.scss";
.app {
padding: 0;
.item {
width: 94%;
margin: 20rpx auto 0;
background-color: #fff;
position: relative;
height: 100rpx;
border-radius: 5rpx;
.title {
position: absolute;
left: 150rpx;
top: 50%;
transform: translateY(-50%);
font-size: 44rpx;
}
image {
position: absolute;
left: 40rpx;
top: 50%;
transform: translateY(-50%);
width: 55rpx;
height: 55rpx;
}
}
}
</style>

View File

@ -74,18 +74,10 @@
},
onShow() {
var that = this
try {
const value = uni.getStorageSync('openid');
const value3 = uni.getStorageSync('Refresh');
if (value) {} else {
uni.navigateTo({
url: '/pages/login/login'
})
}
if (value3) {
that.goodsListinfo();
}
} catch (e) {}
const value3 = uni.getStorageSync('Refresh');
if (value3) {
that.goodsListinfo();
}
},
onLoad(options) { //
if (options.title) {

View File

@ -253,6 +253,7 @@
title: '请阅读用户协议并同意',
type: 'error',
})
this.maskshow = true
} else {
this.orderlist.orderCount = 1;
this.orderlist.orderConsumableList = []

View File

@ -1,14 +1,17 @@
<template>
<view class="app">
<view class="concent">
<view class="background">
<image src="/static/logo.png" mode=""></image>
<view>
<view class="detailed">
<view>
专病管理简介慢性病已成为我国老年人健康的最大威胁建立标准化的慢病专病并发症防治中心建立规范化的导诊流程建立慢病专病综合电子档案对于慢病及并发症的早期发现早期治疗延缓并发症的发生发展降低患者政府经济负担具有重要现实意义组建金字塔式医生服务团队由省级知名专家全程介入慢病管理远程会诊绿色就医通道基层全科医生护师落实专家指导意见和上门随访服务辅以营养师和运动处方师根据筛查监测数据提供营养膳食和专属运动处方运动建议打造一人一病一处方的管理模式
</view>
</view>
<u-tabs :list="tabList" :current="tabcurrent" @change="change"></u-tabs>
<view class="items">
<view class="item" @tap='godiseasemanagement'>
<image src="../../static/zbglzbgl.png" mode=""></image>
<view class="title">
专病管理云社区
</view>
</view>
<view class="item" @tap='gogeriatricdisease'>
<image src="../../static/lnb.png" mode=""></image>
<view class="title">
国家老年病中心
</view>
</view>
</view>
@ -19,9 +22,33 @@
export default {
data() {
return {
tabcurrent: 0,
tabList: [{
name: '专病管理'
}],
};
},
onShow() {},
onLoad() {},
methods: {
//
gogeriatricdisease() {
uni.navigateTo({
url: "/pages/geriatricdisease/geriatricdisease"
})
},
//
godiseasemanagement() {
uni.navigateToMiniProgram({
appId: 'wxa690d053c34ceebd',
path: '/pages/index/index',
extraData: {
'from': 'qy'
},
success(res) {}
})
},
},
//1.
onShareAppMessage(res) {
let pages = getCurrentPages();
@ -45,46 +72,37 @@
<style lang="scss">
.app {
padding-top: 10rpx;
padding: 0;
.concent {
width: 701rpx;
height: 900rpx;
background: #4C7BC9;
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
margin: 5% auto 20px;
.items {
background-color: #fff;
width: 96%;
margin: 20rpx auto;
padding: 60rpx 0;
border-radius: 5rpx;
.background {
position: relative;
width: 657rpx;
height: 850rpx;
background: #FFFFFF;
border-radius: 25rpx;
background-color: white;
margin: 0 auto;
top: 50%;
transform: translateY(-50%);
.item {
width: 50%;
display: inline-block;
image {
width: 178rpx;
height: 160rpx;
background: #FFFFFF;
border-radius: 25px;
margin-left: 68%;
margin-top: 0;
width: 150rpx;
height: 150rpx;
display: block;
margin: 0 auto;
}
.title {
display: block;
margin: 20rpx auto;
width: 180rpx;
text-align: center;
font-size: 40rpx;
line-height: 50rpx;
font-weight: 600;
}
}
}
}
.detailed {
width: 657rpx;
padding: 0 20rpx;
line-height: 56rpx;
}
.detailed view {
text-indent: 2em;
}
</style>

View File

@ -0,0 +1,95 @@
<template>
<view class="app">
<view class="concent">
<view class="background">
<image src="/static/logo.png" mode=""></image>
<view>
<view class="detailed">
<view>
国家老年病中心山东分中心是依托于首都医科大学宣武医院的国家老年疾病临床医学研究中心国家科技部国家卫计委中央军委后勤保障部国家食品药品监督管理总局联合批准的国家级临床医学研究中心老年慢性病全国网络化诊治体系及医疗大数据系统医疗与健康一体化的新型服务体系和数据体系山东省建设单位为提升山东省基层医院老年病学科水平建设区域老年疾病预防管理体系利用国家中心在老年疾病临床诊疗的优势在衰老老年常见重大疾病帕金森和老年痴呆等老年神经变性病心脑及外周血管病糖尿病和老年综合征衰弱跌倒便秘等防治领域围绕老年高龄外科围手术期管理老年用药管理老年共病老年重症以及老年常见疾病帕金森病痴呆心脑外周血管病糖尿病等早期预警干预及全程管理的综合评估干预和管理新技术
主要
<view class="">
1开展的科室有帕金森两腺科妇科心脑血管等精准治疗
</view>
<view class="">
2开展项目有慢病管理血液净化高血脂症妇科筛查老年病筛查康复治疗等
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {};
},
//1.
onShareAppMessage(res) {
let pages = getCurrentPages();
let url = pages[pages.length - 1].$page.fullPath
return {
title: '泉医到家',
path: url,
}
},
//2.
onShareTimeline(res) {
let pages = getCurrentPages();
let url = pages[pages.length - 1].$page.fullPath
return {
title: '泉医到家',
path: url,
}
},
}
</script>
<style lang="scss">
.app {
padding-top: 10rpx;
.concent {
width: 701rpx;
height: 1450rpx;
background: #4C7BC9;
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
margin: 5% auto 20px;
.background {
position: relative;
width: 657rpx;
height: 1400rpx;
background: #FFFFFF;
border-radius: 25rpx;
background-color: white;
margin: 0 auto;
top: 50%;
transform: translateY(-50%);
image {
width: 178rpx;
height: 200rpx;
background: #FFFFFF;
border-radius: 25px;
margin-left: 68%;
margin-top: 0;
}
}
}
}
.detailed {
width: 657rpx;
padding: 0 20rpx;
line-height: 56rpx;
}
.detailed view {
text-indent: 2em;
}
</style>

View File

@ -184,6 +184,14 @@
},
//
godiseasemanagement() {
// uni.navigateToMiniProgram({
// appId: 'wxa690d053c34ceebd',
// path: '/pages/index/index',
// extraData: {
// from: 'qy'
// },
// success(res) {}
// })
uni.navigateTo({
url: '/pages/diseasemanagement/diseasemanagement'
})
@ -263,9 +271,9 @@
.app {
padding: 0 0 0 0;
-webkit-overflow-scrolling: touch;
.container {
padding-top: 100rpx;
padding-top: 70rpx;
background-color: #fff
}

View File

@ -29,7 +29,6 @@
onShow() {
uni.removeStorageSync('openid');
uni.removeStorageSync('patientId');
uni.removeStorageSync('token');
uni.removeStorageSync('phone');
},
//1.
@ -63,7 +62,6 @@
}
});
}
},
login() {
getWeChatUser(this.logincode, this.phonecode).then(res => {
@ -96,6 +94,7 @@
})
},
pwdlogin() {
uni.removeStorageSync('token');
var that = this
createMobileToken().then(res => {
uni.setStorageSync("token", res.data.token)

View File

@ -329,7 +329,7 @@
uni.navigateTo({
url: '/pages/login/login'
})
}, 1500)
}, 1000)
}
} catch (e) {
uni.navigateTo({

View File

@ -9,8 +9,8 @@
<script>
import {
existPatientInfo
} from '@/api/startup/index.js'
createMobileToken
} from '@/api/login/index.js'
export default {
data() {
return {};
@ -34,6 +34,9 @@
}
},
onShow() {
createMobileToken().then(res => {
uni.setStorageSync("token", res.data.token)
})
setTimeout(() => {
uni.reLaunch({
url: '/pages/homepage/homepage'

View File

@ -138,7 +138,6 @@
uni.removeStorageSync('patientId');
uni.removeStorageSync('openid');
uni.removeStorageSync('phone');
uni.removeStorageSync('token');
that.$refs.uToast.show({
title: '退出账号成功',
type: 'success',
@ -167,7 +166,6 @@
uni.removeStorageSync('openid');
uni.removeStorageSync('phone');
uni.removeStorageSync('Refresh');
uni.removeStorageSync('token');
uni.navigateBack({
delta: 1
})

BIN
static/lnb.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
static/zbglzbgl.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB