|
@@ -63,14 +63,15 @@
|
|
|
<!-- 扫描按钮 -->
|
|
|
<view class="action-button flex" v-if="userInfo.sysUserFlag == '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>
|
|
|
<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>
|
|
|
</view>
|
|
|
+ <!-- banner -->
|
|
|
<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>
|
|
@@ -102,7 +103,7 @@
|
|
|
</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>
|
|
|
</template>
|
|
|
|
|
@@ -247,6 +248,9 @@
|
|
|
// 查询红包活动
|
|
|
this.getRedPacketRule()
|
|
|
}
|
|
|
+ }else{
|
|
|
+ // 隐藏促销模块
|
|
|
+ this.hidePromoTab()
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
@@ -379,7 +383,6 @@
|
|
|
// 获取上方滚动扫描记录
|
|
|
getScrollLog(){
|
|
|
scanVinLogQueryRoll({pageNo:1,pageSize:50}).then(res => {
|
|
|
- console.log(res)
|
|
|
this.list = res.data.list || []
|
|
|
this.list.map(item => {
|
|
|
item.placeText = item.userName + '刚刚扫描了一个VIN'
|
|
@@ -411,16 +414,38 @@
|
|
|
// 获取轮播数据
|
|
|
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(){
|
|
|
findCurrentRewardRule().then(res => {
|
|
@@ -646,12 +671,13 @@
|
|
|
color: #fff;
|
|
|
border-radius: 10rpx;
|
|
|
width: 49%;
|
|
|
+ box-shadow: 0rem 0.3rem 0.5rem #d9dada;
|
|
|
}
|
|
|
.f1{
|
|
|
- background: #ff9800;
|
|
|
+ background: #2196f3;
|
|
|
}
|
|
|
.f2{
|
|
|
- background: #2196f3;
|
|
|
+ background: #FF9800;
|
|
|
}
|
|
|
.icons{
|
|
|
font-size: 50rpx;
|
|
@@ -723,10 +749,10 @@
|
|
|
position:relative;
|
|
|
left:0;
|
|
|
bottom:-1rem;
|
|
|
- padding:0.8em;
|
|
|
+ padding: 0.5rem 0.8rem;
|
|
|
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{
|
|
|
flex-grow:1;
|
|
|
> view{
|