circle

nova-werun/components/circle-card/index.js

@@ -121,12 +121,14 @@ Component({
             AIMomentquery.equalTo('isVisible', true);
             AIMomentquery.include('profile.user');
             AIMomentquery.include('profile');
+            AIMomentquery.include('user');
             AIMomentquery.notEqualTo('isDeleted', true)
             let P = await AIMomentquery.find();
             let AIMoment1List = P.map(item => item.toJSON());
             this.setData({
                 cicleList: AIMoment1List,
             })
+            console.log('cicleList',this.data.cicleList);
             this.setData({
                 images: this.data.cicleList[0].images
             })

nova-werun/components/circle-card/index.wxml

@@ -127,8 +127,8 @@
 <view class="trends-two" bindtouchstart="onTouchStart" wx:if="{{objectId&&type=='surface'}}">
     <!--主页  -->
     <view class="namebax" wx:if="{{type=='surface'}}" bindtap="gourl" data-url="../../pages/circle/circle-detail/index" data-id="{{cicleList[0].objectId}}">
-        <image src="{{cicleList[0].profile.user.avatar}}"></image>
-        <view class="name">{{cicleList[0].profile.user.nickname}}</view>
+        <image src="{{cicleList[0].user.avatar}}"></image>
+        <view class="name">{{cicleList[0].user.nickname}}</view>
     </view>
     <view wx:if="{{!showFull}}" class="text">
         <view wx:if="{{cicleList[0].content.length > maxLength}}">

nova-werun/pages/circle/send-circle/index.js

@@ -20,13 +20,13 @@ Page({
         textareaHeight: 52, // 初始高度，单位为 rpx
         // 图片
         fileList: [],
-        fileLists:[],
+        fileLists: [],
         uptokenURL: '',
         domain: '',
         uploadURL: '',
-        saveimage:false,
-        checked:false,
-        address:'',
+        saveimage: false,
+        checked: false,
+        address: '',
     },
 
     /**
@@ -53,13 +53,13 @@ Page({
         });
         const images = []
         images.push({
-            url:options.image
+            url: options.image
         })
-        console.log('options.image',options.image);
-        if(options.image){
+        console.log('options.image', options.image);
+        if (options.image) {
             this.setData({
-                fileList:images,
-                saveimage:true,
+                fileList: images,
+                saveimage: true,
             })
         }
         this.getUptoken()
@@ -146,33 +146,44 @@ Page({
         const currentUser = Parse.User.current();
         let Profilequery = new Parse.Query('Profile');
         Profilequery.equalTo('company', company);
+        Profilequery.equalTo('isCheck', true);
         Profilequery.notEqualTo('isDeleted', true);
         Profilequery.equalTo('user', currentUser.id);
         let p = await Profilequery.first()
 
+        let userequery = new Parse.Query('_User');
+        userequery.equalTo('company', company);
+        userequery.notEqualTo('isDeleted', true);
+        userequery.equalTo('objectId', currentUser.id);
+        let user = await userequery.first()
+
         let companyPointer = Parse.Object.extend('Company').createWithoutData(company);
         let Comment = new Parse.Object('AIMoment');
-        Comment.set('profile', p.toPointer())
+        if(p){
+            Comment.set('profile', p.toPointer())
+            Comment.set('isVisible', true);
+        }
         Comment.set('company', companyPointer);
-        Comment.set('isVisible', true);
-        if(this.data.fileList.length>0){
+        Comment.set('user', user.toPointer());
+        
+        if (this.data.fileList.length > 0) {
             let url = []
             for (let i = 0; i < this.data.fileList.length; i++) {
                 url.push(this.data.fileList[i].url)
             }
             this.setData({
-                fileLists:url,
+                fileLists: url,
             })
             Comment.set('images', this.data.fileLists);
         }
         Comment.set('content', this.data.inputValue);
-        if(this.data.checked){
+        if (this.data.checked) {
             Comment.set('location', this.data.address);
         }
         try {
-            if(this.data.fileList.length==0&& !this.data.inputValue){
+            if (this.data.fileList.length == 0 && !this.data.inputValue) {
                 console.log('新数据保存失败');
-            }else{
+            } else {
                 let saveDate2 = await Comment.save();
                 console.log(saveDate2);
                 console.log("新数据保存成功");
@@ -181,19 +192,20 @@ Page({
                     icon: 'success',
                     duration: 1000
                 });
-                setTimeout(()=>{
+                setTimeout(() => {
                     this.goback()
-                },1000)
+                }, 1000)
             }
-            
-            
+
+
         } catch (error) {
             console.error("保存数据时出现错误:", error);
         }
 
+
     },
-    async goback(){
-        if(!this.data.saveimage){
+    async goback() {
+        if (!this.data.saveimage) {
             let pages = getCurrentPages(); //页面对象
             console.log(pages);
             let prevpage = pages[pages.length - 2]; //上一个页面对象
@@ -207,13 +219,13 @@ Page({
     //选择展示当前位置
     onChange(event) {
         this.setData({
-          checked: event.detail,
+            checked: event.detail,
         });
         console.log(this.data.checked);
         this.Getlocation()
-      },
-      //获取当前位置
-      Getlocation() {
+    },
+    //获取当前位置
+    Getlocation() {
         // 获取当前位置信息
         wx.getLocation({
             type: 'wgs84',

nova-werun/pages/home/signin/index.js

@@ -1,6 +1,9 @@
 // nova-werun/pages/home/signin/index.js
 const Parse = getApp().Parse;
 const company = getApp().globalData.company;
+const {
+    getConsecutiveSignIns
+} = require("../../../service/day")
 Page({
 
     /**
@@ -59,7 +62,7 @@ Page({
      * 生命周期函数--监听页面初次渲染完成
      */
     onReady: function () {
-
+        
     },
 
     /**
@@ -201,6 +204,11 @@ Page({
     },
     //连续打卡
     async continuousChink() {
+        const currentUser = Parse.User.current();
+        let day = await getConsecutiveSignIns({
+            userId: currentUser.id,
+        });
 
+        console.log('day',day);
     }
 })

nova-werun/pages/index/index.js

@@ -145,7 +145,7 @@ Page({
     if (!componentPage) {
       return
     }
-    componentPage.updatetoday()
+    // componentPage.updatetoday()
     componentPage.gettarget()
   },
   //我的页面

nova-werun/service/day.js

@@ -0,0 +1,51 @@
+const req = require('../../utils/request');
+const company = getApp().globalData.company;
+
+async function getConsecutiveSignIns(params) {
+    let { userId } = params; // 从参数中获取用户ID
+
+    // 构建 SQL 查询
+    let sql = `
+        WITH ranked_sign_ins AS (
+            SELECT
+                "user",
+                "createdAt",
+                DATE("createdAt") - INTERVAL '1 day' * ROW_NUMBER() OVER (PARTITION BY "user" ORDER BY "createdAt") AS grp,
+                (CASE WHEN DATE("createdAt") = CURRENT_DATE OR (DATE("createdAt") + INTERVAL '1 day') = CURRENT_DATE THEN TRUE ELSE FALSE END) "isToday"
+            FROM
+                "EventLog"
+            WHERE "user" = '${userId}'
+        ),
+        continuous AS (
+            SELECT "user", grp
+            FROM ranked_sign_ins
+            WHERE "isToday" = TRUE
+            GROUP BY "user", grp
+            LIMIT 1
+        ),
+        grouped_sign_ins AS (
+            SELECT
+                ranked_sign_ins."user",
+                ranked_sign_ins.grp,
+                COUNT(*) AS consecutive_days
+            FROM ranked_sign_ins
+            LEFT JOIN continuous 
+            ON continuous.grp = ranked_sign_ins.grp AND continuous."user" = ranked_sign_ins."user"
+            WHERE continuous.grp IS NOT NULL
+            GROUP BY ranked_sign_ins."user", ranked_sign_ins.grp
+        )
+        SELECT
+            "user",
+            consecutive_days
+        FROM grouped_sign_ins
+        GROUP BY "user", consecutive_days;
+    `;
+
+    // 执行 SQL 查询
+    let res = await req.customSQL(sql);
+    return res;
+}
+
+module.exports = {
+    getConsecutiveSignIns
+};