细节优化

application/admin/controller/Cache.php

@@ -68,6 +68,7 @@ class Cache extends Common
 		// 数据 temp
 		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'cache');
 		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'temp');
+		\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'data');
 		return $this->success('更新成功');
 	}
 

application/admin/controller/Order.php

@@ -118,37 +118,6 @@ class Order extends Common
         return $this->fetch();
     }
 
-    /**
-     * [ExcelExport excel文件导出]
-     * @author   Devil
-     * @blog     http://gong.gg/
-     * @version  0.0.1
-     * @datetime 2017-01-10T15:46:00+0800
-     */
-    public function ExcelExport()
-    {
-        // 参数
-        $params = input();
-        $params['admin'] = $this->admin;
-        $params['user_type'] = 'admin';
-
-        // 条件
-        $where = OrderService::OrderListWhere($params);
-
-        // 获取列表
-        $data_params = array(
-            'where'             => $where,
-            'm'                 => 0,
-            'n'                 => 0,
-            'is_excel_export'   => 1,
-        );
-        $data = OrderService::OrderList($data_params);
-
-        // Excel驱动导出数据
-        $excel = new \base\Excel(array('filename'=>'order', 'title'=>lang('excel_order_title_list'), 'data'=>$data['data'], 'msg'=>'没有相关数据'));
-        return $excel->Export();
-    }
-
     /**
      * [Delete 订单删除]
      * @author   Devil

application/admin/view/default/order/index.html

@@ -100,10 +100,6 @@
 
         <!-- top operation start -->
         <div class="am-g am-margin-top-sm">
-            {{if !IsMobile()}}
-            	<a href="{{$excel_url}}" class="am-btn am-btn-success am-btn-xs am-icon-file-excel-o am-radius"> 导出Excel</a>
-            {{/if}}
-
             <!-- 顶部操作钩子 -->
             {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
                 <div class="plugins-tag">

application/admin/view/default/seo/index.html

@@ -15,7 +15,7 @@
 			</div>
 			<div class="am-form-group">
 				<label>{{$data.common_route_separator.name}}<span class="am-form-group-label-tips">{{$data.common_route_separator.describe}}</span></label>
-				<input type="text" name="{{$data.common_route_separator.only_tag}}" placeholder="{{$data.common_route_separator.name}}" data-validation-message="{{$data.common_route_separator.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_route_separator.value}}"{{/if}} />
+				<input type="text" name="{{$data.common_route_separator.only_tag}}" placeholder="{{$data.common_route_separator.name}}" data-validation-message="{{$data.common_route_separator.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_route_separator.value}}"{{/if}} readonly />
 			</div>
 			<div class="am-form-group">
 				<label>{{$data.home_seo_url_html_suffix.name}}<span class="am-form-group-label-tips">{{$data.home_seo_url_html_suffix.describe}}</span></label>

application/service/OrderService.php

@@ -705,7 +705,6 @@ class OrderService
         $n = isset($params['n']) ? intval($params['n']) : 10;
         $order_by = empty($params['order_by']) ? 'id desc' : $params['order_by'];
         $is_items = isset($params['is_items']) ? intval($params['is_items']) : 1;
-        $is_excel_export = isset($params['is_excel_export']) ? intval($params['is_excel_export']) : 0;
         $is_orderaftersale = isset($params['is_orderaftersale']) ? intval($params['is_orderaftersale']) : 0;
         $user_type = isset($params['user_type']) ? $params['user_type'] : 'user';
 
@@ -852,24 +851,6 @@ class OrderService
                                 $vs['fictitious_goods_value'] = Db::name('OrderFictitiousValue')->where(['order_detail_id'=>$vs['id']])->value('value');
                             }
 
-                            // 是否excel导出
-                            if($is_excel_export == 1)
-                            {
-                                $excel_export_items .= '名称：'.$vs['title']."\n";
-                                $excel_export_items .= '图片：'.$vs['images']."\n";
-                                $excel_export_items .= '地址：'.$vs['goods_url']."\n";
-                                $excel_export_items .= '原价：'.$vs['original_price']."\n";
-                                $excel_export_items .= '销售价：'.$vs['price']."\n";
-                                $excel_export_items .= '总价：'.$vs['total_price']."\n";
-                                $excel_export_items .= '型号：'.$vs['model']."\n";
-                                $excel_export_items .= '规格：'.$vs['spec_text']."\n";
-                                $excel_export_items .= '重量：'.$vs['spec_weight']."\n";
-                                $excel_export_items .= '编码：'.$vs['spec_coding']."\n";
-                                $excel_export_items .= '条形码：'.$vs['spec_barcode']."\n";
-                                $excel_export_items .= '购买数量：'.$vs['buy_number']."\n";
-                                $excel_export_items .= "\n";
-                            }
-
                             // 是否获取最新一条售后信息
                             if($is_orderaftersale == 1)
                             {

application/service/StatisticalService.php

@@ -259,13 +259,13 @@ class StatisticalService
         
         // 总数
         $where = [
-            ['status', '<=', 4],
+            ['status', 'in', [2,3,4]],
         ];
         $total_count = Db::name('Order')->where($where)->sum('total_price');
 
         // 昨天
         $where = [
-            ['status', '<=', 4],
+            ['status', 'in', [2,3,4]],
             ['add_time', '>=', self::$yesterday_time_start],
             ['add_time', '<=', self::$yesterday_time_end],
         ];
@@ -273,7 +273,7 @@ class StatisticalService
 
         // 今天
         $where = [
-            ['status', '<=', 4],
+            ['status', 'in', [2,3,4]],
             ['add_time', '>=', self::$today_time_start],
             ['add_time', '<=', self::$today_time_end],
         ];

application/tags.php

@@ -34,11 +34,27 @@ return array (
   ),
   'plugins_css' => 
   array (
-    0 => 'app\\plugins\\membershiplevelvip\\Hook',
+    0 => 'app\\plugins\\share\\Hook',
+    1 => 'app\\plugins\\membershiplevelvip\\Hook',
+    2 => 'app\\plugins\\coupon\\Hook',
+    3 => 'app\\plugins\\distribution\\Hook',
+    4 => 'app\\plugins\\limitedtimediscount\\Hook',
+    5 => 'app\\plugins\\multilingual\\Hook',
+  ),
+  'plugins_js' => 
+  array (
+    0 => 'app\\plugins\\share\\Hook',
     1 => 'app\\plugins\\coupon\\Hook',
-    2 => 'app\\plugins\\distribution\\Hook',
-    3 => 'app\\plugins\\limitedtimediscount\\Hook',
-    4 => 'app\\plugins\\multilingual\\Hook',
+    2 => 'app\\plugins\\limitedtimediscount\\Hook',
+    3 => 'app\\plugins\\multilingual\\Hook',
+  ),
+  'plugins_view_common_bottom' => 
+  array (
+    0 => 'app\\plugins\\share\\Hook',
+  ),
+  'plugins_view_goods_detail_photo_bottom' => 
+  array (
+    0 => 'app\\plugins\\share\\Hook',
   ),
   'plugins_service_navigation_header_handle' => 
   array (
@@ -114,12 +130,6 @@ return array (
     2 => 'app\\plugins\\distribution\\Hook',
     3 => 'app\\plugins\\wallet\\Hook',
   ),
-  'plugins_js' => 
-  array (
-    0 => 'app\\plugins\\coupon\\Hook',
-    1 => 'app\\plugins\\limitedtimediscount\\Hook',
-    2 => 'app\\plugins\\multilingual\\Hook',
-  ),
   'plugins_view_goods_detail_panel_bottom' => 
   array (
     0 => 'app\\plugins\\coupon\\Hook',

public/static/common/css/common.css

@@ -281,9 +281,6 @@ button.colorpicker-submit:active {
     -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.15);
     box-shadow: inset 0 3px 5px rgba(255, 255, 255, 0.15);
 }
-button.colorpicker-submit img {
-    margin-right: 10px;
-}
 
 
 /**