chenrui 2 vuotta sitten
vanhempi
commit
f4c7999890
2 muutettua tiedostoa jossa 28 lisäystä ja 17 poistoa
  1. 11 4
      pages/vinAnalyse/fitProductlist.vue
  2. 17 13
      pages/vinAnalyse/shelfAnalyse.vue

+ 11 - 4
pages/vinAnalyse/fitProductlist.vue

@@ -48,8 +48,8 @@
 			<view class="sortPopup">
 				<view class="sortList" v-for="(item, i) in sortList" :key="i" :class="isSortFlag == i ? 'sortChecked' : ''" @click="chooseSort(i)">{{ item.name }}</view>
 				<view class="butBox u-flex u-row-between">
-					<u-button shape="circle" size="medium" @click="reset">重置</u-button>
-					<u-button shape="circle" size="medium" type="primary" @click="handelSort">确定</u-button>
+					<u-button hover-class="none" shape="circle" size="medium" @click="reset">重置</u-button>
+					<u-button hover-class="none" :custom-style="customBtnStyle"  shape="circle" size="medium" @click="handelSort">确定</u-button>
 				</view>
 			</view>
 		</u-popup>
@@ -93,7 +93,13 @@ export default {
 			noDataText: '暂无数据',
 			status: 'loading',
 			totalNum: 0,
-			total: 0
+			total: 0,
+			theme:'',
+			customBtnStyle: {  //  自定义按钮样式
+				borderColor: this.$config('primaryColor'),
+				backgroundColor: this.$config('primaryColor'),
+				color: '#fff'
+			}
 		};
 	},
 	onLoad(options) {
@@ -198,6 +204,7 @@ export default {
 				ajaxData.orderBy = 'xvfp.not_stock_count desc,xp.code asc';
 			}
 			this.sortShow = false;
+			console.log('11111:',ajaxData);
 			this.loadData(ajaxData);
 		}
 	},
@@ -312,7 +319,7 @@ export default {
 			margin-top: 100rpx;
 		}
 		.sortChecked {
-			background-color: #189dff;
+			background-color: rgb(0, 122, 255);
 			color: #ffffff;
 		}
 	}

+ 17 - 13
pages/vinAnalyse/shelfAnalyse.vue

@@ -66,7 +66,7 @@
 					<view>VIN详情</view>
 					<view class="st-detailList-item-con flex">
 						<view class="pimgs">
-							<u-image :src="tempData.icon?tempData.icon:`../../static/${tempData.icon}/def_img@2x.png`" width="100" height="100" border-radius="10"></u-image>
+							<u-image :src="tempData.icon?tempData.icon:`../../static/${theme}/def_img@2x.png`" width="100" height="100" border-radius="10"></u-image>
 						</view>
 						<view class="flex_1 pimgs_right">
 							<view class="padding_3">{{tempData.modelInfo || '--'}} </view>
@@ -89,10 +89,10 @@
 							>
 							<view class="nav-right-item flex">
 								<view class="uni-col-2">
-									<u-image :src="item.icon?item.icon:`../../static/${item.icon}/def_img@2x.png`" width="100" height="100" border-radius="30"></u-image>
+									<u-image :src="item.productImageUrl?'http:'+item.productImageUrl:`../../static/${theme}/def_img@2x.png`" width="100" height="100" border-radius="30"></u-image>
 								</view>
 								<view class="item-info uni-col-10">
-									<view class="item-name">
+									<view class="item-name u-line-2">
 										{{item.productName}}
 									</view>
 									<view class="item-detail">
@@ -458,30 +458,34 @@
 				}
 			}
 			.cpb_cart-list{
+				width: 75%;
+				height: 100%;
 				padding: 20rpx;
 				overflow: auto;
 				flex-grow: 1;
+				box-sizing: border-box;
 				> view{
 					margin-bottom: 20rpx;
 				}
 				.nav-right-item{
-					padding: 0 30upx;
+					padding: 0 20upx 20rpx;
 				}
 				.item-name{
 					font-size: 30rpx;
-					text{
-						background: rgba(3, 54, 146, 0.15);
-						color: #1c588a;
-						border-radius: 1em;
-						font-size: 0.8em;
-						padding: 0 0.5em;
-						margin-right: 10upx;
-					}
+					width:100%;
+					// text{
+					// 	background: rgba(3, 54, 146, 0.15);
+					// 	color: #1c588a;
+					// 	border-radius: 1em;
+					// 	font-size: 0.8em;
+					// 	padding: 0 0.5em;
+					// 	margin-right: 10upx;
+					// }
 				}
 				.item-info{
 					border-bottom:2rpx solid #eee;
 					flex-grow: 1;
-					padding-left: 0.2em;
+					padding-left: 20rpx;
 				}
 				.item-detail{
 					.item-detail-info{