修改
This commit is contained in:
曹辉
parent
2bd3decb7a
commit
e09b628333
27
App.vue
27
App.vue
@ -1,7 +1,25 @@
|
||||
<script>
|
||||
export default {
|
||||
onLaunch: function() {},
|
||||
onShow: function() {},
|
||||
onShow: function() {
|
||||
let that = this
|
||||
try {
|
||||
const value = uni.getStorageSync('patientId');
|
||||
if (value) {} else {
|
||||
setTimeout(() => {
|
||||
uni.reLaunch({
|
||||
url: '/pages/login/login'
|
||||
});
|
||||
}, 2000);
|
||||
}
|
||||
} catch (e) {
|
||||
setTimeout(() => {
|
||||
uni.reLaunch({
|
||||
url: '/pages/login/login'
|
||||
});
|
||||
}, 2000);
|
||||
}
|
||||
},
|
||||
onHide: function() {}
|
||||
}
|
||||
</script>
|
||||
@ -10,10 +28,13 @@
|
||||
/*每个页面公共css */
|
||||
@import "uview-ui/index.scss";
|
||||
|
||||
.app {
|
||||
page {
|
||||
background-color: #F4F5F7;
|
||||
}
|
||||
|
||||
.app {
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
height: 100%;
|
||||
// position: relative;
|
||||
color: #000000;
|
||||
padding: 30rpx 0 200rpx 0;
|
||||
|
||||
@ -7,6 +7,15 @@ export function goodsOrder(patientId, orderStatus, goodsOrderId, pageSize, pageN
|
||||
})
|
||||
}
|
||||
|
||||
//收货
|
||||
export function confirmReceipt(orderNo) {
|
||||
return request({
|
||||
url: `/nurseApplet/nursingStationGoods/confirmReceipt?orderNo=${orderNo}`,
|
||||
method: 'POST'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
export function ssgoodsOrder(patientId, orderStatus, goodsOrderId, pageSize, pageNum, goodsName) {
|
||||
return request({
|
||||
|
||||
@ -17,7 +17,7 @@ export function getAppStationItemInfo(stationId, stationItemId, stationItemPrice
|
||||
}
|
||||
export function submitAppointment(data) {
|
||||
return request({
|
||||
url: `/nurseApp/login/submitAppointment`,
|
||||
url: `/nurseApplet/login/appointment`,
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
|
||||
14
pages.json
14
pages.json
@ -9,6 +9,13 @@
|
||||
"navigationBarTitleText": "",
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},{
|
||||
"path": "pages/information/information",
|
||||
"style": {
|
||||
"navigationBarTitleText": "完善个人信息",
|
||||
"navigationBarBackgroundColor": "#ffffff", //背景颜色
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/forgotPassword/forgotPassword",
|
||||
@ -73,13 +80,6 @@
|
||||
"navigationBarBackgroundColor": "#ffffff" //背景颜色
|
||||
|
||||
}
|
||||
}, {
|
||||
"path": "pages/information/information",
|
||||
"style": {
|
||||
"navigationBarTitleText": "完善个人信息",
|
||||
"navigationBarBackgroundColor": "#ffffff", //背景颜色
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
}, {
|
||||
"path": "pages/Personal/Personal",
|
||||
"style": {
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
.app {
|
||||
padding: 3%;
|
||||
height: 100vh;
|
||||
font-size: 36rpx;
|
||||
|
||||
//按钮修改申请和撤销申请
|
||||
|
||||
@ -72,7 +72,6 @@
|
||||
.app {
|
||||
background-color: #F4F5F7;
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
position: relative;
|
||||
padding: 4%;
|
||||
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
<view class="selected">
|
||||
图文服务
|
||||
</view>
|
||||
<image :src="goodsDetailslist.goodsPictureUrl" mode=""></image>
|
||||
<image style="padding: 0; margin: 0;" v-for="item in info" :src="item.image" mode=""></image>
|
||||
</view>
|
||||
<view class="Purchasecolumn">
|
||||
<view class="buy" @tap="buyshow=true">
|
||||
|
||||
@ -243,6 +243,7 @@
|
||||
padding: 20rpx 0 0 5%;
|
||||
color: #969394;
|
||||
display: inline-block;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
image {
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
.app {
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
padding: 3%;
|
||||
background-image: linear-gradient(to bottom, #F4F5F7, #ffffff);
|
||||
.submits {
|
||||
width: 501rpx;
|
||||
height: 71rpx;
|
||||
|
||||
@ -59,21 +59,23 @@
|
||||
</view>
|
||||
<view class="word">为了保证你的售后权益，请收到商品确认无误后再确认收货</view>
|
||||
</view>
|
||||
<view class="submits">确定</view>
|
||||
<view class="submits" @tap='Receipts'>确定</view>
|
||||
</u-popup>
|
||||
</view>
|
||||
<u-toast ref="uToast" />
|
||||
</view>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
ssgoodsOrder
|
||||
ssgoodsOrder,
|
||||
confirmReceipt
|
||||
} from '@/api/CommodityOrder/index.js'
|
||||
import baseurl from '@/api/baseurl.js'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
orderNoitem: '',
|
||||
title: '商品订单', //导航标题
|
||||
baseurl: '', //url
|
||||
orderlist: [], //商品订单list
|
||||
@ -89,6 +91,24 @@
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
//收货
|
||||
Receipts() {
|
||||
confirmReceipt(this.orderNoitem.goOrderNo).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.$refs.uToast.show({
|
||||
title: '收货成功',
|
||||
type: 'success',
|
||||
duration: '1000'
|
||||
})
|
||||
this.show = false
|
||||
setTimeout(e => {
|
||||
uni.navigateTo({
|
||||
url: `/pages/orderDetails/orderDetails?goodsOrderId=${this.orderNoitem.goodsOrderId}`
|
||||
})
|
||||
}, 1000)
|
||||
} else {}
|
||||
})
|
||||
},
|
||||
//支付
|
||||
buy(item) {
|
||||
let obj = {
|
||||
@ -124,6 +144,7 @@
|
||||
},
|
||||
//确认收货
|
||||
Receipt(item) {
|
||||
this.orderNoitem = item
|
||||
this.img = item.attributePitureUrl
|
||||
this.show = true
|
||||
},
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
.app {
|
||||
padding: 2%;
|
||||
height: 100vh;
|
||||
background-image: linear-gradient(to bottom, #F4F5F7, #ffffff);
|
||||
|
||||
.item {
|
||||
width: 99%;
|
||||
|
||||
@ -21,6 +21,10 @@
|
||||
</view>
|
||||
<view class="item">
|
||||
</view>
|
||||
<view class="item">
|
||||
</view>
|
||||
<view class="item">
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@ -48,9 +52,11 @@
|
||||
|
||||
<style lang="scss">
|
||||
.app {
|
||||
height: 100vh;
|
||||
|
||||
.cards {
|
||||
height: 82vh;
|
||||
padding: 22px 0 20px 0;
|
||||
|
||||
.item {
|
||||
height: 295rpx;
|
||||
|
||||
|
||||
@ -83,8 +83,6 @@
|
||||
<style lang="scss">
|
||||
.app {
|
||||
padding: 0;
|
||||
height: 100vh;
|
||||
background-image: linear-gradient(to bottom, #F4F5F7, #ffffff);
|
||||
.productlist {
|
||||
width: 100%;
|
||||
margin: 0 auto;
|
||||
|
||||
@ -138,6 +138,7 @@
|
||||
font-size: 32rpx;
|
||||
padding: 0 3% 0 3%;
|
||||
color: #666666;
|
||||
word-break:break-all;
|
||||
// line-height: 38rpx;
|
||||
}
|
||||
|
||||
|
||||
@ -129,7 +129,6 @@
|
||||
}
|
||||
}, 500)
|
||||
},
|
||||
|
||||
onLoad(options) {
|
||||
//耗材包详情方法调用
|
||||
this.getPatientInfo(options.stationId, options.stationItemId, options.stationItemPriceId)
|
||||
@ -178,7 +177,7 @@
|
||||
this.orderlist.orderChannel = "MOBILE_APP"
|
||||
this.orderlist.buySource = "NURSE_STATION"
|
||||
this.orderlist.orderCount = 1;
|
||||
console.log(this.orderlist)
|
||||
this.orderlist.orderConsumableList = this.orderlist.itemConsumableList
|
||||
submitAppointment(this.orderlist).then(res => {
|
||||
if (res.code == 500) {
|
||||
this.$refs.uToast.show({
|
||||
@ -189,7 +188,7 @@
|
||||
this.$refs.uToast.show({
|
||||
title: '预约成功',
|
||||
type: 'success',
|
||||
url:'/pages/paysuccess/paysuccess',
|
||||
url: '/pages/paysuccess/paysuccess',
|
||||
toast: 1500
|
||||
})
|
||||
}
|
||||
|
||||
@ -60,7 +60,6 @@
|
||||
.app {
|
||||
background-color: #F4F5F7;
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
color: #000000;
|
||||
|
||||
.ConfirmCancel {
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
.app{
|
||||
padding: 0;
|
||||
height: 100vh;
|
||||
}
|
||||
.header {
|
||||
display: inline-block;
|
||||
@ -30,6 +29,7 @@
|
||||
width:92%;
|
||||
font-size: 28rpx;
|
||||
line-height: 32rpx;
|
||||
word-break:break-all;
|
||||
}
|
||||
.namephone{
|
||||
width: 70%;
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
</view>
|
||||
<view class="other">
|
||||
<span>其他:</span>
|
||||
<!-- <input type="text"> -->
|
||||
<u-input type="text" placeholder='请填写' />
|
||||
</view>
|
||||
<view class="btn" @tap='goinformation'>
|
||||
@ -26,10 +25,7 @@
|
||||
data() {
|
||||
return {
|
||||
diseaselist: [], //疾病列表
|
||||
disease: [{ //选择的疾病list
|
||||
id: 9999,
|
||||
diseaseName: '无'
|
||||
}],
|
||||
disease: [],
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
@ -41,19 +37,17 @@
|
||||
this.disease = this.disease.filter(e => e.id != item.id)
|
||||
}
|
||||
if (this.disease.length > 1) {
|
||||
console.log(this.disease.length)
|
||||
this.disease = this.disease.filter(e => e.id != 9999)
|
||||
}
|
||||
console.log(this.disease)
|
||||
},
|
||||
//获取疾病列表
|
||||
diseaseinfo() {
|
||||
getDiseaseInfo().then(res => {
|
||||
this.diseaselist = res.data;
|
||||
this.diseaselist.unshift({
|
||||
id: 9999,
|
||||
diseaseName: '无'
|
||||
})
|
||||
// this.diseaselist.unshift({
|
||||
// id: 9999,
|
||||
// diseaseName: '无'
|
||||
// })
|
||||
})
|
||||
},
|
||||
//跳转回信息完善页面
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
.app {
|
||||
height: 100vh;
|
||||
padding: 20rpx 0;
|
||||
|
||||
.item {
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
</view>
|
||||
<input class="righttext" style='left:23%' type="text" placeholder="请输入" maxlength="11" v-model="phone" />
|
||||
</view>
|
||||
<view class="item">
|
||||
<!-- <view class="item">
|
||||
<view class="lefttext">
|
||||
验证码
|
||||
</view>
|
||||
@ -28,7 +28,7 @@
|
||||
<view class="obtaincode" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
|
||||
{{getCodeText}}
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="loginbtn" @tap='pwdlogin'>
|
||||
登录
|
||||
</view>
|
||||
@ -42,8 +42,8 @@
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
phone: '13678945620',
|
||||
verification: '111111',
|
||||
phone: '',
|
||||
verification: '',
|
||||
password: '',
|
||||
newpassword: '',
|
||||
getCodeText: '获取验证码', //获取验证码的文字
|
||||
|
||||
@ -71,8 +71,9 @@
|
||||
|
||||
<style lang="scss">
|
||||
.app {
|
||||
|
||||
.cards {
|
||||
height: 82vh;
|
||||
padding: 22px 0 20px 0;
|
||||
.shopping {
|
||||
background: #F58540;
|
||||
}
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
}
|
||||
|
||||
.info {
|
||||
width: 94%;
|
||||
width: 96%;
|
||||
margin: 0 auto 20rpx;
|
||||
background-color: #FFFFFF;
|
||||
border-radius: 20rpx;
|
||||
@ -61,7 +61,7 @@
|
||||
|
||||
.userinfo {
|
||||
.item {
|
||||
width: 90%;
|
||||
width: 94%;
|
||||
margin: 0 auto;
|
||||
height: 120rpx;
|
||||
line-height: 120rpx;
|
||||
@ -78,7 +78,7 @@
|
||||
display: inline-block;
|
||||
line-height: 120rpx;
|
||||
height: 120rpx;
|
||||
width: 30%;
|
||||
width: 25%;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
||||
|
||||
@ -21,12 +21,11 @@
|
||||
</view>
|
||||
<view class="item">
|
||||
<span>详细地址:</span>
|
||||
<u-input v-model="query.address" type="text" placeholder='' />
|
||||
<u-input v-model="query.address" maxlength='40' type="text" placeholder='小区、单元、门牌号' />
|
||||
</view>
|
||||
<view class="item" @tap='getAddress()'>
|
||||
<span>所在位置:</span>
|
||||
<view>{{chooseLocation}}</view>
|
||||
<!-- <u-input type="text" placeholder='' /> -->
|
||||
<view style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{chooseLocation}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<u-select v-model="areashow" mode="mutil-column-auto" label-name='areaName' value-name='areaCode'
|
||||
@ -85,6 +84,9 @@
|
||||
methods: {
|
||||
//提交信息
|
||||
informationinfo() {
|
||||
this.query.diseaseInfoList.forEach(e => {
|
||||
e.diseaseId = e.id
|
||||
})
|
||||
information(this.query).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.$refs.uToast.show({
|
||||
@ -93,7 +95,7 @@
|
||||
url: '',
|
||||
duration: '1500'
|
||||
})
|
||||
SetTimeout(() => {
|
||||
setTimeout(() => {
|
||||
uni.navigateBack({
|
||||
delta: 1, //返回层数，2则上上页
|
||||
})
|
||||
@ -112,8 +114,9 @@
|
||||
var that = this;
|
||||
uni.chooseLocation({
|
||||
success: function(res) {
|
||||
that.chooseLocation = '东经:' + res.longitude + ' 北纬:' + res.latitude;
|
||||
console.log(that.chooseLocation)
|
||||
that.chooseLocation = res.name
|
||||
that.query.homeLongitude = res.longitude;
|
||||
that.query.homeLatitude = res.latitude;
|
||||
}
|
||||
});
|
||||
},
|
||||
@ -160,6 +163,10 @@
|
||||
})
|
||||
},
|
||||
},
|
||||
onUnload() {
|
||||
// 页面卸载时设置插件选点数据为null，防止再次进入页面，geLocation返回的是上次选点结果
|
||||
chooseLocation.setLocation(null);
|
||||
},
|
||||
//进入界面加载
|
||||
onLoad() {
|
||||
let that = this
|
||||
|
||||
@ -29,8 +29,8 @@
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
phone: '13645678906',
|
||||
password: '123456',
|
||||
phone: '',
|
||||
password: '',
|
||||
};
|
||||
},
|
||||
//获取到传值
|
||||
|
||||
@ -35,7 +35,6 @@
|
||||
|
||||
<style lang="scss">
|
||||
.app {
|
||||
height: 100vh;
|
||||
.cards {
|
||||
padding: 40rpx 0 500rpx 0;
|
||||
|
||||
|
||||
@ -15,13 +15,14 @@
|
||||
margin-left: 65%;
|
||||
}
|
||||
.userinfo {
|
||||
width: 94%;
|
||||
width: 96%;
|
||||
background-color: #fff;
|
||||
margin: 0 auto;
|
||||
border-radius: 20rpx;
|
||||
.disease{
|
||||
width: 90%;
|
||||
width: 100%;
|
||||
margin: 0 auto;
|
||||
padding: 0 6% 0 3%;
|
||||
line-height: 80rpx;
|
||||
border-bottom: 1rpx solid #D8D4D4;
|
||||
position: relative;
|
||||
@ -29,23 +30,22 @@
|
||||
display: inline-block;
|
||||
}
|
||||
.pictureA {
|
||||
margin-left: 3%;
|
||||
width: 18rpx;
|
||||
height: 27rpx;
|
||||
position: absolute;
|
||||
right:20rpx;
|
||||
right:30rpx;
|
||||
top:50%;
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
}
|
||||
.item {
|
||||
width: 90%;
|
||||
width: 94%;
|
||||
margin: 0 auto;
|
||||
height: 120rpx;
|
||||
line-height: 120rpx;
|
||||
border-bottom: 1rpx solid #D8D4D4;
|
||||
display: flex;
|
||||
position: relative;
|
||||
font-size: 30rpx;
|
||||
.picture {
|
||||
vertical-align: middle;
|
||||
width: 180rpx;
|
||||
@ -65,8 +65,13 @@
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
view {
|
||||
position: absolute;
|
||||
left:25%;
|
||||
top:50%;
|
||||
width: 75%;
|
||||
transform: translateY(-50%);
|
||||
display: inline-block;
|
||||
height: 120rpx;
|
||||
font-size: 30rpx;
|
||||
line-height: 120rpx;
|
||||
}
|
||||
|
||||
@ -75,7 +80,6 @@
|
||||
line-height: 120rpx;
|
||||
height: 120rpx;
|
||||
width: 25%;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
||||
::v-deep .u-input__input {
|
||||
@ -84,14 +88,18 @@
|
||||
}
|
||||
|
||||
::v-deep .uni-input-wrapper {
|
||||
display: inline-block;
|
||||
height: 120rpx;
|
||||
line-height: 120rpx;
|
||||
}
|
||||
|
||||
::v-deep .u-input {
|
||||
width: 75%;
|
||||
height: 120rpx;
|
||||
line-height: 120rpx;
|
||||
position: absolute;
|
||||
left:25%;
|
||||
top:50%;
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<view class="userinfo">
|
||||
<view class="item" style="height: 200rpx; " @tap='uploadImag'>
|
||||
<span style='height:200rpx;line-height: 200rpx;'>头像:</span>
|
||||
<image class="picture" :src="appPersonallist.headPictureUrl" mode=""></image>
|
||||
<image class="picture" :src="img" mode=""></image>
|
||||
<image class="pictureA" src="../../static/jiantou.png" mode=""></image>
|
||||
</view>
|
||||
<view class="item">
|
||||
@ -24,12 +24,11 @@
|
||||
</view>
|
||||
<view class="item">
|
||||
<span>详细地址:</span>
|
||||
<u-input v-model="appPersonallist.address" type="text" placeholder='请输入' />
|
||||
<u-input v-model="appPersonallist.address" type="text" placeholder='小区、单元、门牌号' />
|
||||
</view>
|
||||
<view class="item" @tap='getAddress()'
|
||||
v-if="appPersonallist.homeLongitude&&this.appPersonallist.homeLatitude">
|
||||
<view class="item" @tap='getAddress()'>
|
||||
<span>所在位置:</span>
|
||||
<view>{{chooseLocation}}</view>
|
||||
<view style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{chooseLocation}}</view>
|
||||
</view>
|
||||
<view class="disease" style="border: none;" @tap="godisease">
|
||||
<view style="display: block;line-height: 120rpx;">疾病类型:</view>
|
||||
@ -64,6 +63,7 @@
|
||||
areashow: false,
|
||||
chooseLocation: '',
|
||||
img: null,
|
||||
image: null,
|
||||
appPersonallist: {
|
||||
patientName: "",
|
||||
cardNo: "",
|
||||
@ -83,21 +83,25 @@
|
||||
this.areaInfo();
|
||||
this.baseurl = baseurl
|
||||
this.appPersonallist = JSON.parse(options.appPersonallist)
|
||||
this.appPersonallist.headPictureUrl = baseurl + this.appPersonallist.headPictureUrl
|
||||
this.img = baseurl + this.appPersonallist.headPictureUrl
|
||||
if (this.appPersonallist.regionName && this.appPersonallist.streetName) {
|
||||
this.address = this.appPersonallist.regionName + '-' + this.appPersonallist.streetName
|
||||
}
|
||||
this.patientDiseaseInfoList = this.appPersonallist.patientDiseaseInfoList
|
||||
this.patientDiseaseInfoList.forEach(e => {
|
||||
e.id = e.diseaseId
|
||||
})
|
||||
if (this.appPersonallist.homeLongitude && this.appPersonallist.homeLatitude) {
|
||||
this.chooseLocation = '东经:' + this.appPersonallist.homeLongitude + ' 北纬:' + this.appPersonallist
|
||||
.homeLatitude
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
//上传图片+提交信息
|
||||
informationinfo() {
|
||||
//上传图片
|
||||
var that = this
|
||||
if (this.img) {
|
||||
if (this.image) {
|
||||
uni.uploadFile({
|
||||
url: baseurl + '/nurseApplet/uploadFile/uploadHeadPictureUrl',
|
||||
filePath: that.appPersonallist.headPictureUrl,
|
||||
@ -114,9 +118,13 @@
|
||||
that.$refs.uToast.show({
|
||||
title: '修改信息成功',
|
||||
type: 'success',
|
||||
url: '/pages/user/user',
|
||||
duration: '1500'
|
||||
})
|
||||
setTimeout(e => {
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
})
|
||||
}, 1500)
|
||||
} else if (res.code == 500) {
|
||||
that.$refs.uToast.show({
|
||||
title: res.msg,
|
||||
@ -134,9 +142,13 @@
|
||||
that.$refs.uToast.show({
|
||||
title: '修改信息成功',
|
||||
type: 'success',
|
||||
url: '/pages/user/user',
|
||||
duration: '1500'
|
||||
})
|
||||
setTimeout(e => {
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
})
|
||||
}, 1500)
|
||||
} else if (res.code == 500) {
|
||||
that.$refs.uToast.show({
|
||||
title: res.msg,
|
||||
@ -157,6 +169,7 @@
|
||||
success(res) {
|
||||
that.appPersonallist.headPictureUrl = res.tempFilePaths[0]
|
||||
that.img = res.tempFilePaths[0]
|
||||
that.image = res.tempFilePaths[0]
|
||||
}
|
||||
})
|
||||
},
|
||||
@ -165,8 +178,9 @@
|
||||
var that = this;
|
||||
uni.chooseLocation({
|
||||
success: function(res) {
|
||||
that.chooseLocation = '东经:' + res.longitude + ' 北纬:' + res.latitude;
|
||||
console.log(that.chooseLocation)
|
||||
that.chooseLocation = res.name
|
||||
that.appPersonallist.homeLongitude = res.longitude;
|
||||
that.appPersonallist.homeLatitude = res.latitude;
|
||||
}
|
||||
});
|
||||
},
|
||||
@ -199,13 +213,18 @@
|
||||
})
|
||||
},
|
||||
},
|
||||
onUnload() {
|
||||
// 页面卸载时设置插件选点数据为null，防止再次进入页面，geLocation返回的是上次选点结果
|
||||
chooseLocation.setLocation(null);
|
||||
},
|
||||
//带参返回
|
||||
onShow() {
|
||||
let that = this
|
||||
uni.$on('disease', function(data) {
|
||||
console.log(data)
|
||||
that.patientDiseaseInfoList = JSON.parse(data.disease)
|
||||
that.patientDiseaseInfoList.forEach(e => {
|
||||
e.disbaseId = e.id
|
||||
e.diseaseId = e.id
|
||||
})
|
||||
// console.log(that.patientDiseaseInfoList)
|
||||
})
|
||||
|
||||
@ -3,10 +3,9 @@
|
||||
background-color: #F4F5F7;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
height: 100%;
|
||||
padding: 4%;
|
||||
padding-bottom: 100rpx;
|
||||
background-image: linear-gradient(to bottom, #F4F5F7, #ffffff);
|
||||
font-size: 32rpx;
|
||||
.address {
|
||||
width: 99%;
|
||||
background: #FFFFFF;
|
||||
@ -17,18 +16,19 @@
|
||||
.item {
|
||||
width: 90%;
|
||||
height: 101rpx;
|
||||
font-size: 36rpx;
|
||||
color: #000000;
|
||||
line-height: 100rpx;
|
||||
margin: 0 auto;
|
||||
view{
|
||||
}
|
||||
}
|
||||
|
||||
.detail {
|
||||
border-bottom: 5rpx solid #F4F5F7;
|
||||
height:100%;
|
||||
font-size: 32rpx;
|
||||
line-height: 50rpx;
|
||||
padding-bottom: 20rpx;
|
||||
word-break:break-all;
|
||||
}
|
||||
|
||||
.update {
|
||||
@ -44,7 +44,6 @@
|
||||
background: #FFFFFF;
|
||||
border: 1rpx solid #969394;
|
||||
border-radius: 26rpx;
|
||||
font-size: 31rpx;
|
||||
color: #969394;
|
||||
}
|
||||
|
||||
@ -59,7 +58,6 @@
|
||||
line-height: 80rpx;
|
||||
background: #4C7BC9;
|
||||
border-radius: 26rpx;
|
||||
font-size: 34rpx;
|
||||
color: #FFFFFF;
|
||||
text-align: center;
|
||||
position: fixed;
|
||||
@ -77,11 +75,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
// 弹框支付
|
||||
// 弹框
|
||||
.payment {
|
||||
width: 90%;
|
||||
height: 110rpx;
|
||||
font-size: 36rpx;
|
||||
color: #000000;
|
||||
line-height: 110rpx;
|
||||
text-align: center;
|
||||
@ -103,7 +100,6 @@
|
||||
background: #4C7BC9;
|
||||
border-radius: 26rpx;
|
||||
text-align: center;
|
||||
font-size: 34rpx;
|
||||
color: #FFFFFF;
|
||||
margin: 0 auto;
|
||||
margin-top: 10%;
|
||||
@ -120,7 +116,6 @@
|
||||
}
|
||||
|
||||
.items {
|
||||
font-size: 32rpx;
|
||||
color: #030001;
|
||||
line-height: 40rpx;
|
||||
}
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
<image src="../../static/gb.png" mode=""></image>
|
||||
</view>
|
||||
<view class="addinfos">
|
||||
<u-field v-model="infolist.receiveName" label="收货人" placeholder="姓名" class="items" maxlength='30'>
|
||||
<u-field v-model="infolist.receiveName" label="收货人" placeholder="姓名" class="items" maxlength='10'>
|
||||
</u-field>
|
||||
<u-field v-model="infolist.receivePhone" label="手机号" placeholder="电话" class="items" maxlength='11'>
|
||||
</u-field>
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
.app{
|
||||
height: 100%;
|
||||
padding:10rpx 0 0 0;
|
||||
background-image: linear-gradient(to bottom, #F4F5F7, #ffffff);
|
||||
}
|
||||
.mask {
|
||||
.information {
|
||||
@ -55,10 +53,23 @@
|
||||
.tive {
|
||||
width: 94%;
|
||||
background-color: #ffffff;
|
||||
margin: 0 auto;
|
||||
margin-top: 20rpx;
|
||||
border-radius: 11px;
|
||||
margin: 20rpx auto;
|
||||
border-radius: 11rpx;
|
||||
padding-bottom: 60rpx;
|
||||
.noorder{
|
||||
margin-top: 90rpx;
|
||||
image{
|
||||
display: block;
|
||||
margin: 0 auto;
|
||||
width: 100rpx;
|
||||
height: 120rpx;
|
||||
}
|
||||
view{
|
||||
text-align: center;
|
||||
font-size: 36rpx;
|
||||
color: #BFBFBF;
|
||||
}
|
||||
}
|
||||
.item {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
|
||||
@ -40,7 +40,8 @@
|
||||
{{item.name}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="item" v-for="item in servelist" :key="" v-show='choicetab==0'>
|
||||
<view class="" v-if="servelist.length>0&&choicetab==false">
|
||||
<view class="item" v-for="item in servelist" :key="" v-show='choicetab==false'>
|
||||
<image :src="item.itemPictureUrl"></image>
|
||||
<view class="huanyao">{{item.nurseItemName}}
|
||||
</view>
|
||||
@ -49,12 +50,28 @@
|
||||
</view> -->
|
||||
<view class="servicetime">服务时长:{{item.serveDurationUnit?item.serveDurationUnit:'0'}}</view>
|
||||
<view class="appointment" @tap='goappointments(item)'>预约</view>
|
||||
<view class="price">￥{{item.price==null?'0':item.price}}</view>
|
||||
<view class="price">￥{{item.nurseItemPrice==null?'0':item.nurseItemPrice}}</view>
|
||||
</view>
|
||||
<view class="item" v-show='choicetab==1' v-for="(item,index) in productlist" :key="index">
|
||||
</view>
|
||||
<view class="noorder" v-if='servelist.length==0&&choicetab==false'>
|
||||
<image src="../../static/noorder.png" mode=""></image>
|
||||
<view class="">
|
||||
暂无服务项目
|
||||
</view>
|
||||
</view>
|
||||
<view class="" v-if="productlist.length>0&&choicetab">
|
||||
<view class="item" v-show='choicetab' v-for="(item,index) in productlist" :key="index">
|
||||
<image :src="item.goodsPictureUrl"></image>
|
||||
<view class="product">{{item.goodsName}}</view>
|
||||
<view class="buy appointment" @tap="goCommodityDetails(item)">购买</view>
|
||||
<view class="price">￥{{item.goodsPrice==null?'0':item.goodsPrice}}起</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="noorder" v-if="productlist.length==0&&choicetab">
|
||||
<image src="../../static/noorder.png" mode=""></image>
|
||||
<view class="">
|
||||
暂无产品
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -234,9 +251,7 @@
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
},
|
||||
onPullDownRefresh() { //下拉刷新
|
||||
this.pageNum = 1;
|
||||
|
||||
@ -78,7 +78,6 @@
|
||||
.app {
|
||||
background-color: #F4F5F7;
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
color: #000000;
|
||||
padding: 3%;
|
||||
font-size: 36rpx;
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
.app {
|
||||
height: 100vh;
|
||||
padding: 10rpx 0 0 ;
|
||||
.time{
|
||||
height: 80rpx;
|
||||
@ -143,8 +142,7 @@
|
||||
}
|
||||
|
||||
.info {
|
||||
padding-top: 30rpx;
|
||||
height: 40%;
|
||||
padding: 20rpx 0 50rpx;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
|
||||
border-radius: 20rpx;
|
||||
@ -160,6 +158,7 @@
|
||||
|
||||
text {
|
||||
color: #BFBDBE;
|
||||
word-break:break-all;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<view class="app">
|
||||
<view class="time" style="">
|
||||
<view class="time" style="" v-if="order.orderStatus=='WAIT_PAY'">
|
||||
剩余付款时间：
|
||||
<u-count-down style='' v-if="order.orderStatus=='WAIT_PAY'" :timestamp="timestamp">
|
||||
<u-count-down style='' :timestamp="timestamp">
|
||||
</u-count-down>
|
||||
</view>
|
||||
<view class="content">
|
||||
|
||||
@ -37,7 +37,6 @@
|
||||
|
||||
<style lang="scss">
|
||||
.app {
|
||||
height: 100vh;
|
||||
font-size: 30rpx;
|
||||
|
||||
.goshopping,
|
||||
|
||||
@ -331,7 +331,7 @@
|
||||
this.day = time.getDate();
|
||||
this.hour = time.getHours();
|
||||
this.minute = time.getMinutes();
|
||||
this.endhour = time.getHours();
|
||||
this.endhour = time.getHours()+1;
|
||||
this.endminute = time.getMinutes();
|
||||
// this.second = time.getSeconds();
|
||||
},
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
.app {
|
||||
height: 100vh;
|
||||
|
||||
.content {
|
||||
width: 95%;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<view class="lefttext">
|
||||
姓名
|
||||
</view>
|
||||
<input class="righttext" type="text" placeholder="请输入" v-model="patientName" />
|
||||
<input class="righttext" type="text" placeholder="请输入" maxlength="10" v-model="patientName" />
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="lefttext">
|
||||
@ -26,7 +26,7 @@
|
||||
</view>
|
||||
<input class="righttext" style='left:23%' type="text" placeholder="请输入" maxlength="11" v-model="phone" />
|
||||
</view>
|
||||
<view class="item">
|
||||
<!-- <view class="item">
|
||||
<view class="lefttext">
|
||||
验证码
|
||||
</view>
|
||||
@ -34,7 +34,7 @@
|
||||
<view class="obtaincode" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
|
||||
{{getCodeText}}
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="radio-content" @tap="changeRadio">
|
||||
<view class="radio-right">
|
||||
<view class="radio" :class="radio == 2 ? 'radio-default':''">
|
||||
@ -62,10 +62,10 @@
|
||||
return {
|
||||
radio: 1, //用户协议
|
||||
patientName: '',
|
||||
phone: '13645678913',
|
||||
password: '123456',
|
||||
newpassword: '123456',
|
||||
verification: '111111',
|
||||
phone: '',
|
||||
password: '',
|
||||
newpassword: '',
|
||||
verification: '',
|
||||
getCodeText: '获取验证码', //获取验证码的文字
|
||||
getCodeBtnColor: "#4C7BC9", //获取验证码的color
|
||||
getCodeisWaiting: false, //判断是否在倒计时中
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
//护理站列表
|
||||
.app{
|
||||
padding: 0;
|
||||
padding: 0 0 20rpx 0;
|
||||
.map{
|
||||
padding-top: 100rpx;
|
||||
z-index: 1;
|
||||
|
||||
@ -56,6 +56,7 @@
|
||||
// longitude: 116.39742,
|
||||
latitude: 36.649372,
|
||||
longitude: 116.977102,
|
||||
nurseTypeCode: '',
|
||||
markers: [],
|
||||
covers: [],
|
||||
}
|
||||
@ -109,7 +110,7 @@
|
||||
});
|
||||
},
|
||||
requestinfo() {
|
||||
nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, ).then(res => {
|
||||
nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode).then(res => {
|
||||
res.rows.forEach(e => {
|
||||
e.stationPictureUrl = baseurl + e.stationPictureUrl
|
||||
})
|
||||
@ -183,6 +184,7 @@
|
||||
})
|
||||
that.requestinfo();
|
||||
} else {
|
||||
console.log(1)
|
||||
that.getlocation()
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,8 +1,19 @@
|
||||
.app {
|
||||
padding: 0;
|
||||
font-size: 35rpx;
|
||||
height: 100vh;
|
||||
|
||||
padding: 0 0 200rpx 0;
|
||||
position: relative;
|
||||
.signout{
|
||||
// position: absolute;
|
||||
// bottom: 60rpx;
|
||||
// width: 94%;
|
||||
background: #FFFFFF;
|
||||
margin-top: 50rpx;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
// left:3%;
|
||||
border-radius: 20rpx;
|
||||
text-align: center;
|
||||
}
|
||||
.External {
|
||||
width: 94%;
|
||||
height: 100rpx;
|
||||
@ -13,7 +24,6 @@
|
||||
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
|
||||
border-radius: 20rpx;
|
||||
position: relative;
|
||||
|
||||
.righttext {
|
||||
position: absolute;
|
||||
right: 12%;
|
||||
@ -39,34 +49,42 @@
|
||||
|
||||
.information {
|
||||
width: 94%;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
|
||||
border-radius: 20rpx;
|
||||
position: absolute;
|
||||
top: 18%;
|
||||
top: 250rpx;
|
||||
left: 3%;
|
||||
color: #000000;
|
||||
padding:0 0 50rpx 5%;
|
||||
padding:0 0 0 0;
|
||||
overflow: hidden;
|
||||
font-size: 32rpx;
|
||||
.disease{
|
||||
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
|
||||
line-height: 60rpx;
|
||||
padding:0 0 40rpx 5%;
|
||||
background: #FFFFFF;
|
||||
border-radius: 0 0 20rpx 20rpx;
|
||||
}
|
||||
.item {
|
||||
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
|
||||
// height: 110rpx;
|
||||
line-height: 110rpx;
|
||||
border-bottom: 1rpx solid #D8D4D4;
|
||||
|
||||
.address {
|
||||
position: absolute;
|
||||
height: 80rpx;
|
||||
// font-size: 30rpx;
|
||||
line-height: 40rpx;
|
||||
display: inline-block;
|
||||
width: 80%;
|
||||
margin-left: 30rpx;
|
||||
margin-top: 33rpx;
|
||||
}
|
||||
padding:0 0 0 5%;
|
||||
background: #FFFFFF;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
// .address {
|
||||
// position: absolute;
|
||||
// top:50%;
|
||||
// transform: translateY(-50%);
|
||||
// // font-size: 30rpx;
|
||||
// display: inline-block;
|
||||
// width: 80%;
|
||||
// overflow: hidden;
|
||||
// text-overflow: ellipsis;
|
||||
// white-space: nowrap;
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -44,21 +44,17 @@
|
||||
区域：
|
||||
</view>
|
||||
<view class="item" style="height:100%">
|
||||
<view class="" style="display: inline-block;">
|
||||
地址:
|
||||
</view>
|
||||
<view class="address" v-if="appPersonallist.address!=null">
|
||||
{{appPersonallist.address}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="item" style="height:100%">
|
||||
<!-- <view class="item" style="height:100%">
|
||||
<view class="" style="display: inline-block;">
|
||||
位置:
|
||||
</view>
|
||||
<view class="address" v-if="appPersonallist.homeLatitude&&appPersonallist.homeLongitude">
|
||||
东经:{{appPersonallist.homeLongitude}}--北纬:{{ appPersonallist.homeLatitude}}
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="disease" style="border:none;">
|
||||
<view class="" style="line-height: 110rpx;">
|
||||
疾病类型:
|
||||
@ -67,6 +63,9 @@
|
||||
v-for="(item,index) in appPersonallist.patientDiseaseInfoList"
|
||||
:key="index">{{item.diseaseName}}</span>
|
||||
</view>
|
||||
<view class="signout" @tap='remove'>
|
||||
退出账号
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="External" style="margin: 200rpx auto 0;">
|
||||
<view class="lefttext">
|
||||
@ -108,12 +107,26 @@
|
||||
appPersonallist: [], //获取个人信息
|
||||
}
|
||||
},
|
||||
onLoad(options) {
|
||||
onShow() {
|
||||
this.baseurl = baseurl
|
||||
//获取传值
|
||||
this.myInfo()
|
||||
},
|
||||
onLoad(options) {
|
||||
//获取传值
|
||||
},
|
||||
methods: {
|
||||
//退出
|
||||
remove() {
|
||||
try {
|
||||
uni.removeStorageSync('patientId');
|
||||
|
||||
uni.reLaunch({
|
||||
url: '/pages/login/login'
|
||||
})
|
||||
} catch (e) {
|
||||
// error
|
||||
}
|
||||
},
|
||||
//获取个人信息
|
||||
myInfo() {
|
||||
var that = this
|
||||
|
||||
BIN
static/noorder.png
Normal file
BIN
static/noorder.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
Loading…
Reference in New Issue
Block a user