Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

crmeb/app/api/route/v2.php

@@ -35,9 +35,9 @@ Route::group('v2', function () {
         //是否强制绑定手机号
         Route::get('bind_status', 'v2.PublicController/bindPhoneStatus');
         //小程序授权绑定手机号
-        Route::post('auth_bindind_phone', 'v2.wechat.AuthController/bindingPhone');
+        Route::post('auth_bindind_phone', 'v2.wechat.AuthController/authBindingPhone');
         //小程序授权后绑定手机号
-        Route::post('routine/binding_phone', 'v2.wechat.AuthController/authBindingPhone');
+        Route::post('routine/binding_phone', 'v2.wechat.AuthController/BindingPhone');
         //小程序手机号登录直接绑定
         Route::post('phone_silence_auth', 'v2.wechat.AuthController/silenceAuthBindingPhone');
         //微信手机号登录直接绑定

crmeb/app/services/wechat/RoutineServices.php

@@ -481,10 +481,10 @@ class RoutineServices extends BaseServices
         }
         $uid = app()->make(WechatUserServices::class)->openidTouid($userInfoCong['openid']);
         $userServices = app()->make(UserServices::class);
-        if ($userServices->count(['phone|account' => $userInfo['purePhoneNumber']])) {
+        if ($userServices->count(['phone' => $userInfo['purePhoneNumber']])) {
             throw new ApiException(410028);
         }
-        $res = app()->make(UserServices::class)->update(['id' => $uid], ['phone' => $userInfo['purePhoneNumber']]);
+        $res = app()->make(UserServices::class)->update(['uid' => $uid], ['phone' => $userInfo['purePhoneNumber']]);
         if ($res) return true;
         throw new ApiException(410017);
     }

template/admin/src/pages/app/wechat/reply/follow.vue

@@ -1,5 +1,8 @@
 <template>
   <div>
+    <div class="i-layout-page-header" style="padding: 18px 32px;border-bottom: 1px solid #f2f2f2;">
+      <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
+    </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <!-- 公众号设置 -->
       <Row :gutter="24" type="flex">

template/admin/src/pages/setting/setSystem/index.vue

@@ -3,7 +3,6 @@
     <div class="i-layout-page-header" style="padding: 18px 32px;border-bottom: 1px solid #f2f2f2;">
       <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
     </div>
-
   <div class="article-manager">
     <Card :bordered="false" dis-hover class="ivu-mt fromBox">
       <Tabs v-model="currentTab" @on-click="changeTab" v-if="headerList.length">

template/admin/src/pages/user/grade/right/index.vue

@@ -1,8 +1,10 @@
 <template>
   <div>
+    <div class="i-layout-page-header" style="padding: 18px 32px;border-bottom: 1px solid #f2f2f2;">
+      <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
+    </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
       <Table
-        class="mt25"
         :columns="thead"
         :data="tbody"
         :loading="loading"