lvhao 4 hete
szülő
commit
54003b76b2

+ 2 - 1
core/CoreApp/controllers/Api.php

@@ -308,10 +308,11 @@ class Api extends Start_Controller {
 			}
 			else
 			{
-			    $shop = $this->shop->find_all("type = 269 and tb = 1".$sid);//获取独立站信息
+			    $shop = $this->shop->find_all("( type = 269 or type = 2768) and tb = 1".$sid);//获取独立站信息
 			}
 			foreach ($shop as $value) 
 		    {
+				$value['tbtime'] = 0;
 				if((time()-$value['tbtime']) < 600)
 				{
 					$tb = 1;//正在同步中

+ 2 - 2
core/CoreApp/controllers/User.php

@@ -1085,7 +1085,7 @@ class User extends Start_Controller
 		if (isset($post['time'])) {
 			$time = $this->input->post('time', true);
 			$t = strtotime(date("Ymd", time() + 24 * 3600)); //明天0点
-			$shop = $this->shop->find_all("type = 269 and tb = 1 and id != 22 and id != 28 and id != 29 and id != 30");
+			$shop = $this->shop->find_all(" ( type = 269 or type = 2768 )  and tb = 1 and id != 22 and id != 28 and id != 29 and id != 30");
 			$sid = '';
 			foreach ($shop as $value) {
 				$sid .= " shop = " . $value['id'] . " or";
@@ -1160,7 +1160,7 @@ class User extends Start_Controller
 	public function _shopfxlist()
 	{
 		$t = strtotime(date("Ymd", time())); //今天0点
-		$shop = $this->shop->find_all("type = 269 and tb = 1 and id != 22 and id != 28 and id != 29 and id != 30");
+		$shop = $this->shop->find_all(" ( type = 269 or type = 2768 )  and tb = 1 and id != 22 and id != 28 and id != 29 and id != 30");
 		$sid = '';
 		foreach ($shop as $value) {
 			$sid .= " shop = " . $value['id'] . " or";

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 11 - 11
core/CoreApp/models/Model_usps.php