Browse Source

微信授权

李浩杰 4 years ago
parent
commit
3897c3f7eb

+ 2 - 0
app/Http/Controllers/Admin/TestController.php

xqd xqd
@@ -11,6 +11,7 @@ use App\Models\Project;
 use App\Models\ProjectRole;
 use App\Models\ProjectUser;
 use App\Models\User;
+use App\Models\UserAuth;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -21,6 +22,7 @@ class TestController extends Controller
     public function index(Request $request)
     {
         User::where('id', '>', 0)->update(['open_id' => '', 'phone' => '']);
+        UserAuth::where('id', '>', 0)->delete();
         dd(User::all());
 //    	return view('admin.test.index');
     }

+ 1 - 1
app/Http/Controllers/Api/mini/ProjectRoleController.php

xqd
@@ -50,7 +50,7 @@ class ProjectRoleController extends BaseController
     {
         $items = $this->model;
         if($request->input('limit')) {
-            $items = $items->where('level', '<', 5);
+            $items = $items->where('level', '<', 4);
         }
         $items = $items->get();
         return $this->success(['msg' => '创建成功', 'data' => $items]);

+ 4 - 2
app/Http/Controllers/Api/mini/UserAuthController.php

xqd
@@ -20,9 +20,11 @@ class UserAuthController extends BaseController
         $data = $request->only(['name', 'project_id', 'project_role_id', 'remark', 'phone']);
         $user = Auth::guard('mini')->user();
         $user_id = $user ? $user->id : '';
-        $data['user_id'] = $user_id;
         $data['active'] = 2;
-        $this->model->create($data);
+        $user = $this->model->firstOrCreate([
+            'user_id' => $user_id
+        ], $data);
+        $user->update($data);
         return $this->success(['data' => '操作成功']);
     }
 }

+ 2 - 2
mini/app.json

xqd
@@ -1,8 +1,8 @@
 {
   "pages": [
-    "pages/user/index",
-    "pages/account/index",
     "pages/index/index",
+    "pages/account/index",
+    "pages/user/index",
     "pages/bind/index",
     "pages/data-center/index",
     "pages/filter-data/index",

+ 11 - 9
mini/pages/bind/index.js

xqd xqd
@@ -100,16 +100,18 @@ Page({
       util.error('申请角色不能为空')
       return false;
     }
-    if (this.data.remark.length < 10) {
-      util.error('备注需10个字以上')
-      return false;
-    }
-    if(!this.data.phone) {
-      util.error('手机号不能为空')
-      return false;
-    }
+    // if (this.data.remark.length < 10) {
+    //   util.error('备注需10个字以上')
+    //   return false;
+    // }
+    // if(!this.data.phone) {
+    //   util.error('手机号不能为空')
+    //   return false;
+    // }
     var project = this.data.projects[this.data.projectIndex]
     var role = this.data.roles[this.data.roleIndex]
+    var userInfo = getApp().globalData.userInfo
+    var phone = userInfo ? userInfo.phone : ''
     http({
       url: 'user-auth/create',
       data: {
@@ -117,7 +119,7 @@ Page({
         project_id: project ? project.id : '',
         project_role_id: role ? role.id : '',
         remark: this.data.remark,
-        phone: this.data.phone
+        phone: phone
       },
       success: function (res) {
         util.success('操作成功')

+ 2 - 2
mini/pages/bind/index.wxml

xqd
@@ -6,11 +6,11 @@
         <view class="sg-pick-name">真实姓名</view>
         <input type="text" value="{{name}}" placeholder="请输入真实姓名" data-name="name" bindchange="onInputChange" class="sg-gray-color" style="text-align: right"/>
       </view>
-      <view class="sg-pick-item sg-pad-tb-sm sg-flex sg-align-center sg-bottom-border sg-space-between">
+      <!-- <view class="sg-pick-item sg-pad-tb-sm sg-flex sg-align-center sg-bottom-border sg-space-between">
         <view class="sg-pick-name">手机号</view>
         <view wx:if="{{phone}}">{{phone}}</view>
         <van-button type="primary" open-type="getPhoneNumber" bind:getphonenumber="updatePhoneNumber" size="small" wx:else>授权获取手机号</van-button>
-      </view>
+      </view> -->
       <view class="sg-pick-item sg-pad-tb-sm sg-flex sg-align-center sg-bottom-border sg-space-between">
         <view class="sg-pick-name">所属项目</view>
         <picker bindchange="bindPickerChange" value="{{projectIndex}}" range="{{projects}}" range-key="name"