From c182cfc96d7b89f7e831447068d31b762ffb4a99 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 22 Aug 2018 16:16:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0PS=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E5=9F=B9=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap/header.php | 1 + application/views/bootstrap3/header.php | 1 + 2 files changed, 2 insertions(+) diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php index ca7ec79c..e2b159d4 100644 --- a/application/views/bootstrap/header.php +++ b/application/views/bootstrap/header.php @@ -83,6 +83,7 @@
  • AMP转化检查
  • Html基础知识
  • AMP知识及构建SOP
    • +
  • PS超基础课件
  • 系统设置
    • diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 664cc98d..02adad63 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -90,6 +90,7 @@
  • AMP转化检查
  • Html基础知识
  • AMP知识及构建SOP
    • +
  • PS超基础课件
  • 系统设置
    • From 27e36b36369b5f8b03395a56b226a0fc44f7f610 Mon Sep 17 00:00:00 2001 From: cyc Date: Thu, 23 Aug 2018 11:30:57 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=80=94=E7=89=9B?= =?UTF-8?q?=E4=B8=8D=E6=8F=90=E4=BE=9B=E6=95=B0=E6=8D=AE=E7=9A=84=E5=BA=A7?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/tuniu/controllers/tuniu_train.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/application/third_party/tuniu/controllers/tuniu_train.php b/application/third_party/tuniu/controllers/tuniu_train.php index 08bcb176..e33cc7f1 100644 --- a/application/third_party/tuniu/controllers/tuniu_train.php +++ b/application/third_party/tuniu/controllers/tuniu_train.php @@ -53,7 +53,8 @@ class Tuniu_train extends CI_Controller{ if(empty(json_decode($back_data)->data)){ log_message('error','tuniu:'.json_encode($post_data)); } - //print_r(json_decode($back_data)->data); + //print_r(json_decode($back_data)); + $return_data = new stdClass(); $return_data->returnCode = json_decode($back_data)->returnCode; //echo $return_data->returnCode; @@ -133,7 +134,7 @@ class Tuniu_train extends CI_Controller{ } $pricestr = $seat_type.'"train_no":'.'"'.$value->trainNo.'"'; //余票字符串 - $return_data->data->result[$i] = '|预定|'.$value->trainNo.'|'.$value->trainCode.'|'.$value->fromStationName.'|'.$value->toStationName.'|'.$value->fromStationCode.'|'.$value->toStationCode.'|'.$value->startTime.'|'.$value->arriveTime.'|'.$value->runTime.'|'.$value->canBuyNow.'||'.date('Ymd',strtotime($value->trainStartDate)).'||||||||'.ticket_exchange($value->gjrwNum).'|'.ticket_exchange($value->qtxbNum).'|'.ticket_exchange($value->rwNum).'|'.ticket_exchange($value->rzNum).'|'.ticket_exchange($value->tdzNum).'|'.ticket_exchange($value->wzNum).'||'.ticket_exchange($value->ywNum).'|'.ticket_exchange($value->yzNum).'|'.ticket_exchange($value->edzNum).'|'.ticket_exchange($value->ydzNum).'|'.ticket_exchange($value->swzNum).'|'.ticket_exchange($value->dwNum).'||'; + $return_data->data->result[$i] = '|预定|'.$value->trainNo.'|'.$value->trainCode.'|'.$value->fromStationName.'|'.$value->toStationName.'|'.$value->fromStationCode.'|'.$value->toStationCode.'|'.$value->startTime.'|'.$value->arriveTime.'|'.$value->runTime.'|'.$value->canBuyNow.'||'.date('Ymd',strtotime($value->trainStartDate)).'||||||||'.ticket_exchange($value->gjrwNum).'||'.ticket_exchange($value->rwNum).'|'.ticket_exchange($value->rzNum).'|'.ticket_exchange($value->tdzNum).'|'.ticket_exchange($value->wzNum).'||'.ticket_exchange($value->ywNum).'|'.ticket_exchange($value->yzNum).'|'.ticket_exchange($value->edzNum).'|'.ticket_exchange($value->ydzNum).'|'.ticket_exchange($value->swzNum).'|'.ticket_exchange($value->dwNum).'||'; $data = '{"validateMessagesShowId":"_validatorMessage","status":true,"httpstatus":200,"data":{'.$pricestr.'},"messages":[],"validateMessages":{}}'; $return_data->data->price[$i] = $data; $this->tuniuprice_model->addOrUpdate($value->trainNo,$value->trainCode,$value->fromStationCode,$value->toStationCode,json_encode($data)); From 95a25fbce57e5257eda6fc903fae5aebd51f0e47 Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 27 Aug 2018 14:55:17 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/order/views/gm/confirm_order.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/application/third_party/order/views/gm/confirm_order.php b/application/third_party/order/views/gm/confirm_order.php index 17c7c123..b3750179 100644 --- a/application/third_party/order/views/gm/confirm_order.php +++ b/application/third_party/order/views/gm/confirm_order.php @@ -69,6 +69,7 @@

    Kunden informationen

    +

    Bitte prüfen Sie, ob Ihr Name richtig geschrieben ist (vollständiger Name wie im Reisepass) . Da wir die Folgekosten durch ein wegen falschem Namen stornierten Hotel oder Flugticket nicht tragen, ist die richtige Schreibweise Ihres Namens und Ihrer alle Daten unbedingt wichtig.

    @@ -81,6 +82,9 @@
    Name
    + +
    +
    @@ -88,9 +92,7 @@
    -
    - -
    +
    @@ -146,7 +148,7 @@ -
    - + +
    +
    + +
    +
    +
    @@ -135,11 +141,7 @@ -
    -
    - -
    -
    +