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

pageB/contract/contract.vue

@@ -252,7 +252,7 @@
 			},
 			commit1(item) {
 				uni.navigateTo({
-					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&contracter=${item.contracter}&goodsName=${item.goodsName}`
+					url: `/pageB/contract/look?id=${item.id}&planId=${item.planId}&contractNo=${item.contractNo}&contracter=${item.contracter}&goodsName=${item.goodsName}`
 				})
 			},
 			commit2(item) {

pageB/contract/contract_detail.vue

@@ -181,6 +181,7 @@
 			onShow() {
 			},
 			onLoad(option) {
+				debugger
 				this.goods.planId=option.planId
 				this.goodsName=option.goodsName
 				this.contractNo = option.contractNo

pageB/contract/look.vue

@@ -183,12 +183,8 @@
 					tranCarNo = 'C' + (this.carlist.length + 1)
 				}
 				uni.navigateTo({
-
-					url: `/pageB/contract/contract_detail?contractNo=` + this.goods.contractNo + '&goodsName=' +
-						this.goods.goodsName + '&tranCarNo=' + tranCarNo,
-
-					url: `/pageB/contract/contract_detail?contractNo=`+this.goods.contractNo+'&goodsName='+this.goods.goodsName+'&tranCarNo='+tranCarNo+'&palnId='+this.planId
-
+					url: `/pageB/contract/contract_detail?contractNo=`
+					+this.goods.contractNo+'&goodsName='+this.goods.goodsName+'&tranCarNo='+this.goods.tranCarNo+'&palnId='+this.goods.planId
 				})
 			},
 			confirmunload(item) {