Skip to content

M
million
Commit 2f5c940b authored by zhengke's avatar zhengke
Browse files
Options

修改

parent af01273d
Show whitespace changes
Inline Side-by-side
Showing with 113 additions and 36 deletions
src/components/trip/style2.vue
View file @ 2f5c940b
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
} }
.Style2_main .tour-intro { .Style2_main .tour-intro {
padding-left: 30px; padding:0 30px;
} }
.Style2_main .tour_Nmae { .Style2_main .tour_Nmae {
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
.Style2_main .tour-detail-list { .Style2_main .tour-detail-list {
padding: 0 0 20px; padding: 0 0 20px;
font-size: 14px; font-size: 16px;
color: #999; color: #999;
list-style: none; list-style: none;
} }
...@@ -73,6 +73,9 @@ ...@@ -73,6 +73,9 @@
.Style2_main { .Style2_main {
padding: 0; padding: 0;
} }
.travle_page{
width:100%!important;
}
} }
</style> </style>
......
src/pages/usercenter/demandlist.vue
View file @ 2f5c940b
...@@ -50,6 +50,9 @@ ...@@ -50,6 +50,9 @@
display: block; display: block;
padding: 20px 25px; padding: 20px 25px;
} }
.order-list{
padding:0;
}
.order-list li { .order-list li {
margin-bottom: 15px; margin-bottom: 15px;
...@@ -91,6 +94,9 @@ ...@@ -91,6 +94,9 @@
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
} }
.text-my{
color:#00afff;
}
.order-status-tag { .order-status-tag {
padding: 2px 12px; padding: 2px 12px;
...@@ -116,31 +122,41 @@ ...@@ -116,31 +122,41 @@
} }
} }
.demandlist .items-center { @media only screen and (max-width: 1200px) {
justify-content: center; .order_tour {
width: 100%!important;
padding-right:0!important;
}
} }
</style> </style>
<template> <template>
<q-page> <q-page>
<div class="demandlist"> <div class="demandlist">
<template v-if="!$q.screen.xs">
<div class="order-header"> <div class="order-header">
<div class="order_title">我的需求單</div> <div class="order_title">我的需求單</div>
<ul class="type-bar"> <q-tabs
<li class="type-item"> v-model="tab"
<a :class="{'is-acted':toPend==0}" @click="clickItem(0)">待處理</a> inline-label
</li> class="text-my"
<li class="type-item"> >
<a :class="{'is-acted':toPend==1}" @click="clickItem(1)">處理中</a> <q-tab :name="item.Type" :label="item.Type" v-for="(item,index) in TitList" @click="clickItem(item.ID)" :key="index" />
</li> </q-tabs>
<li class="type-item">
<a :class="{'is-acted':toPend==2}" @click="clickItem(2)">已完成</a>
</li>
<li class="type-item">
<a :class="{'is-acted':toPend==4}" @click="clickItem(4)">已取消</a>
</li>
</ul>
</div> </div>
</template>
<template v-if="$q.screen.xs">
<div>
<div class="order_titleMobile">我的需求單</div>
<q-tabs
v-model="tab"
inline-label
class="text-my"
>
<q-tab :name="item.Type" :label="item.Type" v-for="(item,index) in TitList" @click="clickItem(item.ID)" :key="index" />
</q-tabs>
</div>
</template>
<ul class="order-list"> <ul class="order-list">
<li v-for="(item,index) in DataList" :key="index" @click="CommonJump('/demandinfo/'+item.Id,{})"> <li v-for="(item,index) in DataList" :key="index" @click="CommonJump('/demandinfo/'+item.Id,{})">
<a class="order_link"> <a class="order_link">
...@@ -154,8 +170,11 @@ ...@@ -154,8 +170,11 @@
<div class="order-status"> <div class="order-status">
需求單編號：{{item.Id}} 需求單編號：{{item.Id}}
</div> </div>
<div class="order-status" style="margin-top:10px;" v-if="$q.screen.xs">
<div class="order-status-tag">{{item.DemandStatusStr}}</div>
</div>
</div> </div>
<div class="order-status-ch"> <div class="order-status-ch" v-if="!$q.screen.xs">
<div class="order-status-tag">{{item.DemandStatusStr}}</div> <div class="order-status-tag">{{item.DemandStatusStr}}</div>
</div> </div>
</a> </a>
...@@ -172,6 +191,7 @@ ...@@ -172,6 +191,7 @@
props: [], props: [],
data() { data() {
return { return {
tab:'待處理',
qMsg: { qMsg: {
PageIndex: 1, PageIndex: 1,
PageSize: 10, PageSize: 10,
...@@ -180,7 +200,23 @@ ...@@ -180,7 +200,23 @@
}, },
DataList: [], DataList: [],
pageCount: 0, pageCount: 0,
toPend: 0, TitList: [{
Type: "待處理",
ID: 0
},
{
Type: "處理中",
ID: 1
},
{
Type: "已完成",
ID: 2
},
{
Type: "已取消",
ID: 4
}
],
}; };
}, },
created() { created() {
...@@ -197,7 +233,6 @@ ...@@ -197,7 +233,6 @@
}, },
methods: { methods: {
clickItem(index) { clickItem(index) {
this.toPend = index;
this.qMsg.DemandStatus = index; this.qMsg.DemandStatus = index;
this.getdemandList() this.getdemandList()
}, },
......
src/pages/usercenter/orderlist.vue
View file @ 2f5c940b
...@@ -50,7 +50,9 @@ ...@@ -50,7 +50,9 @@
display: block; display: block;
padding: 20px 25px; padding: 20px 25px;
} }
.order-list{
padding:0;
}
.order-list li { .order-list li {
margin-bottom: 15px; margin-bottom: 15px;
font-size: 0; font-size: 0;
...@@ -116,22 +118,49 @@ ...@@ -116,22 +118,49 @@
} }
} }
.demandlist .items-center { .text-my{
justify-content: center; color:#00afff;
}
.order_titleMobile{
margin:20px 0 10px 0;
font-size:25px;
color:#666;
}
@media only screen and (max-width: 1200px) {
.order_tour {
width: 100%!important;
padding-right:0!important;
}
} }
</style> </style>
<template> <template>
<q-page> <q-page>
<div class="demandlist"> <div class="demandlist">
<template v-if="!$q.screen.xs">
<div class="order-header"> <div class="order-header">
<div class="order_title">我的訂單</div> <div class="order_title">我的訂單</div>
<ul class="type-bar"> <q-tabs
<li class="type-item" v-for="(item,index) in TitList" @click="handleClick(item)" :key="index"> v-model="tab"
<a :class="{'is-acted':checked==item.ID}">{{item.Type}}</a> inline-label
</li> class="text-my"
</ul> >
<q-tab :name="item.Type" :label="item.Type" v-for="(item,index) in TitList" @click="handleClick(item)" :key="index" />
</q-tabs>
</div>
</template>
<template v-if="$q.screen.xs">
<div>
<div class="order_titleMobile">我的訂單</div>
<q-tabs
v-model="tab"
inline-label
class="text-my"
>
<q-tab :name="item.Type" :label="item.Type" v-for="(item,index) in TitList" @click="handleClick(item)" :key="index" />
</q-tabs>
</div> </div>
</template>
<ul class="order-list"> <ul class="order-list">
<li v-for="(item,index) in DataList" :key="index" @click="CommonJump('/orderlistInfo/'+item.orderId,{})"> <li v-for="(item,index) in DataList" :key="index" @click="CommonJump('/orderlistInfo/'+item.orderId,{})">
<a class="order_link"> <a class="order_link">
...@@ -154,8 +183,17 @@ ...@@ -154,8 +183,17 @@
<div class="order-status"> <div class="order-status">
總額：{{item.preferPrice}} 總額：{{item.preferPrice}}
</div> </div>
<div class="order-status" style="display:block;" v-if="$q.screen.xs">
<div class="order-status-tag" style="margin-top:10px;">
<span v-if="item.orderState === 1">待付定金</span>
<span v-else-if="item.orderState === 2">待付尾款</span>
<span v-else-if="item.orderState === 3">待发团</span>
<span v-else-if="item.orderState === 4">交易完成</span>
<span v-else-if="item.orderState === 5">取消</span>
</div>
</div>
</div> </div>
<div class="order-status-ch"> <div class="order-status-ch" v-if="!$q.screen.xs">
<div class="order-status-tag"> <div class="order-status-tag">
<span v-if="item.orderState === 1">待付定金</span> <span v-if="item.orderState === 1">待付定金</span>
<span v-else-if="item.orderState === 2">待付尾款</span> <span v-else-if="item.orderState === 2">待付尾款</span>
...@@ -178,6 +216,7 @@ ...@@ -178,6 +216,7 @@
props: [], props: [],
data() { data() {
return { return {
tab:'全部',
qMsg: { qMsg: {
PageIndex: 1, PageIndex: 1,
PageSize: 10, PageSize: 10,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment