From c063837463506db3221416ce9a9e22d74be9d864 Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Fri, 24 Feb 2023 15:13:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=9D=83=E7=9B=8A?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/setting/setSystem/index.vue | 1 -
 template/admin/src/pages/user/grade/right/index.vue  | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/template/admin/src/pages/setting/setSystem/index.vue b/template/admin/src/pages/setting/setSystem/index.vue
index a25969cb2..0be30ef7d 100644
--- a/template/admin/src/pages/setting/setSystem/index.vue
+++ b/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">
diff --git a/template/admin/src/pages/user/grade/right/index.vue b/template/admin/src/pages/user/grade/right/index.vue
index 57d2bca06..74dbd8e73 100644
--- a/template/admin/src/pages/user/grade/right/index.vue
+++ b/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"

From 96be38654e639db46b21f6a2c35af42d7deb3f3a Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Fri, 24 Feb 2023 15:16:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=B7=BB=E5=8A=A0=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/app/wechat/reply/follow.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/template/admin/src/pages/app/wechat/reply/follow.vue b/template/admin/src/pages/app/wechat/reply/follow.vue
index 09cd7a0ae..f3e69b09e 100644
--- a/template/admin/src/pages/app/wechat/reply/follow.vue
+++ b/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">

From 6b3838600ff99411646978ab622351f86de8a064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Fri, 24 Feb 2023 15:17:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E8=8E=B7=E5=8F=96=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/api/route/v2.php                    | 4 ++--
 crmeb/app/services/wechat/RoutineServices.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crmeb/app/api/route/v2.php b/crmeb/app/api/route/v2.php
index a40c1ef07..1f07b6b08 100644
--- a/crmeb/app/api/route/v2.php
+++ b/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');
         //微信手机号登录直接绑定
diff --git a/crmeb/app/services/wechat/RoutineServices.php b/crmeb/app/services/wechat/RoutineServices.php
index 2c9a8260d..4897cd8d6 100644
--- a/crmeb/app/services/wechat/RoutineServices.php
+++ b/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);
     }