Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

# Conflicts:
#	pageA/product/detail.vue

manifest.json

@@ -150,6 +150,9 @@
         },
         "splashscreen" : {
             "waiting" : false
+        },
+        "statusbar" : {
+            "immersed" : false
         }
     }
 }

pageA/product/detail.vue

@@ -119,10 +119,10 @@
 						<text>{{goods.buyer}}</text>
 					</view>
 				</view>
-				<view class="c-row" @click="contactUs">>
+				<view class="c-row" @click="contactUs">
 					<text class="tit">买方电话</text>
 					<view class="con-list">
-						<view>{{goods.buyerPhone}}<image style='width:11px;height:11px;' src='../../static/img/jiaoyi/gengduo1@3x.png'></image></a></view>
+						<view>{{goods.buyerPhone}}<image style='width:11px;height:11px;' src='../../static/img/jiaoyi/gengduo1@3x.png'></image></view>
 					</view>
 				</view>
 			</view>
@@ -132,67 +132,67 @@
 				<text>货物要求</text>
 			</view>
 			<view class="c-list">
-				<view class="c-row"  v-if="goods.waterContent!=null">
+				<view class="c-row"  v-if="goods.waterContent">
 					<text class="tit">水分（%）{{'<='}} </text>
 					<view class="con-list">
 						<text>{{goods.waterContent}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.bulkDensity!=null">
+				<view class="c-row" v-if="goods.bulkDensity">
 					<text class="tit">容重（g/L）{{'>='}}</text>
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.jiaorenli!=null">
+				<view class="c-row" v-if="goods.jiaorenli">
 					<text class="tit">热损伤（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.jiaorenli}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.impurity!=null">
+				<view class="c-row" v-if="goods.impurity">
 					<text class="tit">杂质（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.impurity}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.mildewGrain!=null">
+				<view class="c-row" v-if="goods.mildewGrain">
 					<text class="tit">霉变粒（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.mildewGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.imperfectGrain!=null">
+				<view class="c-row" v-if="goods.imperfectGrain">
 					<text class="tit">不完善粒（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.imperfectGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.protein!=null">
+				<view class="c-row" v-if="goods.protein">
 					<text class="tit">蛋白（%）{{'>='}} </text>
 					<view class="con-list">
 						<text>{{goods.protein}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.grain!=null">
+				<view class="c-row" v-if="goods.grain">
 					<text class="tit">粒型</text>
 					<view class="con-list">
 						<text>{{goods.grain}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.grade!=null">
+				<view class="c-row" v-if="goods.grade">
 					<text class="tit">品级</text>
 					<view class="con-list">
 						<text>{{goods.grade}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.outputPrivate!=null">
+				<view class="c-row" v-if="goods.outputPrivate">
 					<text class="tit">产地</text>
 					<view class="con-list">
 						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 					</view>
 				</view>
-				<view class="c-row" v-if="goods.outputYear!=null">
+				<view class="c-row" v-if="goods.outputYear">
 					<text class="tit">产出年份</text>
 					<view class="con-list">
 						<text>{{goods.outputYear}}</text>
@@ -1215,5 +1215,7 @@
 		padding:35px 10px;
 		border-radius:15px;
 	}
-	
+	a{
+		text-decoration: none;
+	}
 </style>

pageB/contract/look.vue

@@ -72,7 +72,7 @@
 			</view>
 		</view>
 		<view class='footer'>
-			<button class="btn" @click="commit1(goods)">添加发车信息</button>
+			<button class="btn car" @click="commit1(goods)">添加发车信息</button>
 		</view>
 		<!-- <view class="addcarwrap">
 				<view class="addcar" style="background-color: #FFFFFF;"
@@ -365,7 +365,7 @@
 	.center {
 		padding: 10px 20px;
 		background-color: #F5F6FA;
-		margin-bottom: 50px;
+		margin-bottom: 100px;
 	}
 
 	page {
@@ -1074,6 +1074,7 @@
 		bottom: 0;
 		width: 90%;
 		padding: 20px 0;
+		z-index:4;
 	}
 	.btn {
 		width: 90%;

pageB/info/info_list.vue

@@ -1,21 +1,21 @@
 <template>
 	<view class="introduce-section">
-		<view class="cu-card article no-card" style='width: 100%;'>
-			<view class="cu-item shadow factoryItem flex justify-between align-center">
-				<view style='flex:1;font-weight:900;'>合约</view>
-				<view style='flex:1;font-weight:900;'>最新价</view>
+		<view class="article no-card" style='width: 100%;'>
+			<view class="shadow factoryItem flex justify-between">
+				<view style='flex:1;color:#B2B3BB;'>合约</view>
+				<view style='flex:1;text-align:right;color:#B2B3BB;'>最新价</view>
 			</view>
 		</view>
 		<view
 			v-for="(item, index) in infoList" :key="index"
 			class="guess-item"
 		>
-		<view class="cu-card article no-card" >
+		<view class="article no-card" >
 			<view class="cu-item shadow factoryItem flex justify-between align-center">
 				<view style='flex:1;'>
-					<view class='factory'>{{item.goodsName}}</view>
+					<view style='color:#333;' class='factory'>{{item.goodsName}}</view>
 				</view>
-				<view style='flex:1;' >
+				<view style='flex:1;text-align:right;font-weight:900;font-size:17px;' >
 					<view :class="item.newPrice > item.openPrice ? 'text-red':'text-green'">{{item.newPrice}}</view>
 				</view>
 			</view>
@@ -338,7 +338,7 @@
 		.guess-item {
 			padding-top: 10upx;
 			padding-bottom: 10upx;
-			border-bottom: 1px solid #b9b9b9;
+			border-bottom: 1px solid #EEEEEE;
 		}
 		.title {
 			font-size: 28upx;

pages/task/my_task.vue

@@ -296,4 +296,7 @@
 		bottom:0;
 		border-bottom:1px solid #22C572;
 	}
+	/deep/.u-action-active{
+		margin-right:6px;
+	}
 </style>