gjy 3 gadi atpakaļ
vecāks
revīzija
1f2bf0ebe7

+ 11 - 11
pageA/product/business_buy.vue

@@ -179,17 +179,17 @@
 				// this.basisBig = options.basisBig
 				// this.basisSmall = options.basisSmall
 				// this.unloadingFee = options.unloadingFee
-				this.purchaseOrder.seller = options.seller
-				this.purchaseOrder.goodsName = options.goodsName
-				this.purchaseOrder.receivePrivate = options.receivePrivate
-				this.purchaseOrder.receiveCity = options.receiveCity
-				this.purchaseOrder.receiveArea = options.receiveArea
-				this.purchaseOrder.minimumVolume = options.minimumVolume
-				this.purchaseOrder.buyer = options.buyer
-				this.purchaseOrder.customerName = options.customerName
-				this.purchaseOrder.basisPrice = options.basisPrice
-				this.purchaseOrder.unitPrice = options.unitPrice
-				this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
+				// this.purchaseOrder.seller = options.seller
+				// this.purchaseOrder.goodsName = options.goodsName
+				// this.purchaseOrder.receivePrivate = options.receivePrivate
+				// this.purchaseOrder.receiveCity = options.receiveCity
+				// this.purchaseOrder.receiveArea = options.receiveArea
+				// this.purchaseOrder.minimumVolume = options.minimumVolume
+				// this.purchaseOrder.buyer = options.buyer
+				// this.purchaseOrder.customerName = options.customerName
+				// this.purchaseOrder.basisPrice = options.basisPrice
+				// this.purchaseOrder.unitPrice = options.unitPrice
+				// this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
 				
 			},
 			onShow() {

+ 1 - 1
pageA/product/buydetails.vue

@@ -391,7 +391,7 @@
 </script>
 
 
-<style lang='scss'>
+<style scoped lang='scss'>
 	page {
 		background: $page-color-base;
 		/* padding-bottom: 160upx; */

+ 2 - 1
pageA/product/detail.vue

@@ -538,7 +538,7 @@
 </script>
 
 
-<style lang='scss'>
+<style scoped lang='scss'>
 	.title1{
 		position:absolute;
 		left:50%;
@@ -1106,6 +1106,7 @@
 		.title-tip {
 			flex:1.5;
 			color:#FD714F;font-size:30px;
+			    text-align: right;
 		}
 		.price-box {
 			display: flex;

+ 1 - 1
pageA/product/lookup.vue

@@ -344,7 +344,7 @@
 		}
 	}
 </script>
-<style>
+<style scoped>
 	.search-form{
 		    background: #F5F6F9;
 	}

+ 6 - 8
pages/business/business.vue

@@ -31,13 +31,13 @@
 			<view v-for="(item, index) in buyInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="price-box">
 					<view class="title">{{item.title}}</view>
-					<view class='flex justify-between'>
-						<view class='address'>
-							{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}{{item.receiveWarehouse}}
-						</view>
-						<view class='price' v-if='item.procurementPlanType=="期货"'>{{item.basisPrice}}<text style='font-size:13px;color:#333333;'>元/吨</text></view>
-						<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.unitPrice}}<text style='font-size:13px;color:#333;'>元/吨</text></view>
+				</view>
+				<view class='flex justify-between'>
+					<view class='address'>
+						{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}{{item.receiveWarehouse}}
 					</view>
+					<view class='price' v-if='item.procurementPlanType=="期货"'>{{item.basisPrice}}<text style='font-size:13px;color:#333333;'>元/吨</text></view>
+					<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.unitPrice}}<text style='font-size:13px;color:#333;'>元/吨</text></view>
 				</view>
 				<view class='flex justify-between'>
 					<view>
@@ -681,10 +681,8 @@ currentPage:this.currentPage,searchKeyWord:this.searchKeyWord,receivePrivate:thi
 		.price-box {
 			display: flex;
 			align-items: baseline;
-			height: 70upx;
 			padding: 10upx 0;
 			font-size: 26upx;
-			color: $uni-color-primary;
 		}
 
 		.price {

+ 3 - 0
pages/public/reset.vue

@@ -144,6 +144,9 @@
 						})
 						this.$api.doRequest('get','/commonUser/login',{phone:this.phone,password:this.password}).then(req => {
 						if(res.data.code==200){
+							this.$api.doRequest('post','/auth/api/loginEnhanced',{companyName: "易粮易运",
+							password: "y123456",
+							username: "13333333333"}).then(res => {})
 							uni.setStorageSync('userInfo', req.data.data)
 							that.$store.commit('login', req.data.data)
 							that.liangxinLogin()

+ 2 - 1
pages/user/user.vue

@@ -303,7 +303,8 @@
 				
 				})
 			},
-			gridClick (item, index) {	
+			gridClick (item, index) {
+				console.log(11111)
 				var that = this
 				if(item.name == "退出登录"){
 					this.logout()