xinyilu/NurseStationApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
曹辉 2022-12-06 10:10:34 +08:00
parent 63274809c6
commit b36dd3ab2c
15 changed files with 223 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
androidPrivacy.json Normal file
View File

@ -0,0 +1,37 @@
{
"version" : "1",
"prompt" : "template",
"title" : "服务协议和隐私政策",
"message" : "请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
"buttonAccept" : "同意并接受",
"buttonRefuse" : "暂不同意",
"hrefLoader" : "system|default",
"second" : {
"title" : "确认提示",
"message" : "进入应用前，你需先同意<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>，否则将退出应用。",
"buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用"
},
"disagreeMode" : {
"support" : false,
"loadNativePlugins" : false,
"visitorEntry" : true,
"showAlways" : true
},
"styles" : {
"backgroundColor" : "#ffffff",
"borderRadius" : "5px",
"title" : {
"color" : "#ff00ff"
},
"buttonAccept" : {
"color" : "#ffff00"
},
"buttonRefuse" : {
"color" : "#00ffff"
},
"buttonVisitor" : {
"color" : "#00ffff"
}
}
}

2
node_modules/.package-lock.json generated vendored
View File

@ -6,7 +6,7 @@
"packages": {
"node_modules/uview-ui": {
"version": "1.8.4",
"resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-1.8.4.tgz",
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz",
"integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA=="
}
}

28
package-lock.json generated Normal file
View File

@ -0,0 +1,28 @@
{
"name": "nursestationapp",
"version": "1.0.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "nursestationapp",
"version": "1.0.0",
"license": "ISC",
"dependencies": {
"uview-ui": "^1.8.4"
}
},
"node_modules/uview-ui": {
"version": "1.8.4",
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz",
"integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA=="
}
},
"dependencies": {
"uview-ui": {
"version": "1.8.4",
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz",
"integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA=="
}
}
}

19
package.json Normal file
View File

@ -0,0 +1,19 @@
{
"dependencies": {
"uview-ui": "^1.8.4"
},
"name": "nursestationapp",
"version": "1.0.0",
"main": "main.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "http://192.168.16.64:3000/jihan/NurseStationApp.git"
},
"keywords": [],
"author": "",
"license": "ISC",
"description": ""
}

25
pages/CommodityOrder/CommodityOrder.vue
View File

@ -9,6 +9,7 @@
<view class="names">店铺名称
<image class="picture" src="/static/pic.png" mode=""></image>
<span v-if="item.orderStatus=='WAIT_PAY'">待付款</span>
<span v-if="item.orderStatus=='WAIT_PAY'&&item.timestamp<=0">订单已关闭</span>
<span v-if="item.orderStatus=='WAIT_REFUND'">退款中</span>
<span v-if="item.orderStatus=='CANCEL'">已取消</span>
<span v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'">待收货</span>
@ -41,7 +42,8 @@
<view class="anniu">
<view class="logistics" v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'" @tap='gologistics(item)'>查看物流
</view>
<view class="logistics harvest" v-if="item.orderStatus=='WAIT_PAY'" @tap='buy(item)'>
<view class="logistics harvest" v-if="item.orderStatus=='WAIT_PAY'&&item.timestamp>0"
@tap='buy(item)'>
去支付</view>
<view class="logistics harvest" @tap='Receipt(item)' v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'">
确认收货</view>
@ -160,6 +162,12 @@
res => {
this.orderlist = res.rows
this.total = res.total
this.orderlist.forEach(e => {
e.timestamp = null
var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24)
var times = new Date().getTime() / 1000
e.timestamp = time - times
})
})
},
//确认收货
@ -179,7 +187,7 @@
title: this.title,
});
},
onShow() {
onLoad(options) { //开局调用
let that = this
try {
const value = uni.getStorageSync('patientId');
@ -188,8 +196,6 @@
that.goodsOrderinfo();
}
} catch (e) {}
},
onLoad(options) { //开局调用
this.baseurl = baseurl;
if (options.orderStatus) {
this.orderStatus = options.orderStatus
@ -209,6 +215,10 @@
.goodsName).then(
res => {
res.rows.forEach(e => {
e.timestamp = null
var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24)
var times = new Date().getTime() / 1000
e.timestamp = time - times
this.orderlist.push(e)
})
this.total = res.total
@ -217,12 +227,7 @@
},
onPullDownRefresh() { //下拉刷新
this.pageNum = 1;
ssgoodsOrder(this.patientId, this.orderStatus, this.goodsOrderId, this.pageSize, this.pageNum, this.goodsName)
.then(res => {
this.orderlist = res.rows
this.total = res.total
console.log(this.orderlist)
})
this.goodsOrderinfo();
setTimeout(function() {
uni.stopPullDownRefresh();
}, 1000);

18
pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
View File

@ -4,7 +4,8 @@
<view class="item" v-for="(item,index) in list" :key="index">
<view class="name">
{{item.createTime}}
<span>{{item.orderStatus=='WAIT_PAY'?'待付款':''}}
<span>{{item.orderStatus=='WAIT_PAY'&&item.timestamp>0?'待付款':''}}
{{item.orderStatus=='WAIT_PAY'&&item.timestamp<=0?'订单已关闭':''}}
{{item.orderStatus=='PAY'?'已付款':''}}
{{item.orderStatus=='WAIT_DISPATCH'?'待服务':''}}
{{item.orderStatus=='NOT_FINISH'?'待完成':''}}
@ -28,7 +29,7 @@
</view>
</view>
<view class="submit" @tap='buy(item)' style="background-color:coral;"
v-if="item.orderStatus=='WAIT_PAY'">
v-if="item.orderStatus=='WAIT_PAY'&&item.timestamp>0">
去支付
</view>
<!-- <view class="submit" style="background-color: crimson;" v-if="item.orderStatus=='WAIT_REFUND'">退款进度</view> -->
@ -63,7 +64,7 @@
list: [],
}
},
onShow() {
onLoad() {
this.baseurl = baseurl
let that = this
try {
@ -74,7 +75,6 @@
}
} catch (e) {}
},
onLoad() {},
methods: {
//支付
buy(item) {
@ -84,6 +84,12 @@
appServiceOrder(this.patientId, this.pageSize, this.pageNum).then(res => {
this.list = res.rows;
this.total = res.total
this.list.forEach(e => {
e.timestamp = null
var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 24)
var times = new Date().getTime() / 1000
e.timestamp = time - times
})
})
},
gofinished(item) {
@ -97,6 +103,10 @@
this.pageNum++
appServiceOrder(this.patientId, this.pageSize, this.pageNum).then(res => {
res.rows.forEach(e => {
e.timestamp = null
var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 24)
var times = new Date().getTime() / 1000
e.timestamp = time - times
this.list.push(e)
})
})

9
pages/ServiceDetails/ServiceDetails.scss
View File

@ -4,6 +4,15 @@
font-size: 36rpx;
padding-top: 10rpx;
font-size: 34rpx;
.time{
height: 80rpx;
width: 95%;
text-align: center;
line-height: 80rpx;
background-color: #fff;
margin: 0 auto 10rpx;
border-radius: 20rpx;
}
.mask{
position: absolute;
bottom:0;

23
pages/ServiceDetails/ServiceDetails.vue
View File

@ -1,5 +1,13 @@
<template>
<view class="app">
<view class="time" style="" v-if="list.orderStatus=='WAIT_PAY'&&timestamp>0">
剩余付款时间：
<u-count-down style='' :timestamp="timestamp">
</u-count-down>
</view>
<view class="OrderStatus" v-if="list.orderStatus=='WAIT_PAY'&&timestamp<=0">
订单已关闭
</view>
<view class="OrderStatus" v-if="list.orderStatus=='REFUNDED'||list.orderStatus=='CANCEL'">
订单已关闭
</view>
@ -44,15 +52,17 @@
</view>
</view>
<view class="Consumablespackage" v-if='list.itemConsumableList'>耗材包详情：
<span>￥{{list.consumableTotalPrice}}</span>
<span v-if="list.consumableTotalPrice">￥{{list.consumableTotalPrice}}</span>
<span v-else>￥0</span>
<view class="detail" v-for='(item,index) in list.itemConsumableList' :key="index">
·{{item.orderConsumableName}}
<!-- <span style='font-size: 30rpx;'>{{item.orderConsumableCount}}{{item.consumableUnit}}/￥{{item.orderConsumablePrice}}</span> -->
<span
style='font-size: 30rpx;'>{{item.orderConsumableCount}}{{item.consumableUnit}}/￥{{item.orderConsumablePrice}}</span>
</view>
</view>
<view class="remarks">
<view>备注：</view>
<input placeholder="请输入" v-model='list.remark'>
<input v-model='list.remark' :disabled="list.orderStatus=='PAY'?true :false">
</view>
<view class="evaluate">
<view class="price">
@ -63,7 +73,7 @@
</view>
<!-- <view class="cancelorder " style="background: #4C7BC9;">评价</view> -->
<view class="cancelorder" @tap='buy' style="background-color: darkorange;"
v-if="list.orderStatus=='WAIT_PAY'">
v-if="list.orderStatus=='WAIT_PAY'&&timestamp>0">
去支付
</view>
<view class="cancelorder" style="background: #4C7BC9;" @tap='rateshow= true'
@ -101,6 +111,7 @@
orderNo: '',
patientId: '', //id
timer: null,
timestamp: 0,
}
},
onLoad(options) {
@ -139,7 +150,9 @@
getlist() {
getAppointmentDetailsInfo(this.orderNo).then(res => {
this.list = res.data
console.log(this.list)
var time = new Date(this.list.createTime).getTime() / 1000 + (60 * 60 * 24)
var times = new Date().getTime() / 1000
this.timestamp = time - times
})
},
//支付

19
pages/appointmenttime/appointmenttime.vue
View File

@ -1,6 +1,5 @@
<template>
<view class="app">
<!-- <view class="message">请填写下面的信息</view> -->
<view class="user">
<view class="item">
<span>姓名：</span>
@ -44,7 +43,7 @@
</text>
</view>
<view class="Consumablespackage">耗材包详情：
<text class="money">￥{{orderlist.consumableTotalPrice}}</text>
<text class="money">￥{{consumableTotalPrice}}</text>
<view class="detail">
<u-checkbox-group @change="checkboxGroupChange" wrap='true'>
<u-checkbox @change="checkboxChange(item)" v-model="item.radio"
@ -139,6 +138,7 @@
personInfo: [], //用户信息
patientId: null,
usertime: '', //页面展示时间
consumableTotalPrice: null, //耗材包总价格
orderlist: {
orderCount: 1,
patientId: '',
@ -277,12 +277,14 @@
//获取耗材包详情
getPatientInfo(stationId, stationItemId, stationItemPriceId) {
getAppStationItemInfo(stationId, stationItemId, stationItemPriceId).then(res => {
res.data.nurseItemContent = ''
if (res.code == 200) {
if (res.data.itemConsumableList) {
res.data.itemConsumableList.forEach(e => {
e.radio = true
})
}
this.consumableTotalPrice = res.data.consumableTotalPrice
this.orderlist = res.data
}
})
@ -295,15 +297,18 @@
type: 'error',
})
} else {
this.orderlist.consumableTotalPrice = null
this.orderlist.orderChannel = "MOBILE_APP"
this.orderlist.buySource = "NURSE_STATION"
this.orderlist.orderCount = 1;
this.orderlist.orderConsumableList = []
this.orderlist.itemConsumableList.forEach(e => {
if (e.radio) {
this.orderlist.orderConsumableList.push(e)
}
})
if (this.orderlist.itemConsumableList) {
this.orderlist.itemConsumableList.forEach(e => {
if (e.radio) {
this.orderlist.orderConsumableList.push(e)
}
})
}
// submitAppointment(this.orderlist).then(res => {
// if (res.code == 500) {
// this.$refs.uToast.show({

2
pages/modifyAddress/modifyAddress.vue
View File

@ -91,13 +91,11 @@
},
goodPatient: [], // 查询地址信息
patientId: null,
url: '',
updata: [],
}
},
onLoad(options) {
let that = this
this.url = options.url
this.updata = JSON.parse(options.updata)
//获取传值
this.goodsList()

20
pages/orderDetails/orderDetails.scss
View File

@ -1,5 +1,4 @@
.app {
padding: 10rpx 0 0 ;
.time{
height: 80rpx;
width: 95%;
@ -9,6 +8,18 @@
margin: 0 auto 10rpx;
border-radius: 20rpx;
}
.OrderStatus{
text-align: center;
width: 300rpx;
height: 70rpx;
margin: 0 auto;
line-height: 70rpx;
background-color:#4C7BC9 ;
border-radius: 50rpx;
// color: #4C7BC9;
color: #FFFFFF;
border: 1rpx solid #4C7BC9;
}
.buy {
background: #FFFFFF;
position: fixed;
@ -37,7 +48,7 @@
background: #FFFFFF;
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
margin: 0 auto;
margin: 30rpx auto;
position: relative;
padding-bottom: 130rpx;
@ -142,12 +153,13 @@
}
.info {
padding: 20rpx 0 50rpx;
padding-top: 30rpx;
height: 40%;
background: #FFFFFF;
box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
width: 95%;
margin: 20rpx auto;
margin: 0 auto;
font-size: 30rpx;
color: #020000;

12
pages/orderDetails/orderDetails.vue
View File

@ -1,10 +1,16 @@
<template>
<view class="app">
<view class="time" style="" v-if="order.orderStatus=='WAIT_PAY'">
<view class="time" style="" v-if="order.orderStatus=='WAIT_PAY'&&timestamp>0">
剩余付款时间：
<u-count-down style='' :timestamp="timestamp">
<u-count-down style='' :timestamp="timestamp">
</u-count-down>
</view>
<view class="OrderStatus" v-if="order.orderStatus=='WAIT_PAY'&&timestamp<=0">
订单已关闭
</view>
<view class="OrderStatus" v-if="list.orderStatus=='REFUNDED'||list.orderStatus=='CANCEL'">
订单已关闭
</view>
<view class="content">
<view class="name">
店铺名称
@ -57,7 +63,7 @@
<!-- <span>发货时间：<text>2022-10-28 11：31：26</text></span> -->
<!-- <span>成交时间：<text>2022-10-28 11：31：26</text></span> -->
</view>
<view class="buy" v-if="order.orderStatus == 'WAIT_PAY'">
<view class="buy" v-if="order.orderStatus == 'WAIT_PAY'&&timestamp>0">
<view class="pay">
去支付
</view>

70
pages/payorderDetails/payorderDetails.vue
View File

@ -5,7 +5,9 @@
<u-count-down style='' :timestamp="timestamp">
</u-count-down>
</view>
<!-- <custom-nav nav='To' Url="/pages/CommodityOrder/CommodityOrder" title='商品订单'></custom-nav> -->
<view class="OrderStatus" v-if="order.orderStatus=='WAIT_PAY'&&timestamp<=0">
订单已关闭
</view>
<view class="content">
<view class="name">
店铺名称
@ -61,7 +63,7 @@
<span v-if="order.orderStatus=='REFUNDED'">退款时间：<text>{{order.updateTime}}</text></span>
<!-- <span>成交时间：<text>2022-10-28 11：31：26</text></span> -->
</view>
<view class="buy" v-if="order.orderStatus == 'WAIT_PAY'" @tap='pay'>
<view class="buy" v-if="order.orderStatus == 'WAIT_PAY'&&timestamp>0" @tap='pay'>
<view class="pay">
去支付
</view>
@ -101,38 +103,38 @@
paydata.paymentPrice = this.order.totalPrice
paydata.orderChannel = 'WECHAT_APPLET'
paydata.orderNo = this.order.goOrderNo
appletGoodsOrderPay(paydata).then(response => {
if (response.code == 200) {
uni.requestPayment({
timeStamp: response.data.timeStamp,
nonceStr: response.data.nonceStr,
package: response.data.prepayId,
signType: response.data.signType,
paySign: response.data.paySign,
success: function(res) {
that.$refs.uToast.show({
title: '支付成功',
type: 'success',
toast: 1500,
url: `/pages/paysuccess/paysuccess?delta=${3}`
})
},
fail: function(err) {
that.$refs.uToast.show({
title: '取消支付',
type: 'error',
toast: 1500,
})
}
});
} else {
that.$refs.uToast.show({
title: response.msg,
type: 'error',
toast: 2000
})
}
})
// appletGoodsOrderPay(paydata).then(response => {
// if (response.code == 200) {
// uni.requestPayment({
// timeStamp: response.data.timeStamp,
// nonceStr: response.data.nonceStr,
// package: response.data.prepayId,
// signType: response.data.signType,
// paySign: response.data.paySign,
// success: function(res) {
// that.$refs.uToast.show({
// title: '支付成功',
// type: 'success',
// toast: 1500,
// url: `/pages/paysuccess/paysuccess?delta=${3}`
// })
// },
// fail: function(err) {
// that.$refs.uToast.show({
// title: '取消支付',
// type: 'error',
// toast: 1500,
// })
// }
// });
// } else {
// that.$refs.uToast.show({
// title: response.msg,
// type: 'error',
// toast: 2000
// })
// }
// })
},
//退款页面
gorefundType() {

17
pages/site/site.scss
View File

@ -1,6 +1,6 @@
//护理站列表
.app{
padding: 0 0 20rpx 0;
padding: 0 0 5rpx 0;
.map{
padding-top: 100rpx;
z-index: 1;
@ -35,13 +35,13 @@
position: absolute;
top: 15%;
left: 35%;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
}
.distance {
@ -100,7 +100,6 @@
}
.masks {
height: 100vh;
width: 100%;
position: absolute;
opacity: 0.9;

3
pages/site/site.vue
View File

@ -168,7 +168,7 @@
// this.requestinfo()
},
},
onShow() {
onLoad() {
var that = this
try {
const value = uni.getStorageSync('patientId');
@ -199,7 +199,6 @@
}
} catch (e) {}
},
onLoad() {},
}
</script>
<style lang="scss">