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

pageA/product/detail.vue

@@ -136,7 +136,7 @@
 					</view>
 				</view>
 				<view class="c-row">
-					<text class="tit">容重（g/L）{{'<='}}</text>
+					<text class="tit">容重（g/L）{{'>='}}</text>
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 					</view>
@@ -419,7 +419,7 @@
 						}else if(res.data.code==11016){
 							uni.showModal({
 								    title: '温馨提示',
-								    content: '您还未认证粮商身份， 下单前请先完善您的身份信息',
+								    content: '您还未认证粮商身份， 下单前请先完善您的身份信息。',
 								    confirmText: "去认证",
 									confirmColor: '#22C572',
 									success: function (res) {

pageA/product/lookup.vue

@@ -4,7 +4,7 @@
 			<view style='background:#fff;display:flex;' class="cu-bar search">
 			<view style='flex:6;' class="search-form round" >
 				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
-				<input type="text" v-model="searchKeyWord" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
+				<input type="text" maxlength="20" v-model="searchKeyWord" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
 				
 			</view>
 			<view @click='doSearch()' style="width:4%;flex:1;">搜索</view>

pageA/product/sales_detail.vue

@@ -136,7 +136,7 @@
 					</view>
 				</view>
 				<view class="c-row">
-					<text class="tit">容重（g/L）{{'<='}}</text>
+					<text class="tit">容重（g/L）{{'>='}}</text>
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 					</view>
@@ -411,13 +411,13 @@
 						}else if(res.data.code==11016){
 							uni.showModal({
 								    title: '温馨提示',
-								    content: '您还未认证粮商身份， 下单前请先完善您的身份信息',
+								    content: '您还未认证粮商身份， 下单前请先完善您的身份信息。',
 								    confirmText: "去认证",
 									confirmColor: '#22C572',
 									success: function (res) {
 								        if (res.confirm) {
 											uni.navigateTo({//跳转页面
-												url:"../index/index"
+												url:'/pages/attestation/index'
 											})
 								        } else if (res.cancel) {
 								        }
@@ -549,7 +549,7 @@
 		position:absolute;
 		left:50%;
 		transform: translateX(-50%);
-		top: 40upx;
+		top: 80upx;
 		z-index:9999;
 		color:#fff;
 	}

pageD/identity/companyIdentity.vue

@@ -55,7 +55,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="padding flex flex-direction"> -->
 		<button class="btns btn" @click="jumpUrl">下一步</button>
 
 	</view>

pageD/identity/driverIdentityTwo.vue

@@ -21,7 +21,7 @@
 			<view class="c-row b-b">
 				<text class="tit">车牌号</text>
 				<view class="con-list">
-					<input placeholder="请填写车牌号" name="input" v-model="item.carNumber"></input>
+					<input placeholder="请填写车牌号" maxlength = "7" name="input" v-model="item.carNumber"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">

pages.json

@@ -22,12 +22,6 @@
 				"selectedIconPath": "static/img/jiaoyi_check.png",
 				"text": "交易"
 			},
-			// {
-			// 	"pagePath": "pages/home/home",
-			// 	"iconPath": "static/img/liangxin.png",
-			// 	"selectedIconPath": "static/img/liangxin_check.png",
-			// 	"text": "粮信"
-			// },
 			{
 				"pagePath": "pages/tran/tran",
 				"iconPath": "static/img/wuliu.png",
@@ -63,28 +57,22 @@
 		{
 			"path": "pages/sale/plant",
 			"style": {
-				// #ifdef MP 
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "工厂价格"
-				// #endif 
 			}
 		},
 		{
 			"path": "pages/sale/portprice",
 			"style": {
-				// #ifdef MP 
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "港口价格"
-				// #endif 
 			}
 		},
 		{
 			"path": "pages/sale/newsinfo",
 			"style": {
-				// #ifdef MP 
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "行业新闻"
-				// #endif 
 			}
 		},
 		{

pages/attestation/index.vue

@@ -2,7 +2,7 @@
 	<view class="center">
 		<view class="homePage">
 			<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
-			<view class="title">
+			<view class="title" @click="liangShang">
 				粮商身份
 			</view>
 			<view class="arrows1" @click="liangShang">
@@ -14,7 +14,7 @@
 
 		<view class="homePage1">
 			<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
-			<view class="title">
+			<view class="title" @click="siJi">
 				司机身份
 			</view>
 			<view class="arrows1" @click="siJi">