diff --git a/api/modifyAddress/modifyAddress.js b/api/modifyAddress/modifyAddress.js
index c26d6ee..2c444e5 100644
--- a/api/modifyAddress/modifyAddress.js
+++ b/api/modifyAddress/modifyAddress.js
@@ -1,13 +1,14 @@
import request from "../request.js"
+
// 根据被护理人id查询基本信息
-export function goodPatientInfo(patientId){
+export function goodPatientInfo(patientId) {
return request({
url: `/nurseApplet/nursingStationGoods/goodPatientInfo?patientId=${patientId}`,
method: 'GET'
})
}
// 新增基本信息
-export function addnursingStation(data){
+export function addnursingStation(data) {
return request({
url: '/nurseApplet/nursingStationGoods/add',
method: 'POST',
@@ -17,7 +18,7 @@ export function addnursingStation(data){
// 修改基本信息
-export function updatenursingStation(data){
+export function updatenursingStation(data) {
return request({
url: '/nurseApplet/nursingStationGoods/edit',
method: 'POST',
@@ -25,7 +26,7 @@ export function updatenursingStation(data){
})
}
// 修改反显
-export function nursingStationGoodsinfo(id){
+export function nursingStationGoodsinfo(id) {
return request({
url: '/nurseApplet/nursingStationGoods/' + id,
method: 'GET'
@@ -34,24 +35,36 @@ export function nursingStationGoodsinfo(id){
// 删除
export function delnursingStation(id) {
- return request({
- url: '/nurseApplet/nursingStationGoods/' + id,
- method: 'delete'
- })
+ return request({
+ url: '/nurseApplet/nursingStationGoods/' + id,
+ method: 'delete'
+ })
}
// 查询
-export function getSubordinate(areaCode){
+export function getSubordinate(areaCode) {
return request({
url: `/nurseApplet/nursingStationGoods/getSubordinateRegions?areaCode=${areaCode}`,
method: 'GET'
})
}
-//区街道list
+// //区街道list
+// export function getSubordinateRegions(areaCode) {
+// return request({
+// url: `/nurseApplet/nursingStationGoods/getSubordinateRegions?areaCode=${areaCode}`,
+// method: 'GET'
+// })
+// }
+//省list
export function getSubordinateRegions(areaCode) {
return request({
- url: `/nurseApplet/login/getRegionAndStreetInfo?areaCode=${areaCode}`,
+ url: `/nurseApplet/login/getProvinceInfo?areaCode=${areaCode}`,
+ method: 'GET'
+ })
+}
+//市区街道list
+export function getSubordinateInfo(id) {
+ return request({
+ url: `/nurseApplet/login/getSubordinateInfo?areaCode=${id}`,
method: 'GET'
})
}
-
-
diff --git a/api/order/index.js b/api/order/index.js
new file mode 100644
index 0000000..7bbe944
--- /dev/null
+++ b/api/order/index.js
@@ -0,0 +1,9 @@
+import request from "../request.js"
+
+export function orderCount(patientId) {
+ return request({
+ url: `/nurseApp/login/orderCount?patientId=${patientId}`,
+ method: 'GET'
+ })
+}
+
diff --git a/pages.json b/pages.json
index 3ed115e..3e59949 100644
--- a/pages.json
+++ b/pages.json
@@ -9,6 +9,13 @@
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
+ }, {
+ "path": "pages/information/information",
+ "style": {
+ "navigationBarTitleText": "完善个人信息",
+ "navigationBarBackgroundColor": "#ffffff", //背景颜色
+ "enablePullDownRefresh": false
+ }
},
{
"path": "pages/forgotPassword/forgotPassword",
@@ -70,13 +77,6 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //背景颜色
}
- }, {
- "path": "pages/information/information",
- "style": {
- "navigationBarTitleText": "完善个人信息",
- "navigationBarBackgroundColor": "#ffffff", //背景颜色
- "enablePullDownRefresh": false
- }
}, {
"path": "pages/appointmenttime/appointmenttime",
"style": {
@@ -154,7 +154,7 @@
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "登录",
- // "navigationStyle": "custom"
+ "navigationStyle": "custom",
"enablePullDownRefresh": false
}
},
diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue
index 425c260..4ae65c5 100644
--- a/pages/CommodityDetails/CommodityDetails.vue
+++ b/pages/CommodityDetails/CommodityDetails.vue
@@ -1,10 +1,13 @@
-
+
-
+
{{goodsDetailslist.goodsName}}
+
+ 暂无
+
￥{{goodsPrice}} 起
@@ -45,7 +48,7 @@
-
+
@@ -56,12 +59,15 @@
-
+
-
+
-
- {{goodsDetailslist.goodsName}}
+
+ {{goodsDetailslist.goodsName}}
+
+
+ 暂无
￥{{updata.goodsPrice}}
@@ -70,31 +76,67 @@
库存数量:{{updata.goodsStock}}
-
-
-
- {{item.attributeDetailsName}}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{updata.receiver}},{{updata.phone}}
+
+
+
+
+
+ {{updata.receiveAddress}}
+
+
+
+
+
+
+
+
+
+ {{item.attributeDetailsName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 微信支付
+
+
+
+
立即购买
@@ -130,19 +172,25 @@
goodPatientInfo
} from '@/api/modifyAddress/modifyAddress.js';
import baseurl from '@/api/baseurl.js'
+ import {
+ addStationGoodsOrder,
+ appletGoodsOrderPay
+ } from '@/api/confirmOrder/index.js'
export default {
data() {
return {
+ timer: null,
goodsInfoId: null, //商品id
- usershow: false, //完善信息开关
- image: null, //总图片
baseurl: '', //url
+ image: null, //总图片
+ usershow: false, //完善信息开关
goodsPrice: '', //页面价格
goodsDetailslist: [], //商品list
goodDetailsLists: [], //提前预备商品规格数组
goodshow: true, //商品规格开关
buyshow: false, //立即购买遮罩层开关
info: [], //轮播list
+ goodsAttributeId: null, //商品规格id
updata: { //订单表
goodsPrice: 0.00,
goodsName: "",
@@ -151,24 +199,34 @@
nurseStationId: '',
img: '',
totalPrice: null,
- patientId: '',
+ patientId: null,
goodsStock: 0, //库存数量
goodsAttributeContent: '', //商品属性
giveIntegral: 0, //赠送积分
transportPrice: 0.00, //运费
discountPrice: 0.00, //优惠
buySource: '', //下单来源 '护理站：NURSE_STATION，商城：SHOPPING_MALL'
- orderChannel: 'MOBILE_APP', //下单方式 手机App：MOBILE_APP，微信小程序：WECHAT_APPLET，支付宝小程序：ALI_PAY_APPLET'
+ orderChannel: 'WECHAT_APPLET', //下单方式 手机App：MOBILE_APP，微信小程序：WECHAT_APPLET，支付宝小程序：ALI_PAY_APPLET'
receiver: "", //收货人
receiveAddress: "", //收货地址
phone: '', //联系电话
attributeDetailsId: '', //商品属性明细表id
goodsAttributeId: '',
goodsAttributeDetailsId: '',
- }
+ },
+ scrollTop: 0,
+ old: {
+ scrollTop: 0
+ },
+ userid: null,
};
},
methods: {
+ upper: function(e) {},
+ lower: function(e) {},
+ scroll: function(e) {
+ this.old.scrollTop = e.detail.scrollTop
+ },
//跳转完善页面
goinformation() {
this.usershow = false
@@ -178,67 +236,8 @@
},
//立即购买跳转确认订单页面
tapbuy() {
- let that = this
- try {
- const value = uni.getStorageSync('patientId');
- if (value) {
- if (!that.updata.patientId) {
- that.goodsList()
- }
- that.updata.patientId = value
- AppIdentification(value).then(res => {
- if (res.data.loginFlag) {
- if (that.goodshow == true) {
- if (that.updata.goodsAttributeName == '') {
- that.$refs.uToast.show({
- title: '未选择商品',
- type: 'error'
- })
- } else if (that.updata.goodsStock == 0) {
- that.$refs.uToast.show({
- title: '库存数量不足,无法购买',
- type: 'error'
- })
- } else {
- that.buyshow = false
- that.updata.totalPrice = (that.updata.goodsPrice * that.updata
- .goodsCount).toFixed(
- 2)
- uni.navigateTo({
- url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(that.updata)}`
- })
- }
- } else {
- that.buyshow = false
- uni.navigateTo({
- url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(that.updata)}`
- })
- }
- } else {
- that.buyshow = false
- that.usershow = true
- }
- })
- } else {
- uni.navigateTo({
- url: '/pages/login/login'
- })
- }
- } catch (e) {
- // error
- }
+ console.log(this.updata)
},
- // tapbuy() {
- // this.goodsDetailslist.goodDetailsLists.forEach(e => {
- // e.goodAttributeDetailsLists.forEach(el => {
- // if (el.isActive == true) {
- // this.updata.goodsAttributeName += el.attributeDetailsName + ' '
- // this.updata.totalPrice = (this.updata.goodsPrice * this.updata.goodsCount)
- // .toFixed(2)
- // }
- // })
- // })
- // },
//选择商品
isActivegoods(item) {
this.updata.goodsPrice = 0
@@ -267,35 +266,11 @@
this.updata.goodsAttributeDetailsId = item.attributeDetailsId
}
},
-
- // isActivegoods(item, bitem) {
- // if (item.attributeName.includes('服务')) {} else {
- // if (bitem.isActive == true) {
- // item.goodAttributeDetailsLists.forEach(e => {
- // e.isActive = false
- // })
- // } else {
- // item.goodAttributeDetailsLists.forEach(e => {
- // e.isActive = false
- // })
- // bitem.isActive = true
- // }
- // }
- // this.updata.goodsPrice = 0
- // this.updata.goodsAttributeName = ''
- // this.goodsDetailslist.goodDetailsLists.forEach(e => {
- // e.goodAttributeDetailsLists.forEach(el => {
- // if (el.isActive == true) {
- // this.updata.goodsPrice += el.goodsPrice
- // this.updata.goodsAttributeName += el.attributeDetailsName + ' '
- // }
- // })
- // })
- // this.updata.goodsPrice = this.updata.goodsPrice.toFixed(2)
- // },
// 查询商品详细信息
goodsDetailsinfo(goodsInfoId) {
+ let that = this
goodsDetails(goodsInfoId).then(res => {
+ uni.removeStorageSync('Refresh');
if (res.data[0].goodsRemark) {
res.data[0].goodsRemark = res.data[0].goodsRemark.replace(/\![]()
![]()
{
- // e.goodAttributeDetailsLists.forEach(el => {
- // el.isActive = false
- // el.goodsPrice = Number(el.goodsPrice)
- // })
- // })
- // this.goodsDetailslist = res.data[0]
- // this.updata.goodsName = this.goodsDetailslist.goodsName
+ if (this.goodDetailsLists.length == 1) {
+ this.goodDetailsLists[0].isActive = true
+ this.updata.img = this.goodDetailsLists[0].attributePitureUrl
+ this.updata.goodsAttributeName = this.goodDetailsLists[0].attributeDetailsName
+ this.updata.goodsPrice = this.goodDetailsLists[0].goodsPrice
+ this.updata.goodsPrice = this.updata.goodsPrice.toFixed(2)
+ this.updata.attributeDetailsId = this.goodDetailsLists[0].attributeDetailsId
+ this.updata.goodsStock = this.goodDetailsLists[0].goodsStock
+ this.updata.goodsAttributeId = this.goodDetailsLists[0].goodsAttributeId
+ this.updata.goodsAttributeDetailsId = this.goodDetailsLists[0].attributeDetailsId
+ } else {
+ var list = {}
+ this.goodsDetailslist.goodDetailsLists.forEach(e => {
+ if (e.goodsAttributeId == this.goodsAttributeId) {
+ list = e
+ e.isActive = true
+ this.updata.goodsAttributeId = e.goodsAttributeId
+ this.updata.goodsAttributeDetailsId = e.attributeDetailsId
+ }
+ })
+ this.updata.img = list.attributePitureUrl
+ this.updata.goodsAttributeName = list.attributeDetailsName
+ this.updata.goodsPrice = list.goodsPrice
+ this.updata.attributeDetailsId = list.attributeDetailsId
+ this.updata.goodsStock = list.goodsStock
+ this.updata.img = list.attributePitureUrl
+ }
// this.updata.nurseStationId = this.goodsDetailslist.nurseStationId
- // this.updata.img = this.goodsDetailslist.goodsPictureUrl
- // this.goodDetailsLists = res.data[0].goodDetailsLists
+ // this.updata.img = res.data[0].goodsPictureUrl
+ // this.updata.goodsAttributeName = ''
+ // this.updata.goodsPrice = 0
+ // this.updata.attributeDetailsId = ''
+ // this.updata.goodsStock = 0
+ // this.updata.img = list.image
+ })
+ },
+ //跳转到全部收货地址
+ upaddress() {
+ uni.navigateTo({
+ url: `/pages/modifyAddress/modifyAddress?updata=${JSON.stringify(this.updata)}`
})
},
// 收件人
@@ -354,28 +352,56 @@
this.updata.receiver = res.data[0].receiveName
this.updata.receiveAddress = res.data[0].address
this.updata.phone = res.data[0].receivePhone
+ this.userid = res.data[0].id
})
},
},
onLoad(options) { //获取传值
+ var that = this
+ this.goodsAttributeId = options.goodsAttributeId
this.updata.buySource = options.buySource
- this.goodsPrice = options.goodsPrice //页面价格
+ if (options.goodsPrice == 'null' || !options.goodsPrice) {
+ this.goodsPrice = 0 //页面价格
+ } else {
+ this.goodsPrice = options.goodsPrice //页面价格
+ }
this.goodsInfoId = options.goodsInfoId
- },
- onShow() {
- this.baseurl = baseurl
- this.usershow = false
- this.goodsDetailsinfo(this.goodsInfoId)
- let that = this
try {
const value = uni.getStorageSync('patientId');
if (value) {
that.updata.patientId = value
that.goodsList()
} else {}
- } catch (e) {
- // error
- }
+ } catch (e) {}
+ },
+ onShow() {
+ var that = this
+ this.baseurl = baseurl
+ this.usershow = false
+ this.goodsDetailsinfo(this.goodsInfoId)
+ goodPatientInfo(this.updata.patientId).then(res => {
+ var user = res.data.filter(e => e.id == this.userid)
+ if (user.length == 0) {
+ res.data.forEach(e => {
+ e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e
+ .receiveAddress
+ })
+ this.updata.receiver = res.data[0].receiveName
+ this.updata.receiveAddress = res.data[0].address
+ this.updata.phone = res.data[0].receivePhone
+ }
+ })
+ let useritem = null
+ uni.$on('updata', function(data) {
+ that.updata = JSON.parse(data.updata)
+ if (data.useritem) {
+ useritem = JSON.parse(data.useritem)
+ that.updata.receiver = useritem.receiveName
+ that.updata.phone = useritem.receivePhone
+ that.updata.receiveAddress = useritem.address
+ that.userid = useritem.id
+ }
+ })
},
}
diff --git a/pages/CommodityDetails/CommodityDetailsstyle.scss b/pages/CommodityDetails/CommodityDetailsstyle.scss
index 12d5797..a80859f 100644
--- a/pages/CommodityDetails/CommodityDetailsstyle.scss
+++ b/pages/CommodityDetails/CommodityDetailsstyle.scss
@@ -1,84 +1,128 @@
- .app {
- padding: 0;
-
- .mask {
- .information {
- width: 70%;
- height: 400rpx;
- margin: 50% auto;
- background: #FFFFFF;
- border-radius: 30rpx;
- text-align: center;
- color: #FFFFFF;
- position: relative;
-
- .determine,
- .cancel {
- width: 200rpx;
- height: 70rpx;
- border-radius: 26rpx;
- font-size: 34rpx;
- line-height: 70rpx;
- position: absolute;
- top: 74%;
- }
-
- .determine {
- background: #4C7BC9;
- right: 36rpx;
- }
-
- .cancel {
- background: #C5BFBF;
- left: 36rpx;
- }
-
- .title {
- font-size: 42rpx;
- margin-top: 40rpx;
- color: #000000;
- }
-
- image {
- width: 100rpx;
- height: 100rpx;
- margin: 10% 0 0 0;
- }
+.app {
+ padding: 0;
+ .scroll-Y {
+ height: 790rpx;
+ background-color: #F4F5F7;
+ }
+ .mask {
+ .information {
+ width: 70%;
+ height: 400rpx;
+ margin: 50% auto;
+ background: #FFFFFF;
+ border-radius: 30rpx;
+ text-align: center;
+ color: #FFFFFF;
+ position: relative;
+
+ .determine,
+ .cancel {
+ width: 200rpx;
+ height: 70rpx;
+ border-radius: 26rpx;
+ font-size: 34rpx;
+ line-height: 70rpx;
+ position: absolute;
+ top: 74%;
+ }
+
+ .determine {
+ background: #4C7BC9;
+ right: 36rpx;
+ }
+
+ .cancel {
+ background: #C5BFBF;
+ left: 36rpx;
+ }
+
+ .title {
+ font-size: 42rpx;
+ margin-top: 40rpx;
+ color: #000000;
+ }
+
+ image {
+ width: 100rpx;
+ height: 100rpx;
+ margin: 10% 0 0 0;
}
}
-
+ }
.mask {
.PurchasePage {
position: fixed;
bottom: 0;
+ height: 1150rpx;
width: 100%;
background: #FFFFFF;
border-radius: 30rpx 30rpx 0px 0px;
font-size: 36rpx;
padding-bottom: 20rpx;
-
+ .bodys {
+ background-color: #FFFFFF;
+ width: 96%;
+ margin: 10rpx auto 0;
+ border-radius: 20rpx;
+ padding: 15rpx 0 20rpx;
+ position: relative;
+ .addressinfo {
+ font-size: 32rpx;
+ line-height: 65rpx;
+ margin-left: 90rpx;
+ image{
+ width: 40rpx;
+ height: 50rpx;
+ position: absolute;
+ top:50%;
+ left:20rpx;
+ transform: translateY(-50%);
+ }
+ .address{
+ width:92%;
+ font-size: 32rpx;
+ word-break:break-all;
+ }
+ .namephone{
+ width: 70%;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
+ .picture2 {
+ position: absolute;
+ top:50%;
+ right:20rpx;
+ transform: translateY(-50%);
+ image {
+ width: 18rpx;
+ height: 18rpx;
+ color: #FFFFFF;
+ margin-left: 20rpx;
+ }
+ }
+ }
+ }
.close {
width: 31rpx;
height: 31rpx;
position: absolute;
top: 2%;
right: 2%;
+ z-index: 999;
}
.topcontent {
- width: 90%;
+ width: 96%;
margin: 0 auto;
- padding-bottom: 24rpx;
- border-bottom: 1rpx solid #D8D4D4;
+ padding-bottom: 15rpx;
position: relative;
-
- .goodsStock {
+ .goodsStock{
font-size: 24rpx;
position: absolute;
top: 73%;
left: 75%;
}
-
.price {
color: #D43953;
position: absolute;
@@ -89,19 +133,23 @@
.title {
font-size: 36rpx;
position: absolute;
- top: 0%;
+ top: 3%;
left: 38%;
font-weight: 600;
width: 58%;
- height: 85rpx;
+ // height: 85rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 3;
+ word-break: break-all;
}
.image {
- width: 215rpx;
- height: 215rpx;
- background: rgba(150, 147, 148, 0.21);
- margin: 35rpx 0 0 0;
-
+ width: 200rpx;
+ height: 200rpx;
+ margin: 15rpx 0 0 0;
image {
width: 201rpx;
height: 201rpx;
@@ -119,16 +167,41 @@
text-align: center;
line-height: 71rpx;
border-radius: 26rpx;
- margin: 40rpx 0 0 20%;
+ position: absolute;
+ bottom:30rpx;
+ left:20%;
}
.bottomcontent {
- margin-top: 34rpx;
- padding-bottom: 35rpx;
-
+ margin-top: 10rpx;
+ padding: 35rpx 0;
+ background-color: #FFFFFF;
+ border-radius: 15rpx;
+ .chat {
+ height: 130rpx;
+ position: relative;
+ span {
+ font-size: 30rpx;
+ position: absolute;
+ left:130rpx;
+ top:50%;
+ transform: translateY(-50%);
+ }
+
+ image {
+ position: absolute;
+ left:30rpx;
+ top:50%;
+ transform: translateY(-50%);
+ width: 65rpx;
+ height: 55rpx;
+ }
+ }
.header {
+ font-size: 32rpx;
display: inline-block;
vertical-align: middle;
+ margin-left: 17rpx;
}
.number {
@@ -139,37 +212,54 @@
}
.centercontent {
- margin-top: 34rpx;
- font-size: 36rpx;
-
+ font-size: 32rpx;
+ background-color: #FFFFFF;
+ margin-top: 10rpx;
+ padding-top: 20rpx;
+ border-radius: 20rpx;
.header {
margin-bottom: 20rpx;
+ margin-left: 17rpx;
}
-
+
.productmodel {
- font-size: 24rpx;
- display: inline-block;
- height: 60rpx;
- border: 1rpx solid #D8D4D4;
- line-height: 60rpx;
- border-radius: 25rpx;
- text-align: center;
- padding: 0 15rpx;
- margin: 15rpx 15rpx 0 0;
+ border: 1rpx solid #FFFFFF;
}
.Productmodel {
- font-size: 24rpx;
- display: inline-block;
- height: 60rpx;
background: #ECF1FA;
border: 1rpx solid #4C7BC9;
- line-height: 60rpx;
- border-radius: 25rpx;
color: #4C7BC9;
+ }
+ .productmodel,.Productmodel{
+ background-color: #F6F6F6;
+ height: 300rpx;
text-align: center;
- padding: 0 15rpx;
- margin: 15rpx 15rpx 0 0;
+ width:30%;
+ font-size: 24rpx;
+ border-radius: 10rpx;
+ margin: 5rpx 1.5% 10rpx;
+ padding: 0 0 10rpx;
+ view{
+ background-color: #F6F6F6;
+ margin: 10rpx auto;
+ width: 98%;
+ // height: 90rpx;
+ border-radius: 10rpx;
+ font-size: 24rpx;
+ text-overflow: -o-ellipsis-lastline;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ line-clamp: 2;
+ -webkit-box-orient: vertical;
+ }
+ image{
+ border-radius: 10rpx;
+ width: 100%;
+ height: 200rpx;
+ }
}
}
}
@@ -243,21 +333,18 @@
box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
position: relative;
padding-bottom: 110rpx;
-
- .textInfo {
- word-break: break-all;
+.textInfo {
+ word-break:break-all;
font-size: 29rpx;
text-indent: 2rem;
line-height: 42rpx;
// color: #666666;
padding: 0 20rpx;
-
/deep/ .richPic {
width: 100% !important;
height: 100% !important;
}
}
-
.selected {
padding: 20rpx 0 0 5%;
color: #969394;
@@ -297,6 +384,7 @@
.name,
.number {
+ word-break: break-all;
width: 100%;
display: inline-block;
line-height: 50rpx;
diff --git a/pages/CommodityOrder/CommodityOrder.scss b/pages/CommodityOrder/CommodityOrder.scss
index 6b80e9b..daa0839 100644
--- a/pages/CommodityOrder/CommodityOrder.scss
+++ b/pages/CommodityOrder/CommodityOrder.scss
@@ -1,6 +1,7 @@
.app {
width: 100%;
padding: 3%;
+ padding: 3%;
.noorder{
margin-top: 20%;
image{
@@ -149,6 +150,7 @@
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
+
}
span:nth-child(2) {
@@ -166,12 +168,19 @@
top: 45%;
width: 68%;
- .box {
+ .box:nth-child(1) {
+ width: 70%;
+ display: inline-block;
font-size: 30rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.box:nth-child(2) {
+ width: 30%;
position: absolute;
+ text-align: center;
right: 0%;
}
}
@@ -230,6 +239,7 @@
height: 65rpx;
// top: 8%;
left: 10%;
+ width: 90%;
font-size: 26rpx;
color: #000000;
}
diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue
index 3e75c8d..44a6c7b 100644
--- a/pages/ProductList/ProductList.vue
+++ b/pages/ProductList/ProductList.vue
@@ -4,12 +4,15 @@
-
+
{{item.goodsName}}
+
+ {{item.attributeDetailsName}}
+
￥{{item.goodsPrice}}
@@ -17,6 +20,12 @@
+
+
+
+ 暂无商品
+
+
@@ -66,7 +75,7 @@
//跳转详情页
goCommodityDetails(item) {
uni.navigateTo({
- url: `/pages/CommodityDetails/CommodityDetails?goodsPrice=${item.goodsPrice}&goodsInfoId=${item.goodsInfoId}&buySource=${'SHOPPING_MALL'}`
+ url: `/pages/CommodityDetails/CommodityDetails?goodsPrice=${item.goodsPrice}&goodsInfoId=${item.goodsInfoId}&buySource=${'SHOPPING_MALL'}&goodsAttributeId=${item.goodsAttributeId}`
})
},
},
@@ -98,6 +107,21 @@
.app {
padding: 0;
+ .noorder {
+ view {
+ text-align: center;
+ font-size: 40rpx;
+ color: #BFBFBF;
+ }
+
+ image {
+ display: block;
+ margin: 20% auto 50rpx;
+ width: 160rpx;
+ height: 200rpx;
+ }
+ }
+
.inputs {
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border: 1px solid #f0f0f0;
@@ -134,7 +158,7 @@
.productlist {
width: 100%;
margin: 0 auto;
- padding: 40rpx 0 0 0;
+ padding: 20rpx 0 0 0;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
@@ -147,18 +171,32 @@
box-shadow: 0px 4rpx 8rpx 4rpx rgba(199, 200, 202, 0.8);
margin-bottom: 40rpx;
+
.price {
- font-size: 42rpx;
+ font-size: 36rpx;
color: #D43953;
line-height: 79rpx;
- padding-left: 20rpx;
+ padding-left: 15rpx;
+ }
+
+ .text {
+ font-size: 24rpx;
+ padding: 0 15rpx;
+ // text-overflow: ellipsis;
+ // overflow: hidden;
+ // white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.title {
- font-size: 39rpx;
+ font-size: 36rpx;
color: #000000;
line-height: 69rpx;
- padding-left: 20rpx;
+ padding-left: 15rpx;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@@ -167,6 +205,7 @@
image {
width: 100%;
height: 340rpx;
+ border-radius: 25rpx 25rpx 0 0;
}
}
}
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index ed06ea7..c46b327 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -45,7 +45,7 @@
耗材包详情：
￥{{consumableTotalPrice}}
-
+
diff --git a/pages/information/information.scss b/pages/information/information.scss
index f4e3270..f762e6a 100644
--- a/pages/information/information.scss
+++ b/pages/information/information.scss
@@ -174,6 +174,7 @@
display: inline-block;
height: 120rpx;
line-height: 120rpx;
+ overflow: hidden;text-overflow: ellipsis;white-space: nowrap;
}
span {
diff --git a/pages/information/information.vue b/pages/information/information.vue
index 33323c1..d424ec6 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -15,7 +15,7 @@
身份证号:
-
+
所属区域:
{{address}}
@@ -31,8 +31,11 @@
-
+
+
+
+
@@ -91,10 +94,15 @@
getNurseType,
information
} from '@/api/information/index.js'
+ import {
+ getSubordinateRegions,
+ } from '@/api/modifyAddress/modifyAddress.js';
import contenttext from './text.vue'
+ import gkcity from "../m-city/m-city.vue";
export default {
components: {
- contenttext
+ contenttext,
+ "m-city": gkcity
},
data() {
return {
@@ -116,41 +124,54 @@
nurseTypeIdList: [],
diseaseInfoList: [],
patientId: '',
- }
+ },
+ addresslength: null,
+ list: [{
+ id: "",
+ localName: "请选择",
+ children: [],
+ }, ],
};
},
methods: {
//提交信息
informationinfo() {
let that = this
- try {
- const value = uni.getStorageSync('phone');
- if (value) {
- that.query.phone = value
- information(that.query).then(res => {
- if (res.code == 200) {
- that.$refs.uToast.show({
- title: '完善信息成功',
- type: 'success',
- duration: '1500'
- })
- if (that.timer) {
- clearTimeout(that.timer)
- }
- that.timer = setTimeout(e => {
- uni.navigateBack({
- delta: 1
+ if (this.addresslength.length > 2) {
+ try {
+ const value = uni.getStorageSync('phone');
+ if (value) {
+ that.query.phone = value
+ information(that.query).then(res => {
+ if (res.code == 200) {
+ that.$refs.uToast.show({
+ title: '完善信息成功',
+ type: 'success',
+ duration: '1500'
})
- }, 1500)
- } else if (res.code == 500) {
- that.$refs.uToast.show({
- title: res.msg,
- type: 'error',
- })
- }
- })
- }
- } catch (e) {}
+ if (that.timer) {
+ clearTimeout(that.timer)
+ }
+ that.timer = setTimeout(e => {
+ uni.navigateBack({
+ delta: 1
+ })
+ }, 1500)
+ } else if (res.code == 500) {
+ that.$refs.uToast.show({
+ title: res.msg,
+ type: 'error',
+ })
+ }
+ })
+ }
+ } catch (e) {}
+ } else {
+ that.$refs.uToast.show({
+ title: '地址不完整,请选择到区级',
+ type: 'error'
+ })
+ }
},
//获取所在位置
getAddress() {
@@ -173,21 +194,33 @@
},
//区街道
areaInfo() {
- getRegionAndStreetInfo().then(res => {
- //区下无街道添加一个空街道
- res.data.forEach(e => {
- if (e.children.length == 0) {
- e.children.push({
- areaCode: "",
- areaName: "暂无街道",
- children: null,
- id: '',
- })
- }
- })
- this.arealist = res.data;
+ getSubordinateRegions().then(res => {
+ this.list = res.data;
})
},
+ // 三级地址联动回调
+ getpickerParentValue(e) {
+ this.addresslength = e
+ if (e.length == 4) {
+ this.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName + '-' + e[3]
+ .localName
+ this.query.areaCode = e[3].id
+ } else if (e.length == 3) {
+ this.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName
+ this.query.areaCode = e[2].id
+ } else if (e.length == 2) {
+ this.address = e[0].localName + '-' + e[1].localName
+ this.query.areaCode = e[1].id
+ } else if (e.length == 1) {
+ this.address = e[0].localName
+ this.query.areaCode = e[0].id
+ }
+ },
+ // 显示三级地址联动
+ showPicker() {
+ this.areashow = true
+ this.$refs.cityPicker.show();
+ },
//区街道选择
areaconfirm(e) {
this.query.areaCode = e[e.length - 1].value
diff --git a/pages/m-city/m-city.vue b/pages/m-city/m-city.vue
new file mode 100644
index 0000000..110c29b
--- /dev/null
+++ b/pages/m-city/m-city.vue
@@ -0,0 +1,369 @@
+
+
+
+
+
+ {{ headTitle }}
+
+
+
+
+ {{ item.localName }}
+
+
+
+
+
+ {{ item.areaName }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/modify/modify.vue b/pages/modify/modify.vue
index e8ea989..162004c 100644
--- a/pages/modify/modify.vue
+++ b/pages/modify/modify.vue
@@ -20,7 +20,7 @@
-
+
所属区域:
{{address}}
@@ -31,7 +31,8 @@
所在位置:
- {{chooseLocation}}
+ {{chooseLocation}}
+
疾病类型:
@@ -51,8 +52,8 @@
style="color: #000000;border-bottom: 1rpx solid #000000;">《用户协议》
-
+
完成
@@ -73,6 +74,11 @@
+
+
+
+
@@ -85,9 +91,17 @@
} from '@/api/information/index.js'
import contenttext from '../information/text.vue'
import baseurl from '@/api/baseurl.js'
+ import gkcity from "../m-city/m-city.vue";
+ import {
+ getSubordinateRegions,
+ } from '@/api/modifyAddress/modifyAddress.js';
+ import {
+ appPersonal,
+ } from '@/api/user/user.js';
export default {
components: {
- contenttext
+ contenttext,
+ "m-city": gkcity
},
data() {
return {
@@ -95,9 +109,12 @@
timer: null,
baseurl: '',
address: '',
- arealist: [],
- areashow: false,
- maskshow:false,//用户协议
+ list: [{
+ id: "",
+ localName: "请选择",
+ children: [],
+ }, ],
+ maskshow: false, //用户协议
chooseLocation: '',
img: null,
image: null,
@@ -115,25 +132,64 @@
locationName: '',
},
patientDiseaseInfoList: [], //获取个人信息
+ addresslength: null,
}
},
onLoad(options) {
+ var that = this
this.areaInfo();
this.baseurl = baseurl
- this.appPersonallist = JSON.parse(options.appPersonallist)
- 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.locationName) {
- this.chooseLocation = this.appPersonallist.locationName
- }
+ const value = uni.getStorageSync('patientId');
+ if (value) {
+ appPersonal(value).then(Response => {
+ if (Response.code == 200) {
+ that.appPersonallist = Response.data
+ that.appPersonallist.homeLatitude = Number(that.appPersonallist.homeLatitude)
+ that.appPersonallist.homeLongitude = Number(that.appPersonallist.homeLongitude)
+ that.img = baseurl + that.appPersonallist.headPictureUrl
+ if (that.appPersonallist.streetName) {
+ that.address = that.appPersonallist.provinceName + '-' + that.appPersonallist
+ .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.forEach(e => {
+ e.id = e.diseaseId
+ })
+ if (that.appPersonallist.locationName) {
+ that.chooseLocation = that.appPersonallist.locationName
+ }
+ } else if (Response.code == 9999) {} else {}
+ })
+ } else {}
+
},
methods: {
+ // 三级地址联动回调
+ getpickerParentValue(e) {
+ this.addresslength = e
+ if (e.length == 4) {
+ this.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName + '-' + e[3]
+ .localName
+ this.appPersonallist.areaCode = e[3].id
+ } else if (e.length == 3) {
+ this.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName
+ this.appPersonallist.areaCode = e[2].id
+ } else if (e.length == 2) {
+ this.address = e[0].localName + '-' + e[1].localName
+ this.appPersonallist.areaCode = e[1].id
+ } else if (e.length == 1) {
+ this.address = e[0].localName
+ this.appPersonallist.areaCode = e[0].id
+ }
+ },
+ // 显示三级地址联动
+ showPicker() {
+ this.$refs.cityPicker.show();
+ },
//上传图片+提交信息
informationinfo() {
//上传图片
@@ -253,19 +309,8 @@
},
//区街道
areaInfo() {
- getRegionAndStreetInfo().then(res => {
- //区下无街道添加一个空街道
- res.data.forEach(e => {
- if (e.children.length == 0) {
- e.children.push({
- areaCode: "",
- areaName: "暂无街道",
- children: null,
- id: '',
- })
- }
- })
- this.arealist = res.data;
+ getSubordinateRegions().then(res => {
+ this.list = res.data;
})
},
//跳转疾病选择
diff --git a/pages/modifyAddress/modifyAddress.scss b/pages/modifyAddress/modifyAddress.scss
index d32fe3a..05c9032 100644
--- a/pages/modifyAddress/modifyAddress.scss
+++ b/pages/modifyAddress/modifyAddress.scss
@@ -3,9 +3,12 @@
background-color: #F4F5F7;
width: 100%;
position: relative;
+ height: 100%;
padding: 4%;
padding-bottom: 100rpx;
- font-size: 32rpx;
+ /deep/ .u-drawer{
+ z-index: 0 !important;
+ }
.address {
width: 99%;
background: #FFFFFF;
@@ -13,19 +16,20 @@
border-radius: 20rpx;
margin: 0 auto 20rpx;
padding-bottom: 10rpx;
+
.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;
@@ -44,6 +48,7 @@
background: #FFFFFF;
border: 1rpx solid #969394;
border-radius: 26rpx;
+ font-size: 31rpx;
color: #969394;
}
@@ -58,6 +63,7 @@
line-height: 80rpx;
background: #4C7BC9;
border-radius: 26rpx;
+ font-size: 34rpx;
color: #FFFFFF;
text-align: center;
position: fixed;
@@ -75,10 +81,11 @@
}
}
- // 弹框
+ // 弹框支付
.payment {
width: 90%;
height: 110rpx;
+ font-size: 36rpx;
color: #000000;
line-height: 110rpx;
text-align: center;
@@ -100,6 +107,7 @@
background: #4C7BC9;
border-radius: 26rpx;
text-align: center;
+ font-size: 34rpx;
color: #FFFFFF;
margin: 0 auto;
margin-top: 10%;
@@ -116,6 +124,7 @@
}
.items {
+ font-size: 32rpx;
color: #030001;
line-height: 40rpx;
}
diff --git a/pages/modifyAddress/modifyAddress.vue b/pages/modifyAddress/modifyAddress.vue
index 0a32f59..1405ed0 100644
--- a/pages/modifyAddress/modifyAddress.vue
+++ b/pages/modifyAddress/modifyAddress.vue
@@ -26,8 +26,8 @@
-
-
+
+
{{shipAddress}}
@@ -37,12 +37,12 @@
-
-
+
+
+
-
@@ -52,9 +52,14 @@
-
+
+
+
+
+
@@ -69,42 +74,84 @@
getSubordinate
} from '@/api/modifyAddress/modifyAddress.js';
import baseurl from '@/api/baseurl.js'
+ import gkcity from "../m-city/m-city.vue";
export default {
+ components: {
+ "m-city": gkcity
+ },
data() {
return {
- timer:null,
+ timer: null,
isedit: true, //标识
delshow: false, //删除弹框
content: '确认要删除信息吗？',
show: false, //弹框
- areashow: false, //经纬度开关
- arealist: [], //区街道list
+ address: null,
+ // areashow: false, //经纬度开关
+ // arealist: [], //区街道list
areaCode: '',
shipAddress: '添加地址',
infolist: {
receiveName: '',
receivePhone: '',
receiveAddress: '',
- areaCode: '',
+ areaCode: null,
patientId: '',
- address: '', //页面所属区域
+ address: null, //页面所属区域
},
goodPatient: [], // 查询地址信息
patientId: null,
+ url: '',
updata: [],
+ list: [{
+ id: "",
+ localName: "请选择",
+ children: [],
+ }, ],
+ cityPickershow: false,
+ addresslength: null,
}
},
+ onShow() {
+ this.goodsList()
+ this.areaInfo()
+ },
onLoad(options) {
let that = this
this.updata = JSON.parse(options.updata)
- //获取传值
- this.goodsList()
- this.areaInfo()
},
methods: {
+ // 三级地址联动回调
+ getpickerParentValue(e) {
+ console.log(e)
+ this.addresslength = e
+ if (e.length == 4) {
+ this.infolist.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName + '-' + e[3]
+ .localName
+ this.address = e[0].localName + '-' + e[1].localName + '-' + e[2].localName + '-' + e[3]
+ .localName
+ this.infolist.areaCode = e[3].id
+ } else if (e.length == 3) {
+ 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
+ } else if (e.length == 2) {
+ this.infolist.address = e[0].localName + '-' + e[1].localName
+ this.address = e[0].localName + '-' + e[1].localName
+ this.infolist.areaCode = e[1].id
+ } else if (e.length == 1) {
+ this.infolist.address = e[0].localName
+ this.address = e[0].localName
+ this.infolist.areaCode = e[0].id
+ }
+ },
+ // 显示三级地址联动
+ showPicker() {
+ this.cityPickershow = true
+ this.$refs.cityPicker.show();
+ },
//将信息携带至订单页面
goorder(item) {
- // if (this.url == "appointmenttime") {
uni.$emit('updata', {
updata: JSON.stringify(this.updata),
useritem: JSON.stringify(item)
@@ -112,14 +159,6 @@
uni.navigateBack({
delta: 1
});
- // uni.navigateTo({
- // url: `/pages/appointmenttime/appointmenttime?updata=${JSON.stringify(this.updata)}&useritem=${JSON.stringify(item)}`
- // })
- // } else {
- // uni.navigateTo({
- // url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(this.updata)}&useritem=${JSON.stringify(item)}`
- // })
- // }
},
// 查询地址信息
goodsList() {
@@ -128,7 +167,6 @@
const value = uni.getStorageSync('patientId');
if (value) {
that.patientId = value
- that.infolist.patientId = value
goodPatientInfo(that.patientId).then(res => {
res.data.forEach(e => {
e.address = e.provinceName + e.cityName + e.regionName + e
@@ -148,67 +186,89 @@
uni.navigateBack({
delta: 2
})
+
}, 1500)
}
} catch (e) {}
- // uni.getStorage({
- // key: 'patientId',
- // success: function(res) {
- // that.patientId = res.data
- // that.infolist.patientId = res.data
- // goodPatientInfo(that.patientId).then(res => {
- // res.data.forEach(e => {
- // e.address = e.provinceName + e.cityName + e.regionName + e
- // .streetName + e.receiveAddress
- // })
- // that.goodPatient = res.data
- // })
- // }
- // });
},
// 保存按钮
submit() {
let that = this
- if (that.isedit == true) {
- addnursingStation(that.infolist).then(res => {
- if (res.code == 200) {
- uni.showToast({
- title: '新增成功',
- duration: 1000
- });
- that.show = false;
- setTimeout(e => {
- that.goodsList()
- }, 1000)
- }
- })
+ if (this.addresslength.length > 2) {
+ if (that.isedit == true) {
+ addnursingStation(that.infolist).then(res => {
+ if (res.code == 200) {
+ that.$refs.uToast.show({
+ title: '新增成功',
+ type: 'success'
+ })
+ 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 {
+ that.$refs.uToast.show({
+ title: res.msg,
+ type: 'error'
+ })
+ }
+ })
+ }
} else {
- updatenursingStation(that.infolist).then(res => {
- uni.showToast({
- title: '修改成功',
- duration: 1000
- });
- that.show = false;
- setTimeout(e => {
- that.goodsList()
- }, 1000)
+ that.$refs.uToast.show({
+ title: '地址不完整,请选择到区级',
+ type: 'error'
})
}
+
},
// 修改按钮
updataxg(item) {
+ this.cityPickershow = true
this.shipAddress = '修改地址'
this.isedit = false
nursingStationGoodsinfo(item.id).then(res => {
this.infolist = res.data
getSubordinate(res.data.areaCode).then(res => {
- this.infolist.address = res.data.regionName + '-' + res.data.streetName
+ if (res.data.streetName) {
+ this.infolist.address = res.data.provinceName + '-' + res.data.cityName +
+ '-' +
+ res
+ .data.regionName + '-' + res.data.streetName
+ this.address = res.data.provinceName + '-' + res.data.cityName +
+ '-' +
+ res
+ .data.regionName + '-' + res.data.streetName
+ } else {
+ this.infolist.address = res.data.provinceName + '-' + res.data.cityName +
+ '-' +
+ res
+ .data.regionName
+ this.address = res.data.provinceName + '-' + res.data.cityName +
+ '-' +
+ res
+ .data.regionName
+ }
this.show = true
})
})
},
// 新增
add() {
+ this.cityPickershow = true
this.infolist = {
receiveName: '',
receivePhone: '',
@@ -227,16 +287,23 @@
content: '确认要删除信息吗',
success: function(res) {
if (res.confirm) {
- delnursingStation(item.id).then(res => {
- uni.showToast({
- title: '删除成功',
- duration: 1000,
- });
- setTimeout(e => {
- that.goodsList()
- }, 1000)
- that.delshow = false;
- })
+ if (that.goodPatient.length == 1) {
+ that.$refs.uToast.show({
+ title: '最少保留一条地址信息',
+ type: 'error'
+ })
+ } else {
+ delnursingStation(item.id).then(res => {
+ that.$refs.uToast.show({
+ title: '删除成功',
+ type: 'success'
+ })
+ setTimeout(e => {
+ that.goodsList()
+ }, 1000)
+ that.delshow = false;
+ })
+ }
} else if (res.cancel) {}
}
});
@@ -244,34 +311,44 @@
// 取消
cencel() {
this.show = false
- this.infolist = {}
- // this.address=""
+ this.cityPickershow = false
},
// 选择区街道
areaInfo() {
- getSubordinateRegions(this.areaCode).then(res => {
+ getSubordinateRegions().then(res => {
//区下无街道添加一个空街道
- res.data.forEach(e => {
- if (e.children.length == 0) {
- e.children.push({
- areaCode: "",
- areaName: "暂无街道",
- children: null,
- id: '',
- })
- }
- })
- this.arealist = res.data;
+ this.list = res.data;
})
},
+ // 选择区街道
+ // areaInfo() {
+ // getSubordinateRegions(this.areaCode).then(res => {
+ // //区下无街道添加一个空街道
+ // res.data.forEach(e => {
+ // if (e.children.length == 0) {
+ // e.children.push({
+ // areaCode: "",
+ // areaName: "暂无街道",
+ // children: null,
+ // id: '',
+ // })
+ // }
+ // })
+ // this.arealist = res.data;
+ // })
+ // },
//区街道选择
areaconfirm(e) {
this.infolist.areaCode = e[e.length - 1].value
- // this.address = e[0].label + '-' + e[1].label
this.infolist.address = e[0].label + '-' + e[1].label
-
},
- }
+ },
+ onPullDownRefresh() { //下拉刷新
+ this.goodsList()
+ setTimeout(function() {
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
}
diff --git a/pages/order/order.vue b/pages/order/order.vue
index b812c28..6a4beda 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -4,22 +4,46 @@
商品订单
-
+
待付款
+
+ {{list.waitPayCount}}
+
+
+ 99+
+
待收货
-
-
-
- 待评价
+
+ {{list.waitReceivedGoodsCount}}
+
+
+ 99+
+
+
+ 待评价
+
+ {{list.receivedGoodsCount}}
+
+
+ 99+
+
+
+
已完成
+
@@ -29,22 +53,37 @@
+
@@ -128,14 +173,31 @@
justify-content: space-around;
image {
- width: 83rpx;
- height: 72rpx;
+ width: 100rpx;
+ height: 80rpx;
margin-left: 50%;
transform: translateX(-50%);
}
.OrderStatus {
- margin-top: 8%;
+ padding-top: 50rpx;
+ position: relative;
+
+ .orderCount {
+ background-color: red;
+ color: #FFFFFF;
+ border-radius: 50%;
+ text-align: center;
+ // padding: 0 5rpx ;
+ line-height: 40rpx;
+ width: 40rpx;
+ height: 40rpx;
+ font-size: 20rpx;
+ // display: inline-block;
+ position: absolute;
+ top: 30rpx;
+ right: -20rpx;
+ }
}
}
diff --git a/pages/orderDetails/orderDetails.scss b/pages/orderDetails/orderDetails.scss
index ce6e344..92d848f 100644
--- a/pages/orderDetails/orderDetails.scss
+++ b/pages/orderDetails/orderDetails.scss
@@ -1,19 +1,87 @@
.app {
padding: 0;
+ .submits {
+ width: 501rpx;
+ height: 71rpx;
+ background: #4C7BC9;
+ border-radius: 26rpx;
+ text-align: center;
+ line-height: 71rpx;
+ color: #ffffff;
+ font-size: 34rpx;
+ margin-top: 5%;
+ margin-left: 15%;
+ }
+
+ // 弹框确认收货
+ .chat {
+ .word {
+ font-size: 26rpx;
+ color: #010000;
+ line-height: 36rpx;
+ width: 70%;
+ margin: 50rpx auto;
+ text-align: center;
+ }
+
+ .image {
+ position: relative;
+
+ .blackground {
+ width: 183rpx;
+ height: 69rpx;
+ background: #030303;
+ opacity: 0.5;
+ color: #ffffff;
+ font-size: 36rpx;
+ text-align: center;
+ line-height: 69rpx;
+ position: absolute;
+ bottom: 0%;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+
+ image {
+ width: 182rpx;
+ display: block;
+ margin: 0 auto;
+ height: 182rpx;
+ }
+ }
+
+ }
+ .payment {
+ width: 100%;
+ font-size: 42rpx;
+ color: #000000;
+ line-height: 120rpx;
+ text-align: center;
+
+ span {}
+
+ image {
+ width: 31rpx;
+ height: 31rpx;
+ position: absolute;
+ right: 5%;
+ top: 5%;
+ }
+ }
.time{
height: 80rpx;
width: 95%;
text-align: center;
line-height: 80rpx;
background-color: #fff;
- margin: 0 auto 10rpx;
+ margin: 30rpx auto 0;
border-radius: 20rpx;
}
.OrderStatus{
text-align: center;
width: 300rpx;
height: 70rpx;
- margin: 0 auto;
+ margin: 30rpx auto 0;
line-height: 70rpx;
background-color:#4C7BC9 ;
border-radius: 50rpx;
@@ -27,7 +95,21 @@
bottom: 0;
height: 100rpx;
width: 100%;
-
+ .logistics{
+ width: 216rpx;
+ height: 68rpx;
+ text-align: center;
+ color: #ffffff;
+ border-radius: 26rpx;
+ font-size: 36rpx;
+ line-height: 68rpx;
+ position: absolute;
+ right: 260rpx;
+ top: 50%;
+ background: #E1AE3C;
+ transform: translateY(-50%);
+ z-index: 999;
+ }
.pay {
width: 216rpx;
height: 68rpx;
@@ -164,8 +246,7 @@
font-size: 30rpx;
color: #020000;
- span {
- display: block;
+ view {
line-height: 65rpx;
margin-left: 20rpx;
diff --git a/pages/orderDetails/orderDetails.vue b/pages/orderDetails/orderDetails.vue
index 3fd66af..c8fe743 100644
--- a/pages/orderDetails/orderDetails.vue
+++ b/pages/orderDetails/orderDetails.vue
@@ -5,9 +5,6 @@
-
- 订单已关闭
-
订单已关闭
@@ -52,14 +49,14 @@
-
- 收货人：{{order.receiver}}
- 联系电话：{{order.phone}}
- 收货地址：{{order.receiveAddress}}
- 订单编号：{{order.goOrderNo}}
+
+ 收货人：{{order.receiver}}
+ 联系电话：{{order.phone}}
+ 收货地址：{{order.receiveAddress}}
+ 订单编号：{{order.goOrderNo}}
- 下单时间：{{order.orderTime}}
- 退款时间：{{order.updateTime}}
+ 下单时间：{{order.orderTime}}
+ 退款时间：{{order.updateTime}}
diff --git a/pages/user/user.scss b/pages/user/user.scss
index 3189b01..179e3e0 100644
--- a/pages/user/user.scss
+++ b/pages/user/user.scss
@@ -57,6 +57,16 @@
padding:0 0 0 0;
overflow: hidden;
font-size: 32rpx;
+ .addressitem {
+ box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+ // height: 110rpx;
+ line-height: 80rpx;
+ border-bottom: 1rpx solid #D8D4D4;
+ background: #FFFFFF;
+ .address{
+ line-height: 50rpx;font-size: 28rpx;width: 90%;margin: 0 auto;
+ }
+ }
.disease{
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
line-height: 60rpx;
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 5d41154..136e8fc 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -37,18 +37,39 @@
身份证：
-
- 区域：{{appPersonallist.regionName}}-{{appPersonallist.streetName}}
+
+
+ 区域：
+
+
+ {{appPersonallist.provinceName}}-{{appPersonallist.cityName}}-{{appPersonallist.regionName}}-{{appPersonallist.streetName}}
+
-
- 区域：
+
+
+ 区域：
+
+
+ {{appPersonallist.provinceName}}-{{appPersonallist.cityName}}-{{appPersonallist.regionName}}
+
-
- 地址:
- {{appPersonallist.address}}
+
+
+ 区域：
+
+
+
+
+ 地址：
+
+
+ {{appPersonallist.address}}
+
- 地址:
+
+ 地址：
+