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

pageA/product/detail.vue

@@ -386,12 +386,7 @@
 						success: (e) => {
 							if (e.confirm) {
 								uni.navigateTo({
-									url: `/pageA/product/trade?id=${that.goods.id}&packing=${that.goods.packing}}&province=${that.goods.province}
-									&city=${that.goods.city}&area=${that.goods.area}&storeName=${that.goods.storeName}&seller=${that.goods.seller}
-									&companyId=${that.goods.companyId}&sellerPhone=${that.goods.sellerPhone}&minSale=${that.goods.minSale}
-									&exsitCount=${that.goods.total}&isFutures=${that.goods.isFutures}
-									&basis=${that.goods.basis}&basisSmall=${that.goods.basisSmall}&basisBig=${that.goods.basisBig}
-								&unloadingFee=${that.goods.unloadingFee}`
+									url: '/pages/public/login'
 								})
 							}
 						},
@@ -403,8 +398,14 @@
 					this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
 						if(res.data.code==200){
 							uni.navigateTo({
-								url: '/pages/public/login'
+								url: `/pageA/product/trade?id=${that.goods.id}&packing=${that.goods.packing}}&province=${that.goods.province}
+								&city=${that.goods.city}&area=${that.goods.area}&storeName=${that.goods.storeName}&seller=${that.goods.seller}
+								&companyId=${that.goods.companyId}&sellerPhone=${that.goods.sellerPhone}&minSale=${that.goods.minSale}
+								&exsitCount=${that.goods.total}&isFutures=${that.goods.isFutures}
+								&basis=${that.goods.basis}&basisSmall=${that.goods.basisSmall}&basisBig=${that.goods.basisBig}
+							&unloadingFee=${that.goods.unloadingFee}`
 							})
+							
 						}else if(res.data.code==11016){
 							uni.showModal({
 								    title: '温馨提示',

pageB/contract/look.vue

@@ -134,6 +134,7 @@
 				swiperCurrent: 0,
 				titleNViewBackground: '',
 				swiperLength: 0,
+				id:'',
 				goods: {
 					// id:"",
 					// contractNo:'',
@@ -161,8 +162,8 @@
 		onShow() {
 		},
 		onLoad(option) {
-			// this.goods.id = option.id
-			 this.goods.contractNo = option.contractNo
+			this.id = option.id
+			this.goods.contractNo = option.contractNo
 			// this.goods.customer = option.customer
 			// this.goods.goodsName = option.goodsName
 			// this.goods.netWeight = option.netWeight
@@ -181,7 +182,7 @@
 			},
 			getList(){
 				console.log(15454)
-			this.$api.doRequest('post','/tranCarInfo/api/confirmUnloading',this.goods).then(res => {
+			this.$api.doRequest('post','/tranCarInfo/api/confirmUnloading',{id:this.id}).then(res => {
 			     console.log("调用接口")
 			      that.sendDisabled = true
 			      let sec = 60