Skip to content

J
jd-vx-app
Commit a87ff134 authored by 肖健's avatar 肖健
Browse files
Options

Merge remote-tracking branch 'origin/dev_cd' into dev_jd

parents a1bc1902 a0de2c1c
Show whitespace changes
Inline Side-by-side
Showing with 427 additions and 392 deletions
App.vue
View file @ a87ff134
......@@ -28,7 +28,11 @@ export default {
margin: 0 auto;
min-height: 100vh;
}
body{
max-width: 750rpx;
background: #f9f9f9;
box-sizing: border-box;
}
uni-page-body {
width: 100%;
height: 100%;
......
pages/main.vue
View file @ a87ff134
......@@ -314,6 +314,7 @@
// 判断是否扫码进入
that.scene = uni.getStorageSync('scene')
console.log(that.scene,"微信扫码进入")
if (that.scene) {
//获取二维码携带的参数
//扫码后得到的参数
......@@ -372,6 +373,7 @@
//获取二维码携带的参数
//扫码后得到的参数
that.scene = decodeURIComponent(option.scene)
uni.setStorageSync('scene', that.scene)
that.http.httpTokenRequest({
url: '/app/user/check/move/code',
method: 'post'
......@@ -384,6 +386,7 @@
} else {
that.gotoBindMoveCar(that.scene);
}
uni.removeStorageSync('scene')
}else{
uni.showToast({
title: res.data.msg,
......
pages/moveCar.vue
View file @ a87ff134
<template>
<view class="appCotent" v-if="show">
<view class="" v-if="show">
<view class="moveCar">
<div class="move_car__content">
<div class="menu__top" @click="goUrl({
url: '/pagesB/pages/move-car/loveCar',
})">
<div class="menu__top" @click="goUrl({url: '/pagesB/pages/move-car/loveCar',})">
<div>
<image src="@/static/move-car/move-car1.png" />
</div>
......@@ -27,11 +23,11 @@ url: '/pagesB/pages/move-car/loveCar',
</div>
</div>
</view>
</view>
</view>
</template>
<script>
export default {
export default {
data() {
return {
show: false,
......@@ -54,13 +50,13 @@ export default {
title: "我的挪车记录"
},
],
scanClick:true, //扫一扫节流
scanClick: true, //扫一扫节流
}
},
methods: {
goUrl(vo) {
let token = uni.getStorageSync('userToken');
if(!token){
if (!token) {
// uni.navigateTo({
// url: '/pages/binding/index?url=/pages/main&index=1'
// })
......@@ -80,11 +76,11 @@ export default {
// url: vo.url
// })
//扫码
if(this.scanClick){
if (this.scanClick) {
this.scanClick = false;
setTimeout(()=>{
setTimeout(() => {
uni.scanCode({
success:(res)=> {
success: (res) => {
this.scanClick = true
let path = res.path
......@@ -100,14 +96,14 @@ export default {
}
that.http.httpTokenRequest(opts, param).then(res => {
console.log(res,"扫码通知车主")
console.log(res, "扫码通知车主")
if (res.data.code == 200) {
if (res.data.data.bindFlag) {
that.gotoMoveCar(scene)
} else {
that.gotoBindMoveCar(scene)
}
}else{
} else {
uni.showToast({
title: res.data.msg,
icon: 'none',
......@@ -126,7 +122,7 @@ export default {
this.scanClick = true
}
});
},300)
}, 300)
}
}
},
......@@ -145,7 +141,7 @@ export default {
});
},
},
onReady: function () {
onReady: function() {
uni.setNavigationBarTitle({
title: '我要挪车'
});
......@@ -155,11 +151,11 @@ export default {
this.show = true
}, 100);
},
};
};
</script>
<style lang="scss">
.moveCar {
.moveCar {
.move_car__content {
padding: 40rpx;
......@@ -269,5 +265,5 @@ export default {
}
}
}
}
}
</style>
pages/personal.vue
View file @ a87ff134
......@@ -3,8 +3,7 @@
* @Description: 个人中心
-->
<template>
<view class="appCotent" v-if="show">
<view class="content">
<view class="" v-if="show">
<view class="personal">
<div class="ps__bg">
<div class="ps__title"></div>
......@@ -57,7 +56,6 @@
<div class="ps__btn" v-if="logoutFlag" @click="loginOut">退出登录</div>
</view>
<u-gap bgColor="transparent" height="70"></u-gap>
</view>
</view>
</template>
......@@ -486,8 +484,8 @@ export default {
align-items: center;
image {
width: 27rpx;
height: 33rpx;
width: 28rpx;
height: 28rpx;
margin-right: 34rpx;
}
}
......@@ -511,45 +509,45 @@ export default {
background: rgba(0, 0, 0, .1);
}
.list__item:nth-of-type(2) {
.list__left {
image {
width: 29rpx;
height: 25rpx;
margin-right: 32rpx;
}
}
}
.list__item:nth-of-type(3) {
.list__left {
image {
width: 28rpx;
height: 28rpx;
margin-right: 33rpx;
}
}
}
.list__item:nth-of-type(4) {
.list__left {
image {
width: 28rpx;
height: 28rpx;
margin-right: 33rpx;
}
}
}
.list__item:last-child {
.list__left {
image {
width: 28rpx;
height: 28rpx;
margin-right: 33rpx;
}
}
}
// .list__item:nth-of-type(2) {
// .list__left {
// image {
// width: 29rpx;
// height: 25rpx;
// margin-right: 32rpx;
// }
// }
// }
// .list__item:nth-of-type(3) {
// .list__left {
// image {
// width: 28rpx;
// height: 28rpx;
// margin-right: 33rpx;
// }
// }
// }
// .list__item:nth-of-type(4) {
// .list__left {
// image {
// width: 28rpx;
// height: 28rpx;
// margin-right: 33rpx;
// }
// }
// }
// .list__item:last-child {
// .list__left {
// image {
// width: 28rpx;
// height: 28rpx;
// margin-right: 33rpx;
// }
// }
// }
.list__item:nth-last-of-type(1)::before {
content: '';
......
pagesB/pages/move-car/loveCar.vue
View file @ a87ff134
......@@ -36,7 +36,7 @@
<u-modal :show="deleteShow" :title="deleteTitle" :content='deleteContent'
@confirm="confirmModal" @cancel="cancelModal" showCancelButton="true"></u-modal>
</div>
<u-gap bgColor="transparent" height="60"></u-gap>
<u-gap bgColor="transparent" height="10"></u-gap>
<div class="love__btn" @click="addCar">
<image src="@/static/move-car/love-car5.png"> 添加车辆
</div>
......
pagesB/pages/move-car/myCall.vue
View file @ a87ff134
......@@ -27,9 +27,9 @@
</div>
</div>
<div class="item__btn" @click="goDetail(vo.id)">
<div>
<view>
查看详情
</div>
</view>
</div>
</div>
</scroll-list>
......@@ -191,13 +191,13 @@ export default {
font-weight: 500;
color: #999999;
>div {
>view {
width: 180rpx;
height: 56rpx;
text-align: center;
line-height: 56rpx;
border-radius: 28rpx;
border: 1rpx solid #DDDDDD;
border-radius: 50rpx;
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 500;
......
pagesB/pages/move-car/myMoveCar.vue
View file @ a87ff134
......@@ -143,13 +143,13 @@ export default {
.item__top {
display: flex;
justify-content: space-between;
margin-bottom: 44rpx;
align-items: center;
.top__img {
width: 100rpx;
height: 100rpx;
margin-right:30rpx;
image {
width: 100%;
......
pagesB/pages/move-car/myRecord.vue
View file @ a87ff134
......@@ -27,9 +27,9 @@
</div>
</div>
<div class="item__btn" @click="goDetail(vo.id)">
<div>
<view>
查看详情
</div>
</view>
</div>
</div>
</scroll-list>
......@@ -207,13 +207,13 @@ export default {
font-weight: 500;
color: #999999;
>div {
>view {
width: 180rpx;
height: 56rpx;
text-align: center;
line-height: 56rpx;
border-radius: 28rpx;
border: 1rpx solid #DDDDDD;
border-radius: 50rpx;
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 500;
......
pagesB/pages/move-car/oneMoveCar.vue
View file @ a87ff134
......@@ -37,7 +37,7 @@
open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
拨打车主电话通知
</button>
<div class="move-car__btn" @click="wechat">
<div class="move-car__btn move-car__wx" @click="wechat">
微信通知(上限{{wxMaxNum}}次)
</div>
<!-- <div class="move-car__wx">
......@@ -435,16 +435,14 @@
font-family: PingFang SC;
font-weight: 500;
color: #333333;
line-height: 100rpx;
line-height: 1.5;
width: 500rpx;
padding: 10rpx 0;
height: auto;
background: url(@/static/move-car/move-car-code4.png) no-repeat;
background-size: cover;
line-height: 40rpx;
background-size: 100% 100%;
display: flex;
box-sizing: border-box;
padding: 0 10rpx;
padding:10rpx 20rpx;
align-items: center;
justify-content: space-between;
}
......@@ -487,7 +485,6 @@
}
.moveCarMsg {
height: 454rpx;
background: #FFFFFF;
box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.2);
border-radius: 20rpx;
......@@ -502,6 +499,7 @@
color: #666666;
line-height: 39rpx;
text-align: center;
margin-bottom:40rpx;
}
.move-car__btn {
......@@ -511,25 +509,18 @@
border-radius: 8rpx;
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500;
font-weight: 700;
color: #FFFFFF;
line-height: 76rpx;
background: url(@/static/move-car/move-car-code7.png) no-repeat;
background-size: contain;
margin: 40rpx auto 30rpx auto;
background-size: 100% 100%;
margin: 80rpx auto 30rpx;
&.move-car__wx {
margin:0 auto 80rpx ;
}
}
.move-car__wx {
font-size: 26rpx;
font-family: PingFang SC;
font-weight: 500;
color: #666666;
line-height: 42rpx;
text-align: center;
margin-bottom: 100rpx;
}
.move-car__more {
font-size: 28rpx;
......
pagesB/pages/move-car/scan.vue
View file @ a87ff134
......@@ -8,23 +8,39 @@
<div class="contentMoveCar">
<div class="car_item__one">
<div class="item__content">
<view class="">
您的专属二维码编号
</view>
{{moveCode}}
</div>
</div>
<div class="car_item__three">
感谢您使用挪车二维码，请完成车牌号与手机的绑定以便享受挪车服务
<view class="">
感谢您使用挪车二维码。
</view>
请完成<text>车辆信息</text>与<text>联系方式</text>的填写以便享受挪车服务。
</div>
</div>
<div class="car_info">
<view class="select-car" @click="getCarList">
<!-- <view class="select-car" @click="getCarList">
请选择爱车 &gt;
</view>
<view class="info_list">
</view> -->
<view class="info_list" style="padding:20rpx 0;">
<view class="left">
品牌车型：
</view>
<view class="right" style="width:500rpx;">
{{carInfo ? carInfo.brand + " " + carInfo.carModel : ""}}
<view class="right info" style="width:500rpx;" v-if="carInfo" @click="getCarList">
<image :src="carInfo.logoUrl" mode=""></image>
<view>
<view>
{{carInfo.brand + "-" + carInfo.seriesName}}
</view>
{{carInfo.carModel}}
</view>
&gt;
</view>
<view class="right" style="width:500rpx;color: #E1251B;" v-else @click="getCarList">
请选择 &gt;
</view>
</view>
<!-- <view class="info_list">
......@@ -86,10 +102,10 @@
<view class="form-data">
<view class="form-item">
<view class="item-text">
联系方式：
手机号：
</view>
<view class="item-input">
<input type="number" placeholder="请输入" v-model="model1.userMobile">
<input type="number" placeholder="请输入手机号" v-model="model1.userMobile">
</view>
</view>
<view class="form-item">
......@@ -124,7 +140,7 @@
<view class="love_list">
<view v-if="carList.length != 0">
<view class="love_item" v-for="(item,i) in carList" :key="i" @click="radioChange(item)">
<image src="../../../static/move-car/love-car6.png"></image>
<image :src="item.logoUrl"></image>
<view class="love_info">
<view>
{{item.brand + "-" + item.seriesName}}
......@@ -510,7 +526,7 @@ export default {
}
.contentMoveCar {
// background-color: #fff;
padding:40rpx 40rpx 0;
.item__label {
......@@ -527,16 +543,19 @@ export default {
.item__content {
width: 500rpx;
padding:15rpx 0;
font-size: 40rpx;
font-family: PingFang SC;
font-weight: bold;
color: #F1251B;
line-height: 42rpx;
text-align: center;
line-height: 100rpx;
height: 100rpx;
background: url(@/static/move-car/move-car-code5.png) no-repeat;
background-size: contain;
background-size: 100% 100%;
view{
font-size: 30rpx;
font-weight: 500;
margin-bottom:6rpx;
}
}
.car_item__one {
......@@ -553,11 +572,16 @@ export default {
font-weight: 500;
color: #F88D28;
line-height: 36rpx;
text-indent: 2em;
padding: 30rpx;
// text-indent: 2em;
text-align: center;
box-sizing: border-box;
padding:16rpx 30rpx 26rpx;
background: url(@/static/move-car/move-car-code6.png) no-repeat;
background-size: contain;
background-size: 100% 100%;
text{
font-size: 28rpx;
font-weight: bold;
}
}
}
......@@ -634,7 +658,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: center;
border-bottom:2rpx solid rgba(0,0,0,.1);
// border-bottom:2rpx solid rgba(0,0,0,.1);
.left{
font-size: 32rpx;
......@@ -645,6 +669,25 @@ export default {
line-height: 1.8;
word-wrap:break-word;
text-align: right;
&.info{
display: flex;
align-items: center;
justify-content: flex-end;
text-align: left;
// padding:20rpx 0;
image{
max-width:48rpx;height: 48rpx;
}
>view{
margin:0 10rpx;
line-height: 1.5;
>view{
font-weight:bold;
font-size: 32rpx;
color: #333;
}
}
}
.car__input{
width: 100%;
}
......
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