Skip to content

T
tl_estate
Commit fdc29673 authored by zw's avatar zw
Browse files
Options

Merge remote-tracking branch 'origin/test' into test

# Conflicts: # public/app/js/app_jump.js
parents 0d947a0a 75738d5b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
application/index/service/RankingListService.php
View file @ fdc29673
...@@ -266,7 +266,7 @@ class RankingListService ...@@ -266,7 +266,7 @@ class RankingListService
$store_arr = $this->agentModel->getStoreOrDistrict(["store_id" => $value["store_id"], "level" => ["in", "20"]]); $store_arr = $this->agentModel->getStoreOrDistrict(["store_id" => $value["store_id"], "level" => ["in", "20"]]);
if (count($store_arr) > 0) { if (count($store_arr) > 0) {
//$value["name"] = count($store_arr) > 0 ? $store_arr[0]["name"] : "---"; //$value["name"] = count($store_arr) > 0 ? $store_arr[0]["name"] : "---";
$value["img"] = $store_arr[0]["img"]; $store_sort[$key]["img"] = $store_arr[0]["img"];
} }
} }
$data["store_sort"] = $store_sort; $data["store_sort"] = $store_sort;
......
public/app/js/app_jump.js
View file @ fdc29673
...@@ -103,7 +103,7 @@ function jumpEvent(){ ...@@ -103,7 +103,7 @@ function jumpEvent(){
} }
} else if (device.isAndroid()) { } else if (device.isAndroid()) {
if ( navigator.userAgent.toLowerCase().match(/MicroMessenger/i)!='micromessenger' ) { if ( navigator.userAgent.toLowerCase().match(/MicroMessenger/i)!='micromessenger' ) {
window.location.href = 'tlscheme://tlhost/tonglian/open' ;//+ params; window.location.href = 'tlscheme://tlhost/tonglian/open' + params;
window.setTimeout(function(){ window.setTimeout(function(){
location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c' location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
},5000); },5000);
...@@ -121,7 +121,7 @@ function jumpEvent(){ ...@@ -121,7 +121,7 @@ function jumpEvent(){
location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c' location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
},5000); },5000);
} else if (device.isAndroid()) { } else if (device.isAndroid()) {
window.location.href = 'tlscheme://tlhost/tonglian/open' ;//+ params; window.location.href = 'tlscheme://tlhost/tonglian/open' + params;
window.setTimeout(function(){ window.setTimeout(function(){
location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c' location.href = ServerHostTempC + _clientType==='b'?'/app_broker/download_b':'/app.php/app/download_c'
},5000); },5000);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment