Accept Merge Request #111: (feature/hant -> develop)

Merge Request: 修改

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/111?initial=true

application/admin/view/orders/auditorder/edit.html

@@ -9,34 +9,19 @@
     </div>
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Item_title')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">订单渠道:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-item_title" readonly class="form-control"  type="text" value="{$row.item_title|htmlentities}">
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Detail')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <textarea id="c-detail" readonly class="form-control" placeholder="订单详情" >{$row.detail|htmlentities}</textarea>
+            <input id="c-detail" readonly class="form-control" placeholder="订单详情"  value="{$row.source_shop|htmlentities}">
         </div>
     </div>
 
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Customer')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">客户昵称:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-customer" class="form-control" readonly type="text" value="{$row.customer|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Tel')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-tel" class="form-control" readonly type="text" value=" {$row.tel|htmlentities}">
-        </div>
-    </div>
-
-
 
 <!--
     <div class="form-group">

application/extra/site.php

@@ -0,0 +1,47 @@
+
+<?php
+
+return array (
+  'name' => '神帝',
+  'beian' => '2',
+  'cdnurl' => '',
+  'version' => '1.0.2',
+  'timezone' => 'Asia/Shanghai',
+  'forbiddenip' => '',
+  'languages' =>
+  array (
+    'backend' => 'zh-cn',
+    'frontend' => 'zh-cn',
+  ),
+  'fixedpage' => 'dashboard',
+  'categorytype' =>
+  array (
+    'default' => 'Default',
+    'page' => 'Page',
+    'article' => 'Article',
+    'test' => 'Test',
+  ),
+  'configgroup' =>
+  array (
+    'basic' => 'Basic',
+    'email' => 'Email',
+    'dictionary' => 'Dictionary',
+    'user' => 'User',
+    'example' => 'Example',
+  ),
+  'mail_type' => '1',
+  'mail_smtp_host' => 'smtp.qq.com',
+  'mail_smtp_port' => '465',
+  'mail_smtp_user' => '',
+  'mail_smtp_pass' => '',
+  'mail_verify_type' => '2',
+  'mail_from' => '',
+  'attachmentcategory' =>
+  array (
+    'category1' => 'Category1',
+    'category2' => 'Category2',
+    'custom' => 'Custom',
+  ),
+  'ip_check' => '0',
+  'allowip' => '',
+);

crontab

@@ -0,0 +1,7 @@
+*/5    *    *    *    * docker exec php-www php /var/www/html/allocatr/think check:dispatch-toget
+1      9    *    *    * docker exec php-www php /var/www/html/allocatr/think check:dispatch-record-notice
+00    */1    *    *    * docker exec php-www php /var/www/html/allocatr/think check:dispatch-sms-plant
+*/10    *    *    *    * docker exec php-www php /var/www/html/allocatr/think check:dispatch-tts-overtime
+5    *    *    *    * docker exec php-www php /var/www/html/allocatr/think check:dispatch-tts-plant
+*    *    *    *    * docker exec php-www php /var/www/html/allocatr/think check:dispatch-tts-task
+0    0    *    *    * docker exec php-www php /var/www/html/allocatr/think update-worker-man-info