Merge branch 'master' of github.com:hainatravel/information-system

application/third_party/trainsystem/config/database.php

@@ -0,0 +1,53 @@
+<?php
+
+if (!defined('BASEPATH'))
+    exit('No direct script access allowed');
+/*
+  | -------------------------------------------------------------------
+  | DATABASE CONNECTIVITY SETTINGS
+  | -------------------------------------------------------------------
+  | This file will contain the settings needed to access your database.
+  |
+  | For complete instructions please consult the 'Database Connection'
+  | page of the User Guide.
+  |
+  | -------------------------------------------------------------------
+  | EXPLANATION OF VARIABLES
+  | -------------------------------------------------------------------
+  |
+  |	['hostname'] The hostname of your database server.
+  |	['username'] The username used to connect to the database
+  |	['password'] The password used to connect to the database
+  |	['database'] The name of the database you want to connect to
+  |	['dbdriver'] The database type. ie: mysql.  Currently supported:
+  mysql, mysqli, postgre, odbc, mssql, sqlite, oci8
+  |	['dbprefix'] You can add an optional prefix, which will be added
+  |				 to the table name when using the  Active Record class
+  |	['pconnect'] TRUE/FALSE - Whether to use a persistent connection
+  |	['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
+  |	['cache_on'] TRUE/FALSE - Enables/disables query caching
+  |	['cachedir'] The path to the folder where cache files should be stored
+  |	['char_set'] The character set used in communicating with the database
+  |	['dbcollat'] The character collation used in communicating with the database
+  |	['swap_pre'] A default table prefix that should be swapped with the dbprefix
+  |	['autoinit'] Whether or not to automatically initialize the database.
+  |	['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
+  |							- good for ensuring strict SQL while developing
+  |
+  | The $active_group variable lets you choose which connection group to
+  | make active.  By default there is only one group (the 'default' group).
+  |
+  | The $active_record variables lets you determine whether or not to load
+  | the active record class
+ */
+
+//选择数据库
+$active_group = 'HT';
+//是否加载
+$active_record = TRUE;
+
+require 'C:/database_conn.php';
+//require 'c:/database_conn_local.php';
+
+/* End of file database.php */
+/* Location: ./application/config/database.php */

application/third_party/trainsystem/models/BIZ_train_model.php

@@ -4,8 +4,8 @@ class BIZ_train_model extends CI_Model {
 
     function __construct() {
         parent::__construct();
-        $this->HT = $this->load->database('HT', TRUE);
+        $this->HT = $this->load->database('TOURMANAGER_LOCAL', TRUE);
-        $this->INFO = $this->load->database('INFO', TRUE);
+        $this->INFO = $this->load->database('INFORMATION_LOCAL', TRUE);
     }
 	
     //传入一组BPE_SN获取乘客信息

application/third_party/trainsystem/models/train_system_model.php

@@ -5,8 +5,8 @@ class train_system_model extends CI_Model {
 
     function __construct() {
         parent::__construct();
-        $this->HT = $this->load->database('HT', TRUE);
+        $this->HT = $this->load->database('TOURMANAGER_LOCAL', TRUE);
-		$this->INFO = $this->load->database('INFO', TRUE);
+		$this->INFO = $this->load->database('INFORMATION_LOCAL', TRUE);
     }
 
 	//获取订单(用于订单列表)

application/views/bootstrap3/information_edit.php

@@ -1718,6 +1718,29 @@ $meta_subnavi_arr = array(
             </div>
             <?php }?>
 
+            <?php if ($this->config->item('site_code') == 'gm') {?>
+            <div class="col-sm-8">
+              <label>海外页面标签
+                <a href="javascript:void(0);"
+                  onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_haiwai', $('#meta_haiwai').val())"><i
+                    class="text-muted glyphicon glyphicon-remove"></i></a>
+                <a href="javascript:void(0);"
+                  onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_haiwai', $('#meta_haiwai').val())"><i
+                    class="text-muted glyphicon glyphicon-hdd"></i></a>
+                <a href="javascript:void(0);" title="用于配置页面是海外信息还是海外线路."><i
+                    class="text-muted glyphicon glyphicon-question-sign"></i></a>
+              </label>
+              <select name="meta_haiwai" id="meta_haiwai" class="form-control">
+                <?php $meta_haiwai = get_meta($information->ic_id, 'meta_haiwai');?>
+                <option <?php if ($meta_haiwai == false) {?>selected="selected" <?php }?> value="">无</option>
+                <option <?php if ($meta_haiwai == 'info') {?>selected="selected" <?php }?> value="info">海外信息
+                </option>
+                <option <?php if ($meta_haiwai == 'tour') {?>selected="selected" <?php }?> value="tour">海外线路
+                </option>
+              </select>
+            </div>
+            <?php }?>
+
             <?php if ($information->ic_ht_area_type == 'g') {?>
             <div class="row">