lilei 2 سال پیش
والد
کامیت
273df9601a

+ 18 - 14
libs/axios.js

@@ -27,9 +27,16 @@ const request = (opts, hasToken) => {
 	let promise = new Promise(function(resolve, reject) {
 		uni.request(DefaultOpts).then(
 			(res) => {
+				console.log(res)
 				// 是否超时已跳转
 				let loginTimeOut = uni.getStorageSync('loginTimeOut');
 				if(res[0]&&res[0].errMsg.indexOf('request:fail')>=0){
+					uni.showToast({
+						icon:'none',
+						title: '网络请求失败,请检查网络连接情况',
+						mask: true,
+						duration: 4000 
+					})
 					resolve({
 						status: 6000,
 						message: "网络请求失败"
@@ -48,19 +55,16 @@ const request = (opts, hasToken) => {
 					resolve(ret)
 				}else{
 					if(ret.status == '401' || ret.status == '1099'){  //  未登录或登录过期
-					    // 除过查询未完成订单的请求
-						// if(opts.url.indexOf("order/unFinishedOrderRunStatus")<0){
-							uni.showToast({
-								icon:'none',
-								title: '未登录或登录已过期,请重新登录',
-								duration: 5000 
-							})
-							setTimeout(function() {
-								const currentRoute = getRoutePath();
-								const url = `/pages/login/login`
-								uni.redirectTo({ url })
-							}, 1000)
-						// }
+					   uni.showToast({
+					   	icon:'none',
+					   	title: '未登录或登录已过期,请重新登录',
+					   	duration: 5000 
+					   })
+					   setTimeout(function() {
+					   	const currentRoute = getRoutePath();
+					   	const url = `/pages/login/login`
+					   	uni.redirectTo({ url })
+					   }, 1000)
 					}
 					else{
 						console.log(opts.url,'opts.url')
@@ -73,7 +77,7 @@ const request = (opts, hasToken) => {
 									icon:'none',
 									title: ret.message,
 									mask: true,
-									duration: 3000 
+									duration: 4000 
 								})
 							}
 						}

+ 4 - 4
pages.json

@@ -379,7 +379,7 @@
             				},
 							{
 								"text": "",
-								"width":"10",
+								"width":"8",
 								"redDot" : false
 							}
             			]
@@ -502,7 +502,7 @@
             "path" : "pages/batchShelves/index",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "批量上架产品——选层",
+                "navigationBarTitleText": "批量上架—选层",
                 "enablePullDownRefresh": false
             }
             
@@ -557,7 +557,7 @@
             "path" : "pages/batchShelves/cartList",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "批量上架产品",
+                "navigationBarTitleText": "批量上架",
                 "enablePullDownRefresh": false,
 				"app-plus":{
 					"titleNView": {
@@ -568,7 +568,7 @@
 								"fontSrc": "/static/iconfont/iconfont.ttf",
 								"fontSize": "14",
 								"color": "#00aaff",
-								"width":"110px"
+								"width":"100px"
 							},
 							{
 								"text": "\ue6f5 打印贴签" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u

+ 2 - 2
pages/batchShelves/batchPrint/batchPrint.vue

@@ -229,11 +229,11 @@
 		.search{
 			padding: 0.1rem;
 			border-radius: 50rpx;
-			border:0.1rpx solid #eee;
+			border:1rpx solid #eee;
 			width: 100%;
 			.input{
 				flex-grow: 1;
-				padding: 0.1rpx;
+				padding: 4rpx;
 			}
 			.icon{
 				width: 13%;

+ 1 - 1
pages/batchShelves/batchPrint/productList.vue

@@ -125,7 +125,7 @@
 	}
 	.partList-title{
 		padding: 15rpx 20rpx;
-		border-bottom: 0.1rpx solid #eee;
+		border-bottom: 1rpx solid #eee;
 		width: 100%;
 		background-color: #fff;
 		> text{

+ 12 - 13
pages/batchShelves/searchProduct.vue

@@ -56,14 +56,12 @@
 					</view>
 				</view>
 			</view>
-			<view 
-			v-if="productList&&productList.length" 
-			style="color:#999;font-size: 26upx;text-align: center;padding: 20upx;">
-				最多显示前20条匹配产品,请尝试输入更多内容
-			</view>
 			<view v-if="productList && productList.length == 0">
 				<u-empty :text="noDataText" mode="list" :img-width="200" :margin-top="60"></u-empty>
 			</view>
+			<view style="padding: 20upx;" v-else>
+				<u-loadmore :status="status" :load-text="loadText" />
+			</view>
 		</view>
 	</view>
 </template>
@@ -82,7 +80,11 @@
 				noDataText: '暂无产品',
 				status: 'nomore',
 				shelfPlaceCode: '',
-				fromPage: null
+				fromPage: null,
+				loadText: {
+					loading: '努力加载中',
+					nomore: '最多显示前20条匹配产品,请尝试输入更多内容'
+				}
 			}
 		},
 		onLoad(options) {
@@ -129,9 +131,6 @@
 					this.productList = []
 					return
 				}
-				uni.showLoading({
-					title: "正在查询..."
-				})
 				let params = {
 					pageNo:1,
 					pageSize:20,
@@ -140,6 +139,7 @@
 					shelfTierCode: this.layer
 				}
 				console.log(params)
+				this.status = 'loading'
 				queryProductPage(params).then(res => {
 					console.log(res)
 					if(res.status == 200&&res.data&&res.data.page){
@@ -150,7 +150,6 @@
 						this.noDataText = '没有搜索到相关产品'
 					}
 					this.status = 'nomore'
-					uni.hideLoading()
 				})
 			},
 			// 新增
@@ -185,11 +184,11 @@
 				}
 				console.log(params)
 				shelfCartSave(params).then(res => {
+					uni.hideLoading()
 					if(res.status == 200){
 						this.toashMsg(res.message)
 						this.getProductList()
 					}
-					uni.hideLoading()
 				})
 			}
 		}
@@ -206,10 +205,10 @@
 			.search{
 				padding: 0.1rem;
 				border-radius: 50rpx;
-				border:0.1rpx solid #eee;
+				border:1rpx solid #eee;
 				.input{
 					flex-grow: 1;
-					padding: 0.1rpx;
+					padding: 4rpx;
 				}
 				.icon{
 					width: 13%;

+ 1 - 1
pages/common/printTag/printTag.vue

@@ -220,7 +220,7 @@
 			color: #222222;
 			display: flex;
 			justify-content: space-between;
-			border-bottom: 0.1rpx solid #eee;
+			border-bottom: 1rpx solid #eee;
 			padding: 15rpx 30rpx;
 			font-weight: bold;
 			.shelf-name{

+ 3 - 3
pages/latePlay/chooseProduct.vue

@@ -330,10 +330,10 @@
 				margin-top: 15upx;
 				padding: 0.1rem;
 				border-radius: 50rpx;
-				border:0.1rpx solid #eee;
+				border:1rpx solid #eee;
 				.input{
 					flex-grow: 1;
-					padding: 0.1rpx;
+					padding: 4rpx;
 				}
 				.icon{
 					width: 13%;
@@ -414,7 +414,7 @@
 					justify-content: space-between;
 					> view{
 						width: 45%;
-						border: 0.1rpx solid #eee;
+						border: 1rpx solid #eee;
 						padding: 15rpx;
 						border-radius: 50rpx;
 						text-align: center;

+ 2 - 2
pages/shelfSetting/bindProduct.vue

@@ -185,10 +185,10 @@
 			.search{
 				padding: 0.1rem;
 				border-radius: 50rpx;
-				border:0.1rpx solid #eee;
+				border:1rpx solid #eee;
 				.input{
 					flex-grow: 1;
-					padding: 0.1rpx;
+					padding: 4rpx;
 				}
 				.icon{
 					width: 13%;

+ 1 - 1
pages/shelfSetting/productList.vue

@@ -139,7 +139,7 @@
 	}
 	.partList-title{
 		padding: 10rpx 20rpx;
-		border-bottom: 0.1rpx solid #eee;
+		border-bottom: 1rpx solid #eee;
 		width: 100%;
 		position: fixed;
 		left: 0;

+ 3 - 3
pages/shelfSetting/searchShelfHw.vue

@@ -293,10 +293,10 @@
 			margin-top: 15upx;
 			padding: 0.1rem;
 			border-radius: 50rpx;
-			border:0.1rpx solid #eee;
+			border:1rpx solid #eee;
 			.input{
 				flex-grow: 1;
-				padding: 0.1rpx;
+				padding: 4rpx;
 			}
 			.icon{
 				width: 13%;
@@ -366,7 +366,7 @@
 				justify-content: space-between;
 				> view{
 					width: 45%;
-					border: 0.1rpx solid #ddd;
+					border: 1rpx solid #ddd;
 					padding: 15rpx;
 					border-radius: 50rpx;
 					text-align: center;

+ 4 - 4
pages/shelfSetting/shelfSet.vue

@@ -347,7 +347,7 @@
 	padding: 0 1rem;
 	margin: 0.5rem;
 	.card-row{
-		border-bottom: 0.1rpx solid #eee;
+		border-bottom: 1rpx solid #eee;
 		padding: 20rpx 0;
 		min-height: 90rpx;
 		&:last-child{
@@ -376,7 +376,7 @@
 			}
 		}
 		.search-btn{
-			border:0.1rpx solid #eee;
+			border:1rpx solid #eee;
 			border-radius: 50rpx;
 			width: 50%;
 			justify-content: space-between;
@@ -413,7 +413,7 @@
 				padding: 0.5rem;
 				padding-bottom: 105rpx;
 				> text{
-					border: 0.1rpx solid #eee;
+					border: 1rpx solid #eee;
 					padding: 0.2rem 0.8rem;
 					border-radius: 0.3rem;
 					margin: 0.5rem 2%;
@@ -422,7 +422,7 @@
 					text-align: center;
 				}
 				.red{
-					border-color: orangered;
+					border-color: #ff5500;
 				}
 				.add{
 					border-style: dashed;

+ 3 - 3
pages/stockCheck/startCheck.vue

@@ -629,10 +629,10 @@
 			margin-top: 15upx;
 			padding: 0.1rem;
 			border-radius: 50rpx;
-			border:0.1rpx solid #eee;
+			border:1rpx solid #eee;
 			.input{
 				flex-grow: 1;
-				padding: 0.1rpx;
+				padding: 4rpx;
 			}
 			.icon{
 				width: 13%;
@@ -765,7 +765,7 @@
 				justify-content: space-between;
 				> view{
 					width: 45%;
-					border: 0.1rpx solid #eee;
+					border: 1rpx solid #eee;
 					padding: 15rpx;
 					border-radius: 50rpx;
 					text-align: center;