Browse Source

bug 修复

lilei 2 years ago
parent
commit
216632f659

+ 1 - 1
pages/digitalShelf/choosePart.vue

@@ -160,7 +160,7 @@
 				合计:<text>¥{{totalAmount}}</text>
 				合计:<text>¥{{totalAmount}}</text>
 			</view>
 			</view>
 			<div>
 			<div>
-				<u-button type="primary" :loading="saveLoading" @click="submitForm" :custom-style="{background:'#066cff',fontSize:'32rpx'}" shape="circle">立即提交</u-button>
+				<u-button type="primary" :loading="saveLoading" @click="submitForm" :custom-style="{background:'#066cff',fontSize:'32rpx'}" shape="circle">确认拿货</u-button>
 			</div>
 			</div>
 		</div>
 		</div>
 		<!-- 已选配件 购物车 -->
 		<!-- 已选配件 购物车 -->

+ 5 - 5
pages/digitalShelf/choosePartResult.vue

@@ -22,7 +22,7 @@
 				<u-tabs :list="[{name:'货架订单',value:0},{name:'急送订单',value:1}]" :is-scroll="false" :current="current" @change="changeTab"></u-tabs>
 				<u-tabs :list="[{name:'货架订单',value:0},{name:'急送订单',value:1}]" :is-scroll="false" :current="current" @change="changeTab"></u-tabs>
 				<view v-if="current==0">
 				<view v-if="current==0">
 					<view class="infoList" v-if="partList.length">
 					<view class="infoList" v-if="partList.length">
-						<view class="title">请在货架上按照指定位置拿取配件</view>
+						<view class="title"><u-icon name="info-circle"></u-icon> 请在货架上按照指定位置拿取配件</view>
 						<view>
 						<view>
 							{{partList.length}}款,共<text class="redText">{{totalNums}}</text>件
 							{{partList.length}}款,共<text class="redText">{{totalNums}}</text>件
 						</view>
 						</view>
@@ -50,7 +50,7 @@
 				</view>
 				</view>
 				<view v-if="current==1">
 				<view v-if="current==1">
 					<view class="infoList" v-if="tempPartList.length">
 					<view class="infoList" v-if="tempPartList.length">
-						<view class="title">请耐心等待汽配经销商进行配送</view>
+						<view class="title"><u-icon name="info-circle"></u-icon> 请耐心等待汽配经销商进行配送</view>
 						<view>
 						<view>
 							{{tempPartList.length}}款,共<text class="redText">{{totalTempNums}}</text>件
 							{{tempPartList.length}}款,共<text class="redText">{{totalTempNums}}</text>件
 						</view>
 						</view>
@@ -147,7 +147,7 @@
 		  this.state = option.state
 		  this.state = option.state
 		  console.log(this.info,'-------------')
 		  console.log(this.info,'-------------')
 		  if(option.state==1){
 		  if(option.state==1){
-			  this.statusText = '提交成功'
+			  this.statusText = '拿货成功'
 			  this.statusIcon = 'checkmark-circle'
 			  this.statusIcon = 'checkmark-circle'
 			  // 获取配件列表
 			  // 获取配件列表
 			  this.partList = this.info.shelfOrder ? this.info.shelfOrder.shelfOrderDetailList : []
 			  this.partList = this.info.shelfOrder ? this.info.shelfOrder.shelfOrderDetailList : []
@@ -155,7 +155,7 @@
 			  this.shelfOrderSn = this.info.shelfOrder ? this.info.shelfOrder.shelfOrderSn : ''
 			  this.shelfOrderSn = this.info.shelfOrder ? this.info.shelfOrder.shelfOrderSn : ''
 			  this.current = this.partList.length ? 0 : 1
 			  this.current = this.partList.length ? 0 : 1
 		  }else{
 		  }else{
-			  this.statusText = '提交失败'
+			  this.statusText = '拿货失败'
 			  this.statusIcon = 'close-circle'
 			  this.statusIcon = 'close-circle'
 		  }
 		  }
 		  
 		  
@@ -305,7 +305,7 @@
 				padding:20rpx 0;
 				padding:20rpx 0;
 				border-bottom: 2rpx solid #f2f2f2;
 				border-bottom: 2rpx solid #f2f2f2;
 				.title{
 				.title{
-					color: #999;
+					color: #ff7423;
 					font-size: 28rpx;
 					font-size: 28rpx;
 				}
 				}
 				> text{
 				> text{

+ 51 - 4
pages/index/index.vue

@@ -60,10 +60,22 @@
 					<u-icon name="scan" size="60"></u-icon><text class="ml10">扫描VIN</text>
 					<u-icon name="scan" size="60"></u-icon><text class="ml10">扫描VIN</text>
 				</view> -->
 				</view> -->
 				<!-- 直接取货 -->
 				<!-- 直接取货 -->
-				<view class="scanButton flex align_center" v-if="userInfo.sysUserFlag == '1'" @click="openTakeGood">
+				<!-- <view class="scanButton flex align_center" v-if="userInfo.sysUserFlag == '1'" @click="openTakeGood">
 					<text>没有VIN,直接取货</text>
 					<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>
+					</view>
+					<view class="f2" @click="openTakeGood(0)">
+						<view class="icons"><u-icon name="saomasoudan" custom-prefix="custom-icon"></u-icon></view>
+						<view class="tits">二维码/条形码取货</view>
+					</view>
+					<view></view>
 				</view>
 				</view>
-				<view class="flex align_center justify_center">
+				<view class="flex align_center justify_center" style="margin-top: 20upx;">
 					<u-image src="/static/banner1.png" width="645" height="504"></u-image>
 					<u-image src="/static/banner1.png" width="645" height="504"></u-image>
 				</view>
 				</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>
@@ -358,10 +370,11 @@
 			},
 			},
 			// 保证金支付
 			// 保证金支付
 			toPayBondAmount(){},
 			toPayBondAmount(){},
-			openTakeGood(){
+			openTakeGood(index){
 				// 已有数字货架
 				// 已有数字货架
 				if(this.hasShelf){
 				if(this.hasShelf){
-					this.showAction = true
+					// this.showAction = true
+					this.clickAction(index)
 				}else{
 				}else{
 					uni.showToast({
 					uni.showToast({
 						icon:'none',
 						icon:'none',
@@ -524,6 +537,40 @@
 					margin-left: 1em;
 					margin-left: 1em;
 				}
 				}
 			}
 			}
+			.action-button{
+				padding:40upx 0 0 0;
+				justify-content: space-between;
+				> view{
+					text-align: center;
+					display: flex;
+					align-items: center;
+					flex-direction: column;
+				}
+				.f1{
+					width: 140rpx;
+				}
+				.f2{
+					width: 150rpx;
+				}
+				.icons{
+					font-size: 70rpx;
+					background: #066cff;
+					color: #fff;
+					border-radius: 30rpx;
+					width: 120rpx;
+					height: 120rpx;
+					text-align:center;
+					display: flex;
+					align-items: center;
+					flex-direction: column;
+					justify-content: center;
+				}
+				.tits{
+					font-size:30rpx;
+					font-weight: bold;
+					padding: 10upx  0;
+				}
+			}
 			.scanButton{
 			.scanButton{
 				margin: 0.8em 0 0.5em;
 				margin: 0.8em 0 0.5em;
 				padding: 0.5em;
 				padding: 0.5em;

File diff suppressed because it is too large
+ 1 - 1
static/iconfont/iconfont.css


Some files were not shown because too many files changed in this diff