Commit 13ab7197 authored by fwz's avatar fwz

Merge branch 'master' into dev_cd

# Conflicts:
#	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/uview-ui/components/u--textarea/u--textarea.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-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-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/pages/binding/binding.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/addCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/callDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/editCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/loveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/moveCarDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/myCall.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/myMoveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/myRecord.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/oneMoveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/recordDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/move-car/scan.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/addAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/ask.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/asking.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/carTime.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/editAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/help.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/myAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/myOrder.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/orderDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/pull.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/personal/userInfo.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/pay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/payOk.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/search.js.map
#	unpackage/dist/dev/mp-weixin/common/active-form/active-form.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/checkbox-group.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/checkbox.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/popup.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/radio-group.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/radio.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/select.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u--textarea/u--textarea.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-action-sheet/u-action-sheet.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-badge/u-badge.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-checkbox-group/u-checkbox-group.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-checkbox/u-checkbox.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-modal/u-modal.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-overlay/u-overlay.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-popup/u-popup.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-safe-bottom/u-safe-bottom.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-search/u-search.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-status-bar/u-status-bar.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-switch/u-switch.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-tabs/u-tabs.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-textarea/u-textarea.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-transition/u-transition.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/pages/binding/index.wxss
#	unpackage/dist/dev/mp-weixin/pages/move-car/addCar.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/addCar.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/addCar.wxss
#	unpackage/dist/dev/mp-weixin/pages/move-car/callDetail.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/callDetail.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/editCar.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/editCar.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/editCar.wxss
#	unpackage/dist/dev/mp-weixin/pages/move-car/loveCar.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/loveCar.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/moveCarDetail.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/moveCarDetail.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/myCall.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/myCall.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/myMoveCar.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/myMoveCar.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/myRecord.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/myRecord.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/oneMoveCar.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/oneMoveCar.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/oneMoveCar.wxss
#	unpackage/dist/dev/mp-weixin/pages/move-car/recordDetail.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/recordDetail.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/scan.js
#	unpackage/dist/dev/mp-weixin/pages/move-car/scan.wxml
#	unpackage/dist/dev/mp-weixin/pages/move-car/scan.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/addAddress.js
#	unpackage/dist/dev/mp-weixin/pages/personal/addAddress.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/addAddress.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/ask.js
#	unpackage/dist/dev/mp-weixin/pages/personal/ask.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/asking.js
#	unpackage/dist/dev/mp-weixin/pages/personal/asking.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/carTime.js
#	unpackage/dist/dev/mp-weixin/pages/personal/carTime.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/carTime.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/editAddress.js
#	unpackage/dist/dev/mp-weixin/pages/personal/editAddress.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/editAddress.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/help.js
#	unpackage/dist/dev/mp-weixin/pages/personal/help.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/help.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/index.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/myAddress.js
#	unpackage/dist/dev/mp-weixin/pages/personal/myAddress.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/myAddress.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/myOrder.js
#	unpackage/dist/dev/mp-weixin/pages/personal/myOrder.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/myOrder.wxss
#	unpackage/dist/dev/mp-weixin/pages/personal/orderDetail.js
#	unpackage/dist/dev/mp-weixin/pages/personal/orderDetail.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/pull.js
#	unpackage/dist/dev/mp-weixin/pages/personal/pull.wxml
#	unpackage/dist/dev/mp-weixin/pages/personal/userInfo.js
#	unpackage/dist/dev/mp-weixin/pages/personal/userInfo.wxml
#	unpackage/dist/dev/mp-weixin/pages/shop/detail.js
#	unpackage/dist/dev/mp-weixin/pages/shop/detail.wxml
#	unpackage/dist/dev/mp-weixin/pages/shop/index.wxss
#	unpackage/dist/dev/mp-weixin/pages/shop/pay.js
#	unpackage/dist/dev/mp-weixin/pages/shop/pay.wxml
#	unpackage/dist/dev/mp-weixin/pages/shop/payOk.js
#	unpackage/dist/dev/mp-weixin/pages/shop/payOk.wxml
#	unpackage/dist/dev/mp-weixin/pages/shop/search.js
#	unpackage/dist/dev/mp-weixin/pages/shop/search.wxml
#	unpackage/dist/dev/mp-weixin/static/public.css
parents aada2c7d e1f2a087
{
"commentTranslate.multiLineMerge": false
}
\ No newline at end of file
<script> <script>
export default { export default {
onLaunch: function() { onLaunch: function () {
uni.hideTabBar() uni.hideTabBar()
}
} }
}
</script> </script>
<style lang='scss'> <style lang="scss">
@import 'common/css/iconfont.css'; @import 'common/css/iconfont.css';
@import "common/uview-ui/index.scss"; @import "common/uview-ui/index.scss";
@import "./static/public.css"; @import "./static/public.css";
/*每个页面公共css */
.content { /*每个页面公共css */
width: 100%; .content {
height: 100vh; width: 100%;
box-sizing: border-box; height: 100vh;
} box-sizing: border-box;
uni-page-body { }
width: 100%;
height: 100%; .appCotent {
background: #f9f9f9; height: 100%;
} box-sizing: border-box;
uni-page-wrapper{ max-width: 750rpx;
width: 100%; margin: 0 auto;
height: 100%; }
background: #f9f9f9;
} uni-page-body {
width: 100%;
height: 100%;
background: #f9f9f9;
}
uni-page-wrapper {
width: 100%;
height: 100%;
background: #f9f9f9;
}
</style> </style>
No preview for this file type
...@@ -17,7 +17,7 @@ color: tabBar.color, ...@@ -17,7 +17,7 @@ color: tabBar.color,
<view class="tarbar-list-li-icon"> <view class="tarbar-list-li-icon">
<image :src="selected == index ? item.selectedIconPath : item.iconPath" mode=""></image> <image :src="selected == index ? item.selectedIconPath : item.iconPath" mode=""></image>
</view> </view>
<view class="tarbar-list-li-name">{{ item.text }}</view> <view :class="selected!==index?'tarbar-list-li-name':'tarbar-list-li-name__active'">{{ item.text }}</view>
</block> </block>
<block v-else> <block v-else>
<view class="tarbar-list-li-icon"> <view class="tarbar-list-li-icon">
...@@ -27,9 +27,6 @@ color: tabBar.color, ...@@ -27,9 +27,6 @@ color: tabBar.color,
</view> </view>
</view> </view>
</view> </view>
<block v-if="isShowMask">
<release-popup @close-mask="closeMask"></release-popup>
</block>
</view> </view>
</template> </template>
...@@ -80,20 +77,21 @@ export default { ...@@ -80,20 +77,21 @@ export default {
] ]
}, },
oldSelected: 0, // 记录之前访问的索引; 值为2的时候显示遮罩 oldSelected: 0, // 记录之前访问的索引; 值为2的时候显示遮罩
isShowMask: false
}; };
}, },
onLoad() {}, onLoad() {},
methods: { methods: {
setSelected(index) { setSelected(index) {
console.log(index);
if (index != 2) { if (index != 2) {
uni.switchTab({ uni.navigateTo({
url: this.tabBar.list[index].pagePath url: this.tabBar.list[index].pagePath,
}); });
} else { } else {
//扫码 //扫码
// 允许从相机和相册扫码 // 允许从相机和相册扫码
uni.navigateTo({
url: '/pages/move-car/scan',
});
uni.scanCode({ uni.scanCode({
success: function (res) { success: function (res) {
console.log('条码类型:' + res.scanType); console.log('条码类型:' + res.scanType);
...@@ -103,9 +101,7 @@ export default { ...@@ -103,9 +101,7 @@ export default {
} }
this.$forceUpdate(); this.$forceUpdate();
}, },
closeMask() {
this.isShowMask = false;
}
} }
}; };
</script> </script>
...@@ -130,15 +126,24 @@ export default { ...@@ -130,15 +126,24 @@ export default {
.tarbar-list-ul { .tarbar-list-ul {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding: 20upx 50upx; padding: 20upx 0upx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
} }
.tarbar-list-li { .tarbar-list-li {
width: 100upx; width: 25%;
height: 80upx; height: 80upx;
text-align: center;
}
.tarbar-list-li:nth-of-type(2) {
padding-right: 40rpx;
}
.tarbar-list-li:nth-of-type(4) {
padding-left: 40rpx;
} }
.tarbar-list-li-icon { .tarbar-list-li-icon {
...@@ -164,6 +169,18 @@ export default { ...@@ -164,6 +169,18 @@ export default {
margin-top: 10rpx; margin-top: 10rpx;
} }
.tarbar-list-li-name__active {
width: 100%;
text-align: center;
line-height: 30upx;
font-size: 20upx;
height: 30upx;
font-family: PingFang SC;
font-weight: 500;
color: rgba(225, 37, 27, 1);
margin-top: 10rpx;
}
.tarbar-list-li-center { .tarbar-list-li-center {
width: 100upx; width: 100upx;
position: absolute; position: absolute;
......
...@@ -231,45 +231,48 @@ ...@@ -231,45 +231,48 @@
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "首页", "navigationBarTitleText": "首页",
"navigationBarBackgroundColor": "#ffffff", "navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#ffffff" "backgroundColor": "#ffffff",
}, "rpxCalcMaxDeviceWidth": 750, // rpx 计算所支持的最大设备宽度,单位 px,默认值为 960
"tabBar": { "rpxCalcBaseDeviceWidth": 375, // rpx 计算使用的基准设备宽度,设备实际宽度超出 rpx 计算所支持的最大设备宽度时将按基准宽度计算,单位 px,默认值为 375
"color": "#595656", "rpxCalcIncludeWidth": 750 // rpx 计算特殊处理的值,始终按实际的设备宽度计算,单位 rpx,默认值为 750
"selectedColor": "#E84351",
"borderStyle": "black",
"backgroundColor": "#FFFFFF",
"list": [
{
"pagePath": "pages/index/index",
"iconPath": "static/tarbar/index22.png",
"selectedIconPath": "static/tarbar/index5.png",
"text": "首页"
},
{
"pagePath": "pages/move-car/index",
"iconPath": "static/tarbar/index17.png",
"selectedIconPath": "static/tarbar/index24.png",
"text": "我要挪车"
},
/*
{
"pagePath": "pages/collection/collection",
"iconPath": "static/tarbar/详情页-查看更多.png",
"selectedIconPath": "static/tarbar/release.png"
},
*/
{
"pagePath": "pages/shop/index",
"iconPath": "static/tarbar/index22.png",
"selectedIconPath": "static/tarbar/index17.png",
"text": "精选商城"
},
{
"pagePath": "pages/personal/index",
"iconPath": "static/tarbar/index11.png",
"selectedIconPath": "static/tarbar/index23.png",
"text": "我的"
}
]
} }
// "tabBar": {
// "color": "#595656",
// "selectedColor": "#E84351",
// "borderStyle": "black",
// "backgroundColor": "#FFFFFF",
// "list": [
// {
// "pagePath": "pages/index/index",
// "iconPath": "static/tarbar/index22.png",
// "selectedIconPath": "static/tarbar/index5.png",
// "text": "首页"
// },
// {
// "pagePath": "pages/move-car/index",
// "iconPath": "static/tarbar/index17.png",
// "selectedIconPath": "static/tarbar/index24.png",
// "text": "我要挪车"
// },
// /*
// {
// "pagePath": "pages/collection/collection",
// "iconPath": "static/tarbar/详情页-查看更多.png",
// "selectedIconPath": "static/tarbar/release.png"
// },
// */
// {
// "pagePath": "pages/shop/index",
// "iconPath": "static/tarbar/index22.png",
// "selectedIconPath": "static/tarbar/index17.png",
// "text": "精选商城"
// },
// {
// "pagePath": "pages/personal/index",
// "iconPath": "static/tarbar/index11.png",
// "selectedIconPath": "static/tarbar/index23.png",
// "text": "我的"
// }
// ]
// }
} }
\ No newline at end of file
No preview for this file type
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 绑定账号 * @Description: 绑定账号
--> -->
<template> <template>
<view class="appCotent">
<div class="bindingLogin"> <div class="bindingLogin">
<div class="login__logo"> <div class="login__logo">
<image src="@/static/binding/logo.png"> <image src="@/static/binding/logo.png">
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
<view class="subform" @click="sub">确认绑定</view> <view class="subform" @click="sub">确认绑定</view>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
...@@ -74,7 +76,7 @@ export default { ...@@ -74,7 +76,7 @@ export default {
// duration: 2000, // duration: 2000,
// }); // });
//跳转到首页 //跳转到首页
uni.switchTab({ uni.navigateTo({
url: '/pages/index/index' url: '/pages/index/index'
}); });
}, },
......
...@@ -3,20 +3,22 @@ ...@@ -3,20 +3,22 @@
* @Description: 登录 * @Description: 登录
--> -->
<template> <template>
<div class="binding"> <view class="appCotent">
<div class="login__logo"> <div class="binding">
<image src="@/static/binding/logo.png"> <div class="login__logo">
<image src="@/static/binding/logo.png">
</div>
<div class="login__btn" @click="login">
微信一键登录
</div>
<div class="login__read">
<u-checkbox-group v-model="checked" placement="row">
<u-checkbox activeColor="ok"></u-checkbox>
</u-checkbox-group>
已阅读并同意 <span>《京东用户注册协议》</span><span>《京东隐私政策》</span>。若您的手机号未注册,将为您直接注册京东账号
</div>
</div> </div>
<div class="login__btn" @click="login"> </view>
微信一键登录
</div>
<div class="login__read">
<u-checkbox-group v-model="checked" placement="row">
<u-checkbox activeColor="ok"></u-checkbox>
</u-checkbox-group>
已阅读并同意 <span>《京东用户注册协议》</span><span>《京东隐私政策》</span>。若您的手机号未注册,将为您直接注册京东账号
</div>
</div>
</template> </template>
<script> <script>
...@@ -27,13 +29,14 @@ export default { ...@@ -27,13 +29,14 @@ export default {
}; };
}, },
methods: { methods: {
login() { login() {
//跳转到绑定页面 //跳转到绑定页面
uni.navigateTo({ uni.navigateTo({
url: '/pages/binding/binding' url: '/pages/binding/binding'
}); });
} }
}, },
} }
</script> </script>
...@@ -54,6 +57,10 @@ export default { ...@@ -54,6 +57,10 @@ export default {
display: inline-block !important; display: inline-block !important;
} }
/deep/.u-checkbox-group--row {
display: inline-block !important;
}
.login__btn { .login__btn {
width: 600rpx; width: 600rpx;
height: 90rpx; height: 90rpx;
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 领取优惠卷 * @Description: 领取优惠卷
--> -->
<template> <template>
<view class="appCotent">
<div class="getPrice"> <div class="getPrice">
<u-gap bgColor="transparent" height="20"></u-gap> <u-gap bgColor="transparent" height="20"></u-gap>
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
</u--form> </u--form>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 领取优惠卷 * @Description: 领取优惠卷
--> -->
<template> <template>
<view class="appCotent">
<div class="getPrice"> <div class="getPrice">
<u-gap bgColor="transparent" height="30"></u-gap> <u-gap bgColor="transparent" height="30"></u-gap>
<div class="content__code"> <div class="content__code">
...@@ -61,6 +62,7 @@ ...@@ -61,6 +62,7 @@
</div> </div>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 获取挪车码 * @Description: 获取挪车码
--> -->
<template> <template>
<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">
...@@ -75,7 +76,7 @@ ...@@ -75,7 +76,7 @@
<span>1</span> <span>1</span>
</div> </div>
<div class="price__all"> <div class="price__all">
合计<span>¥00.00</span> 合计<span class="num__two">¥00.00</span>
</div> </div>
</div> </div>
<div class="price__next" @click="pay"> <div class="price__next" @click="pay">
...@@ -83,6 +84,7 @@ ...@@ -83,6 +84,7 @@
</div> </div>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,64 +3,66 @@ ...@@ -3,64 +3,66 @@
* @Description: 领取优惠卷 * @Description: 领取优惠卷
--> -->
<template> <template>
<div class="getPrice"> <view class="appCotent">
<u-gap bgColor="transparent" height="30"></u-gap> <div class="getPrice">
<div class="content__code"> <u-gap bgColor="transparent" height="30"></u-gap>
<div class="code__img"></div> <div class="content__code">
<div class="code__money"> <div class="code__img"></div>
<div class="money__title"> <div class="code__money">
<text>二维码挪车贴-经典样式</text> <div class="money__title">
</div> <text>二维码挪车贴-经典样式</text>
<div class="code__tips"> </div>
<text>静电贴材质 7.1cm*8.9cm</text> <div class="code__tips">
</div> <text>静电贴材质 7.1cm*8.9cm</text>
<div class="money__num"> </div>
<text class="num__one">¥0.00</text> <div class="money__num">
<text class="num__one">¥0.00</text>
</div>
</div> </div>
</div> </div>
</div> <u-gap bgColor="transparent" height="30"></u-gap>
<u-gap bgColor="transparent" height="30"></u-gap> <div class="car_info">
<div class="car_info"> <div class="car_info__title">填写车辆信息</div>
<div class="car_info__title">填写车辆信息</div> <u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="100">
<u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="100"> <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>
<u--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>
<u--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
<u--input v-model="model1.userInfo.name" placeholder="请输入" border="none"></u--input>KM </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> </u--form>
</u--form> <div class="select__car">
<div class="select__car"> 从爱车选择 <image src="@/static/index/zhankai.png" alt="">
从爱车选择 <image src="@/static/index/zhankai.png" alt=""> </div>
</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"> <span>1</span>
<span>1</span> </div>
<div class="price__all">
合计<span>¥00.00</span>
</div>
</div> </div>
<div class="price__all"> <div class="price__next" @click="getCarCode">
合计<span>¥00.00</span> 下一步
</div> </div>
</div> </div>
<div class="price__next" @click="getCarCode"> <div class="price__bottom">
下一步 <div class="price">
</div> ¥0.00
</div> </div>
<div class="price__bottom"> <div class="price__next" @click="getCarCode">
<div class="price"> 下一步
¥0.00 </div>
</div>
<div class="price__next" @click="getCarCode">
下一步
</div> </div>
</div> </div>
</div> </view>
</template> </template>
<script> <script>
...@@ -108,6 +110,10 @@ export default { ...@@ -108,6 +110,10 @@ export default {
.getPrice { .getPrice {
width: 100%; width: 100%;
height: 100%; height: 100%;
.uni-input-input,
.uni-input-placeholder {
text-indent: 300rpx;
}
.content__code { .content__code {
padding: 28rpx; padding: 28rpx;
......
<template> <template>
<view class="index-content"> <view class="appCotent">
<custom-tarbar :selected="0"></custom-tarbar> <view class="index-content">
<u-swiper :radius="0" :height="210" :list="list5" @change="(e) => (current = e.current)" :autoplay="false"> <custom-tarbar :selected="0"></custom-tarbar>
<view slot="indicator" class="indicator"> <u-swiper :radius="0" :height="210" :list="list5" @change="(e) => (current = e.current)" :autoplay="false">
<view class="indicator__dot" v-for="(item, index) in list5" :key="index" :class="[index === current && 'indicator__dot--active']"> <view slot="indicator" class="indicator">
<view class="indicator__dot" v-for="(item, index) in list5" :key="index" :class="[index === current && 'indicator__dot--active']">
</view>
</view> </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"> <div class="code__img"></div>
<div class="code__img"></div> <div class="code__money">
<div class="code__money"> <div class="money__title">
<div class="money__title"> <text>二维码挪车贴</text>
<text>二维码挪车贴</text> </div>
<div class="code__tips">
<text>绑定京东账号,仅需支付邮费</text>
</div>
<div class="money__num">
<text class="num__one">¥0.00</text>
<text class="num__two">¥19.99</text>
</div>
</div> </div>
<div class="code__tips"> <div class="code__get" @click="getPrice">
<text>绑定京东账号,仅需支付邮费</text> <div>
</div> 立即
<div class="money__num"> </div>
<text class="num__one">¥0.00</text> <div>
<text class="num__two">¥19.99</text> 领取
</div>
</div> </div>
</div> </div>
<div class="code__get" @click="getPrice"> <u-gap bgColor="transparent" height="15"></u-gap>
<div> <div class="index__item3">
立即 <image src="@/static/index/index23.png"></image>
</div> </div>
<div> <u-gap bgColor="transparent" height="15"></u-gap>
领取 <div class="index__item3-1">
</div> <image src="@/static/index/index14.png"></image>
</div> </div>
</div> <u-gap bgColor="transparent" height="15"></u-gap>
<u-gap bgColor="transparent" height="15"></u-gap> <div class="index__item4">
<div class="index__item3"> <image src="@/static/index/index20.png"></image>
<image src="@/static/index/index23.png"></image> </div>
</div> <u-gap bgColor="transparent" height="15"></u-gap>
<u-gap bgColor="transparent" height="15"></u-gap> <div class="index__item5">
<div class="index__item3-1"> <image src="@/static/index/index8.png"></image>
<image src="@/static/index/index14.png"></image> </div>
</div> <u-gap bgColor="transparent" height="60"></u-gap>
<u-gap bgColor="transparent" height="15"></u-gap> </view>
<div class="index__item4">
<image src="@/static/index/index20.png"></image>
</div>
<u-gap bgColor="transparent" height="15"></u-gap>
<div class="index__item5">
<image src="@/static/index/index8.png"></image>
</div>
<u-gap bgColor="transparent" height="60"></u-gap>
</view> </view>
</template> </template>
...@@ -90,41 +92,41 @@ export default { ...@@ -90,41 +92,41 @@ export default {
height: 100%; height: 100%;
.index__item3 { .index__item3 {
width: 750rpx; width: 100%;
height: 356rpx; height: 356rpx;
image { image {
width: 750rpx; width: 100%;
height: 356rpx; height: 356rpx;
} }
} }
.index__item3-1 { .index__item3-1 {
width: 750rpx; width: 100%;
height: 711rpx; height: 711rpx;
image { image {
width: 750rpx; width: 100%;
height: 711rpx; height: 711rpx;
} }
} }
.index__item4 { .index__item4 {
width: 750rpx; width: 100%;
height: 646rpx; height: 646rpx;
image { image {
width: 750rpx; width: 100%;
height: 646rpx; height: 646rpx;
} }
} }
.index__item5 { .index__item5 {
width: 750rpx; width: 100%;
height: 1289rpx; height: 1289rpx;
image { image {
width: 750rpx; width: 100%;
height: 1289rpx; height: 1289rpx;
} }
} }
...@@ -140,7 +142,7 @@ export default { ...@@ -140,7 +142,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin: 0 auto; margin-left: 30rpx;
position: relative; position: relative;
.code__img { .code__img {
...@@ -184,6 +186,16 @@ export default { ...@@ -184,6 +186,16 @@ export default {
font-weight: 500; font-weight: 500;
color: #999999; color: #999999;
line-height: 42rpx; line-height: 42rpx;
position: relative;
}
.num__two::before{
content:'';
width: 100%;
height: 1rpx;
background:#999 ;
position: absolute;
bottom: 16rpx;
left: 8rpx;
} }
} }
} }
......
<!--
* @Author: euzhi
* @Description: tab
-->
<template>
<div class="tab__item">
<custom-tarbar :selected="0"></custom-tarbar>
</div>
</template>
<script>
import customTarbar from "@/common/wxcomponents/custom-tarbar/custom-tarbar.vue";
export default {
components: {
customTarbar
},
data() {
return {
}
},
}
</script>
<style lang="scss" scoped>
</style>
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 新增车辆 * @Description: 新增车辆
--> -->
<template> <template>
<view class="appCotent">
<div class="addCar"> <div class="addCar">
<div class="add__content"> <div class="add__content">
<div class="add__title"> <div class="add__title">
...@@ -34,6 +35,7 @@ ...@@ -34,6 +35,7 @@
完成 完成
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
...@@ -93,7 +95,10 @@ export default { ...@@ -93,7 +95,10 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.addCar { .addCar {
padding: 40rpx 0rpx; padding: 40rpx 0rpx;
.uni-input-input,
.uni-input-placeholder {
text-indent: 300rpx;
}
.u-checkbox-group { .u-checkbox-group {
display: inline-block !important; display: inline-block !important;
} }
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 呼叫记录详情 * @Description: 呼叫记录详情
--> -->
<template> <template>
<view class="appCotent">
<div class="callDetail"> <div class="callDetail">
<div class="view__content"> <div class="view__content">
<div class="view__item" v-for="(vo,inx) in items" :key="inx"> <div class="view__item" v-for="(vo,inx) in items" :key="inx">
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
返回 返回
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 新增车辆 * @Description: 新增车辆
--> -->
<template> <template>
<view class="appCotent">
<div class="editCar"> <div class="editCar">
<div class="add__content"> <div class="add__content">
<div class="add__title"> <div class="add__title">
...@@ -32,6 +33,7 @@ ...@@ -32,6 +33,7 @@
删除 删除
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
...@@ -91,10 +93,16 @@ export default { ...@@ -91,10 +93,16 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.editCar { .editCar {
padding: 40rpx 0rpx; padding: 40rpx 0rpx;
.uni-input-input,
.uni-input-placeholder {
text-indent: 300rpx;
}
.u-checkbox-group { .u-checkbox-group {
display: inline-block !important; display: inline-block !important;
} }
.u-checkbox-group--row{
display: inline-block !important;
}
.add__content { .add__content {
background: #FFFFFF; background: #FFFFFF;
......
<template> <template>
<view class="moveCar"> <view class="appCotent">
<custom-tarbar :selected="1"></custom-tarbar> <view class="moveCar">
<div class="move_car__content"> <custom-tarbar :selected="1"></custom-tarbar>
<div class="menu__top" @click="goUrl({ <div class="move_car__content">
<div class="menu__top" @click="goUrl({
url: '/pages/move-car/loveCar', url: '/pages/move-car/loveCar',
})"> })">
<div>
<image src="@/static/move-car/move-car1.png" />
</div>
<div>
爱车管理
</div>
</div>
<div class="menu__list">
<div class="list__items" v-for="(vo,inx) in items" :key="inx" @click="goUrl(vo)">
<div> <div>
<image :src="vo.icon" /> <image src="@/static/move-car/move-car1.png" />
</div> </div>
<div> <div>
{{vo.title}} 爱车管理
</div>
</div>
<div class="menu__list">
<div class="list__items" v-for="(vo,inx) in items" :key="inx" @click="goUrl(vo)">
<div>
<image :src="vo.icon" />
</div>
<div>
{{vo.title}}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </view>
</view> </view>
</template> </template>
...@@ -39,7 +41,7 @@ export default { ...@@ -39,7 +41,7 @@ export default {
return { return {
items: [{ items: [{
icon: require("@/static/move-car/move-car6.png"), icon: require("@/static/move-car/move-car6.png"),
url: "/pages/move-car/scan", url: "/pages/move-car/oneMoveCar",
title: "扫一扫联系车主" title: "扫一扫联系车主"
}, },
{ {
...@@ -48,7 +50,7 @@ export default { ...@@ -48,7 +50,7 @@ export default {
title: "我的呼叫记录" title: "我的呼叫记录"
}, { }, {
icon: require("@/static/move-car/move-car2.png"), icon: require("@/static/move-car/move-car2.png"),
url: "/pages/move-car/oneMoveCar", url: "/pages/move-car/myMoveCar",
title: "我的挪车牌" title: "我的挪车牌"
}, { }, {
icon: require("@/static/move-car/move-car4.png"), icon: require("@/static/move-car/move-car4.png"),
...@@ -77,7 +79,8 @@ export default { ...@@ -77,7 +79,8 @@ export default {
}) })
} }
} }
} },
}; };
</script> </script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 爱车管理 * @Description: 爱车管理
--> -->
<template> <template>
<view class="appCotent">
<div class="loveCar"> <div class="loveCar">
<div class="love-car__title"> <div class="love-car__title">
我的爱车 我的爱车
...@@ -27,6 +28,7 @@ ...@@ -27,6 +28,7 @@
<image src="../../static/move-car/love-car5.png"> 添加车辆 <image src="../../static/move-car/love-car5.png"> 添加车辆
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 挪车码详情 * @Description: 挪车码详情
--> -->
<template> <template>
<view class="appCotent">
<div class="moveCarDetail"> <div class="moveCarDetail">
<div class="view__content"> <div class="view__content">
<div class="view__item" v-for="(vo,inx) in items" :key="inx"> <div class="view__item" v-for="(vo,inx) in items" :key="inx">
...@@ -21,6 +22,7 @@ ...@@ -21,6 +22,7 @@
返回 返回
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 我的呼叫记录 * @Description: 我的呼叫记录
--> -->
<template> <template>
<view class="appCotent">
<div class="myRecord"> <div class="myRecord">
<div class="record__item" v-for="(vo,inx) in items" :key="inx"> <div class="record__item" v-for="(vo,inx) in items" :key="inx">
<div class="item__top"> <div class="item__top">
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
</div> </div>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 我的挪车码 * @Description: 我的挪车码
--> -->
<template> <template>
<view class="appCotent">
<div class="myMoveCar"> <div class="myMoveCar">
<div class="my__search"> <div class="my__search">
<u-search placeholder="请输入车牌号" :showAction='false' bgColor='#ffffff' v-model="keyword"></u-search> <u-search placeholder="请输入车牌号" :showAction='false' bgColor='#ffffff' v-model="keyword"></u-search>
...@@ -32,6 +33,7 @@ ...@@ -32,6 +33,7 @@
</div> </div>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 我的挪车记录 * @Description: 我的挪车记录
--> -->
<template> <template>
<view class="appCotent">
<div class="myRecord"> <div class="myRecord">
<div class="record__item" v-for="(vo,inx) in items" :key="inx"> <div class="record__item" v-for="(vo,inx) in items" :key="inx">
<div class="item__top"> <div class="item__top">
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
</div> </div>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
<template> <template>
<view class="appCotent">
<div class="oneMoveCar"> <div class="oneMoveCar">
<div class="contentMoveCar"> <div class="contentMoveCar">
<div class="car_item__one"> <div class="car_item__one">
...@@ -56,6 +57,7 @@ ...@@ -56,6 +57,7 @@
</div> </div>
<u-action-sheet :actions="list" @close='close' closeOnClickOverlay round='6' :show="show"></u-action-sheet> <u-action-sheet :actions="list" @close='close' closeOnClickOverlay round='6' :show="show"></u-action-sheet>
</div> </div>
</view>
</template> </template>
<script> <script>
...@@ -108,6 +110,9 @@ export default { ...@@ -108,6 +110,9 @@ export default {
.u-checkbox-group { .u-checkbox-group {
display: inline-block !important; display: inline-block !important;
} }
.u-checkbox-group--row{
display: inline-block !important;
}
.contentMoveCar { .contentMoveCar {
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 挪车记录详情 * @Description: 挪车记录详情
--> -->
<template> <template>
<view class="appCotent">
<div class="callDetail"> <div class="callDetail">
<div class="view__content"> <div class="view__content">
<div class="view__item" v-for="(vo,inx) in items" :key="inx"> <div class="view__item" v-for="(vo,inx) in items" :key="inx">
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
返回 返回
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 扫码绑定 * @Description: 扫码绑定
--> -->
<template> <template>
<view class="appCotent">
<div class="scan"> <div class="scan">
<div class="contentMoveCar"> <div class="contentMoveCar">
<div class="car_item__one"> <div class="car_item__one">
...@@ -27,6 +28,7 @@ ...@@ -27,6 +28,7 @@
</div> </div>
<div class="use__text">使用说明</div> <div class="use__text">使用说明</div>
</div> </div>
</view>
</template> </template>
<script> <script>
...@@ -142,6 +144,9 @@ export default { ...@@ -142,6 +144,9 @@ export default {
.u-checkbox-group { .u-checkbox-group {
display: inline-block !important; display: inline-block !important;
} }
.u-checkbox-group--row{
display: inline-block !important;
}
.contentMoveCar { .contentMoveCar {
......
...@@ -3,34 +3,42 @@ ...@@ -3,34 +3,42 @@
* @Description: 新增地址 * @Description: 新增地址
--> -->
<template> <template>
<div class="addAddress"> <view class="appCotent">
<u-gap bgColor="transparent" height="20"></u-gap> <div class="addAddress">
<u-gap bgColor="transparent" height="20"></u-gap>
<div class="car_info"> <div class="car_info">
<u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="100"> <u--form labelPosition="left" :model="model1" :rules="rules" ref="form1" labelWidth="100">
<u-form-item label="收货人:" prop="userInfo.name" borderBottom ref="item1"> <u-form-item label="收货人:" prop="userInfo.name" borderBottom ref="item1">
<u--input v-model="model1.userInfo.name" placeholder="请填写收货人姓名" border="none"></u--input> <u--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 v-model="model1.userInfo.name" placeholder="请填写收货人手机号码" border="none"></u--input> <u--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 v-model="model1.userInfo.name" disabled placeholder="点击选择收货地址" border="none"></u--input> <u--input v-model="model1.userInfo.name" disabled placeholder="点击选择收货地址" border="none"></u--input>
</u-form-item> <span class="app__gps">
<u-form-item label="楼号门牌:" prop="userInfo.name" borderBottom ref="item1"> <image src="../../static/my/gps.png">
<u--input v-model="model1.userInfo.name" placeholder="例如 2栋3单元101室" border="none"></u--input> </span>
</u-form-item> <span class="app__right">
<u-form-item label="设置默认地址:" prop="userInfo.name" ref="item1"> <image src="../../static/my/my6.png">
<u-switch class="del__address" v-model="model1.value" activeColor="#5ac725" @change="change"></u-switch> </span>
</u-form-item> </u-form-item>
<u-form-item label="楼号门牌:" prop="userInfo.name" borderBottom ref="item1">
<u--input v-model="model1.userInfo.name" placeholder="例如 2栋3单元101室" border="none"></u--input>
</u-form-item>
<u-form-item label="设置默认地址:" prop="userInfo.name" ref="item1">
<u-switch class="del__address" v-model="model1.value" activeColor="#5ac725" @change="change"></u-switch>
</u-form-item>
</u--form> </u--form>
</div>
<div class="add__tips">为保证您的商品准确送达,请填写正确的地址!</div>
<div class="love__btn" @click="add">
<image src="../../static/move-car/love-car5.png"> 新增地址
</div>
</div> </div>
<div class="add__tips">为保证您的商品准确送达,请填写正确的地址!</div> </view>
<div class="love__btn" @click="add">
<image src="../../static/move-car/love-car5.png"> 新增地址
</div>
</div>
</template> </template>
<script> <script>
...@@ -63,6 +71,23 @@ export default { ...@@ -63,6 +71,23 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.addAddress { .addAddress {
.app__gps {
image {
width: 34rpx;
height: 36rpx;
}
}
.app__right {
padding-left: 20rpx;
padding-bottom: 10rpx;
image {
width: 11rpx;
height: 18rpx;
}
}
.love__btn { .love__btn {
height: 76rpx; height: 76rpx;
background: url('@/static/move-car/love-car4.png') no-repeat; background: url('@/static/move-car/love-car4.png') no-repeat;
...@@ -76,6 +101,7 @@ export default { ...@@ -76,6 +101,7 @@ export default {
width: 670rpx; width: 670rpx;
margin: 0 auto; margin: 0 auto;
margin-top: 40rpx; margin-top: 40rpx;
image { image {
width: 30rpx; width: 30rpx;
height: 30rpx; height: 30rpx;
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 问题反馈 * @Description: 问题反馈
--> -->
<template> <template>
<view class="appCotent">
<div class="pull"> <div class="pull">
<div class="view__content"> <div class="view__content">
<div class="view__title"> <div class="view__title">
...@@ -24,6 +25,7 @@ ...@@ -24,6 +25,7 @@
提交 提交
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 常见问题 * @Description: 常见问题
--> -->
<template> <template>
<view class="appCotent">
<div class="asking"> <div class="asking">
<div class="title__ask"> <div class="title__ask">
【如何获取客户?获取客户的渠道有哪些?】 【如何获取客户?获取客户的渠道有哪些?】
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
通过参加行业群的集体活动,接洽客户。 通过参加行业群的集体活动,接洽客户。
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 查看物流 * @Description: 查看物流
--> -->
<template> <template>
<view class="appCotent">
<div class="carTime"> <div class="carTime">
<div class="time__content"> <div class="time__content">
<div class="time__top"> <div class="time__top">
...@@ -16,7 +17,7 @@ ...@@ -16,7 +17,7 @@
<div> <div>
物流单号:3543859111977240 物流单号:3543859111977240
</div> </div>
<div class="time__btn btn__one" @click="viewCar"> <div class="time__btn btn__one">
<span>复制</span> <span>复制</span>
</div> </div>
</div> </div>
...@@ -80,6 +81,7 @@ ...@@ -80,6 +81,7 @@
</div> </div>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
...@@ -184,6 +186,7 @@ export default { ...@@ -184,6 +186,7 @@ export default {
display: inline-block; display: inline-block;
right: 0rpx; right: 0rpx;
bottom: 60rpx; bottom: 60rpx;
border-radius: 4rpx;
} }
} }
} }
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 编辑地址 * @Description: 编辑地址
--> -->
<template> <template>
<view class="appCotent">
<div class="editAddress"> <div class="editAddress">
<u-gap bgColor="transparent" height="20"></u-gap> <u-gap bgColor="transparent" height="20"></u-gap>
...@@ -15,7 +16,13 @@ ...@@ -15,7 +16,13 @@
<u--input v-model="model1.userInfo.name" placeholder="请填写收货人手机号码" border="none"></u--input> <u--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 v-model="model1.userInfo.name" disabled placeholder="点击选择收货地址" border="none"></u--input> <u--input v-model="model1.userInfo.name" placeholder="点击选择收货地址" border="none"></u--input>
<span class="app__gps">
<image src="../../static/my/gps.png" >
</span>
<span class="app__right">
<image src="../../static/my/my6.png" >
</span>
</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 v-model="model1.userInfo.name" placeholder="例如 2栋3单元101室" border="none"></u--input> <u--input v-model="model1.userInfo.name" placeholder="例如 2栋3单元101室" border="none"></u--input>
...@@ -34,6 +41,7 @@ ...@@ -34,6 +41,7 @@
删除该地址 删除该地址
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
...@@ -83,6 +91,20 @@ export default { ...@@ -83,6 +91,20 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.editAddress { .editAddress {
.app__gps{
image{
width: 34rpx;
height: 36rpx;
}
}
.app__right{
padding-left: 20rpx;
padding-bottom: 10rpx;
image{
width: 11rpx;
height: 18rpx;
}
}
.love__btn { .love__btn {
height: 76rpx; height: 76rpx;
background: url('@/static/move-car/love-car4.png') no-repeat; background: url('@/static/move-car/love-car4.png') no-repeat;
......
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
* @Description: 帮助使用 * @Description: 帮助使用
--> -->
<template> <template>
<view class="appCotent">
<div class="hlep"> <div class="hlep">
<image src="../../static/my/help.png" /> <image src="../../static/my/help.png" />
</div> </div>
</view>
</template> </template>
<script> <script>
...@@ -20,7 +22,7 @@ ...@@ -20,7 +22,7 @@
height: 1092rpx; height: 1092rpx;
image{ image{
height: 100%; height: 100%;
width: 750rpx; width: 100%;
} }
} }
</style> </style>
\ No newline at end of file
...@@ -3,59 +3,61 @@ ...@@ -3,59 +3,61 @@
* @Description: 个人中心 * @Description: 个人中心
--> -->
<template> <template>
<view class="content"> <view class="appCotent">
<custom-tarbar :selected="4"></custom-tarbar> <view class="content">
<view class="personal"> <custom-tarbar :selected="4"></custom-tarbar>
<div class="ps__bg"> <view class="personal">
<div class="ps__title">个人中心</div> <div class="ps__bg">
<div class="ps__info"> <div class="ps__title">个人中心</div>
<div class="info__cover"> <div class="ps__info">
<image src="../../static/my/my2.png" /> <div class="info__cover">
</div> <image src="../../static/my/my2.png" />
<div>
<div class="info__name">这里是昵称</div>
<div class="view__info" @click="editInfo">
查看个人主页或编辑资料
<span>
<image src="../../static/my/my7.png">
</span>
</div> </div>
</div> <div>
</div> <div class="info__name">这里是昵称</div>
<div class="ps__shop"> <div class="view__info" @click="editInfo">
<div class="shop__tab"> 查看个人主页或编辑资料
<div class="tab__top">
<span>商品订单</span>
<div class="tab__all" @click="goOrder">
<span>全部订单</span>
<span> <span>
<image src="../../static/my/my5.png"> <image src="../../static/my/my7.png">
</span> </span>
</div> </div>
</div> </div>
<div class="tab__bottom"> </div>
<div class="tab__item" v-for="(vo,inx) in items" :key="inx"> <div class="ps__shop">
<image :src="vo.icon" /> <div class="shop__tab">
<div>{{vo.title}}</div> <div class="tab__top">
<span>商品订单</span>
<div class="tab__all" @click="goOrder">
<span>全部订单</span>
<span>
<image src="../../static/my/my5.png">
</span>
</div>
</div>
<div class="tab__bottom">
<div class="tab__item" v-for="(vo,inx) in items" :key="inx">
<image :src="vo.icon" />
<div>{{vo.title}}</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="ps__list">
<div class="ps__list"> <div class="list__item" v-for="(vo,inx) in menu" :key="inx" @click="goUrl(vo)">
<div class="list__item" v-for="(vo,inx) in menu" :key="inx" @click="goUrl(vo)"> <div class="list__left">
<div class="list__left"> <image :src="vo.icon" alt="" srcset="">
<image :src="vo.icon" alt="" srcset=""> {{vo.title}}
{{vo.title}} </div>
</div> <div class="list__right">
<div class="list__right"> <image src="../../static/my/my5.png" alt="" srcset="">
<image src="../../static/my/my5.png" alt="" srcset=""> </div>
</div> </div>
</div> </div>
</div> <div class="ps__btn">退出登录</div>
<div class="ps__btn">退出登录</div> </view>
<u-gap bgColor="transparent" height="70"></u-gap>
</view> </view>
<u-gap bgColor="transparent" height="70"></u-gap>
</view> </view>
</template> </template>
...@@ -85,7 +87,7 @@ export default { ...@@ -85,7 +87,7 @@ export default {
{ {
icon: require("../../static/my/my11.png"), icon: require("../../static/my/my11.png"),
title: "问题反馈", title: "问题反馈",
url: "/pages/personal/ask" url: "/pages/personal/ask"
} }
], ],
items: [{ items: [{
...@@ -116,12 +118,13 @@ export default { ...@@ -116,12 +118,13 @@ export default {
url: vo.url url: vo.url
}); });
}, },
editInfo() { editInfo() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/personal/userInfo' url: '/pages/personal/userInfo'
}); });
} }
}, },
}; };
</script> </script>
...@@ -129,7 +132,7 @@ export default { ...@@ -129,7 +132,7 @@ export default {
.personal { .personal {
.ps__bg { .ps__bg {
background: url('../../static/my/my15.png') no-repeat; background: url('../../static/my/my15.png') no-repeat;
background-size: contain; background-size: cover;
.ps__title { .ps__title {
font-size: 40rpx; font-size: 40rpx;
...@@ -259,7 +262,7 @@ export default { ...@@ -259,7 +262,7 @@ export default {
.list__item { .list__item {
position: relative; position: relative;
padding: 34rpx 40rpx; padding: 26rpx 40rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
...@@ -336,7 +339,7 @@ export default { ...@@ -336,7 +339,7 @@ export default {
.ps__btn { .ps__btn {
margin-top: 20rpx; margin-top: 20rpx;
width: 750rpx; width: 100%;
height: 100rpx; height: 100rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.16); box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.16);
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 我的地址 * @Description: 我的地址
--> -->
<template> <template>
<view class="appCotent">
<div class="myAddress"> <div class="myAddress">
<div class="address__content"> <div class="address__content">
<div class="ress__item" v-for="(vo,inx) in 4" :key="inx"> <div class="ress__item" v-for="(vo,inx) in 4" :key="inx">
...@@ -23,6 +24,7 @@ ...@@ -23,6 +24,7 @@
<image src="../../static/move-car/love-car5.png"> 新增地址 <image src="../../static/move-car/love-car5.png"> 新增地址
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
...@@ -127,7 +129,7 @@ export default { ...@@ -127,7 +129,7 @@ export default {
} }
>span:nth-of-type(2) { >span:nth-of-type(2) {
padding-left: 40rpx;
image { image {
width: 28rpx; width: 28rpx;
height: 30rpx; height: 30rpx;
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 我的订单 * @Description: 我的订单
--> -->
<template> <template>
<view class="appCotent">
<div class="myOrder"> <div class="myOrder">
<u-tabs :current='current' :list="list4" lineWidth="30" @change="changeVal" lineColor="#f56c6c" :activeStyle="{ <u-tabs :current='current' :list="list4" lineWidth="30" @change="changeVal" lineColor="#f56c6c" :activeStyle="{
color: '#303133', color: '#303133',
...@@ -142,6 +143,7 @@ ...@@ -142,6 +143,7 @@
</div> </div>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
...@@ -286,7 +288,7 @@ export default { ...@@ -286,7 +288,7 @@ export default {
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #666666; color: #666666;
margin: 20rpx margin: 20rpx 0;
} }
.order__num { .order__num {
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 订单详情 * @Description: 订单详情
--> -->
<template> <template>
<view class="appCotent">
<div class="orderDetail"> <div class="orderDetail">
<div class="order__car"> <div class="order__car">
<div> <div>
...@@ -72,6 +73,7 @@ ...@@ -72,6 +73,7 @@
</div> </div>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 申请退款 * @Description: 申请退款
--> -->
<template> <template>
<view class="appCotent">
<div class="pull"> <div class="pull">
<div class="view__content"> <div class="view__content">
<div class="view__item" v-for="(vo,inx) in items" :key="inx"> <div class="view__item" v-for="(vo,inx) in items" :key="inx">
...@@ -22,6 +23,7 @@ ...@@ -22,6 +23,7 @@
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 描述 * @Description: 描述
--> -->
<template> <template>
<view class="appCotent">
<div class="userInfo"> <div class="userInfo">
<div class="info__cover" @click="select"> <div class="info__cover" @click="select">
<span class="cover__name">头像</span> <span class="cover__name">头像</span>
...@@ -16,6 +17,7 @@ ...@@ -16,6 +17,7 @@
<active-form :formDate.sync="formData"></active-form> <active-form :formDate.sync="formData"></active-form>
</view> </view>
</div> </div>
</view>
</template> </template>
<script> <script>
......
<template> <template>
<view class="appCotent">
<view class="content"> <view class="content">
<view class="release"> <view class="release">
release release
</view> </view>
</view> </view>
</view>
</template> </template>
<script> <script>
......
<template> <template>
<view class="appCotent">
<div class="shop__detail"> <div class="shop__detail">
<div class="top__swiper"> <div class="top__swiper">
<u-swiper radius='0' :list="list6" @change="e => currentNum = e.current" :autoplay="false" height='358' indicatorStyle="right: 20px"> <u-swiper radius='0' :list="list6" @change="e => currentNum = e.current" :autoplay="false" height='358' indicatorStyle="right: 20px">
...@@ -24,6 +25,7 @@ ...@@ -24,6 +25,7 @@
<div class="shop__btn view__no__bind" @click="pay">立即购买</div> <div class="shop__btn view__no__bind" @click="pay">立即购买</div>
<u-gap bgColor="transparent" height="80"></u-gap> <u-gap bgColor="transparent" height="80"></u-gap>
</div> </div>
</view>
</template> </template>
<script> <script>
......
<template> <template>
<view class="appCotent">
<view> <view>
<custom-tarbar :selected="3"></custom-tarbar> <custom-tarbar :selected="3"></custom-tarbar>
<view class="shop"> <view class="shop">
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
临时停车牌 临时停车牌
</div> </div>
<div class="one__item__price"> <div class="one__item__price">
¥25.5<span>¥39.9</span> ¥25.5<span class="num__two">¥39.9</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -41,6 +42,7 @@ ...@@ -41,6 +42,7 @@
</view> </view>
<u-gap bgColor="transparent" height="60"></u-gap> <u-gap bgColor="transparent" height="60"></u-gap>
</view>
</view> </view>
</template> </template>
...@@ -91,14 +93,14 @@ export default { ...@@ -91,14 +93,14 @@ export default {
flex-wrap: wrap; flex-wrap: wrap;
.one__item { .one__item {
width: 320rpx; width: 48%;
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;
margin-bottom: 30rpx; margin-bottom: 30rpx;
.one__item__img { .one__item__img {
width: 320rpx; width: 100%;
height: 320rpx; height: 320rpx;
background: #FFD4D4; background: #FFD4D4;
border-radius: 20rpx; border-radius: 20rpx;
...@@ -117,6 +119,7 @@ export default { ...@@ -117,6 +119,7 @@ export default {
color: #333333; color: #333333;
margin: 20rpx 0; margin: 20rpx 0;
text-indent: 20rpx; text-indent: 20rpx;
margin-bottom: 10rpx;
} }
.one__item__price { .one__item__price {
...@@ -124,7 +127,6 @@ export default { ...@@ -124,7 +127,6 @@ export default {
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #E1251B; color: #E1251B;
line-height: 42rpx;
text-indent: 20rpx; text-indent: 20rpx;
padding-bottom: 20rpx; padding-bottom: 20rpx;
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 支付 * @Description: 支付
--> -->
<template> <template>
<view class="appCotent">
<div class="pay"> <div class="pay">
<div class="address"> <div class="address">
<div class="address__left"> <div class="address__left">
...@@ -62,6 +63,7 @@ ...@@ -62,6 +63,7 @@
</div> </div>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 描述 * @Description: 描述
--> -->
<template> <template>
<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" />
...@@ -14,6 +15,7 @@ ...@@ -14,6 +15,7 @@
<div>返回首页</div> <div>返回首页</div>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 搜索商品 * @Description: 搜索商品
--> -->
<template> <template>
<view class="appCotent">
<div class="myMoveCar"> <div class="myMoveCar">
<div class="my__search"> <div class="my__search">
<u-search placeholder="请输入商品" :showAction='false' bgColor='#ffffff' v-model="keyword"></u-search> <u-search placeholder="请输入商品" :showAction='false' bgColor='#ffffff' v-model="keyword"></u-search>
...@@ -27,6 +28,7 @@ ...@@ -27,6 +28,7 @@
</div> </div>
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
* @Description: 描述 * @Description: 描述
--> -->
<template> <template>
<view class="appCotent">
<div> <div>
<div class="view__title">超低价养车好物</div> <div class="view__title">超低价养车好物</div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 扫码绑定 * @Description: 扫码绑定
--> -->
<template> <template>
<view class="appCotent">
<div class="scan"> <div class="scan">
<div class="contentMoveCar"> <div class="contentMoveCar">
<div class="car_item__one"> <div class="car_item__one">
...@@ -19,6 +20,7 @@ ...@@ -19,6 +20,7 @@
</div> </div>
<u-action-sheet :actions="list" @close='close' closeOnClickOverlay round='6' :show="show"></u-action-sheet> <u-action-sheet :actions="list" @close='close' closeOnClickOverlay round='6' :show="show"></u-action-sheet>
</div> </div>
</view>
</template> </template>
<script> <script>
...@@ -71,6 +73,9 @@ export default { ...@@ -71,6 +73,9 @@ export default {
.u-checkbox-group { .u-checkbox-group {
display: inline-block !important; display: inline-block !important;
} }
.u-checkbox-group--row{
display: inline-block !important;
}
.contentMoveCar { .contentMoveCar {
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* @Description: 新增车辆 * @Description: 新增车辆
--> -->
<template> <template>
<view class="appCotent">
<div class="addCar"> <div class="addCar">
<div class="view__content"> <div class="view__content">
1 1
...@@ -11,6 +12,7 @@ ...@@ -11,6 +12,7 @@
完成 完成
</div> </div>
</div> </div>
</view>
</template> </template>
<script> <script>
......
...@@ -2,4 +2,16 @@ ...@@ -2,4 +2,16 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
}
.num__two{
position: relative;
}
.num__two::before{
content:'';
width: 100%;
height: 1rpx;
background:#999 ;
position: absolute;
bottom: 16rpx;
left: 2rpx;
} }
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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