lilei 11 달 전
부모
커밋
d77356b968
6개의 변경된 파일51개의 추가작업 그리고 28개의 파일을 삭제
  1. 42 16
      pages/index/index.vue
  2. 1 1
      pages/morePage/morePage.vue
  3. 1 1
      pages/promo/index.vue
  4. 1 1
      pages/videos/index.vue
  5. 5 9
      static/iconfont/iconfont.css
  6. 1 0
      store/index.js

+ 42 - 16
pages/index/index.vue

@@ -63,14 +63,15 @@
 				<!-- 扫描按钮 -->
 				<!-- 扫描按钮 -->
 				<view class="action-button flex" v-if="userInfo.sysUserFlag == '1'">
 				<view class="action-button flex" v-if="userInfo.sysUserFlag == '1'">
 					<view class="f1" @click="openTakeGood(1)">
 					<view class="f1" @click="openTakeGood(1)">
-						<view class="icons"><u-icon name="shujuchaxun" custom-prefix="custom-icon"></u-icon></view>
+						<view class="icons"><u-icon name="bianmachaxun" custom-prefix="custom-icon"></u-icon></view>
 						<view class="tits">产品编码取货</view>
 						<view class="tits">产品编码取货</view>
 					</view>
 					</view>
 					<view class="f2" @click="openTakeGood(0)">
 					<view class="f2" @click="openTakeGood(0)">
-						<view class="icons"><u-icon name="saomasoudan" custom-prefix="custom-icon"></u-icon></view>
+						<view class="icons"><u-icon name="saoma" custom-prefix="custom-icon"></u-icon></view>
 						<view class="tits">二维码/条形码取货</view>
 						<view class="tits">二维码/条形码取货</view>
 					</view>
 					</view>
 				</view>
 				</view>
+				<!-- banner -->
 				<view style="margin-top: 20upx;">
 				<view style="margin-top: 20upx;">
 					<u-swiper mode="dot" bg-color="" img-mode="widthFix" @click="clickBanner" :interval="3000" :height="374" :list="imgList"></u-swiper>
 					<u-swiper mode="dot" bg-color="" img-mode="widthFix" @click="clickBanner" :interval="3000" :height="374" :list="imgList"></u-swiper>
 				</view>
 				</view>
@@ -102,7 +103,7 @@
 			</view>
 			</view>
 			</view>
 			</view>
 		</view>
 		</view>
-		<u-tabbar :list="vuex_tabBarList" :before-switch="beforeSwitch"></u-tabbar>
+		<u-tabbar :list="vuex_tabBarList" :before-switch="beforeSwitch" :midButton="vuex_tabBarList.length==5"></u-tabbar>
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -247,6 +248,9 @@
 					// 查询红包活动
 					// 查询红包活动
 					this.getRedPacketRule()
 					this.getRedPacketRule()
 				}
 				}
+			}else{
+				// 隐藏促销模块
+				this.hidePromoTab()
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
@@ -379,7 +383,6 @@
 			// 获取上方滚动扫描记录
 			// 获取上方滚动扫描记录
 			getScrollLog(){
 			getScrollLog(){
 				scanVinLogQueryRoll({pageNo:1,pageSize:50}).then(res => {
 				scanVinLogQueryRoll({pageNo:1,pageSize:50}).then(res => {
-					console.log(res)
 					this.list = res.data.list || []
 					this.list = res.data.list || []
 					this.list.map(item => {
 					this.list.map(item => {
 						item.placeText = item.userName + '刚刚扫描了一个VIN'
 						item.placeText = item.userName + '刚刚扫描了一个VIN'
@@ -411,16 +414,38 @@
 							// 获取轮播数据
 							// 获取轮播数据
 							this.getCarousel()
 							this.getCarousel()
 							// 显示促销模块
 							// 显示促销模块
-							this.$store.state.vuex_tabBarList.splice(1,0,{
-								"pagePath": "/pages/promo/index",
-								"iconPath": "/static/tab/tab_promo_normal.png",
-								"selectedIconPath": "/static/tab/tab_promo_pressed.png",
-								"text": "促销",
-								'customIcon': false,
-							})
+							this.showPromoTab()
+						}else{
+							// 隐藏促销模块
+							this.hidePromoTab()
 						}
 						}
 				})
 				})
 			},
 			},
+			// 显示促销模块
+			showPromoTab(){
+				this.$store.state.vuex_tabBarList.splice(1,0,{
+					"pagePath": "/pages/promo/index",
+					"iconPath": "/static/tab/tab_promo_normal.png",
+					"selectedIconPath": "/static/tab/tab_promo_pressed.png",
+					"text": "促销",
+					'customIcon': false,
+				})
+				// 居中透出显示扫描按钮
+				this.$store.state.vuex_tabBarList[2].iconPath = "/static/tab/tab_scan_mid.png"
+				this.$store.state.vuex_tabBarList[2].midButton = true
+			},
+			// 隐藏促销模块
+			hidePromoTab(){
+				const promoIndex = this.$store.state.vuex_tabBarList.findIndex(item => item.text == '促销')
+				if(promoIndex > -1){
+					this.$store.state.vuex_tabBarList.splice(promoIndex,1)
+				}
+				const scanTab = this.$store.state.vuex_tabBarList.find(item => item.text == '扫描VIN')
+				if(scanTab){
+					scanTab.iconPath = "/static/tab/tab_scan_normal.png"
+					scanTab.midButton = false
+				}
+			},
 			// 查询是有红包活动
 			// 查询是有红包活动
 			getRedPacketRule(){
 			getRedPacketRule(){
 				findCurrentRewardRule().then(res => {
 				findCurrentRewardRule().then(res => {
@@ -646,12 +671,13 @@
 					color: #fff;
 					color: #fff;
 					border-radius: 10rpx;
 					border-radius: 10rpx;
 					width: 49%;
 					width: 49%;
+					box-shadow: 0rem 0.3rem 0.5rem #d9dada;
 				}
 				}
 				.f1{
 				.f1{
-					background: #ff9800;
+					background: #2196f3;
 				}
 				}
 				.f2{
 				.f2{
-					background: #2196f3;
+					background: #FF9800;
 				}
 				}
 				.icons{
 				.icons{
 					font-size: 50rpx;
 					font-size: 50rpx;
@@ -723,10 +749,10 @@
 				position:relative;
 				position:relative;
 				left:0;
 				left:0;
 				bottom:-1rem;
 				bottom:-1rem;
-				padding:0.8em;
+				padding: 0.5rem 0.8rem;
 				background: #fff;
 				background: #fff;
-				border-radius: 0.5em;
-				box-shadow: 0.3em 0.3em 1em #c4e5ee;
+				border-radius: 0.5rem;
+				box-shadow: 0rem 0.5rem 0.5rem #bcdede;
 				.userCard-info{
 				.userCard-info{
 					flex-grow:1;
 					flex-grow:1;
 					> view{
 					> view{

+ 1 - 1
pages/morePage/morePage.vue

@@ -112,7 +112,7 @@
 			</view>
 			</view>
 		</u-popup>
 		</u-popup>
 	</view>
 	</view>
-	<u-tabbar :list="vuex_tabBarList" :before-switch="beforeSwitch"></u-tabbar>
+	<u-tabbar :list="vuex_tabBarList" :before-switch="beforeSwitch" :midButton="vuex_tabBarList.length==5"></u-tabbar>
 	</view>
 	</view>
 </template>
 </template>
 
 

+ 1 - 1
pages/promo/index.vue

@@ -21,7 +21,7 @@
 				 </view>
 				 </view>
 			</scroll-view>     
 			</scroll-view>     
 		</view>
 		</view>
-		<u-tabbar :list="vuex_tabBarList" :before-switch="beforeSwitch"></u-tabbar>
+		<u-tabbar :list="vuex_tabBarList" :before-switch="beforeSwitch" :midButton="vuex_tabBarList.length==5"></u-tabbar>
 	</view>
 	</view>
 </template>
 </template>
 
 

+ 1 - 1
pages/videos/index.vue

@@ -36,7 +36,7 @@
 					</swiper-item>
 					</swiper-item>
 				</swiper>
 				</swiper>
 		</view>
 		</view>
-		<u-tabbar :list="vuex_tabBarList" :before-switch="beforeSwitch"></u-tabbar>
+		<u-tabbar :list="vuex_tabBarList" :before-switch="beforeSwitch" :midButton="vuex_tabBarList.length==5"></u-tabbar>
 	</view>
 	</view>
 </template>
 </template>
 
 

+ 5 - 9
static/iconfont/iconfont.css

@@ -1,7 +1,7 @@
 @font-face {
 @font-face {
   font-family: "custom-icon"; /* Project id 3658445 */
   font-family: "custom-icon"; /* Project id 3658445 */
   src: 
   src: 
-       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAATYAAsAAAAACeQAAASJAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDHAqGYIVdATYCJAMQCwoABCAFhQsHUhuTCMg+QCa3+oG0UCZrZlC2yYl7dvRdCsFdfPERD//tR7tvZv5fEYki1vZsXIdEUg+FSqISM4SqVuk7ZFfOnjz7MFGZ1X0FOWXSc2st818AUFElkkBofzJ7OaD87GULyra6uhWyUynLg3Pb/qTefrJm8SwWCqEQ6nnkCdEqmiARX1FJhUwuAA4miF90pbKWRGD2Ii/Pd7/SP/t2cAsXawD8R8/firikpANbu0hLOopKuwM5wBI6Mb1FPJ9cqiZm1lsEmi0xhjnYPb6G9oekOQzDYb2B0z8eRgFB492jEIbQaK/TnllQ2Aoq0ivkiNfGz8c/K0ECkioDdp2T2zsevP+UviPY0n/k97QeAfZOqJAx1zJf3KUj19VYlTlYzVGlWhvAudQoUeoy73fk//8z1yvcyP/lkSVB1IDhVoRr1czPPsk4yjy4JFD2gZsBXLQzGtEFxBIAcQHMNmq01Cp1J/wxLpYsnROj8dJ0uhCbQG1YIbBsScHr58BLNK+GTqlJbxgLvVQuSuUpJXQTQFEhBKql4SwOTaEgZUMKiYcv9iZTigDFRYF0tFFtWJVNBdfBuo+P8n4tu37Xn0/r9SIaQl5d5C7h9ee1h3OzrpUUMpHhi5Tqx/vzIRrKemXeTMcXwuhelk1TmZ5OV2lnZ2TpBCfF18pDbVj4dE10jiYo15Zp3dzu08sIHH+/n4yp6Plcbl1cXS88PD1P3vXHm9HuwdmtgTd3Ng6CXDAX7kgPF2oYOYpgLQlKkVfzzHIYUrmUq8R15tDttUW2sNCaro6JIiRPICJdn7+zEpFe9Lf3GfC92n9L/GqdRsg0qEGaLAkpEwqSjkaqbLFPBd30M83l7vfBeTcat9izbQ+3UQvzEVdB6rKrdYqskm9paS0/5COVe8St+dDLLwV1SL9q1a5GAyP7eaSGeMHD/u7Z+lR8eu+hRJB6cbpvi+G3yC9KweX4UTjS+m/W/FeeYbgNl+eHp20oM7BLitPsNpT6JOx2lOk06671HMUwFLNKMpHO4+rel66UELZqoNp9o+kV+fy+TQ+I/Mgw/WZwwetnPzJBnl2ApwCXCsRaGKYyO+vWzndZ6rjby+P/RVY6DH+NVvmUT0cXkc/HHjdsauYo29y1YgNAiXs7pQAIxuDSVxWPHEGlhGae4BIS3Z7LcPRsu1Bo8bA3lDQYz2Yt2t6XosUSgArughoeomaz3OjS9i9UIwoZMKEFUOi3ipJ271DW7w4U+JOoNIEHNRRAza6G2tVaTERNKp1J2cPwPIyLkNwXw9S4QiWb/q98yYFLyT5H2sVbtkUEU1FNWTWivsc52+KOycgOFjIzfYxOlwyty70fp6lgarrEbHQmNlOriyoq0VHvMhORksEWixHFPCjcIxTHEDlfa1WGUxgNkZkmfs8lFnBSxNITiCjdYvaOI9wYpEaZajqwh/O0Y7bwuAx3AgsyKR9KbPPFkHWbQyzlFYFSo3eLMUPNiM1RqlqkgpNFp8Uz9dqyBT4HmrGPK4FBsAgOwYOWFyQZFeI8ylsjQnpwuUoexFFLRuhiF3ADAAAAAA==') format('woff2');
+       url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAPYAAsAAAAACEwAAAOJAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDBgqDeINIATYCJAMMCwgABCAFhQsHPhtQBxEVnHvIfibYtha2WFk/1LsIM6M2hUbSN0GAOu1kyU7qxCmw+wAM6fQAOBWApyeErZAAAXOrUys+AgxILyzd45enmXOeK8fZKdLw+T9muvo4oOhvA4CsoKSBzfJ5AmVdJuHd8wPyG8auvIiXIACTZrrQevUZNArPoumrlmBTGK0C4nyxaP7c6Ti5BlWTL3AiMNruVYj96KDt0K4B+/yfF19pkRM0dIlxybA5vWdR8qHKh/rSW+EF+Qy3BQGcrwE6IIFGK9OJKfWWccgw0ojELJMolG6gEGij+isq8DmqzFjzP54GwsDIdQNQD4q1k+LaDAj4UJ8NpZz/ITAAC0gCbkIQlGTgcIcEm+f5BVnKYej6Rr+dMd5Yl/+u+Mi4UVEGeGNMMzvVtSs/WYjIuEXmzjifU6FKzC1zxp+Km+Cw8uL4hCoyrvGUnATwxi517Yr1ORXapLxBVJPdfUWyncjC52jemLW77t+/N2z4kTMxGSEhY+49MJIfPhy98949b5FwVyiMTJbOUaZuacfD8c4m514j6cuDMcLkQi/RQZzvZgXYARYh17BrNDmbZp3zVLdKUkw4xc49ZZ+zAhq9OF/GtEURyGWfyrWTPp8a3541ZEk+O8BzHuLcL0o8wGaPsyhgcJctQXGBcwLjgvwPIy189J4p3U9XjSq49jwscWXpsX//ITViK21cWzO667m900bPaTaiadPhMyymp50+PGRC45t2J40kHkl5siV8bM7fwd3zO1DarcvYoJhW52s2jGEaABVliaxKY+Qj7dsf/huyj+wNmerb6b/TpQB4c8V/BHRXULTX4bx1i4D/KZ3UsqlSvSBVGcdeggAkK3C8KBWmqYUfWAgQ4EV/WWDrXBC4CIyhhoMqUOKiNlKBZkgddEQaoA80aWg4e7TFm5AI5QPUsQ9CQYhMqOHhKpSEeIxU4CdCx6YjDeCIgKYxzee51GnbkVEJvmH7g9dUjFUmulWh3OuDb2hbUixWRsEXcvWwHeZhKolfsSAPt6F+7CJiwDBluIx7O0yJYGcKqGVwIvs6jqbsWwZNuTtiSBHoDWz+gKeRwrinhNZUgmR9ze+5QVaTKFzfQEnoBTGXeDQZMBtM7ZBXSWlbc4Wbqw9rIYQBDGb3s4HLmk0omREC9vJZAdLEwPUI7VYjambaSoZ5Zflx9wEm4xyZJqRQ6CvK6rB5Vbwy7dSvla4DAAAA') format('woff2');
 }
 }
 
 
 .custom-icon {
 .custom-icon {
@@ -12,15 +12,11 @@
   -moz-osx-font-smoothing: grayscale;
   -moz-osx-font-smoothing: grayscale;
 }
 }
 
 
-.custom-icon-saomasoudan:before {
-  content: "\e63d";
+.custom-icon-saoma:before {
+  content: "\e61e";
 }
 }
 
 
-.custom-icon-chaxuntongji:before {
-  content: "\e62d";
-}
-
-.custom-icon-shujuchaxun:before {
-  content: "\e615";
+.custom-icon-bianmachaxun:before {
+  content: "\e629";
 }
 }
 
 

+ 1 - 0
store/index.js

@@ -78,6 +78,7 @@ const store = new Vuex.Store({
 				'selectedIconPath': "/static/tab/tab_scan_pressed.png",
 				'selectedIconPath': "/static/tab/tab_scan_pressed.png",
 				'text': '扫描VIN',
 				'text': '扫描VIN',
 				'customIcon': false,
 				'customIcon': false,
+				'midButton': false
 			},
 			},
 			{
 			{
 				"pagePath": "/pages/videos/index",
 				"pagePath": "/pages/videos/index",