From 0bdfc6fdb3a413535bc22f36bbaab7d69ec6cdf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Tue, 21 May 2019 11:09:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=AE=E7=9A=84?=
 =?UTF-8?q?=E5=9C=B0=E4=BA=A7=E5=93=81=E7=9A=844=E4=B8=AA=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=80=89=E9=A1=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/bootstrap3/information_edit.php     | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index a2bf64f4..9fe9d8ac 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -1273,6 +1273,50 @@ $meta_subnavi_arr = array(
 
             </div>
             <?php } ?>
+
+            <!-- 目的地产品选项 -->
+            <div class="row">
+            <div class="col-sm-6">
+                <label>目的地产品类型
+                  <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_trippest_type', $('#meta_trippest_type').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
+                  <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_trippest_type', $('#meta_trippest_type').val())"><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
+                  <a href="javascript:void(0);" title="产品分类，目前有普通，故宫，接送三种."><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-question-sign"></i></a>
+                </label>
+                <select name="meta_trippest_type" id="meta_trippest_type" class="form-control" >
+                  <option value="common" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'common' ? 'selected' : false; ?>>普通</option>
+                  <option value="gg" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'gg' ? 'selected' : false; ?>>故宫</option>
+                  <option value="tranfer" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'tranfer' ? 'selected' : false; ?>>接送</option>
+                </select>
+              </div>
+              <div class="col-sm-18">
+               <label>目的地产品Package 
+                  <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_trippest_package', $('#meta_trippest_package').val())"><i class="text-muted glyphicon glyphicon-remove"></i></a>
+                  <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_trippest_package', $('#meta_trippest_package').val())"><i class="text-muted glyphicon glyphicon-hdd"></i></a>
+                  <a href="javascript:void(0);" title="产品Package,如某条线路可以从两个地方出发，价格还不一样。格式： 下拉框显示标题，|项目1,差价|项目2，差价  例如：Departure Place，|Guilin Departure，0|Yangshuo Departure，5"><i class="text-muted glyphicon glyphicon-question-sign"></i></a>
+                </label>
+                <input type="text" name="meta_trippest_package" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_trippest_package'); ?>" id="meta_trippest_package"/>
+             </div>
+            </div>
+
+          <div class="row">
+            <div class="col-sm-12">
+               <label>目的地产品不开放日期的列表 
+                  <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_trippest_excludedate', $('#meta_trippest_excludedate').val())"><i class="text-muted glyphicon glyphicon-remove"></i></a>
+                  <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_trippest_excludedate', $('#meta_trippest_excludedate').val())"><i class="text-muted glyphicon glyphicon-hdd"></i></a>
+                  <a href="javascript:void(0);" title="录入的日期都不能预订，逗号隔开，用“/”日期格式，例如：2019/2/5，2019/2/7，2019/10/5"><i class="text-muted glyphicon glyphicon-question-sign"></i></a>
+                </label>
+                <input type="text" name="meta_trippest_excludedate" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_trippest_excludedate'); ?>" id="meta_trippest_excludedate"/>
+            </div>
+            <div class="col-sm-12">
+               <label>目的地产品肯定开放日期的列表 
+                  <a href="javascript:void(0);" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_trippest_includedate', $('#meta_trippest_includedate').val())"><i class="text-muted glyphicon glyphicon-remove"></i></a>
+                  <a href="javascript:void(0);" onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_trippest_includedate', $('#meta_trippest_includedate').val())"><i class="text-muted glyphicon glyphicon-hdd"></i></a>
+                  <a href="javascript:void(0);" title="录入的日期肯定能预订，逗号隔开，用“/”日期格式，例如：2019/2/5，2019/2/7，2019/10/5"><i class="text-muted glyphicon glyphicon-question-sign"></i></a>
+                </label>
+                <input type="text" name="meta_trippest_includedate" class="form-control" value="<?php echo get_meta($information->ic_id, 'meta_trippest_includedate'); ?>" id="meta_trippest_includedate"/>
+            </div>
+          </div>
+
             <!-- 自定义选项 -->
           </div>
 

From 593d6519044337875f05c3f421c9c087731cf4e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Wed, 22 May 2019 14:39:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E7=9A=84?=
 =?UTF-8?q?=E5=9C=B0=E4=BA=A7=E5=93=81=E4=B8=89=E7=A7=8D=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/bootstrap3/information_edit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 7c1a5f34..b84f0666 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -1283,9 +1283,9 @@ $meta_subnavi_arr = array(
                   <a href="javascript:void(0);" title="产品分类，目前有普通，故宫，接送三种."><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-question-sign"></i></a>
                 </label>
                 <select name="meta_trippest_type" id="meta_trippest_type" class="form-control" >
-                  <option value="common" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'common' ? 'selected' : false; ?>>普通</option>
+                  <option value="common" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'general' ? 'selected' : false; ?>>普通</option>
                   <option value="gg" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'gg' ? 'selected' : false; ?>>故宫</option>
-                  <option value="tranfer" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'tranfer' ? 'selected' : false; ?>>接送</option>
+                  <option value="tranfer" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'transfer' ? 'selected' : false; ?>>接送</option>
                 </select>
               </div>
               <div class="col-sm-18">

From f7dc90b4ff657566742a3de3df1f56e68d5023a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Wed, 22 May 2019 14:45:26 +0800
Subject: [PATCH 3/3] transfer

---
 application/views/bootstrap3/information_edit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index b84f0666..64b1fa50 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -1283,9 +1283,9 @@ $meta_subnavi_arr = array(
                   <a href="javascript:void(0);" title="产品分类，目前有普通，故宫，接送三种."><i class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-question-sign"></i></a>
                 </label>
                 <select name="meta_trippest_type" id="meta_trippest_type" class="form-control" >
-                  <option value="common" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'general' ? 'selected' : false; ?>>普通</option>
+                  <option value="general" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'general' ? 'selected' : false; ?>>普通</option>
                   <option value="gg" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'gg' ? 'selected' : false; ?>>故宫</option>
-                  <option value="tranfer" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'transfer' ? 'selected' : false; ?>>接送</option>
+                  <option value="transfer" <?php echo get_meta($information->ic_id, 'meta_trippest_type') === 'transfer' ? 'selected' : false; ?>>接送</option>
                 </select>
               </div>
               <div class="col-sm-18">