Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
richod
/
online_album
1
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

1

dyjh 6 vuotta sitten
vanhempi
c18fe7bb5f
commit
009b3ae242
18 muutettua tiedostoa jossa 133 lisäystä ja 133 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 2 2
      app/Helper/functions.inc.php
  2. 1 1
      app/Http/Controllers/Admin/Base/IndexController.php
  3. 1 1
      app/Http/Controllers/Admin/Controller.php
  4. 53 53
      app/Http/Controllers/Api/V1/FurnitureController.php
  5. 6 6
      app/Widget/Tools/FileUpload.php
  6. 14 14
      app/Widget/Tools/ImgUpload.php
  7. 3 3
      public/apidoc/api_data.js
  8. 3 3
      public/apidoc/api_data.json
  9. 1 1
      public/base/css/style.min.css
  10. 4 4
      public/base/plugins/imguploader/uploader.js
  11. 1 1
      public/base/plugins/webuploader/webuploader.css
  12. 3 3
      resources/views/admin/album/manufacturer/edit-all.blade.php
  13. 3 3
      resources/views/admin/album/manufacturer/edit.blade.php
  14. 13 13
      resources/views/admin/base/index/index.blade.php
  15. 3 3
      resources/views/admin/base/index/welcome.blade.php
  16. 2 2
      resources/views/admin/base/photos/index.blade.php
  17. 1 1
      resources/views/admin/furniture/newgoods/info/booking.blade.php
  18. 19 19
      resources/views/admin/layout.blade.php

+ 2 - 2
app/Helper/functions.inc.php
Näytä tiedosto

xqd xqd 
@@ -622,7 +622,7 @@ function formPost($url, $post_data=array(), $timeout=60, $userpwd = null)
 
  * @return string
 
  */
 
 function editor($textareaid = 'content', $getParam = array(), $options = array()) {
 
-    $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
+    $strUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'';
 
     $getParam['_token']     = csrf_token();
 
     $getParam['elementid']  = isset($getParam['elementid'])?$getParam['elementid']:'elementid';
 
     $getParam['KindEditor'] = isset($getParam['KindEditor'])?$getParam['KindEditor']:true;
 
@@ -665,7 +665,7 @@ HTML;
 
 }
 
 
 function ueditor() {
 
-    $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
+    $strUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'';
 
     $editer = <<<HTML
 
     <!-- 配置文件 -->
 
     <script type="text/javascript" src="$strUri/base/neditor-1.5.3/neditor.config.js"></script>

+ 1 - 1
app/Http/Controllers/Admin/Base/IndexController.php
Näytä tiedosto

xqd 
@@ -309,7 +309,7 @@ class IndexController extends Controller
 
 //            'fur_goods'=>
 
 //                ['name' => '产品管理', 'path' => "#", 'ico' => 'fa fa-bar-chart-o', '_child' =>
 
 //                    [
 
-//                        ['name' => '产品列表', 'path' => '/Furniture/Goods/index', 'ico' => ''],
 
+//                        ['name' => '产品列表', 'path' => '/furnitureWe7/Goods/index', 'ico' => ''],
 
 //                    ]
 
 //                ],
 
 //            'fur_user'=>

+ 1 - 1
app/Http/Controllers/Admin/Controller.php
Näytä tiedosto

xqd 
@@ -159,7 +159,7 @@ abstract class Controller extends BaseController
 
             }
 
             $urlHtml .= '&nbsp;<a  class="btn btn-primary"  href="' . $u . '" >' . $url['title'] . '</a>';
 
         }
 
-        $u = session()->get("is_we7")=="true"?"/addons/furniture/public":"";
 
+        $u = session()->get("is_we7")=="true"?"/addons/furnitureWe7/public":"";
 
         $html ='<!DOCTYPE html>
 
                 <html>
 
                 <head>

+ 53 - 53
app/Http/Controllers/Api/V1/FurnitureController.php
Näytä tiedosto

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd 
@@ -38,7 +38,7 @@ class FurnitureController extends Controller
 
 
 
     /**
 
-     * @api {post} /api/furniture/setting 首页基本设置
 
+     * @api {post} /api/furnitureWe7/setting 首页基本设置
 
      * @apiDescription   首页基本设置
 
      * @apiGroup Furniture
 
      * @apiPermission none
 
@@ -160,7 +160,7 @@ class FurnitureController extends Controller
 
 
 
     /**
 
-     * @api {get} /api/furniture/news_detail 获取新闻详情
 
+     * @api {get} /api/furnitureWe7/news_detail 获取新闻详情
 
      * @apiDescription 获取新闻详情(news_detail)
 
      * @apiGroup Furniture
 
      * @apiPermission none
 
@@ -208,12 +208,12 @@ class FurnitureController extends Controller
 
      *                  "replys": {
 
      *                      "current_page": 1,
 
      *                      "data": [],
 
-     *                      "first_page_url": "http://localhost:8082/api/furniture/news_detail?page=1",
 
+     *                      "first_page_url": "http://localhost:8082/api/furnitureWe7/news_detail?page=1",
 
      *                      "from": null,
 
      *                      "last_page": 1,
 
-     *                      "last_page_url": "http://localhost:8082/api/furniture/news_detail?page=1",
 
+     *                      "last_page_url": "http://localhost:8082/api/furnitureWe7/news_detail?page=1",
 
      *                      "next_page_url": null,
 
-     *                      "path": "http://localhost:8082/api/furniture/news_detail",
 
+     *                      "path": "http://localhost:8082/api/furnitureWe7/news_detail",
 
      *                      "per_page": 5,
 
      *                      "prev_page_url": null,
 
      *                      "to": null,
 
@@ -221,12 +221,12 @@ class FurnitureController extends Controller
 
      * }
 
      * }
 
      * ],
 
-     * "first_page_url": "http://localhost:8082/api/furniture/news_detail?page=1",
 
+     * "first_page_url": "http://localhost:8082/api/furnitureWe7/news_detail?page=1",
 
      * "from": 1,
 
      * "last_page": 1,
 
-     * "last_page_url": "http://localhost:8082/api/furniture/news_detail?page=1",
 
+     * "last_page_url": "http://localhost:8082/api/furnitureWe7/news_detail?page=1",
 
      * "next_page_url": null,
 
-     * "path": "http://localhost:8082/api/furniture/news_detail",
 
+     * "path": "http://localhost:8082/api/furnitureWe7/news_detail",
 
      * "per_page": 5,
 
      * "prev_page_url": null,
 
      * "to": 1,
 
@@ -273,7 +273,7 @@ class FurnitureController extends Controller
 
 
 
     /**
 
-     * @api {get} /api/furniture/news_list 获取新闻列表
 
+     * @api {get} /api/furnitureWe7/news_list 获取新闻列表
 
      * @apiDescription 获取新闻列表(news_list)
 
      * @apiGroup Furniture
 
      * @apiPermission none
 
@@ -305,12 +305,12 @@ class FurnitureController extends Controller
 
      *                  },
 
      *...
 
      *          ],
 
-     *      "first_page_url": "http://s1.xcx.com/api/furniture/news_list?page=1",       //首页url
 
+     *      "first_page_url": "http://s1.xcx.com/api/furnitureWe7/news_list?page=1",       //首页url
 
      *      "from": 1,
 
      *      "last_page": 1,
 
-     *      "last_page_url": "http://s1.xcx.com/api/furniture/news_list?page=1",        //尾页url
 
+     *      "last_page_url": "http://s1.xcx.com/api/furnitureWe7/news_list?page=1",        //尾页url
 
      *      "next_page_url": null,                                                      //下一页url
 
-     *      "path": "http://s1.xcx.com/api/furniture/news_list",
 
+     *      "path": "http://s1.xcx.com/api/furnitureWe7/news_list",
 
      *      "per_page": 5,
 
      *      "prev_page_url": null,                                                     //上一页url
 
      *      "to": 3,
 
@@ -348,7 +348,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {get} /api/furniture/add_comments 添加新闻评论
 
+     * @api {get} /api/furnitureWe7/add_comments 添加新闻评论
 
      * @apiDescription 添加新闻评论(news_list)
 
      * @apiGroup Furniture
 
      * @apiPermission Passport
 
@@ -405,7 +405,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {get} /api/furniture/addtolike 新闻点赞
 
+     * @api {get} /api/furnitureWe7/addtolike 新闻点赞
 
      * @apiDescription 新闻点赞
 
      * @apiGroup Furniture
 
      * @apiPermission None
 
@@ -465,7 +465,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {get} /api/furniture/getmorecomments 获取全部评论/回复
 
+     * @api {get} /api/furnitureWe7/getmorecomments 获取全部评论/回复
 
      * @apiDescription 获取全部评论/回复(getmorecomments)
 
      * @apiGroup Furniture
 
      * @apiPermission none
 
@@ -512,12 +512,12 @@ class FurnitureController extends Controller
 
      *                  "replys": {
 
      *                      "current_page": 1,
 
      *                      "data": [],
 
-     *                      "first_page_url": "http://localhost:8082/api/furniture/news_detail?page=1",
 
+     *                      "first_page_url": "http://localhost:8082/api/furnitureWe7/news_detail?page=1",
 
      *                      "from": null,
 
      *                      "last_page": 1,
 
-     *                      "last_page_url": "http://localhost:8082/api/furniture/news_detail?page=1",
 
+     *                      "last_page_url": "http://localhost:8082/api/furnitureWe7/news_detail?page=1",
 
      *                      "next_page_url": null,
 
-     *                      "path": "http://localhost:8082/api/furniture/news_detail",
 
+     *                      "path": "http://localhost:8082/api/furnitureWe7/news_detail",
 
      *                      "per_page": 5,
 
      *                      "prev_page_url": null,
 
      *                      "to": null,
 
@@ -525,12 +525,12 @@ class FurnitureController extends Controller
 
      * }
 
      * }
 
      * ],
 
-     * "first_page_url": "http://localhost:8082/api/furniture/news_detail?page=1",
 
+     * "first_page_url": "http://localhost:8082/api/furnitureWe7/news_detail?page=1",
 
      * "from": 1,
 
      * "last_page": 1,
 
-     * "last_page_url": "http://localhost:8082/api/furniture/news_detail?page=1",
 
+     * "last_page_url": "http://localhost:8082/api/furnitureWe7/news_detail?page=1",
 
      * "next_page_url": null,
 
-     * "path": "http://localhost:8082/api/furniture/news_detail",
 
+     * "path": "http://localhost:8082/api/furnitureWe7/news_detail",
 
      * "per_page": 5,
 
      * "prev_page_url": null,
 
      * "to": 1,
 
@@ -580,7 +580,7 @@ class FurnitureController extends Controller
 
 
 
     /**
 
-     * @api {get} /api/furniture/newgoods_list 新品发布列表
 
+     * @api {get} /api/furnitureWe7/newgoods_list 新品发布列表
 
      * @apiDescription 获取新品发布列表(news_list)
 
      * @apiGroup Furniture
 
      * @apiPermission none
 
@@ -610,12 +610,12 @@ class FurnitureController extends Controller
 
      *          "comments_total": 2,                  //评价总量
 
      *      }
 
      *      ],
 
-     *      "first_page_url": "http://local.furniture.com/api/furniture/newgoods_list?page=1",
 
+     *      "first_page_url": "http://local.furniture.com/api/furnitureWe7/newgoods_list?page=1",
 
      *      "from": 1,
 
      *      "last_page": 1,
 
-     *      "last_page_url": "http://local.furniture.com/api/furniture/newgoods_list?page=1",
 
+     *      "last_page_url": "http://local.furniture.com/api/furnitureWe7/newgoods_list?page=1",
 
      *      "next_page_url": null,
 
-     *      "path": "http://local.furniture.com/api/furniture/newgoods_list",
 
+     *      "path": "http://local.furniture.com/api/furnitureWe7/newgoods_list",
 
      *      "per_page": 10,
 
      *      "prev_page_url": null,
 
      *      "to": 1,
 
@@ -656,7 +656,7 @@ class FurnitureController extends Controller
 
 
 
     /**
 
-     * @api {get} /api/furniture/newgoods_index 新品发布详情
 
+     * @api {get} /api/furnitureWe7/newgoods_index 新品发布详情
 
      * @apiDescription 获取新品发布详情(news_index)
 
      * @apiGroup Furniture
 
      * @apiPermission none
 
@@ -755,7 +755,7 @@ class FurnitureController extends Controller
 
 
 
     /**
 
-     * @api {post} /api/furniture/newgoods_addcomment 新品发布添加评论
 
+     * @api {post} /api/furnitureWe7/newgoods_addcomment 新品发布添加评论
 
      * @apiDescription 添加评论(newgoods_addcomment)
 
      * @apiGroup Furniture
 
      * @apiPermission passport
 
@@ -839,7 +839,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {post} /api/furniture/newgoods_addbooking 新品发布添加预售
 
+     * @api {post} /api/furnitureWe7/newgoods_addbooking 新品发布添加预售
 
      * @apiDescription 添加预售(newgoods_addbooking)
 
      * @apiGroup Furniture
 
      * @apiPermission passport
 
@@ -915,7 +915,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {get} /api/furniture/goods_list 获取产品列表
 
+     * @api {get} /api/furnitureWe7/goods_list 获取产品列表
 
      * @apiDescription 获取产品列表(goods_list)
 
      * @apiGroup Furniture
 
      * @apiPermission none
 
@@ -945,12 +945,12 @@ class FurnitureController extends Controller
 
      *              }
 
      * ...
 
      *          ],
 
-     *          "first_page_url": "http://s1.xcx.com/api/furniture/goods_list?page=1",
 
+     *          "first_page_url": "http://s1.xcx.com/api/furnitureWe7/goods_list?page=1",
 
      *          "from": 1,
 
      *          "last_page": 1,
 
-     *          "last_page_url": "http://s1.xcx.com/api/furniture/goods_list?page=1",
 
+     *          "last_page_url": "http://s1.xcx.com/api/furnitureWe7/goods_list?page=1",
 
      *          "next_page_url": null,
 
-     *          "path": "http://s1.xcx.com/api/furniture/goods_list",
 
+     *          "path": "http://s1.xcx.com/api/furnitureWe7/goods_list",
 
      *          "per_page": 5,
 
      *          "prev_page_url": null,
 
      *          "to": 4,
 
@@ -990,7 +990,7 @@ class FurnitureController extends Controller
 
 
 
     /**
 
-     * @api {post} /api/furniture/service_login 登陆(login)
 
+     * @api {post} /api/furnitureWe7/service_login 登陆(login)
 
      * @apiDescription 登陆(login)
 
      * @apiGroup Furniture_Service
 
      * @apiPermission none
 
@@ -1132,7 +1132,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {get} /api/furniture/getfurnitureads 获取首页广告
 
+     * @api {get} /api/furnitureWe7/getfurnitureads 获取首页广告
 
      * @apiDescription 获取首页广告
 
      * @apiGroup Furniture_Service
 
      * @apiPermission none
 
@@ -1179,7 +1179,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {get} /api/furniture/getattr 获取产品属性
 
+     * @api {get} /api/furnitureWe7/getattr 获取产品属性
 
      * @apiDescription 获取产品属性
 
      * @apiGroup Furniture_Service
 
      * @apiPermission none
 
@@ -1228,7 +1228,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {post} /api/furniture/createorder 创建售后订单
 
+     * @api {post} /api/furnitureWe7/createorder 创建售后订单
 
      * @apiDescription 创建售后订单
 
      * @apiGroup Furniture_Service
 
      * @apiPermission Passport
 
@@ -1322,7 +1322,7 @@ class FurnitureController extends Controller
 
 
 
     /**
 
-     * @api {get} /api/furniture/getorder 获取订单信息
 
+     * @api {get} /api/furnitureWe7/getorder 获取订单信息
 
      * @apiDescription 获取订单
 
      * @apiGroup Furniture_Service
 
      * @apiPermission none
 
@@ -1366,12 +1366,12 @@ class FurnitureController extends Controller
 
      *          }
 
      * ...
 
      *      ],
 
-     *                  "first_page_url": "http://s1.xcx.com/api/furniture/getorder?page=1",
 
+     *                  "first_page_url": "http://s1.xcx.com/api/furnitureWe7/getorder?page=1",
 
      *                  "from": 1,
 
      *                  "last_page": 1,
 
-     *                  "last_page_url": "http://s1.xcx.com/api/furniture/getorder?page=1",
 
+     *                  "last_page_url": "http://s1.xcx.com/api/furnitureWe7/getorder?page=1",
 
      *                  "next_page_url": null,
 
-     *                  "path": "http://s1.xcx.com/api/furniture/getorder",
 
+     *                  "path": "http://s1.xcx.com/api/furnitureWe7/getorder",
 
      *                  "per_page": 5,
 
      *                  "prev_page_url": null,
 
      *                  "to": 2,
 
@@ -1459,7 +1459,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {get} /api/furniture/getorderdetail 获取订单详情
 
+     * @api {get} /api/furnitureWe7/getorderdetail 获取订单详情
 
      * @apiDescription 获取订单详情
 
      * @apiGroup Furniture_Service
 
      * @apiPermission Passport
 
@@ -1563,7 +1563,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {get} /api/furniture/getprogress 订单进度统计
 
+     * @api {get} /api/furnitureWe7/getprogress 订单进度统计
 
      * @apiDescription 订单进度统计
 
      * @apiGroup Furniture_Service
 
      * @apiPermission none
 
@@ -1731,7 +1731,7 @@ class FurnitureController extends Controller
 
 
 
     /**
 
-     * @api {get} /api/furniture/getreviewcount 评价统计
 
+     * @api {get} /api/furnitureWe7/getreviewcount 评价统计
 
      * @apiDescription 评价统计
 
      * @apiGroup Furniture_Service
 
      * @apiPermission none
 
@@ -1814,7 +1814,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {get} /api/furniture/ordercount 按产品/品类统计
 
+     * @api {get} /api/furnitureWe7/ordercount 按产品/品类统计
 
      * @apiDescription 按产品/品类统计
 
      * @apiGroup Furniture_Service
 
      * @apiPermission none
 
@@ -1920,7 +1920,7 @@ class FurnitureController extends Controller
 
 
 
     /**
 
-     * @api {get} /api/furniture/searchlist  产品订单搜索列表页
 
+     * @api {get} /api/furnitureWe7/searchlist  产品订单搜索列表页
 
      * @apiDescription 产品订单搜索列表页
 
      * @apiGroup Furniture_Service
 
      * @apiPermission none
 
@@ -1962,12 +1962,12 @@ class FurnitureController extends Controller
 
      *          }
 
      * ...
 
      *      ],
 
-     *                  "first_page_url": "http://s1.xcx.com/api/furniture/getorder?page=1",
 
+     *                  "first_page_url": "http://s1.xcx.com/api/furnitureWe7/getorder?page=1",
 
      *                  "from": 1,
 
      *                  "last_page": 1,
 
-     *                  "last_page_url": "http://s1.xcx.com/api/furniture/getorder?page=1",
 
+     *                  "last_page_url": "http://s1.xcx.com/api/furnitureWe7/getorder?page=1",
 
      *                  "next_page_url": null,
 
-     *                  "path": "http://s1.xcx.com/api/furniture/getorder",
 
+     *                  "path": "http://s1.xcx.com/api/furnitureWe7/getorder",
 
      *                  "per_page": 5,
 
      *                  "prev_page_url": null,
 
      *                  "to": 2,
 
@@ -2020,7 +2020,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {post} /api/furniture/addreview  添加评论
 
+     * @api {post} /api/furnitureWe7/addreview  添加评论
 
      * @apiDescription 添加评论
 
      * @apiGroup Furniture_Service
 
      * @apiPermission Passport
 
@@ -2109,7 +2109,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {post} /api/furniture/updatestatus  更新订单状态
 
+     * @api {post} /api/furnitureWe7/updatestatus  更新订单状态
 
      * @apiDescription 更新订单状态
 
      * @apiGroup Furniture_Service
 
      * @apiPermission Passport
 
@@ -2195,7 +2195,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {post} /api/furniture/getphonenumber   获取手机号
 
+     * @api {post} /api/furnitureWe7/getphonenumber   获取手机号
 
      * @apiDescription 获取手机号
 
      * @apiGroup Furniture_Service
 
      * @apiPermission none
 
@@ -2272,7 +2272,7 @@ class FurnitureController extends Controller
 
 
 
     /**
 
-     * @api {post} /api/furniture/printorder   打印订单
 
+     * @api {post} /api/furnitureWe7/printorder   打印订单
 
      * @apiDescription 打印订单
 
      * @apiGroup Furniture_Service
 
      * @apiPermission none
 
@@ -2462,7 +2462,7 @@ class FurnitureController extends Controller
 
     }
 
 
     /**
 
-     * @api {post} /api/furniture/saveformid   保存formid
 
+     * @api {post} /api/furnitureWe7/saveformid   保存formid
 
      * @apiDescription 保存formid
 
      * @apiGroup Furniture_Service
 
      * @apiPermission none

+ 6 - 6
app/Widget/Tools/FileUpload.php
Näytä tiedosto

xqd xqd xqd 
@@ -19,8 +19,8 @@ class FileUpload {
 
      */
 
     public function single($folder, $id, $name = "data[file]", $file = "", $option = [], $param = [])
 
     {
 
-        $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
-        $serverUri = session()->get('is_we7')=='true'?'/addons/furniture/public/?route=':'/';
 
+        $strUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'';
 
+        $serverUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public/?route=':'/';
 
         $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $file_types = 'jpg|jpeg|gif|png|bmp|doc|docx|xls|xlsx|ppt|htm|html|php|txt|zip|rar|gz|bz2';
 
         $option['position'] = isset($option['position']) ? $option['position'] : "alioss";
 
@@ -118,8 +118,8 @@ EOF;
 
 
     public function single2($folder, $id, $name="data", $file="", $option=[]){
 
         $folder = urlencode($folder);
 
-        $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
-        $serverUri = session()->get('is_we7')=='true'?'/addons/furniture/public/?route=':'/';
 
+        $strUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'';
 
+        $serverUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public/?route=':'/';
 
         $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $imgHtml =  "";
 
         $option['callback'] = isset($option['callback']) ? $option['callback'] : "";
 
@@ -180,8 +180,8 @@ EOF;
 
     }
 
 
     public function multi2($folder, $id, $name="data[image]", $files=[], $option=[]){
 
-        $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
-        $serverUri = session()->get('is_we7')=='true'?'/addons/furniture/public/?route=':'/';
 
+        $strUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'';
 
+        $serverUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public/?route=':'/';
 
         $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $folder = urlencode($folder);
 
         $imgHtml =  "";

+ 14 - 14
app/Widget/Tools/ImgUpload.php
Näytä tiedosto

xqd xqd xqd xqd xqd xqd xqd 
@@ -22,8 +22,8 @@ class ImgUpload {
 
      */
 
     public function single($id, $name = "data[image]", $file = '')
 
     {
 
-        $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
-        $serverUri = session()->get('is_we7')=='true'?'/addons/furniture/public/?route=':'/';
 
+        $strUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'';
 
+        $serverUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public/?route=':'/';
 
         $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $url = U("/Base/Photos/index");
 
         $imgHtml = "";
 
@@ -101,8 +101,8 @@ EOF;
 
 
 
     public function single2($folder, $id, $name="data", $file="", $option=[]){
 
-        $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
-        $serverUri = session()->get('is_we7')=='true'?'/addons/furniture/public/?route=':'/';
 
+        $strUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'';
 
+        $serverUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public/?route=':'/';
 
         $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $folder = urlencode($folder);
 
         $imgHtml =  "";
 
@@ -175,8 +175,8 @@ EOF;
 
 
     public function single3($text, $folder, $id, $option = [])
 
     {
 
-        $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
-        $serverUri = session()->get('is_we7')=='true'?'/addons/furniture/public/?route=':'/';
 
+        $strUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'';
 
+        $serverUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public/?route=':'/';
 
         $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $folder = urlencode($folder);
 
         $trigger = $id . '-trigger';
 
@@ -334,8 +334,8 @@ EOF;
 
      */
 
     public function multi($id, $name = "data[image]", $imgs = [])
 
     {
 
-        $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
-        $serverUri = session()->get('is_we7')=='true'?'/addons/furniture/public/?route=':'/';
 
+        $strUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'';
 
+        $serverUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public/?route=':'/';
 
         $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $url = U("/Base/Photos/index");
 
         $imgHtml = "";
 
@@ -417,8 +417,8 @@ EOF;
 
 
     public function multi2($folder, $id, $name="data[image]", $imgs=[], $option=[]){
 
         $folder = urlencode($folder);
 
-        $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
-        $serverUri = session()->get('is_we7')=='true'?'/addons/furniture/public/?route=':'/';
 
+        $strUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'';
 
+        $serverUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public/?route=':'/';
 
         $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $imgHtml =  "";
 
         $option['callback'] = isset($option['callback']) ? $option['callback'] : "";
 
@@ -503,8 +503,8 @@ EOF;
 
      */
 
     public function multi3($text, $folder, $id, $option = [])
 
     {
 
-        $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
-        $serverUri = session()->get('is_we7')=='true'?'/addons/furniture/public/?route=':'/';
 
+        $strUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'';
 
+        $serverUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public/?route=':'/';
 
         $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $folder = urlencode($folder);
 
         $trigger = $id . '-trigger';
 
@@ -656,8 +656,8 @@ EOF;
 
      */
 
     public function upload($text, $folder, $id, $option = [])
 
     {
 
-        $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
-        $serverUri = session()->get('is_we7')=='true'?'/addons/furniture/public/?route=':'/';
 
+        $strUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'';
 
+        $serverUri = session()->get('is_we7')=='true'?'/addons/furnitureWe7/public/?route=':'/';
 
         $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $folder = urlencode($folder);
 
         $trigger = $id . '-trigger';

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 3 - 3
public/apidoc/api_data.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 3 - 3
public/apidoc/api_data.json


+ 1 - 1
public/base/css/style.min.css
Näytä tiedosto

xqd 
@@ -1,4 +1,4 @@
 
-@import url("/addons/furniture/public/base/fonts.useso.com/css-family=Open+Sans-300,400,600,700&lang=en.css");
 
+@import url("/addons/furnitureWe7/public/base/fonts.useso.com/css-family=Open+Sans-300,400,600,700&lang=en.css");
 
 /*@import url("/base/fonts.useso.com/css-family=Open+Sans-300,400,600,700&lang=en.css");*/
 
 h1,h2,h3,h4,h5,h6 {
 
 	font-weight:100

+ 4 - 4
public/base/plugins/imguploader/uploader.js
Näytä tiedosto

xqd xqd xqd 
@@ -14,10 +14,10 @@ var uploadObj = [];
 
 function upload(obj){
 
 
     this.upobj = {
 
-        UploaderUrl : obj.UploaderUrl ? obj.UploaderUrl : "/addons/furniture/public/base/js/plugins/webuploader/webuploader.min.js",
 
+        UploaderUrl : obj.UploaderUrl ? obj.UploaderUrl : "/addons/furnitureWe7/public/base/js/plugins/webuploader/webuploader.min.js",
 
         //UploaderUrl : obj.UploaderUrl ? obj.UploaderUrl : "/base/js/plugins/webuploader/webuploader.min.js",
 
         //UploaderServer : obj.UploaderServer ? obj.UploaderServer :"/api/attachment/webupload?elementid=&watermark=" + obj.UploadWatermark + "&_time=" + Math.random() ,
 
-        UploaderServer : obj.UploaderServer ? obj.UploaderServer :"/addons/furniture/public/?route=api/attachment/webupload?elementid=&watermark=" + obj.UploadWatermark + "&_time=" + Math.random() ,
 
+        UploaderServer : obj.UploaderServer ? obj.UploaderServer :"/addons/furnitureWe7/public/?route=api/attachment/webupload?elementid=&watermark=" + obj.UploadWatermark + "&_time=" + Math.random() ,
 
         UploaderPick : obj.UploaderPick ? obj.UploaderPick : "#upload01" ,
 
         UploaderMax  : obj.UploaderMax ? obj.UploaderMax : 100,
 
         UploaderSingle  : obj.UploaderSingle ? obj.UploaderSingle : false,
 
@@ -59,7 +59,7 @@ upload.prototype.loadCom = function() {
 
         div.layout_upload ul.ullit li{float:left;width:150px;height:150px;position:relative;z-index:5;zoom:1;margin:0 10px 10px 0}\
 
         div.layout_upload ul.ullit li em{font-weight: 100;opacity: 1;box-shadow: none;font-size: 12px;width:15px;height:15px;cursor:pointer;font-style:normal;line-height:15px;border-radius:15px;-moz-border-radius:15px;-webkit-border-radius:15px;-o-border-radius:15px;-ms-border-radius:15px;background:#999;color:#fff;text-align:center;position:absolute;z-index:30;zoom:1;right:-7px;top:-7px}\
 
         div.layout_upload ul.ullit li img{width:100%;height:auto;display:block}\
 
-        div.layout_upload ul.ullit li .layout_upload_but{width:150px;height:150px;border: 5px #eee solid;display:block;line-height:60px;text-align:center;background:url(/addons/furniture/public/base/plugins/imguploader/img/uploadCamera.png) no-repeat center center #fefefe}\
 
+        div.layout_upload ul.ullit li .layout_upload_but{width:150px;height:150px;border: 5px #eee solid;display:block;line-height:60px;text-align:center;background:url(/addons/furnitureWe7/public/base/plugins/imguploader/img/uploadCamera.png) no-repeat center center #fefefe}\
 
         div.layout_upload ul.ullit li .layout_upload_but .webuploader-pick{height:150px; background:none;}\
 
         div.layout_upload ul.ullit li .rate{width:100%;height:4px;background:#9e9e9e;overflow:hidden;position:absolute;z-index:800;zoom:1;left:0;bottom:-8px;display:none}\
 
         div.layout_upload ul.ullit li .rate span{overflow:hidden;width:0;height:4px;background:#36c3be;display:block;transition:all 400ms ease-out 0s;-o-transition:all 400ms ease-out 0s;-moz-transition:all 400ms ease-out 0s;-webkit-transition:all 400ms ease-out 0s;transform-origin:center}\
 
@@ -87,7 +87,7 @@ upload.prototype.upLoader=function(){
 
     // 百度上传插件初始化
 
     var uploader = WebUploader.create({
 
         // swf文件路径
 
-        swf:'/addons/furniture/public/base/plugins/imguploader/uploader.swf',
 
+        swf:'/addons/furnitureWe7/public/base/plugins/imguploader/uploader.swf',
 
         // swf:'/base/plugins/imguploader/uploader.swf',
 
 
         // 文件接收服务端。

+ 1 - 1
public/base/plugins/webuploader/webuploader.css
Näytä tiedosto

xqd 
@@ -30,7 +30,7 @@ div.layout_upload ul,div.layout_upload li{ padding: 0px; margin: 0px;list-style-
 
 div.layout_upload ul.ullit li{float:left;width:150px;height:150px;position:relative;z-index:5;zoom:1;margin:0 10px 10px 0}
 
 div.layout_upload ul.ullit li em{font-weight: 100;opacity: 1;box-shadow: none;font-size: 12px;width:15px;height:15px;cursor:pointer;font-style:normal;line-height:15px;border-radius:15px;-moz-border-radius:15px;-webkit-border-radius:15px;-o-border-radius:15px;-ms-border-radius:15px;background:#999;color:#fff;text-align:center;position:absolute;z-index:30;zoom:1;right:-7px;top:-7px}
 
 div.layout_upload ul.ullit li img{width:100%;height:auto;display:block}
 
-div.layout_upload ul.ullit li .layout_upload_but{width:150px;height:150px;border: 5px #eee solid;display:block;line-height:60px;text-align:center;background:url(/addons/furniture/public/base/plugins/imguploader/img/uploadCamera.png) no-repeat center center #fefefe}
 
+div.layout_upload ul.ullit li .layout_upload_but{width:150px;height:150px;border: 5px #eee solid;display:block;line-height:60px;text-align:center;background:url(/addons/furnitureWe7/public/base/plugins/imguploader/img/uploadCamera.png) no-repeat center center #fefefe}
 
 /*div.layout_upload ul.ullit li .layout_upload_but{width:150px;height:150px;border: 5px #eee solid;display:block;line-height:60px;text-align:center;background:url(/base/plugins/imguploader/img/uploadCamera.png) no-repeat center center #fefefe}*/
 
 div.layout_upload ul.ullit li .layout_upload_but .webuploader-pick{height:150px; background:none;}
 
 div.layout_upload ul.ullit li .rate{width:100%;height:4px;background:#9e9e9e;overflow:hidden;position:absolute;z-index:800;zoom:1;left:0;bottom:-8px;display:none}

+ 3 - 3
resources/views/admin/album/manufacturer/edit-all.blade.php
Näytä tiedosto

xqd 
@@ -1,10 +1,10 @@
 
 @extends('admin.layout')
 
 @section('header')
 
 
-    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/fileinput.css" media="all" rel="stylesheet" type="text/css" />
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/css/fileinput.css" media="all" rel="stylesheet" type="text/css" />
 
 
-    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/fileinput.js" type="text/javascript"></script>
 
-    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/fileinput_locale_zh.js" type="text/javascript"></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/fileinput.js" type="text/javascript"></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/fileinput_locale_zh.js" type="text/javascript"></script>
 
 
 @endsection
 
 @section('content')

+ 3 - 3
resources/views/admin/album/manufacturer/edit.blade.php
Näytä tiedosto

xqd 
@@ -1,10 +1,10 @@
 
 @extends('admin.layout')
 
 @section('header')
 
 
-    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/fileinput.css" media="all" rel="stylesheet" type="text/css" />
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/css/fileinput.css" media="all" rel="stylesheet" type="text/css" />
 
 
-    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/fileinput.js" type="text/javascript"></script>
 
-    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/fileinput_locale_zh.js" type="text/javascript"></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/fileinput.js" type="text/javascript"></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/fileinput_locale_zh.js" type="text/javascript"></script>
 
 
 @endsection
 
 @section('content')

+ 13 - 13
resources/views/admin/base/index/index.blade.php
Näytä tiedosto

xqd xqd xqd 
@@ -14,10 +14,10 @@
 
     </script>
 
     <![endif]-->
 
 
-    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/bootstrap.min.css?v=3.4.0" rel="stylesheet">
 
-    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/font-awesome.min.css?v=4.3.0" rel="stylesheet">
 
-    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/animate.min.css" rel="stylesheet">
 
-    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/style.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/css/bootstrap.min.css?v=3.4.0" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/css/font-awesome.min.css?v=4.3.0" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/css/animate.min.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/css/style.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
 </head>
 
 
 <body class="fixed-sidebar full-height-layout gray-bg">
 
@@ -119,7 +119,7 @@
 
                     <li class="J_tabCloseOther"><a>关闭其他选项卡</a></li>
 
                 </ul>
 
             </div>
 
-            <a href="/addons/furniture/public/?route=Admin/Auth/Login/logout" class="roll-nav roll-right J_tabExit"><i class="fa fa fa-sign-out"></i> 退出</a>
 
+            <a href="/addons/furnitureWe7/public/?route=Admin/Auth/Login/logout" class="roll-nav roll-right J_tabExit"><i class="fa fa fa-sign-out"></i> 退出</a>
 
         </div>
 
         <div class="row J_mainContent" id="content-main">
 
             <iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="{{ U('Base/Index/welcome')}}"
 
@@ -153,18 +153,18 @@
 
 <!--右侧边栏结束-->
 
 </div>
 
 <!-- 全局js -->
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/jquery-2.1.1.min.js?v={{config("sys.version")}}"></script>
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/bootstrap.min.js?v=3.4.0"></script>
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/plugins/metisMenu/jquery.metisMenu.js?v={{config("sys.version")}}"></script>
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/plugins/slimscroll/jquery.slimscroll.min.js?v={{config("sys.version")}}"></script>
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/plugins/layer/layer.min.js?v={{config("sys.version")}}"></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/jquery-2.1.1.min.js?v={{config("sys.version")}}"></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/bootstrap.min.js?v=3.4.0"></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/plugins/metisMenu/jquery.metisMenu.js?v={{config("sys.version")}}"></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/plugins/slimscroll/jquery.slimscroll.min.js?v={{config("sys.version")}}"></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/plugins/layer/layer.min.js?v={{config("sys.version")}}"></script>
 
 
 <!-- 自定义js -->
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/hplus.min.js?v=3.2.0"></script>
 
-<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/contabs.min.js?v={{config("sys.version")}}"></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/hplus.min.js?v=3.2.0"></script>
 
+<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/contabs.min.js?v={{config("sys.version")}}"></script>
 
 
 <!-- 第三方插件 -->
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/plugins/pace/pace.min.js?v={{config("sys.version")}}"></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/plugins/pace/pace.min.js?v={{config("sys.version")}}"></script>
 
 
 <script>
 
     $(function () {

+ 3 - 3
resources/views/admin/base/index/welcome.blade.php
Näytä tiedosto

xqd xqd 
@@ -1,8 +1,8 @@
 
 @extends('admin.layout')
 
 
 @section('content')
 
-    <script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/echarts.min.js"></script>
 
-    {{--<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/bmap.min.js"></script>--}}
 
+    <script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/echarts.min.js"></script>
 
+    {{--<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/bmap.min.js"></script>--}}
 
     <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=5N76rPnIjhk6NXtinNK1zAkQd9la7MNH"></script>
 
     <style>
 
         .statistical {
 
@@ -330,7 +330,7 @@
 
 
 
     </script>
 
-    <script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/china.js"></script>
 
+    <script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/china.js"></script>
 
     <script type="text/javascript">
 
         var dataMap = "{{ $data }}";
 
         dataMap = JSON.parse(dataMap.replace(/&quot;/g,'\"'));

+ 2 - 2
resources/views/admin/base/photos/index.blade.php
Näytä tiedosto

xqd 
@@ -46,8 +46,8 @@
 
 			color: rgba(0, 0, 0, 0.85);
 
 		}
 
 	</style>
 
-	<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/neditor-1.5.3/dialogs/image/image.js"></script>
 
-	<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/neditor-1.5.3/dialogs/internal.js"></script>
 
+	<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/neditor-1.5.3/dialogs/image/image.js"></script>
 
+	<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/neditor-1.5.3/dialogs/internal.js"></script>
 
 @endsection
 
 
 @section('content')

+ 1 - 1
resources/views/admin/furniture/newgoods/info/booking.blade.php
Näytä tiedosto

xqd 
@@ -120,7 +120,7 @@
 
         $('.myModal1').click(function () {
 
             var booking = $(this).attr('data-id');
 
             var remark = $(this).attr('data-content');
 
-            $('#form-validation-1').attr('action', "/admin/Furniture/Newgoods/Info/bookingremark?id=" + booking)
 
+            $('#form-validation-1').attr('action', "/admin/furnitureWe7/Newgoods/Info/bookingremark?id=" + booking)
 
             $('#remark').val(remark)
 
         })
 
     </script>

+ 19 - 19
resources/views/admin/layout.blade.php
Näytä tiedosto

xqd xqd 
@@ -10,25 +10,25 @@
 
     <!-- CSRF Token -->
 
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
 
-    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/bootstrap.min.css?v=3.4.0.css" rel="stylesheet">
 
-    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/font-awesome.min.css?v=4.3.0.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/css/bootstrap.min.css?v=3.4.0.css" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/css/font-awesome.min.css?v=4.3.0.css" rel="stylesheet">
 
 
     <!-- Data Tables -->
 
-    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/plugins/dataTables/dataTables.bootstrap.css"rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/css/plugins/dataTables/dataTables.bootstrap.css"rel="stylesheet">
 
 
-    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/animate.min.css?v={{config("sys.version")}}"  rel="stylesheet">
 
-    <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/style.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/css/animate.min.css?v={{config("sys.version")}}"  rel="stylesheet">
 
+    <link href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/css/style.min.css?v={{config("sys.version")}}" rel="stylesheet">
 
 
     <!-- fine-uploader -->
 
-<!--     <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/fine-uploader/fine-uploader-new.min.css"> -->
 
+<!--     <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/plugins/fine-uploader/fine-uploader-new.min.css"> -->
 
 
     <!-- cropperjs -->
 
-    <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/cropperjs/cropper.min.css">
 
+    <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/plugins/cropperjs/cropper.min.css">
 
 
     <!-- 全局js -->
 
-    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/jquery-2.1.1.min.js?v={{config("sys.version")}}" ></script>
 
-    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/bootstrap.min.js?v=3.4.0" ></script>
 
-    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/layer/layer.js?v={{config("sys.version")}}"></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/jquery-2.1.1.min.js?v={{config("sys.version")}}" ></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/bootstrap.min.js?v=3.4.0" ></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/layer/layer.js?v={{config("sys.version")}}"></script>
 
 
     @yield('header')
 
 </head>
 
@@ -37,21 +37,21 @@
 
 @yield('content')
 
 
 <!-- layer Date -->
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/plugins/laydate/laydate.js?v={{config("sys.version")}}" type="text/javascript" ></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/plugins/laydate/laydate.js?v={{config("sys.version")}}" type="text/javascript" ></script>
 
 <script type="text/javascript"> !function(){ laydate.skin('molv'); }(); </script>
 
 
 <!-- 自定义js -->
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/content.min.js?v=1.0.0" ></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/content.min.js?v=1.0.0" ></script>
 
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/jquery-ui-1.10.4.min.js"></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/jquery-ui-1.10.4.min.js"></script>
 
 
 <!-- jQuery Validation plugin javascript-->
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/plugins/validate/jquery.validate.min.js?v={{config("sys.version")}}" ></script>
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/plugins/validate/validate_custom.js?v={{config("sys.version")}}" ></script>
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/plugins/validate/messages_zh.min.js?v={{config("sys.version")}}" ></script>
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/jquery.tableSort.js?v={{config("sys.version")}}" ></script>
 
-<!--     <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/fine-uploader/fine-uploader.min.js"></script> -->
 
-<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/cropperjs/cropper.min.js"></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/plugins/validate/jquery.validate.min.js?v={{config("sys.version")}}" ></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/plugins/validate/validate_custom.js?v={{config("sys.version")}}" ></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/plugins/validate/messages_zh.min.js?v={{config("sys.version")}}" ></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/js/jquery.tableSort.js?v={{config("sys.version")}}" ></script>
 
+<!--     <script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/plugins/fine-uploader/fine-uploader.min.js"></script> -->
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furnitureWe7/public':'' }}/base/plugins/cropperjs/cropper.min.js"></script>
 
 <script>
 
     $.ajaxSetup({
 
         headers: { 'X-CSRF-TOKEN' : '{{ csrf_token() }}' }

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä