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

修改

Browse Source
This commit is contained in:
曹辉 2023-01-13 13:55:31 +08:00
parent 1614b27292
commit 944486e7f4
19 changed files with 443 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/modifyAddress/modifyAddress.js
View File

@ -68,3 +68,13 @@ export function getSubordinateInfo(id) {
method: 'GET' method: 'GET'
}) })
} }
//默认地址
export function updateDefaultAddress(data) {
return request({
url: `/nurseApplet/nursingStationGoods/updateDefaultAddress`,
method: 'POST',
data
})
}

122
pages/CommodityDetails/CommodityDetails.vue
View File

@ -9,7 +9,7 @@
暂无 暂无
</view> </view>
<view class="price"> <view class="price">
￥{{goodsPrice}} 起 ￥{{goodsPrice}}
</view> </view>
</view> </view>
<view class="choice common" @tap="buyshow=true"> <view class="choice common" @tap="buyshow=true">
@ -82,15 +82,18 @@
<view class="bodys" @tap='upaddress()'> <view class="bodys" @tap='upaddress()'>
<view class="addressinfo"> <view class="addressinfo">
<image src="../../static/locatinsmall.png" mode=""></image> <image src="../../static/locatinsmall.png" mode=""></image>
<view class="namephone"> <view class="namephone" v-if='userid'>
{{updata.receiver}},{{updata.phone}} {{updata.receiver}},{{updata.phone}}
</view> </view>
<view class="address" v-if='userid'>
{{updata.receiveAddress}}
</view>
<view class="namephone" v-else>
前往完善个人信息
</view>
<view class="picture2"> <view class="picture2">
<u-icon name="arrow-right" color="black" size="28"></u-icon> <u-icon name="arrow-right" color="black" size="28"></u-icon>
</view> </view>
<view class="address">
{{updata.receiveAddress}}
</view>
</view> </view>
</view> </view>
<view class="centercontent topcontent" v-show="goodshow"> <view class="centercontent topcontent" v-show="goodshow">
@ -165,10 +168,17 @@
import { import {
goodsDetails goodsDetails
} from '@/api/CommodityDetails/CommodityDetails.js' } from '@/api/CommodityDetails/CommodityDetails.js'
import {
AppIdentification
} from '@/api/AppIdentification/index.js'
import { import {
goodPatientInfo goodPatientInfo
} from '@/api/modifyAddress/modifyAddress.js'; } from '@/api/modifyAddress/modifyAddress.js';
import baseurl from '@/api/baseurl.js' import baseurl from '@/api/baseurl.js'
import {
addStationGoodsOrder,
appletGoodsOrderPay
} from '@/api/confirmOrder/index.js'
export default { export default {
data() { data() {
return { return {
@ -228,31 +238,31 @@
}) })
}, },
//立即购买跳转确认订单页面 //立即购买跳转确认订单页面
tapbuy() { tapbuy() {},
},
//选择商品 //选择商品
isActivegoods(item) { isActivegoods(item) {
this.updata.goodsPrice = 0
this.updata.goodsAttributeName = ''
if (item.isActive == true) { if (item.isActive == true) {
this.goodDetailsLists.forEach(e => { // this.updata.goodsPrice = 0
e.isActive = false // this.updata.goodsAttributeName = ''
}) // this.goodDetailsLists.forEach(e => {
this.updata.goodsAttributeName = '' // e.isActive = false
this.updata.goodsPrice = 0 // })
this.updata.attributeDetailsId = '' // this.updata.goodsAttributeName = ''
this.updata.goodsStock = 0 // this.updata.goodsPrice = 0
this.updata.img = this.image // this.updata.attributeDetailsId = ''
// this.updata.goodsStock = 0
// this.updata.img = this.image
} else { } else {
this.goodDetailsLists.forEach(e => { this.goodDetailsLists.forEach(e => {
e.isActive = false e.isActive = false
}) })
item.isActive = true item.isActive = true
this.goodsAttributeId = item.goodsAttributeId
this.updata.img = item.attributePitureUrl this.updata.img = item.attributePitureUrl
this.updata.goodsAttributeName = item.attributeDetailsName this.updata.goodsAttributeName = item.attributeDetailsName
this.updata.goodsPrice = item.goodsPrice this.updata.goodsPrice = item.goodsPrice
this.updata.goodsPrice = this.updata.goodsPrice.toFixed(2) this.updata.goodsPrice = this.updata.goodsPrice.toFixed(2)
this.goodsPrice = this.updata.goodsPrice
this.updata.attributeDetailsId = item.attributeDetailsId this.updata.attributeDetailsId = item.attributeDetailsId
this.updata.goodsStock = item.goodsStock this.updata.goodsStock = item.goodsStock
this.updata.goodsAttributeId = item.goodsAttributeId this.updata.goodsAttributeId = item.goodsAttributeId
@ -268,7 +278,6 @@
res.data.goodsRemark = res.data.goodsRemark.replace(/\<img/gi, res.data.goodsRemark = res.data.goodsRemark.replace(/\<img/gi,
"<br/> <img class='richPic'") "<br/> <img class='richPic'")
} }
this.goodsPrice = res.data.minGoodsPrice //页面价格
res.data.goodsPictureUrl = this.baseurl + res.data.goodsPictureUrl res.data.goodsPictureUrl = this.baseurl + res.data.goodsPictureUrl
this.image = res.data.goodsPictureUrl this.image = res.data.goodsPictureUrl
var obj = { var obj = {
@ -304,7 +313,7 @@
this.updata.goodsStock = this.goodDetailsLists[0].goodsStock this.updata.goodsStock = this.goodDetailsLists[0].goodsStock
this.updata.goodsAttributeId = this.goodDetailsLists[0].goodsAttributeId this.updata.goodsAttributeId = this.goodDetailsLists[0].goodsAttributeId
this.updata.goodsAttributeDetailsId = this.goodDetailsLists[0].attributeDetailsId this.updata.goodsAttributeDetailsId = this.goodDetailsLists[0].attributeDetailsId
} else { } else {
var list = {} var list = {}
this.goodsDetailslist.goodAttributeDetailsLists.forEach(e => { this.goodsDetailslist.goodAttributeDetailsLists.forEach(e => {
if (e.goodsAttributeId == this.goodsAttributeId) { if (e.goodsAttributeId == this.goodsAttributeId) {
@ -332,36 +341,49 @@
}, },
//跳转到全部收货地址 //跳转到全部收货地址
upaddress() { upaddress() {
uni.navigateTo({ if (this.updata.receiver) {
url: `/pages/modifyAddress/modifyAddress?updata=${JSON.stringify(this.updata)}` uni.navigateTo({
}) url: `/pages/modifyAddress/modifyAddress?updata=${JSON.stringify(this.updata)}`
})
} else {
uni.navigateTo({
url: '/pages/information/information'
})
}
}, },
// 收件人 // 收件人
goodsList() { goodsList() {
goodPatientInfo(this.updata.patientId).then(res => { goodPatientInfo(this.updata.patientId).then(res => {
res.data.forEach(e => { // res.data.forEach(e => {
e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e // e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e
.receiveAddress // .receiveAddress
}) // })
this.updata.receiver = res.data[0].receiveName var list = res.data.filter(e => e.defaultAddressFlag == 1)
this.updata.receiveAddress = res.data[0].address if (list.length >= 1) {
this.updata.phone = res.data[0].receivePhone this.updata.receiver = list[0].receiveName
this.userid = res.data[0].id this.updata.receiveAddress = list[0].areaName + list[0].receiveAddress
this.updata.phone = list[0].receivePhone
this.userid = list[0].id
} else {
this.updata.receiver = res.data[0].receiveName
this.updata.receiveAddress = res.data[0].areaName + res.data[0].receiveAddress
this.updata.phone = res.data[0].receivePhone
this.userid = res.data[0].id
}
}) })
}, },
}, },
onLoad(options) { //获取传值 onLoad(options) { //获取传值
var that = this var that = this
this.goodsPrice = options.goodsPrice //页面价格
this.goodsAttributeId = options.goodsAttributeId this.goodsAttributeId = options.goodsAttributeId
this.updata.buySource = options.buySource this.updata.buySource = options.buySource
this.goodsInfoId = options.goodsInfoId this.goodsInfoId = options.goodsInfoId
try { const value = uni.getStorageSync('patientId');
const value = uni.getStorageSync('patientId'); if (value) {
if (value) { that.updata.patientId = value
that.updata.patientId = value that.goodsList()
that.goodsList() } else {}
} else {}
} catch (e) {}
}, },
onShow() { onShow() {
var that = this var that = this
@ -370,14 +392,23 @@
this.goodsDetailsinfo(this.goodsInfoId) this.goodsDetailsinfo(this.goodsInfoId)
goodPatientInfo(this.updata.patientId).then(res => { goodPatientInfo(this.updata.patientId).then(res => {
var user = res.data.filter(e => e.id == this.userid) var user = res.data.filter(e => e.id == this.userid)
if (user.length == 0) { if (user.length >= 1) {
res.data.forEach(e => { // user[0].address = user[0].provinceName + user[0].cityName + user[0].regionName + user[0]
e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e // .streetName + user[0].receiveAddress
.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.receiver = res.data[0].receiveName
this.updata.receiveAddress = res.data[0].address // 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.updata.phone = res.data[0].receivePhone
this.userid = res.data[0].id
} }
}) })
let useritem = null let useritem = null
@ -387,7 +418,8 @@
useritem = JSON.parse(data.useritem) useritem = JSON.parse(data.useritem)
that.updata.receiver = useritem.receiveName that.updata.receiver = useritem.receiveName
that.updata.phone = useritem.receivePhone that.updata.phone = useritem.receivePhone
that.updata.receiveAddress = useritem.address // that.updata.receiveAddress = useritem.address
that.updata.receiveAddress = useritem.areaName + useritem.receiveAddress
that.userid = useritem.id that.userid = useritem.id
} }
}) })

10
pages/CommodityDetails/CommodityDetailsstyle.scss
View File

@ -79,9 +79,11 @@
transform: translateY(-50%); transform: translateY(-50%);
} }
.address{ .address{
padding-top: 10rpx;
width:92%; width:92%;
font-size: 32rpx; font-size: 30rpx;
word-break:break-all; word-break:break-all;
line-height: 45rpx;
} }
.namephone{ .namephone{
width: 70%; width: 70%;
@ -178,7 +180,7 @@
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 15rpx; border-radius: 15rpx;
.chat { .chat {
height: 130rpx; height: 130rpx;
position: relative; position: relative;
span { span {
font-size: 30rpx; font-size: 30rpx;
@ -223,12 +225,12 @@
} }
.productmodel { .productmodel {
border: 1rpx solid #FFFFFF; border: 4rpx solid #FFFFFF;
} }
.Productmodel { .Productmodel {
background: #ECF1FA; background: #ECF1FA;
border: 1rpx solid #4C7BC9; border: 4rpx solid #4C7BC9;
color: #4C7BC9; color: #4C7BC9;
} }
.productmodel,.Productmodel{ .productmodel,.Productmodel{

25
pages/CommodityOrder/CommodityOrder.vue
View File

@ -8,8 +8,7 @@
<view class="Apayment" v-for='(item,index) in orderlist' :key="index"> <view class="Apayment" v-for='(item,index) in orderlist' :key="index">
<view class="names">店铺名称 <view class="names">店铺名称
<image class="picture" src="/static/pic.png" mode=""></image> <image class="picture" src="/static/pic.png" mode=""></image>
<span v-if="item.orderStatus=='WAIT_PAY'&&item.timestamp>0">待付款</span> <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=='WAIT_REFUND'">退款中</span>
<span v-if="item.orderStatus=='CANCEL'">已取消</span> <span v-if="item.orderStatus=='CANCEL'">已取消</span>
<span v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'">待收货</span> <span v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'">待收货</span>
@ -44,7 +43,7 @@
</view> </view>
<view class="logistics" v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'" @tap='gologistics(item)'>查看物流 <view class="logistics" v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'" @tap='gologistics(item)'>查看物流
</view> </view>
<view class="logistics harvest" v-if="item.orderStatus=='WAIT_PAY'&&item.timestamp>0" <view class="logistics harvest" v-if="item.orderStatus=='WAIT_PAY'"
@tap='buy(item)'> @tap='buy(item)'>
去支付</view> 去支付</view>
<view class="logistics harvest" @tap='Receipt(item)' v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'"> <view class="logistics harvest" @tap='Receipt(item)' v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'">
@ -168,12 +167,12 @@
res => { res => {
this.orderlist = res.rows this.orderlist = res.rows
this.total = res.total this.total = res.total
this.orderlist.forEach(e => { // this.orderlist.forEach(e => {
e.timestamp = null // e.timestamp = null
var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24) // var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24)
var times = new Date().getTime() / 1000 // var times = new Date().getTime() / 1000
e.timestamp = time - times // e.timestamp = time - times
}) // })
}) })
}, },
//确认收货 //确认收货
@ -228,10 +227,10 @@
.goodsName).then( .goodsName).then(
res => { res => {
res.rows.forEach(e => { res.rows.forEach(e => {
e.timestamp = null // e.timestamp = null
var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24) // var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24)
var times = new Date().getTime() / 1000 // var times = new Date().getTime() / 1000
e.timestamp = time - times // e.timestamp = time - times
this.orderlist.push(e) this.orderlist.push(e)
}) })
this.total = res.total this.total = res.total

26
pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
View File

@ -4,8 +4,7 @@
<view class="item" v-for="(item,index) in list" :key="index"> <view class="item" v-for="(item,index) in list" :key="index">
<view class="name"> <view class="name">
{{item.createTime}} {{item.createTime}}
<span>{{item.orderStatus=='WAIT_PAY'&&item.timestamp>0?'待付款':''}} <span>{{item.orderStatus=='WAIT_PAY'?'待付款':''}}
{{item.orderStatus=='WAIT_PAY'&&item.timestamp<=0?'订单已关闭':''}}
{{item.orderStatus=='PAY'?'已付款':''}} {{item.orderStatus=='PAY'?'已付款':''}}
{{item.orderStatus=='WAIT_DISPATCH'?'待服务':''}} {{item.orderStatus=='WAIT_DISPATCH'?'待服务':''}}
{{item.orderStatus=='NOT_FINISH'?'待完成':''}} {{item.orderStatus=='NOT_FINISH'?'待完成':''}}
@ -29,7 +28,7 @@
</view> </view>
</view> </view>
<view class="submit" @tap='buy(item)' style="background-color:coral;" <view class="submit" @tap='buy(item)' style="background-color:coral;"
v-if="item.orderStatus=='WAIT_PAY'&&item.timestamp>0"> v-if="item.orderStatus=='WAIT_PAY'">
去支付 去支付
</view> </view>
<view class="submit" v-if="item.orderStatus=='WAIT_REFUND'" style="background-color: coral;">退款中</view> <view class="submit" v-if="item.orderStatus=='WAIT_REFUND'" style="background-color: coral;">退款中</view>
@ -148,7 +147,6 @@
taprate(item) { taprate(item) {
var obj = { var obj = {
"patientId": this.patientId, "patientId": this.patientId,
"openid": this.openid,
"orderNo": this.orderNo, "orderNo": this.orderNo,
"evaluateChannel": "PHONE_APP", "evaluateChannel": "PHONE_APP",
"evaluateSatisfaction": item, "evaluateSatisfaction": item,
@ -177,12 +175,12 @@
appServiceOrder(this.patientId, this.pageSize, this.pageNum).then(res => { appServiceOrder(this.patientId, this.pageSize, this.pageNum).then(res => {
this.list = res.rows; this.list = res.rows;
this.total = res.total this.total = res.total
this.list.forEach(e => { // this.list.forEach(e => {
e.timestamp = null // e.timestamp = null
var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 24) // var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 24)
var times = new Date().getTime() / 1000 // var times = new Date().getTime() / 1000
e.timestamp = time - times // e.timestamp = time - times
}) // })
}) })
}, },
gofinished(item) { gofinished(item) {
@ -196,10 +194,10 @@
this.pageNum++ this.pageNum++
appServiceOrder(this.patientId, this.pageSize, this.pageNum).then(res => { appServiceOrder(this.patientId, this.pageSize, this.pageNum).then(res => {
res.rows.forEach(e => { res.rows.forEach(e => {
e.timestamp = null // e.timestamp = null
var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 24) // var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 24)
var times = new Date().getTime() / 1000 // var times = new Date().getTime() / 1000
e.timestamp = time - times // e.timestamp = time - times
this.list.push(e) this.list.push(e)
}) })
}) })

74
pages/ProjectDetails/ProjectDetails.vue
View File

@ -70,39 +70,21 @@
//预约 //预约
goappointments() { goappointments() {
let that = this let that = this
try { const value = uni.getStorageSync('patientId');
const value = uni.getStorageSync('openid'); if (value) {
if (value) { AppIdentification(value).then(res => {
const value2 = uni.getStorageSync('patientId'); if (res.code == 200) {
if (value2) { if (res.data.loginFlag) {
AppIdentification(value2).then(res => { that.usershow = false
if (res.code == 200) { uni.navigateTo({
if (res.data.loginFlag) { url: `/pages/appointmenttime/appointmenttime?stationId=${this.list.stationId}&stationItemId=${this.list.stationItemId}&stationItemPriceId=${this.list.stationItemPriceId}`,
that.usershow = false })
uni.navigateTo({ } else {
url: `/pages/appointmenttime/appointmenttime?stationId=${this.list.stationId}&stationItemId=${this.list.stationItemId}&stationItemPriceId=${this.list.stationItemPriceId}`, that.usershow = true
}) }
} else {
that.usershow = true
}
} else {
that.$refs.uToast.show({
title: res.msg,
type: 'error'
})
if (that.timer) {
clearTimeout(that.timer)
}
that.timer = setTimeout(e => {
uni.navigateTo({
url: '/pages/login/login'
})
}, 1500)
}
})
} else { } else {
that.$refs.uToast.show({ that.$refs.uToast.show({
title: '未登录,请先登录', title: res.msg,
type: 'error' type: 'error'
}) })
if (that.timer) { if (that.timer) {
@ -114,24 +96,20 @@
}) })
}, 1500) }, 1500)
} }
} else {
that.$refs.uToast.show({
title: '未登录,请先登录',
type: 'error'
})
if (that.timer) {
clearTimeout(that.timer)
}
that.timer = setTimeout(e => {
uni.navigateTo({
url: '/pages/login/login'
})
}, 1500)
}
} catch (e) {
uni.navigateTo({
url: '/pages/login/login'
}) })
} else {
that.$refs.uToast.show({
title: '未登录,请先登录',
type: 'error'
})
if (that.timer) {
clearTimeout(that.timer)
}
that.timer = setTimeout(e => {
uni.navigateTo({
url: '/pages/login/login'
})
}, 1500)
} }
}, },
//跳转完善页面 //跳转完善页面

7
pages/ServiceDetails/ServiceDetails.vue
View File

@ -1,13 +1,10 @@
<template> <template>
<view class="app"> <view class="app">
<view class="time" style="" v-if="list.orderStatus=='WAIT_PAY'&&timestamp>0"> <view class="time" style="" v-if="list.orderStatus=='WAIT_PAY'">
剩余付款时间： 剩余付款时间：
<u-count-down style='' :timestamp="timestamp"> <u-count-down style='' :timestamp="timestamp">
</u-count-down> </u-count-down>
</view> </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 class="OrderStatus" v-if="list.orderStatus=='REFUNDED'||list.orderStatus=='CANCEL'">
订单已关闭 订单已关闭
</view> </view>
@ -72,7 +69,7 @@
v-if="list.orderStatus=='PAY'||list.orderStatus=='WAIT_DISPATCH'||list.orderStatus=='NOT_FINISH'">取消订单 v-if="list.orderStatus=='PAY'||list.orderStatus=='WAIT_DISPATCH'||list.orderStatus=='NOT_FINISH'">取消订单
</view> </view>
<view class="cancelorder" @tap='buy' style="background-color: darkorange;" <view class="cancelorder" @tap='buy' style="background-color: darkorange;"
v-if="list.orderStatus=='WAIT_PAY'&&timestamp>0"> v-if="list.orderStatus=='WAIT_PAY'">
去支付 去支付
</view> </view>
<view class="cancelorder" style="background: #4C7BC9;" v-if="list.orderStatus=='EVALUATED'" @tap='lookrate'> <view class="cancelorder" style="background: #4C7BC9;" v-if="list.orderStatus=='EVALUATED'" @tap='lookrate'>

12
pages/appointmenttime/appointmenttime.vue
View File

@ -45,7 +45,7 @@
<view class="Consumablespackage">耗材包详情： <view class="Consumablespackage">耗材包详情：
<text class="money">￥{{consumableTotalPrice}}</text> <text class="money">￥{{consumableTotalPrice}}</text>
<view class="detail"> <view class="detail">
<u-checkbox-group @change="checkboxGroupChange" > <u-checkbox-group @change="checkboxGroupChange">
<u-checkbox @change="checkboxChange(item)" v-model="item.radio" <u-checkbox @change="checkboxChange(item)" v-model="item.radio"
v-for="(item, index) in orderlist.itemConsumableList" :key="index" v-for="(item, index) in orderlist.itemConsumableList" :key="index"
:name="item.consumableDetail"> :name="item.consumableDetail">
@ -261,13 +261,9 @@
//被护理人信息 //被护理人信息
getAppPatientList(value).then(response => { getAppPatientList(value).then(response => {
that.personInfo = response.data that.personInfo = response.data
that.personInfo.address = response.data.provinceName + response.data that.personInfo.address = response.data.areaName + response.data.address
.cityName + response.data.regionName + response.data.streetName +
response.data.address
that.orderlist.patientId = response.data.patientId that.orderlist.patientId = response.data.patientId
that.orderlist.serviceAddress = response.data.provinceName + response.data that.orderlist.serviceAddress = response.data.areaName + response.data.address
.cityName + response.data.regionName + response.data.streetName +
response.data.address
}) })
} }
} catch (e) { } catch (e) {
@ -320,7 +316,7 @@
// title: '预约成功', // title: '预约成功',
// type: 'success', // type: 'success',
// url: '/pages/paysuccess/paysuccess', // url: '/pages/paysuccess/paysuccess',
// toast: 1500 // duration: 1500
// }) // })
// } // }
// }) // })

4
pages/information/information.scss
View File

@ -174,7 +174,9 @@
display: inline-block; display: inline-block;
height: 120rpx; height: 120rpx;
line-height: 120rpx; line-height: 120rpx;
overflow: hidden;text-overflow: ellipsis;white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
} }
span { span {

90
pages/information/information.vue
View File

@ -137,41 +137,49 @@
//提交信息 //提交信息
informationinfo() { informationinfo() {
let that = this let that = this
if (this.addresslength.length > 2) { if (this.addresslength) {
try { if (this.addresslength.length > 2) {
const value = uni.getStorageSync('phone'); try {
if (value) { const value = uni.getStorageSync('phone');
that.query.phone = value if (value) {
information(that.query).then(res => { that.query.phone = value
if (res.code == 200) { information(that.query).then(res => {
that.$refs.uToast.show({ if (res.code == 200) {
title: '完善信息成功', that.$refs.uToast.show({
type: 'success', title: '完善信息成功',
duration: '1500' type: 'success',
}) duration: '1500'
if (that.timer) {
clearTimeout(that.timer)
}
that.timer = setTimeout(e => {
uni.navigateBack({
delta: 1
}) })
}, 1500) if (that.timer) {
} else if (res.code == 500) { clearTimeout(that.timer)
that.$refs.uToast.show({ }
title: res.msg, that.timer = setTimeout(e => {
type: 'error', uni.navigateBack({
}) delta: 1
} })
}) }, 1500)
} } else if (res.code == 500) {
} catch (e) {} that.$refs.uToast.show({
title: res.msg,
type: 'error',
})
}
})
}
} catch (e) {}
} else {
that.$refs.uToast.show({
title: '所属区域应选择所在的区或街道,请重新选择!',
type: 'error'
})
}
} else { } else {
that.$refs.uToast.show({ that.$refs.uToast.show({
title: '地址不完整,请选择到区级', title: '所属区域应选择所在的区或街道,请重新选择!',
type: 'error' type: 'error'
}) })
} }
}, },
//获取所在位置 //获取所在位置
getAddress() { getAddress() {
@ -202,18 +210,21 @@
getpickerParentValue(e) { getpickerParentValue(e) {
this.addresslength = e this.addresslength = e
if (e.length == 4) { if (e.length == 4) {
this.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName + '-' + e[3] this.address = e[0].localName + e[1].localName + e[2].localName + e[3]
.localName .localName
this.query.areaCode = e[3].id this.query.areaCode = e[3].id
} else if (e.length == 3) { } else if (e.length == 3) {
this.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName this.address = e[0].localName + e[1].localName + e[2].localName
this.query.areaCode = e[2].id this.query.areaCode = e[2].id
} else if (e.length == 2) { } else if (e.length == 2) {
this.address = e[0].localName + '-' + e[1].localName this.address = e[0].localName + e[1].localName
this.query.areaCode = e[1].id this.query.areaCode = e[1].id
} else if (e.length == 1) { } else if (e.length == 1) {
this.address = e[0].localName this.address = e[0].localName
this.query.areaCode = e[0].id this.query.areaCode = e[0].id
} else {
this.address = ''
this.query.areaCode = ''
} }
}, },
// 显示三级地址联动 // 显示三级地址联动
@ -221,11 +232,6 @@
this.areashow = true this.areashow = true
this.$refs.cityPicker.show(); this.$refs.cityPicker.show();
}, },
//区街道选择
areaconfirm(e) {
this.query.areaCode = e[e.length - 1].value
this.address = e[0].label + '-' + e[1].label
},
//点击所需服务 //点击所需服务
addnurseType(item) { addnurseType(item) {
if (this.query.nurseTypeIdList.findIndex(e => e == item.id) == -1) { if (this.query.nurseTypeIdList.findIndex(e => e == item.id) == -1) {
@ -259,15 +265,7 @@
if (value) { if (value) {
that.query.patientId = value that.query.patientId = value
} }
} catch (e) { } catch (e) {}
// error
}
// uni.getStorage({
// key: 'patientId',
// success: function(res) {
// that.query.patientId = res.data
// }
// });
this.areaInfo() this.areaInfo()
this.getNurseTypeInfo(); this.getNurseTypeInfo();
}, },

53
pages/m-city/m-city.vue
View File

@ -1,11 +1,18 @@
<template> <template>
<view> <view>
<view class="mask" :class="{ maskShow: showPicker }" @click="hide" @click.stop.prevent @touchmove.stop.prevent <view class="mask" :class="{ maskShow: showPicker }" @click="goemit" @click.stop.prevent @touchmove.stop.prevent
catchtouchmove="true"></view> catchtouchmove="true"></view>
<view class="cpicker-content" :class="{ cpickerShow: showPicker }"> <view class="cpicker-content" :class="{ cpickerShow: showPicker }">
<view class="city-head" @click.stop.prevent @touchmove.stop.prevent catchtouchmove="true"> <view class="city-head" @click.stop.prevent @touchmove.stop.prevent catchtouchmove="true">
<view class="city-head-title">{{ headTitle }}</view> <view class="city-head-title">{{ headTitle }}</view>
<icon type="clear" v-if="clearRightIcon" class="clearRightIcon" size="20" color="#cccccc" @click="hide"> <!-- <view class="titlecancel" @click="hide">
取消
</view>
<view class="titletap" @click="goemit">
确定
</view> -->
<icon type="clear" v-if="clearRightIcon" class="clearRightIcon" size="20" color="#cccccc"
@click="goemit">
</icon> </icon>
</view> </view>
<scroll-view id="nav-bar" class="nav-bar" scroll-x="true" scroll-with-animation="true" <scroll-view id="nav-bar" class="nav-bar" scroll-x="true" scroll-with-animation="true"
@ -74,14 +81,23 @@
showPicker: false, //显示选取器 showPicker: false, //显示选取器
}; };
}, },
onShow() { onShow() {},
},
onLoad() { onLoad() {
}, },
onUnload() {}, onUnload() {},
methods: { methods: {
goemit() {
var list = null
console.log(this.tabbars)
if (this.tabbars[this.tabbars.length - 1].localName == '请选择') {
list = this.tabbars.filter(e => e.localName != '请选择')
}else{
list = this.tabbars
}
this.$emit("funcValue", list);
this.hide();
},
/** /**
* 显示选择器 * 显示选择器
*/ */
@ -259,10 +275,11 @@
border-bottom-width: 1px; border-bottom-width: 1px;
border-bottom-color: #f4f4f4; border-bottom-color: #f4f4f4;
border-bottom-style: solid; border-bottom-style: solid;
position: relative;
} }
.city-head-title { .city-head-title {
font-size: 15px; font-size: 30rpx;
line-height: 88rpx; line-height: 88rpx;
align-items: center; align-items: center;
/* #ifndef APP-NVUE */ /* #ifndef APP-NVUE */
@ -270,6 +287,24 @@
/* #endif */ /* #endif */
} }
.titletap {
display: inline-block;
fonts-size: 24rpx;
position: absolute;
right: 5%;
top: 22rpx;
color: #999999;
}
.titlecancel {
display: inline-block;
fonts-size: 24rpx;
position: absolute;
left: 5%;
top: 22rpx;
color: #999999;
}
.clearRightIcon { .clearRightIcon {
position: absolute; position: absolute;
right: 15px; right: 15px;
@ -306,7 +341,7 @@
} }
.nav-bar-title { .nav-bar-title {
font-size: 12px; font-size: 30rpx;
} }
.current { .current {
@ -321,7 +356,7 @@
} }
.panel-scroll-box { .panel-scroll-box {
height: 516rpx; height: 750rpx;
margin-top: 8px; margin-top: 8px;
} }
@ -341,7 +376,7 @@
/* #endif */ /* #endif */
height: 35px; height: 35px;
line-height: 35px; line-height: 35px;
font-size: 13px; font-size: 30rpx;
} }
.hide { .hide {

49
pages/menttimeorder/menttimeorder.vue
View File

@ -88,7 +88,6 @@
return { return {
baseurl: '', baseurl: '',
patientId: '', //id patientId: '', //id
openid: '', //id
list: {}, list: {},
orderNo: '', orderNo: '',
timestamp: 0, timestamp: 0,
@ -103,59 +102,11 @@
that.patientId = value that.patientId = value
} }
} catch (e) {} } catch (e) {}
try {
const value = uni.getStorageSync('openid');
if (value) {
that.openid = value
}
} catch (e) {}
this.getlist(JSON.parse(options.list).orderNo) this.getlist(JSON.parse(options.list).orderNo)
}, },
methods: { methods: {
//支付 //支付
buy() { buy() {
var that = this
let obj = {
patientId: this.patientId,
openid: this.openid,
orderNo: this.list.orderNo,
orderChannel: "WECHAT_APPLET",
paymentPrice: this.list.totalPrice,
payType: "WECHAT_PAY",
buySource: "NURSE_STATION",
}
appletAppointmentOrderPay(obj).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
})
}
})
}, },
//打电话 //打电话
gophone() { gophone() {

3
pages/modify/modify.scss
View File

@ -159,6 +159,9 @@
display: inline-block; display: inline-block;
height: 120rpx; height: 120rpx;
line-height: 120rpx; line-height: 120rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
} }
span { span {

33
pages/modify/modify.vue
View File

@ -31,7 +31,7 @@
<view class="item" @tap='getAddress'> <view class="item" @tap='getAddress'>
<span>所在位置:</span> <span>所在位置:</span>
<view class="address" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"> <view class="address" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
{{chooseLocation}} {{appPersonallist.locationName}}
</view> </view>
</view> </view>
<view class="disease" style="border: none;" @tap="godisease"> <view class="disease" style="border: none;" @tap="godisease">
@ -52,8 +52,6 @@
style="color: #000000;border-bottom: 1rpx solid #000000;">《用户协议》</text> style="color: #000000;border-bottom: 1rpx solid #000000;">《用户协议》</text>
</view> </view>
</view> </view>
<!-- <u-select v-model="areashow" mode="mutil-column-auto" label-name='areaName' value-name='areaCode'
:list="arealist" @confirm="areaconfirm"></u-select> -->
<view class="finish" @tap="informationinfo()">完成 <view class="finish" @tap="informationinfo()">完成
</view> </view>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
@ -147,21 +145,13 @@
that.appPersonallist.homeLatitude = Number(that.appPersonallist.homeLatitude) that.appPersonallist.homeLatitude = Number(that.appPersonallist.homeLatitude)
that.appPersonallist.homeLongitude = Number(that.appPersonallist.homeLongitude) that.appPersonallist.homeLongitude = Number(that.appPersonallist.homeLongitude)
that.img = baseurl + that.appPersonallist.headPictureUrl that.img = baseurl + that.appPersonallist.headPictureUrl
if (that.appPersonallist.streetName) { if (that.appPersonallist.areaName) {
that.address = that.appPersonallist.provinceName + '-' + that.appPersonallist that.address = that.appPersonallist.areaName
.cityName + '-' + that.appPersonallist.regionName + '-' + that.appPersonallist
.streetName
} else {
that.address = that.appPersonallist.provinceName + '-' + that.appPersonallist
.cityName + '-' + that.appPersonallist.regionName
} }
that.patientDiseaseInfoList = that.appPersonallist.patientDiseaseInfoList that.patientDiseaseInfoList = that.appPersonallist.patientDiseaseInfoList
that.patientDiseaseInfoList.forEach(e => { that.patientDiseaseInfoList.forEach(e => {
e.id = e.diseaseId e.id = e.diseaseId
}) })
if (that.appPersonallist.locationName) {
that.chooseLocation = that.appPersonallist.locationName
}
} else if (Response.code == 9999) {} else {} } else if (Response.code == 9999) {} else {}
}) })
} else {} } else {}
@ -172,18 +162,21 @@
getpickerParentValue(e) { getpickerParentValue(e) {
this.addresslength = e this.addresslength = e
if (e.length == 4) { if (e.length == 4) {
this.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName + '-' + e[3] this.address = e[0].localName + e[1].localName + e[2].localName + e[3]
.localName .localName
this.appPersonallist.areaCode = e[3].id this.appPersonallist.areaCode = e[3].id
} else if (e.length == 3) { } else if (e.length == 3) {
this.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName this.address = e[0].localName + e[1].localName + e[2].localName
this.appPersonallist.areaCode = e[2].id this.appPersonallist.areaCode = e[2].id
} else if (e.length == 2) { } else if (e.length == 2) {
this.address = e[0].localName + '-' + e[1].localName this.address = e[0].localName + e[1].localName
this.appPersonallist.areaCode = e[1].id this.appPersonallist.areaCode = e[1].id
} else if (e.length == 1) { } else if (e.length == 1) {
this.address = e[0].localName this.address = e[0].localName
this.appPersonallist.areaCode = e[0].id this.appPersonallist.areaCode = e[0].id
}else {
this.address = ''
this.appPersonallist.areaCode = ''
} }
}, },
// 显示三级地址联动 // 显示三级地址联动
@ -271,7 +264,7 @@
that.data(); that.data();
} else { } else {
that.$refs.uToast.show({ that.$refs.uToast.show({
title: '地址不完整,请选择到区级', title: '所属区域应选择所在的区或街道,请重新选择!',
type: 'error' type: 'error'
}) })
} }
@ -309,17 +302,11 @@
uni.chooseLocation({ uni.chooseLocation({
success: function(res) { success: function(res) {
that.appPersonallist.locationName = res.address that.appPersonallist.locationName = res.address
that.chooseLocation = res.name
that.appPersonallist.homeLongitude = res.longitude; that.appPersonallist.homeLongitude = res.longitude;
that.appPersonallist.homeLatitude = res.latitude; that.appPersonallist.homeLatitude = res.latitude;
} }
}); });
}, },
//区街道选择
areaconfirm(e) {
this.appPersonallist.areaCode = e[e.length - 1].value
this.address = e[0].label + '-' + e[1].label
},
//区街道 //区街道
areaInfo() { areaInfo() {
getSubordinateRegions().then(res => { getSubordinateRegions().then(res => {

7
pages/modifyAddress/modifyAddress.scss
View File

@ -29,15 +29,16 @@
.detail { .detail {
border-bottom: 5rpx solid #F4F5F7; border-bottom: 5rpx solid #F4F5F7;
height:100%; height:100%;
padding-bottom: 30rpx;
font-size: 32rpx; font-size: 32rpx;
line-height: 50rpx; line-height: 50rpx;
padding-bottom: 20rpx;
word-break:break-all; word-break:break-all;
} }
.update { .update {
display: flex; display: flex;
margin: 18rpx 18rpx 18rpx 50%; width: 100%;
justify-content: flex-end;
} }
.up { .up {
@ -53,7 +54,7 @@
} }
.ups { .ups {
margin-right: 30rpx; margin-right: 20rpx;
} }
} }

286
pages/modifyAddress/modifyAddress.vue
View File

@ -7,14 +7,26 @@
{{item.receivePhone}} {{item.receivePhone}}
</view> </view>
<view class="item detail" @tap='goorder(item)'> <view class="item detail" @tap='goorder(item)'>
{{item.address}} {{item.areaName}}{{item.receiveAddress}}
</view> </view>
<view class="update"> <view class="item detail" style="border: none;font-size: 32rpx;margin-top: 40rpx;">
<view class="up ups" @tap='updataxg(item)'> <view class="" style='width: 50%;display: inline-block;'>
修改 <view class="" style="display: inline-block;">
默认地址
</view>
<view class="" style="transform: translateY(16%);display: inline-block;margin-left: 20rpx;">
<u-switch v-model="item.defaultAddressFlag" size='36' @change='change(item)'></u-switch>
</view>
</view> </view>
<view class="up" @tap='del(item)'> <view class="" style="display: inline-block;width: 50%;">
删除 <view class="update">
<view class="up ups" @tap='updataxg(item)'>
修改
</view>
<view class="up" @tap='del(item)'>
删除
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -26,7 +38,7 @@
</span> </span>
</view> </view>
<!-- 弹框 --> <!-- 弹框 -->
<u-popup v-model="show" mode="center" width="80%" height="50%" border-radius="30" @close='cencel()'> <u-popup v-model="show" mode="center" width="85%" height="600rpx" border-radius="30" @close='cencel()'>
<view class="payment" @click.stop=''> <view class="payment" @click.stop=''>
<span>{{shipAddress}}</span> <span>{{shipAddress}}</span>
<view class="cencel" @tap="cencel()"> <view class="cencel" @tap="cencel()">
@ -39,21 +51,27 @@
</u-field> </u-field>
<view class="area" @click="showPicker"> <view class="area" @click="showPicker">
<!-- <view class="area" @tap='areashow=true'> --> <!-- <view class="area" @tap='areashow=true'> -->
<u-field v-model="address" label="地区" placeholder="请选择" class="items" disabled> <u-field v-model="infolist.address" label="区域" placeholder="请选择" class="items" disabled>
</u-field> </u-field>
<image src="../../static/jiantou.png" mode=""></image> <image src="../../static/jiantou.png" mode=""></image>
</view> </view>
<u-field v-model="infolist.receiveAddress" label-width="170" label="详细地址" placeholder="如街道、门牌号、小区等" <u-field v-model="infolist.receiveAddress" label-width="170" label="详细地址" placeholder="如街道、门牌号、小区等"
class="items" maxlength='50'> class="items" maxlength='50'>
</u-field> </u-field>
<!-- <view class="" style="font-size: 28rpx;height: 80rpx">
<view class="" style="display: inline-block;">
默认地址
</view>
<view class="" style="transform: translateY(8%);display: inline-block;margin-left: 20rpx;">
<u-switch v-model="infolist.defaultAddressFlag" size='32'></u-switch>
</view>
</view> -->
</view> </view>
<view class="save" @tap='submit()'> <view class="save" @tap='submit()'>
保存 保存
</view> </view>
</view> </view>
</u-popup> </u-popup>
<!-- <u-select v-model="areashow" mode="mutil-column-auto" label-name='areaName' value-name='areaCode'
:list="arealist" @confirm="areaconfirm"></u-select> -->
<u-toast ref="uToast" /> <u-toast ref="uToast" />
<view class="" v-if="cityPickershow"> <view class="" v-if="cityPickershow">
<m-city style='z-index: 10076;' :provinceData="list" headTitle="地区选择" ref="cityPicker" <m-city style='z-index: 10076;' :provinceData="list" headTitle="地区选择" ref="cityPicker"
@ -71,7 +89,8 @@
nursingStationGoodsinfo, nursingStationGoodsinfo,
updatenursingStation, updatenursingStation,
getSubordinateRegions, getSubordinateRegions,
getSubordinate getSubordinate,
updateDefaultAddress
} from '@/api/modifyAddress/modifyAddress.js'; } from '@/api/modifyAddress/modifyAddress.js';
import baseurl from '@/api/baseurl.js' import baseurl from '@/api/baseurl.js'
import gkcity from "../m-city/m-city.vue"; import gkcity from "../m-city/m-city.vue";
@ -86,7 +105,6 @@
delshow: false, //删除弹框 delshow: false, //删除弹框
content: '确认要删除信息吗？', content: '确认要删除信息吗？',
show: false, //弹框 show: false, //弹框
address: null,
// areashow: false, //经纬度开关 // areashow: false, //经纬度开关
// arealist: [], //区街道list // arealist: [], //区街道list
areaCode: '', areaCode: '',
@ -97,7 +115,8 @@
receiveAddress: '', receiveAddress: '',
areaCode: null, areaCode: null,
patientId: '', patientId: '',
address: null, //页面所属区域 address: '', //页面所属区域
defaultAddressFlag: false,
}, },
goodPatient: [], // 查询地址信息 goodPatient: [], // 查询地址信息
patientId: null, patientId: null,
@ -121,29 +140,56 @@
this.updata = JSON.parse(options.updata) this.updata = JSON.parse(options.updata)
}, },
methods: { methods: {
// 三级地址联动回调 change(status) {
if (!status.defaultAddressFlag) {
status.defaultAddressFlag = true
} else {
this.goodPatient.forEach(e => {
e.defaultAddressFlag = 0
})
status.defaultAddressFlag = 1
updateDefaultAddress(this.goodPatient).then(res => {
if (res.code == 200) {
this.goodsList();
uni.$emit('updata', {
updata: JSON.stringify(this.updata),
useritem: JSON.stringify(status)
})
uni.navigateBack({
delta: 1
});
}
})
}
},
// 四级地址联动回调
getpickerParentValue(e) { getpickerParentValue(e) {
console.log(e)
this.addresslength = e this.addresslength = e
if (e.length == 4) { this.infolist.address = ''
this.infolist.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName + '-' + e[3] this.infolist.areaCode = ''
.localName if (e && e.length >= 1) {
this.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName + '-' + e[3] e.forEach(el => {
this.infolist.address = this.infolist.address + el.localName
})
this.infolist.areaCode = e[e.length - 1].id
}
/* if (e.length == 4) {
this.infolist.address = e[0].localName + e[1].localName + e[2].localName + e[3]
.localName .localName
this.infolist.areaCode = e[3].id this.infolist.areaCode = e[3].id
} else if (e.length == 3) { } else if (e.length == 3) {
this.infolist.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName this.infolist.address = e[0].localName + e[1].localName + e[2].localName
this.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName
this.infolist.areaCode = e[2].id this.infolist.areaCode = e[2].id
} else if (e.length == 2) { } else if (e.length == 2) {
this.infolist.address = e[0].localName + '-' + e[1].localName this.infolist.address = e[0].localName + e[1].localName
this.address = e[0].localName + '-' + e[1].localName
this.infolist.areaCode = e[1].id this.infolist.areaCode = e[1].id
} else if (e.length == 1) { } else if (e.length == 1) {
this.infolist.address = e[0].localName this.infolist.address = e[0].localName
this.address = e[0].localName
this.infolist.areaCode = e[0].id this.infolist.areaCode = e[0].id
} } else {
this.infolist.address = ''
this.infolist.areaCode = ''
} */
}, },
// 显示三级地址联动 // 显示三级地址联动
showPicker() { showPicker() {
@ -163,117 +209,139 @@
// 查询地址信息 // 查询地址信息
goodsList() { goodsList() {
let that = this let that = this
try { const value = uni.getStorageSync('patientId');
const value = uni.getStorageSync('patientId'); if (value) {
if (value) { that.patientId = value
that.patientId = value goodPatientInfo(that.patientId).then(res => {
goodPatientInfo(that.patientId).then(res => { res.data.forEach(e => {
res.data.forEach(e => { e.address = e.areaName + e.receiveAddress
e.address = e.provinceName + e.cityName + e.regionName + e if (e.defaultAddressFlag == 1) {
.streetName + e.receiveAddress e.defaultAddressFlag = true
}) } else {
that.goodPatient = res.data e.defaultAddressFlag = false
}
}) })
} else { that.goodPatient = res.data
that.$refs.uToast.show({ })
title: '登录状态异常', } else {
type: 'error' that.$refs.uToast.show({
}) title: '登录状态异常',
if (that.timer) { type: 'error'
clearTimeout(that.timer) })
} if (that.timer) {
that.timer = setTimeout(e => { clearTimeout(that.timer)
uni.navigateBack({
delta: 2
})
}, 1500)
} }
} catch (e) {} that.timer = setTimeout(e => {
uni.navigateBack({
delta: 2
})
}, 1500)
}
}, },
// 保存按钮 // 保存按钮
data() { submit() {
let that = this let that = this
if (that.isedit == true) { if (that.isedit == true) {
addnursingStation(that.infolist).then(res => { if (that.addresslength) {
if (res.code == 200) { if (that.addresslength.length > 2) {
that.$refs.uToast.show({ addnursingStation(that.infolist).then(res => {
title: '新增成功', if (res.code == 200) {
type: 'success' that.$refs.uToast.show({
title: '新增成功',
type: 'success'
})
that.cencel();
setTimeout(e => {
that.goodsList()
}, 1000)
} else {
that.$refs.uToast.show({
title: res.msg,
type: 'error'
})
}
}) })
that.cencel();
setTimeout(e => {
that.goodsList()
}, 1000)
}
})
} else {
updatenursingStation(that.infolist).then(res => {
if (res.code == 200) {
that.$refs.uToast.show({
title: '修改成功',
type: 'success'
})
that.cencel();
setTimeout(e => {
that.goodsList()
}, 1000)
} else { } else {
that.$refs.uToast.show({ this.Toast()
title: res.msg,
type: 'error'
})
} }
}) } else {
this.Toast()
}
} else {
if (that.addresslength) {
if (that.addresslength.length > 2) {
this.xgdata();
} else {
this.Toast()
}
} else {
this.xgdata();
}
} }
}, },
submit() { Toast() {
if (this.addresslength) { this.$refs.uToast.show({
if (this.addresslength.length > 2) { title: '区域应选择所在的区或街道,请重新选择!',
this.data(); type: 'error'
})
},
xgdata() {
var that = this
updatenursingStation(that.infolist).then(res => {
if (res.code == 200) {
that.$refs.uToast.show({
title: '修改成功',
type: 'success'
})
that.cencel();
setTimeout(e => {
that.goodsList()
}, 1000)
} else { } else {
this.$refs.uToast.show({ that.$refs.uToast.show({
title: '地址不完整,请选择到区级', title: res.msg,
type: 'error' type: 'error'
}) })
} }
} else { })
this.data()
}
}, },
// submit() {
// if (this.addresslength) {
// if (this.addresslength.length > 2) {
// this.data();
// } else {
// this.$refs.uToast.show({
// title: '所属区域应选择所在的区或街道,请重新选择!',
// type: 'error'
// })
// }
// } else {
// this.data()
// }
// },
// 修改按钮 // 修改按钮
updataxg(item) { updataxg(item) {
this.cityPickershow = true this.cityPickershow = true
this.shipAddress = '修改地址' this.shipAddress = '修改地址'
this.isedit = false this.isedit = false
nursingStationGoodsinfo(item.id).then(res => { nursingStationGoodsinfo(item.id).then(res => {
this.infolist = res.data getSubordinate(res.data.areaCode).then(resp => {
getSubordinate(res.data.areaCode).then(res => { if (resp.data.streetName) {
if (res.data.streetName) { res.data.address = resp.data.provinceName + resp.data.cityName + resp.data
this.infolist.address = res.data.provinceName + '-' + res.data.cityName + .regionName + resp.data.streetName
'-' +
res
.data.regionName + '-' + res.data.streetName
this.address = res.data.provinceName + '-' + res.data.cityName +
'-' +
res
.data.regionName + '-' + res.data.streetName
} else { } else {
this.infolist.address = res.data.provinceName + '-' + res.data.cityName + res.data.address = resp.data.provinceName + resp.data.cityName + resp.data
'-' + .regionName
res
.data.regionName
this.address = res.data.provinceName + '-' + res.data.cityName +
'-' +
res
.data.regionName
} }
this.infolist = res.data
this.show = true this.show = true
}) })
}) })
console.log(this.infolist)
}, },
// 新增 // 新增
add() { add() {
this.shipAddress = '添加地址'
this.cityPickershow = true this.cityPickershow = true
this.infolist = { this.infolist = {
receiveName: '', receiveName: '',
@ -281,6 +349,7 @@
receiveAddress: '', receiveAddress: '',
areaCode: '', areaCode: '',
patientId: this.patientId, patientId: this.patientId,
address: '',
} }
this.isedit = true this.isedit = true
this.show = true this.show = true
@ -343,11 +412,6 @@
// this.arealist = res.data; // this.arealist = res.data;
// }) // })
// }, // },
//区街道选择
areaconfirm(e) {
this.infolist.areaCode = e[e.length - 1].value
this.infolist.address = e[0].label + '-' + e[1].label
},
}, },
onPullDownRefresh() { //下拉刷新 onPullDownRefresh() { //下拉刷新
this.goodsList() this.goodsList()

4
pages/orderDetails/orderDetails.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="app"> <view class="app">
<view class="time" style="" v-if="order.orderStatus=='WAIT_PAY'&&timestamp>0"> <view class="time" style="" v-if="order.orderStatus=='WAIT_PAY'">
剩余付款时间： 剩余付款时间：
<u-count-down style='' :timestamp="timestamp"> <u-count-down style='' :timestamp="timestamp">
</u-count-down> </u-count-down>
@ -60,7 +60,7 @@
<!-- <span>发货时间：<text>2022-10-28 11：31：26</text></span> --> <!-- <span>发货时间：<text>2022-10-28 11：31：26</text></span> -->
<!-- <span>成交时间：<text>2022-10-28 11：31：26</text></span> --> <!-- <span>成交时间：<text>2022-10-28 11：31：26</text></span> -->
</view> </view>
<view class="buy" v-if="order.orderStatus == 'WAIT_PAY'&&timestamp>0"> <view class="buy" v-if="order.orderStatus == 'WAIT_PAY'">
<view class="pay"> <view class="pay">
去支付 去支付
</view> </view>

14
pages/payorderDetails/payorderDetails.vue
View File

@ -86,7 +86,6 @@
baseurl: '', baseurl: '',
order: null, order: null,
patientId: '', patientId: '',
openid: null,
orderStatus: '', orderStatus: '',
pageSize: 10, pageSize: 10,
pageNum: 1, pageNum: 1,
@ -98,7 +97,6 @@
pay() { pay() {
var that = this var that = this
let paydata = this.order let paydata = this.order
paydata.openid = this.openid
paydata.payType = "WECHAT_PAY" paydata.payType = "WECHAT_PAY"
paydata.paymentPrice = this.order.totalPrice paydata.paymentPrice = this.order.totalPrice
paydata.orderChannel = 'WECHAT_APPLET' paydata.orderChannel = 'WECHAT_APPLET'
@ -115,7 +113,7 @@
// that.$refs.uToast.show({ // that.$refs.uToast.show({
// title: '支付成功', // title: '支付成功',
// type: 'success', // type: 'success',
// toast: 1500, // duration: 1500,
// url: `/pages/paysuccess/paysuccess?delta=${3}` // url: `/pages/paysuccess/paysuccess?delta=${3}`
// }) // })
// }, // },
@ -123,7 +121,7 @@
// that.$refs.uToast.show({ // that.$refs.uToast.show({
// title: '取消支付', // title: '取消支付',
// type: 'error', // type: 'error',
// toast: 1500, // duration: 1500,
// }) // })
// } // }
// }); // });
@ -131,7 +129,7 @@
// that.$refs.uToast.show({ // that.$refs.uToast.show({
// title: response.msg, // title: response.msg,
// type: 'error', // type: 'error',
// toast: 2000 // duration: 2000
// }) // })
// } // }
// }) // })
@ -167,12 +165,6 @@
that.goodsOrderinfo(options.goodsOrderId) that.goodsOrderinfo(options.goodsOrderId)
} }
} catch (e) {} } catch (e) {}
try {
const value = uni.getStorageSync('openid');
if (value) {
that.openid = value
} else {}
} catch (e) {}
}, },
onUnload() {}, onUnload() {},
} }

13
pages/user/user.vue
View File

@ -7,7 +7,7 @@
<view class="img" v-else> <view class="img" v-else>
<image src="../../static/users.png" mode=""></image> <image src="../../static/users.png" mode=""></image>
</view> </view>
<view class="phone" v-if="appPersonallist.patientName!=null"> <view class="phone" v-if="appPersonallist.patientName">
{{appPersonallist.patientName}} {{appPersonallist.patientName}}
</view> </view>
<view class="nickname"> <view class="nickname">
@ -19,30 +19,30 @@
</view> </view>
</view> </view>
<view class="information"> <view class="information">
<view class="item" v-if="appPersonallist.patientName!=null"> <view class="item" v-if="appPersonallist.patientName">
姓名：{{appPersonallist.patientName}} 姓名：{{appPersonallist.patientName}}
</view> </view>
<view class="item" v-else> <view class="item" v-else>
姓名： 姓名：
</view> </view>
<view class="item" v-if="appPersonallist.phone!=null"> <view class="item" v-if="appPersonallist.phone">
电话：{{appPersonallist.phone}} 电话：{{appPersonallist.phone}}
</view> </view>
<view class="item" v-else> <view class="item" v-else>
电话： 电话：
</view> </view>
<view class="item" v-if="appPersonallist.cardNo!=null"> <view class="item" v-if="appPersonallist.cardNo">
身份证：{{appPersonallist.cardNo}} 身份证：{{appPersonallist.cardNo}}
</view> </view>
<view class="item" v-else> <view class="item" v-else>
身份证： 身份证：
</view> </view>
<view class="addressitem" v-if="appPersonallist.streetName"> <view class="addressitem" v-if="appPersonallist.areaName">
<view class="" style="padding-left: 5%;"> <view class="" style="padding-left: 5%;">
区域： 区域：
</view> </view>
<view class="address" style=""> <view class="address" style="">
{{appPersonallist.provinceName}}-{{appPersonallist.cityName}}-{{appPersonallist.regionName}}-{{appPersonallist.streetName}} {{appPersonallist.areaName}}
</view> </view>
</view> </view>
<view class="addressitem" v-else> <view class="addressitem" v-else>
@ -50,7 +50,6 @@
区域： 区域：
</view> </view>
<view class="address" style=""> <view class="address" style="">
{{appPersonallist.provinceName}}-{{appPersonallist.cityName}}-{{appPersonallist.regionName}}
</view> </view>
</view> </view>
<view class="addressitem" style="height:100%" v-if="appPersonallist.address"> <view class="addressitem" style="height:100%" v-if="appPersonallist.address">