Skip to content

J
jd-vx-app
Commit 0cfced19 authored by 程新智's avatar 程新智 👽
Browse files
Options

适配样式

parent d3052f6f
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 102 deletions
pages/home.vue
View file @ 0cfced19
<template> <template>
<view class="appCotent" v-if="show"> <view class="appCotent" v-if="show">
<view class="index-content"> <view class="index-content">
<u-swiper :radius="0" :height="210" :list="list5" circular @change="e => current = e.current" :autoplay="true"> <u-swiper radius="0 0 0 30px" :height="210" :list="list5" circular @change="e => current = e.current" :autoplay="true">
<view slot="indicator" class="indicator"> <view slot="indicator" class="indicator">
<view class="indicator__dot" v-for="(item, index) in list5" :key="index" :class="[index === current && 'indicator__dot--active']"> <view class="indicator__dot" v-for="(item, index) in list5" :key="index" :class="[index === current && 'indicator__dot--active']">
</view> </view>
...@@ -69,30 +69,33 @@ export default { ...@@ -69,30 +69,33 @@ export default {
methods: { methods: {
getPrice() { getPrice() {
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken');
if(!token){ if (!token) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/binding/index?url=/pages/main&index=0' url: '/pages/binding/index?url=/pages/main&index=0'
}) })
return; return;
} }
let opts = { url: '/app/user/info', method: 'get' } let opts = {
this.http.httpTokenRequest(opts, {}).then(res => { url: '/app/user/info',
if (res.data.code == 200) { method: 'get'
let freeMoveFlag = res.data.data.freeMoveFlag }
if (freeMoveFlag) { this.http.httpTokenRequest(opts, {}).then(res => {
uni.showToast({ if (res.data.code == 200) {
title: "您的免费领取次数已用完", let freeMoveFlag = res.data.data.freeMoveFlag
icon: 'none', if (freeMoveFlag) {
duration: 2000, uni.showToast({
}); title: "您的免费领取次数已用完",
} else { icon: 'none',
//跳转到领取优惠卷页面 duration: 2000,
uni.navigateTo({ });
url: '/pagesA/pages/index/getPrice?orderId=' + this.freeCode.id } else {
}); //跳转到领取优惠卷页面
} uni.navigateTo({
} url: '/pagesA/pages/index/getPrice?orderId=' + this.freeCode.id
}) });
}
}
})
}, },
getMoveCode() { getMoveCode() {
let opts = { let opts = {
...@@ -143,6 +146,11 @@ export default { ...@@ -143,6 +146,11 @@ export default {
<style lang="scss"> <style lang="scss">
.index-content { .index-content {
/deep/ .u-swiper__indicator {
position: absolute;
right: 30rpx !important;
}
background-color: #f9f9f9; background-color: #f9f9f9;
height: 100%; height: 100%;
...@@ -273,10 +281,6 @@ export default { ...@@ -273,10 +281,6 @@ export default {
} }
} }
/deep/ .u-swiper__indicator {
right: 0 !important;
}
/deep/ .u-swiper { /deep/ .u-swiper {
border-radius: 0 0 0 100rpx !important; border-radius: 0 0 0 100rpx !important;
} }
...@@ -304,6 +308,7 @@ export default { ...@@ -304,6 +308,7 @@ export default {
background-color: rgba(0, 0, 0, 0.35); background-color: rgba(0, 0, 0, 0.35);
border-radius: 100%; border-radius: 100%;
width: 35px; width: 35px;
text-align: right;
@include flex; @include flex;
justify-content: center; justify-content: center;
......
pagesB/pages/move-car/myMoveCar.vue
View file @ 0cfced19
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
<image src="@/static/move-car/my-move-car4.png" /> <image src="@/static/move-car/my-move-car4.png" />
</div> </div>
<div class="top__car__phone"> <div class="top__car__phone">
<div> <div class="top__car">
{{vo.carNo}} {{vo.carNo}}
</div> </div>
<div> <div class="top__phone">
{{vo.userMobile}} {{vo.userMobile}}
</div> </div>
</div> </div>
...@@ -158,8 +158,7 @@ export default { ...@@ -158,8 +158,7 @@ export default {
} }
.top__car__phone { .top__car__phone {
width: 60%; width: 340rpx;
.top__car { .top__car {
font-size: 36rpx; font-size: 36rpx;
font-family: PingFang SC; font-family: PingFang SC;
...@@ -180,6 +179,7 @@ export default { ...@@ -180,6 +179,7 @@ export default {
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #666666; color: #666666;
padding-bottom: 50rpx;
} }
} }
......
pagesB/pages/move-car/myRecord.vue
View file @ 0cfced19
...@@ -4,36 +4,36 @@ ...@@ -4,36 +4,36 @@
--> -->
<template> <template>
<view class="appCotent"> <view class="appCotent">
<div class="myRecord"> <div class="myRecord">
<scroll-list ref="list" :option="option" @load="load"> <scroll-list ref="list" :option="option" @load="load">
<div class="record__item" v-for="(vo,inx) in items" :key="inx"> <div class="record__item" v-for="(vo,inx) in items" :key="inx">
<div class="item__top"> <div class="item__top">
<div class="top__time"> <div class="top__time">
时间:{{vo.applyDate}} 时间:{{vo.applyDate}}
</div>
<div class="top__state" :class="vo.state==='微信'?'':'phone__state'">
{{vo.confirmType=="1"?'电话':'微信'}}
</div>
</div>
<div class="item__content">
<div>
车牌号:{{vo.carNo}}
</div>
<div>
通知类型:{{type}}
</div>
<div>
挪车申请人:{{vo.applyUserMobile}}
</div>
</div>
<div class="item__btn" @click="goDetail(vo.id)">
<div>
查看详情
</div>
</div>
</div> </div>
<div class="top__state" :class="vo.state==='微信'?'':'phone__state'"> </scroll-list>
{{vo.confirmType=="1"?'电话':'微信'}}
</div>
</div>
<div class="item__content">
<div>
车牌号:{{vo.carNo}}
</div>
<div>
通知类型:{{type}}
</div>
<div>
挪车申请人:{{vo.applyUserMobile}}
</div>
</div>
<div class="item__btn" @click="goDetail(vo.id)">
<div>
查看详情
</div>
</div>
</div> </div>
</scroll-list>
</div>
</view> </view>
</template> </template>
...@@ -42,53 +42,59 @@ export default { ...@@ -42,53 +42,59 @@ export default {
data() { data() {
return { return {
option: { option: {
size: 10, size: 10,
auto: true auto: true
}, },
items: [], items: [],
type: '他人请求挪车', type: '他人请求挪车',
}; };
}, },
methods: { methods: {
// 加载数据 // 加载数据
load(paging) { load(paging) {
setTimeout(() => { setTimeout(() => {
let list = []; let list = [];
let opts = { url: '/app/moveLog/my/list?pageSize='+paging.size+'&pageNum='+paging.page, method: 'get' }; let opts = {
this.http.httpTokenRequest(opts, {}).then(res => { url: '/app/moveLog/my/list?pageSize=' + paging.size + '&pageNum=' + paging.page,
if (res.data.code == 200) { method: 'get'
list = res.data.rows };
this.items = [...this.items, ...list] this.http.httpTokenRequest(opts, {}).then(res => {
// 加载成功 参数对象{list: 当前列表,total: 数据总长度(后端查询的total)} if (res.data.code == 200) {
this.$refs.list.loadSuccess({ list = res.data.rows
list: this.items, this.items = [...this.items, ...list]
total: res.data.total // 加载成功 参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
}); this.$refs.list.loadSuccess({
} list: this.items,
}) total: res.data.total
});
}
})
// 加载失败 // 加载失败
// this.$refs.list.loadFail() // this.$refs.list.loadFail()
}, this.$u.random(100, 1000)); }, this.$u.random(100, 1000));
}, },
goDetail(id){ goDetail(id) {
//console.log(id) //console.log(id)
uni.navigateTo({ uni.navigateTo({
url: '/pagesB/pages/move-car/recordDetail?id='+id url: '/pagesB/pages/move-car/recordDetail?id=' + id
}) })
},
getMyMoveLogList() {
let opts = {
url: '/app/moveLog/my/list',
method: 'get'
};
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
this.items = res.data.rows
}
})
}, },
getMyMoveLogList(){
let opts = { url: '/app/moveLog/my/list', method: 'get' };
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
this.items = res.data.rows
}
})
},
}, },
created() { created() {
//this.getMyMoveLogList() //this.getMyMoveLogList()
}, },
} }
</script> </script>
...@@ -112,6 +118,13 @@ export default { ...@@ -112,6 +118,13 @@ export default {
padding-bottom: 30rpx; padding-bottom: 30rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
.top__time {
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 500;
color: #666666;
}
.top__state { .top__state {
background: #cfffe2; background: #cfffe2;
width: 70rpx; width: 70rpx;
......
pagesC/pages/shop/search.vue
View file @ 0cfced19
...@@ -81,7 +81,7 @@ export default { ...@@ -81,7 +81,7 @@ export default {
.list__item { .list__item {
padding: 28rpx; padding: 28rpx;
box-sizing: border-box; box-sizing: border-box;
width: 620rpx; width: 640rpx;
height: 220rpx; height: 220rpx;
background: #ffffff; background: #ffffff;
box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.16); box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.16);
......
pagesD/pages/personal/myOrder.vue
View file @ 0cfced19
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
}" itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;"> }" itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;">
</u-tabs> </u-tabs>
<scroll-list ref="list" :option="option" @load="load"> <scroll-list ref="list" :option="option" @load="load">
<div class="order__content" v-for="(item,index) in orderList"> <u-gap bgColor="transparent" height="15"></u-gap>
<div class="order__content" v-for="(item,index) in orderList" :key="index">
<div class="order__items" @click="orderDetail(item.id)" v-if="(current===0||current===1) && item.orderStatus == 10"> <div class="order__items" @click="orderDetail(item.id)" v-if="(current===0||current===1) && item.orderStatus == 10">
<div class="item"> <div class="item">
<div class="item__time"> <div class="item__time">
...@@ -313,9 +314,8 @@ export default { ...@@ -313,9 +314,8 @@ export default {
uni-view { uni-view {
background: #fff; background: #fff;
} }
.order__content { .order__content {
padding: 40rpx; padding:0 40rpx;
.order__items { .order__items {
background: #FFFFFF; background: #FFFFFF;
...@@ -370,7 +370,7 @@ export default { ...@@ -370,7 +370,7 @@ export default {
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
width: 320rpx; width: 340rpx;
padding-right: 70rpx; padding-right: 70rpx;
} }
......
pagesD/pages/personal/orderDetail.vue
View file @ 0cfced19
...@@ -209,7 +209,7 @@ export default { ...@@ -209,7 +209,7 @@ export default {
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #666666; color: #666666;
padding: 0 14rpx; padding-right: 14rpx;
} }
span:nth-of-type(2) { span:nth-of-type(2) {
...@@ -292,7 +292,7 @@ export default { ...@@ -292,7 +292,7 @@ export default {
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
width: 320rpx; width: 340rpx;
padding-right: 70rpx; padding-right: 70rpx;
} }
......
static/public.css
View file @ 0cfced19
...@@ -23,4 +23,8 @@ ...@@ -23,4 +23,8 @@
/deep/ .self__input__km span{ /deep/ .self__input__km span{
padding-left: 10rpx; padding-left: 10rpx;
width: 70rpx !important; width: 70rpx !important;
}
/deep/ .u-swiper__indicator {
position: absolute;
right: 30rpx !important;
} }
\ No newline at end of file
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