Merge branch 'test' of http://git.echepei.com/sailun/sailun-tbr-web into test

App.vue

@@ -78,4 +78,7 @@
 	.u-skeleton {
 		height: 100%;
 	}
+	.u-action[data-v-4c556b40]{
+		color: #FFFFFF !important;
+	}
 </style>

pages/home/my-stock/my-stock.vue

@@ -2,8 +2,8 @@
 	<view class="page">
 		<!-- 我的库存 -->
 		<view class="content-top">
-			<u-navbar :background="background" back-icon-color="#ffffff" is-fixed>
-				<u-search placeholder="请输入轮胎规格" v-model="keyword" style="margin-right: 26rpx;" @custom="handleSearch"></u-search>
+			<u-navbar :background="background" back-icon-color="#ffffff" is-fixed :border-bottom="false">
+				<u-search placeholder="请输入轮胎规格" v-model="keyword" style="margin-right: 26rpx;color: #FFFFFF !important;" @custom="handleSearch"></u-search>
 			</u-navbar>
 			<u-tabs ref="tabs" name="brandName" :list="brandlLst" bg-color="#0094FE" active-color="#ffffff" inactive-color="#ffffff"
 			 font-size="30" :current="current" @change="handleFilterBrand"></u-tabs>
@@ -105,8 +105,8 @@
 					url: '/baseReq/getBrandListByStoreId',
 					method: 'Post',
 					data: {
-						storeId:this.$store.state.storeInfo.storeId,
-						userId:this.$store.state.storeInfo.userId
+						storeId: this.$store.state.storeInfo.storeId,
+						userId: this.$store.state.storeInfo.userId
 					}
 				}).then(res => {
 					if (res.data.code == 0) {
@@ -150,11 +150,11 @@
 					url: '/homepage/storeGetStock',
 					method: 'post',
 					data: {
-						storeId:this.$store.state.storeInfo.storeId,
-						userId:this.$store.state.storeInfo.userId,
+						storeId: this.$store.state.storeInfo.storeId,
+						userId: this.$store.state.storeInfo.userId,
 						current: _this.currentPage,
 						pageSize: _this.pageSize,
-						brandCode: _this.currentBrand=="all"?"":_this.currentBrand,
+						brandCode: _this.currentBrand == "all" ? "" : _this.currentBrand,
 						specKey: _this.keyword
 					}
 				}).then(res => {
@@ -208,10 +208,11 @@
 </script>
 
 <style lang="scss" scoped>
-	.page{
+	.page {
 		width: 100%;
 		height: 100%;
 	}
+
 	.content-top {
 		background-color: #0094FE;
 		padding-bottom: 119rpx;
@@ -227,7 +228,7 @@
 		margin: 0 auto 0 auto;
 		border-radius: 20rpx;
 		background-color: #FFFFFF;
-	
+
 		padding: 26rpx;
 
 		.list-row {