Merge branch 'test'

application/app/controller/Index.php

@@ -52,9 +52,9 @@ class Index
     {
         return view('index/agreement_app');
     }
-    public function download()
+    public function download_c()
     {
-      return view('index/download');
+      return view('index/download_c');
     }
     public function more_pingjia()
     {

application/app/view/index/download.html → application/app/view/index/download_c.html

@@ -41,11 +41,15 @@
         $('#app_ban').attr('src','/app/images/bg_download.png');
         $('title').html('下载');
         $('.xiazai-p-fuju').show();
+        //0是c端，2是b端
         $.ajax({
-            type: "post",
-            url: "/app/getVersionNo",
+            type: "get",
+            url: ServerHostTempC+"/api/getVersionNo",
             timeout: 10000,
             dataType: "json",
+            data: {
+            	'type': 0
+            },
             beforeSend: function() {},
             success: function(data) {
                 $('#android_link').attr('href',data.data.app_path);

application/app_broker/controller/Index.php

@@ -105,9 +105,9 @@ class Index
         return view('index/imagebody');
     }
     
-    public function xiazai()
+    public function download_b()
     {
-        return view('index/xiazai');
+        return view('index/download_b');
     }
 	
     public function __construct()

application/app_broker/view/index/xiazai.html → application/app_broker/view/index/download_b.html

@@ -39,14 +39,18 @@
     		$('#app_ban').attr('src','/app/images/bg_download.png');
     		$('title').html('下载');
     		$('.xiazai-p-fuju').show();
+    		//0是c端，2是b端
     		$.ajax({
-	    	    type: "post",
-	    	    url: ServerHostTempC+"/AppTab5/versions",
+	    	    type: "get",
+	    	    url: ServerHostTempC+"/api/getVersionNo",
 	    	    timeout: 10000,
 	    	    dataType: "json",
+	    	    data: {
+	    	    	'type': 2
+	    	    },
 	    	    beforeSend: function() {},
 	    	    success: function(data) {
-	    	        $('#android_link').attr('href',data.apk_url);
+	    	        $('#android_link').attr('href',data.data.app_path);
 	    	    },
 	    	    error: function() {
 

application/route.php

@@ -21,7 +21,7 @@ Route::group('app', [
     'share_register' => [ 'app/index/share_register', [ 'method' => 'get' ] ],
     'agreement'      => [ 'app/index/agreement', [ 'method' => 'get' ] ],
     'agreement_app'  => [ 'app/index/agreement_app', [ 'method' => 'get' ] ],
-    'download'       => [ 'app/index/download', [ 'method' => 'get' ] ],
+    'download_c'       => [ 'app/index/download_c', [ 'method' => 'get' ] ],
     'getShopDetails' => [ 'app/index/getShopDetail', [ 'method' => 'get | post' ] ],
     'getVersionNo'   => [ 'app/index/getVersionNo', [ 'method' => 'get | post' ] ],
     'feed'           => [ 'app/index/feed', [ 'method' => 'get' ] ]
@@ -47,7 +47,7 @@ Route::group('app_broker', [
     'timeline_pc'               => [ 'app_broker/index/timeline_pc', [ 'method' => 'get' ] ],
     'customerinfo_customer_add' => [ 'app_broker/index/customerinfo_customer_add', [ 'method' => 'get' ] ],
     'customerinfo_details_new'  => [ 'app_broker/index/customerinfo_details_new', [ 'method' => 'get' ] ],
-    'xiazai'                    => [ 'app_broker/index/xiazai', [ 'method' => 'get' ] ],
+    'download_b'                    => [ 'app_broker/index/download_b', [ 'method' => 'get' ] ],
     'imagebody'                 => [ 'app_broker/index/imagebody', [ 'method' => 'get' ] ],
 ]);
 

public/app/js/app_jump.js

@@ -82,8 +82,7 @@ function jumpEvent(){
 	$('#jump_link').click(function(e){
 		e.preventDefault();
 		e.stopPropagation();
-		var _ym = (~ServerHost.indexOf('estate.'))?'https://admin.tonglianjituan.com/mobile4.0/xiazai.html':'https://develop.tonglianjituan.com/mobile4.0/xiazai.html';
-		location.href = _clientType==='b'?_ym:'download';
+		location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
 	});
 	
 //	var _ft = getUrlParam('ft');