Skip to content

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

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

# Conflicts:
#	pages/binding/index.vue
#	pagesB/pages/move-car/addCar.vue
#	pagesB/pages/move-car/editCar.vue
#	pagesB/pages/move-car/oneMoveCar.vue
#	pagesB/pages/move-car/scan.vue
#	pagesD/pages/personal/userInfo.vue
#	unpackage/dist/build/mp-weixin/common/active-form/active-form.wxml
#	unpackage/dist/build/mp-weixin/static/my/my15.png
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/active-form.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/checkbox-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/radio-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/radio.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/select.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/codecook-carnumber/codecook-carnumber.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/codecook-keyboard/codecook-keyboard.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-action-sheet/u-action-sheet.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-badge/u-badge.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-checkbox/u-checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-form-item/u-form-item.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-gap/u-gap.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-icon/u-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-input/u-input.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-line/u-line.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-loading-icon/u-loading-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-modal/u-modal.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-overlay/u-overlay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-popup/u-popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-search/u-search.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-status-bar/u-status-bar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-swiper/u-swiper.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-switch/u-switch.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-tabs/u-tabs.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-textarea/u-textarea.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-transition/u-transition.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/wxcomponents/custom-tarbar/custom-tarbar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/binding.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/getCarCode.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/getPrice.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/addCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/callDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/editCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/loveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/moveCarDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/myCall.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/myMoveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/myRecord.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/oneMoveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/recordDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/scan.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/pay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/payOk.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/search.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/addAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/ask.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/asking.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/carTime.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/editAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/help.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/myAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/myOrder.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/orderDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/pull.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/userInfo.js.map
#	unpackage/dist/dev/mp-weixin/common/active-form/active-form.js
#	unpackage/dist/dev/mp-weixin/common/main.wxss
#	unpackage/dist/dev/mp-weixin/common/runtime.js
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/pages/binding/binding.js
#	unpackage/dist/dev/mp-weixin/pages/binding/binding.wxml
#	unpackage/dist/dev/mp-weixin/pages/binding/index.js
#	unpackage/dist/dev/mp-weixin/pages/binding/index.wxml
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/getCarCode.js
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/getCarCode.wxml
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/getPrice.js
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/getPrice.wxml
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/getPrice.wxss
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/index.wxss
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/addCar.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/addCar.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/addCar.wxss
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/editCar.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/editCar.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/editCar.wxss
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/oneMoveCar.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/oneMoveCar.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/scan.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/scan.wxss
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/index.js
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/payOk.js
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/payOk.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/help.wxss
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/index.js
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/index.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/index.wxss
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/myOrder.js
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/orderDetail.js
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/orderDetail.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/pull.wxss
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/userInfo.js
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/userInfo.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/userInfo.wxss
#	unpackage/dist/dev/mp-weixin/static/public.css
parents 6d7e044d a49ee032
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2313 additions and 620 deletions
App.vue
View file @ da4e6101
...@@ -21,10 +21,11 @@ export default { ...@@ -21,10 +21,11 @@ export default {
} }
.appCotent { .appCotent {
height: 100%;
box-sizing: border-box; box-sizing: border-box;
background: #f9f9f9;
max-width: 750rpx; max-width: 750rpx;
margin: 0 auto; margin: 0 auto;
min-height: 100vh;
} }
uni-page-body { uni-page-body {
......
common/active-form/active-form.vue
View file @ da4e6101
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
placeholder-class="plaClass" placeholder-class="plaClass"
:placeholder="item.placeholder" :placeholder="item.placeholder"
v-model="item.rules.label" v-model="item.rules.label"
@click="formDate2[index].show = true" @click="clickFn(index)"
/> />
<view class="select-icon"> </view> <view class="select-icon"> </view>
</view> </view>
...@@ -321,6 +321,11 @@ export default { ...@@ -321,6 +321,11 @@ export default {
}, },
}, },
methods: { methods: {
clickFn(index) {
this.formDate2[index].show = true
this.$emit('clickFn', index)
},
async getphonenumber({ detail }) { async getphonenumber({ detail }) {
if (detail.errMsg === "getPhoneNumber:ok") { if (detail.errMsg === "getPhoneNumber:ok") {
console.log("detail :>> ", detail); console.log("detail :>> ", detail);
......
pages.json
View file @ da4e6101
...@@ -36,7 +36,12 @@ ...@@ -36,7 +36,12 @@
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "首页" "navigationBarTitleText": "首页",
"app-plus": {
"titleNView":{
"autoBackButton":true
}
}
} }
}, },
{ {
...@@ -59,7 +64,12 @@ ...@@ -59,7 +64,12 @@
{ {
"path": "pages/move-car/index", "path": "pages/move-car/index",
"style": { "style": {
"navigationBarTitleText": "我要挪车" "navigationBarTitleText": "我要挪车",
"app-plus": {
"titleNView":{
"autoBackButton":false
}
}
} }
}, },
{ {
...@@ -136,7 +146,12 @@ ...@@ -136,7 +146,12 @@
{ {
"path": "pages/shop/index", "path": "pages/shop/index",
"style": { "style": {
"navigationBarTitleText": "精选商城" "navigationBarTitleText": "精选商城",
"app-plus": {
"titleNView":{
"autoBackButton":false
}
}
} }
}, },
{ {
...@@ -171,8 +186,10 @@ ...@@ -171,8 +186,10 @@
{ {
"path": "pages/personal/index", "path": "pages/personal/index",
"style": { "style": {
"navigationBarTitleText": "个人中心",
"app-plus": { "app-plus": {
"titleNView": false "titleNView":{
}
} }
} }
}, },
......
pages/binding/binding.vue
View file @ da4e6101
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
</view> </view>
</div> </div>
<div class="login__read"> <div class="login__read">
<u-checkbox-group v-model="checked" placement="row"> <u-checkbox-group placement="row">
<u-checkbox activeColor="ok"></u-checkbox> <u-checkbox v-model="checked" ></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
已阅读并同意<span>京东挪车牌用户协议（含隐私政策）</span>、<span>京东用户注册协议</span>、<span>京东隐私政策</span>和<span>联通账号认证服务条款</span>并使用本机号码登录 已阅读并同意<span>京东挪车牌用户协议（含隐私政策）</span>、<span>京东用户注册协议</span>、<span>京东隐私政策</span>和<span>联通账号认证服务条款</span>并使用本机号码登录
</div> </div>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
export default { export default {
data() { data() {
return { return {
checked: [], checked: false,
formData: [{ formData: [{
id: "kjjns", //id必须唯一 可以是数字 id: "kjjns", //id必须唯一 可以是数字
placeholder: "请输入京东账号", placeholder: "请输入京东账号",
......
pages/binding/index.vue
View file @ da4e6101
<!--
* @Author: euzhi
* @Description: 登录
-->
<template> <template>
<view class="appCotent"> <view class="appCotent">
<div class="binding"> <div class="binding">
<div class="login__logo"> <div class="login__logo">
<image src="@/static/binding/logo.png"> <image src="@/static/binding/logo.png">
</div> </div>
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<!-- <view v-if="isCanUse"> <!-- <view v-if="isCanUse">
<view> <view>
<button class="login__btn" hover-class="none" type='primary' @click="getUserProfile"> <button class="login__btn" hover-class="none" type='primary' @click="getUserProfile">
微信一键登录 微信一键登录
</button> </button>
</view> </view>
</view> --> </view> -->
<view v-if="isCanUse2"> <view v-if="isCanUse2">
<view> <view>
<button class="login__btn" hover-class="none" type='primary' open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"> <button class="login__btn" hover-class="none" type='primary' open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
微信一键登录 微信一键登录
</button> </button>
</view> </view>
</view> </view>
<!-- #endif --> <!-- #endif -->
<div class="login__read"> <div class="login__read">
<u-checkbox-group v-model="nc_protocol" placement="row"> <u-checkbox-group placement="row">
<u-checkbox activeColor="green"></u-checkbox> <u-checkbox activeColor="green" v-model="checked"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
已阅读并同意 <span>《京东用户注册协议》</span>、<span>《京东隐私政策》</span>。若您的手机号未注册，将为您直接注册京东账号 已阅读并同意 <span>《京东用户注册协议》</span>、<span>《京东隐私政策》</span>。若您的手机号未注册，将为您直接注册京东账号
</div> </div>
</div> </div>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
code: "", checked: true,
isCanUse: false, //默认为true code: "",
isCanUse2: false, //默认为true isCanUse: false, //默认为true
openid: '', isCanUse2: false, //默认为true
nc_protocol : false, openid: '',
scene : "", nc_protocol : false,
} scene : "",
}, };
methods: { },
//登录 methods: {
login() { //登录
let _this = this; login() {
uni.showLoading({ let _this = this;
title: '登录中...' uni.showLoading({
}) title: '登录中...'
}, })
async wechatLogin() { },
wx.login({ async wechatLogin() {
success: (res) => { wx.login({
this.code = res.code success: (res) => {
this.wechatSession(res.code) this.code = res.code
} this.wechatSession(res.code)
}) }
}, })
//获取session_key },
async wechatSession(code) { //获取session_key
let that = this async wechatSession(code) {
let param = { let that = this
code: code, let param = {
} code: code,
let opts = { url: '/xcx/code/session', method: 'post' } }
let opts = { url: '/xcx/code/session', method: 'post' }
await that.http.httpRequest(opts, param).then(res => {
if (res.data.code == 200) { await that.http.httpRequest(opts, param).then(res => {
that.openid = res.data.data.openid if (res.data.code == 200) {
} that.openid = res.data.data.openid
}) }
}, })
//解析手机号 },
getPhoneNumber(e) { //解析手机号
let that = this getPhoneNumber(e) {
if (e.detail.errMsg == "getPhoneNumber:ok") { let that = this
that.decodePhoneLogin(e.detail) if (e.detail.errMsg == "getPhoneNumber:ok") {
} else { that.decodePhoneLogin(e.detail)
console.log("用户点击了拒绝") } else {
} console.log("用户点击了拒绝")
}, }
//解密手机号码 },
async decodePhoneLogin(detail) { //解密手机号码
let encryptedData = detail.encryptedData async decodePhoneLogin(detail) {
let iv = detail.iv let encryptedData = detail.encryptedData
let that = this let iv = detail.iv
let that = this
let param = {
code: detail.code, let param = {
openid : that.openid code: detail.code,
} openid : that.openid
let opts = { url: '/xcx/login', method: 'post' } }
let opts = { url: '/xcx/login', method: 'post' }
await that.http.httpRequest(opts, param).then(res => {
if (res.data.code == 200) { await that.http.httpRequest(opts, param).then(res => {
uni.showToast({ if (res.data.code == 200) {
title:'授权成功', uni.showToast({
duration:1500 title:'授权成功',
}) duration:1500
uni.setStorageSync("userToken", res.data.data.token) })
uni.setStorageSync("userToken", res.data.data.token)
if(this.scene) {
this.gotoMoveCar(); if(this.scene) {
} else { this.gotoMoveCar();
//跳转到绑定页面 } else {
this.gotoIndex() //跳转到绑定页面
} this.gotoIndex()
}
} else {
uni.showToast({ } else {
title:'授权失败', uni.showToast({
icon:'none', title:'授权失败',
}) icon:'none',
} })
}) }
})
},
gotoIndex() { },
//跳转到绑定页面 gotoIndex() {
uni.reLaunch({ //信息更新成功后跳转到小程序首页 //跳转到绑定页面
url: '/pages/binding/binding' uni.reLaunch({ //信息更新成功后跳转到小程序首页
}) url: '/pages/binding/binding'
})
// uni.navigateTo({
// url: '/pages/binding/binding' // uni.navigateTo({
// }); // url: '/pages/binding/binding'
// });
},
//调整到挪车页面 },
gotoMoveCar(scene) { //调整到挪车页面
uni.navigateTo({ gotoMoveCar(scene) {
url: '/pagesB/pages/move-car/oneMoveCar?scene=' + scene uni.navigateTo({
}); url: '/pagesB/pages/move-car/oneMoveCar?scene=' + scene
}, });
}, },
onLoad(e) { //默认加载 },
// #ifdef MP-WEIXIN onLoad(e) { //默认加载
if(e.query) { // #ifdef MP-WEIXIN
//获取二维码携带的参数 if(e.query) {
//扫码后得到的参数 //获取二维码携带的参数
let scene = decodeURIComponent(e.query.scene) //扫码后得到的参数
// scene = scene.split('&') let scene = decodeURIComponent(e.query.scene)
// let data = { // scene = scene.split('&')
// //场景值 // let data = {
// scene: e.scene // //场景值
// } // scene: e.scene
// }
this.scene = scene;
} this.scene = scene;
}
this.wechatLogin()
this.wechatLogin()
let userToken = uni.getStorageSync('userToken')
if (userToken) { let userToken = uni.getStorageSync('userToken')
let that = this if (userToken) {
let opts = { url: '/app/user/info', method: 'get' } let that = this
let opts = { url: '/app/user/info', method: 'get' }
that.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) { that.http.httpTokenRequest(opts, {}).then(res => {
if(this.scene) { if (res.data.code == 200) {
this.gotoMoveCar(); if(this.scene) {
} else { this.gotoMoveCar();
this.gotoIndex() } else {
} this.gotoIndex()
}
} else {
uni.showToast({ } else {
title:'授权失败', uni.showToast({
icon:'none', title:'授权失败',
}) icon:'none',
this.isCanUse2 = true })
} this.isCanUse2 = true
}) }
} else { })
this.isCanUse2 = true } else {
} this.isCanUse2 = true
// #endif }
} // #endif
}
} }
</script> </script>
......
pagesA/pages/index/getCarCode.vue
View file @ da4e6101
...@@ -4,86 +4,86 @@ ...@@ -4,86 +4,86 @@
--> -->
<template> <template>
<view class="appCotent"> <view class="appCotent">
<div class="getCarCode"> <div class="getCarCode">
<div class="get__content"> <div class="get__content">
<div class="address" v-if="addressShow"> <div class="address" v-if="addressShow">
<div class="address__left"> <div class="address__left">
<div class="right__title"> <div class="right__title" @click="geMap">
北京市朝阳区李家董镇太阳宫社区大唐公寓 2号楼3单元303 北京市朝阳区李家董镇太阳宫社区大唐公寓 2号楼3单元303
</div>
<div class="right__phone">
<span>默认</span> <span>我是收货人</span><span>19963353323</span>
</div>
</div> </div>
<div class="right__phone"> <div class="address__right">
<span>默认</span> <span>我是收货人</span><span>19963353323</span> <image src="@/static/index/right.png" />
</div> </div>
<u-gap bgColor="transparent" height="15"></u-gap>
</div> </div>
<div class="address__right"> <div v-else class="add__address" @click="addAddress">
<image src="@/static/index/right.png" /> <image src="@/static/index/get-car-code5.png"> 添加收货地址
</div> </div>
<u-gap bgColor="transparent" height="15"></u-gap> <u-gap bgColor="transparent" height="15"></u-gap>
</div> <div class="content__code">
<div v-else class="add__address" @click="addAddress"> <div class="code__img"></div>
<image src="@/static/index/get-car-code5.png"> 添加收货地址 <div class="code__money">
</div> <div class="money__title">
<u-gap bgColor="transparent" height="15"></u-gap> <text>二维码挪车贴-经典样式</text>
<div class="content__code"> </div>
<div class="code__img"></div> <div class="code__tips">
<div class="code__money"> <text>静电贴材质 7.1cm*8.9cm</text>
<div class="money__title"> </div>
<text>二维码挪车贴-经典样式</text> <div class="money__num">
</div> <text class="num__one">￥0.00</text>
<div class="code__tips"> </div>
<text>静电贴材质 7.1cm*8.9cm</text>
</div>
<div class="money__num">
<text class="num__one">￥0.00</text>
</div> </div>
</div> </div>
</div>
<u-gap bgColor="transparent" height="20"></u-gap>
<div class="content__list">
<div class="list__title">
超低价养车好物
</div>
<u-gap bgColor="transparent" height="20"></u-gap> <u-gap bgColor="transparent" height="20"></u-gap>
<div class="list"> <div class="content__list">
<div class="list__item" v-for="(vo,inx) in items" :key="inx"> <div class="list__title">
<div class="list__img"> 超低价养车好物
<!-- <image :src="vo.img" /> --> </div>
</div> <u-gap bgColor="transparent" height="20"></u-gap>
<div class="list__money"> <div class="list">
<div class="money__title"> <div class="list__item" v-for="(vo,inx) in items" :key="inx">
<text>{{vo.title}}</text> <div class="list__img">
<!-- <image :src="vo.img" /> -->
</div> </div>
<div class="code__tips"> <div class="list__money">
<text>{{vo.tip}}</text> <div class="money__title">
<text>{{vo.title}}</text>
</div>
<div class="code__tips">
<text>{{vo.tip}}</text>
</div>
<div class="money__num">
<text class="num__one">¥{{vo.price2}}</text>
<text class="num__two">¥{{vo.price2}}</text>
</div>
</div> </div>
<div class="money__num"> <div class="list__add" @click="add">
<text class="num__one">¥{{vo.price2}}</text> <image src="@/static/index/get-car-code2.png" />
<text class="num__two">¥{{vo.price2}}</text>
</div> </div>
</div> </div>
<div class="list__add">
<image src="@/static/index/get-car-code2.png" />
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <u-modal :show="show" :content='content' @confirm='show = false'></u-modal>
<u-modal :show="show" :content='content' @confirm='show = false'></u-modal> <u-gap bgColor="transparent" height="65"></u-gap>
<u-gap bgColor="transparent" height="65"></u-gap> <div class="price__bottom">
<div class="price__bottom"> <div class="price">
<div class="price"> <div class="price__num">
<div class="price__num"> 共<span>{{nums}}</span>件
共<span>1</span>件 </div>
<div class="price__all">
合计<span class="num__two">￥00.00</span>
</div>
</div> </div>
<div class="price__all"> <div class="price__next" @click="pay">
合计<span class="num__two">￥00.00</span> 立即支付
</div> </div>
</div> </div>
<div class="price__next" @click="pay">
立即支付
</div>
</div> </div>
</div>
</view> </view>
</template> </template>
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
export default { export default {
data() { data() {
return { return {
nums:0,
show: false, show: false,
addressShow: false, addressShow: false,
content: "地址不能为空", content: "地址不能为空",
...@@ -119,9 +120,21 @@ export default { ...@@ -119,9 +120,21 @@ export default {
} }
}, },
methods: { methods: {
getMap() {
uni.getLocation({
type: 'wgs84',
success: function (res) {
console.log('当前位置的经度：' + res.longitude);
console.log('当前位置的纬度：' + res.latitude);
}
});
},
pay() { pay() {
this.show = true this.show = true
}, },
add(){
this.nums++
},
addAddress() { addAddress() {
this.addressShow = !this.addressShow this.addressShow = !this.addressShow
} }
......
pagesA/pages/index/getPrice.vue
View file @ da4e6101
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
<u--input class="self__input" v-model="model1.userInfo.name" placeholder="请输入" border="none"></u--input> <u--input class="self__input" v-model="model1.userInfo.name" placeholder="请输入" border="none"></u--input>
</u-form-item> </u-form-item>
<u-form-item label="行驶里程" prop="userInfo.name" borderBottom ref="item1"> <u-form-item label="行驶里程" prop="userInfo.name" borderBottom ref="item1">
<u--input class="self__input" v-model="model1.userInfo.name" placeholder="请输入" border="none"></u--input>KM <div class="self__input__km">
<u--input class="self__input" v-model="model1.userInfo.name" placeholder="请输入" border="none"></u--input><span>KM</span>
</div>
</u-form-item> </u-form-item>
<u-form-item label="车牌号" ref="item1"> </u-form-item> <u-form-item label="车牌号" ref="item1"> </u-form-item>
<car-number v-model="carNumber"></car-number> <car-number v-model="carNumber"></car-number>
...@@ -110,9 +112,16 @@ export default { ...@@ -110,9 +112,16 @@ export default {
.getPrice { .getPrice {
width: 100%; width: 100%;
height: 100%; height: 100%;
.uni-input-input,
/deep/.uni-input-input,
.uni-input-placeholder { .uni-input-placeholder {
text-indent: 300rpx; text-indent: 300rpx;
text-align: right;
}
.self__input__km {
display: flex;
align-items: center;
} }
.content__code { .content__code {
......
pagesA/pages/index/index.vue
View file @ da4e6101
...@@ -202,7 +202,7 @@ export default { ...@@ -202,7 +202,7 @@ export default {
.code__get { .code__get {
position: absolute; position: absolute;
right: -45rpx; right: -60rpx;
width: 90rpx; width: 90rpx;
height: 90rpx; height: 90rpx;
font-size: 28rpx; font-size: 28rpx;
......
pagesB/pages/move-car/addCar.vue
View file @ da4e6101
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
填写车辆信息 填写车辆信息
</div> </div>
<div> <div>
<u--form labelPosition="left" :model="model1" ref="form1" labelWidth="100"> <u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="100">
<u-form-item label="品牌" prop="carInfo.brand" borderBottom ref="item1"> <u-form-item label="品牌" prop="carInfo.brand" borderBottom ref="item1">
<u--input v-model="model1.carInfo.brand" placeholder="请输入" border="none"></u--input> <u--input v-model="model1.carInfo.brand" placeholder="请输入" border="none"></u--input>
</u-form-item> </u-form-item>
...@@ -18,17 +18,18 @@ ...@@ -18,17 +18,18 @@
<u--input v-model="model1.carInfo.carModel" placeholder="请输入" border="none"></u--input> <u--input v-model="model1.carInfo.carModel" placeholder="请输入" border="none"></u--input>
</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">
<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>KM
</div>
</u-form-item> </u-form-item>
<u-form-item label="车牌号" prop="carInfo.carNo" ref="item1"> <u-form-item label="车牌号" prop="carInfo.carNo" ref="item1"> </u-form-item>
<car-number v-model="model1.carInfo.carNo"></car-number> <car-number v-model="model1.carInfo.carNo"></car-number>
</u-form-item>
</u--form> </u--form>
</div> </div>
</div> </div>
<div class="add__user"> <div class="add__user">
<u-checkbox-group v-model="checked" placement="row"> <u-checkbox-group placement="row">
<u-checkbox activeColor="ok"></u-checkbox> <u-checkbox v-model="checked"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
勾选同意<span>《用户服务协议》</span> 勾选同意<span>《用户服务协议》</span>
</div> </div>
...@@ -47,6 +48,7 @@ export default { ...@@ -47,6 +48,7 @@ export default {
}, },
data() { data() {
return { return {
checked:false,
model1: { model1: {
carInfo: { carInfo: {
brand: '', brand: '',
...@@ -126,14 +128,16 @@ export default { ...@@ -126,14 +128,16 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.addCar { .addCar {
padding: 40rpx 0rpx; padding: 40rpx 0rpx;
.uni-input-input, /deep/.u-input__content__field-wrapper__field{
.uni-input-placeholder { text-align: right !important;
text-indent: 300rpx; padding-right: 30rpx;
} }
.u-checkbox-group { .u-checkbox-group {
display: inline-block !important; display: inline-block !important;
} }
/deep/.u-checkbox-group--row {
/deep/.u-checkbox-group--row {
display: inline-block !important; display: inline-block !important;
} }
...@@ -169,6 +173,7 @@ export default { ...@@ -169,6 +173,7 @@ export default {
padding-left: 40rpx; padding-left: 40rpx;
margin-top: 30rpx; margin-top: 30rpx;
margin-bottom: 60rpx; margin-bottom: 60rpx;
span { span {
color: rgba(58, 134, 247, 1); color: rgba(58, 134, 247, 1);
padding: 0 5rpx; padding: 0 5rpx;
......
pagesB/pages/move-car/editCar.vue
View file @ da4e6101
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
填写车辆信息 填写车辆信息
</div> </div>
<div> <div>
<u--form labelPosition="left" :model="model1" ref="form1" labelWidth="100"> <u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="100">
<u-form-item label="品牌" prop="carInfo.brand" borderBottom ref="item1"> <u-form-item label="品牌" prop="carInfo.brand" borderBottom ref="item1">
<u--input v-model="model1.carInfo.brand" placeholder="请输入" border="none"></u--input> <u--input v-model="model1.carInfo.brand" placeholder="请输入" border="none"></u--input>
</u-form-item> </u-form-item>
...@@ -18,11 +18,12 @@ ...@@ -18,11 +18,12 @@
<u--input v-model="model1.carInfo.carModel" placeholder="请输入" border="none"></u--input> <u--input v-model="model1.carInfo.carModel" placeholder="请输入" border="none"></u--input>
</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">
<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>KM
</div>
</u-form-item> </u-form-item>
<u-form-item label="车牌号" prop="carInfo.carNo" ref="item1"> <u-form-item label="车牌号" prop="carInfo.carNo" ref="item1"> </u-form-item>
<car-number v-model="model1.carInfo.carNo"></car-number> <car-number v-model="model1.carInfo.carNo"></car-number>
</u-form-item>
</u--form> </u--form>
</div> </div>
</div> </div>
...@@ -45,8 +46,8 @@ export default { ...@@ -45,8 +46,8 @@ export default {
}, },
data() { data() {
return { return {
//车辆id //车辆id
id: '', id: '',
model1: { model1: {
carInfo: {}, carInfo: {},
}, },
...@@ -98,51 +99,52 @@ export default { ...@@ -98,51 +99,52 @@ export default {
delta: 1 delta: 1
}) })
}, },
getCarInfo(){ getCarInfo(){
let opts = { url: '/app/vehicleAdmin/' + this.id, method: 'get' }; let opts = { url: '/app/vehicleAdmin/' + this.id, method: 'get' };
this.http.httpTokenRequest(opts, {}).then(res => { this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.model1.carInfo = res.data.data this.model1.carInfo = res.data.data
console.log(this.model1.carInfo) console.log(this.model1.carInfo)
}else{ }else{
//展示删除失败 //展示删除失败
} }
}) })
}, },
editCarInfo(){ editCarInfo(){
this.$refs.form1.validate().then(res => { this.$refs.form1.validate().then(res => {
let opts = { url: '/app/vehicleAdmin/edit', method: 'put' }; let opts = { url: '/app/vehicleAdmin/edit', method: 'put' };
this.http.httpTokenRequest(opts, this.model1.carInfo).then(res => { this.http.httpTokenRequest(opts, this.model1.carInfo).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
//添加成功 //添加成功
uni.$u.toast('修改成功') uni.$u.toast('修改成功')
this.goBack() this.goBack()
} }
}) })
}).catch(errors => { }).catch(errors => {
uni.$u.toast('校验失败') uni.$u.toast('校验失败')
}) })
}, },
}, },
onLoad(option) { onLoad(option) {
this.id = option.id this.id = option.id
}, },
onReady() { onReady() {
// 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则 // 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
this.$refs.form1.setRules(this.rules) this.$refs.form1.setRules(this.rules)
}, },
onShow(){ onShow(){
this.getCarInfo() this.getCarInfo()
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.editCar { .editCar {
padding: 40rpx 0rpx; padding: 40rpx 0rpx;
.uni-input-input, /deep/ .u-input__content__field-wrapper__field{
.uni-input-placeholder { text-align: right !important;
text-indent: 300rpx; padding-right: 30rpx;
justify-content: space-evenly;
} }
.u-checkbox-group { .u-checkbox-group {
display: inline-block !important; display: inline-block !important;
......
pagesB/pages/move-car/oneMoveCar.vue
View file @ da4e6101
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
拨打车主电话通知 拨打车主电话通知
</div> </div>
<div class="move-car__wx"> <div class="move-car__wx">
<u-checkbox-group v-model="checked" placement="row"> <u-checkbox-group placement="row">
<u-checkbox activeColor="ok"></u-checkbox> <u-checkbox v-model="checked"></u-checkbox>
</u-checkbox-group> 微信通知(上限3次) </u-checkbox-group> 微信通知(上限3次)
</div> </div>
<div class="move-car__more"> <div class="move-car__more">
...@@ -65,46 +65,46 @@ export default { ...@@ -65,46 +65,46 @@ export default {
data() { data() {
return { return {
show:false, show:false,
list: [ list: [
{ {
name:'2367虚拟号码345', name:'2367虚拟号码345',
color:'#333333', color:'#333333',
fontSize:'20', fontSize:'20',
}, },
{ {
name:'呼叫', name:'呼叫',
color:'#3A86F7', color:'#3A86F7',
fontSize:'18', fontSize:'18',
}, },
{ {
name:'取消', name:'取消',
color:'#E6271D', color:'#E6271D',
fontSize:'18', fontSize:'18',
}, },
], ],
checked: [], checked:false,
moveCode: '', moveCode: '',
appBusCar: {}, appBusCar: {},
appBo: { appBo: {
//车牌号 //车牌号
carNo: '', carNo: '',
//申请人手机号 //申请人手机号
applyUserMobile: '', applyUserMobile: '',
//省 //省
provinceName: '', provinceName: '',
//市 //市
cityName: '', cityName: '',
//区 //区
countyName: '', countyName: '',
//详细地址 //详细地址
detailInfo: '', detailInfo: '',
//是否微信通知 //是否微信通知
isWechat: false, isWechat: false,
//是否成功 //是否成功
isSuccess: false, isSuccess: false,
//日志唯一编码 //日志唯一编码
logCode: '', logCode: '',
}, },
} }
}, },
methods: { methods: {
...@@ -115,69 +115,70 @@ export default { ...@@ -115,69 +115,70 @@ export default {
this.show = false; this.show = false;
}, },
selectClick(index){ selectClick(index){
if(index.name == "2367虚拟号码345"){ if(index.name == "2367虚拟号码345"){
}else if(index.name == "呼叫"){ }else if(index.name == "呼叫"){
//请求拨打电话路径 //请求拨打电话路径
let opts = { url: '/app/contact/' , method: 'get' }; let opts = { url: '/app/contact/' , method: 'get' };
this.http.httpTokenRequest(opts, {}).then(res => { this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
//请求成功逻辑，修改 //请求成功逻辑，修改
}
})
//记录修改
let optsOne = { url: '/app/moveLog/updateLog' , method: 'post' };
this.http.httpTokenRequest(optsOne, this.appBo).then(res => {
if (res.data.code == 200) {
//请求成功逻辑，后端应记录此次电话拨打
}
})
}else{
} }
}, })
//记录修改
let optsOne = { url: '/app/moveLog/updateLog' , method: 'post' };
this.http.httpTokenRequest(optsOne, this.appBo).then(res => {
if (res.data.code == 200) {
//请求成功逻辑，后端应记录此次电话拨打
}
})
}else{
}
},
goMyCar() { goMyCar() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/move-car/myMoveCar' url: '/pagesB/pages/move-car/myMoveCar'
}) })
}, },
getCarNumber(){ getCarNumber(){
let opts = { url: '/app/moveCode/owner/' + this.moveCode, method: 'get' }; let opts = { url: '/app/moveCode/owner/' + this.moveCode, method: 'get' };
this.http.httpTokenRequest(opts, {}).then(res => { this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
if(JSON.stringify(res.data.data) != "{}"){ if(JSON.stringify(res.data.data) != "{}"){
this.appBusCar = res.data.data this.appBusCar = res.data.data
}else{ }else{
uni.navigateTo({ uni.navigateTo({
url: '/pagesB/pages/move-car/scan?moveCode=' + this.moveCode url: '/pagesB/pages/move-car/scan?moveCode=' + this.moveCode
}) })
} }
}else{ }else{
//查询挪车码失败 //查询挪车码失败
uni.showToast({ uni.showToast({
title: res.data.msg, title: res.data.msg,
icon: "error", icon: "error",
}); });
} }
}) })
}, },
},
}, },
onLoad() { onLoad() {
if(e.query) { if(e.query) {
//获取二维码携带的参数 //获取二维码携带的参数
//扫码后得到的参数 //扫码后得到的参数
let scene = decodeURIComponent(e.query.scene) let scene = decodeURIComponent(e.query.scene)
// scene = scene.split('&') // scene = scene.split('&')
// let data = { // let data = {
// //场景值 // //场景值
// scene: e.scene // scene: e.scene
// } // }
this.moveCode = scene this.moveCode = scene
console.log('scene: ' + scene); console.log('scene: ' + scene);
} }
} }
} }
</script> </script>
......
pagesB/pages/move-car/scan.vue
View file @ da4e6101
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</div> </div>
</div> </div>
<div class="car_item__three"> <div class="car_item__three">
我的车辆如果阻碍了您的爱车的通行，请点击下方按钮通知我，给您造成的不便敬请谅解！！！ 感谢您使用挪车二维码，请完成车牌号与手机的绑定以便享受挪车服务
</div> </div>
</div> </div>
<div class="moveCarMsg"> <div class="moveCarMsg">
...@@ -41,8 +41,7 @@ export default { ...@@ -41,8 +41,7 @@ export default {
sex: "", sex: "",
}, },
}, },
formData: [ formData: [{
{
id: "kjjns", //id必须唯一 可以是数字 id: "kjjns", //id必须唯一 可以是数字
placeholder: "请输入", placeholder: "请输入",
label: "车牌号", // 提示输入名 label: "车牌号", // 提示输入名
...@@ -142,6 +141,11 @@ export default { ...@@ -142,6 +141,11 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.scan { .scan {
/deep/ .form-container .line .input {
text-align: right !important;
padding-right: 30rpx;
}
.use__text { .use__text {
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
...@@ -174,7 +178,8 @@ export default { ...@@ -174,7 +178,8 @@ export default {
.u-checkbox-group { .u-checkbox-group {
display: inline-block !important; display: inline-block !important;
} }
/deep/.u-checkbox-group--row {
/deep/.u-checkbox-group--row {
display: inline-block !important; display: inline-block !important;
} }
......
pagesC/pages/shop/index.vue
View file @ da4e6101
...@@ -64,7 +64,6 @@ export default { ...@@ -64,7 +64,6 @@ export default {
}, },
methods: { methods: {
goSearch() { goSearch() {
console.log('---');
uni.navigateTo({ uni.navigateTo({
url: '/pagesC/pages/shop/search' url: '/pagesC/pages/shop/search'
}) })
......
pagesC/pages/shop/payOk.vue
View file @ da4e6101
...@@ -4,17 +4,17 @@ ...@@ -4,17 +4,17 @@
--> -->
<template> <template>
<view class="appCotent"> <view class="appCotent">
<div class="payOk"> <div class="payOk">
<div class="ok__icon"> <div class="ok__icon">
<image src="@/static/shop/pay-ok1.png" /> <image src="@/static/shop/pay-ok1.png" />
</div>
<div class="ok__msg">支付成功</div>
<div class="ok__tips">挪车码预计今天发货，请耐心等待</div>
<div class="ok__btn">
<div @click="viewId">查看订单</div>
<div @click="goGhome">返回首页</div>
</div>
</div> </div>
<div class="ok__msg">支付成功</div>
<div class="ok__tips">挪车码预计今天发货，请耐心等待</div>
<div class="ok__btn">
<div>查看订单</div>
<div>返回首页</div>
</div>
</div>
</view> </view>
</template> </template>
...@@ -25,6 +25,18 @@ export default { ...@@ -25,6 +25,18 @@ export default {
} }
}, },
methods: {
viewId() {
uni.navigateTo({
url: '/pagesD/pages/personal/myOrder'
})
},
goGhome() {
uni.navigateTo({
url: '/pagesC/pages/shop/index'
})
}
},
} }
</script> </script>
...@@ -35,6 +47,7 @@ export default { ...@@ -35,6 +47,7 @@ export default {
.ok__icon { .ok__icon {
text-align: center; text-align: center;
image { image {
width: 144rpx; width: 144rpx;
height: 144rpx; height: 144rpx;
...@@ -64,6 +77,7 @@ export default { ...@@ -64,6 +77,7 @@ export default {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-top: 80rpx; margin-top: 80rpx;
>div { >div {
width: 320rpx; width: 320rpx;
height: 76rpx; height: 76rpx;
......
pagesD/pages/personal/help.vue
View file @ da4e6101
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.hlep{ .hlep{
padding:40rpx 0; padding:0rpx 0;
height: 1092rpx; height: 1092rpx;
image{ image{
height: 100%; height: 100%;
......
pagesD/pages/personal/index.vue
View file @ da4e6101
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<custom-tarbar :selected="4"></custom-tarbar> <custom-tarbar :selected="4"></custom-tarbar>
<view class="personal"> <view class="personal">
<div class="ps__bg"> <div class="ps__bg">
<div class="ps__title">个人中心</div> <div class="ps__title"></div>
<div class="ps__info"> <div class="ps__info">
<div class="info__cover"> <div class="info__cover">
<image :src="avatar" /> <image :src="avatar" />
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div class="shop__tab"> <div class="shop__tab">
<div class="tab__top"> <div class="tab__top">
<span>商品订单</span> <span>商品订单</span>
<div class="tab__all" @click="goOrder"> <div class="tab__all" @click="goOrder(0)">
<span>全部订单</span> <span>全部订单</span>
<span> <span>
<image src="@/static/my/my5.png"> <image src="@/static/my/my5.png">
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
</div> </div>
<div class="tab__bottom"> <div class="tab__bottom">
<div class="tab__item" v-for="(vo,inx) in items" :key="inx"> <div class="tab__item" v-for="(vo,inx) in items" :key="inx" @click="goOrder(vo.page)">
<image :src="vo.icon" /> <image :src="vo.icon" />
<div>{{vo.title}}</div> <div>{{vo.title}}</div>
</div> </div>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ps__btn">退出登录</div> <div class="ps__btn" @click="loginOut">退出登录</div>
</view> </view>
<u-gap bgColor="transparent" height="70"></u-gap> <u-gap bgColor="transparent" height="70"></u-gap>
</view> </view>
...@@ -92,17 +92,21 @@ export default { ...@@ -92,17 +92,21 @@ export default {
], ],
items: [{ items: [{
title: '待付款', title: '待付款',
icon: require('@/static/my/my2.png') icon: require('@/static/my/my2.png'),
page:0
}, },
{ {
title: '待收货', title: '待收货',
icon: require('@/static/my/my3.png') icon: require('@/static/my/my3.png'),
page:2
}, { }, {
title: '已完成', title: '已完成',
icon: require('@/static/my/my14.png') icon: require('@/static/my/my14.png'),
page:3
}, { }, {
title: '退款/售后', title: '退款/售后',
icon: require('@/static/my/my9.png') icon: require('@/static/my/my9.png'),
page:4
} }
], ],
//用户信息 //用户信息
...@@ -112,9 +116,14 @@ export default { ...@@ -112,9 +116,14 @@ export default {
} }
}, },
methods: { methods: {
goOrder() { loginOut(){
uni.navigateTo({
url: '/pages/binding/index'
});
},
goOrder(page=0) {
uni.navigateTo({ uni.navigateTo({
url: '/pagesD/pages/personal/myOrder' url: '/pagesD/pages/personal/myOrder?page=' + page
}); });
}, },
goUrl(vo) { goUrl(vo) {
...@@ -155,7 +164,7 @@ export default { ...@@ -155,7 +164,7 @@ export default {
font-weight: bold; font-weight: bold;
color: #FFFFFF; color: #FFFFFF;
text-align: center; text-align: center;
padding-top: 80rpx; padding-top: 40rpx;
} }
.ps__info { .ps__info {
......
pagesD/pages/personal/myOrder.vue
View file @ da4e6101
This diff is collapsed.
pagesD/pages/personal/orderDetail.vue
View file @ da4e6101
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<div class="bottom__price">￥48.00</div> <div class="bottom__price">￥48.00</div>
</div> </div>
</div> </div>
<div class="order__btn"> <div class="order__btn" @click="pull">
<span>申请退款</span> <span>申请退款</span>
</div> </div>
</div> </div>
...@@ -84,6 +84,11 @@ export default { ...@@ -84,6 +84,11 @@ export default {
url: '/pagesD/pages/personal/carTime' url: '/pagesD/pages/personal/carTime'
}) })
} }
,pull() {
uni.navigateTo({
url: '/pagesD/pages/personal/pull'
})
}
}, },
} }
</script> </script>
......
pagesD/pages/personal/pull.vue
View file @ da4e6101
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
} }
} }
.view__item:nth-last-child(1) { .view__item:nth-of-type(2) {
border-bottom: none !important; border-bottom: none !important;
} }
} }
......
pagesD/pages/personal/userInfo.vue
View file @ da4e6101
This diff is collapsed.
static/public.css
View file @ da4e6101
...@@ -14,4 +14,8 @@ ...@@ -14,4 +14,8 @@
position: absolute; position: absolute;
bottom: 16rpx; bottom: 16rpx;
left: 2rpx; left: 2rpx;
}
.self__input__km{
display: flex;
align-items: center;
} }
\ No newline at end of file
unpackage/dist/build/mp-weixin/pages/personal/index.json
View file @ da4e6101
{ {
"navigationBarTitleText": "个人中心",
"usingComponents": { "usingComponents": {
"u-gap": "/common/uview-ui/components/u-gap/u-gap", "u-gap": "/common/uview-ui/components/u-gap/u-gap",
"custom-tarbar": "/common/wxcomponents/custom-tarbar/custom-tarbar" "custom-tarbar": "/common/wxcomponents/custom-tarbar/custom-tarbar"
......
unpackage/dist/build/mp-weixin/pages/personal/userInfo.json
View file @ da4e6101
{ {
"navigationBarTitleText": "编辑资料", "navigationBarTitleText": "编辑资料",
"usingComponents": {} "usingComponents": {
"u-popup": "/common/uview-ui/components/u-popup/u-popup",
"u-datetime-picker": "/common/uview-ui/components/u-datetime-picker/u-datetime-picker"
}
} }
\ No newline at end of file
unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-datetime-picker/u-datetime-picker.json 0 → 100644
View file @ da4e6101
{
"usingComponents": {
"u-picker": "/common/uview-ui/components/u-picker/u-picker"
},
"component": true
}
\ No newline at end of file
unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-datetime-picker/u-datetime-picker.wxml 0 → 100644
View file @ da4e6101
<u-picker vue-id="4066cfa8-1" show="{{show}}" closeOnClickOverlay="{{closeOnClickOverlay}}" columns="{{columns}}" title="{{title}}" itemHeight="{{itemHeight}}" showToolbar="{{showToolbar}}" visibleItemCount="{{visibleItemCount}}" defaultIndex="{{innerDefaultIndex}}" cancelText="{{cancelText}}" confirmText="{{confirmText}}" cancelColor="{{cancelColor}}" confirmColor="{{confirmColor}}" data-ref="picker" data-event-opts="{{[['^close',[['close']]],['^cancel',[['cancel']]],['^confirm',[['confirm']]],['^change',[['change']]]]}}" bind:close="__e" bind:cancel="__e" bind:confirm="__e" bind:change="__e" class="data-v-a73d27cc vue-ref" bind:__l="__l"></u-picker>
\ No newline at end of file
unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-datetime-picker/u-datetime-picker.wxss 0 → 100644
View file @ da4e6101
@charset "UTF-8";
/**
* 这里是uni-app内置的常用样式变量
*
* uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
* 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
*
*/
/**
* 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
*
* 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
*/
/* 颜色变量 */
/* 行为相关颜色 */
/* 文字基本颜色 */
/* 背景颜色 */
/* 边框颜色 */
/* 尺寸变量 */
/* 文字尺寸 */
/* 图片尺寸 */
/* Border Radius */
/* 水平间距 */
/* 垂直间距 */
/* 透明度 */
/* 文章场景相关 */
view.data-v-a73d27cc, scroll-view.data-v-a73d27cc, swiper-item.data-v-a73d27cc {
display: flex;
flex-direction: column;
flex-shrink: 0;
flex-grow: 0;
flex-basis: auto;
align-items: stretch;
align-content: flex-start;
}
unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-picker/u-picker.json 0 → 100644
View file @ da4e6101
{
"usingComponents": {
"u-popup": "/common/uview-ui/components/u-popup/u-popup",
"u-toolbar": "/common/uview-ui/components/u-toolbar/u-toolbar",
"u-loading-icon": "/common/uview-ui/components/u-loading-icon/u-loading-icon"
},
"component": true
}
\ No newline at end of file
unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-picker/u-picker.wxml 0 → 100644
View file @ da4e6101
<u-popup vue-id="0c78d7fe-1" show="{{show}}" data-event-opts="{{[['^close',[['closeHandler']]]]}}" bind:close="__e" class="data-v-0fb62bf0" bind:__l="__l" vue-slots="{{['default']}}"><view class="u-picker data-v-0fb62bf0"><block wx:if="{{showToolbar}}"><u-toolbar vue-id="{{('0c78d7fe-2')+','+('0c78d7fe-1')}}" cancelColor="{{cancelColor}}" confirmColor="{{confirmColor}}" cancelText="{{cancelText}}" confirmText="{{confirmText}}" title="{{title}}" data-event-opts="{{[['^cancel',[['cancel']]],['^confirm',[['confirm']]]]}}" bind:cancel="__e" bind:confirm="__e" class="data-v-0fb62bf0" bind:__l="__l"></u-toolbar></block><picker-view class="u-picker__view data-v-0fb62bf0" style="{{'height:'+(''+$root.g0)+';'}}" indicatorStyle="{{'height: '+$root.g1}}" value="{{innerIndex}}" immediateChange="{{immediateChange}}" data-event-opts="{{[['change',[['changeHandler',['$event']]]]]}}" bindchange="__e"><block wx:for="{{$root.l1}}" wx:for-item="item" wx:for-index="index" wx:key="index"><picker-view-column class="u-picker__view__column data-v-0fb62bf0"><block wx:for="{{item.l0}}" wx:for-item="item1" wx:for-index="index1" wx:key="index1"><block wx:if="{{item.g2}}"><text class="u-picker__view__column__item u-line-1 data-v-0fb62bf0" style="{{'height:'+(item.g3)+';'+('line-height:'+(item.g4)+';')+('font-weight:'+(index1===innerIndex[index]?'bold':'normal')+';')}}">{{item1.m0}}</text></block></block></picker-view-column></block></picker-view><block wx:if="{{loading}}"><view class="u-picker--loading data-v-0fb62bf0"><u-loading-icon vue-id="{{('0c78d7fe-3')+','+('0c78d7fe-1')}}" mode="circle" class="data-v-0fb62bf0" bind:__l="__l"></u-loading-icon></view></block></view></u-popup>
\ No newline at end of file
unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-picker/u-picker.wxss 0 → 100644
View file @ da4e6101
@charset "UTF-8";
/**
* 这里是uni-app内置的常用样式变量
*
* uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
* 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
*
*/
/**
* 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
*
* 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
*/
/* 颜色变量 */
/* 行为相关颜色 */
/* 文字基本颜色 */
/* 背景颜色 */
/* 边框颜色 */
/* 尺寸变量 */
/* 文字尺寸 */
/* 图片尺寸 */
/* Border Radius */
/* 水平间距 */
/* 垂直间距 */
/* 透明度 */
/* 文章场景相关 */
view.data-v-0fb62bf0, scroll-view.data-v-0fb62bf0, swiper-item.data-v-0fb62bf0 {
display: flex;
flex-direction: column;
flex-shrink: 0;
flex-grow: 0;
flex-basis: auto;
align-items: stretch;
align-content: flex-start;
}
.u-picker.data-v-0fb62bf0 {
position: relative;
}
.u-picker__view__column.data-v-0fb62bf0 {
display: flex;
flex-direction: row;
flex: 1;
justify-content: center;
}
.u-picker__view__column__item.data-v-0fb62bf0 {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
font-size: 16px;
text-align: center;
display: block;
color: #303133;
}
.u-picker__view__column__item--disabled.data-v-0fb62bf0 {
cursor: not-allowed;
opacity: 0.35;
}
.u-picker--loading.data-v-0fb62bf0 {
position: absolute;
top: 0;
right: 0;
left: 0;
bottom: 0;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
background-color: rgba(255, 255, 255, 0.87);
z-index: 1000;
}
unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-toolbar/u-toolbar.json 0 → 100644
View file @ da4e6101
{
"usingComponents": {},
"component": true
}
\ No newline at end of file
unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-toolbar/u-toolbar.wxml 0 → 100644
View file @ da4e6101
<block wx:if="{{show}}"><view data-event-opts="{{[['touchmove',[['noop',['$event']]]]]}}" class="u-toolbar data-v-7b8fcf10" catchtouchmove="__e"><view class="u-toolbar__cancel__wrapper data-v-7b8fcf10" hover-class="u-hover-class"><text data-event-opts="{{[['tap',[['cancel',['$event']]]]]}}" class="u-toolbar__wrapper__cancel data-v-7b8fcf10" style="{{'color:'+(cancelColor)+';'}}" bindtap="__e">{{cancelText}}</text></view><block wx:if="{{title}}"><text class="u-toolbar__title u-line-1 data-v-7b8fcf10">{{title}}</text></block><view class="u-toolbar__confirm__wrapper data-v-7b8fcf10" hover-class="u-hover-class"><text data-event-opts="{{[['tap',[['confirm',['$event']]]]]}}" class="u-toolbar__wrapper__confirm data-v-7b8fcf10" style="{{'color:'+(confirmColor)+';'}}" bindtap="__e">{{confirmText}}</text></view></view></block>
\ No newline at end of file
unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-toolbar/u-toolbar.wxss 0 → 100644
View file @ da4e6101
@charset "UTF-8";
/**
* 这里是uni-app内置的常用样式变量
*
* uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
* 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
*
*/
/**
* 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
*
* 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
*/
/* 颜色变量 */
/* 行为相关颜色 */
/* 文字基本颜色 */
/* 背景颜色 */
/* 边框颜色 */
/* 尺寸变量 */
/* 文字尺寸 */
/* 图片尺寸 */
/* Border Radius */
/* 水平间距 */
/* 垂直间距 */
/* 透明度 */
/* 文章场景相关 */
view.data-v-7b8fcf10, scroll-view.data-v-7b8fcf10, swiper-item.data-v-7b8fcf10 {
display: flex;
flex-direction: column;
flex-shrink: 0;
flex-grow: 0;
flex-basis: auto;
align-items: stretch;
align-content: flex-start;
}
.u-toolbar.data-v-7b8fcf10 {
height: 42px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.u-toolbar__wrapper__cancel.data-v-7b8fcf10 {
color: #909193;
font-size: 15px;
padding: 0 15px;
}
.u-toolbar__title.data-v-7b8fcf10 {
color: #303133;
padding: 0 60rpx;
font-size: 16px;
flex: 1;
text-align: center;
}
.u-toolbar__wrapper__confirm.data-v-7b8fcf10 {
color: #3c9cff;
font-size: 15px;
padding: 0 15px;
}
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