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

# Conflicts:
#	pageD/identity/driverIdentityEdit.vue

pageA/product/detail.vue

@@ -129,67 +129,67 @@
 				<text>货物要求</text>
 			</view>
 			<view class="c-list">
-				<view class="c-row">
+				<view class="c-row"  v-if="goods.waterContent!=null">
 					<text class="tit">水分（%）{{'<='}} </text>
 					<view class="con-list">
 						<text>{{goods.waterContent}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.bulkDensity!=null">
 					<text class="tit">容重（g/L）{{'>='}}</text>
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.jiaorenli!=null">
 					<text class="tit">热损伤（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.jiaorenli}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.impurity!=null">
 					<text class="tit">杂质（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.impurity}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.mildewGrain!=null">
 					<text class="tit">霉变粒（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.mildewGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.imperfectGrain!=null">
 					<text class="tit">不完善粒（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.imperfectGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.protein!=null">
 					<text class="tit">蛋白（%）{{'>='}} </text>
 					<view class="con-list">
 						<text>{{goods.protein}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.grain!=null">
 					<text class="tit">粒型</text>
 					<view class="con-list">
 						<text>{{goods.grain}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.grade!=null">
 					<text class="tit">品级</text>
 					<view class="con-list">
 						<text>{{goods.grade}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.outputPrivate!=null">
 					<text class="tit">产地</text>
 					<view class="con-list">
 						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.outputYear!=null">
 					<text class="tit">产出年份</text>
 					<view class="con-list">
 						<text>{{goods.outputYear}}</text>

pageA/product/sales_detail.vue

@@ -129,67 +129,67 @@
 				<text>货物要求</text>
 			</view>
 			<view class="c-list">
-				<view class="c-row">
+				<view class="c-row" v-if="goods.waterContent!=null">
 					<text class="tit">水分（%）{{'<='}} </text>
 					<view class="con-list">
 						<text>{{goods.waterContent}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.bulkDensity!=null">
 					<text class="tit">容重（g/L）{{'>='}}</text>
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.jiaorenli!=null">
 					<text class="tit">热损伤（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.jiaorenli}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.impurity!=null">
 					<text class="tit">杂质（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.impurity}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.mildewGrain!=null">
 					<text class="tit">霉变粒（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.mildewGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.imperfectGrain!=null">
 					<text class="tit">不完善粒（%）{{'<='}}</text>
 					<view class="con-list">
 						<text>{{goods.imperfectGrain}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.protein!=null">
 					<text class="tit">蛋白（%）{{'>='}} </text>
 					<view class="con-list">
 						<text>{{goods.protein}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.grain!=null">
 					<text class="tit">粒型</text>
 					<view class="con-list">
 						<text>{{goods.grain}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.grade!=null">
 					<text class="tit">品级</text>
 					<view class="con-list">
 						<text>{{goods.grade}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.outputPrivate!=null||goods.outputCity!=null">
 					<text class="tit">产地</text>
 					<view class="con-list">
 						<text>{{goods.outputPrivate}}{{goods.outputCity}}</text>
 					</view>
 				</view>
-				<view class="c-row">
+				<view class="c-row" v-if="goods.outputYear!=null">
 					<text class="tit">产出年份</text>
 					<view class="con-list">
 						<text>{{goods.outputYear}}</text>

pageB/contract/contract.vue

@@ -172,6 +172,10 @@
 		onLoad() {
 			this.getList()
 		},
+		onPullDownRefresh() {
+			this.getList()
+			uni.stopPullDownRefresh()
+		},
 		methods: {
 			amendprice() {
 				this.$api.doRequest('post', '/purchaseOrder/api/pointPrice', {

pageD/identity/companyIdentity.vue

@@ -345,6 +345,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 
 	.switchs1 {

pageD/identity/driverIdentityThree.vue

@@ -384,6 +384,8 @@
 
 	.btns {
 		background-color: #22C572;
+		margin-bottom: 30rpx;
+		color: white;
 	}
 
 	.words {

pages/public/login_account_number.vue

@@ -17,7 +17,7 @@
 			</view>
 			<button :class='phone!=""&&password!=""?"active":""' @click='passlogin' class='verificationCode'>登录</button>
 			<view class='flex' style='color:#6A6A6A;margin-top:10px;'>
-				<view style='flex:1;text-align:center;border-right:1px solid #E8E9ED;'>忘记密码</view>
+				<view style='flex:1;text-align:center;border-right:1px solid #E8E9ED;' @click="forgetpass()">忘记密码</view>
 				<view @click='gocode' style='flex:1;text-align:center;'>验证码登录</view>
 			</view>
 		    <button @click='goregister' class='register'>手机号一键注册</button>
@@ -54,7 +54,7 @@
 					gender:'',
 					phone:''
 				},
-				type:'text',
+				type:'password',
 				inputStatus:'none',
 				verifyCode:null,
 				sendText:'获取验证码',

pages/user/user.vue

@@ -19,7 +19,7 @@
 			<image v-bind:src="headUrl" class="headPortrait"></image>
 			<view class="personal">
 				<view @click="toLogin" class="information">{{hasLogin? username : '立即登录' }}</view>
-				<view class="information">{{userphone}}</view>
+				<view class="information">{{starUserphone}}</view>
 			</view>
 
 		</view>
@@ -257,7 +257,12 @@
 		},
 		// #endif
 		computed: {
-			...mapState(['hasLogin', 'userInfo'])
+			...mapState(['hasLogin', 'userInfo']),
+			// 手机号中间4位加*
+			starUserphone(){
+				let reg = /^(\d{3})\d{4}(\d{4})$/;
+				return this.userphone.replace(reg, "$1****$2");
+			}
 		},
 		onShow() {
 			uni.showTabBar()