简版逻辑处理

pages.json

@@ -112,45 +112,38 @@
 			{
 				"navigationBarTitleText" : "EPC简版",
 				"enablePullDownRefresh": false,
-				"mp-weixin": {
-					"bounce":"none"
-				},
-				"h5": {
-				      "bounce": "none"  // 禁用H5端回弹（如果支持）
-				    }
-				
+				"disableScroll": false  // 确保这个为 false 以允许滚动
 			}
 		},
 		{
 			"path" : "pages/mobile/epcSimpleDetailTwo",
 			"style" : 
 			{
-				"navigationBarTitleText" : "EPC圈选",
-				  "disableSwipeBack": true 
+				"navigationBarTitleText" : "EPC圈选"
 			}
 		},
 		{
 			"path" : "pages/mobile/SimpleOemSearch",
 			"style" : 
 			{
-				"navigationBarTitleText" : "详情",
-				  "disableSwipeBack": true 
+				"navigationBarTitleText" : "详情"
+				 
 			}
 		},
 		{
 			"path" : "pages/mobile/modelTwoSimple",
 			"style" : 
 			{
-				"navigationBarTitleText" : "车型件",
-				  "disableSwipeBack": true 
+				"navigationBarTitleText" : "车型件"
+				 
 			}
 		},
 		{
 			"path" : "pages/mobile/vinDetailSimple",
 			"style" : 
 			{
-				"navigationBarTitleText" : "",
-				  "disableSwipeBack": true 
+				"navigationBarTitleText" : ""
+				 
 			}
 		}
 

pages/mobile/epcSimpleDetailOne.vue

@@ -143,6 +143,9 @@
 				brand_name:'',
 				caption:'',
 				vin:'',
+				imageicon:'',
+				modelname:'',
+				 isReturningFromChild: false,
 			}
 		},
 		onLoad(opt) {
@@ -161,23 +164,22 @@
 			this.brand_name = opt.brand_name;
 			this.caption = opt.caption;
 			this.vin = opt.vin;
+			this.imageicon = opt.imageicon;
+			this.modelname = opt.modelname;
 			this.getSmileDate();
-			//禁止下拉
-			
-			
-		},
-		onReady(){
 			this.initCanvas();
-			
-		},
-		onShow() {
-		  this.initCanvas(); // 确保重新加载数据
 		},
+		// onReady(){ 
+		// 	this.initCanvas();
+			
+		// },
+		// onShow() {
+			
+		// },
 		methods: {
 			goback() {
 				uni.navigateBack({})
 			},
-			 
 			//返回选品牌
 			goToSelectCarModel(){
 				let vin = this.vin;
@@ -305,6 +307,7 @@
 			},
 			//初始化画布
 			initCanvas(){
+				console.log("画布初始化");
 				this.ctxBig = uni.createCanvasContext('big-this-image',this);
 				//this.ctxSmall = uni.createCanvasContext('small-this-image',this);
 				
@@ -435,7 +438,7 @@
 				 this.ctxBig.draw(true);
 				 this.isDrawingBig = true;
 				 this.toDetailByCanvas();
-			  },1000)
+			  },400)
 			},
 			//筛选圈选的位置
 			toDetailByCanvas(){
@@ -445,25 +448,24 @@
 				chlildObj = this.labChildObj;
 				//击中对象
 				const oneSet = new Set();
-				
+				let isgo =false;
 				zuobiao.forEach(x =>{
 					//判断当前坐标是否在当前位置
 					this.ifClickObj(x.x,x.y);
-					console.log(this.hitChild);
 					//判断是否跳转
-					console.log(this.isGoTwo());
 					if(this.isGoTwo()){
 						//跳转
+						uni.removeStorageSync('epcChildrenTwo');
 						uni.setStorageSync('epcChildrenTwo', this.hitChild); 
-						uni.navigateTo({
-							url: 'epcSimpleDetailTwo?token='+this.token+'&param='+this.param+'&access_time='+this.access_time+'&epc_id='+this.epc_id+"&title="+this.chlildObj.title
-							+'&brand_id='+this.brand_id+"&brand_name="+this.brand_name+"&caption="+this.caption+"&vin="+this.vin
-						})
+						isgo =true;
 					}
-					
-					
 				})
-				
+				if(isgo){
+					uni.navigateTo({
+						url: 'epcSimpleDetailTwo?token='+this.token+'&param='+this.param+'&access_time='+this.access_time+'&epc_id='+this.epc_id+"&title="+this.chlildObj.title
+						+'&brand_id='+this.brand_id+"&brand_name="+this.brand_name+"&caption="+this.caption+"&vin="+this.vin
+					})
+				}
 			},
 			isGoTwo(){
 				if (this.hitChild.length === 0) {

pages/mobile/epcSimpleDetailTwo.vue

@@ -77,15 +77,15 @@
 			this.vin = opt.vin;
 			//获取缓存对象 epcChildrenTwo
 			this.chlilds = uni.getStorageSync('epcChildrenTwo');
-			uni.removeStorageSync('epcChildrenTwo');
-			
 		},
 		methods: {
 			goback() {
-				 uni.navigateTo({
-				 	url: 'epcSimpleDetailOne?type=2&token='+this.token+'&param='+this.param+'&access_time='+this.access_time
-					+'&epc_id='+this.epc_id+'&brand_id='+this.brand_id+"&brand_name="+this.brand_name+"&caption="+this.caption+"&vin="+this.vin
-				 })
+			  uni.navigateBack({
+				delta: 1,
+				success: (res) => {
+				  console.log("返回成功", res);
+				}
+			  });
 			},
 			
 			//返回选品牌
@@ -242,7 +242,7 @@
 	}
 	.show-images{
 		display: flex;
-		
+		flex-wrap: wrap;
 	}
 	.show-images-item{
 		

pages/mobile/group.vue

@@ -359,8 +359,14 @@
 				})
 			},
 			goback() {
-				console.log('返回');
 				uni.navigateBack({})
+				//判断返回
+				// let vin = this.vin;
+				// if(vin ==undefined || vin =='' || vin == 'undefined' ){
+				// 	uni.navigateTo({url:'SelectCarModel'});
+				// }else{
+				// 	uni.navigateTo({url:'index'});
+				// }
 			},
 			//返回选品牌
 			goToSelectCarModel(){
@@ -447,6 +453,8 @@
 				uni.navigateTo({
 					url: 'epcSimpleDetailOne?type=2&token='+this.token+'&param='+this.param+'&access_time='+this.access_time+'&epc_id='
 					+this.epc_id+'&brand_id='+this.brand_id+"&brand_name="+this.brand_name+"&caption="+this.captionOld+"&vin="+this.vin
+					+"&imageicon="+this.imageicon+"&modelname="+this.description
+					
 				})
 			}
 		}