From 718f18d0193aa61a9fb35df72e67377aca402e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Thu, 4 Jun 2020 14:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0bokun=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/models/infoBokunData_model.php    | 23 +++++++++++---
 .../tpmanage/controllers/webgetbokun.php      |  7 +++--
 .../views/bootstrap3/information_edit.php     | 31 +++++++++++++++++++
 application/views/information_edit.php        |  2 ++
 4 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/application/models/infoBokunData_model.php b/application/models/infoBokunData_model.php
index 0a78bebf..ffb02325 100644
--- a/application/models/infoBokunData_model.php
+++ b/application/models/infoBokunData_model.php
@@ -57,7 +57,7 @@ class InfoBokunData_model extends CI_Model {
      * @return: 
      * @Date Changed: 
      */
-    function update_byId($ibd_id){
+    function update_byId($ibd_id,$ibd_Itemvalue,$ibd_ItemType,$ibd_ItemDescription){
         $sql = "
             UPDATE [infoBokunData]
             SET [ibd_Itemvalue] = ?
@@ -66,9 +66,9 @@ class InfoBokunData_model extends CI_Model {
              WHERE ibd_id=?
         ";
         $query = $this->HT->query($sql,array(
-            $this->ibd_Itemvalue,
-            $this->ibd_ItemType,
-            $this->ibd_ItemDescription,
+            $ibd_Itemvalue,
+            $ibd_ItemType,
+            $ibd_ItemDescription,
             $ibd_id
         ));
         return $query;        
@@ -95,6 +95,21 @@ class InfoBokunData_model extends CI_Model {
         return $this->HT->query($sql,array($ibd_id));
     }
 
+    /**
+     * @description: 根据ic_id获取所有的附加属性
+     * @param {type} 
+     * @return: 
+     * @Date Changed: 
+     */
+    function getList($ic_id){
+        $sql = " select * from infobokundata 
+        where ibd_ic_id = ?
+        order by case when CHARINDEX('Photo',ibd_itemName)>0 then 999 else 1 end ,ibd_id ";
+        $query = $this->HT->query($sql,array($ic_id));
+        return $query->result();
+
+    }
+
 }
 
 /* End of file InfoBokunData.php */
diff --git a/application/third_party/tpmanage/controllers/webgetbokun.php b/application/third_party/tpmanage/controllers/webgetbokun.php
index ffae8183..21a9ffe1 100644
--- a/application/third_party/tpmanage/controllers/webgetbokun.php
+++ b/application/third_party/tpmanage/controllers/webgetbokun.php
@@ -150,8 +150,11 @@ class webgetbokun extends CI_Controller
                 $this->InfoBokunData_model->ibd_Itemvalue = $activityid;
                 $ibd_id = $this->InfoBokunData_model->Add();
 
-                $this->InfoBokunData_model->ibd_parentId = $ibd_id; //设置剩余的属性都是这个activityid的子类，避免每条记录都保存activityid
-
+                if ($this->InfoBokunData_model->ibd_ItemName == "ActivityID"){
+                    $this->InfoBokunData_model->ibd_parentId = 0;
+                }else{                
+                    $this->InfoBokunData_model->ibd_parentId = $ibd_id; //设置剩余的属性都是这个activityid的子类，避免每条记录都保存activityid
+                }
                 if (isset($activityDeatil->keyPhoto)){
                     $this->InfoBokunData_model->ibd_ItemName = "keyPhoto";  //主要图片
                     $this->InfoBokunData_model->ibd_Itemvalue = $activityDeatil->keyPhoto->originalUrl;
diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 141a73f3..804374d9 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -735,6 +735,9 @@ if (!empty($setting_website_nav)) {
           <p></p>
           <div class="col-xs-24">
             <label><a href="javascript:void(0);" onclick="$('#customize').toggle();">自定义选项</a>　</label>
+            <?php if ( $information->ic_sitecode=="trippest") { ?> 
+            <label><a class="btn default" data-toggle="modal" id="aBokunData"> 管理TPBokun数据 </a> </label>
+            <?php } ?>
           </div>
 
           <div id="customize" class="col-xs-24" style="display:none;">
@@ -1572,3 +1575,31 @@ foreach ($author_list as $author_item) {
 
   </div>
 </div>
+<!-- Trippest bokun窗口 -->
+<div class="modal fade" id="NoPermissionModal">
+    <div class="modal-dialog modal-lg" >
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title" id="NoPermissionModalLabel">BOKUN附加属性管理</h4>
+            </div>
+            <div class="modal-body" style="height:650px;">
+                <iframe id="NoPermissioniframe" width="100%" height="100%" frameborder="0"></iframe>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default " data-dismiss="modal">    关  闭    </button>
+            </div>
+        </div>
+    </div>
+    <script >
+      $(function(){
+        $("#aBokunData").click(function(){
+          var frameSrc = "/info.php/infobokundata/index/<?php echo $information->ic_id ?>/";
+          $("#NoPermissioniframe").attr("src", frameSrc);
+          $('#NoPermissionModal').modal({ show: true, backdrop: 'static' });
+        })
+      });
+    </script>
+  <!-- Trippest bokun窗口 -->
+
+
diff --git a/application/views/information_edit.php b/application/views/information_edit.php
index 5ec12a37..0752799f 100644
--- a/application/views/information_edit.php
+++ b/application/views/information_edit.php
@@ -1114,3 +1114,5 @@
     </div>
   </div>
 </div>
+
+