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

pageB/contract/collectLook.vue

@@ -167,7 +167,7 @@
 						this.goods.goodsName + '&tranCarNo=' + tranCarNo,
 
 					url: `/pageB/contract/contract_detail?contractNo=` + this.goods.contractNo + '&goodsName=' +
-						this.goods.goodsName + '&tranCarNo=' + tranCarNo + '&palnId=' + this.planId
+						this.goods.goodsName + '&tranCarNo=' + tranCarNo + '&planId=' + this.planId
 
 				})
 			},

pageD/identity/companyIdentityThree.vue

@@ -337,7 +337,12 @@
 						verifyCode: this.verifyCode
 					}).then(res => {
 						if (res.data.code == 200) {
-							that.identityAuthenticationInfo.commonId = that.userInfo.id
+							if(that.userInfo){
+								that.identityAuthenticationInfo.commonId = that.userInfo.id
+							}
+							else{
+								that.identityAuthenticationInfo.commonId = res.data.data.id
+							}
 							that.identityAuthenticationInfo.payeeAddressUrl = that.bankid.toString()
 							that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 							uni.showModal({

pageD/warehousings/warehousings.vue

@@ -276,6 +276,21 @@ import upload from '@/components/upload.vue';
 						 			 arr.push(res.data.data[i].warehouseName)
 						 		 }
 						 		 this.warehouselist=res.data.data
+								 for(var i=0;i<this.warehouselist.length;i++){
+								 	if(this.warehouselist[i].warehouseName==this.WarehouseInOutInfo.warehouseName){
+								 		var id=this.warehouselist[i].id
+										this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {id:id,}).then(res => {
+											var arr=[]
+											for(var i=0;i<res.data.data.warehousePositionInfoList.length;i++){
+												arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
+											}
+											this.warehouse1=arr
+											this.warehouselist11=res.data.data
+										})
+										break;
+								 	}
+								 }
+								
 						 		 this.warehouse=arr
 						 	 }
 						 })
@@ -493,8 +508,8 @@ import upload from '@/components/upload.vue';
 							duration: 2000
 						})
 						setTimeout(() => {
-							uni.navigateBack({})
-						}, 200)
+							uni.navigateBack()
+						}, 1000)
 					}else{
 						uni.showToast({
 							title: res.data.message,
@@ -651,8 +666,8 @@ import upload from '@/components/upload.vue';
 							icon: 'none'
 						})
 						setTimeout(() => {
-							uni.navigateBack({})
-						}, 200)
+							uni.navigateBack()
+						}, 1000)
 					}else{
 						uni.showToast({
 							title: res.data.message,

pages/user/set_nickname.vue

@@ -49,15 +49,12 @@
 							that.deptListurl.id = that.userInfo.id
 							that.$api.doRequest('post', '/commonUser/editUserInfo', that.deptListurl).then(res => {
 								if (res.data.code == 200) {
-								// this.$api.msg('修改成功！')
-								var _student = wx.getStorageSync('userInfo');
-								_student.userName = that.nickname;
-								wx.setStorageSync('userInfo', _student);
-								
-									uni.navigateTo({
-										url: `/pages/user/setUp`
-									})
-									}
+									// this.$api.msg('修改成功！')
+									var _student = uni.getStorageSync('userInfo');
+									_student.userName = that.nickname;
+									uni.setStorageSync('userInfo', _student);
+									uni.navigateBack()
+								}
 								})
 								.catch(res => {
 									uni.showToast({

pages/user/set_picture.vue

@@ -130,13 +130,11 @@
 												// 	duration: 2000
 												// })
 											that.userInfo.avatarUrl = that.identityUrl
-											var _student = wx.getStorageSync('userInfo');
+											var _student = uni.getStorageSync('userInfo');
 											_student.avatarUrl = that.identityUrl;
-											wx.setStorageSync('userInfo', _student);
+											uni.setStorageSync('userInfo', _student);
 										    // this.$api.msg('修改成功！')
-											uni.navigateTo({
-												url: `/pages/user/setUp`
-											})
+											uni.navigateBack()
 										}
 									})
 								.catch(res => {

pages/user/user.vue

@@ -268,11 +268,12 @@
 			}else{
 				this.headUrl = this.userInfo.avatarUrl
 			}
-			if(!this.username){
-				this.username = "请更改昵称"
+			console.log("this.userInfo",this.userInfo)
+			if(this.userInfo.userName){
+				this.username = this.userInfo.userName
 			}
 			else{
-				this.username = this.userInfo.userName
+				this.username = "请更改昵称"
 			}
 			if(this.userInfo.phone){
 				this.userphone = this.userInfo.phone