Commit e1f2a087 authored by 程新智's avatar 程新智 👽

优化

parent a1a6611c
...@@ -82,7 +82,6 @@ export default { ...@@ -82,7 +82,6 @@ export default {
onLoad() {}, onLoad() {},
methods: { methods: {
setSelected(index) { setSelected(index) {
console.log(index);
if (index != 2) { if (index != 2) {
uni.navigateTo({ uni.navigateTo({
url: this.tabBar.list[index].pagePath, url: this.tabBar.list[index].pagePath,
...@@ -90,6 +89,9 @@ export default { ...@@ -90,6 +89,9 @@ export default {
} 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);
...@@ -135,10 +137,12 @@ export default { ...@@ -135,10 +137,12 @@ export default {
height: 80upx; height: 80upx;
text-align: center; text-align: center;
} }
.tarbar-list-li:nth-of-type(2){
.tarbar-list-li:nth-of-type(2) {
padding-right: 40rpx; padding-right: 40rpx;
} }
.tarbar-list-li:nth-of-type(4){
.tarbar-list-li:nth-of-type(4) {
padding-left: 40rpx; padding-left: 40rpx;
} }
...@@ -164,8 +168,9 @@ export default { ...@@ -164,8 +168,9 @@ export default {
color: #666666; color: #666666;
margin-top: 10rpx; margin-top: 10rpx;
} }
.tarbar-list-li-name__active{
width: 100%; .tarbar-list-li-name__active {
width: 100%;
text-align: center; text-align: center;
line-height: 30upx; line-height: 30upx;
font-size: 20upx; font-size: 20upx;
...@@ -175,6 +180,7 @@ export default { ...@@ -175,6 +180,7 @@ export default {
color: rgba(225, 37, 27, 1); color: rgba(225, 37, 27, 1);
margin-top: 10rpx; margin-top: 10rpx;
} }
.tarbar-list-li-center { .tarbar-list-li-center {
width: 100upx; width: 100upx;
position: absolute; position: absolute;
......
...@@ -41,7 +41,7 @@ export default { ...@@ -41,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: "扫一扫联系车主"
}, },
{ {
...@@ -50,7 +50,7 @@ export default { ...@@ -50,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"),
......
...@@ -198,7 +198,6 @@ __webpack_require__.r(__webpack_exports__); ...@@ -198,7 +198,6 @@ __webpack_require__.r(__webpack_exports__);
onLoad: function onLoad() {}, onLoad: function onLoad() {},
methods: { methods: {
setSelected: function setSelected(index) { setSelected: function setSelected(index) {
console.log(index);
if (index != 2) { if (index != 2) {
uni.navigateTo({ uni.navigateTo({
url: this.tabBar.list[index].pagePath }); url: this.tabBar.list[index].pagePath });
...@@ -206,6 +205,9 @@ __webpack_require__.r(__webpack_exports__); ...@@ -206,6 +205,9 @@ __webpack_require__.r(__webpack_exports__);
} else { } else {
//扫码 //扫码
// 允许从相机和相册扫码 // 允许从相机和相册扫码
uni.navigateTo({
url: '/pages/move-car/scan' });
uni.scanCode({ uni.scanCode({
success: function success(res) { success: function success(res) {
console.log('条码类型:' + res.scanType); console.log('条码类型:' + res.scanType);
......
...@@ -173,7 +173,7 @@ __webpack_require__.r(__webpack_exports__); ...@@ -173,7 +173,7 @@ __webpack_require__.r(__webpack_exports__);
return { return {
items: [{ items: [{
icon: __webpack_require__(/*! @/static/move-car/move-car6.png */ 183), icon: __webpack_require__(/*! @/static/move-car/move-car6.png */ 183),
url: "/pages/move-car/scan", url: "/pages/move-car/oneMoveCar",
title: "扫一扫联系车主" }, title: "扫一扫联系车主" },
{ {
...@@ -182,7 +182,7 @@ __webpack_require__.r(__webpack_exports__); ...@@ -182,7 +182,7 @@ __webpack_require__.r(__webpack_exports__);
title: "我的呼叫记录" }, title: "我的呼叫记录" },
{ {
icon: __webpack_require__(/*! @/static/move-car/move-car2.png */ 185), icon: __webpack_require__(/*! @/static/move-car/move-car2.png */ 185),
url: "/pages/move-car/oneMoveCar", url: "/pages/move-car/myMoveCar",
title: "我的挪车牌" }, title: "我的挪车牌" },
{ {
icon: __webpack_require__(/*! @/static/move-car/move-car4.png */ 186), icon: __webpack_require__(/*! @/static/move-car/move-car4.png */ 186),
......
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