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

1

dyjh 6 年之前
父节点
73471ccafb
当前提交
abb24ecbb6
共有 31 个文件被更改，包括 364 次插入 和 226 次删除
合并视图 显示文件统计
  1. 2 2
      .gitignore
  2. 7 0
      app/Furniture.php
  3. 9 20
      app/Helper/functions.inc.php
  4. 3 40
      app/Http/Controllers/Admin/Auth/LoginController.php
  5. 1 0
      app/Http/Controllers/Admin/Base/IndexController.php
  6. 2 2
      app/Http/Controllers/Admin/Base/RoleController.php
  7. 4 4
      app/Http/Controllers/Admin/Controller.php
  8. 0 8
      app/Http/Controllers/Web/AuthController.php
  9. 0 26
      app/Http/Middleware/VerifyCsrfToken.php
  10. 1 1
      app/Models/AdminAccessModel.php
  11. 0 1
      app/Models/AdminUserModel.php
  12. 0 1
      app/Models/AlbumAgentModel.php
  13. 0 1
      app/Providers/AppServiceProvider.php
  14. 2 0
      app/Providers/RouteServiceProvider.php
  15. 9 17
      app/Widget/Tools/FileUpload.php
  16. 21 41
      app/Widget/Tools/ImgUpload.php
  17. 1 1
      config/database.php
  18. 34 0
      database/migrations/2017_10_12_092318_add_remember_token_to_user_info.php
  19. 32 0
      database/migrations/2017_10_12_102044_add_app_id_to_base_settings.php
  20. 33 0
      database/migrations/2017_10_20_165639_add_appid_show_to_sw_company_info_table.php
  21. 32 0
      database/migrations/2017_10_24_165004_add_api_token_to_user_info_table.php
  22. 37 0
      database/migrations/2017_11_30_110019_create_card_user_project_table.php
  23. 37 0
      database/migrations/2017_11_30_163928_create_card_banner_table.php
  24. 33 0
      database/migrations/2017_12_04_095210_add_location_to_card_user_info_table.php
  25. 32 0
      database/migrations/2017_12_04_103818_add_qrcode_to_card_user_info_table.php
  26. 32 0
      database/migrations/2017_12_06_102208_add_shade_to_card_user_info_table.php
  27. 0 0
      database/migrations/2017_12_14_160035_add_test_to_card_user_info_table.php
  28. 二进制
      icon.jpg
  29. 0 25
      manifest.xml
  30. 0 5
      map.json
  31. 0 31
      module.php

+ 2 - 2
.gitignore
查看文件 

@@ -2,7 +2,7 @@
 
 /public/storage
 
 /public/storage
 
 /public/hot
 
 /public/hot
 
 /storage/*.key
 
 /storage/*.key
 
-/vendor/
 
+/vendor
 
 /.idea
 
 /.idea
 
 Homestead.json
 
 Homestead.json
 
 Homestead.yaml
 
 Homestead.yaml
 
@@ -13,4 +13,4 @@ _ide_helper*
 
 /storage/logs
 
 /storage/logs
 
 /public/upload
 
 /public/upload
 
 /public/download
 
 /public/download
 
-/public/base/poster/download
 
+/public/base/poster/download

+ 7 - 0
app/Furniture.php
查看文件 

@@ -0,0 +1,7 @@
 
+<?php
 
+/**
 
+ * Created by PhpStorm.
 
+ * User: 思维定制
 
+ * Date: 2019/3/20
 
+ * Time: 11:20
 
+ */

+ 9 - 20
app/Helper/functions.inc.php
查看文件 

@@ -194,14 +194,6 @@ if( ! function_exists('pairList'))
 
  */
 
  */
 
 function U ($url, $query = [])
 
 function U ($url, $query = [])
 
 {
 
 {
 
-    $is_we7 = session()->get('is_we7');
 
-    if($is_we7 == 'true'){
 
-        $adminUri = '?route=';
 
-        $string = '&';
 
-    }else if ($is_we7 == 'false') {
 
-        $adminUri = '';
 
-        $string = '?';
 
-    }
 
     $url = ltrim($url, '/');
 
     $url = ltrim($url, '/');
 
     $urlInfo = parse_url($url);
 
     $urlInfo = parse_url($url);
 
     $aQuery = [];
 
     $aQuery = [];
 
@@ -211,16 +203,14 @@ function U ($url, $query = [])
 
     }
 
     }
 
     $queryString = http_build_query(array_merge($aQuery, $query));
 
     $queryString = http_build_query(array_merge($aQuery, $query));
 
     if(isset($urlInfo['host'])) {
 
     if(isset($urlInfo['host'])) {
 
-        $url = $urlInfo['scheme'] . '://' . $urlInfo['host'].'/' . $adminUri . 'admin/';
 
+        $url = $urlInfo['scheme'] . '://' . $urlInfo['host'].'/admin/';
 
     }else{
 
     }else{
 
-        $url = request()->root() . '/' . $adminUri . 'admin/';
 
+        $url = request()->root() . '/admin/';
 
     }
 
     }
 
     $url .= isset($urlInfo['path']) ? $urlInfo['path'] : '';
 
     $url .= isset($urlInfo['path']) ? $urlInfo['path'] : '';
 
-    $url .= $queryString === '' ? '' : ($string . $queryString);
 
+    $url .= $queryString === '' ? '' : ('?'.$queryString);
 
     return $url;
 
     return $url;
 
 }
 
 }
 
-
 
-
 
 /**
 
 /**
 
  * 验证角色菜单权限
 
  * 验证角色菜单权限
 
  *
 
  *
 
@@ -622,7 +612,6 @@ function formPost($url, $post_data=array(), $timeout=60, $userpwd = null)
 
  * @return string
 
  * @return string
 
  */
 
  */
 
 function editor($textareaid = 'content', $getParam = array(), $options = array()) {
 
 function editor($textareaid = 'content', $getParam = array(), $options = array()) {
 
-    $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
     $getParam['_token']     = csrf_token();
 
     $getParam['_token']     = csrf_token();
 
     $getParam['elementid']  = isset($getParam['elementid'])?$getParam['elementid']:'elementid';
 
     $getParam['elementid']  = isset($getParam['elementid'])?$getParam['elementid']:'elementid';
 
     $getParam['KindEditor'] = isset($getParam['KindEditor'])?$getParam['KindEditor']:true;
 
     $getParam['KindEditor'] = isset($getParam['KindEditor'])?$getParam['KindEditor']:true;
 
@@ -643,9 +632,9 @@ function editor($textareaid = 'content', $getParam = array(), $options = array()
 
     $_csrf_token = csrf_token();
 
     $_csrf_token = csrf_token();
 
 
 
     $editer = <<<HTML
 
     $editer = <<<HTML
 
-        <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>
 
+        <link rel="stylesheet" href="/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>
 
         <script>
 
         <script>
 
             var editor_{$textareaid};
 
             var editor_{$textareaid};
 
             var options = '{$options}';
 
             var options = '{$options}';
 
@@ -665,12 +654,12 @@ HTML;
 
 }
 
 }
 
 
 
 function ueditor() {
 
 function ueditor() {
 
-    $strUri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
+
 
     $editer = <<<HTML
 
     $editer = <<<HTML
 
     <!-- 配置文件 -->
 
     <!-- 配置文件 -->
 
-    <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.config.js"></script>
 
     <!-- 编辑器源码文件 -->
 
     <!-- 编辑器源码文件 -->
 
-    <script type="text/javascript" src="$strUri/base/neditor-1.5.3/neditor.all.js"></script>
 
+    <script type="text/javascript" src="/base/neditor-1.5.3/neditor.all.js"></script>
 
     <!-- 实例化编辑器 -->
 
     <!-- 实例化编辑器 -->
 
     <script type="text/javascript">
 
     <script type="text/javascript">
 
         var ue = UE.getEditor('container',{
 
         var ue = UE.getEditor('container',{

+ 3 - 40
app/Http/Controllers/Admin/Auth/LoginController.php
查看文件 

@@ -2,7 +2,6 @@
 
 
 
 namespace App\Http\Controllers\Admin\Auth;
 
 namespace App\Http\Controllers\Admin\Auth;
 
 
 
-use App\Models\AdminUserModel;
 
 use App\Services\Admin\AdminUser;
 
 use App\Services\Admin\AdminUser;
 
 use App\Http\Controllers\Admin\Controller;
 
 use App\Http\Controllers\Admin\Controller;
 
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
@@ -66,41 +65,6 @@ class LoginController extends Controller
 
         return 'name';
 
         return 'name';
 
     }
 
     }
 
 
 
-    public function wxLogin()
 
-    {
 
-        $store_id = session()->get('store_id');
 
-       // dd($store_id);die;
 
-        $wUser = session()->get('wUser');
 
-        $groupid = session()->get('groupid');
 
-     //   dd($groupid);
 
-        //$wAccount = session()->get('wAccount');
 
-        if ($groupid == 0) {
 
-            $res = AdminUserModel::where([['is_root', 1]])->first();
 
-        } else {
 
-            $res = AdminUserModel::where([['name', $wUser['name']],['store_id', $store_id]])->first();
 
-        }
 
-
 
-        if (!$res) {
 
-            $createUser['name'] = $wUser['name'];
 
-            $createUser['real_name'] = $wUser['username'];
 
-            $createUser['password'] = bcrypt('qweqwe');
 
-            $createUser['type'] = 0;
 
-            $createUser['status'] = 1;
 
-            $createUser['is_root'] = null;
 
-            $createUser['store_id'] = $store_id;
 
-            $createUser['admin_role_id'] = 4;
 
-            $res = AdminUserModel::create($createUser);
 
-        }
 
-        //dd(Auth::loginUsingId($res->id));
 
-        if (Auth::guard('admin')->loginUsingId($res->id)) {
 
-
 
-            $userAuth = Auth::guard('admin')->user();
 
-            session()->put('is_we7','true');
 
-            return redirect('?route=Admin/Base/Index/index');
 
-        }
 
-        //dd('success');
 
-    }
 
-    
     public function login(\Illuminate\Http\Request $request)
 
     public function login(\Illuminate\Http\Request $request)
 
     {
 
     {
 
 
 
@@ -120,19 +84,18 @@ class LoginController extends Controller
 
         }
 
         }
 
         $res = $this->_service->login($request->name, $request->password);
 
         $res = $this->_service->login($request->name, $request->password);
 
         if($res) {
 
         if($res) {
 
-            session()->put('is_we7','true');
 
-            redirect('?route=Admin/Auth/Login/showLoginForm');
 
+            redirect('/admin/login');
 
         }else{
 
         }else{
 
             $msg = $this->_service->getMsg();
 
             $msg = $this->_service->getMsg();
 
             $this->showWarning($msg);
 
             $this->showWarning($msg);
 
         }
 
         }
 
 
 
-        return redirect('?route=Admin/Base/Index/index');
 
+        return redirect('/admin');
 
     }
 
     }
 
     public function logout()
 
     public function logout()
 
     {
 
     {
 
         Auth::guard('admin')->logout();
 
         Auth::guard('admin')->logout();
 
-        return redirect('?route=Admin/Auth/Login/showLoginForm');
 
+        return redirect('/admin/login');
 
 
 
     }
 
     }
 
 }
 
 }

+ 1 - 0
app/Http/Controllers/Admin/Base/IndexController.php
查看文件 

@@ -85,6 +85,7 @@ class IndexController extends Controller
 
             }
 
             }
 
             $geoCoordMap->$name = [$val['lon'], $val['lat']];
 
             $geoCoordMap->$name = [$val['lon'], $val['lat']];
 
         }
 
         }
 
+        //dd($geoCoordMap);
 
         $data = json_encode($data);
 
         $data = json_encode($data);
 
         $geoCoordMap = json_encode($geoCoordMap);
 
         $geoCoordMap = json_encode($geoCoordMap);
 
         $day = substr($day, 0, strlen($day) - 1) . ']';
 
         $day = substr($day, 0, strlen($day) - 1) . ']';

+ 2 - 2
app/Http/Controllers/Admin/Base/RoleController.php
查看文件 

@@ -100,14 +100,14 @@ class RoleController extends Controller
 
             $menuIds = Request::input('menu_ids');
 
             $menuIds = Request::input('menu_ids');
 
             if($this->_user['is_root']) {
 
             if($this->_user['is_root']) {
 
                 $allMenus = false;
 
                 $allMenus = false;
 
-            } else {
 
+            }else{
 
                 $allMenus = array();
 
                 $allMenus = array();
 
                 foreach ($this->_user['menus'] as $value) {
 
                 foreach ($this->_user['menus'] as $value) {
 
                     $allMenus[] = $value['id'];
 
                     $allMenus[] = $value['id'];
 
                 }
 
                 }
 
             }
 
             }
 
             $ok = $objAcl->setRole($id, $menuIds,$allMenus);
 
             $ok = $objAcl->setRole($id, $menuIds,$allMenus);
 
-            if ($ok) {
 
+            if($ok) {
 
                 $arr['status'] = SUCESS_CODE;
 
                 $arr['status'] = SUCESS_CODE;
 
 
 
             }else{
 
             }else{

+ 4 - 4
app/Http/Controllers/Admin/Controller.php
查看文件 

@@ -159,16 +159,16 @@ abstract class Controller extends BaseController
 
             }
 
             }
 
             $urlHtml .= '&nbsp;<a  class="btn btn-primary"  href="' . $u . '" >' . $url['title'] . '</a>';
 
             $urlHtml .= '&nbsp;<a  class="btn btn-primary"  href="' . $u . '" >' . $url['title'] . '</a>';
 
         }
 
         }
 
-        $str_uri = session()->get('is_we7')=='true'?'/addons/furniture/public':'';
 
+
 
         $html ='<!DOCTYPE html>
 
         $html ='<!DOCTYPE html>
 
                 <html>
 
                 <html>
 
                 <head>
 
                 <head>
 
                     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
                     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
                     <meta name="renderer" content="webkit">
 
                     <meta name="renderer" content="webkit">
 
                     <title>' . $titleHtml .'</title>
 
                     <title>' . $titleHtml .'</title>
 
-                    <link href="'. $str_uri .'/base/css/bootstrap.min.css?v=3.4.0.css"  rel="stylesheet">
 
-                    <link href="'. $str_uri .'/base/css/font-awesome.min.css?v=4.3.0.css"  rel="stylesheet">
 
-                    <link href="'. $str_uri .'/base/css/style.min.css?v=3.0.0.css"  rel="stylesheet">
 
+                    <link href="/base/css/bootstrap.min.css?v=3.4.0.css"  rel="stylesheet">
 
+                    <link href="/base/css/font-awesome.min.css?v=4.3.0.css"  rel="stylesheet">
 
+                    <link href="/base/css/style.min.css?v=3.0.0.css"  rel="stylesheet">
 
                     <script type="text/javascript">
 
                     <script type="text/javascript">
 
                             setTimeout(function(){
 
                             setTimeout(function(){
 
                                 var url = "' . $urls[0]['url'] . '";
 
                                 var url = "' . $urls[0]['url'] . '";

+ 0 - 8
app/Http/Controllers/Web/AuthController.php
查看文件 

@@ -183,12 +183,4 @@ class AuthController extends Controller
 
     {
 
     {
 
         return view('welcome');
 
         return view('welcome');
 
     }
 
     }
 
-
 
-//用于回复用户消息
 
-function responseMsg(){
 
-
 
-}
 
-
 
-
 
-
 
 }
 
 }

+ 0 - 26
app/Http/Middleware/VerifyCsrfToken.php
查看文件 

@@ -3,7 +3,6 @@
 
 namespace App\Http\Middleware;
 
 namespace App\Http\Middleware;
 
 
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
 
-use Closure;
 
 
 
 class VerifyCsrfToken extends BaseVerifier
 
 class VerifyCsrfToken extends BaseVerifier
 
 {
 
 {
 
@@ -20,29 +19,4 @@ class VerifyCsrfToken extends BaseVerifier
 
         '/web/notify-account'
 
         '/web/notify-account'
 
     ];
 
     ];
 
 
 
-    public function handle($request, Closure $next)
 
-    {
 
-        // 如果是来自 api 域名，就跳过检查
 
-
 
-        $QUERY_STRING = explode('/', $_SERVER['QUERY_STRING']);
 
-       // dd($QUERY_STRING);die;
 
-        if($QUERY_STRING[0] == 'route=admin' && $QUERY_STRING[1] == 'Base' && $QUERY_STRING[2] == 'Attachment'){
 
-            return $next($request);
 
-        }
 
-
 
-        if($QUERY_STRING[0] == 'route=wechat'){
 
-            return $next($request);
 
-        }
 
-        if($QUERY_STRING[0] == 'route=Api'){
 
-            return $next($request);
 
-        }
 
-
 
-        if($QUERY_STRING[0] == 'route=notify'){
 
-            return $next($request);
 
-        }
 
-        return parent::handle($request, $next);
 
-
 
-
 
-
 
-    }
 
 }
 
 }

+ 1 - 1
app/Models/AdminAccessModel.php
查看文件 

@@ -67,7 +67,7 @@ class AdminAccessModel extends BaseModel
 
         }
 
         }
 
         $info = $info
 
         $info = $info
 
             ->orderBy('admin_menus.sort', 'desc')->orderBy('admin_menus.id', 'asc')
 
             ->orderBy('admin_menus.sort', 'desc')->orderBy('admin_menus.id', 'asc')
 
-            ->groupby(\DB::raw("fanyun_admin_menus.id"))
 
+            ->groupby(\DB::raw("admin_menus.id"))
 
             ->get();
 
             ->get();
 
         return $info->toArray();
 
         return $info->toArray();
 
     }
 
     }

+ 0 - 1
app/Models/AdminUserModel.php
查看文件 

@@ -32,7 +32,6 @@ class AdminUserModel extends Authenticatable
 
     protected $fillable = [
 
     protected $fillable = [
 
         'name',
 
         'name',
 
         'real_name',
 
         'real_name',
 
-        'store_id',
 
         'password',
 
         'password',
 
         'store_id',
 
         'store_id',
 
         'email',
 
         'email',

+ 0 - 1
app/Models/AlbumAgentModel.php
查看文件 

@@ -56,5 +56,4 @@ class AlbumAgentModel extends BaseModel
 
         'share_times'
 
         'share_times'
 
     ];
 
     ];
 
 
 
-
 
 }
 
 }

+ 0 - 1
app/Providers/AppServiceProvider.php
查看文件 

@@ -14,7 +14,6 @@ class AppServiceProvider extends ServiceProvider
 
     public function boot()
 
     public function boot()
 
     {
 
     {
 
         //
 
         //
 
-        //qwew
 
     }
 
     }
 
 
 
     /**
 
     /**

+ 2 - 0
app/Providers/RouteServiceProvider.php
查看文件 

@@ -24,6 +24,7 @@ class RouteServiceProvider extends ServiceProvider
 
     public function boot()
 
     public function boot()
 
     {
 
     {
 
         //
 
         //
 
+
 
         parent::boot();
 
         parent::boot();
 
     }
 
     }
 
 
 
@@ -37,6 +38,7 @@ class RouteServiceProvider extends ServiceProvider
 
         $this->mapApiRoutes();
 
         $this->mapApiRoutes();
 
 
 
         $this->mapWebRoutes();
 
         $this->mapWebRoutes();
 
+
 
         //后台路由
 
         //后台路由
 
         $this->mapAdminRoutes();
 
         $this->mapAdminRoutes();
 
     }
 
     }

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

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

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

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

+ 1 - 1
config/database.php
查看文件 

@@ -49,7 +49,7 @@ return [
 
             'unix_socket' => env('DB_SOCKET', ''),
 
             'unix_socket' => env('DB_SOCKET', ''),
 
             'charset' => 'utf8mb4',
 
             'charset' => 'utf8mb4',
 
             'collation' => 'utf8mb4_unicode_ci',
 
             'collation' => 'utf8mb4_unicode_ci',
 
-            'prefix' => 'fanyun_',
 
+            'prefix' => '',
 
             'strict' => false,
 
             'strict' => false,
 
             'engine' => null,
 
             'engine' => null,
 
         ],
 
         ],

+ 34 - 0
database/migrations/2017_10_12_092318_add_remember_token_to_user_info.php
查看文件 

@@ -0,0 +1,34 @@
 
+<?php
 
+
 
+use Illuminate\Support\Facades\Schema;
 
+use Illuminate\Database\Schema\Blueprint;
 
+use Illuminate\Database\Migrations\Migration;
 
+
 
+class AddRememberTokenToUserInfo extends Migration
 
+{
 
+    /**
 
+     * Run the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function up()
 
+    {
 
+        Schema::table('user_info', function (Blueprint $table) {
 
+            $table->string('remember_token')->nullable()->after('openid');
 
+            $table->unsignedInteger('status')->default(1)->after('openid');
 
+            $table->unsignedInteger('is_root')->default(1)->after('openid');
 
+        });
 
+    }
 
+
 
+    /**
 
+     * Reverse the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function down()
 
+    {
 
+        Schema::table('user_info', function (Blueprint $table) {
 
+            //
 
+        });
 
+    }
 
+}

+ 32 - 0
database/migrations/2017_10_12_102044_add_app_id_to_base_settings.php
查看文件 

@@ -0,0 +1,32 @@
 
+<?php
 
+
 
+use Illuminate\Support\Facades\Schema;
 
+use Illuminate\Database\Schema\Blueprint;
 
+use Illuminate\Database\Migrations\Migration;
 
+
 
+class AddAppIdToBaseSettings extends Migration
 
+{
 
+    /**
 
+     * Run the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function up()
 
+    {
 
+        Schema::table('base_settings', function (Blueprint $table) {
 
+            $table->string('appid')->after('id')->default(0);
 
+        });
 
+    }
 
+
 
+    /**
 
+     * Reverse the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function down()
 
+    {
 
+        Schema::table('base_settings', function (Blueprint $table) {
 
+            //
 
+        });
 
+    }
 
+}

+ 33 - 0
database/migrations/2017_10_20_165639_add_appid_show_to_sw_company_info_table.php
查看文件 

@@ -0,0 +1,33 @@
 
+<?php
 
+
 
+use Illuminate\Support\Facades\Schema;
 
+use Illuminate\Database\Schema\Blueprint;
 
+use Illuminate\Database\Migrations\Migration;
 
+
 
+class AddAppidShowToSwCompanyInfoTable extends Migration
 
+{
 
+    /**
 
+     * Run the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function up()
 
+    {
 
+        Schema::table('cp_company_info', function (Blueprint $table) {
 
+            $table->string('appid')->default('')->after('id')->comment('appid');
 
+            $table->text('show')->default('')->after('pic')->comment('展示banner');
 
+        });
 
+    }
 
+
 
+    /**
 
+     * Reverse the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function down()
 
+    {
 
+        Schema::table('cp_company_info', function (Blueprint $table) {
 
+            //
 
+        });
 
+    }
 
+}

+ 32 - 0
database/migrations/2017_10_24_165004_add_api_token_to_user_info_table.php
查看文件 

@@ -0,0 +1,32 @@
 
+<?php
 
+
 
+use Illuminate\Support\Facades\Schema;
 
+use Illuminate\Database\Schema\Blueprint;
 
+use Illuminate\Database\Migrations\Migration;
 
+
 
+class AddApiTokenToUserInfoTable extends Migration
 
+{
 
+    /**
 
+     * Run the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function up()
 
+    {
 
+        Schema::table('user_info', function (Blueprint $table) {
 
+            $table->string('api_token')->comment('api_token')->after('remember_token')->nullable();
 
+        });
 
+    }
 
+
 
+    /**
 
+     * Reverse the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function down()
 
+    {
 
+        Schema::table('user_info', function (Blueprint $table) {
 
+            //
 
+        });
 
+    }
 
+}

+ 37 - 0
database/migrations/2017_11_30_110019_create_card_user_project_table.php
查看文件 

@@ -0,0 +1,37 @@
 
+<?php
 
+
 
+use Illuminate\Support\Facades\Schema;
 
+use Illuminate\Database\Schema\Blueprint;
 
+use Illuminate\Database\Migrations\Migration;
 
+
 
+class CreateCardUserProjectTable extends Migration
 
+{
 
+    /**
 
+     * Run the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function up()
 
+    {
 
+        Schema::create('card_user_project', function (Blueprint $table) {
 
+            $table->increments('id');
 
+            $table->string('user_id')->comment('用户');
 
+            $table->string('name')->default('')->comment('项目名');
 
+            $table->string('show')->default('')->comment('展示图');
 
+            $table->text('detail')->comment('详情');
 
+            $table->timestamps();
 
+
 
+            $table->index('user_id');
 
+        });
 
+    }
 
+
 
+    /**
 
+     * Reverse the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function down()
 
+    {
 
+        Schema::dropIfExists('card_user_project');
 
+    }
 
+}

+ 37 - 0
database/migrations/2017_11_30_163928_create_card_banner_table.php
查看文件 

@@ -0,0 +1,37 @@
 
+<?php
 
+
 
+use Illuminate\Support\Facades\Schema;
 
+use Illuminate\Database\Schema\Blueprint;
 
+use Illuminate\Database\Migrations\Migration;
 
+
 
+class CreateCardBannerTable extends Migration
 
+{
 
+    /**
 
+     * Run the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function up()
 
+    {
 
+        Schema::create('card_banner', function (Blueprint $table) {
 
+            $table->increments('id');
 
+            $table->string('user_id');
 
+            $table->string('pic')->default('')->comment('图片');
 
+            $table->integer('sort')->default(0)->comment('排序号');
 
+            $table->enum('status',['显示','显示'])->default('显示')->comment('轮播图状态');
 
+            $table->timestamps();
 
+
 
+            $table->index('user_id');
 
+        });
 
+    }
 
+
 
+    /**
 
+     * Reverse the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function down()
 
+    {
 
+        Schema::dropIfExists('card_banner');
 
+    }
 
+}

+ 33 - 0
database/migrations/2017_12_04_095210_add_location_to_card_user_info_table.php
查看文件 

@@ -0,0 +1,33 @@
 
+<?php
 
+
 
+use Illuminate\Support\Facades\Schema;
 
+use Illuminate\Database\Schema\Blueprint;
 
+use Illuminate\Database\Migrations\Migration;
 
+
 
+class AddLocationToCardUserInfoTable extends Migration
 
+{
 
+    /**
 
+     * Run the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function up()
 
+    {
 
+        Schema::table('card_user_info', function (Blueprint $table) {
 
+            $table->double('lat',13,10)->after('address')->default(0)->comment('地址纬度');
 
+            $table->double('lon',13,10)->after('address')->default(0)->comment('地址经度');
 
+        });
 
+    }
 
+
 
+    /**
 
+     * Reverse the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function down()
 
+    {
 
+        Schema::table('card_user_info', function (Blueprint $table) {
 
+            //
 
+        });
 
+    }
 
+}

+ 32 - 0
database/migrations/2017_12_04_103818_add_qrcode_to_card_user_info_table.php
查看文件 

@@ -0,0 +1,32 @@
 
+<?php
 
+
 
+use Illuminate\Support\Facades\Schema;
 
+use Illuminate\Database\Schema\Blueprint;
 
+use Illuminate\Database\Migrations\Migration;
 
+
 
+class AddQrcodeToCardUserInfoTable extends Migration
 
+{
 
+    /**
 
+     * Run the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function up()
 
+    {
 
+        Schema::table('card_user_info', function (Blueprint $table) {
 
+            $table->string('qrcode')->default('')->after('avatar')->comment('名片二维码');
 
+        });
 
+    }
 
+
 
+    /**
 
+     * Reverse the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function down()
 
+    {
 
+        Schema::table('card_user_info', function (Blueprint $table) {
 
+            //
 
+        });
 
+    }
 
+}

+ 32 - 0
database/migrations/2017_12_06_102208_add_shade_to_card_user_info_table.php
查看文件 

@@ -0,0 +1,32 @@
 
+<?php
 
+
 
+use Illuminate\Support\Facades\Schema;
 
+use Illuminate\Database\Schema\Blueprint;
 
+use Illuminate\Database\Migrations\Migration;
 
+
 
+class AddShadeToCardUserInfoTable extends Migration
 
+{
 
+    /**
 
+     * Run the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function up()
 
+    {
 
+        Schema::table('card_user_info', function (Blueprint $table) {
 
+            $table->string('shade')->default('')->after('qrcode')->comment('');
 
+        });
 
+    }
 
+
 
+    /**
 
+     * Reverse the migrations.
 
+     *
 
+     * @return void
 
+     */
 
+    public function down()
 
+    {
 
+        Schema::table('card_user_info', function (Blueprint $table) {
 
+            //
 
+        });
 
+    }
 
+}

+ 0 - 0
database/migrations/2017_12_14_160035_add_test_to_card_user_info_table.php
查看文件


二进制
icon.jpg
查看文件


+ 0 - 25
manifest.xml
查看文件 

@@ -1,25 +0,0 @@
 
-<?xml version="1.0" encoding="utf-8"?>
 
-<manifest xmlns="http://9026.com/" versionCode="">
 
-    <application setting="false">
 
-        <name><![CDATA[在线画册]]></name>
 
-        <identifie><![CDATA[furniture]]></identifie>
 
-        <version><![CDATA[1.0]]></version>
 
-        <type><![CDATA[business]]></type>
 
-        <ability><![CDATA[在线画册]]></ability>
 
-        <description><![CDATA[在线画册]]></description>
 
-        <author><![CDATA[在线画册]]></author>
 
-        <url><![CDATA[http://9026.com]]></url>
 
-  </application>
 
-    <platform>
 
-        <supports>
 
-            <item type="wxapp"/>
 
-        </supports>
 
-    </platform>
 
-    <bindings>
 
-    </bindings>
 
-    <permissions>
 
-    </permissions>
 
-    <install><![CDATA[]]></install>
 
-    <uninstall><![CDATA[]]></uninstall>
 
-    <upgrade><![CDATA[]]></upgrade>
 
-</manifest>

+ 0 - 5
map.json
查看文件 

@@ -1,5 +0,0 @@
 
-微猫源码
 
-
 
-http://www.weixin2015.cn
 
-
 
-QQ:2058430070

+ 0 - 31
module.php
查看文件 

@@ -1,31 +0,0 @@
 
-<?php
 
-
 
-//namespace zjhj_mall;
 
-$entry = '/public/';
 
-
 
-if (file_exists(__DIR__ . $entry)) {
 
-    global $_W;
 
-    $wUser = [
 
-        'uid' => $_W['user']['uid'],
 
-        'groupid' => $_W['user']['groupid'],
 
-        'name' => $_W['user']['name'],
 
-        'username' => $_W['user']['username'],
 
-    ];
 
-    /*$wAccount = [
 
-        'acid' => $_W['account']['acid'],
 
-        'name' => $_W['account']['name'],
 
-    ];*/
 
-      //  print_r($_W);die;
 
-    require __DIR__ . '/vendor/autoload.php';
 
-    $request = new Illuminate\Http\Request;
 
-    session_start();
 
-    $_SESSION["store_id"] = $_W['uniacid'];
 
-    $_SESSION["wUser"] = $wUser;
 
-//    $_SESSION["wAccount"] = $wAccount;
 
-    $_SESSION["route"] = 'Admin/Auth/Login/wxLogin';
 
-    $uri = $_W['siteroot'] . 'addons/' . $_W['current_module']['name'] . $entry .'?route=Admin/Auth/Login/wxLogin';
 
-    header('Location: ' . $uri);
 
-    exit;
 
-} else {
 
-    die('应用入口文件缺失，请联系开发者处理！');
 
-}