Accueil Explorer Aide
Connexion
zhouzhendong
/
baoshi-was
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

Merge branch 'master' into zengjun

ajun il y a 5 ans
Parent
4ce288d485 e8a8568b29
commit
87215f10b2
5 fichiers modifiés avec 10 ajouts et 3 suppressions
Vue unifiée Afficher les stats Diff
  1. 1 1
      app/Http/Controllers/OrderController.php
  2. 1 0
      resources/sass/app.scss
  3. 6 0
      resources/sass/elements.scss
  4. 1 1
      resources/views/layouts/app.blade.php
  5. 1 1
      webpack.mix.js

+ 1 - 1
app/Http/Controllers/OrderController.php
Voir le fichier 

@@ -85,7 +85,7 @@ class OrderController extends Controller
 
                 'mobile_sender' => $order->c_tel2,
 
                 'mobile_sender' => $order->c_tel2,
 
                 'logistic_number' => '原单退回',//$order->soreference1
 
                 'logistic_number' => '原单退回',//$order->soreference1
 
                 'remark' => $order->notes,
 
                 'remark' => $order->notes,
 
-                'is_loaded' =>1,
 
+                'is_loaded' =>0,
 
             ]);
 
             ]);
 
             LogService::log(__METHOD__,"生成退货单",json_encode($order),Auth::user()['id']);
 
             LogService::log(__METHOD__,"生成退货单",json_encode($order),Auth::user()['id']);
 
             if ($commodities[$order->orderno] ?? false){
 
             if ($commodities[$order->orderno] ?? false){

+ 1 - 0
resources/sass/app.scss
Voir le fichier 

@@ -4,6 +4,7 @@
 
 @import 'text';
 
 @import 'text';
 
 @import 'layout';
 
 @import 'layout';
 
 @import 'effect';
 
 @import 'effect';
 
+@import 'elements';
 
 
 
 // Bootstrap
 
 // Bootstrap
 
 @import '~bootstrap/scss/bootstrap';
 
 @import '~bootstrap/scss/bootstrap';

+ 6 - 0
resources/sass/elements.scss
Voir le fichier 

@@ -0,0 +1,6 @@
 
+input[type=checkbox]
 
+{
 
+    width:17px;
 
+    height:17px;
 
+    opacity:0.85;
 
+}

+ 1 - 1
resources/views/layouts/app.blade.php
Voir le fichier 

@@ -10,7 +10,7 @@
 
     <title>@yield('title') {{ config('app.name', '宝时WAS') }}</title>
 
     <title>@yield('title') {{ config('app.name', '宝时WAS') }}</title>
 
     @yield('head')
 
     @yield('head')
 
     <!-- Styles -->
 
     <!-- Styles -->
 
-    <link href="{{ asset('css/app200901.css') }}" rel="stylesheet">
 
+    <link href="{{ asset('css/app200923.css') }}" rel="stylesheet">
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <div id="app">
 
 <div id="app">

+ 1 - 1
webpack.mix.js
Voir le fichier 

@@ -12,7 +12,7 @@ const mix = require('laravel-mix');
 
  */
 
  */
 
 
 
 mix.js('resources/js/app.js', 'public/js/app200922.js')
 
 mix.js('resources/js/app.js', 'public/js/app200922.js')
 
-    .sass('resources/sass/app.scss', 'public/css/app200901.css');
 
+    .sass('resources/sass/app.scss', 'public/css/app200923.css');
 
 mix.copy('resources/sass/fonts/','public/fonts');
 
 mix.copy('resources/sass/fonts/','public/fonts');
 
 mix.copy('resources/icon','public/icon');
 
 mix.copy('resources/icon','public/icon');
 
 mix.copy('resources/images','public/images');
 
 mix.copy('resources/images','public/images');