Browse Source

修复bug

master
前端-胡立永 2 weeks ago
parent
commit
8116423bec
4 changed files with 22 additions and 5 deletions
  1. +7
    -1
      components/active/active-item.vue
  2. +2
    -3
      pages/index/index.vue
  3. +1
    -1
      pages_order/lvyou-detail.vue
  4. +12
    -0
      pages_order/payOrder.vue

+ 7
- 1
components/active/active-item.vue View File

@ -54,7 +54,13 @@
url: '/pages_order/orderDetails'
})
},
toDetail({ id }) {
toDetail({ id, ntype }) {
if(ntype == 1){
uni.navigateTo({
url:`/pages_order/lvyou-detail?travelId=${id}`
})
return
}
uni.navigateTo({
url:`/pages_order/huodong-detail?activityId=${id}`
})


+ 2
- 3
pages/index/index.vue View File

@ -99,8 +99,7 @@
<view v-for="(item, index) in cardListData"
:key="item.id">
<active-item :cardListData="[item]" v-if="item.ntype == 0"/>
<travelList :cardListData="[item]" v-else/>
<active-item :cardListData="[item]"/>
</view>
<uv-load-more :status="status" fontSize="24rpx" dashed line />
@ -288,7 +287,7 @@
this.cardListData = [...this.cardListData, ...list1, ...list2]
this.cardListData.sort((a, b) => {
return new Date(b.startTime).getTime() - new Date(a.startTime).getTime()
return this.$dayjs(a.startTime).valueOf() - this.$dayjs(b.startTime).valueOf()
})
},
getApi(api){


+ 1
- 1
pages_order/lvyou-detail.vue View File

@ -354,7 +354,7 @@
}
}
.lv-miaoshu {
margin-top: 250rpx;
margin-top: 400rpx;
.value-box {
background: #1B1713;
border-radius: 27rpx;


+ 12
- 0
pages_order/payOrder.vue View File

@ -43,6 +43,16 @@
<uv-cell :border="false"
title="订单状态" :value="orderStatus"></uv-cell>
<uv-cell :border="false"
v-if="dataInfo.type == 0"
title="邀请码">
<template #value>
<input type="text"
style="color: #fff;"
placeholder="请输入邀请码" v-model="code"/>
</template>
</uv-cell>
</view>
</view>
@ -84,6 +94,7 @@
color:'#FF5858'
},
num : 1,
code : '',//
typeList:[
{
name:'早鸟票',
@ -144,6 +155,7 @@
this.$api('createOrderPay',{
id:this.orderId,
num : this.num,
code : this.code,
},res=>{
if(res.code === 200) {
uni.requestPaymentWxPay(res)


Loading…
Cancel
Save