From 2418516c4924a4bc871530f2f720b142b89602c4 Mon Sep 17 00:00:00 2001
From: hawind <fvzone@qq.com>
Date: Fri, 26 Feb 2021 06:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=96=87=E4=BB=B6=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E6=A0=B7=E5=93=81=E7=94=B3=E8=AF=B7=E5=8C=BA=E5=9F=9F=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Gdoo/Index/Controllers/Controller.php     |   5 -
 app/Gdoo/Index/views/index/index.blade.php    |   8 +-
 app/Gdoo/Index/views/index/support.blade.php  |   8 -
 .../Controllers/SampleApplyController.php     |  11 +-
 resources/views/layouts/print3.blade.php      | 278 ------------------
 resources/views/layouts/print4.blade.php      | 226 --------------
 6 files changed, 9 insertions(+), 527 deletions(-)
 delete mode 100644 resources/views/layouts/print3.blade.php
 delete mode 100644 resources/views/layouts/print4.blade.php

diff --git a/app/Gdoo/Index/Controllers/Controller.php b/app/Gdoo/Index/Controllers/Controller.php
index 7f3ef03a..a6b138db 100644
--- a/app/Gdoo/Index/Controllers/Controller.php
+++ b/app/Gdoo/Index/Controllers/Controller.php
@@ -17,11 +17,6 @@ class Controller extends BaseController
      */
     public $version = '<a target="_blank" href="http://www.gdoo.net">Gdoo</a> 2.2.2';
 
-    /**
-     * @var 资源版本
-     */
-    public $resVersion = '20210225';
-
     /**
      * @var 开发商名称
      */
diff --git a/app/Gdoo/Index/views/index/index.blade.php b/app/Gdoo/Index/views/index/index.blade.php
index 7b0076ad..65372138 100644
--- a/app/Gdoo/Index/views/index/index.blade.php
+++ b/app/Gdoo/Index/views/index/index.blade.php
@@ -5,11 +5,11 @@
     <title>{{$setting['title']}} - Powered By {{$setting['powered']}}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=yes" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <link rel="stylesheet" href="{{$asset_url}}/dist/index.min.css?v={{$resVersion}}" type="text/css" />
-    <script src="{{$public_url}}/common?v={{$resVersion}}"></script>
-    <script src="{{$asset_url}}/dist/index.min.js?v={{$resVersion}}"></script>
+    <link rel="stylesheet" href="{{mix('/assets/dist/index.min.css')}}" type="text/css" />
+    <script src="{{$public_url}}/common?v={{time()}}"></script>
+    <script src="{{mix('/assets/dist/index.min.js')}}"></script>
+    <script src="{{mix('/assets/dist/bundle.min.js')}}"></script>
     <script src="{{$asset_url}}/vendor/layer/layer.js"></script>
-    <script src="{{$asset_url}}/dist/bundle.min.js"></script>
 
     <style type="text/css">
     @foreach($menus['children'] as $menu_id => $menu)
diff --git a/app/Gdoo/Index/views/index/support.blade.php b/app/Gdoo/Index/views/index/support.blade.php
index 663a20f9..3ec890ec 100644
--- a/app/Gdoo/Index/views/index/support.blade.php
+++ b/app/Gdoo/Index/views/index/support.blade.php
@@ -8,14 +8,6 @@
             {{$version}} {{$licenseType ? $licenseType : '开源版'}}
         </td>
     </tr>
-    <tr>
-        <td align="right">
-            资源版本
-        </td>
-        <td align="left">
-            {{$resVersion}}
-        </td>
-    </tr>
     <tr>
         <td align="right">
             开发商
diff --git a/app/Gdoo/Order/Controllers/SampleApplyController.php b/app/Gdoo/Order/Controllers/SampleApplyController.php
index bf3fd63a..aa2673bc 100644
--- a/app/Gdoo/Order/Controllers/SampleApplyController.php
+++ b/app/Gdoo/Order/Controllers/SampleApplyController.php
@@ -14,6 +14,7 @@ use Gdoo\Model\Form;
 use Gdoo\Order\Services\OrderService;
 
 use Gdoo\Index\Controllers\WorkflowController;
+use Gdoo\User\Services\UserService;
 
 class SampleApplyController extends WorkflowController
 {
@@ -79,9 +80,8 @@ class SampleApplyController extends WorkflowController
             }
 
             if ($this->access['index'] <> 4) {
-                // 这里需要包括创建者权限
-                $authorise = User::authoriseAccess();
-                $model->whereIn('sample_apply.created_id', $authorise);
+                $region = regionCustomer('customer');
+                $model->whereIn('sample_apply.region_id', $region['regionIn']);
             }
             
             $model->select($header['select']);
@@ -153,9 +153,8 @@ class SampleApplyController extends WorkflowController
             }
 
             if ($this->access['index'] <> 4) {
-                // 这里需要包括创建者权限
-                $authorise = User::authoriseAccess();
-                $model->whereIn('sample_apply.created_id', $authorise);
+                $region = regionCustomer('customer');
+                $model->whereIn('sample_apply.region_id', $region['regionIn']);
             }
             
             $model->select($header['select']);
diff --git a/resources/views/layouts/print3.blade.php b/resources/views/layouts/print3.blade.php
deleted file mode 100644
index 70db8e44..00000000
--- a/resources/views/layouts/print3.blade.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>{{$setting['title']}}</title>
-<link type="text/css" rel="stylesheet" href="{{mix('/assets/dist/app.min.css')}}" />
-<script src="{{$public_url}}/common?v={{time()}}"></script>
-<script src="{{mix('/assets/dist/app.min.js')}}"></script>
-<script src="{{$asset_url}}/vendor/datepicker/datepicker.js"></script>
-<style type="text/css">
-body {
-    background: -webkit-linear-gradient(right, #198fb4, #0b6fab);
-    background: -o-linear-gradient(right, #198fb4, #0b6fab);
-    background: linear-gradient(to left, #198fb4, #0b6fab);
-    background-color: #3586b7;
-}
-.table {
-    border: 1px solid #58585C;
-    color: #000;
-    width: 100%;
-    margin: 5px 0;
-}
-
-.table .left { text-align:left; }
-.table .center { text-align:center; }
-.table .right { text-align:right; }
-
-.table p { text-align:center; }
-.table img { border:0; }
-.table td {
-    border: 1px solid #58585C;
-    padding: 3px;
-    color: #000;
-    vertical-align: middle;
-    font-weight: normal;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td {
-    padding: 3px;
-}
-
-.table th {
-    font-weight: normal;
-    color: #000;
-    border: 1px solid #58585C;
-    padding: 3px;
-    /*
-    white-space: nowrap;
-    */
-}
-
-.table>tbody>tr>td, 
-.table>tbody>tr>th, 
-.table>tfoot>tr>td, 
-.table>tfoot>tr>th, 
-.table>thead>tr>td, 
-.table>thead>tr>th {
-    border-top: 1px solid #58585C;
-}
-
-.table>thead>tr>th {
-    border-bottom: 1px solid #58585C;
-}
-
-.title {
-    text-align: center;
-    font-size: 18px;
-    font-weight: 400;
-    color: #333;
-    padding-bottom: 10px;
-    /*
-    border-bottom: 1px solid #333;
-    */
-}
-
-.main-container {
-    margin:0 auto;
-    font:14px '微软雅黑', '黑体', 'Lucida Grande', Verdana, sans-serif;
-    background: #fff;
-    position: relative;
-}
-
-.main-container h3 {
-    padding-top:12px;
-    font-size:15px;
-    text-align:center;
-}
-
-.main-container p {
-    text-align:left;
-    padding-top:6px;
-}
-
-.panel {
-    width: 1000px;
-    margin: 15px auto;
-    border-radius: 0;
-    border-color: #eee;
-}
-
-.table.no-border,
-.table.no-border td,
-.table.no-border th {
-    border: 0;
-}
-
-@media screen {
-    .main {
-        width: 1000px;
-        margin: 15px auto;
-        padding: 50px 0;
-        background-color: #fff;
-        border: solid 1px #eee;
-        -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.05);
-        box-shadow: 0 1px 1px rgba(0,0,0,.05);
-    }
-    .main-container {
-        width: 880px;
-    }
-}
-
-@media print {
-    .panel {
-        display: none; 
-    }
-    .main {
-        margin: 0 auto;
-        border: 0;
-    }
-    .main-container {
-        font:12px 'SimSun', 'Microsoft YaHei';
-    }
-}
-
-.text-muted {
-    color: #333;
-}
-.b-t {
-    border-top: 1px solid #333;
- }
-
-.row {
-    border: 1px solid #333;
-    border-top: 0;
-    padding: 5px;
-    color: #333;
-    margin-left: 0;
-    margin-right: 0;
-}
-
-.row > div {
-    padding: 3px 8px;
-}
-
-.row:first-child {
-    border-top: 1px solid #333;
-}
-
-.row.no-border {
-    border: 0;
-    padding: 0;
-}
-
-@media print {
-   .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
-        float: left;
-   }
-   .col-sm-12 {
-        width: 100%;
-   }
-   .col-sm-11 {
-        width: 91.66666667%;
-   }
-   .col-sm-10 {
-        width: 83.33333333%;
-   }
-   .col-sm-9 {
-        width: 75%;
-   }
-   .col-sm-8 {
-        width: 66.66666667%;
-   }
-   .col-sm-7 {
-        width: 58.33333333%;
-   }
-   .col-sm-6 {
-        width: 50%;
-   }
-   .col-sm-5 {
-        width: 41.66666667%;
-   }
-   .col-sm-4 {
-        width: 33.33333333%;
-   }
-   .col-sm-3 {
-        width: 25%;
-   }
-   .col-sm-2 {
-        width: 16.66666667%;
-   }
-   .col-sm-1 {
-        width: 8.33333333%;
-   }
-}
-
-.i-checks>i {
-    border: 1px solid #333;
-}
-.i-checks input:checked+i {
-    border-color: #333;
-}
-.i-checks input:checked+i:before {
-    background-color: #333;
-}
-
-@page {
-    margin: 10mm;
-    size: 210mm 297mm;
-}
-
-#lodop-container {
-    width: 1000px;
-    margin: auto;
-    display: none;
-}
-
-</style>
-
-<script>
-function print280() {
-    alert('没有此尺寸');
-}
-function print140() {
-    alert('没有此尺寸');
-}
-function print93() {
-    alert('没有此尺寸');
-}
-</script>
-
-</head>
-
-<body>
-
-    <div class="panel panel-default">
-        <div class="panel-body">
-            <div class="pull-right">
-                <a class="btn btn-default" href="javascript:print280();"><i class="icon icon-print"></i> 打印(27cm)</a>
-                <a class="btn btn-default" href="javascript:print140();"><i class="icon icon-print"></i> 打印(14cm)</a>
-                <a class="btn btn-default" href="javascript:print93();"><i class="icon icon-print"></i> 打印(9.3cm)</a>
-                <a class="btn btn-default" href="javascript:window.close();"><i class="icon icon-remove"></i> 关闭</a>
-            </div>
-            <h4><i class="icon icon-note"></i> 打印预览</h4>
-        </div>
-    </div>
-
-    <div id="lodop-container">
-        <div class="alert alert-warning alert-dismissable m-b-sm">
-            <button type="button" class="close" data-dismiss="alert"
-                    aria-hidden="true">
-                &times;
-            </button>
-            <div id="lodop_msg"></div>
-        </div>
-    </div>
-
-    <div class="main">
-
-        <div class="main-container">
-            <div>
-                {{$content}}
-            </div>
-        </div>
-    </div>
-</body>
-</html>
diff --git a/resources/views/layouts/print4.blade.php b/resources/views/layouts/print4.blade.php
deleted file mode 100644
index 9c52be70..00000000
--- a/resources/views/layouts/print4.blade.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>{{$setting['print_title']}}{{$form['template']['name']}}</title>
-<link type="text/css" rel="stylesheet" href="{{mix('/assets/dist/app.min.css')}}" />
-<style type="text/css">
-.table {
-    border: 1px solid #000;
-    color: #000;
-    width: 100%;
-    margin: 5px 0;
-}
-
-.table .left { text-align:left; }
-.table .center { text-align:center; }
-.table .right { text-align:right; }
-
-.table p { text-align:center; }
-.table img { border:0; }
-.table td {
-    border: 1px solid #000;
-    padding: 1px 2px;
-    color: #000;
-    vertical-align: middle;
-    font-weight: normal;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.table th {
-    font-weight: normal;
-    color: #000;
-    border: 1px solid #000;
-    padding: 3px;
-}
-
-.table>tbody>tr>td, 
-.table>tbody>tr>th, 
-.table>tfoot>tr>td, 
-.table>tfoot>tr>th, 
-.table>thead>tr>td, 
-.table>thead>tr>th {
-    border-top: 1px solid #000;
-}
-
-.table.table-grid>tbody>tr>td, 
-.table.table-grid>tbody>tr>th, 
-.table.table-grid>tfoot>tr>td, 
-.table.table-grid>tfoot>tr>th, 
-.table.table-grid>thead>tr>td, 
-.table.table-grid>thead>tr>th {
-    display:table-cell; vertical-align:middle;
-}
-
-.table>thead>tr>th {
-    border-bottom: 1px solid #000;
-}
-
-.title {
-    text-align: center;
-    font-size: 20px;
-    font-weight: 600;
-    color: #333;
-    padding-bottom: 10px;
-}
-
-.main-container h3 {
-    padding-top:12px;
-    font-size:15px;
-    text-align:center;
-}
-
-.main-container p {
-    text-align:left;
-    padding-top:6px;
-}
-
-.table.no-border,
-.table.no-border td,
-.table.no-border th {
-    border: 0;
-}
-
-@media print {
-    .panel {
-        display: none; 
-    }
-    .main {
-        margin: 0 auto;
-        border: 0;
-    }
-    .main-container {
-        font:11pt 'SimSun', 'STXihei', sans-serif;
-    }
-    label {
-        font:11pt 'SimSun', 'STXihei', sans-serif;
-    }
-    .i-checks-sm>i {
-        width: 14px;
-        height: 14px;
-        margin-right: 6px;
-        margin-left: -18px;
-    }
-}
-
-.text-muted {
-    color: #000;
-}
-
-.b-t {
-    border-top: 1px solid #000;
- }
-
-.row {
-    border: 1px solid #000;
-    border-top: 0;
-    padding: 5px;
-    color: #000;
-    margin-left: 0;
-    margin-right: 0;
-}
-
-.row > div {
-    padding: 2px 6px;
-}
-
-.row:first-child {
-    border-top: 1px solid #000;
-}
-
-.row.no-border {
-    border: 0;
-    padding: 0;
-}
-
-@media print {
-   .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
-        float: left;
-   }
-   .col-sm-12 {
-        width: 100%;
-   }
-   .col-sm-11 {
-        width: 91.66666667%;
-   }
-   .col-sm-10 {
-        width: 83.33333333%;
-   }
-   .col-sm-9 {
-        width: 75%;
-   }
-   .col-sm-8 {
-        width: 66.66666667%;
-   }
-   .col-sm-7 {
-        width: 58.33333333%;
-   }
-   .col-sm-6 {
-        width: 50%;
-   }
-   .col-sm-5 {
-        width: 41.66666667%;
-   }
-   .col-sm-4 {
-        width: 33.33333333%;
-   }
-   .col-sm-3 {
-        width: 25%;
-   }
-   .col-sm-2 {
-        width: 16.66666667%;
-   }
-   .col-sm-1 {
-        width: 8.33333333%;
-   }
-}
-
-.i-checks>i {
-    border: 1px solid #000;
-}
-.i-checks input:checked+i {
-    border-color: #000;
-}
-.i-checks input:checked+i:before {
-    background-color: #000;
-}
-
-@page {
-    font:11pt 'SimSun', sans-serif;
-    margin: 5mm 10mm 20mm 10mm;
-    size: 210mm 297mm;
-    prince-pdf-page-colorspace: auto;
-    prince-pdf-page-label: auto;
-    prince-rotate-body: 0deg;
-    prince-shrink-to-fit: none;
-    @bottom {
-        content: "第" counter(page)"页，共"counter(pages)"页"
-    }
-}
-
-@media print {
-    .main-container {
-        font:11pt 'SimSun', 'STXihei', sans-serif;
-    }
-    label {
-        font:11pt 'SimSun', 'STXihei', sans-serif;
-    }
-}
-
-.table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td {
-    padding: 3px;
-}
-
-</style>
-</head>
-
-<body>
-    <div class="main-container">
-        <div class="title">{{$setting['print_title']}}{{$form['template']['name']}}</div>
-        <div>
-            {{$content}}
-        </div>
-    </div>
-</body>
-</html>