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