Skip to content

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

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

# Conflicts:
#	pagesA/pages/index/getCarCode.vue
parents 33ac9a73 c418433f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 834 additions and 684 deletions
App.vue
View file @ b508c001
......@@ -2,9 +2,10 @@
export default {
onLaunch: function () {
uni.hideTabBar()
}
},
onShow: function () {
uni.hideHomeButton()
},
}
</script>
......
pages/binding/index.vue
View file @ b508c001
......@@ -48,7 +48,7 @@
export default {
data() {
return {
checked: false,
checked: true,
code: "",
isCanUse: false, //默认为true
isCanUse2: false, //默认为true
......@@ -302,6 +302,7 @@ button::after {
opacity: 0.96;
letter-spacing: .5em;
margin-bottom: 32rpx;
margin-top: 200rpx;
}
.login__read {
......@@ -312,7 +313,11 @@ button::after {
font-weight: 500;
color: #666666;
line-height: 36rpx;
position: fixed;
bottom: 100rpx;
left: 0;
right: 0;
margin: 0 auto;
span {
color: rgb(0, 81, 255);
}
......
pages/home.vue
View file @ b508c001
<template>
<view class="appCotent">
<view class="appCotent" v-if="show">
<view class="index-content">
<u-swiper :radius="0" :height="210" :list="list5" circular :autoplay="false">
<u-swiper :radius="0" :height="210" :list="list5" circular @change="e => current = e.current" :autoplay="false">
<view slot="indicator" class="indicator">
<view class="indicator__dot" v-for="(item, index) in list5" :key="index" :class="[index === current && 'indicator__dot--active']">
</view>
......@@ -58,6 +58,7 @@
export default {
data() {
return {
show: false,
current: 0,
balance: "0.00",
list5: [],
......@@ -111,6 +112,11 @@ export default {
this.getMoveCode()
this.getRotationList()
},
mounted() {
setTimeout(() => {
this.show = true
}, 100);
},
onReady: function () {
uni.setNavigationBarTitle({
title: '首页'
......
pages/main.vue
View file @ b508c001
<template>
<view class="main_content">
<view class="main_content">
<index v-if="tab=='index'"></index>
<moveCar v-if="tab=='moveCar'"></moveCar>
<shop v-if="tab=='shop'"></shop>
......@@ -8,7 +8,7 @@
<view class="tabbar">
<v-tabbar :list="tabbar" style="position:fixed;bottom:0;width:100%;left:0;right:0;" @tabChange="tabChange"></v-tabbar>
</view>
</view>
</view>
</template>
<script>
......@@ -31,6 +31,7 @@ export default {
},
data() {
return {
tab: "index",
}
},
......@@ -41,8 +42,11 @@ export default {
tabbar: "tabbar"
})
},
onShow: function () {},
onShow: function () {
uni.hideHomeButton()
},
methods: {
tabChange(index) {
let that = this
switch (index) {
......@@ -56,20 +60,25 @@ export default {
uni.scanCode({
success: function (res) {
let path = res.path
if(path) {
if (path) {
let xcxIndexPath = uni.getStorageSync('xcxIndexPath')
console.info(xcxIndexPath);
if(xcxIndexPath) {
if (xcxIndexPath) {
xcxIndexPath = path.replace(xcxIndexPath, '').replace("?", '')
if(xcxIndexPath.indexOf('scene') >= 0 ) {
if (xcxIndexPath.indexOf('scene') >= 0) {
let scene = xcxIndexPath.replace('scene=', '')
let param = {code : scene}
let opts = { url: '/app/index/check/move/code', method: 'post' }
let param = {
code: scene
}
let opts = {
url: '/app/index/check/move/code',
method: 'post'
}
console.log(param);
that.http.httpTokenRequest(opts, param).then(res => {
console.info(res)
if (res.data.code == 200) {
if(res.data.data.bindFlag) {
if (res.data.data.bindFlag) {
that.gotoMoveCar(scene)
} else {
that.gotoBindMoveCar(scene)
......@@ -80,8 +89,8 @@ export default {
}
} else {
uni.showToast({
title:'扫码失败',
icon:'none',
title: '扫码失败',
icon: 'none',
})
}
}
......@@ -94,7 +103,7 @@ export default {
this.tab = 'personal'
break;
}
this.$forceUpdate();
that.$forceUpdate();
},
//跳转到挪车页面
gotoMoveCar(s) {
......
pages/moveCar.vue
View file @ b508c001
<template>
<view class="appCotent">
<view class="appCotent" v-if="show">
<view class="moveCar">
<div class="move_car__content">
<div class="menu__top" @click="goUrl({
......@@ -34,6 +34,7 @@ url: '/pagesB/pages/move-car/loveCar',
export default {
data() {
return {
show: false,
items: [{
icon: require("@/static/move-car/move-car6.png"),
url: "/pagesB/pages/move-car/oneMoveCar",
......@@ -126,7 +127,12 @@ export default {
uni.setNavigationBarTitle({
title: '我要挪车'
});
}
},
mounted() {
setTimeout(() => {
this.show = true
}, 100);
},
};
</script>
......
pages/personal.vue
View file @ b508c001
......@@ -3,7 +3,7 @@
* @Description: 个人中心
-->
<template>
<view class="appCotent">
<view class="appCotent" v-if="show">
<view class="content">
<view class="personal">
<div class="ps__bg">
......@@ -64,6 +64,7 @@
export default {
data() {
return {
show:false,
menu: [{
icon: require("@/static/my/my12.png"),
title: "我的地址",
......@@ -252,6 +253,9 @@ export default {
},
mounted() {
setTimeout(() => {
this.show=true
}, 100);
this.getUserInfo()
},
onReady: function () {
......
pages/shop.vue
View file @ b508c001
<template>
<view class="appCotent">
<scroll-view scroll-y="true" :scroll-top="scrollTop" @scroll="scroll">
<view class="appCotent" v-if="isShow">
<view>
<view class="shop">
<div class="my__search" @click='goSearch'>
......@@ -25,8 +26,7 @@
<div class="shop__list__one">
<div class="view__title">车主精选 养车必备</div>
<scroll-list ref="list" :option="option" @load="load">
<div class="list__one__items">
<div class="list__one__items" v-if="boutiqueMallList.length>0">
<div class="one__item" v-for="(vo,inx) in boutiqueMallList" :key="inx" @click="goDetail(vo.id)">
<div class="one__item__img">
<image :src="getImage(vo.mainImgUrl)" />
......@@ -40,19 +40,23 @@
</div>
</div>
</scroll-list>
</div>
</view>
<u-gap bgColor="transparent" height="60"></u-gap>
</view>
</view>
</view>
</scroll-view>
</template>
<script>
export default {
data() {
return {
isShow:false,
scrollTop: 0,
old: {
scrollTop: 0
},
option: {
size: 10,
auto: true
......@@ -70,6 +74,16 @@ export default {
}
},
methods: {
scroll: function (e) {
this.old.scrollTop = e.detail.scrollTop
console.log(this.old.scrollTop);
},
goTop() {
this.scrollTop = this.old.scrollTop
this.$nextTick(function () {
this.scrollTop = 0
});
},
// 加载数据
load(paging) {
setTimeout(() => {
......@@ -158,7 +172,13 @@ export default {
title: '精选商城'
});
},
created() {
this.goTop()
},
mounted() {
setTimeout(() => {
this.isShow = true
}, 100);
this.getMallList()
this.getRotationList()
//this.getBoutiqueMallList()
......@@ -272,9 +292,12 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
overflow: hidden;
overflow-x: scroll;
.shop__item2 {
width: 25%;
width: 24%;
margin-right:30rpx;
.item2__img {
margin-bottom: 20rpx;
......
pagesA/pages/index/getCarCode.vue
View file @ b508c001
This diff is collapsed.
pagesA/pages/index/getPrice.vue
View file @ b508c001
......@@ -98,6 +98,12 @@ export default {
message: "请填写车型",
trigger: ["blur", "change"],
},
"carInfo.mileage": {
type: "number",
required: false,
message: "请填写正确的里程数",
trigger: ["blur", "change"],
},
"carInfo.carNo": [{
min: 7,
max: 8,
......@@ -185,7 +191,6 @@ export default {
this.getMoveCode()
})
},
onLoad(e) {
this.orderId = e.orderId
......
pagesB/pages/move-car/addCar.vue
View file @ b508c001
......@@ -157,7 +157,6 @@ export default {
/deep/.u-input__content__field-wrapper__field {
text-align: right !important;
padding-right: 30rpx;
}
.u-checkbox-group {
......
pagesB/pages/move-car/editCar.vue
View file @ b508c001
......@@ -71,6 +71,12 @@ export default {
message: "请填写车型",
trigger: ["blur", "change"],
},
"carInfo.mileage": {
type: "number",
required: false,
message: "请填写正确的里程数",
trigger: ["blur", "change"],
},
"carInfo.carNo": [{
min: 7,
max: 8,
......@@ -194,7 +200,6 @@ export default {
/deep/ .u-input__content__field-wrapper__field {
text-align: right !important;
padding-right: 30rpx;
justify-content: space-evenly;
}
......
pagesD/pages/personal/addAddress.vue
View file @ b508c001
......@@ -50,7 +50,7 @@ export default {
carNumber: "",
model1: {
addressInfo: {
address : ''
address: ''
},
value: false,
},
......@@ -61,12 +61,25 @@ export default {
message: "收货人不能为空",
trigger: ["blur", "change"],
},
"addressInfo.telNumber": {
"addressInfo.telNumber": [{
type: "string",
required: true,
message: "手机号不能为空",
trigger: ["blur", "change"],
},
{
// 自定义验证函数，见上说明
validator: (rule, value, callback) => {
// 上面有说，返回true表示校验通过，返回false表示不通过
// uni.$u.test.mobile()就是返回true或者false的
return uni.$u.test.mobile(value);
},
message: '手机格式错误，请输入11位手机号',
// 触发器可以同时用blur和change
trigger: ['change', 'blur'],
}
],
"addressInfo.address": {
type: "string",
required: true,
......@@ -88,13 +101,16 @@ export default {
delta: 1
})
},
addAddress(){
addAddress() {
this.$refs.form1.validate().then(res => {
this.model1.addressInfo.defaultFlag = false
if(this.model1.value){
if (this.model1.value) {
this.model1.addressInfo.defaultFlag = true
}
let opts = { url: '/app/user/address', method: 'post' };
let opts = {
url: '/app/user/address',
method: 'post'
};
this.http.httpTokenRequest(opts, this.model1.addressInfo).then(res => {
if (res.data.code == 200) {
//添加成功
......@@ -198,6 +214,7 @@ export default {
image {
width: 34rpx;
height: 36rpx;
padding-left: 20rpx;
}
}
......
pagesD/pages/personal/ask.vue
View file @ b508c001
......@@ -4,7 +4,7 @@
-->
<template>
<view class="appCotent">
<div class="pull">
<div class="pull">
<div class="view__content">
<div class="view__title">
问题/意见描述
......@@ -24,7 +24,7 @@
<div class="view__btn view__no__bind" @click="addFeedback()">
提交
</div>
</div>
</div>
</view>
</template>
......@@ -41,15 +41,27 @@ export default {
};
},
methods: {
addFeedback(){
let opts = { url: '/app/user/feedback', method: 'post' };
addFeedback() {
let regChinese = /^[^\u4e00-\u9fa5]{0,}$/;
let checkChinese = regChinese.test(this.feedback.contact);
if(!checkChinese){
uni.showToast({
title: '请填写正确的联系方式',
icon: 'none',
})
return;
}
let opts = {
url: '/app/user/feedback',
method: 'post'
};
this.http.httpTokenRequest(opts, this.feedback).then(res => {
if (res.data.code == 200) {
uni.showToast({
title: '提交成功',
icon: 'success',
})
}else{
} else {
uni.showToast({
title: '提交失败',
icon: 'error',
......@@ -80,6 +92,7 @@ export default {
border-radius: 20rpx;
padding: 30rpx;
margin-bottom: 30rpx;
.view__title {
font-size: 32rpx;
font-family: PingFang SC;
......
pagesD/pages/personal/editAddress.vue
View file @ b508c001
......@@ -4,7 +4,7 @@
-->
<template>
<view class="appCotent">
<div class="editAddress">
<div class="editAddress">
<u-gap bgColor="transparent" height="20"></u-gap>
<div class="car_info">
......@@ -19,10 +19,10 @@
<u--input v-model="model1.addressInfo.address" placeholder="点击选择收货地址" border="none"></u--input>
<span @click.stop="getAuthorize">
<span class="app__gps">
<image src="@/static/my/gps.png" >
<image src="@/static/my/gps.png">
</span>
<span class="app__right">
<image src="@/static/my/my6.png" >
<image src="@/static/my/my6.png">
</span>
</span>
</u-form-item>
......@@ -42,7 +42,7 @@
<div class="view__btn view__back" @click="del">
删除该地址
</div>
</div>
</div>
</view>
</template>
......@@ -62,12 +62,24 @@ export default {
message: "收货人不能为空",
trigger: ["blur", "change"],
},
"addressInfo.telNumber": {
"addressInfo.telNumber": [{
type: "string",
required: true,
message: "手机号不能为空",
trigger: ["blur", "change"],
},
{
// 自定义验证函数，见上说明
validator: (rule, value, callback) => {
// 上面有说，返回true表示校验通过，返回false表示不通过
// uni.$u.test.mobile()就是返回true或者false的
return uni.$u.test.mobile(value);
},
message: '手机格式错误，请输入11位手机号',
// 触发器可以同时用blur和change
trigger: ['change', 'blur'],
}
],
"addressInfo.address": {
type: "string",
required: true,
......@@ -91,14 +103,17 @@ export default {
delta: 1
})
},
del(){
del() {
uni.showModal({
title: '提示',
content: '确定删除该地址吗？',
success: (res) => {
if (res.confirm) {
//提示删除成功
let opts = { url: '/app/user/address/' + this.id, method: 'delete' };
let opts = {
url: '/app/user/address/' + this.id,
method: 'delete'
};
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
uni.showToast({
......@@ -115,17 +130,23 @@ export default {
}
});
},
getAddress(){
let opts = { url: '/app/user/address/info/' + this.id, method: 'get' };
getAddress() {
let opts = {
url: '/app/user/address/info/' + this.id,
method: 'get'
};
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
this.model1.addressInfo = res.data.data
}
})
},
editAddress(){
editAddress() {
this.$refs.form1.validate().then(res => {
let opts = { url: '/app/user/address', method: 'put' };
let opts = {
url: '/app/user/address',
method: 'put'
};
this.http.httpTokenRequest(opts, this.model1.addressInfo).then(res => {
if (res.data.code == 200) {
//添加成功
......@@ -219,7 +240,7 @@ export default {
onLoad(option) {
this.id = option.id
},
onShow(){
onShow() {
this.getAddress()
},
......@@ -228,22 +249,26 @@ export default {
<style lang="scss" scoped>
.editAddress {
.app__gps{
.app__gps {
display: inline-block;
image{
image {
width: 34rpx;
height: 36rpx;
}
}
.app__right{
.app__right {
display: inline-block;
padding-left: 20rpx;
padding-bottom: 10rpx;
image{
image {
width: 11rpx;
height: 18rpx;
}
}
.love__btn {
height: 76rpx;
background: url('@/static/move-car/love-car4.png') no-repeat;
......@@ -258,6 +283,7 @@ export default {
margin: 0 auto;
margin-top: 40rpx;
margin-bottom: 30rpx;
image {
width: 30rpx;
height: 30rpx;
......
pagesD/pages/personal/myOrder.vue
View file @ b508c001
......@@ -6,8 +6,8 @@
<view class="appCotent">
<div class="myOrder">
<u-tabs :current='current' :list="list4" lineWidth="30" @change="changeVal" lineColor="#f56c6c" :activeStyle="{
color: '#303133',
fontWeight: 'bold',
color: 'rgba(241, 37, 27, 1)',
fontSize: '32rpx',
transform: 'scale(1.05)'
}" :inactiveStyle="{
color: '#606266',
......
pagesD/pages/personal/pull.vue
View file @ b508c001
......@@ -65,7 +65,7 @@ export default {
this.http.httpTokenRequest(opts, orderRefund).then(res => {
if (res.data.code == 200) {
uni.showToast({
title: '退款成功',
title: '退款申请成功',
icon: 'success',
})
}
......
static/.DS_Store
View file @ b508c001
No preview for this file type
store/index.js
View file @ b508c001
......@@ -32,7 +32,7 @@ const store = new Vuex.Store({
{
pagePath: '/pagesC/pages/releaseBtn/releaseBtn',
iconPath: '',
selectedIconPath: '/static/tarbar/index31.png'
selectedIconPath: ''
},
{
pagePath: '/pagesC/pages/shop/index',
......
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