Browse Source

bug修改

twt 2 years ago
parent
commit
017ac09c8e
6 changed files with 31 additions and 13 deletions
  1. 2 2
      common/request.js
  2. 4 1
      pages.json
  3. 20 7
      pages/index/index.vue
  4. 1 1
      pages/login/iphoneLogin.vue
  5. 1 1
      pages/login/login.vue
  6. 3 1
      pages/pay/pay.vue

+ 2 - 2
common/request.js

@@ -9,8 +9,8 @@ const baseURL='http://api.dms.66km.com.cn/'
   // authorizaURL: 'http://192.168.0.140:20187/weixin/authorizeSimulation',
 //const code='B527DBDDC89D4A29902D1C7CE34814FB'
 
-//const webURL='http://192.168.0.215:9588/#/'
-const webURL='http://dms.32che.cn/#/'
+const webURL='http://192.168.0.215:9588/#/'
+//const webURL='http://dms.32che.cn/#/'
 //const webURL='https://minh5.66km.com/#/'
 
 

+ 4 - 1
pages.json

@@ -4,7 +4,10 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"titleNView": {  
+				 "autoBackButton":false
+				 }
 			}
 		},
 		{

+ 20 - 7
pages/index/index.vue

@@ -119,12 +119,23 @@
 				        console.log('当前位置的经度是:' + res.longitude);
 				        console.log('当前位置的纬度:' + res.latitude);
 						if(opt.id){
-							if(opt.type==6){
-								that.url=that.$webURL+'paySuccessPinTuan?id='+opt.id+'&hideHeader=true&codeapp='+that.wxOpendata.code+'&lat='+res.latitude+'&lng='+res.longitude+'&isDmsOpen='+that.wxOpendata.isDmsOpen+'&isMarketingOpen='+that.wxOpendata.isMarketingOpen
+							if(opt.quxiao==1){
+								if(opt.type==6){
+									that.url=that.$webURL+'carOwner/index?codeapp='+that.wxOpendata.code+'&lat='+res.latitude+'&lng='+res.longitude+'&isDmsOpen='+that.wxOpendata.isDmsOpen+'&isMarketingOpen='+that.wxOpendata.isMarketingOpen
+								}else{
+									 that.url=that.$webURL+'order/'+opt.id+'?showBackHome=true&codeapp='+that.wxOpendata.code+'&lat='+res.latitude+'&lng='+res.longitude+'&isDmsOpen='+that.wxOpendata.isDmsOpen+'&isMarketingOpen='+that.wxOpendata.isMarketingOpen
+								}
+								
+							  
 							}else{
-								that.url=that.$webURL+'paySuccess?orderId='+opt.id+'&hideHeader=true&codeapp='+that.wxOpendata.code+'&lat='+res.latitude+'&lng='+res.longitude+'&isDmsOpen='+that.wxOpendata.isDmsOpen+'&isMarketingOpen='+that.wxOpendata.isMarketingOpen
+								if(opt.type==6){
+									that.url=that.$webURL+'paySuccessPinTuan?id='+opt.id+'&hideHeader=true&codeapp='+that.wxOpendata.code+'&lat='+res.latitude+'&lng='+res.longitude+'&isDmsOpen='+that.wxOpendata.isDmsOpen+'&isMarketingOpen='+that.wxOpendata.isMarketingOpen
+								}else{
+									that.url=that.$webURL+'paySuccess?orderId='+opt.id+'&hideHeader=true&codeapp='+that.wxOpendata.code+'&lat='+res.latitude+'&lng='+res.longitude+'&isDmsOpen='+that.wxOpendata.isDmsOpen+'&isMarketingOpen='+that.wxOpendata.isMarketingOpen
+								}
 							}
 							
+							
 						}else{
 							/* if(!that.wxOpendata.shopID||!that.logindata){
 								uni.navigateTo({
@@ -173,13 +184,15 @@
 				this.url2='http://wx.32che.cn/weixin/authorize?path=/carOwner/index&isCarOwner=true&shopId='+opt.shopId
 			} */
            //http://192.168.0.215:9588/#/carOwner/index?codeapp=D8E849B9EE0D4A07812BB0186E77B993&lat=36.68013&lng=117.06533
-		   
+		   var a = document.getElementsByClassName('uni-page-head-hd')[0]
+		   	a.style.display = 'none';
 		
 		   
 		},
-		
-		
-		    
+		mounted(){
+			var a = document.getElementsByClassName('uni-page-head-hd')[0]
+				a.style.display = 'none';
+		}, 
 		
 		methods: {
 			goUrl(){

+ 1 - 1
pages/login/iphoneLogin.vue

@@ -161,7 +161,7 @@
 						/* uni.switchTab({
 							url: '../homePage/homePage'
 						}) */
-						uni.navigateTo({
+						uni.reLaunch({
 							url:'../index/index'
 						})
 					} else {

+ 1 - 1
pages/login/login.vue

@@ -121,7 +121,7 @@ export default {
 			 		/* uni.switchTab({
 			 			 url:'../home/home'
 			 		 }) */
-					 uni.navigateTo({
+					 uni.reLaunch({
 					 	url:'../index/index'
 					 })
 			 	}else{

+ 3 - 1
pages/pay/pay.vue

@@ -78,7 +78,9 @@
 			      },
 			      fail: function (err) {
 			          console.log('取消支付fail:' + JSON.stringify(err));
-			  						 
+			  		uni.reLaunch({
+			  			url:'../index/index?id='+that.id+'&type='+that.type+'&quxiao=1'
+			  		})			 
 			      }
 			  }); 
 		  }