首页 发现 帮助
注册 登录
wesley
/
furniture
2
1
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

test

dyjh 6 年之前
父节点
0aca67929b
当前提交
8713fb41bc
共有 18 个文件被更改，包括 120 次插入 和 90 次删除
分列视图 显示文件统计
  1. 7 6
      app/Helper/functions.inc.php
  2. 17 9
      app/Widget/Tools/FileUpload.php
  3. 41 21
      app/Widget/Tools/ImgUpload.php
  4. 1 0
      public/base/plugins/imguploader/uploader.js
  5. 2 2
      resources/views/admin/album/agent/edit.blade.php
  6. 3 3
      resources/views/admin/album/order/check.blade.php
  7. 1 1
      resources/views/admin/album/order/index.blade.php
  8. 3 3
      resources/views/admin/album/order/view.blade.php
  9. 2 2
      resources/views/admin/auth/albumlogin.blade.php
  10. 2 2
      resources/views/admin/auth/login.blade.php
  11. 8 8
      resources/views/admin/base/index/index.blade.php
  12. 3 3
      resources/views/admin/base/index/welcome.blade.php
  13. 2 2
      resources/views/admin/base/photos/index.blade.php
  14. 5 5
      resources/views/admin/base/resources/manage.blade.php
  15. 2 2
      resources/views/admin/base/role/auth.blade.php
  16. 5 5
      resources/views/admin/base/tool/alimanage.blade.php
  17. 4 4
      resources/views/admin/furniture/newgoods/info/commentschart.blade.php
  18. 12 12
      resources/views/admin/layout.blade.php

+ 7 - 6
app/Helper/functions.inc.php
查看文件

xqd xqd xqd 
@@ -622,6 +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':'';
 
     $getParam['_token']     = csrf_token();
 
     $getParam['elementid']  = isset($getParam['elementid'])?$getParam['elementid']:'elementid';
 
     $getParam['KindEditor'] = isset($getParam['KindEditor'])?$getParam['KindEditor']:true;
 
@@ -642,9 +643,9 @@ function editor($textareaid = 'content', $getParam = array(), $options = array()
 
     $_csrf_token = csrf_token();
 
 
     $editer = <<<HTML
 
-        <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/kindeditor-4.1.10/themes/default/default.css" />
 
-        <script charset="utf-8" src="/base/kindeditor-4.1.10/kindeditor-min.js"></script>
 
-        <script charset="utf-8" src="/base/kindeditor-4.1.10/lang/zh_CN.js"></script>
 
+        <link rel="stylesheet" href="$strUri/base/kindeditor-4.1.10/themes/default/default.css" />
 
+        <script charset="utf-8" src="$strUri/base/kindeditor-4.1.10/kindeditor-min.js"></script>
 
+        <script charset="utf-8" src="$strUri/base/kindeditor-4.1.10/lang/zh_CN.js"></script>
 
         <script>
 
             var editor_{$textareaid};
 
             var options = '{$options}';
 
@@ -664,12 +665,12 @@ HTML;
 
 }
 
 
 function ueditor() {
 
-
 
+    $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
     $editer = <<<HTML
 
     <!-- 配置文件 -->
 
-    <script type="text/javascript" src="/base/neditor-1.5.3/neditor.config.js"></script>
 
+    <script type="text/javascript" src="$strUri/base/neditor-1.5.3/neditor.config.js"></script>
 
     <!-- 编辑器源码文件 -->
 
-    <script type="text/javascript" src="/base/neditor-1.5.3/neditor.all.js"></script>
 
+    <script type="text/javascript" src="$strUri/base/neditor-1.5.3/neditor.all.js"></script>
 
     <!-- 实例化编辑器 -->
 
     <script type="text/javascript">
 
         var ue = UE.getEditor('container',{

+ 17 - 9
app/Widget/Tools/FileUpload.php
查看文件

xqd xqd xqd xqd xqd xqd xqd xqd xqd 
@@ -19,6 +19,9 @@ 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=':'/';
 
+        $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";
 
         $option['placeholder'] = isset($option['placeholder']) ? $option['placeholder'] : "";
 
@@ -34,8 +37,8 @@ class FileUpload {
 
 
         $token = csrf_token();
 
         $html = <<<EOF
 
-         <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/webuploader/webuploader.css" rel="stylesheet">
 
-                        <script src="/base/webuploader/webuploader.min.js"></script>
 
+         <link href="$strUri/base/webuploader/webuploader.css" rel="stylesheet">
 
+                        <script src="$strUri/base/webuploader/webuploader.min.js"></script>
 
             <div class="WebUploader">
 
                 <div class="WebUploader_button">
 
                     <div class="input-group">
 
@@ -59,8 +62,8 @@ class FileUpload {
 
                             title: 'Files',
 
                             extensions: "{$file_types}",
 
                         },
 
-                        swf: "/base/webuploader/uploader.swf",
 
-                        server: "/api/attachment/webupload",
 
+                        swf: "{$strUri}/base/webuploader/uploader.swf",
 
+                        server: "{$serverUri}api/attachment/webupload",
 
                         fileNumLimit: 300,
 
                         fileSizeLimit: 20 * 1024 * 1024,
 
                         fileSingleSizeLimit: 10 * 1024 * 1024,
 
@@ -115,7 +118,9 @@ 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=':'/';
 
+        $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $imgHtml =  "";
 
         $option['callback'] = isset($option['callback']) ? $option['callback'] : "";
 
         if(!$option['callback'] && !empty($file)) {
 
@@ -144,7 +149,7 @@ EOF;
 
         }
 
 
         $html = <<<EOF
 
-           <script type="text/javascript" src="/base/plugins/imguploader/uploader.js"></script>
 
+           <script type="text/javascript" src="$strUri/base/plugins/imguploader/uploader.js"></script>
 
             <div class="layout_upload">
 
                 <ul class="ullit">
 
                     $imgHtml
 
@@ -166,7 +171,7 @@ EOF;
 
                 UploaderPick:"#$id",
 
                 UploaderMax:0,
 
                 UploadHiddenField:"$name",
 
-                UploaderServer:"/api/attachment/webupload?elementid=&folder=$folder&_time=" + Math.random(),
 
+                UploaderServer:"{$serverUri}api/attachment/webupload{$str_U}elementid=&folder=$folder&_time=" + Math.random(),
 
                 UploaderSingle:true
 
             });
 
         </script>
 
@@ -175,6 +180,9 @@ 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=':'/';
 
+        $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $folder = urlencode($folder);
 
         $imgHtml =  "";
 
         $option['callback'] = isset($option['callback']) ? $option['callback'] : "";
 
@@ -217,7 +225,7 @@ EOF;
 
         }
 
 
         $html = <<<EOF
 
-           <script type="text/javascript" src="/base/plugins/imguploader/uploader.js"></script>
 
+           <script type="text/javascript" src="$strUri/base/plugins/imguploader/uploader.js"></script>
 
             <div class="layout_upload">
 
                 <ul class="ullit">
 
                                     $imgHtml
 
@@ -239,7 +247,7 @@ EOF;
 
             new uploadFile({
 
                 UploaderPick:"#$id",
 
                 UploaderMax:{$option['max']},
 
-                UploaderServer:"/api/attachment/webupload?elementid=&folder=$folder&_time=" + Math.random(),
 
+                UploaderServer:"{$serverUri}api/attachment/webupload{$str_U}elementid=&folder=$folder&_time=" + Math.random(),
 
                 UploadHiddenField:"$name"
 
             });
 
         </script>

+ 41 - 21
app/Widget/Tools/ImgUpload.php
查看文件

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd 
@@ -22,6 +22,9 @@ 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=':'/';
 
+        $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $url = U("/Base/Photos/index");
 
         $imgHtml = "";
 
         if (!empty($file)) {
 
@@ -46,8 +49,8 @@ class ImgUpload {
 
             }
 
         }
 
         $html = <<<EOF
 
-                        <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/webuploader/webuploader.css" rel="stylesheet">
 
-                        <script src="/base/plugins/webuploader/webuploader.js"></script>
 
+                        <link href="$strUri/base/plugins/webuploader/webuploader.css" rel="stylesheet">
 
+                        <script src="$strUri/base/plugins/webuploader/webuploader.js"></script>
 
                             <div style="clear:both">
 
                             <div id="$id" class="layout_upload">
 
                                 <ul class="ullit">
 
@@ -98,6 +101,9 @@ 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=':'/';
 
+        $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $folder = urlencode($folder);
 
         $imgHtml =  "";
 
         $option['callback'] = isset($option['callback']) ? $option['callback'] : "";
 
@@ -136,7 +142,7 @@ EOF;
 
         }
 
 
         $html = <<<EOF
 
-           <script type="text/javascript" src="/base/plugins/imguploader/uploader.js"></script>
 
+           <script type="text/javascript" src="$strUri/base/plugins/imguploader/uploader.js"></script>
 
             <div class="layout_upload">
 
                 <ul class="ullit">
 
                     $imgHtml
 
@@ -158,7 +164,7 @@ EOF;
 
                 UploaderPick:"#$id",
 
                 UploaderMax:0,
 
                 UploadHiddenField:"data[$name]",
 
-                UploaderServer:"/admin/Base/Attachment/webupload?elementid=&watermark={$option['watermark']}&sizex={$option['sizex']}&sizey={$option['sizey']}&folder=$folder&_time=" + Math.random(),
 
+                UploaderServer:"{$serverUri}admin/Base/Attachment/webupload{$str_U}elementid=&watermark={$option['watermark']}&sizex={$option['sizex']}&sizey={$option['sizey']}&folder=$folder&_time=" + Math.random(),
 
                 UploaderSingle:true
 
             });
 
         </script>
 
@@ -169,6 +175,9 @@ 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=':'/';
 
+        $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $folder = urlencode($folder);
 
         $trigger = $id . '-trigger';
 
         $modal = $id . '-modal';
 
@@ -176,14 +185,14 @@ EOF;
 
         $upload_btn = $id . '-upload-btn';
 
         $uploader = $id . '_uploader';
 
         $url = isset($option['url']) ? $option['url'] : 'empty';
 
-        $upload_url = "/admin/Base/Attachment/webupload?folder=" . $folder;
 
+        $upload_url = "{$serverUri}admin/Base/Attachment/webupload{$str_U}folder=" . $folder;
 
         foreach($option as $key => $val) {
 
             $upload_url = $upload_url . '&' . $key . '=' . $val;
 
         }
 
 
         $html = <<<EOF
 
-<link rel="stylesheet" type="text/css" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/webuploader/webuploader.css">
 
-<script type="text/javascript" src="/base/plugins/webuploader/webuploader.js"></script>
 
+<link rel="stylesheet" type="text/css" href="$strUri/base/plugins/webuploader/webuploader.css">
 
+<script type="text/javascript" src="$strUri/base/plugins/webuploader/webuploader.js"></script>
 
 <style type="text/css">
 
     .webuploader-pick {
 
         height: 34px
 
@@ -248,7 +257,7 @@ EOF;
 
             multiple: false,
 
         },
 
         server: "$upload_url",
 
-        swf: "/base/plugins/webuploader/Uploader.swf",
 
+        swf: "$strUri/base/plugins/webuploader/Uploader.swf",
 
         fileNumLimit: 1,
 
         accept: {
 
             title: 'Images',
 
@@ -325,6 +334,9 @@ 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=':'/';
 
+        $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $url = U("/Base/Photos/index");
 
         $imgHtml = "";
 
         if (!empty($imgs)) {
 
@@ -356,8 +368,8 @@ EOF;
 
 
 
         $html = <<<EOF
 
-                        <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/webuploader/webuploader.css" rel="stylesheet">
 
-                        <script src="/base/plugins/webuploader/webuploader.js"></script>
 
+                        <link href="$strUri/base/plugins/webuploader/webuploader.css" rel="stylesheet">
 
+                        <script src="$strUri/base/plugins/webuploader/webuploader.js"></script>
 
                             <div style="clear:both">
 
                             <div id="multi" class="layout_upload">
 
                                 <ul class="ullit">
 
@@ -405,7 +417,9 @@ 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=':'/';
 
+        $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $imgHtml =  "";
 
         $option['callback'] = isset($option['callback']) ? $option['callback'] : "";
 
         $option['max'] = isset($option['max']) ? $option['max'] : 200;
 
@@ -450,7 +464,7 @@ EOF;
 
         }
 
 
         $html = <<<EOF
 
-           <script type="text/javascript" src="/base/plugins/imguploader/uploader.js"></script>
 
+           <script type="text/javascript" src="$strUri/base/plugins/imguploader/uploader.js"></script>
 
             <div class="layout_upload">
 
                 <ul class="ullit">
 
                                     $imgHtml
 
@@ -472,7 +486,7 @@ EOF;
 
             new upload({
 
                 UploaderPick:"#$id",
 
                 UploaderMax:{$option['max']},
 
-                UploaderServer:"/admin/Base/Attachment/webupload?elementid=&watermark={$option['watermark']}&sizex={$option['sizex']}&sizey={$option['sizey']}&folder=$folder&class=$class&_time=" + Math.random(),
 
+                UploaderServer:"{$serverUri}admin/Base/Attachment/webupload{$str_U}elementid=&watermark={$option['watermark']}&sizex={$option['sizex']}&sizey={$option['sizey']}&folder=$folder&class=$class&_time=" + Math.random(),
 
                 UploadHiddenField:"$name"
 
             });
 
         </script>
 
@@ -489,6 +503,9 @@ 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=':'/';
 
+        $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $folder = urlencode($folder);
 
         $trigger = $id . '-trigger';
 
         $modal = $id . '-modal';
 
@@ -496,14 +513,14 @@ EOF;
 
         $upload_btn = $id . '-upload-btn';
 
         $uploader = $id . '_uploader';
 
         $url = isset($option['url']) ? $option['url'] : 'empty';
 
-        $upload_url = "/admin/Base/Attachment/webupload?folder=" . $folder;
 
+        $upload_url = "{$serverUri}admin/Base/Attachment/webupload{$str_U}folder=" . $folder;
 
         foreach($option as $key => $val) {
 
             $upload_url = $upload_url . '&' . $key . '=' . $val;
 
         }
 
 
         $html = <<<EOF
 
-<link rel="stylesheet" type="text/css" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/webuploader/webuploader.css">
 
-<script type="text/javascript" src="/base/plugins/webuploader/webuploader.js"></script>
 
+<link rel="stylesheet" type="text/css" href="$strUri/base/plugins/webuploader/webuploader.css">
 
+<script type="text/javascript" src="$strUri/base/plugins/webuploader/webuploader.js"></script>
 
 <style type="text/css">
 
     .webuploader-pick {
 
         height: 34px
 
@@ -568,7 +585,7 @@ EOF;
 
             id: "#$select_btn",
 
         },
 
         server: "$upload_url",
 
-        swf: "/base/plugins/webuploader/Uploader.swf",
 
+        swf: "$strUri/base/plugins/webuploader/Uploader.swf",
 
         accept: {
 
             title: 'Images',
 
             extensions: 'gif,jpg,jpeg,bmp,png',
 
@@ -639,6 +656,9 @@ 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=':'/';
 
+        $str_U = session()->get('is_we7')=='true'?'&':'?';
 
         $folder = urlencode($folder);
 
         $trigger = $id . '-trigger';
 
         $modal = $id . '-modal';
 
@@ -646,13 +666,13 @@ EOF;
 
         $upload_btn = $id . '-upload-btn';
 
         $uploader = $id . '_uploader';
 
         $url = isset($option['url']) ? $option['url'] : 'empty';
 
-        $upload_url = "/admin/Base/Attachment/webupload?folder=" . $folder;
 
+        $upload_url = "{$serverUri}admin/Base/Attachment/webupload{$str_U}folder=" . $folder;
 
         foreach ($option as $key => $val) {
 
             $upload_url = $upload_url . '&' . $key . '=' . $val;
 
         }
 
         $html = <<<EOF
 
-<link rel="stylesheet" type="text/css" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/webuploader/webuploader.css">
 
-<script type="text/javascript" src="/base/plugins/webuploader/webuploader.js"></script>
 
+<link rel="stylesheet" type="text/css" href="$strUri/base/plugins/webuploader/webuploader.css">
 
+<script type="text/javascript" src="$strUri/base/plugins/webuploader/webuploader.js"></script>
 
 <style type="text/css">
 
     .webuploader-pick {
 
         height: 34px
 
@@ -717,7 +737,7 @@ EOF;
 
             id: "#$select_btn",
 
         },
 
         server: "$upload_url",
 
-        swf: "/base/plugins/webuploader/Uploader.swf",
 
+        swf: "$strUri/base/plugins/webuploader/Uploader.swf",
 
         accept: {
 
             title: 'Images',
 
             extensions: 'gif,jpg,jpeg,bmp,png',

+ 1 - 0
public/base/plugins/imguploader/uploader.js
查看文件

xqd 
@@ -12,6 +12,7 @@
 
 var uploadlist = "";
 
 var uploadObj = [];
 
 function upload(obj){
 
+
 
     this.upobj = {
 
         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() ,

+ 2 - 2
resources/views/admin/album/agent/edit.blade.php
查看文件

xqd 
@@ -3,8 +3,8 @@
 
 
     <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/css/fileinput.css" media="all" rel="stylesheet" type="text/css" />
 
 
-    <script src="/base/js/fileinput.js" type="text/javascript"></script>
 
-    <script src="/base/js/fileinput_locale_zh.js" type="text/javascript"></script>
 
+    <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>
 
 
 @endsection
 
 @section('content')

+ 3 - 3
resources/views/admin/album/order/check.blade.php
查看文件

xqd 
@@ -26,9 +26,9 @@
 
     <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/cropperjs/cropper.min.css">
 
 
     <!-- 全局js -->
 
-    <script src="/base/js/jquery-2.1.1.min.js?v={{config("sys.version")}}"></script>
 
-    <script src="/base/js/bootstrap.min.js?v=3.4.0"></script>
 
-    <script src="/base/js/layer/layer.js?v={{config("sys.version")}}"></script>
 
+    <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 type="text/javascript">
 
         function doPrint() {

+ 1 - 1
resources/views/admin/album/order/index.blade.php
查看文件

xqd 
@@ -290,7 +290,7 @@
 
         </small>
 
     </div>
 
     {{--时间插件--}}
 
-    <script src="/base/js/time/jquery-ui-1.10.1.min.js"></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/time/jquery-ui-1.10.1.min.js"></script>
 
     <script>
 
         //        时间选择js
 
         $(function () {

+ 3 - 3
resources/views/admin/album/order/view.blade.php
查看文件

xqd 
@@ -26,9 +26,9 @@
 
     <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/cropperjs/cropper.min.css">
 
 
     <!-- 全局js -->
 
-    <script src="/base/js/jquery-2.1.1.min.js?v={{config("sys.version")}}"></script>
 
-    <script src="/base/js/bootstrap.min.js?v=3.4.0"></script>
 
-    <script src="/base/js/layer/layer.js?v={{config("sys.version")}}"></script>
 
+    <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 type="text/javascript">
 
         function doPrint() {

+ 2 - 2
resources/views/admin/auth/albumlogin.blade.php
查看文件

xqd 
@@ -37,8 +37,8 @@
 
     </div>
 
 
 <!-- 全局js -->
 
-<script src="/base/js/jquery-2.1.1.min.js" ></script>
 
-<script src="/base/js/bootstrap.min.js?v=3.4.0" ></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/jquery-2.1.1.min.js" ></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/bootstrap.min.js?v=3.4.0" ></script>
 
 
 
 <!--统计代码，可删除-->

+ 2 - 2
resources/views/admin/auth/login.blade.php
查看文件

xqd 
@@ -37,8 +37,8 @@
 
     </div>
 
 
 <!-- 全局js -->
 
-<script src="/base/js/jquery-2.1.1.min.js" ></script>
 
-<script src="/base/js/bootstrap.min.js?v=3.4.0" ></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/jquery-2.1.1.min.js" ></script>
 
+<script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/bootstrap.min.js?v=3.4.0" ></script>
 
 
 
 <!--统计代码，可删除-->

+ 8 - 8
resources/views/admin/base/index/index.blade.php
查看文件

xqd 
@@ -153,18 +153,18 @@
 
 <!--右侧边栏结束-->
 
 </div>
 
 <!-- 全局js -->
 
-<script src="/base/js/jquery-2.1.1.min.js?v={{config("sys.version")}}"></script>
 
-<script src="/base/js/bootstrap.min.js?v=3.4.0"></script>
 
-<script src="/base/js/plugins/metisMenu/jquery.metisMenu.js?v={{config("sys.version")}}"></script>
 
-<script src="/base/js/plugins/slimscroll/jquery.slimscroll.min.js?v={{config("sys.version")}}"></script>
 
-<script src="/base/js/plugins/layer/layer.min.js?v={{config("sys.version")}}"></script>
 
+<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>
 
 
 <!-- 自定义js -->
 
-<script src="/base/js/hplus.min.js?v=3.2.0"></script>
 
-<script type="text/javascript" src="/base/js/contabs.min.js?v={{config("sys.version")}}"></script>
 
+<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="/base/js/plugins/pace/pace.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>
 
     $(function () {

+ 3 - 3
resources/views/admin/base/index/welcome.blade.php
查看文件

xqd xqd 
@@ -1,8 +1,8 @@
 
 @extends('admin.layout')
 
 
 @section('content')
 
-    <script type="text/javascript" src="/base/js/echarts.min.js"></script>
 
-    {{--<script type="text/javascript" src="/base/js/bmap.min.js"></script>--}}
 
+    <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="https://api.map.baidu.com/api?v=2.0&ak=5N76rPnIjhk6NXtinNK1zAkQd9la7MNH"></script>
 
     <style>
 
         .statistical {
 
@@ -330,7 +330,7 @@
 
 
 
     </script>
 
-    <script type="text/javascript" src="/base/js/china.js"></script>
 
+    <script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/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
查看文件

xqd 
@@ -46,8 +46,8 @@
 
 			color: rgba(0, 0, 0, 0.85);
 
 		}
 
 	</style>
 
-	<script type="text/javascript" src="/base/neditor-1.5.3/dialogs/image/image.js"></script>
 
-	<script type="text/javascript" src="/base/neditor-1.5.3/dialogs/internal.js"></script>
 
+	<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>
 
 @endsection
 
 
 @section('content')

+ 5 - 5
resources/views/admin/base/resources/manage.blade.php
查看文件

xqd xqd 
@@ -3,7 +3,7 @@
 
 @section('content')
 
 
 <link href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/swfupload/swfupload.css?v={{config("sys.version")}}" rel="stylesheet">
 
-<script type="text/javascript" src="/base/js/zclip/jquery.zclip.min.js?v={{config("sys.version")}}" ></script>
 
+<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/zclip/jquery.zclip.min.js?v={{config("sys.version")}}" ></script>
 
 <style type="text/css">
 
 i,em{font-style:normal;}
 
 .upload_object {width:80px;}
 
@@ -158,10 +158,10 @@ i,em{font-style:normal;}
 
 </div>
 
 
 
-<script type="text/javascript" src="/base/js/swfupload/swfupload.js?v={{config("sys.version")}}" ></script>
 
-<script type="text/javascript" src="/base/js/swfupload/swfupload.queue.js?v={{config("sys.version")}}" ></script>
 
-<script type="text/javascript" src="/base/js/swfupload/fileprogress.js?v={{config("sys.version")}}" ></script>
 
-<script type="text/javascript" src="/base/js/swfupload/handlers.js?v={{config("sys.version")}}" ></script>
 
+<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/swfupload/swfupload.js?v={{config("sys.version")}}" ></script>
 
+<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/swfupload/swfupload.queue.js?v={{config("sys.version")}}" ></script>
 
+<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/swfupload/fileprogress.js?v={{config("sys.version")}}" ></script>
 
+<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/swfupload/handlers.js?v={{config("sys.version")}}" ></script>
 
 <script type="text/javascript">
 
 	var loadlayer;
 
 	var swfu = '';

+ 2 - 2
resources/views/admin/base/role/auth.blade.php
查看文件

xqd 
@@ -141,6 +141,6 @@
 
 @section('footer')
 
 	 <!-- ztree -->
 
     <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/zTree_v3/css/zTreeStyle/zTreeStyle.css" type="text/css">
 
-    <script type="text/javascript" src="/base/js/zTree_v3/js/jquery.ztree.core-3.5.js?v={{config("sys.version")}}" ></script>
 
-    <script type="text/javascript" src="/base/js/zTree_v3/js/jquery.ztree.excheck-3.5.js?v={{config("sys.version")}}" ></script>
 
+    <script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/zTree_v3/js/jquery.ztree.core-3.5.js?v={{config("sys.version")}}" ></script>
 
+    <script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/zTree_v3/js/jquery.ztree.excheck-3.5.js?v={{config("sys.version")}}" ></script>
 
 @endsection

+ 5 - 5
resources/views/admin/base/tool/alimanage.blade.php
查看文件

xqd xqd 
@@ -2,7 +2,7 @@
 
 
 @section('content')
 
 
-<script type="text/javascript" src="/base/js/zclip/jquery.zclip.min.js?v={{config("sys.version")}}" ></script>
 
+<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/zclip/jquery.zclip.min.js?v={{config("sys.version")}}" ></script>
 
 <style type="text/css">
 
 #new-upload-btn { display:none; }
 
 #new-upload-btn .notice{position: relative; left: 8px; top: -9px; color: #1a7bb9;}
 
@@ -113,10 +113,10 @@
 
     </div>
 
 </div>
 
 
-<script type="text/javascript" src="/base/js/swfupload/swfupload.js?v={{config("sys.version")}}" ></script>
 
-<script type="text/javascript" src="/base/js/swfupload/swfupload.queue.js?v={{config("sys.version")}}" ></script>
 
-<script type="text/javascript" src="/base/js/swfupload/fileprogress.js?v={{config("sys.version")}}" ></script>
 
-<script type="text/javascript" src="/base/js/swfupload/handlers.js?v={{config("sys.version")}}" ></script>
 
+<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/swfupload/swfupload.js?v={{config("sys.version")}}" ></script>
 
+<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/swfupload/swfupload.queue.js?v={{config("sys.version")}}" ></script>
 
+<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/swfupload/fileprogress.js?v={{config("sys.version")}}" ></script>
 
+<script type="text/javascript" src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/swfupload/handlers.js?v={{config("sys.version")}}" ></script>
 
 <script type="text/javascript">
 
 var loadlayer;
 
 var swfu = '';

+ 4 - 4
resources/views/admin/furniture/newgoods/info/commentschart.blade.php
查看文件

xqd 
@@ -28,10 +28,10 @@
 
         </div>
 
     </div>
 
 
-    <script src="/base/js/plugins/flot/jquery.flot.js"></script>
 
-    <script src="/base/js/plugins/flot/jquery.flot.tooltip.min.js"></script>
 
-    <script src="/base/js/plugins/flot/jquery.flot.resize.js"></script>
 
-    <script src="/base/js/plugins/flot/jquery.flot.pie.js"></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/plugins/flot/jquery.flot.js"></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/plugins/flot/jquery.flot.tooltip.min.js"></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/plugins/flot/jquery.flot.resize.js"></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/plugins/flot/jquery.flot.pie.js"></script>
 
     <script>
 
         $(function () {
 
             var e = {

+ 12 - 12
resources/views/admin/layout.blade.php
查看文件

xqd xqd 
@@ -26,9 +26,9 @@
 
     <link rel="stylesheet" href="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/plugins/cropperjs/cropper.min.css">
 
 
    	<!-- 全局js -->
 
-    <script src="/base/js/jquery-2.1.1.min.js?v={{config("sys.version")}}" ></script>
 
-    <script src="/base/js/bootstrap.min.js?v=3.4.0" ></script>
 
-    <script src="/base/js/layer/layer.js?v={{config("sys.version")}}"></script>
 
+    <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>
 
 
     @yield('header')
 
 </head>
 
@@ -37,21 +37,21 @@
 
        @yield('content')
 
 
     <!-- layer Date -->
 
-    <script src="/base/js/plugins/laydate/laydate.js?v={{config("sys.version")}}" type="text/javascript" ></script>
 
+    <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 type="text/javascript"> !function(){ laydate.skin('molv'); }(); </script>
 
 
     <!-- 自定义js -->
 
-    <script src="/base/js/content.min.js?v=1.0.0" ></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/content.min.js?v=1.0.0" ></script>
 
 
-    <script src="/base/js/jquery-ui-1.10.4.min.js"></script>
 
+    <script src="{{ session()->get('is_we7')=='true'?'/addons/furniture/public':'' }}/base/js/jquery-ui-1.10.4.min.js"></script>
 
 
     <!-- jQuery Validation plugin javascript-->
 
-    <script src="/base/js/plugins/validate/jquery.validate.min.js?v={{config("sys.version")}}" ></script>
 
-    <script src="/base/js/plugins/validate/validate_custom.js?v={{config("sys.version")}}" ></script>
 
-    <script src="/base/js/plugins/validate/messages_zh.min.js?v={{config("sys.version")}}" ></script>
 
-    <script src="/base/js/jquery.tableSort.js?v={{config("sys.version")}}" ></script>
 
-<!--     <script src="/base/plugins/fine-uploader/fine-uploader.min.js"></script> -->
 
-    <script src="/base/plugins/cropperjs/cropper.min.js"></script>
 
+    <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>
 
         $.ajaxSetup({
 
             headers: { 'X-CSRF-TOKEN' : '{{ csrf_token() }}' }