fix:盘点任务bug、用户名和手机号

pages/index/index.vue

@@ -11,7 +11,23 @@
 		</u-navbar>
 		<view class="container_main">
 			<view class="header-box">
-				<image src="@/static/image/home/home-top-img.png" mode=""></image>
+				<view class="user-content-box">
+					<view class="user-info-box">
+						<image src="@/static/image/home/avatar.png" mode=""></image>
+						<view class="user-info-content">
+							<view class="user-name">
+								{{userInfo.username}}
+							</view>	
+							<view class="user-phone">
+								{{userInfo.phonenum}}
+							</view>
+						</view>
+					</view>
+					<view class="user-txt">
+						您的移动仓库管家
+					</view>
+				</view>
+				<image src="@/static/image/home/home-top-img.png" class="header-bg" mode=""></image>
 			</view>
 			<view class="container_cont">
 				<view class="operate-item" v-for="(item,i) in operateList" :key="i" @click="operateClick(item)">
@@ -160,12 +176,60 @@
 	.container_box {
 		.container_main {
 			.header-box {
-				image {
+				position: relative;
+				height: 375rpx;
+				
+				.header-bg {
 					width: 100%;
 					height: 375rpx;
 				}
 			}
-
+			.user-content-box {
+				position: absolute;
+				bottom: 32rpx;
+				left: 32rpx;
+				z-index: 99;
+				
+				.user-info-box{
+					display: flex;
+					
+					image{
+						width: 80rpx;
+						height: 80rpx;
+						margin-right: 20rpx;
+					}
+					
+					.user-name{
+						font-family: PingFang SC;
+						font-weight: 500;
+						font-size: 32rpx;
+						color: #0F1828;
+					}	
+					
+					.user-phone{
+						font-family: PingFang SC;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #666666;
+					}
+				}
+				
+				.user-txt{
+					margin-top: 20rpx;
+					width: 350rpx;
+					height: 44rpx;
+					padding: 0 26rpx;
+					border-radius: 64rpx;
+					background: linear-gradient(90deg, #5CC4E8 0%, #0256FF 100%);
+					font-family: PingFang SC;
+					font-weight: 500;
+					font-size: 24rpx;
+					letter-spacing: 2;
+					text-align-last: justify;
+					line-height: 44rpx;
+					color: #FFFFFF;
+				}
+			}
 		}
 		.container_cont {
 			padding: 32rpx;

pages/inventory-task/detail.vue

@@ -165,18 +165,20 @@
           >
           </u-button>
           <u-tag
-            text="盘亏"
+						:text="`盘亏${item.inventory-item.newInventory}`"
             type="error"
             plain
             plainFill
+						class="action-btn"
             v-if="item.status === 3"
           >
           </u-tag>
           <u-tag
-            text="盘盈"
+            :text="`盘盈${item.newInventory-item.inventory}`"
             type="error"
             plain
             plainFill
+						class="action-btn"
             v-if="item.status === 2"
           >
           </u-tag>
@@ -185,6 +187,7 @@
 					  type="success"
 					  plain
 					  plainFill
+						class="action-btn"
 					  v-if="item.status === 4"
 					>
 					</u-tag>
@@ -192,6 +195,7 @@
 					  text="未盘"
 					  plain
 					  plainFill
+						class="action-btn"
 					  v-if="item.status === 1"
 					>
 					</u-tag>
@@ -374,6 +378,7 @@ export default {
 						item.imgNameArr = []
 					}
 				})
+				console.log('rows======',rows)
         this.goodsList = [...this.goodsList, ...rows];
         if (pageNum * pageSize < Number(total)) {
           this.pageNum++;
@@ -707,10 +712,10 @@ export default {
         gap: 24rpx;
 
         .action-btn {
-          width: 144rpx;
           height: 56rpx;
           padding: 0;
-
+					margin-left: 20rpx;
+					
           &-secondary {
             background-color: transparent;
             border-color: #ff9900;

pages/login/components/account-login.vue

@@ -20,18 +20,16 @@
 
       <u-form-item prop="password" label="密码">
         <view class="input-line">
-					<u-input
+					<input
 						:type="passwordType"
 						placeholder="请输入密码"
 						v-model="model.password"
 						border="none"
 					>
-						<template slot="suffix">
-							<view class="eye-box" @click="eyeClick">
-								<u-icon :name="eyeIcon"></u-icon>
-							</view>
-						</template>
-					</u-input>
+					</input>
+					<view class="eye-box" @click="eyeClick">
+						<u-icon :name="eyeIcon"></u-icon>
+					</view>
         </view>
       </u-form-item>
     </u-form>
@@ -83,6 +81,7 @@
 								...res.data.user
 							}
 							this.$store.dispatch('userLogin',userInfo)
+							console.log('userInfo======',userInfo)
 						} else if (res.data.msgTip === 'user is not exist') {
 							uni.$u.toast("用户不存在")
 						} else if (res.data.msgTip === 'user password error') {
@@ -120,6 +119,10 @@
   padding-left: 30rpx;
   height: 88rpx;
   box-sizing: border-box;
+	
+	input{
+		width: 100%;
+	}
 }
 .eye-box {
 	width: 100rpx;

pages/picking-task/delivery.vue

@@ -257,6 +257,7 @@
 				.then(res=>{
 					if(res.code == 200) {
 						this.orderInfo = res.data
+						console.log('this.orderInfo====',this.orderInfo)
 					}
 				})
 			},

pages/picking-task/index.vue

@@ -173,6 +173,7 @@
 							this.status = 'nomore'
 						}
 						this.taskList =[...this.taskList,...res.data.rows];
+						console.log('taskList========',res.data.rows)
 					}
 					uni.hideLoading()
 				})