ccj 3 年 前
コミット
ae3550eaa4

+ 27 - 32
pageA/product/lookup.vue

@@ -65,13 +65,13 @@
 						<view class='tag1 tag-red radius line-yellow' v-if="TabCur== 1">{{item.plannedSaleVolume}}吨
 						</view>
 					</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货" && TabCur== 0'>
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货" && TabCur== 0'>
 						今日基差</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0'>
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0'>
 						采购价格</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货" && TabCur== 1'>今日基差
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货" && TabCur== 1'>今日基差
 					</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1'>销售价格
+					<view style='font-size: 12px;color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1'>销售价格
 					</view>
 				</view>
 					</view>
@@ -184,10 +184,11 @@
 				}
 			},
 			init() {
-				this.loadDefaultKeyword();
-				this.loadOldKeyword();
-				this.loadHotKeyword();
-
+				if (this.hasLogin) {
+					this.loadDefaultKeyword();
+					this.loadOldKeyword();
+					this.loadHotKeyword();
+				}
 			},
 			search(e) {
 				if (e.detail.value.length == 0) {
@@ -238,6 +239,7 @@
 						searchKeyWord: this.searchKeyWord
 					}).then(res => {
 						uni.hideLoading()
+						console.log("res.data",res.data)
 						this.keywordList = res.data.data.records
 					})
 					.catch(res => {
@@ -759,7 +761,7 @@
 
 	.tag1 {
 		background: #F5F6F9;
-		padding: 5px;
+		padding: 2px;
 		color: #333333;
 		display: inline-flex;
 		font-size: 22rpx;
@@ -802,57 +804,50 @@
 		height: 40px;
 		line-height: 40px;
 		flex: 2.5;
-		border-bottom: 1px solid #EEEEEE;
+		/* border-bottom: 1px solid #EEEEEE; */
 	}
 
 	.introduce-section .address {
 		color: #878C9C;
 		font-size: 12px;
-		padding: 15px 0 10px;
+		/* padding: 15px 0 10px; */
 	}
 
 	.introduce-section .price {
-		padding: 10px 0 10px;
+		/* padding: 10px 0 10px; */
 		color: #FD714F;
 		font-size: 19px;
 		font-weight: 700;
 	}
-
-	/* 销售信息 */
-	.introduce-section {
+	.introduce-section .guess-item {
+		border-radius: 10px;
 		background: #fff;
 		padding: 0upx 30upx 20upx;
-		margin: 10px;
-		border-radius: 4px;
-
-		.guess-item {
-			padding-bottom: 20upx;
-			border-bottom: 1px solid #ccc;
-		}
-
+		margin: 8px;
+		/* border-bottom: 1px solid #ccc; */
+	}
+	/* 销售信息 */
+	.introduce-section {
 		.title-tip {
 			flex: 1;
 		}
-
+	
 		.price-box {
 			display: flex;
 			align-items: baseline;
-			height: 70upx;
-			padding: 10upx 0;
 			font-size: 26upx;
-			color: $uni-color-primary;
 		}
-
+	
 		.price {
 			font-size: $font-lg + 2upx;
 		}
-
+	
 		.m-price {
 			margin: 0 12upx;
 			color: $font-color-light;
 			text-decoration: line-through;
 		}
-
+	
 		.coupon-tip {
 			align-items: center;
 			padding: 4upx 10upx;
@@ -863,14 +858,14 @@
 			line-height: 1;
 			transform: translateY(-4upx);
 		}
-
+	
 		.bot-row {
 			display: flex;
 			align-items: center;
 			height: 50upx;
 			font-size: $font-sm;
 			color: $font-color-light;
-
+	
 			view {
 				flex: 1;
 			}

+ 1 - 0
pages/business/business.vue

@@ -138,6 +138,7 @@
 		},
 		onShow() {
 			uni.showTabBar()
+			uni.hideKeyboard()
 			var userInfo = uni.getStorageSync("userInfo")
 			var that = this
 			console.log("userInfo", userInfo)

+ 2 - 0
pages/sale/information.vue

@@ -170,6 +170,8 @@
 		},
 		onReady() {},
 		onShow() {
+			
+			uni.hideKeyboard()
 			uni.showTabBar()
 			this.pages = 1
 			this.isLoadMore = false

+ 1 - 0
pages/tran/tran.vue

@@ -124,6 +124,7 @@
 			},
 			onShow() {
 				uni.showTabBar()
+				uni.hideKeyboard()
 				this.loadData()
 				var userInfo = uni.getStorageSync("userInfo")
 				var that = this

+ 2 - 0
pages/user/user.vue

@@ -200,6 +200,8 @@
 			}
 		},
 		onShow() {
+			
+			uni.hideKeyboard()
 			uni.showTabBar()
 			this.loadData()
 			console.log("hasLogin",this.hasLogin )