Skip to content

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

scn

parent 63e9a270
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 94 deletions
pages/binding/index.vue
View file @ fce20f06
...@@ -268,10 +268,8 @@ button::after { ...@@ -268,10 +268,8 @@ button::after {
.binding { .binding {
.login__logo { .login__logo {
padding-top: 80rpx; padding-top: 206rpx;
text-align: center; text-align: center;
padding-bottom: 100rpx;
image { image {
width: 174rpx; width: 174rpx;
height: 174rpx; height: 174rpx;
...@@ -302,7 +300,7 @@ button::after { ...@@ -302,7 +300,7 @@ button::after {
opacity: 0.96; opacity: 0.96;
letter-spacing: .5em; letter-spacing: .5em;
margin-bottom: 32rpx; margin-bottom: 32rpx;
margin-top: 200rpx; margin-top: 100rpx;
} }
.login__read { .login__read {
......
pages/shop.vue
View file @ fce20f06
...@@ -178,7 +178,7 @@ export default { ...@@ -178,7 +178,7 @@ export default {
mounted() { mounted() {
setTimeout(() => { setTimeout(() => {
this.isShow = true this.isShow = true
}, 100); }, 200);
this.getMallList() this.getMallList()
this.getRotationList() this.getRotationList()
//this.getBoutiqueMallList() //this.getBoutiqueMallList()
......
pagesA/pages/index/getCarCode.vue
View file @ fce20f06
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</div> --> </div> -->
</div> </div>
</div> </div>
<u-gap bgColor="transparent" height="100"></u-gap> <u-gap bgColor="transparent" height="160"></u-gap>
<div class="address" v-if="addressShow" @click="goAddress"> <div class="address" v-if="addressShow" @click="goAddress">
<div class="address__left"> <div class="address__left">
<div class="right__title"> <div class="right__title">
...@@ -446,7 +446,10 @@ export default { ...@@ -446,7 +446,10 @@ export default {
left: 0; left: 0;
right: 0; right: 0;
margin: 0 auto; margin: 0 auto;
justify-content: space-between;
box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.16);
border-radius: 40rpx;
border: 1rpx solid #ffeddc;
.address__left { .address__left {
width: 600rpx; width: 600rpx;
......
pagesA/pages/index/getPrice.vue
View file @ fce20f06
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</u-form-item> </u-form-item>
<u-form-item label="行驶里程" prop="carInfo.mileage" borderBottom ref="item3"> <u-form-item label="行驶里程" prop="carInfo.mileage" borderBottom ref="item3">
<div class="self__input__km"> <div class="self__input__km">
<u--input v-model="model1.carInfo.mileage" placeholder="请输入" border="none"></u--input>KM <u--input v-model="model1.carInfo.mileage" placeholder="请输入" border="none"></u--input><span>KM</span>
</div> </div>
</u-form-item> </u-form-item>
<u-form-item label="车牌号" prop="carInfo.carNo" ref="item1"> </u-form-item> <u-form-item label="车牌号" prop="carInfo.carNo" ref="item1"> </u-form-item>
......
pagesB/pages/move-car/addCar.vue
View file @ fce20f06
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</u-form-item> </u-form-item>
<u-form-item label="行驶里程" prop="carInfo.mileage" borderBottom ref="item1"> <u-form-item label="行驶里程" prop="carInfo.mileage" borderBottom ref="item1">
<div class="self__input__km"> <div class="self__input__km">
<u--input v-model="model1.carInfo.mileage" placeholder="请输入" border="none"></u--input>KM <u--input v-model="model1.carInfo.mileage" placeholder="请输入" border="none"></u--input><span>KM</span>
</div> </div>
</u-form-item> </u-form-item>
<u-form-item label="车牌号" prop="carInfo.carNo" ref="item1"> </u-form-item> <u-form-item label="车牌号" prop="carInfo.carNo" ref="item1"> </u-form-item>
......
pagesB/pages/move-car/editCar.vue
View file @ fce20f06
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</u-form-item> </u-form-item>
<u-form-item label="行驶里程" prop="carInfo.mileage" borderBottom ref="item3"> <u-form-item label="行驶里程" prop="carInfo.mileage" borderBottom ref="item3">
<div class="self__input__km"> <div class="self__input__km">
<u--input v-model="model1.carInfo.mileage" placeholder="请输入" border="none"></u--input>KM <u--input v-model="model1.carInfo.mileage" placeholder="请输入" border="none"></u--input><span>KM</span>
</div> </div>
</u-form-item> </u-form-item>
<u-form-item label="车牌号" prop="carInfo.carNo" ref="item1"> </u-form-item> <u-form-item label="车牌号" prop="carInfo.carNo" ref="item1"> </u-form-item>
......
pagesB/pages/move-car/scan.vue
View file @ fce20f06
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="contentMoveCar"> <div class="contentMoveCar">
<div class="car_item__one"> <div class="car_item__one">
<div class="item__content"> <div class="item__content">
{{moveCode}} {{moveCode}}
</div> </div>
</div> </div>
<div class="car_item__three"> <div class="car_item__three">
...@@ -19,7 +19,11 @@ ...@@ -19,7 +19,11 @@
<div class="scan__tips"> <div class="scan__tips">
<div>请填写以下信息</div> <div>请填写以下信息</div>
<div @click="goLoveCar">从爱车选择<span> <div @click="goLoveCar">从爱车选择<span>
<image src="@/static/move-car/scan_right.png" /></span></div> <image src="@/static/move-car/scan_right.png" /></span></div>
</div>
<div class="car__num__self">
<div class="car__num">车牌号：</div>
<car-number v-model="moveCodeInfo.carNo"></car-number>
</div> </div>
<active-form :formDate.sync="formData"></active-form> <active-form :formDate.sync="formData"></active-form>
</div> </div>
...@@ -32,28 +36,33 @@ ...@@ -32,28 +36,33 @@
</template> </template>
<script> <script>
import CarNumber from "@/common/codecook-carnumber/codecook-carnumber.vue";
export default { export default {
components: {
CarNumber,
},
data() { data() {
return { return {
model1: { model1: {
carInfo: {}, carInfo: {},
}, },
formData: [{ formData: [
id: "kjjns", //id必须唯一 可以是数字 // {
placeholder: "请输入", // id: "kjjns", //id必须唯一 可以是数字
label: "车牌号", // 提示输入名 // placeholder: "请输入",
type: "text", //类型 // label: "车牌号", // 提示输入名
rules: { // type: "text", //类型
name: "carNo", //字段名 即提交给后端的字段 // rules: {
value: "", // name: "carNo", //字段名 即提交给后端的字段
verify: false, //是否开启校验 // value: "",
errMess: "车牌号未填写", //校验不通过的错误提示 // verify: false, //是否开启校验
}, // errMess: "车牌号未填写", //校验不通过的错误提示
}, // },
// },
{ {
id: "kjjns", //id必须唯一 可以是数字 id: "kjjns", //id必须唯一 可以是数字
placeholder: "请输入", placeholder: "请输入",
label: "品牌", // 提示输入名 label: "品牌：", // 提示输入名
type: "text", //类型 type: "text", //类型
rules: { rules: {
name: "brand", //字段名 即提交给后端的字段 name: "brand", //字段名 即提交给后端的字段
...@@ -65,7 +74,7 @@ export default { ...@@ -65,7 +74,7 @@ export default {
{ {
id: "kjjns", //id必须唯一 可以是数字 id: "kjjns", //id必须唯一 可以是数字
placeholder: "请输入", placeholder: "请输入",
label: "车型", // 提示输入名 label: "车型：", // 提示输入名
type: "text", //类型 type: "text", //类型
rules: { rules: {
name: "carModel", //字段名 即提交给后端的字段 name: "carModel", //字段名 即提交给后端的字段
...@@ -77,7 +86,7 @@ export default { ...@@ -77,7 +86,7 @@ export default {
{ {
id: "kjjns", //id必须唯一 可以是数字 id: "kjjns", //id必须唯一 可以是数字
placeholder: "请输入", placeholder: "请输入",
label: "手机号", // 提示输入名 label: "手机号：", // 提示输入名
type: "text", //类型 type: "text", //类型
rules: { rules: {
name: "phone", //字段名 即提交给后端的字段userMobile name: "phone", //字段名 即提交给后端的字段userMobile
...@@ -89,7 +98,7 @@ export default { ...@@ -89,7 +98,7 @@ export default {
{ {
id: "uisdfjks", id: "uisdfjks",
placeholder: "请输入验证码", placeholder: "请输入验证码",
label: "验证码", label: "验证码：",
type: "text", type: "text",
// oneKeyPhone:true, // oneKeyPhone:true,
rules: { rules: {
...@@ -100,79 +109,85 @@ export default { ...@@ -100,79 +109,85 @@ export default {
}, },
}, },
], ],
//挪车码 //挪车码
moveCode: '', moveCode: '',
//绑定挪车码信息 //绑定挪车码信息
moveCodeInfo: {}, moveCodeInfo: {},
//选择车辆id //选择车辆id
carId: '', carId: '',
} }
}, },
methods: { methods: {
goLoveCar() { goLoveCar() {
uni.navigateTo({ uni.navigateTo({
url: '/pagesB/pages/move-car/loveCar?price=1' url: '/pagesB/pages/move-car/loveCar?price=1'
}); });
}, },
confirmBinding(){ confirmBinding() {
for(let i in this.formData){ for (let i in this.formData) {
let name = this.formData[i].rules.name let name = this.formData[i].rules.name
if(name == 'yzm'){ if (name == 'yzm') {
this.moveCodeInfo.verificationCode = this.formData[i].rules.value this.moveCodeInfo.verificationCode = this.formData[i].rules.value
}else if(name == 'phone'){ } else if (name == 'phone') {
this.moveCodeInfo.userMobile = this.formData[i].rules.value this.moveCodeInfo.userMobile = this.formData[i].rules.value
}else{ } else {
this.moveCodeInfo[name] = this.formData[i].rules.value this.moveCodeInfo[name] = this.formData[i].rules.value
} }
} }
//console.log(this.moveCodeInfo) //console.log(this.moveCodeInfo)
this.moveCodeInfo.moveCode = this.moveCode this.moveCodeInfo.moveCode = this.moveCode
let opts = { url: '/app/moveCode/binding/', method: 'put' }; let opts = {
this.http.httpTokenRequest(opts, this.moveCodeInfo).then(res => { url: '/app/moveCode/binding/',
if (res.data.code == 200) { method: 'put'
//展示绑定成功 };
uni.showToast({ this.http.httpTokenRequest(opts, this.moveCodeInfo).then(res => {
title: "绑定成功", if (res.data.code == 200) {
icon: "success", //展示绑定成功
}); uni.showToast({
uni.navigateTo({ title: "绑定成功",
url: '/pagesB/pages/move-car/myMoveCar' icon: "success",
}) });
}else{ uni.navigateTo({
//绑定失败，展示失败信息 url: '/pagesB/pages/move-car/myMoveCar'
uni.showToast({ })
title: res.data.msg, } else {
icon: "error", //绑定失败，展示失败信息
}); uni.showToast({
} title: res.data.msg,
}) icon: "error",
}, });
getCarInfo(){ }
if(this.carId){ })
let opts = { url: '/app/vehicleAdmin/' + this.carId, method: 'get' }; },
this.http.httpTokenRequest(opts, {}).then(res => { getCarInfo() {
if (res.data.code == 200) { if (this.carId) {
this.model1.carInfo = res.data.data let opts = {
} url: '/app/vehicleAdmin/' + this.carId,
}) method: 'get'
this.formData.forEach(e=>{ };
if(e.label == '车牌号'){ this.http.httpTokenRequest(opts, {}).then(res => {
e.rules.value = this.model1.carInfo.carNo if (res.data.code == 200) {
}else if(e.label == '品牌'){ this.model1.carInfo = res.data.data
e.rules.value = this.model1.carInfo.brand }
}else if(e.label == '车型'){ })
e.rules.value = this.model1.carInfo.carModel this.formData.forEach(e => {
if (e.label == '车牌号') {
e.rules.value = this.model1.carInfo.carNo
} else if (e.label == '品牌') {
e.rules.value = this.model1.carInfo.brand
} else if (e.label == '车型') {
e.rules.value = this.model1.carInfo.carModel
} }
}) })
console.log(this.formData) console.log(this.formData)
} }
}, },
}, },
onLoad(option) { onLoad(option) {
this.moveCode = option.moveCode this.moveCode = option.moveCode
}, },
onShow:function(){ onShow: function () {
this.getCarInfo() this.getCarInfo()
//console.log( this.$store.state.selectedCar); //console.log( this.$store.state.selectedCar);
} }
...@@ -283,6 +298,19 @@ export default { ...@@ -283,6 +298,19 @@ export default {
position: relative; position: relative;
top: -56rpx; top: -56rpx;
.car__num__self {
display: flex;
align-items: center;
justify-content: space-between;
.car__num {
width: 160rpx;
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500;
color: #666666;
}
}
.scan__tips { .scan__tips {
display: flex; display: flex;
align-items: center; align-items: center;
......
pagesD/pages/personal/addAddress.vue
View file @ fce20f06
...@@ -211,10 +211,10 @@ export default { ...@@ -211,10 +211,10 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.addAddress { .addAddress {
.app__gps { .app__gps {
padding-left: 20rpx;
image { image {
width: 34rpx; width: 34rpx;
height: 36rpx; height: 36rpx;
padding-left: 20rpx;
} }
} }
......
pagesD/pages/personal/editAddress.vue
View file @ fce20f06
...@@ -251,7 +251,7 @@ export default { ...@@ -251,7 +251,7 @@ export default {
.editAddress { .editAddress {
.app__gps { .app__gps {
display: inline-block; display: inline-block;
padding-left: 20rpx;
image { image {
width: 34rpx; width: 34rpx;
height: 36rpx; height: 36rpx;
......
pagesD/pages/personal/myOrder.vue
View file @ fce20f06
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
</div> </div>
<div class="order__btn"> <div class="order__btn">
<span @click="goCarTime(item.id)">查看物流</span> <span @click="goCarTime(item.id)">查看物流</span>
<span @click="orderDetail(item.id)">查看详情</span> <span class="btn__two" @click="orderDetail(item.id)">查看详情</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -448,6 +448,7 @@ export default { ...@@ -448,6 +448,7 @@ export default {
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #999999; color: #999999;
margin-left: 20rpx;
} }
.btn__two { .btn__two {
......
static/public.css
View file @ fce20f06
...@@ -18,4 +18,9 @@ ...@@ -18,4 +18,9 @@
.self__input__km{ .self__input__km{
display: flex; display: flex;
align-items: center; align-items: center;
} }
/deep/ .self__input__km span{
padding-left: 10rpx;
width: 70rpx !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