删除无用的模板文件

修正样品申请区域权限

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 开发商名称
      */

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)

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">
             开发商

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']);