xinyilu/xinelu-applet-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
闫晓茹 2023-10-27 17:09:58 +08:00
commit fd70992ce6
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pagesB/CommodityOrder/CommodityOrder.vue
View File

@ -68,8 +68,8 @@
</view> </view>
</view> </view>
<view class="anniu"> <view class="anniu">
<view class="logistics" v-if="item.orderStatus=='WAIT_REFUND'" style="background-color: coral;color:#fff" <view class="logistics" v-if="item.orderStatus=='WAIT_REFUND'"
@tap='goorderdetails(item)'>退款中 style="background-color: coral;color:#fff" @tap='goorderdetails(item)'>退款中
</view> </view>
<view class="logistics" <view class="logistics"
v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType !='HEALTH_CONSULTATION'" v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType !='HEALTH_CONSULTATION'"
@ -151,13 +151,14 @@
}, },
orderTypeList: { orderTypeList: {
patientId: '', patientId: '',
goodsOrderId: '',
orderTypeList: [ orderTypeList: [
'INTEGRAL_EXCHANGE', 'INTEGRAL_EXCHANGE',
'DIRECT_BUY', 'DIRECT_BUY',
], ],
orderStatus: '', orderStatus: '',
pageSize: 15, // pageSize: 15,
pageNum: 1, // pageNum: 1,
goodsName: '', goodsName: '',
}, },
orderNoitem: null, orderNoitem: null,
@ -167,12 +168,6 @@
total: 0, //list长度 total: 0, //list长度
show: false, //确认收获开关 show: false, //确认收获开关
img: '', //确认收货页面图片 img: '', //确认收货页面图片
orderStatus: '', //
goodsOrderId: '', //
pageSize: 15, //
pageNum: 1, //
goodsName: '',
getCodeText: null,
} }
}, },
methods: { methods: {
@ -331,8 +326,8 @@
this.orderTypeList.pageNum = 1; this.orderTypeList.pageNum = 1;
this.baseurl = baseurl; this.baseurl = baseurl;
let that = this let that = this
const value3 = uni.getStorageSync('Refresh'); const Refresh = uni.getStorageSync('Refresh');
if (value3) { if (Refresh) {
that.goodsOrderinfo(); that.goodsOrderinfo();
} }
}, },
@ -345,7 +340,7 @@
that.openid = value2 that.openid = value2
if (options.orderStatus) { if (options.orderStatus) {
that.tabscurrent = options.toindex that.tabscurrent = options.toindex
that.orderStatus = options.orderStatus that.orderTypeList.orderStatus = options.orderStatus
that.goodsOrderinfo(); that.goodsOrderinfo();
} else { } else {
that.goodsOrderinfo(); that.goodsOrderinfo();
@ -384,4 +379,4 @@
<style lang="scss"> <style lang="scss">
@import "./CommodityOrder.scss"; @import "./CommodityOrder.scss";
</style> </style>

10
pagesB/confirmation/confirmation.vue
View File

@ -68,8 +68,14 @@
<view class="items" v-if="Soonerorlater=='after'"> <view class="items" v-if="Soonerorlater=='after'">
<view @tap='taptime(item,index)' <view @tap='taptime(item,index)'
v-for="(item ,index) in appointmentTimeList[timecurrent].afternoonList" v-for="(item ,index) in appointmentTimeList[timecurrent].afternoonList"
:class="timeindex==index?'timeitemtap':'timeitem'"> :class="timeindex==index?'timeitemtap':'timeitem'"
{{item.scheduleTimeSlot}} :style="item.status?'':'background: #FFFFFF;color: #AAABB0;'">
<view class="itemstext">
{{item.scheduleTimeSlot}}
</view>
<view class="itemstexttwo">
{{item.status?'(可预约)':'(不可预约)'}}
</view>
</view> </view>
</view> </view>
</view> </view>