lilei 2 年 前
コミット
0414721b70

+ 10 - 1
pages.json

@@ -334,7 +334,16 @@
 			    }
 			    
 			}
-		]
+		    ,{
+                    "path" : "videos/index",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "视频",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 	}],
 	"preloadRule": {
 		"pages/index/index": {

+ 11 - 15
pages/index/index.vue

@@ -65,7 +65,6 @@
 					<text>没有VIN,直接取货</text>
 				</view> -->
 				<view class="action-button flex" v-if="userInfo.sysUserFlag == '1'">
-					<view></view>
 					<view class="f1" @click="openTakeGood(1)">
 						<view class="icons"><u-icon name="shujuchaxun" custom-prefix="custom-icon"></u-icon></view>
 						<view class="tits">产品编码取货</view>
@@ -74,12 +73,11 @@
 						<view class="icons"><u-icon name="saomasoudan" custom-prefix="custom-icon"></u-icon></view>
 						<view class="tits">二维码/条形码取货</view>
 					</view>
-					<view></view>
 				</view>
 				<view style="margin-top: 20upx;">
 					<u-swiper mode="dot" bg-color="" img-mode="widthFix" @click="clickBanner" :interval="3000" :height="374" :list="imgList"></u-swiper>
 				</view>
-				<u-action-sheet :list="actionList" @click="clickAction" v-model="showAction"></u-action-sheet>
+				<!-- <u-action-sheet :list="actionList" @click="clickAction" v-model="showAction"></u-action-sheet> -->
 			</view>
 			<!-- 扫描记录 -->
 			<view class="list-box">
@@ -108,7 +106,7 @@
 			</view>
 			</view>
 		</view>
-		<u-tabbar :list="vuex_tabBarList" :before-switch="beforeSwitch" :mid-button="true"></u-tabbar>
+		<u-tabbar :list="vuex_tabBarList" :before-switch="beforeSwitch" :mid-button="false"></u-tabbar>
 	</view>
 </template>
 
@@ -585,24 +583,23 @@
 				padding:40upx 0 0 0;
 				justify-content: space-between;
 				> view{
-					text-align: center;
 					display: flex;
 					align-items: center;
-					flex-direction: column;
+					color: #fff;
+					border-radius: 10rpx;
+					width: 49%;
 				}
 				.f1{
-					width: 140rpx;
+					background: #ff9800;
 				}
 				.f2{
-					width: 150rpx;
+					background: #2196f3;
 				}
 				.icons{
-					font-size: 60rpx;
-					background: #066cff;
+					font-size: 50rpx;
 					color: #fff;
-					border-radius: 30rpx;
-					width: 110rpx;
-					height: 110rpx;
+					width: 80rpx;
+					height: 80rpx;
 					text-align:center;
 					display: flex;
 					align-items: center;
@@ -610,9 +607,8 @@
 					justify-content: center;
 				}
 				.tits{
-					font-size:30rpx;
+					font-size:28rpx;
 					font-weight: bold;
-					padding: 10upx  0;
 				}
 			}
 			.scanButton{

+ 1 - 1
pages/morePage/morePage.vue

@@ -88,7 +88,7 @@
 			</view>
 		</u-popup>
 	</view>
-	<u-tabbar :list="vuex_tabBarList" :before-switch="beforeSwitch" :mid-button="true"></u-tabbar>
+	<u-tabbar :list="vuex_tabBarList" :before-switch="beforeSwitch" :mid-button="false"></u-tabbar>
 	</view>
 </template>
 

+ 22 - 0
pagesA/videos/index.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

BIN
static/tab/midBtn.png


BIN
static/tab/tab_home_normal.png


BIN
static/tab/tab_home_pressed.png


BIN
static/tab/tab_scan_normal.png


BIN
static/tab/tab_scan_pressed.png


BIN
static/tab/tab_video_normal.png


BIN
static/tab/tab_video_pressed.png


+ 9 - 3
store/index.js

@@ -72,10 +72,16 @@ const store = new Vuex.Store({
 				'customIcon': false,
 			},
 			{
-				'iconPath': "/static/tab/midBtn.png",
-				'selectedIconPath': "/static/tab/midBtn.png",
+				'iconPath': "/static/tab/tab_scan_normal.png",
+				'selectedIconPath': "/static/tab/tab_scan_pressed.png",
 				'text': '扫描VIN',
-				'midButton': true,
+				'customIcon': false,
+			},
+			{
+				"pagePath": "/pagesA/videos/index",
+				"iconPath": "/static/tab/tab_video_normal.png",
+				"selectedIconPath": "/static/tab/tab_video_pressed.png",
+				"text": "视频",
 				'customIcon': false,
 			},
 			{