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

# Conflicts:
#	pageD/identity/companyIdentity.vue

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.120:8090/',
-	// baseUrlNew: 'http://api.eliangeyun.com/',
+	// baseUrlNew: 'http://192.168.1.122:9100/',
+	baseUrlNew: 'http://api.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pageB/contract/collectLook.vue

@@ -115,6 +115,13 @@
 		onShow() {
 			this.loaddata()
 		},
+		//下拉刷新
+		onPullDownRefresh() {
+			this.loaddata()
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		onLoad(option) {
 			this.goods.goodsName = option.goodsName
 			this.goods.customer = option.contracter

pageB/contract/contract.vue

@@ -175,7 +175,9 @@
 		},
 		onPullDownRefresh() {
 			this.getList()
-			uni.stopPullDownRefresh()
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		methods: {
 			amendprice() {

pageB/contract/contract_detail.vue

@@ -194,7 +194,6 @@
 		methods: {
 			DateChange(e) {
 				this.goods.sendDateStart = e.year + '-' + e.month + '-' + e.day
-				// this.goods.sendDateStart = e.detail.value
 			},
 			commit1(item) {
 				uni.navigateTo({
@@ -264,10 +263,10 @@
 							that.$api.doRequest('post', '/tranCarInfo/api/addTranTask', that.goods).then(
 								res => {
 									if (res.data.code == 200) {
-										uni.showToast({
-											title: '提交成功！',
-											icon: 'success',
-											duration: 2000,
+										uni.showModal({
+											content: '提交成功！',
+											cancelText: "返回",
+											confirmText: "继续添加",
 											success: function(res) {
 												setTimeout(() => {
 													var result = that.goods.tranCarNo
@@ -290,8 +289,7 @@
 														tare: '',
 														loadNetWeight: '',
 														loadPoundImg: '',
-														contractNo: that
-															.contractNo,
+														contractNo: that.contractNo,
 														goodsName: that.goodsName,
 														sendDateStart: ''
 													}
@@ -299,7 +297,8 @@
 														delta: 1
 													});
 												}, 2000)
-											}
+											},
+											
 										})
 									} else if (res.data.code == 11015) {
 										uni.showToast({
@@ -316,7 +315,9 @@
 										duration: 2000
 									})
 								});
-						} else if (res.cancel) {}
+						} else if (res.cancel) {
+							// setTimeout(()=>{uni.navigateBack({})},1000);
+						}
 					}
 				});
 			},

pageB/contract/look.vue

@@ -71,12 +71,15 @@
 					@click="confirmunload(item)" >确认卸货</button>
 			</view>
 		</view>
-		<view class="addcarwrap">
+		<view class='footer'>
+			<button class="btn" @click="commit1(goods)">添加发车信息</button>
+		</view>
+		<!-- <view class="addcarwrap">
 				<view class="addcar" style="background-color: #FFFFFF;"
 					@click="commit1(goods)">
 					+
 					添加发车信息</view>
-		</view>
+		</view> -->
 		<view v-if='imgstatus' class='shade'>
 			<view class='shade-content'>
 				<image v-if='img' style='width:100px;height:100px;' :src='img'></image>
@@ -137,6 +140,13 @@
 		onShow() {
 			this.loaddata()
 		},
+		//下拉刷新
+		onPullDownRefresh() {
+			this.loaddata()
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		onLoad(option) {
 			this.goods.goodsName = option.goodsName
 			this.goods.contracter = option.contracter
@@ -1039,15 +1049,17 @@
 		color: #FE6430;
 		background-color: #FEECE6;
 	}
-	.btn {
-		margin-top: 10px;
-		background-color: #FFFFFF;
-		border-radius: 25px;
-		border: none;
+	.footer {
+		position: fixed;
+		bottom: 0;
+		width: 90%;
+		padding: 20px 0;
 	}
-	
-	.btns {
-		background-color: #22C572;
+	.btn {
+		width: 90%;
+		background: #22C572;
+		color: #fff;
+		border-radius: 30px;
 	}
 	.poundlist{
 		width: 62px;
@@ -1065,7 +1077,7 @@
 	.unload{
 		
 	}
-	.addcarwrap{
+	/* .addcarwrap{
 		position:fixed;bottom:0;
 		width:100%;
 		left:0;
@@ -1077,5 +1089,5 @@
 		height:46px;
 		line-height:46px;
 		color:#00C265;
-	}
+	} */
 </style>

pageB/news/news.vue

@@ -63,6 +63,9 @@
 			this.isLoadMore = false
 			this.loadStatus = 'loading'
 			this.loadData()
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		onReachBottom(){  //上拉触底函数
 		  if(!this.isLoadMore){  //此处判断，上锁，防止重复请求

pageD/identity/companyIdentityEdit.vue

@@ -484,6 +484,7 @@
 	
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 	.switchs1{
 		font-size: 20px;

pageD/identity/companyIdentityThree.vue

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

pageD/identity/companyIdentityTwo.vue

@@ -217,6 +217,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 	.picture{
 		width: 100%;

pageD/identity/driverIdentity.vue

@@ -528,6 +528,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 	.words{
 		font-size: 18px;

pageD/identity/driverIdentityEdit.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="center">
 		<view>
-			<view>
+			<!-- <view>
 				<view style="margin: 0 auto;" v-if="id != ''" @click="idUp">
 					<image v-bind:src="id1" class="picture"></image>
 				</view>
@@ -9,6 +9,16 @@
 				<view style="margin: 0 auto;" v-if="id2 != ''" @click="idLow">
 					<image v-bind:src="id2" class="picture"></image>
 				</view>
+			</view> -->
+			<view class='cardaddress'>
+				<view class='title'>身份证</view>
+			<swiper class="screen-swiper header-swiper" ::class="dotStyle?'square-dot':'round-dot'" :indicator-dots="true" :circular="true"  interval="3000" duration="500" indicator-color="#8799a3"
+								 indicator-active-color="#0081ff">
+				<swiper-item class="swiper-item" v-for="(item,index) in cardAddress" :key="index" :class="cardCur==index?'text-white':''" @click="naviageToPage(item.url)">
+					<image :src="item"></image>
+									<!-- 	<view style='position:absolute;top:50%;left:50%;transform: translate(-50%,-50%);'>11111</view> -->
+				</swiper-item>
+			</swiper>
 			</view>
 			<view class="personalcss">
 				<view class="c-row b-b">
@@ -52,11 +62,11 @@
 
 		</view>
 		<!-- 车辆信息 -->
-		<view class="information">
+		<view @click="opencarclick" class="information">
 			<view class="c-row">
-				<text class="tit" style="line-height: 36px;">货车信息</text>
+				<text class="tit">货车信息</text>
 				<view class="con-list">
-					<image v-bind:src="opencar" class="open"  @click="opencarclick"></image>
+					<image v-bind:src="opencar" class="icon-up" ></image>
 				</view>
 			</view>
 		</view>
@@ -117,15 +127,15 @@
 			</view>
 		</view>
 		<button class="btn" v-if="opencarboolean == true" @click="carAdd">
-			<image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image>
+			<image style='width:16px;height:16px;margin-right:3px;position:relative;top:2px;' src="../../static/img/add@3x.png" mode=""></image>
 			<texe>添加车辆</texe>
 		</button>
 		<!-- 账户信息 -->
-		<view class="information">
+		<view @click="openuserclick" class="information">
 			<view class="c-row">
 				<text class="tit" style="line-height: 36px;">账户信息</text>
 				<view class="con-list">
-					<image v-bind:src="openuser" class="open" openuserboolean @click="openuserclick"></image>
+					<image style='width:17px;height:9px;' v-bind:src="openuser" class="icon-up" openuserboolean></image>
 				</view>
 			</view>
 		</view>
@@ -196,31 +206,42 @@
 			<image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image>
 			<text style="margin-top: -2px;">添加账户</text>
 		</button>
-		<view class="fujians" v-if="travels != ''" @click="travel">
-			<view class="c-row b-b">
-				<text class="picturebiaoti">行驶证</text>
+		<!-- 账户信息 -->
+		<view @click="openfujianclick" class="information">
+			<view class="c-row">
+				<text class="tit" style="line-height: 36px;">附件信息</text>
+				<view class="con-list">
+					<image style='width:17px;height:9px;' v-bind:src="openfujian" class="icon-up" openuserboolean></image>
+				</view>
 			</view>
-			<image v-bind:src="travels" class="picture"></image>
 		</view>
-		<view class="fujians" v-if="drives != ''" @click="drive">
-			<view class="c-row b-b">
-				<text class="picturebiaoti">驾驶证</text>
+		<view v-if='openfujianboolean'>
+			<view class="fujians" v-if="travels != ''" @click="travel">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">行驶证</text>
+				</view>
+				<image v-bind:src="travels" class="picture"></image>
 			</view>
-			<image v-bind:src="drives" class="picture"></image>
-		</view>
-		<view class="fujians" v-if="operates != ''" @click="operate">
-			<view class="c-row b-b">
-				<text class="picturebiaoti">道路运营证</text>
+			<view class="fujians" v-if="drives != ''" @click="drive">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">驾驶证</text>
+				</view>
+				<image v-bind:src="drives" class="picture"></image>
 			</view>
-			<image v-bind:src="operates" class="picture"></image>
-		</view>
-		<view class="fujians" v-if="practices != ''" @click="practice">
-			<view class="c-row b-b">
-				<text class="picturebiaoti">从业资格证</text>
+			<view class="fujians" v-if="operates != ''" @click="operate">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">道路运营证</text>
+				</view>
+				<image v-bind:src="operates" class="picture"></image>
+			</view>
+			<view class="fujians" v-if="practices != ''" @click="practice">
+				<view class="c-row b-b">
+					<text class="picturebiaoti">从业资格证</text>
+				</view>
+				<image v-bind:src="practices" class="picture"></image>
 			</view>
-			<image v-bind:src="practices" class="picture"></image>
 		</view>
-		<button class="btn btns" @click="commitEdit">修改</button>
+		<button class="btn btns commit" @click="commitEdit">修改</button>
 
 	</view>
 	</view>
@@ -251,9 +272,11 @@
 				// bankid:[],
 				sendText: '获取验证码',
 				sendDisabled: false,
+				cardAddress:[],
 				sendText: '获取验证码',
 				ModelIndex: '高栏',
 				Model: '',
+				dotStyle: false,
 				ModelType: ["高栏", "集装箱", "自卸车"],
 				carLong: '',
 				carLongIndex: 0,
@@ -277,11 +300,13 @@
 				addressUrl: [],
 				opencarboolean: false,
 				openuserboolean: false,
+				openfujianboolean:false,
 				carchength: true,
 				show: false,
 				show1: false,
 				opencar: "../../static/img/authentication/down2@3x.png",
 				openuser: "../../static/img/authentication/down2@3x.png",
+				openfujian: "../../static/img/authentication/down2@3x.png",
 				bankimg: "",
 				bankImgs1: {},
 				bankIndex: -1,
@@ -399,9 +424,7 @@
 						this.addressUrl = this.DriverViewInfo.addressUrl.split(",")
 						this.drivers = res.data.data
 						if (this.drivers.cardAddressUrl != "") {
-							this.id = this.drivers.cardAddressUrl.split(","),
-								this.id1 = this.id[0]
-							this.id2 = this.id[1]
+							this.cardAddress = this.drivers.cardAddressUrl.split(",")
 						}
 						if (this.drivers.addressUrl != "") {
 							this.address = this.drivers.addressUrl.split(","),
@@ -663,7 +686,19 @@
 	.labels {
 		font-size: 14px;
 	}
-
+	.cardaddress{
+		background:#fff;
+		padding:10px;
+		border-radius:8px;
+	}
+	.cardaddress .title{
+		padding:0px 0 10px;
+		border-bottom:1px solid #EEEEEE;
+		margin-bottom:10px;
+	}
+	.swiper-item image{
+		border-radius:8px;
+	}
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -760,39 +795,52 @@
 	.fujians {
 		margin: 0 auto;
 		background-color: #FFFFFF;
-		margin-top: 30px;
-		border-radius: 20px;
+		margin-top: 10px;
+		border-radius: 8px;
 		padding: 10px 10px;
 	}
-
+	
 	.btn {
 		margin-top: 10px;
 		background-color: #FFFFFF;
-		border-radius: 25px;
+		border-radius: 8px;
+		color:#00C265;
 		border: none;
 	}
-
+	.btn:after{
+		border:none;
+	}
 	.btns {
 		background-color: #22C572;
+		color: white;
+	}
+.btn.commit{
+		color:#fff;
 	}
-
 	.information {
 		margin-top: 10px;
 		width: 100%;
 		height: 56px;
 		background-color: #FFFFFF;
-		border-radius: 16px;
+		border-radius: 8px;
+		line-height: 56px;
+	}
+	.information .c-row{
+		height:56px;
+		align-items: center;
+	}
+	.information .c-row .icon-up{
+		align-self:flex-end;
 	}
-
 	.informations {
 		margin-top: 10px;
 		background-color: #FFFFFF;
-		border-radius: 20px;
+		border-radius: 8px;
 	}
 
 	.personalcss {
 		background-color: #FFFFFF;
-		border-radius: 20px;
+		border-radius: 8px;
 		margin-top: 10px;
 	}
 
@@ -814,11 +862,14 @@
 	.eliminate {
 		width: 20px;
 		height: 20px;
-		float: right;
+		    align-self: flex-end;
 	}
 
 	.bankImg {
 		width: 20px;
 		height: 20px;
 	}
+	.icon-up{
+		width:17px;height:9px;
+	}
 </style>

pageD/identity/driverIdentityTwo.vue

@@ -530,13 +530,12 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 
 	.add {
 		width: 26px;
 		height: 26px;
-
-		/* background-image: url(../../static/img/jiaoyi/ic_fabu@3x.png); */
 	}
 
 	/* 清除 */

pages.json

@@ -351,7 +351,7 @@
 			"path": "pages/business/business",
 			"style": {
 				"navigationBarTitleText": "交易",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 
 		}, {
@@ -797,7 +797,7 @@
 					"path": "news/news_detail",
 					"style": {
 						"navigationBarTitleText": "新闻",
-						"enablePullDownRefresh": true
+						"enablePullDownRefresh": false
 					}
 				},
 				{
@@ -1064,7 +1064,7 @@
 			"pages": [{
 					"path": "search/search",
 					"style": {
-						"enablePullDownRefresh": true,
+						"enablePullDownRefresh": false,
 						"navigationBarTitleText": "",
 						"navigationStyle": "custom",
 						"app-plus": {

pages/attestation/indexThree.vue

@@ -82,8 +82,8 @@
 
 
 		</view>
-		<view>
-			<button class="btn btns" @click="Add">新增</button>
+		<view v-if="drivers.length==0">
+			<button class="btn btns"  @click="Add">新增</button>
 		</view>
 	</view>
 </template>
@@ -115,7 +115,9 @@
 		},
 		onPullDownRefresh() {
 			this.getList()
-			uni.stopPullDownRefresh()
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		methods: {
 			resend() {
@@ -463,6 +465,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 
 	.but {

pages/attestation/indexTwo.vue

@@ -81,7 +81,7 @@
 				</view>
 			</view>
 		</view>
-		<button class="btn btns" @click="Add">新增</button>
+		<button class="btns btn" @click="Add">新增</button>
 	</view>
 </template>
 
@@ -116,7 +116,9 @@
 		},
 		onPullDownRefresh() {
 			this.getList()
-			uni.stopPullDownRefresh()
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		methods: {
 			resend() {
@@ -563,6 +565,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 
 	.shade-content {

pages/business/business.vue

@@ -175,6 +175,9 @@
 			this.isLoadMore = false
 			this.loadStatus = 'loading'
 			this.loadData()
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求

pages/sale/information.vue

@@ -249,6 +249,9 @@
 			this.isLoadMore = false
 			this.loadStatus = 'loading'
 			this.loadData()
+			setTimeout(function () {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])

pages/sale/newsinfo.vue

@@ -120,6 +120,9 @@
 				this.isLoadMore = false
 				this.loadStatus = 'loading'
 				this.loadData()
+				setTimeout(function () {
+					uni.stopPullDownRefresh();
+				}, 1000);
 			},
 			computed: {
 				...mapState(['hasLogin', 'userInfo'])

pages/sale/plant.vue

@@ -133,6 +133,9 @@
 				this.isLoadMore = false
 				this.loadStatus = 'loading'
 				this.loadData()
+				setTimeout(function () {
+					uni.stopPullDownRefresh();
+				}, 1000);
 			},
 			computed: {
 				...mapState(['hasLogin', 'userInfo'])

pages/sale/portprice.vue

@@ -137,6 +137,9 @@
 				this.isLoadMore = false
 				this.loadStatus = 'loading'
 				this.loadData()
+				setTimeout(function () {
+					uni.stopPullDownRefresh();
+				}, 1000);
 			},
 			computed: {
 				...mapState(['hasLogin', 'userInfo'])

pages/user/set_nickname.vue

@@ -39,60 +39,48 @@
 					return
 				}
 				var that = this
-				uni.showModal({
-					content: "您确定要更改昵称？",
-					showCancel: true,
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							that.deptListurl.userName = that.nickname
-							that.deptListurl.id = that.userInfo.id
-							that.$api.doRequest('post', '/commonUser/editUserInfo', that.deptListurl).then(
-									res => {
-										if (res.data.code == 200) {
-											uni.showToast({
-												title: '修改成功！',
-												icon: 'success',
-												duration: 2000,
-												success() {
-													setTimeout(()=>{
-														var _student = uni.getStorageSync('userInfo');
-														_student.userName = that.nickname;
-														uni.setStorageSync('userInfo', _student);
-														var name = 'userInfo';
-														var value = _student;
-														that.$store.commit('$uStore', {
-															name,
-															value
-														});
-														uni.navigateBack()
-													},2000)
-												}
-											})
-										}
-									})
-								.catch(res => {
-									if(res.errmsg){
-										uni.showToast({
-											title: res.errmsg,
-											icon: 'none',
-											duration: 2000
-										})
+				that.deptListurl.userName = that.nickname
+				that.deptListurl.id = that.userInfo.id
+				that.$api.doRequest('post', '/commonUser/editUserInfo', that.deptListurl).then(
+						res => {
+							if (res.data.code == 200) {
+								uni.showToast({
+									title: '修改成功！',
+									icon: 'success',
+									duration: 2000,
+									success() {
+										setTimeout(()=>{
+											var _student = uni.getStorageSync('userInfo');
+											_student.userName = that.nickname;
+											uni.setStorageSync('userInfo', _student);
+											var name = 'userInfo';
+											var value = _student;
+											that.$store.commit('$uStore', {
+												name,
+												value
+											});
+											uni.navigateBack()
+										},2000)
 									}
-									else{
-										uni.showToast({
-											title: "系统异常，请联系管理员",
-											icon: 'none',
-											duration: 2000
-										})
-									}
-								});
-
-						} else if (res.cancel) {
-							// console.log('用户点击取消');
+								})
+							}
+						})
+					.catch(res => {
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
 						}
-					},
-				})
+					});
 
 
 

pages/user/set_picture.vue

@@ -113,64 +113,53 @@
 					return
 				}
 				var that = this
-				uni.showModal({
-					content: "您确定要更改图像？",
-					showCancel: true,
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							that.deptListurl.avatarUrl = that.identityUrl
-							that.deptListurl.id = that.userInfo.id
-							that.$api.doRequest('post', '/commonUser/editUserInfo', that.deptListurl).then(
-									res => {
-										if (res.data.code == 200) {
-												uni.showToast({
-													title: '修改成功！',
-													icon: 'success',
-													duration: 2000,
-													success() {
-														setTimeout(()=>{
-															that.userInfo.avatarUrl = that.identityUrl
-															var _student = uni.getStorageSync('userInfo');
-															_student.avatarUrl = that.identityUrl;
-															uni.setStorageSync('userInfo', _student);
-															var name = 'userInfo';
-															var value = _student;
-															that.$store.commit('$uStore', {
-																name,
-																value
-															});
-															// this.$api.msg('修改成功2！')
-															uni.navigateBack({
-																delta:1
-															})
-														},2000)
-													}
+				that.deptListurl.avatarUrl = that.identityUrl
+				that.deptListurl.id = that.userInfo.id
+				that.$api.doRequest('post', '/commonUser/editUserInfo', that.deptListurl).then(
+						res => {
+							if (res.data.code == 200) {
+									uni.showToast({
+										title: '修改成功！',
+										icon: 'success',
+										duration: 2000,
+										success() {
+											setTimeout(()=>{
+												that.userInfo.avatarUrl = that.identityUrl
+												var _student = uni.getStorageSync('userInfo');
+												_student.avatarUrl = that.identityUrl;
+												uni.setStorageSync('userInfo', _student);
+												var name = 'userInfo';
+												var value = _student;
+												that.$store.commit('$uStore', {
+													name,
+													value
+												});
+												// this.$api.msg('修改成功2！')
+												uni.navigateBack({
+													delta:1
 												})
-											
+											},2000)
 										}
 									})
-								.catch(res => {
-									if(res.data.errmsg){
-										uni.showToast({
-											title: res.data.errmsg,
-											icon: 'none',
-											duration: 2000
-										})
-									}
-									else{
-										uni.showToast({
-											title: "系统异常，请联系管理员",
-											icon: 'none',
-											duration: 2000
-										})
-									}
-								});
-						} else if (res.cancel) {
-							// console.log('用户点击取消');
+								
+							}
+						})
+					.catch(res => {
+						if(res.data.errmsg){
+							uni.showToast({
+								title: res.data.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
 						}
-					},
-				})
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					});
 			},
 		}
 	}

pages/user/user.vue

@@ -64,18 +64,10 @@
 					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
 			</view>
 		</view>
-		<neil-modal :show="inputShow" @close="cancel" :style="{display:inputStatus}" title="修改昵称" showCancel="true">
-			<input v-model="inputContent" style="margin:20upx;" placeholder="请输入昵称" />
-			<button class="margin:20upx;bg-green">
-				确认修改
-			</button>
-
-		</neil-modal>
 	</view>
 </template>
 <script>
 	import dragButton from "@/components/drag-button/drag-button.vue";
-	import neilModal from '@/components/neil-modal/neil-modal.vue';
 	import {
 		mapState
 	} from 'vuex';
@@ -84,7 +76,6 @@
 		pageAtTop = true;
 	export default {
 		components: {
-			neilModal,
 			dragButton
 		},
 		data() {
@@ -106,63 +97,6 @@
 				userphone:"",
 				username:"请更改昵称",
 				gridList: [
-					// {
-					// 	num:0,
-					// 	name: '货源信息',
-					// 	icon:'cuIcon-apps',
-					// 	tips: 0,
-					// 	url:'/pages/tran/my_tran?TabCur=0',
-					// 	show:true
-					// },
-					// {
-					// 	num:1,
-					// 	name: '承运信息',
-					// 	icon:'cuIcon-calendar',
-					// 	tips: 0,
-					// 	url:'/pages/tran/my_tran?TabCur=1',
-					// 	show:true
-					// },
-					// {
-					// 	num:2,
-					// 	name: '我的合同',
-					// 	icon:'cuIcon-copy',
-					// 	tips: 0,
-					// 	url:'/pageB/contract/contract',
-					// 	show:true
-					// },
-					// {
-					// 	num:3,
-					// 	name: '消息列表',
-					// 	icon:'cuIcon-news',
-					// 	tips: 0,
-					// 	url:'/pages/user/message',
-					// 	show:true
-					// },
-					// {
-					// 	num:4,
-					// 	name: '任务中心',
-					// 	icon:'cuIcon-copy',
-					// 	tips: 0,
-					// 	url:`/pages/user/task`,
-					// 	show:true
-					// },
-					// {
-					// 	num:5,
-					// 	name: '我的车辆',
-					// 	icon:'cuIcon-deliver',
-					// 	tips: 0,
-					// 	url:'',
-					// 	show:true
-					// },
-					// {
-					// 	num:6,
-					// 	name: '联系我们',
-					// 	icon:'cuIcon-phone',
-					// 	tips: 0,
-					// 	url:'/pages/user/contact',
-					// 	show:true
-					// },
-					// {
 					{
 						num: 0,
 						name: '身份认证',
@@ -261,7 +195,9 @@
 			// 手机号中间4位加*
 			starUserphone(){
 				let reg = /^(\d{3})\d{4}(\d{4})$/;
-				return this.userphone.replace(reg, "$1****$2");
+				if(this.userphone){
+					return this.userphone.replace(reg, "$1****$2");
+				}
 			}
 		},
 		onShow() {
@@ -480,6 +416,9 @@
 					confirmText: '确定',
 					success: (e) => {
 						if (e.confirm) {
+							uni.hideTabBarRedDot({
+								index:3
+							})
 							uni.clearStorageSync();
 							that.$store.commit('logout')
 							that.$api.logout()