From db61dde3da98a816d7f23c9d447d5456b27c1821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Thu, 22 Apr 2021 15:50:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=97=A5=E6=B8=B8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=AF=BB=E5=8F=96=E8=A7=84=E5=88=99=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/ctmobilefirst/controllers/api.php  | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/application/third_party/ctmobilefirst/controllers/api.php b/application/third_party/ctmobilefirst/controllers/api.php
index 92e0b2a0..0ef55030 100644
--- a/application/third_party/ctmobilefirst/controllers/api.php
+++ b/application/third_party/ctmobilefirst/controllers/api.php
@@ -138,23 +138,15 @@ class Api extends CI_Controller {
 			//图片
 
             if (!empty($row->pic1)){
-               if (strpos($row->pic1,"chinatravel.com")!== false){
-                    $picurl=$row->pic1;
-                }else{
-                    $picurl = $this->imageCdn.$row->pic1;
-                }
-                
+                $picurl = $row->pic1;                
             }else if(!empty($row->pic2)){
-                if (strpos($row->pic2,"chinatravel.com")!== false){
-                    $picurl=$row->pic2;
-                }else{
-                    $picurl = $this->imageCdn.$row->pic2;
-                }
+                $picurl = $row->pic2;
             }else{
                 $picurl="//data.chinatravel.com/images/loading2.gif";
             }
 
             $row->price = $addPrice; //新增价格属性
+            $picurl = $this->api_model->getPicCdn($picurl).$picurl;
             $row->pic =$picurl; //图片地址
             
         }