Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
shidongli
commit
81728643c7
@ -1,15 +1,5 @@
|
||||
import request from "../../request.js"
|
||||
|
||||
export function goodsOrder(patientId, orderStatus, goodsOrderId, pageSize, pageNum) {
|
||||
return request({
|
||||
url: `/nurseApplet/nursingOrder/goodsOrder?patientId=${patientId}&orderStatus=${orderStatus}&goodsOrderId=${goodsOrderId}&pageSize=${pageSize}&pageNum=${pageNum}`,
|
||||
method: 'GET',
|
||||
header: {
|
||||
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
//收货
|
||||
export function confirmReceipt(orderNo) {
|
||||
|
||||
10
pages.json
10
pages.json
@ -56,7 +56,8 @@
|
||||
"navigationBarTitleText": "人脸采集",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"path": "pages/location/location",
|
||||
"style": {
|
||||
"navigationBarTitleText": "定位",
|
||||
@ -347,8 +348,11 @@
|
||||
}, {
|
||||
"path": "ExpertlookOrder/ExpertlookOrder",
|
||||
"style": {
|
||||
"navigationBarTitleText": "专家咨询订单",
|
||||
"enablePullDownRefresh": false
|
||||
// "navigationBarTitleText": "专家咨询订单",
|
||||
"navigationStyle": "custom", // 隐藏系统导航栏
|
||||
"onReachBottomDistance": 20, //距离底部多远时触发 单位为px
|
||||
"enablePullDownRefresh": true //设置参数为true
|
||||
// "enablePullDownRefresh": false
|
||||
}
|
||||
}, {
|
||||
"path": "consulted/consulted",
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
|
||||
<script>
|
||||
import {
|
||||
goodsOrder
|
||||
ssgoodsOrder
|
||||
} from '@/api/pagesB/CommodityOrder/index.js'
|
||||
import baseurl from '@/api/baseurl.js'
|
||||
export default {
|
||||
@ -49,28 +49,38 @@
|
||||
return {
|
||||
baseurl: '',
|
||||
Aftersalesorder: null,
|
||||
patientId: '', //用户id
|
||||
goodsOrderId: '', //订单id
|
||||
orderStatus: '', //状态 不传
|
||||
pageSize: 10,
|
||||
pageNum: 1,
|
||||
orderTypeList: {
|
||||
goodsOrderId: null,
|
||||
patientId: '',
|
||||
openid: null,
|
||||
orderTypeList: [
|
||||
'INTEGRAL_EXCHANGE',
|
||||
'DIRECT_BUY',
|
||||
],
|
||||
orderStatus: '',
|
||||
pageSize: 15,
|
||||
pageNum: 1,
|
||||
goodsName: '',
|
||||
},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
goodsOrderinfo() {
|
||||
goodsOrder(this.patientId, this.orderStatus, this.goodsOrderId, this.pageSize, this.pageNum).then(
|
||||
ssgoodsOrder(this.orderTypeList).then(
|
||||
res => {
|
||||
this.Aftersalesorder = res.rows[0]
|
||||
})
|
||||
},
|
||||
},
|
||||
onLoad(options) {
|
||||
this.goodsOrderId = options.goodsOrderId
|
||||
this.orderTypeList.goodsOrderId = options.goodsOrderId
|
||||
this.baseurl = baseurl
|
||||
let that = this
|
||||
const value = uni.getStorageSync('patientId');
|
||||
if (value) {
|
||||
that.patientId = value
|
||||
const openid = uni.getStorageSync('openid');
|
||||
if (value && openid) {
|
||||
that.orderTypeList.patientId = value
|
||||
that.orderTypeList.openid = openid
|
||||
that.goodsOrderinfo();
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
</view>
|
||||
<view class="inputs">
|
||||
<i class="icon"></i>
|
||||
<input v-model="goodsName" type="text" name="" id="" class="input" placeholder="搜索订单"
|
||||
<input v-model="orderTypeList.goodsName" type="text" name="" id="" class="input" placeholder="搜索订单"
|
||||
placeholder-class="placeholder">
|
||||
</view>
|
||||
</u-navbar>
|
||||
@ -68,8 +68,8 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="anniu">
|
||||
<view class="logistics" v-if="item.orderStatus=='WAIT_REFUND'" style="background-color: coral;"
|
||||
@tap='goorderdetails(item)'>退款中
|
||||
<view class="logistics" v-if="item.orderStatus=='WAIT_REFUND'"
|
||||
style="background-color: coral;color:#fff" @tap='goorderdetails(item)'>退款中
|
||||
</view>
|
||||
<view class="logistics"
|
||||
v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType !='HEALTH_CONSULTATION'"
|
||||
@ -151,36 +151,28 @@
|
||||
},
|
||||
orderTypeList: {
|
||||
patientId: '',
|
||||
goodsOrderId: '',
|
||||
orderTypeList: [
|
||||
'INTEGRAL_EXCHANGE',
|
||||
'DIRECT_BUY',
|
||||
|
||||
'INTEGRAL_EXCHANGE',
|
||||
'DIRECT_BUY',
|
||||
],
|
||||
orderStatus: '',
|
||||
pageSize: 15, //
|
||||
pageNum: 1, //
|
||||
pageSize: 15,
|
||||
pageNum: 1,
|
||||
goodsName: '',
|
||||
},
|
||||
orderNoitem: null,
|
||||
patientId: '',
|
||||
openid: '',
|
||||
baseurl: '', //url
|
||||
orderlist: [], //商品订单list
|
||||
total: 0, //list长度
|
||||
show: false, //确认收获开关
|
||||
img: '', //确认收货页面图片
|
||||
orderStatus: '', //
|
||||
goodsOrderId: '', //
|
||||
pageSize: 15, //
|
||||
pageNum: 1, //
|
||||
goodsName: '',
|
||||
getCodeText: null,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
//点击tabs
|
||||
tabschange(index) {
|
||||
console.log(this.tabslist)
|
||||
this.tabscurrent = index;
|
||||
this.orderTypeList.orderStatus = this.tabslist[index].orderStatus
|
||||
this.goodsOrderinfo();
|
||||
@ -305,10 +297,10 @@
|
||||
uni.removeStorageSync('Refresh');
|
||||
this.total = res.total
|
||||
} else if (res.code == 9999) {
|
||||
// this.$refs.uToast.show({
|
||||
// title: '未登录,请先登录',
|
||||
// type: 'error',
|
||||
// })
|
||||
this.$refs.uToast.show({
|
||||
title: '未登录,请先登录',
|
||||
type: 'error',
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
@ -320,8 +312,8 @@
|
||||
},
|
||||
},
|
||||
watch: { //监听
|
||||
goodsName() {
|
||||
this.pageNum = 1
|
||||
'orderTypeList.goodsName'() {
|
||||
this.orderTypeList.pageNum = 1
|
||||
this.goodsOrderinfo()
|
||||
},
|
||||
},
|
||||
@ -331,16 +323,15 @@
|
||||
// });
|
||||
},
|
||||
onShow() {
|
||||
this.pageNum = 1;
|
||||
this.orderTypeList.pageNum = 1;
|
||||
this.baseurl = baseurl;
|
||||
let that = this
|
||||
const value3 = uni.getStorageSync('Refresh');
|
||||
if (value3) {
|
||||
const Refresh = uni.getStorageSync('Refresh');
|
||||
if (Refresh) {
|
||||
that.goodsOrderinfo();
|
||||
}
|
||||
},
|
||||
onLoad(options) { //开局调用
|
||||
console.log(options, '898')
|
||||
let that = this
|
||||
const value = uni.getStorageSync('patientId');
|
||||
const value2 = uni.getStorageSync('openid');
|
||||
@ -349,7 +340,7 @@
|
||||
that.openid = value2
|
||||
if (options.orderStatus) {
|
||||
that.tabscurrent = options.toindex
|
||||
that.orderStatus = options.orderStatus
|
||||
that.orderTypeList.orderStatus = options.orderStatus
|
||||
that.goodsOrderinfo();
|
||||
} else {
|
||||
that.goodsOrderinfo();
|
||||
@ -363,7 +354,7 @@
|
||||
},
|
||||
onReachBottom() { //下滑加载
|
||||
if (this.orderlist.length >= this.total) {} else {
|
||||
this.pageNum++;
|
||||
this.orderTypeList.pageNum++;
|
||||
ssgoodsOrder(this.orderTypeList).then(res => {
|
||||
res.rows.forEach(e => {
|
||||
// e.timestamp = null
|
||||
@ -377,7 +368,7 @@
|
||||
}
|
||||
},
|
||||
onPullDownRefresh() { //下拉刷新
|
||||
this.pageNum = 1;
|
||||
this.orderTypeList.pageNum = 1;
|
||||
this.goodsOrderinfo();
|
||||
setTimeout(function() {
|
||||
uni.stopPullDownRefresh();
|
||||
|
||||
@ -1,51 +1,683 @@
|
||||
<template>
|
||||
<view class="app">
|
||||
<view class="orderitem">
|
||||
<view class="tiemitem">
|
||||
<span>2023-08-13</span><span>23:43:49</span><span @tap="consulted">待咨询</span>
|
||||
<u-navbar :is-back="false" :background="background" class="u-navbar">
|
||||
<image src="@/static/pagesB/fanhui.png" mode="" @tap="goprevious"></image>
|
||||
<view class="title" @tap="goprevious">
|
||||
专家咨询订单
|
||||
</view>
|
||||
<view class="details">
|
||||
<image src="../../static/headsculpture.png" mode=""></image>
|
||||
<view class="ppointment">
|
||||
<view class="doctorname">
|
||||
<span>齐鲁医院张先生</span><span>￥30</span>
|
||||
</view>
|
||||
<view class="reservation">
|
||||
预约时间：2023-09-08
|
||||
</view>
|
||||
<view class="hospital">
|
||||
三甲医院
|
||||
<view class="inputs">
|
||||
<i class="icon"></i>
|
||||
<input v-model="orderTypeList.goodsName" type="text" name="" id="" class="input" placeholder="搜索订单"
|
||||
placeholder-class="placeholder">
|
||||
</view>
|
||||
</u-navbar>
|
||||
<!-- <u-tabs :list="tabslist" :is-scroll="false" :current="tabscurrent" @change="tabschange" :show-bar='false'
|
||||
active-color='#26A888'></u-tabs> -->
|
||||
<view class="" v-if="total>0" style="margin-top: 80rpx;padding: 3%;">
|
||||
<view class="Apayment" v-for='(item,index) in orderlist' :key="index">
|
||||
<view class="names">店铺名称
|
||||
<image class="picture" src="../../static/huijiantou.png" mode=""></image>
|
||||
<span v-if="item.orderStatus=='WAIT_PAY'">待付款</span>
|
||||
<span v-if="item.orderStatus=='WAIT_REFUND'">退款中</span>
|
||||
<span v-if="item.orderStatus=='CANCEL'">已取消</span>
|
||||
<span
|
||||
v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType !='HEALTH_CONSULTATION'">待收货</span>
|
||||
<span
|
||||
v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType =='HEALTH_CONSULTATION'">待咨询</span>
|
||||
<span v-if="item.orderStatus=='RECEIVED_GOODS'">待评价</span>
|
||||
<span v-if="item.orderStatus=='EVALUATED'">已完成</span>
|
||||
<span v-if="item.orderStatus=='PAY'">待发货</span>
|
||||
<span v-if="item.orderStatus=='REFUNDED'">已退款</span>
|
||||
<span v-if="item.orderStatus=='WAIT_RETURNED_GOODS'">待退货</span>
|
||||
<span v-if="item.orderStatus=='RETURNED_GOODS'">退款成功</span>
|
||||
</view>
|
||||
<view class="details" @tap='goorderdetails(item)'>
|
||||
<view class="detailslist">
|
||||
<image :src="baseurl+item.personPictureUrl" mode=""
|
||||
v-if="item.orderType =='HEALTH_CONSULTATION'&&item.personPictureUrl"></image>
|
||||
<image src="@/static/pagesB/yis.png" mode=""
|
||||
v-if="item.orderType =='HEALTH_CONSULTATION'&&!item.personPictureUrl"></image>
|
||||
<image :src="baseurl+item.attributePitureUrl" mode=""
|
||||
v-if="item.orderType !='HEALTH_CONSULTATION'"></image>
|
||||
<view class="model">
|
||||
<view class="top">
|
||||
<span v-if="item.orderType =='HEALTH_CONSULTATION'">健康咨询</span>
|
||||
<span v-else>{{item.goodsName}}</span>
|
||||
<!-- <span v-if="item.orderType =='HEALTH_CONSULTATION'">￥{{item.totalPrice}}</span> -->
|
||||
<span
|
||||
v-if="item.goodsPrice&&item.orderType !='HEALTH_CONSULTATION'">￥{{item.goodsPrice}}</span>
|
||||
</view>
|
||||
<view class="bottom" v-if="item.orderType !='HEALTH_CONSULTATION'">
|
||||
<span class="box">型号：{{item.goodsAttributeName}}</span>
|
||||
<span class="box">×{{item.goodsCount}}</span>
|
||||
</view>
|
||||
<view class="refund">
|
||||
<span>
|
||||
实付款：
|
||||
</span>
|
||||
<text class="price"
|
||||
v-if="item.orderType=='DIRECT_BUY'||item.orderType =='HEALTH_CONSULTATION'">￥{{item.totalPrice}}</text>
|
||||
<text class="price"
|
||||
v-if="item.orderType=='INTEGRAL_EXCHANGE'">{{item.integralExchangeSill}}</text>
|
||||
<text class="price" v-if="item.orderType=='INTEGRAL_EXCHANGE'"
|
||||
style='padding-left: 10rpx;'>
|
||||
积分
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="bottom">
|
||||
<span>更多</span>
|
||||
<span>确认完成</span>
|
||||
<view class="anniu">
|
||||
<view class="logistics" v-if="item.orderStatus=='WAIT_REFUND'" style="background-color: coral;"
|
||||
@tap='goorderdetails(item)'>退款中
|
||||
</view>
|
||||
<view class="logistics"
|
||||
v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType !='HEALTH_CONSULTATION'"
|
||||
@tap='gologistics(item)'>查看物流
|
||||
</view>
|
||||
<view class="logistics harvest" @tap='buy(item)' v-if="item.orderStatus=='WAIT_PAY'">
|
||||
去支付</view>
|
||||
<view class="logistics harvest" @tap='Receipt(item)'
|
||||
v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType !='HEALTH_CONSULTATION'">
|
||||
确认收货</view>
|
||||
<view class="logistics harvest" @tap='Receipt(item)'
|
||||
v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType =='HEALTH_CONSULTATION'">
|
||||
咨询完成</view>
|
||||
<view class="logistics harvest" style="background-color: #60c5f1;" @tap='rate(item)'
|
||||
v-if="item.orderStatus=='RECEIVED_GOODS'">
|
||||
去评价</view>
|
||||
<view class="logistics harvest" v-if="item.orderStatus=='EVALUATED'" @tap='golookrate(item)'>
|
||||
查看评价</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="noorder" v-else>
|
||||
<u-empty mode="order" icon-size='220'></u-empty>
|
||||
</view>
|
||||
<!-- 弹框 -->
|
||||
<view class="frame">
|
||||
<u-popup v-model="show" mode="bottom" length="45%" border-radius="30" :closeable='true'>
|
||||
<view class="payment">
|
||||
<span v-if="orderNoitem.orderType =='HEALTH_CONSULTATION'">确认咨询完成了吗</span>
|
||||
<span v-else>确认收到货了吗</span>
|
||||
</view>
|
||||
<view class="chat">
|
||||
<view class="image" style="height:182rpx">
|
||||
<image :src="baseurl+img" mode="" v-if="orderNoitem.orderType !='HEALTH_CONSULTATION'"></image>
|
||||
<view class="blackground" v-if="orderNoitem.orderType !='HEALTH_CONSULTATION'">共1件</view>
|
||||
</view>
|
||||
<view class="word" v-if="orderNoitem.orderType =='HEALTH_CONSULTATION'">为了保证您的售后权益，请确认健康咨询无误后再确认完成
|
||||
</view>
|
||||
<view class="word" v-else>为了保证您的售后权益，请收到商品确认无误后再确认收货</view>
|
||||
</view>
|
||||
<view class="submits" @tap='Receipts'>确定</view>
|
||||
</u-popup>
|
||||
</view>
|
||||
<u-toast ref="uToast" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
ssgoodsOrder,
|
||||
confirmReceipt
|
||||
} from '@/api/pagesB/CommodityOrder/index.js'
|
||||
import baseurl from '@/api/baseurl.js'
|
||||
import {
|
||||
appletGoodsOrderPay
|
||||
} from '@/api/pagesB/confirmOrder/index.js'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
||||
tabslist: [
|
||||
// {
|
||||
// name: '全部',
|
||||
// orderStatus: '',
|
||||
// },
|
||||
// {
|
||||
// name: '待付款',
|
||||
// orderStatus: 'WAIT_PAY',
|
||||
// }, {
|
||||
// name: '待收货',
|
||||
// orderStatus: 'WAIT_RECEIVED_GOODS',
|
||||
// }, {
|
||||
// name: '待评价',
|
||||
// orderStatus: 'RECEIVED_GOODS',
|
||||
// },
|
||||
// {
|
||||
// name: '已完成',
|
||||
// orderStatus: 'EVALUATED',
|
||||
// },
|
||||
// {
|
||||
// name: '待咨询',
|
||||
// orderStatus: 'RECEIVED_GOODS',
|
||||
// }
|
||||
],
|
||||
tabscurrent: 0,
|
||||
background: {
|
||||
backgroundColor: '#26A888',
|
||||
},
|
||||
orderNoitem: null,
|
||||
orderTypeList: {
|
||||
patientId: '',
|
||||
orderType: 'HEALTH_CONSULTATION',
|
||||
orderStatus: 'RECEIVED_GOODS',
|
||||
// goodsOrderId: '', //
|
||||
pageSize: 15, //
|
||||
pageNum: 1, //
|
||||
goodsName: '',
|
||||
},
|
||||
openid: '',
|
||||
baseurl: '', //url
|
||||
orderlist: [], //商品订单list
|
||||
total: 0, //list长度
|
||||
show: false, //确认收获开关
|
||||
img: '', //确认收货页面图片
|
||||
orderStatus: '', //
|
||||
getCodeText: null,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 待咨询
|
||||
consulted(){
|
||||
//点击tabs
|
||||
// tabschange(index) {
|
||||
// console.log(this.tabslist)
|
||||
// this.tabscurrent = index;
|
||||
// this.orderTypeList.orderStatus = this.tabslist[index].orderStatus
|
||||
// console.log(this.orderTypeList.orderStatus, '999')
|
||||
// console.log(this.orderTypeList.orderType, '99')
|
||||
|
||||
// this.goodsOrderinfo();
|
||||
// },
|
||||
//返回上一页
|
||||
goprevious() {
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
})
|
||||
},
|
||||
//查看评价
|
||||
golookrate(item) {
|
||||
uni.navigateTo({
|
||||
url:'/pagesB/consulted/consulted'
|
||||
url: `/pagesB/lookrate/lookrate?item=${JSON.stringify(item)}`
|
||||
})
|
||||
},
|
||||
//收货
|
||||
Receipts() {
|
||||
confirmReceipt(this.orderNoitem.goOrderNo).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.$refs.uToast.show({
|
||||
title: '收货成功',
|
||||
type: 'success',
|
||||
duration: '1000'
|
||||
})
|
||||
this.show = false
|
||||
uni.setStorageSync("Refresh", 'Refresh')
|
||||
setTimeout(e => {
|
||||
uni.navigateTo({
|
||||
url: `/pagesB/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.orderNoitem)}&delta=${1}`
|
||||
})
|
||||
// uni.navigateTo({
|
||||
// url: `/pagesB/orderDetails/orderDetails?goodsOrderId=${this.orderNoitem.goodsOrderId}`
|
||||
// })
|
||||
}, 1000)
|
||||
} else {
|
||||
this.$refs.uToast.show({
|
||||
title: '收货失败',
|
||||
type: 'error',
|
||||
duration: '1000'
|
||||
})
|
||||
this.show = false
|
||||
}
|
||||
})
|
||||
},
|
||||
//支付
|
||||
buy(item) {
|
||||
let obj = {
|
||||
patientId: this.orderTypeList.patientId,
|
||||
openid: this.openid,
|
||||
orderNo: item.goOrderNo,
|
||||
orderChannel: "WECHAT_APPLET",
|
||||
paymentPrice: item.totalPrice,
|
||||
payType: "WECHAT_PAY",
|
||||
buySource: item.buySource,
|
||||
}
|
||||
var that = this
|
||||
appletGoodsOrderPay(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) {
|
||||
uni.setStorageSync("Refresh", 'Refresh')
|
||||
that.$refs.uToast.show({
|
||||
title: '支付成功',
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
url: `/pagesB/paysuccess/paysuccess?delta=${1}`
|
||||
})
|
||||
},
|
||||
fail: function(err) {
|
||||
that.$refs.uToast.show({
|
||||
title: '取消支付',
|
||||
type: 'error',
|
||||
duration: 1500,
|
||||
})
|
||||
}
|
||||
});
|
||||
} else {
|
||||
that.$refs.uToast.show({
|
||||
title: response.msg,
|
||||
type: 'error',
|
||||
duration: 2000
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
//物流页面
|
||||
gologistics(item) {
|
||||
uni.navigateTo({
|
||||
url: `/pagesB/logistics/logistics?item=${JSON.stringify(item)}`
|
||||
})
|
||||
},
|
||||
//评价
|
||||
rate(item) {
|
||||
uni.navigateTo({
|
||||
url: `/pagesB/goodsorderRate/goodsorderRate?item=${JSON.stringify(item)}&delta=${1}`
|
||||
})
|
||||
},
|
||||
//订单详情页面
|
||||
goorderdetails(item) {
|
||||
uni.navigateTo({
|
||||
url: `/pagesB/orderDetails/orderDetails?goodsOrderId=${item.goodsOrderId}`
|
||||
})
|
||||
},
|
||||
//商品订单请求
|
||||
goodsOrderinfo() {
|
||||
// this.orderTypeList.orderType = this.patientId
|
||||
console.log(this.orderTypeList, '45')
|
||||
ssgoodsOrder(this.orderTypeList).then(
|
||||
res => {
|
||||
if (res.code == 200) {
|
||||
this.orderlist = res.rows
|
||||
// this.orderlist.forEach(e => {
|
||||
// e.timestamp = null
|
||||
// var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 2)
|
||||
// var times = new Date().getTime() / 1000
|
||||
// e.timestamp = time - times
|
||||
// })
|
||||
uni.removeStorageSync('Refresh');
|
||||
this.total = res.total
|
||||
} else if (res.code == 9999) {
|
||||
this.$refs.uToast.show({
|
||||
title: '未登录,请先登录',
|
||||
type: 'error',
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
//确认收货
|
||||
Receipt(item) {
|
||||
this.orderNoitem = item
|
||||
this.img = item.attributePitureUrl
|
||||
this.show = true
|
||||
},
|
||||
},
|
||||
watch: { //监听
|
||||
'orderTypeList.goodsName'() {
|
||||
this.orderTypeList.pageNum = 1
|
||||
this.goodsOrderinfo()
|
||||
},
|
||||
},
|
||||
onReady() { //更改导航栏文字
|
||||
// uni.setNavigationBarTitle({
|
||||
// title: this.title,
|
||||
// });
|
||||
},
|
||||
onShow() {
|
||||
this.orderTypeList.pageNum = 1;
|
||||
this.baseurl = baseurl;
|
||||
let that = this
|
||||
const value3 = uni.getStorageSync('Refresh');
|
||||
if (value3) {
|
||||
that.goodsOrderinfo();
|
||||
}
|
||||
},
|
||||
onLoad(options) { //开局调用
|
||||
let that = this
|
||||
const value = uni.getStorageSync('patientId');
|
||||
const value2 = uni.getStorageSync('openid');
|
||||
if (value && value2) {
|
||||
that.orderTypeList.patientId = value
|
||||
that.openid = value2
|
||||
if (options.orderStatus) {
|
||||
console.log(options.orderStatus, '585')
|
||||
that.tabscurrent = options.toindex
|
||||
that.orderStatus = options.orderStatus
|
||||
that.goodsOrderinfo();
|
||||
} else {
|
||||
that.goodsOrderinfo();
|
||||
}
|
||||
} else {
|
||||
that.$refs.uToast.show({
|
||||
title: '未登录,请先登录',
|
||||
type: 'error',
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
onReachBottom() { //下滑加载
|
||||
if (this.orderlist.length >= this.total) {} else {
|
||||
this.orderTypeList.pageNum++;
|
||||
ssgoodsOrder(this.orderTypeList).then(res => {
|
||||
res.rows.forEach(e => {
|
||||
// e.timestamp = null
|
||||
// var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 2)
|
||||
// var times = new Date().getTime() / 1000
|
||||
// e.timestamp = time - times
|
||||
this.orderlist.push(e)
|
||||
})
|
||||
this.total = res.total
|
||||
})
|
||||
}
|
||||
},
|
||||
onPullDownRefresh() { //下拉刷新
|
||||
this.orderTypeList.pageNum = 1;
|
||||
this.goodsOrderinfo();
|
||||
setTimeout(function() {
|
||||
uni.stopPullDownRefresh();
|
||||
}, 1000);
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
@import './ExpertlookOrder.scss'
|
||||
</style>
|
||||
page {
|
||||
background-color: #F7F5F5;
|
||||
}
|
||||
|
||||
.app {
|
||||
width: 100%;
|
||||
|
||||
::v-deep .u-navbar-placeholder {
|
||||
background-color: #F7F5F5;
|
||||
z-index: 999;
|
||||
}
|
||||
|
||||
::v-deep .u-tabs {
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
// top: 200rpx;
|
||||
z-index: 999;
|
||||
background-color: #F7F5F5 !important;
|
||||
}
|
||||
|
||||
.noorder {
|
||||
margin-top: 20%;
|
||||
}
|
||||
|
||||
.u-navbar {
|
||||
display: block;
|
||||
// height: 200rpx;
|
||||
|
||||
image {
|
||||
margin: 0 4% 0 4%;
|
||||
width: 20rpx;
|
||||
height: 30rpx;
|
||||
}
|
||||
|
||||
.title {
|
||||
width: 46%;
|
||||
font-size: 34rpx;
|
||||
font-weight: 500;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.inputs {
|
||||
position: relative;
|
||||
margin-left: 4%;
|
||||
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
|
||||
width: 60%;
|
||||
height: 65rpx;
|
||||
border-radius: 20rpx;
|
||||
z-index: 999;
|
||||
background: #65c0a9;
|
||||
color: #FFFFFF;
|
||||
|
||||
.placeholder {
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.input {
|
||||
margin: 0 auto;
|
||||
position: absolute;
|
||||
height: 65rpx;
|
||||
// top: 8%;
|
||||
left: 18%;
|
||||
width: 80%;
|
||||
font-size: 26rpx;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.icon {
|
||||
background: url(@/static/pagesB/sousuo.png) no-repeat;
|
||||
width: 30rpx;
|
||||
height: 28rpx;
|
||||
background-size: cover;
|
||||
position: absolute;
|
||||
top: 28%;
|
||||
left: 4%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.submits {
|
||||
width: 501rpx;
|
||||
height: 71rpx;
|
||||
background: #26A888;
|
||||
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%;
|
||||
}
|
||||
}
|
||||
|
||||
.Apayment {
|
||||
width: 99%;
|
||||
height: 400rpx;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
|
||||
border-radius: 20rpx;
|
||||
padding: 3%;
|
||||
font-size: 30rpx;
|
||||
color: #969394;
|
||||
margin-top: 3%;
|
||||
position: relative;
|
||||
// line-height: 70rpx;
|
||||
|
||||
.anniu {
|
||||
display: flex;
|
||||
position: absolute;
|
||||
right: 3%;
|
||||
bottom: 20rpx;
|
||||
|
||||
.logistics {
|
||||
text-align: center;
|
||||
color: #ffffff;
|
||||
width: 170rpx;
|
||||
height: 60rpx;
|
||||
background: #FFFFFF;
|
||||
border: 1px solid #959595;
|
||||
border-radius: 5rpx;
|
||||
font-weight: 400;
|
||||
color: #000000;
|
||||
line-height: 60rpx;
|
||||
}
|
||||
|
||||
.harvest {
|
||||
margin-left: 10rpx;
|
||||
background: #26A888;
|
||||
color: #FFFFFF !important;
|
||||
}
|
||||
}
|
||||
|
||||
.details {
|
||||
height: 200rpx;
|
||||
position: relative;
|
||||
|
||||
.detailslist {
|
||||
|
||||
image {
|
||||
position: absolute;
|
||||
width: 182rpx;
|
||||
height: 182rpx;
|
||||
}
|
||||
|
||||
.model {
|
||||
.top {
|
||||
margin-top: 20rpx;
|
||||
height: 100rpx;
|
||||
|
||||
span:nth-child(1) {
|
||||
position: absolute;
|
||||
left: 32%;
|
||||
font-size: 32rpx;
|
||||
color: #000000;
|
||||
width: 50%;
|
||||
line-height: 40rpx;
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 2;
|
||||
overflow: hidden;
|
||||
|
||||
}
|
||||
|
||||
span:nth-child(2) {
|
||||
position: absolute;
|
||||
top: 0%;
|
||||
right: 0%;
|
||||
line-height: 40rpx;
|
||||
font-size: 32rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.bottom {
|
||||
position: absolute;
|
||||
left: 32%;
|
||||
top: 45%;
|
||||
width: 68%;
|
||||
|
||||
.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%;
|
||||
}
|
||||
}
|
||||
|
||||
.refund {
|
||||
position: absolute;
|
||||
right: 0%;
|
||||
top: 70%;
|
||||
|
||||
.price {
|
||||
font-size: 41rpx;
|
||||
color: #000000;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.names {
|
||||
width: 100%;
|
||||
border-bottom: 1rpx solid #D8D4D4;
|
||||
position: relative;
|
||||
padding-bottom: 20rpx;
|
||||
|
||||
.picture {
|
||||
width: 15rpx;
|
||||
height: 23rpx;
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
|
||||
span {
|
||||
position: absolute;
|
||||
right: 0%;
|
||||
color: #26A888;
|
||||
// line-height: 67px;
|
||||
display: inline-block;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -38,7 +38,6 @@
|
||||
<u-empty mode="order" icon-size='220' text="暂无数据"></u-empty>
|
||||
</view>
|
||||
<!-- 家医模块 评价 -->
|
||||
|
||||
<u-popup v-model="evaluateshow" mode="bottom" length="45%" border-radius="30" :closeable='true'>
|
||||
<view class="evaluateserver">
|
||||
立即评价
|
||||
@ -470,7 +469,8 @@
|
||||
height: 74rpx;
|
||||
|
||||
overflow: auto;
|
||||
span:nth-child(1) {
|
||||
|
||||
span:nth-child(1) {
|
||||
font-size: 28rpx;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
@ -68,8 +68,14 @@
|
||||
<view class="items" v-if="Soonerorlater=='after'">
|
||||
<view @tap='taptime(item,index)'
|
||||
v-for="(item ,index) in appointmentTimeList[timecurrent].afternoonList"
|
||||
:class="timeindex==index?'timeitemtap':'timeitem'">
|
||||
{{item.scheduleTimeSlot}}
|
||||
:class="timeindex==index?'timeitemtap':'timeitem'"
|
||||
:style="item.status?'':'background: #FFFFFF;color: #AAABB0;'">
|
||||
<view class="itemstext">
|
||||
{{item.scheduleTimeSlot}}
|
||||
</view>
|
||||
<view class="itemstexttwo">
|
||||
{{item.status?'(可预约)':'(不可预约)'}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -169,6 +175,7 @@
|
||||
timecurrent: 0, //时间下标
|
||||
timeindex: 0,
|
||||
appointmentTimeList: [],
|
||||
timer: null,
|
||||
formdata: {
|
||||
address: null,
|
||||
patientId: null,
|
||||
|
||||
@ -142,7 +142,7 @@
|
||||
} from '@/api/pagesB/confirmOrder/index.js'
|
||||
import {
|
||||
confirmReceipt,
|
||||
goodsOrder
|
||||
ssgoodsOrder
|
||||
} from '@/api/pagesB/CommodityOrder/index.js'
|
||||
import {
|
||||
handCloseOrder
|
||||
@ -153,16 +153,23 @@
|
||||
return {
|
||||
baseurl: '',
|
||||
order: null,
|
||||
patientId: '',
|
||||
openid: null,
|
||||
show: false, //收货
|
||||
orderStatus: '',
|
||||
pageSize: 10,
|
||||
pageNum: 1,
|
||||
timestamp: 0,
|
||||
goodsOrderId: null,
|
||||
timecount: undefined,
|
||||
Timers: null,
|
||||
orderTypeList: {
|
||||
goodsOrderId: null,
|
||||
patientId: '',
|
||||
openid: null,
|
||||
orderTypeList: [
|
||||
'INTEGRAL_EXCHANGE',
|
||||
'DIRECT_BUY',
|
||||
],
|
||||
orderStatus: '',
|
||||
pageSize: 15,
|
||||
pageNum: 1,
|
||||
goodsName: '',
|
||||
},
|
||||
}
|
||||
},
|
||||
onUnload() {
|
||||
@ -232,7 +239,7 @@
|
||||
pay() {
|
||||
var that = this
|
||||
let paydata = this.order
|
||||
paydata.openid = this.openid
|
||||
paydata.openid = this.orderTypeList.openid
|
||||
paydata.payType = "WECHAT_PAY"
|
||||
paydata.paymentPrice = this.order.totalPrice
|
||||
paydata.orderChannel = 'WECHAT_APPLET'
|
||||
@ -279,19 +286,20 @@
|
||||
})
|
||||
},
|
||||
goodsOrderinfo() {
|
||||
goodsOrder(this.patientId, this.orderStatus, this.goodsOrderId, this.pageSize, this.pageNum).then(res => {
|
||||
this.order = res.rows[0]
|
||||
var ordertimes = this.order.orderTime.replaceAll(/\-/gi, "/")
|
||||
var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2)
|
||||
var times = new Date().getTime() / 1000
|
||||
this.timestamp = time - times
|
||||
if (this.timestamp >= 0) {
|
||||
this.timecount = this.timestamp
|
||||
this.Timers = setInterval(() => {
|
||||
this.timecount--;
|
||||
}, 1000)
|
||||
}
|
||||
})
|
||||
ssgoodsOrder(this.orderTypeList).then(
|
||||
res => {
|
||||
this.order = res.rows[0]
|
||||
var ordertimes = this.order.orderTime.replaceAll(/\-/gi, "/")
|
||||
var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2)
|
||||
var times = new Date().getTime() / 1000
|
||||
this.timestamp = time - times
|
||||
if (this.timestamp >= 0) {
|
||||
this.timecount = this.timestamp
|
||||
this.Timers = setInterval(() => {
|
||||
this.timecount--;
|
||||
}, 1000)
|
||||
}
|
||||
})
|
||||
},
|
||||
//跳转售后详情
|
||||
goAftersalesdetails(item) {
|
||||
@ -305,13 +313,13 @@
|
||||
},
|
||||
onLoad(options) {
|
||||
this.baseurl = baseurl
|
||||
this.goodsOrderId = options.goodsOrderId
|
||||
this.orderTypeList.goodsOrderId = options.goodsOrderId
|
||||
let that = this
|
||||
const value = uni.getStorageSync('patientId');
|
||||
const value2 = uni.getStorageSync('openid');
|
||||
if (value && value2) {
|
||||
that.patientId = value
|
||||
that.openid = value2
|
||||
that.orderTypeList.patientId = value
|
||||
that.orderTypeList.openid = value2
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -120,7 +120,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="submits">
|
||||
<span>取消</span>
|
||||
<span @tap="cancel()">取消</span>
|
||||
<span @tap="submit(item)">提交</span>
|
||||
</view>
|
||||
</u-popup>
|
||||
@ -179,6 +179,9 @@
|
||||
},
|
||||
|
||||
methods: {
|
||||
cancel(){
|
||||
this.evaluateshow=false
|
||||
},
|
||||
submit(item) {
|
||||
console.log(this.list, '45')
|
||||
add(this.list).then(res => {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user