fix bugs

Author: ojhdt

cloud/addGroupMember/config.json

@@ -0,0 +1,6 @@
+{
+  "permissions": {
+    "openapi": [
+    ]
+  }
+}

cloud/addGroupMember/index.js

@@ -0,0 +1,18 @@
+// 云函数入口文件
+const cloud = require('wx-server-sdk')
+
+cloud.init()
+
+// 云函数入口函数
+exports.main = async (event, context) => {
+  const wxContext = cloud.getWXContext()
+  const _ = cloud.database().command
+  let openid = event.openid
+  let _groupid = event.groupid
+  return cloud.database().collection('group').doc(_groupid).update({
+    data: {
+      'member': _.push(openid),
+    }
+  })
+
+}

cloud/addGroupMember/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "addGroupMember",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "wx-server-sdk": "~2.3.3"
+  }
+}

pages/about/about.wxml

@@ -4,7 +4,7 @@
     <image src="/source/main.png" mode="widthFix"></image>
     <view class="head_text">
       <text>简洁，轻量化的任务管理工具</text>
-      <text class="version">HoloTask 1.6.0.210222_beta</text>
+      <text class="version">HoloTask 1.6.1.210222_beta</text>
     </view>
   </view>
   <view class="content">

pages/account/account.js

@@ -42,6 +42,10 @@ Page({
     })
   },
 
+  share: function() {
+
+  },
+
   joinGroup: function () {
     var that = this
     wx.showModal({
@@ -55,12 +59,13 @@ Page({
             title: '处理中',
           })
           var inputcontent = res.content
-          console.log(res.content.length)
-          if (res.content.length == 8) {
+          console.log(inputcontent)
+          if (inputcontent.length == 8) {
             wx.cloud.database().collection('group').where({
-                groupid: res.content
+                groupid: inputcontent
               }).get()
               .then(res => {
+                console.log(res)
                 if (res.data.length == 0) {
                   wx.hideLoading({
                     success: (res) => {},
@@ -77,10 +82,10 @@ Page({
                     })
                   })
                 } else {
-                  var _groupid = res.data._id
+                  var _groupid = res.data[0]._id
                   wx.cloud.database().collection('group').where({
                     groupid: inputcontent,
-                    member: that.openid
+                    member: [that.data.openid]
                   }).get()
                   .then(res => {
                     if(res.data.length != 0){
@@ -92,10 +97,17 @@ Page({
                         icon: "none"
                       })
                     } else {
-                      const _ = wx.cloud.database().command
-                      wx.cloud.database().collection('group').doc(_groupid).update({
+                      // const _ = wx.cloud.database().command
+                      // wx.cloud.database().collection('group').doc(_groupid).update({
+                      //   data: {
+                      //     'member': _.push(that.data.openid),
+                      //   }
+                      // })
+                      wx.cloud.callFunction({
+                        name: 'addGroupMember',
                         data: {
-                          'member': _.push(that.openid),
+                          groupid: _groupid,
+                          openid: that.data.openid
                         }
                       })
                       wx.cloud.database().collection('user').where({
@@ -119,6 +131,9 @@ Page({
                 }
               })
           } else {
+            wx.hideLoading({
+              success: (res) => {},
+            })
             wx.showModal({
               title: "错误",
               content: "输入格式有误",

pages/account/account.wxml

@@ -58,7 +58,7 @@
             <text class="subtitle">功能选项设置</text>
           </view>
         </view>
-        <view class="setting_box">
+        <view class="setting_box" bindtap="share">
           <image class="icon" src="/source/icon/account/share-gray-24dp.svg"></image>
           <view class="text">
             <text class="title">分享</text>

pages/add/add.js

@@ -15,7 +15,7 @@ Page({
     tempImgs: [],
     tempFiles: [],
     file_style: null,
-    file_helptext: "可添加一个大小不超过 10 MiB 的附件。",
+    file_helptext: "可添加一个大小不超过 10 MiB 的附件。仅支持从会话文件中选择",
     input: [{
       main: "",
       placeholder: "",
@@ -72,7 +72,7 @@ Page({
         } else {
           that.setData({
             tempFiles: tempFilePaths,
-            file_helptext: "可添加一个大小不超过 10 MiB 的附件。",
+            file_helptext: "可添加一个大小不超过 10 MiB 的附件。仅支持从会话文件中选择",
             file_style: ""
           })
         }