sync

app/api/controller/AuthController.php

@@ -6,6 +6,7 @@ namespace app\api\controller;
 
 use app\admin\model\sms\SmsRecord;
 use app\http\validates\user\RegisterValidates;
+use app\models\redis\SystemCarousel;
 use app\models\user\User;
 use app\models\user\UserToken;
 use app\models\user\WechatUser;
@@ -393,4 +394,14 @@ class AuthController
         else
             return app('json')->fail('绑定失败');
     }
+
+    /** 不登录模拟推送
+     * @param Request $request
+     */
+    public function notifications(Request $request)
+    {
+        // 跑马灯
+        $carousel = SystemCarousel::getFirst(20);
+        return app('json')->successful(compact('carousel'));
+    }
 }

app/api/controller/user/UserController.php

@@ -94,7 +94,7 @@ class UserController
         $user['couponCount'] = 0; //StoreCouponUser::getUserValidCouponCount($user['uid']);
         $user['like'] = StoreProductRelation::getUserIdCollect($user['uid']);
         $user['orderStatusNum'] = StoreOrder::getOrderData($user['uid']);
-        $user['notice'] = UserNotice::getNotice($user['uid']);
+//        $user['notice'] = UserNotice::getNotice($user['uid']);
 //        $user['brokerage'] = UserBill::getBrokerage($user['uid']);//获取总佣金
         $user['recharge'] = UserBill::getRecharge($user['uid']);//累计充值
         $user['orderStatusSum'] = StoreOrder::getOrderStatusSum($user['uid']);//累计消费

app/api/controller/user/UserNotificationController.php

@@ -2,7 +2,6 @@
 namespace app\api\controller\user;
 
 use app\models\coin\UserCoinTransfer;
-use app\models\redis\SystemCarousel;
 use app\models\redis\UserHash;
 use app\models\system\DictCoin;
 use app\Request;
@@ -55,8 +54,6 @@ class UserNotificationController {
                 UserHash::mining_set($uid, $mining);
             }
         }
-        // 跑马灯
-        $carousel = SystemCarousel::getFirst(20);
 
         return app('json')->successful(compact('unread', 'mining', 'carousel'));
     }

docs/通信协议/global.md

@@ -1,4 +1,5 @@
 ## 全局新增接口
+登录 (暂不使用)
 GET api/user/notifications
 
 returns
@@ -10,14 +11,19 @@ returns
 
 
 ## carousel 
-GET api/carousel
+不登录
+GET notifications
 noauth
 
 returns
 ```json
-"interval": 3,
-"items": [{
-  "text": "<span style=\"color:2343;\"></span>",
-  "uri": "page/boards",
-}]      // 跑马灯
+{
+  "carousel": {
+    "interval": 3,
+    "items": [{
+      "text": "<span style=\"color:2343;\"></span>",
+      "uri": "page/boards",
+    }]      // 跑马灯
+  }
+}
 ```

route/api/route.php

@@ -27,6 +27,9 @@ Route::post('register', 'AuthController/register')->name('register')
 Route::post('register/reset', 'AuthController/reset')->name('registerReset')
     ->middleware(\app\http\middleware\AllowOriginMiddleware::class);
 
+// 模拟推送 (不需要登录)
+Route::get('notifications', 'AuthController/notifications')->name('notifications');
+
 Route::any('wechat/serve', 'wechat.WechatController/serve');//公众号服务
 Route::any('wechat/notify', 'wechat.WechatController/notify');//公众号支付回调
 Route::any('routine/notify', 'wechat.AuthController/notify');//小程序支付回调
@@ -159,11 +162,12 @@ Route::group(function () {
     Route::get('user/level/task/:id', 'user.UserLevelController/task')->name('userLevelTask');//获取等级任务
     //首页获取未支付订单
     Route::get('order/nopay', 'order.StoreOrderController/get_noPay')->name('getNoPay');//获取未支付订单
+    // 模拟推送 (需要登录)
+    Route::get('user/notifications', 'user.UserNotificationController/snapshot')->name('userNotifications');
+
     /**
      * 消息类 api, 需要权限, 暂时为测试
      */
-    Route::get('user/notifications', 'user.UserNotificationController/snapshot')->name('userNotifications');
-
     Route::get('user/messages', 'user.UserNoticeController/messages')->name('userMessages');
     Route::post('user/messages', 'user.UserNoticeController/read')->name('userRead');
     Route::post('user/messages/del', 'user.UserNoticeController/del')->name('userDel');

view/xcx/app.js

@@ -88,12 +88,13 @@ App({
     urlImages: '',
     url: HTTP_REQUEST_URL,
     token: '',
-    isLog:false,
+    isLog:false,    // 是否已登录
     expiresTime:0,
     MyMenus:[],
     userInfo:{},
     loginType:'routine',
     isFixed: false,
+    unread: 0,    // 未读消息条数
   },
   /**
    * 聊天事件快捷注册

view/xcx/pages/index/index.js

@@ -173,6 +173,7 @@ Page({
         logoUrl: res.data.logoUrl,
         couponList: res.data.couponList,
       });
+      console.log(res.data)
       // 检测是否授权；scope.userInfo存在为授权；
       wx.getSetting({
         success(res) {