Skip to content

J
jd-vx-app
Commit 9999d200 authored by fwz's avatar fwz
Browse files
Options

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

parents 5ed0c1d1 54acd97e
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 21 deletions
pages/binding/binding.vue
View file @ 9999d200
...@@ -16,12 +16,16 @@ ...@@ -16,12 +16,16 @@
<active-form :formDate.sync="formData"></active-form> <active-form :formDate.sync="formData"></active-form>
</view> </view>
</div> </div>
<div class="login__read"> <view class="login__read">
<u-checkbox-group placement="row"> <view>
<u-checkbox :checked='checked' @change="changeBtn"></u-checkbox> <u-checkbox-group placement="row">
</u-checkbox-group> <u-checkbox :checked='checked' @change="changeBtn"></u-checkbox>
已阅读并同意<span>友众挪车牌用户协议（含隐私政策）</span>、<span>友众用户注册协议</span>、<span>友众隐私政策</span>和<span>联通账号认证服务条款</span>并使用本机号码登录 </u-checkbox-group>
</div> </view>
<view>
已阅读并同意<span @click="goArticle(1)">《用户注册服务协议》</span>、<span @click="goArticle(2)">《京东挪车牌隐私权政策》</span>
</view>
</view>
<div> <div>
<view class="subform" @click="sub">确认绑定</view> <view class="subform" @click="sub">确认绑定</view>
</div> </div>
...@@ -85,12 +89,30 @@ export default { ...@@ -85,12 +89,30 @@ export default {
}); });
} else { } else {
uni.showToast({ uni.showToast({
title: "请阅读并同意友众挪车牌用户协议", title: "请阅读并同意《用户注册服务协议》和《京东挪车牌隐私权政策》",
icon: 'none', icon: 'none',
duration: 2000, duration: 2000,
}); });
} }
}, },
// 跳转协议政策页面
goArticle(index){
let opts = { url: '', method: 'get' };
if(index == 1){
opts.url = "/app/user/registerAgreement"
}else{
opts.url = "/app/user/ofPrivacy"
}
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
let data = res.data.msg
uni.setStorageSync("articelContent",data)
uni.navigateTo({
url: '/pages/binding/article'
});
}
})
}
}, },
} }
</script> </script>
...@@ -157,12 +179,11 @@ export default { ...@@ -157,12 +179,11 @@ export default {
font-weight: 500; font-weight: 500;
color: #666666; color: #666666;
line-height: 36rpx; line-height: 36rpx;
display: flex;
span { align-items: center;
color: #444; span {
padding: 0 5rpx; color: rgb(0, 81, 255);
text-decoration: underline #444; }
}
} }
} }
</style> </style>
pages/binding/index.vue
View file @ 9999d200
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<u-checkbox-group placement="row"> <u-checkbox-group placement="row">
<u-checkbox :checked='checked' @change="changeBtn"></u-checkbox> <u-checkbox :checked='checked' @change="changeBtn"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
已阅读并同意 <span @click="goArticle(1)">《用户注册协议》</span>、<span @click="goArticle(2)">《友众隐私政策》</span>。若您的手机号未注册，将为您直接注册友众账号 已阅读并同意 <span @click="goArticle(1)">《用户注册服务协议》</span>、<span @click="goArticle(2)">《京东挪车牌隐私权政策》</span>。若您的手机号未注册，将为您直接注册友众账号
</div> </div>
</div> </div>
</view> </view>
...@@ -72,7 +72,7 @@ export default { ...@@ -72,7 +72,7 @@ export default {
//登录 //登录
checkLogin() { checkLogin() {
uni.showToast({ uni.showToast({
title: "请先阅读并同意《友众用户注册协议》、《友众隐私政策》", title: "请先阅读并同意《用户注册服务协议》、《京东挪车牌隐私权政策》",
icon: 'none', icon: 'none',
duration: 2000, duration: 2000,
}); });
......
pages/home.vue
View file @ 9999d200
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</view> </view>
</u-swiper> </u-swiper>
<u-gap bgColor="transparent" height="15"></u-gap> <u-gap bgColor="transparent" height="15"></u-gap>
<div class="content__code"> <div class="content__code" v-if="freeCode.mainImgUrl">
<div class="code__img"> <div class="code__img">
<image :src="freeCode.mainImgUrl" class="code__img"></image> <image :src="freeCode.mainImgUrl" class="code__img"></image>
</div> </div>
......
pagesA/pages/index/getPrice.vue
View file @ 9999d200
...@@ -43,7 +43,17 @@ ...@@ -43,7 +43,17 @@
<div class="select__car" @click="goLoveCar"> <div class="select__car" @click="goLoveCar">
从爱车选择 <image src="@/static/index/zhankai.png" alt=""> 从爱车选择 <image src="@/static/index/zhankai.png" alt="">
</div> </div>
<div class="add__user">
<u-checkbox-group placement="row">
<u-checkbox :checked='checked' @change="changeBtn"></u-checkbox>
</u-checkbox-group>
请先阅读并同意<span @click="goArticle">《京东挪车牌隐私权政策》</span>
</div>
</div> </div>
<div class="price__bottom"> <div class="price__bottom">
<div class="price"> <div class="price">
<div class="price__num"> <div class="price__num">
...@@ -120,9 +130,13 @@ export default { ...@@ -120,9 +130,13 @@ export default {
carId: '', carId: '',
//免费挪车码 //免费挪车码
freeCode: {}, freeCode: {},
checked:false
}; };
}, },
methods: { methods: {
changeBtn() {
this.checked = !this.checked;
},
goLoveCar() { goLoveCar() {
uni.navigateTo({ uni.navigateTo({
url: '/pagesB/pages/move-car/loveCar?price=1' url: '/pagesB/pages/move-car/loveCar?price=1'
...@@ -131,6 +145,14 @@ export default { ...@@ -131,6 +145,14 @@ export default {
getCarCode() { getCarCode() {
//跳转到获取挪车码页面 //跳转到获取挪车码页面
this.$refs.form1.validate().then(res => { this.$refs.form1.validate().then(res => {
if (!this.checked) {
uni.showToast({
title: "请同意京东挪车牌隐私权政策",
icon: 'none',
duration: 2000,
});
return
}
if (!this.model1.carInfo.id) { if (!this.model1.carInfo.id) {
let opts = { let opts = {
url: '/app/vehicleAdmin/add', url: '/app/vehicleAdmin/add',
...@@ -180,6 +202,19 @@ export default { ...@@ -180,6 +202,19 @@ export default {
} }
}) })
}, },
// 跳转协议政策页面
goArticle(){
let opts = { url: '/app/user/ofPrivacy', method: 'get' };
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
let data = res.data.msg
uni.setStorageSync("articelContent",data)
uni.navigateTo({
url: '/pages/binding/article'
});
}
})
}
}, },
onReady() { onReady() {
// 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则 // 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
...@@ -328,6 +363,22 @@ export default { ...@@ -328,6 +363,22 @@ export default {
margin-left: 10rpx; margin-left: 10rpx;
} }
} }
.add__user {
display: flex;
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 500;
color: #999999;
// padding-left: 20rpx;
margin-top: 40rpx;
margin-bottom: 60rpx;
span {
color: rgba(58, 134, 247, 1);
padding: 0 5rpx;
}
}
.price__bottom { .price__bottom {
width: 100%; width: 100%;
......
pagesB/pages/move-car/addCar.vue
View file @ 9999d200
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<u-checkbox-group placement="row"> <u-checkbox-group placement="row">
<u-checkbox :checked='checked' @change="changeBtn"></u-checkbox> <u-checkbox :checked='checked' @change="changeBtn"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
勾选同意<span>《用户服务协议》</span> 请先阅读并同意<span @click="goArticle">《京东挪车牌隐私权政策》</span>
</div> </div>
<div class="add__btn add__no__bind" @click="addCarInfo()"> <div class="add__btn add__no__bind" @click="addCarInfo()">
完成 完成
...@@ -122,7 +122,7 @@ export default { ...@@ -122,7 +122,7 @@ export default {
this.$refs.form1.validate().then(res => { this.$refs.form1.validate().then(res => {
if (!this.checked) { if (!this.checked) {
uni.showToast({ uni.showToast({
title: "请同意用户协议", title: "请同意京东挪车牌隐私权政策",
icon: 'none', icon: 'none',
duration: 2000, duration: 2000,
}); });
...@@ -148,6 +148,19 @@ export default { ...@@ -148,6 +148,19 @@ export default {
uni.$u.toast('校验失败') uni.$u.toast('校验失败')
}) })
}, },
// 跳转协议政策页面
goArticle(){
let opts = { url: '/app/user/ofPrivacy', method: 'get' };
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
let data = res.data.msg
uni.setStorageSync("articelContent",data)
uni.navigateTo({
url: '/pages/binding/article'
});
}
})
}
}, },
onReady() { onReady() {
// 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则 // 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
......
pagesB/pages/move-car/editCar.vue
View file @ 9999d200
...@@ -28,6 +28,13 @@ ...@@ -28,6 +28,13 @@
</u--form> </u--form>
</div> </div>
</div> </div>
<div class="add__user">
<u-checkbox-group placement="row">
<u-checkbox :checked='checked' @change="changeBtn"></u-checkbox>
</u-checkbox-group>
请先阅读并同意<span @click="goArticle">《京东挪车牌隐私权政策》</span>
</div>
<div class="add__btn add__no__bind" @click="editCarInfo"> <div class="add__btn add__no__bind" @click="editCarInfo">
保存 保存
...@@ -91,10 +98,14 @@ export default { ...@@ -91,10 +98,14 @@ export default {
}, },
] ]
}, },
items: [] items: [],
checked:false
}; };
}, },
methods: { methods: {
changeBtn() {
this.checked = !this.checked;
},
goBack() { goBack() {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
...@@ -118,6 +129,14 @@ export default { ...@@ -118,6 +129,14 @@ export default {
}, },
editCarInfo() { editCarInfo() {
this.$refs.form1.validate().then(res => { this.$refs.form1.validate().then(res => {
if (!this.checked) {
uni.showToast({
title: "请同意京东挪车牌隐私权政策",
icon: 'none',
duration: 2000,
});
return
}
let opts = { let opts = {
url: '/app/vehicleAdmin/edit', url: '/app/vehicleAdmin/edit',
method: 'put' method: 'put'
...@@ -161,6 +180,19 @@ export default { ...@@ -161,6 +180,19 @@ export default {
delModal() { delModal() {
this.deleteShow = true this.deleteShow = true
}, },
// 跳转协议政策页面
goArticle(){
let opts = { url: '/app/user/ofPrivacy', method: 'get' };
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
let data = res.data.msg
uni.setStorageSync("articelContent",data)
uni.navigateTo({
url: '/pages/binding/article'
});
}
})
}
}, },
onLoad(option) { onLoad(option) {
this.id = option.id this.id = option.id
...@@ -206,6 +238,21 @@ export default { ...@@ -206,6 +238,21 @@ export default {
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
} }
.add__user {
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 500;
color: #999999;
padding-left: 40rpx;
margin-top: 30rpx;
margin-bottom: 60rpx;
span {
color: rgba(58, 134, 247, 1);
padding: 0 5rpx;
}
}
.add__btn { .add__btn {
width: 670rpx; width: 670rpx;
......
pagesB/pages/move-car/scan.vue
View file @ 9999d200
...@@ -26,6 +26,13 @@ ...@@ -26,6 +26,13 @@
<car-number class="car__input" v-model="model1.carInfo.carNo"></car-number> <car-number class="car__input" v-model="model1.carInfo.carNo"></car-number>
</div> </div>
<active-form :formDate.sync="formData"></active-form> <active-form :formDate.sync="formData"></active-form>
<div class="add__user">
<u-checkbox-group placement="row">
<u-checkbox :checked='checked' @change="changeBtn"></u-checkbox>
</u-checkbox-group>
请先阅读并同意<span @click="goArticle">《京东挪车牌隐私权政策》</span>
</div>
</div> </div>
<div class="view__btn view__no__bind" @click="confirmBinding"> <div class="view__btn view__no__bind" @click="confirmBinding">
确认绑定 确认绑定
...@@ -115,9 +122,13 @@ export default { ...@@ -115,9 +122,13 @@ export default {
moveCodeInfo: {}, moveCodeInfo: {},
//选择车辆id //选择车辆id
carId: '', carId: '',
checked:false
} }
}, },
methods: { methods: {
changeBtn() {
this.checked = !this.checked;
},
// 跳转到使用说明页面 // 跳转到使用说明页面
gotoExplanation() { gotoExplanation() {
uni.navigateTo({ uni.navigateTo({
...@@ -142,6 +153,14 @@ export default { ...@@ -142,6 +153,14 @@ export default {
} }
this.moveCodeInfo.carNo = this.model1.carInfo.carNo this.moveCodeInfo.carNo = this.model1.carInfo.carNo
this.moveCodeInfo.moveCode = this.moveCode this.moveCodeInfo.moveCode = this.moveCode
if (!this.checked) {
uni.showToast({
title: "请同意京东挪车牌隐私权政策",
icon: 'none',
duration: 2000,
});
return
}
let opts = { let opts = {
url: '/app/moveCode/binding/', url: '/app/moveCode/binding/',
method: 'put' method: 'put'
...@@ -211,6 +230,20 @@ export default { ...@@ -211,6 +230,20 @@ export default {
text-decoration: underline; text-decoration: underline;
color: #3A86F7; color: #3A86F7;
} }
.add__user {
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 500;
color: #999999;
padding-left: 40rpx;
margin-bottom: 20rpx;
span {
color: rgba(58, 134, 247, 1);
padding: 0 5rpx;
}
}
.view__btn { .view__btn {
width: 670rpx; width: 670rpx;
......
pagesC/pages/shop/search.vue
View file @ 9999d200
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="list__item" v-for="(vo,inx) in items" :key="inx" @click="goDetail(vo.id)"> <div class="list__item" v-for="(vo,inx) in items" :key="inx" @click="goDetail(vo.id)">
<div class="list__img"> <div class="list__img">
<!-- <image :src="vo.img" /> --> <!-- <image :src="vo.img" /> -->
<image :src="vo.mainImgUrl" style="width: 160rpx;height: 160rpx;"></image> <image :src="vo.mainImgUrl" style="width: 160rpx;height: 160rpx;border-radius:10rpx;"></image>
</div> </div>
<div class="list__money"> <div class="list__money">
<div class="money__title"> <div class="money__title">
......
pagesD/pages/personal/myOrder.vue
View file @ 9999d200
...@@ -188,7 +188,7 @@ export default { ...@@ -188,7 +188,7 @@ export default {
}, },
onLoad: function (e) { onLoad: function (e) {
this.$nextTick(() => { this.$nextTick(() => {
this.current = Number(e.page) || 0 this.current = Number(e.current) || 0
}) })
}, },
methods: { methods: {
......
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