diff --git a/dist/app.js b/dist/app.js
index 3438541..1e9bc7c 100644
--- a/dist/app.js
+++ b/dist/app.js
@@ -1,2 +1,2 @@
/*! For license information please see app.js.LICENSE.txt */
-"use strict";require("./prebundle/vendors-node_modules_taro_weapp_prebundle_antmjs_vantui_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_chunk-TS5T3MDA_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_chunk-5ZOEZXK4_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_lodash_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_moment_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_chunk-JHQVW7VO_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_tarojs_plugin-framework-react_dist_runtime_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_chunk-YPK4VK53_js.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-node_modules_taro_weapp_prebundle_tarojs_plu-b2bd19.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_chunk-HER2BAHA_js.js"),require("./prebundle/remoteEntry.js"),require("./prebundle/node_modules_taro_weapp_prebundle_react_jsx-runtime_js.js"),require("./prebundle/node_modules_taro_weapp_prebundle_react_js.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-node_modules_taro_weapp_prebundle_tarojs_run-08648c.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-node_modules_taro_weapp_prebundle_react-dom_js.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-node_modules_taro_weapp_prebundle_tarojs_taro_js.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-_94890.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-_94891.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-_94892.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-_94893.js"),require("./common"),require("./vendors"),require("./taro"),require("./runtime"),(wx.webpackJsonp=wx.webpackJsonp||[]).push([["app"],{"./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./src/app.ts":function(e,r,t){var n=t("./node_modules/@babel/runtime/helpers/esm/classCallCheck.js"),o=t("./node_modules/@babel/runtime/helpers/esm/createClass.js"),s=t("./node_modules/@babel/runtime/helpers/esm/inherits.js"),u=t("./node_modules/@babel/runtime/helpers/esm/createSuper.js"),d=t("webpack/container/remote/@tarojs/taro"),i=t.n(d),a=t("webpack/container/remote/react"),p=function(e){(0,s.default)(App,e);var r=(0,u.default)(App);function App(){return(0,n.default)(this,App),r.apply(this,arguments)}return(0,o.default)(App,[{key:"componentDidMount",value:function componentDidMount(){i().cloud.init({env:"cloud1-5g5xrgza12a0dd6d",traceUser:!0}),new(i().cloud.Cloud)({resourceEnv:"cloud1-5g5xrgza12a0dd6d"}).init()}},{key:"componentDidShow",value:function componentDidShow(){}},{key:"componentDidHide",value:function componentDidHide(){}},{key:"render",value:function render(){return this.props.children}}]),App}(a.Component);r.default=p},"./src/app.ts":function(e,r,t){t("webpack/container/remote/@tarojs/plugin-platform-weapp/dist/runtime");var n=t("webpack/container/remote/@tarojs/runtime"),o=t("webpack/container/remote/@tarojs/plugin-framework-react/dist/runtime"),s=t("webpack/container/remote/@tarojs/taro"),u=t("./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./src/app.ts"),d=t("webpack/container/remote/react"),i=t("webpack/container/remote/react-dom"),a=t.n(i),p={pages:["pages/home/index","pages/home/components/CheckIn/index","pages/home/components/Certified/index","pages/activityList/index","pages/formSubmit/index","pages/activityList/components/details/index","pages/mountainPeak/index","pages/my/index","pages/my/components/Version/index","pages/my/components/AbountUs/index"],permission:{"scope.userLocation":{desc:"你的位置信息将用于小程序位置接口的效果展示"}},requiredPrivateInfos:["getLocation","chooseLocation"],window:{backgroundTextStyle:"light",navigationBarBackgroundColor:"#fff",navigationBarTitleText:"WeChat",navigationBarTextStyle:"black"}};n.window.__taroAppConfig=p;App((0,o.createReactApp)(u.default,d,a(),p));(0,s.initPxTransform)({designWidth:750,deviceRatio:{640:1.17,750:1,828:.905}})},"./node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js":function(e,r,t){function _assertThisInitialized(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}t.d(r,{default:function(){return _assertThisInitialized}})},"./node_modules/@babel/runtime/helpers/esm/createSuper.js":function(e,r,t){t.d(r,{default:function(){return _createSuper}});var n=t("./node_modules/@babel/runtime/helpers/esm/getPrototypeOf.js"),o=t("./node_modules/@babel/runtime/helpers/esm/isNativeReflectConstruct.js"),s=t("./node_modules/@babel/runtime/helpers/esm/possibleConstructorReturn.js");function _createSuper(e){var r=(0,o.default)();return function _createSuperInternal(){var t,o=(0,n.default)(e);if(r){var u=(0,n.default)(this).constructor;t=Reflect.construct(o,arguments,u)}else t=o.apply(this,arguments);return(0,s.default)(this,t)}}},"./node_modules/@babel/runtime/helpers/esm/getPrototypeOf.js":function(e,r,t){function _getPrototypeOf(e){return _getPrototypeOf=Object.setPrototypeOf?Object.getPrototypeOf.bind():function _getPrototypeOf(e){return e.__proto__||Object.getPrototypeOf(e)},_getPrototypeOf(e)}t.d(r,{default:function(){return _getPrototypeOf}})},"./node_modules/@babel/runtime/helpers/esm/inherits.js":function(e,r,t){t.d(r,{default:function(){return _inherits}});var n=t("./node_modules/@babel/runtime/helpers/esm/setPrototypeOf.js");function _inherits(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(r&&r.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),Object.defineProperty(e,"prototype",{writable:!1}),r&&(0,n.default)(e,r)}},"./node_modules/@babel/runtime/helpers/esm/isNativeReflectConstruct.js":function(e,r,t){function _isNativeReflectConstruct(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(e){return!1}}t.d(r,{default:function(){return _isNativeReflectConstruct}})},"./node_modules/@babel/runtime/helpers/esm/possibleConstructorReturn.js":function(e,r,t){t.d(r,{default:function(){return _possibleConstructorReturn}});var n=t("./node_modules/@babel/runtime/helpers/esm/typeof.js"),o=t("./node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js");function _possibleConstructorReturn(e,r){if(r&&("object"===(0,n.default)(r)||"function"==typeof r))return r;if(void 0!==r)throw new TypeError("Derived constructors may only return object or undefined");return(0,o.default)(e)}},"./node_modules/@babel/runtime/helpers/esm/setPrototypeOf.js":function(e,r,t){function _setPrototypeOf(e,r){return _setPrototypeOf=Object.setPrototypeOf?Object.setPrototypeOf.bind():function _setPrototypeOf(e,r){return e.__proto__=r,e},_setPrototypeOf(e,r)}t.d(r,{default:function(){return _setPrototypeOf}})}},function(e){e.O(0,["vendors","common"],(function(){return r="./src/app.ts",e(e.s=r);var r}));e.O()}]);
\ No newline at end of file
+"use strict";require("./prebundle/vendors-node_modules_taro_weapp_prebundle_antmjs_vantui_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_chunk-TS5T3MDA_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_chunk-5ZOEZXK4_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_lodash_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_moment_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_chunk-JHQVW7VO_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_tarojs_plugin-framework-react_dist_runtime_js.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_chunk-YPK4VK53_js.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-node_modules_taro_weapp_prebundle_tarojs_plu-b2bd19.js"),require("./prebundle/vendors-node_modules_taro_weapp_prebundle_chunk-HER2BAHA_js.js"),require("./prebundle/remoteEntry.js"),require("./prebundle/node_modules_taro_weapp_prebundle_react_jsx-runtime_js.js"),require("./prebundle/node_modules_taro_weapp_prebundle_react_js.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-node_modules_taro_weapp_prebundle_tarojs_run-08648c.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-node_modules_taro_weapp_prebundle_react-dom_js.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-node_modules_taro_weapp_prebundle_tarojs_taro_js.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-_94890.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-_94891.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-_94892.js"),require("./prebundle/node_modules_taro_weapp_prebundle_sync_recursive-_94893.js"),require("./common"),require("./vendors"),require("./taro"),require("./runtime"),(wx.webpackJsonp=wx.webpackJsonp||[]).push([["app"],{"./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./src/app.ts":function(e,r,t){var n=t("./node_modules/@babel/runtime/helpers/esm/classCallCheck.js"),o=t("./node_modules/@babel/runtime/helpers/esm/createClass.js"),s=t("./node_modules/@babel/runtime/helpers/esm/inherits.js"),u=t("./node_modules/@babel/runtime/helpers/esm/createSuper.js"),d=t("webpack/container/remote/@tarojs/taro"),i=t.n(d),a=t("webpack/container/remote/react"),p=function(e){(0,s.default)(App,e);var r=(0,u.default)(App);function App(){return(0,n.default)(this,App),r.apply(this,arguments)}return(0,o.default)(App,[{key:"componentDidMount",value:function componentDidMount(){i().cloud.init({env:"cloud1-5g5xrgza12a0dd6d",traceUser:!0}),new(i().cloud.Cloud)({resourceEnv:"cloud1-5g5xrgza12a0dd6d"}).init()}},{key:"componentDidShow",value:function componentDidShow(){}},{key:"componentDidHide",value:function componentDidHide(){}},{key:"render",value:function render(){return this.props.children}}]),App}(a.Component);r.default=p},"./src/app.ts":function(e,r,t){t("webpack/container/remote/@tarojs/plugin-platform-weapp/dist/runtime");var n=t("webpack/container/remote/@tarojs/runtime"),o=t("webpack/container/remote/@tarojs/plugin-framework-react/dist/runtime"),s=t("webpack/container/remote/@tarojs/taro"),u=t("./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./src/app.ts"),d=t("webpack/container/remote/react"),i=t("webpack/container/remote/react-dom"),a=t.n(i),p={pages:["pages/home/index","pages/home/components/CheckIn/index","pages/home/components/Certified/index","pages/activityList/index","pages/formSubmit/index","pages/activityList/components/details/index","pages/mountainPeak/index","pages/my/index","pages/my/components/Version/index","pages/my/components/AbountUs/index","pages/my/components/CheckinDetail/index"],permission:{"scope.userLocation":{desc:"你的位置信息将用于小程序位置接口的效果展示"}},requiredPrivateInfos:["getLocation","chooseLocation"],window:{backgroundTextStyle:"light",navigationBarBackgroundColor:"#fff",navigationBarTitleText:"WeChat",navigationBarTextStyle:"black"}};n.window.__taroAppConfig=p;App((0,o.createReactApp)(u.default,d,a(),p));(0,s.initPxTransform)({designWidth:750,deviceRatio:{640:1.17,750:1,828:.905}})},"./node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js":function(e,r,t){function _assertThisInitialized(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}t.d(r,{default:function(){return _assertThisInitialized}})},"./node_modules/@babel/runtime/helpers/esm/createSuper.js":function(e,r,t){t.d(r,{default:function(){return _createSuper}});var n=t("./node_modules/@babel/runtime/helpers/esm/getPrototypeOf.js"),o=t("./node_modules/@babel/runtime/helpers/esm/isNativeReflectConstruct.js"),s=t("./node_modules/@babel/runtime/helpers/esm/possibleConstructorReturn.js");function _createSuper(e){var r=(0,o.default)();return function _createSuperInternal(){var t,o=(0,n.default)(e);if(r){var u=(0,n.default)(this).constructor;t=Reflect.construct(o,arguments,u)}else t=o.apply(this,arguments);return(0,s.default)(this,t)}}},"./node_modules/@babel/runtime/helpers/esm/getPrototypeOf.js":function(e,r,t){function _getPrototypeOf(e){return _getPrototypeOf=Object.setPrototypeOf?Object.getPrototypeOf.bind():function _getPrototypeOf(e){return e.__proto__||Object.getPrototypeOf(e)},_getPrototypeOf(e)}t.d(r,{default:function(){return _getPrototypeOf}})},"./node_modules/@babel/runtime/helpers/esm/inherits.js":function(e,r,t){t.d(r,{default:function(){return _inherits}});var n=t("./node_modules/@babel/runtime/helpers/esm/setPrototypeOf.js");function _inherits(e,r){if("function"!=typeof r&&null!==r)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(r&&r.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),Object.defineProperty(e,"prototype",{writable:!1}),r&&(0,n.default)(e,r)}},"./node_modules/@babel/runtime/helpers/esm/isNativeReflectConstruct.js":function(e,r,t){function _isNativeReflectConstruct(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(e){return!1}}t.d(r,{default:function(){return _isNativeReflectConstruct}})},"./node_modules/@babel/runtime/helpers/esm/possibleConstructorReturn.js":function(e,r,t){t.d(r,{default:function(){return _possibleConstructorReturn}});var n=t("./node_modules/@babel/runtime/helpers/esm/typeof.js"),o=t("./node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js");function _possibleConstructorReturn(e,r){if(r&&("object"===(0,n.default)(r)||"function"==typeof r))return r;if(void 0!==r)throw new TypeError("Derived constructors may only return object or undefined");return(0,o.default)(e)}},"./node_modules/@babel/runtime/helpers/esm/setPrototypeOf.js":function(e,r,t){function _setPrototypeOf(e,r){return _setPrototypeOf=Object.setPrototypeOf?Object.setPrototypeOf.bind():function _setPrototypeOf(e,r){return e.__proto__=r,e},_setPrototypeOf(e,r)}t.d(r,{default:function(){return _setPrototypeOf}})}},function(e){e.O(0,["vendors","common"],(function(){return r="./src/app.ts",e(e.s=r);var r}));e.O()}]);
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 01f24f8..7d09807 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -37,6 +37,13 @@
"query": "fileID=http%3A%2F%2Ftmp%2F8X3J8R5FfJma6891872b4a0e24b61c323769b8a8addb.png",
"launchMode": "default",
"scene": null
+ },
+ {
+ "name": "打卡记录",
+ "pathName": "pages/my/components/CheckinDetail/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
}
]
}
diff --git a/src/pages/my/components/CheckinDetail/index.scss b/src/pages/my/components/CheckinDetail/index.scss
index e69de29..420be64 100644
--- a/src/pages/my/components/CheckinDetail/index.scss
+++ b/src/pages/my/components/CheckinDetail/index.scss
@@ -0,0 +1,10 @@
+.CheckinDetail{
+ display: flex;
+ flex-direction: column;
+ padding: 20px;
+ .checkCom{
+ margin-top: 20px;
+ display: flex;
+ flex-direction: column;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/my/components/CheckinDetail/index.tsx b/src/pages/my/components/CheckinDetail/index.tsx
index cf260c0..dcb0985 100644
--- a/src/pages/my/components/CheckinDetail/index.tsx
+++ b/src/pages/my/components/CheckinDetail/index.tsx
@@ -1,10 +1,65 @@
import { View } from "@tarojs/components";
import react, { useEffect, useState } from "react";
+import { Image } from "@antmjs/vantui";
import "./index.scss";
+import Taro from "@tarojs/taro";
+import { getTable } from "../../../../utils/index";
const CheckinDetail = () => {
- return CheckinDetail;
+ const [checkArr, setcheckArr] = useState([]);
+
+ useEffect(() => {
+ // 设置标题
+ definePageConfig({
+ navigationBarTitleText: "打卡记录",
+ });
+ getcheckArr();
+ }, []);
+
+ const getcheckArr = () => {
+ Taro.cloud.callFunction({
+ name: "getOpenid",
+ complete: async (res: any) => {
+ let openid: any = res?.result?.event?.userInfo?.openId;
+ let postData = {
+ tableName: "userInfo",
+ keyValue: {
+ openId: openid,
+ },
+ okFun: (res: any) => {
+ console.log('res',res)
+ let _id = res?.data?._id;
+ setcheckArr(res?.data?.[0]?.checkInArr ?? []);
+ },
+ };
+ getTable({...postData})
+ },
+ });
+ };
+
+ const checkCom = () => {
+ return checkArr.map((item: any) => {
+ return (
+
+ {item?.remark}
+
+
+
+ {/* 打卡日期 */}
+ {item?.checkTime}
+ {location&& {item?.location}}
+
+ );
+ });
+ };
+
+ return {checkCom()};
};
export default CheckinDetail;
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 0e8575e..e63563d 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -38,7 +38,7 @@ export const addTable: any = ({ env, tableName, objData, okFun }: Typeint) => {
});
};
-// 获取指定集合数据表
+// 获取指定集合数据表 (keyValue指定条件)
export const getTable: any = ({ env, tableName, keyValue={}, okFun }: Typeint) => {
// 数据库环境
const db: any = Taro.cloud.database({