Browse Source

账号修改用户名重名问题

wanghaijun 4 năm trước cách đây
mục cha
commit
28330024bd

+ 10 - 3
app/Http/Controllers/Api/mini/OrderController.php

xqd
@@ -580,9 +580,16 @@ class OrderController extends BaseController
     {
         $order_device = OrderDevice::find($request->input('id'));
         if(!$order_device) return $this->error(['msg' => '找不到设备']);
-        $order_device->update([
-            'quantity' => $request->input('quantity')
-        ]);
+        if($request->input('quantity')){
+            $order_device->update([
+                'quantity' => $request->input('quantity')
+            ]);
+        }
+        if($request->input('price')){
+            $order_device->update([
+                'price' => intval($request->input('pricre'))*100
+            ]);
+        }
         $order = $this->model->find($order_device['order_id']);
         if(!$order) return $this->error(['msg' => '找不到订单']);
         $order->updateMoney();

+ 3 - 2
app/Models/User.php

xqd
@@ -18,10 +18,11 @@ class User extends Authenticatable
     {
         if ($type == 'store') {
             $validator = Validator::make($request->input('data'), [
-                'name' => 'required|unique:users'
+                'name' => 'required',
+                'phone' => 'required|unique:users',
             ], [
                 'name.required' => '用户名必填',
-                'name.unique' => '用户名已存在'
+                'phone.unique' => '手机号已被使用'
             ]);
         } else if ($type == 'change-password') {
             $validator = Validator::make($request->input('data'), [

+ 3 - 3
mini/utils/env.js

xqd
@@ -1,5 +1,5 @@
-const isTest = false;
+const isTest = true;
 //172.31.31.35
 //172.31.31.92
-export const baseUrl = isTest ? 'http://172.31.31.92/api/mini/' : 'https://t18.9026.com/api/mini/';
-export const imgHost = isTest ? 'http://172.31.31.92/images/' : 'https://t18.9026.com/images/'
+export const baseUrl = isTest ? 'http://172.31.31.35/api/mini/' : 'https://t18.9026.com/api/mini/';
+export const imgHost = isTest ? 'http://172.31.31.35/images/' : 'https://t18.9026.com/images/'

+ 1 - 1
resources/views/admin/users/index.blade.php

xqd
@@ -53,7 +53,7 @@
                     <div class="layui-btn-group">
                         <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="role">角色管理</a>
                         <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
-                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
+{{--                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>--}}
                     </div>
                 </div>
             </script>