diff --git a/dist/app.json b/dist/app.json index cdd653b..b7a7181 100644 --- a/dist/app.json +++ b/dist/app.json @@ -1 +1 @@ -{"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"],"permission":{"scope.userLocation":{"desc":"你的位置信息将用于小程序位置接口的效果展示"}},"requiredPrivateInfos":["getLocation","chooseLocation"],"window":{"backgroundTextStyle":"light","navigationBarBackgroundColor":"#fff","navigationBarTitleText":"WeChat","navigationBarTextStyle":"black"}} \ No newline at end of file +{"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"}} \ No newline at end of file diff --git a/dist/common.js b/dist/common.js index 68af9f8..0921670 100644 --- a/dist/common.js +++ b/dist/common.js @@ -1,2 +1,2 @@ /*! For license information please see common.js.LICENSE.txt */ -"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([["common"],{"./src/pages/components/ActiveCard/index.tsx":function(e,n,a){var t=a("./node_modules/@antmjs/vantui/es/button/index.js"),l=a("./node_modules/@antmjs/vantui/es/image/index.js"),o=a("./node_modules/@antmjs/vantui/es/tag/index.js"),s=a("./node_modules/@babel/runtime/helpers/esm/slicedToArray.js"),i=a("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),u=a("webpack/container/remote/react"),r=a("webpack/container/remote/moment"),c=a.n(r),d=a("webpack/container/remote/react/jsx-runtime");n.default=function ActiveCard(e){var n,a=(0,u.useState)({}),r=(0,s.default)(a,2),m=(r[0],r[1],null==e?void 0:e.dataSource),p=m.title,f=m.address,v=m.date,b=m.tagName,j=(m.tagCode,m.Status,m.images);m.isDelete;return(0,d.jsxs)(i.View,{className:"activeCard",children:[(0,d.jsxs)(i.View,{className:"left",children:[!1,(0,d.jsx)(i.View,{className:"leftImage",children:(0,d.jsx)(l.default,{width:"100%",height:"100px",fit:"cover",src:null==j||null===(n=j[0])||void 0===n?void 0:n.url})})]}),(0,d.jsxs)(i.View,{className:"middle",children:[(0,d.jsxs)(i.View,{className:"title",children:[(0,d.jsx)(o.default,{round:!0,type:"warning",style:{marginRight:"5px"},children:b}),(0,d.jsx)(i.Text,{children:p})]}),(0,d.jsxs)(i.View,{className:"down",children:[(0,d.jsxs)(i.View,{className:"date",children:[(0,d.jsx)(i.View,{className:"",children:f}),(0,d.jsx)(i.View,{className:"",children:c()(v).format("YYYY-MM-DD")})]}),(0,d.jsx)(i.View,{className:"btn",children:(0,d.jsx)(t.default,{plain:!0,hairline:!0,type:"primary",children:"立即报名"})})]})]})]})}},"./src/pages/components/TabbarCom/index.tsx":function(e,n,a){var t=a("./node_modules/@antmjs/vantui/es/tabbar/index.js"),l=a("./node_modules/@antmjs/vantui/es/tabbar-item/index.js"),o=a("./node_modules/@babel/runtime/helpers/esm/slicedToArray.js"),s=a("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),i=a("webpack/container/remote/@tarojs/taro"),u=a.n(i),r=a("webpack/container/remote/react"),c=a.n(r),d=a("webpack/container/remote/react/jsx-runtime");n.default=function TabbarCom(e){var n,a=c().useState(null!==(n=null==e?void 0:e.active)&&void 0!==n?n:0),i=(0,o.default)(a,2),r=i[0],m=i[1];return(0,d.jsx)(s.View,{style:{marginTop:"40px"},children:(0,d.jsxs)(t.default,{active:r,onChange:function onChange(e){console.log("e",e),m(null==e?void 0:e.detail),0===(null==e?void 0:e.detail)&&u().redirectTo({url:"/pages/home/index"}),1===(null==e?void 0:e.detail)&&u().redirectTo({url:"/pages/activityList/index"}),2===(null==e?void 0:e.detail)&&u().redirectTo({url:"/pages/my/index"})},safeAreaInsetBottom:!0,children:[(0,d.jsx)(l.default,{icon:"home-o",children:"首页"}),(0,d.jsx)(l.default,{icon:"friends-o",children:"活动"}),(0,d.jsx)(l.default,{icon:"setting-o",children:"我的"})]})})}},"./src/utils/index.ts":function(e,n,a){a.d(n,{getTable:function(){return r},getTableid:function(){return c},updateTableid:function(){return d},phoneLogin:function(){return m}});var t=a("./node_modules/@babel/runtime/helpers/esm/regeneratorRuntime.js"),l=a("./node_modules/@babel/runtime/helpers/esm/asyncToGenerator.js"),o=a("./node_modules/@babel/runtime/helpers/esm/objectSpread2.js"),s=a("webpack/container/remote/@tarojs/taro"),i=a.n(s),u=function addTable(e){var n=e.env,a=e.tableName,t=e.objData,l=e.okFun,o=i().cloud.database({env:n}),s=null==o?void 0:o.collection(a);null==s||s.add({data:t,success:function success(e){l(e)}})},r=function getTable(e){var n=e.env,a=e.tableName,t=e.keyValue,l=e.okFun,s=i().cloud.database({env:n}),u=null==s?void 0:s.collection(a);null==u||u.where((0,o.default)({},null!=t?t:{})).get({success:function success(e){l(e)}})},c=function getTableid(e){var n=e.env,a=e.tableName,t=e.id,l=(e.keyValue,e.okFun),o=i().cloud.database({env:n}),s=null==o?void 0:o.collection(a);null==s||s.doc(t).get({success:function success(e){l(e)}})},d=function updateTableid(e){var n=e.env,a=e.tableName,t=e.objData,l=e.id,o=e.okFun,s=i().cloud.database({env:n});(null==s?void 0:s.collection(a)).doc(l).update({data:t,success:function success(e){o(e)}})},m=function(){var e=(0,l.default)((0,t.default)().mark((function _callee4(){return(0,t.default)().wrap((function _callee4$(e){for(;;)switch(e.prev=e.next){case 0:return e.abrupt("return",new Promise((function(e,n){var a,o=i().cloud.database({}).command,s="";i().cloud.callFunction({name:"getOpenid",complete:(a=(0,l.default)((0,t.default)().mark((function _callee3(n){var a,l,i;return(0,t.default)().wrap((function _callee3$(t){for(;;)switch(t.prev=t.next){case 0:console.log("callFunction test result: ",n),s=null==n||null===(a=n.result)||void 0===a||null===(l=a.event)||void 0===l||null===(i=l.userInfo)||void 0===i?void 0:i.openId,console.log("openId--",s),r({tableName:"userInfo",keyValue:{openId:o.eq(s)},okFun:function okFun(n){var a;console.log("res",n);var t,l,o=null!==(a=null==n?void 0:n.data)&&void 0!==a?a:[];if(0!==(null==o?void 0:o.length))return null!=o&&null!==(t=o[0])&&void 0!==t&&null!==(l=t.authInfo)&&void 0!==l&&l.authPhonenum?(e(!0),!0):(e(!1),!1);u({tableName:"userInfo",objData:{openId:s},okFun:function okFun(e){}})}});case 4:case"end":return t.stop()}}),_callee3)}))),function complete(e){return a.apply(this,arguments)})})})));case 1:case"end":return e.stop()}}),_callee4)})));return function phoneLogin(){return e.apply(this,arguments)}}()}}]); \ No newline at end of file +"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([["common"],{"./src/pages/components/ActiveCard/index.tsx":function(e,n,a){var t=a("./node_modules/@antmjs/vantui/es/button/index.js"),l=a("./node_modules/@antmjs/vantui/es/image/index.js"),o=a("./node_modules/@antmjs/vantui/es/tag/index.js"),s=a("./node_modules/@babel/runtime/helpers/esm/slicedToArray.js"),i=a("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),u=a("webpack/container/remote/react"),r=a("webpack/container/remote/moment"),c=a.n(r),d=a("webpack/container/remote/react/jsx-runtime");n.default=function ActiveCard(e){var n,a=(0,u.useState)({}),r=(0,s.default)(a,2),m=(r[0],r[1],null==e?void 0:e.dataSource),p=m.title,f=m.address,v=m.date,b=m.tagName,j=(m.tagCode,m.Status,m.images);m.isDelete;return(0,d.jsxs)(i.View,{className:"activeCard",children:[(0,d.jsxs)(i.View,{className:"left",children:[!1,(0,d.jsx)(i.View,{className:"leftImage",children:(0,d.jsx)(l.default,{width:"100%",height:"100px",fit:"cover",src:null==j||null===(n=j[0])||void 0===n?void 0:n.url})})]}),(0,d.jsxs)(i.View,{className:"middle",children:[(0,d.jsxs)(i.View,{className:"title",children:[(0,d.jsx)(o.default,{round:!0,type:"warning",style:{marginRight:"5px"},children:b}),(0,d.jsx)(i.Text,{children:p})]}),(0,d.jsxs)(i.View,{className:"down",children:[(0,d.jsxs)(i.View,{className:"date",children:[(0,d.jsx)(i.View,{className:"",children:f}),(0,d.jsx)(i.View,{className:"",children:c()(v).format("YYYY-MM-DD")})]}),(0,d.jsx)(i.View,{className:"btn",children:(0,d.jsx)(t.default,{plain:!0,hairline:!0,type:"primary",children:"立即查看"})})]})]})]})}},"./src/pages/components/TabbarCom/index.tsx":function(e,n,a){var t=a("./node_modules/@antmjs/vantui/es/tabbar/index.js"),l=a("./node_modules/@antmjs/vantui/es/tabbar-item/index.js"),o=a("./node_modules/@babel/runtime/helpers/esm/slicedToArray.js"),s=a("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),i=a("webpack/container/remote/@tarojs/taro"),u=a.n(i),r=a("webpack/container/remote/react"),c=a.n(r),d=a("webpack/container/remote/react/jsx-runtime");n.default=function TabbarCom(e){var n,a=c().useState(null!==(n=null==e?void 0:e.active)&&void 0!==n?n:0),i=(0,o.default)(a,2),r=i[0],m=i[1];return(0,d.jsx)(s.View,{style:{marginTop:"40px"},children:(0,d.jsxs)(t.default,{active:r,onChange:function onChange(e){console.log("e",e),m(null==e?void 0:e.detail),0===(null==e?void 0:e.detail)&&u().redirectTo({url:"/pages/home/index"}),1===(null==e?void 0:e.detail)&&u().redirectTo({url:"/pages/activityList/index"}),2===(null==e?void 0:e.detail)&&u().redirectTo({url:"/pages/my/index"})},safeAreaInsetBottom:!0,children:[(0,d.jsx)(l.default,{icon:"home-o",children:"首页"}),(0,d.jsx)(l.default,{icon:"friends-o",children:"活动"}),(0,d.jsx)(l.default,{icon:"setting-o",children:"我的"})]})})}},"./src/utils/index.ts":function(e,n,a){a.d(n,{getTable:function(){return r},getTableid:function(){return c},updateTableid:function(){return d},phoneLogin:function(){return m}});var t=a("./node_modules/@babel/runtime/helpers/esm/regeneratorRuntime.js"),l=a("./node_modules/@babel/runtime/helpers/esm/asyncToGenerator.js"),o=a("./node_modules/@babel/runtime/helpers/esm/objectSpread2.js"),s=a("webpack/container/remote/@tarojs/taro"),i=a.n(s),u=function addTable(e){var n=e.env,a=e.tableName,t=e.objData,l=e.okFun,o=i().cloud.database({env:n}),s=null==o?void 0:o.collection(a);null==s||s.add({data:t,success:function success(e){l(e)}})},r=function getTable(e){var n=e.env,a=e.tableName,t=e.keyValue,l=e.okFun,s=i().cloud.database({env:n}),u=null==s?void 0:s.collection(a);null==u||u.where((0,o.default)({},null!=t?t:{})).get({success:function success(e){l(e)}})},c=function getTableid(e){var n=e.env,a=e.tableName,t=e.id,l=(e.keyValue,e.okFun),o=i().cloud.database({env:n}),s=null==o?void 0:o.collection(a);null==s||s.doc(t).get({success:function success(e){l(e)}})},d=function updateTableid(e){var n=e.env,a=e.tableName,t=e.objData,l=e.id,o=e.okFun,s=i().cloud.database({env:n});(null==s?void 0:s.collection(a)).doc(l).update({data:t,success:function success(e){o(e)}})},m=function(){var e=(0,l.default)((0,t.default)().mark((function _callee4(){return(0,t.default)().wrap((function _callee4$(e){for(;;)switch(e.prev=e.next){case 0:return e.abrupt("return",new Promise((function(e,n){var a,o=i().cloud.database({}).command,s="";i().cloud.callFunction({name:"getOpenid",complete:(a=(0,l.default)((0,t.default)().mark((function _callee3(n){var a,l,i;return(0,t.default)().wrap((function _callee3$(t){for(;;)switch(t.prev=t.next){case 0:console.log("callFunction test result: ",n),s=null==n||null===(a=n.result)||void 0===a||null===(l=a.event)||void 0===l||null===(i=l.userInfo)||void 0===i?void 0:i.openId,console.log("openId--",s),r({tableName:"userInfo",keyValue:{openId:o.eq(s)},okFun:function okFun(n){var a;console.log("res",n);var t,l,o=null!==(a=null==n?void 0:n.data)&&void 0!==a?a:[];if(0!==(null==o?void 0:o.length))return null!=o&&null!==(t=o[0])&&void 0!==t&&null!==(l=t.authInfo)&&void 0!==l&&l.authPhonenum?(e(!0),!0):(e(!1),!1);u({tableName:"userInfo",objData:{openId:s},okFun:function okFun(e){}})}});case 4:case"end":return t.stop()}}),_callee3)}))),function complete(e){return a.apply(this,arguments)})})})));case 1:case"end":return e.stop()}}),_callee4)})));return function phoneLogin(){return e.apply(this,arguments)}}()}}]); \ No newline at end of file diff --git a/dist/pages/my/index.js b/dist/pages/my/index.js index a6d1f74..a046e95 100644 --- a/dist/pages/my/index.js +++ b/dist/pages/my/index.js @@ -1,2 +1,2 @@ /*! For license information please see index.js.LICENSE.txt */ -"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([["pages/my/index"],{"./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./src/pages/my/index.tsx":function(e,n,t){var o=t("./node_modules/@antmjs/vantui/es/cell/index.js"),a=t("./node_modules/@antmjs/vantui/es/button/index.js"),s=t("./node_modules/@antmjs/vantui/es/image/index.js"),l=t("./node_modules/@babel/runtime/helpers/esm/objectSpread2.js"),u=t("./node_modules/@babel/runtime/helpers/esm/regeneratorRuntime.js"),i=t("./node_modules/@babel/runtime/helpers/esm/asyncToGenerator.js"),d=t("./node_modules/@babel/runtime/helpers/esm/slicedToArray.js"),r=t("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),c=t("webpack/container/remote/react"),m=t("./src/pages/components/TabbarCom/index.tsx"),f=t("webpack/container/remote/@tarojs/taro"),p=t.n(f),x=(t("./src/pages/components/ActiveCard/index.tsx"),t("./src/utils/index.ts")),g=t("webpack/container/remote/react/jsx-runtime");n.default=function my(e){var n=(0,c.useState)({}),t=(0,d.default)(n,2),f=(t[0],t[1],(0,c.useState)([])),v=(0,d.default)(f,2),b=(v[0],v[1],(0,c.useState)(0)),j=(0,d.default)(b,2),h=(j[0],j[1],(0,c.useState)(!0)),k=(0,d.default)(h,2),w=k[0],_=k[1];(0,c.useEffect)((function(){y()}),[]);var y=function(){var e=(0,i.default)((0,u.default)().mark((function _callee(){var e;return(0,u.default)().wrap((function _callee$(n){for(;;)switch(n.prev=n.next){case 0:return n.next=2,(0,x.phoneLogin)();case 2:e=n.sent,console.log("isok",e),_(e);case 5:case"end":return n.stop()}}),_callee)})));return function getok(){return e.apply(this,arguments)}}();(0,c.useEffect)((function(){}),[]);var N=function getPhoneNumber(e){console.log("点击获取手机事件",e.detail.cloudID),function getLogin(e){p().cloud.callFunction({name:"getPhoneNum",data:{weRunData:p().cloud.CloudID(e.detail.cloudID)}}).then((function(e){var n,t,o,a,s,u,i,d,r;console.log("res222",e);var c=null==e||null===(n=e.result)||void 0===n||null===(t=n.event)||void 0===t||null===(o=t.weRunData)||void 0===o||null===(a=o.data)||void 0===a?void 0:a.phoneNumber,m=null==e||null===(s=e.result)||void 0===s||null===(u=s.context)||void 0===u?void 0:u.tencentcloud_uin,f={tableName:"userInfo",keyValue:{openId:null==e||null===(i=e.result)||void 0===i||null===(d=i.event)||void 0===d||null===(r=d.userInfo)||void 0===r?void 0:r.openId},okFun:function okFun(e){var n,t;console.log("q",e),(0,x.updateTableid)({id:null==e||null===(n=e.data)||void 0===n||null===(t=n[0])||void 0===t?void 0:t._id,tableName:"userInfo",objData:{tencentcloud_uin:m,authInfo:{authPhonenum:c}},okFun:function okFun(e){y()}})}};(0,x.getTable)((0,l.default)({},f))}))}(e)};return(0,g.jsxs)(r.View,{className:"myContent",children:[(0,g.jsxs)(r.View,{className:"myImage",children:[(0,g.jsx)(s.default,{round:!0,width:"100px",height:"100px",src:"cloud://cloud1-5g5xrgza12a0dd6d.636c-cloud1-5g5xrgza12a0dd6d-1253665791/images/images-2.jpg"}),!w&&(0,g.jsx)(r.View,{className:"loginBtn",children:(0,g.jsx)(a.default,{type:"primary",size:"mini","open-type":"getPhoneNumber",lang:"zh_CN",onGetPhoneNumber:function onGetPhoneNumber(e){console.log("info",e),N(e)},children:"登录"})})]}),(0,g.jsxs)(r.View,{className:"cellArr",children:[(0,g.jsx)(o.default,{icon:"manager",title:"打卡记录",isLink:!0}),(0,g.jsx)(o.default,{title:"微信客服",icon:"wechat",isLink:!0,value:"",onClick:function onClick(){p().openCustomerServiceChat({corpId:"wwb04af9a97514271c",extInfo:{url:"https://work.weixin.qq.com/kfid/kfc70f3f112c97a54c5"},success:function success(e){}})}}),(0,g.jsx)(o.default,{icon:"friends",title:"关于我们",isLink:!0}),(0,g.jsx)(o.default,{icon:"setting",title:"版本日志",isLink:!0,onClick:function onClick(){p().navigateTo({url:"/pages/my/components/Version/index"})}})]}),(0,g.jsx)(m.default,{active:2})]})}},"./src/pages/my/index.tsx":function(e,n,t){var o=t("webpack/container/remote/@tarojs/runtime"),a=t("./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./src/pages/my/index.tsx");Page((0,o.createPageConfig)(a.default,"pages/my/index",{root:{cn:[]}},{navigationBarTitleText:"我的"}||{}))}},function(e){e.O(0,["taro","vendors","common"],(function(){return n="./src/pages/my/index.tsx",e(e.s=n);var n}));e.O()}]); \ No newline at end of file +"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([["pages/my/index"],{"./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./src/pages/my/index.tsx":function(e,n,t){var o=t("./node_modules/@antmjs/vantui/es/cell/index.js"),a=t("./node_modules/@antmjs/vantui/es/button/index.js"),s=t("./node_modules/@antmjs/vantui/es/image/index.js"),l=t("./node_modules/@babel/runtime/helpers/esm/objectSpread2.js"),u=t("./node_modules/@babel/runtime/helpers/esm/regeneratorRuntime.js"),i=t("./node_modules/@babel/runtime/helpers/esm/asyncToGenerator.js"),d=t("./node_modules/@babel/runtime/helpers/esm/slicedToArray.js"),r=t("./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js"),c=t("webpack/container/remote/react"),m=t("./src/pages/components/TabbarCom/index.tsx"),f=t("webpack/container/remote/@tarojs/taro"),p=t.n(f),x=(t("./src/pages/components/ActiveCard/index.tsx"),t("./src/utils/index.ts")),g=t("webpack/container/remote/react/jsx-runtime");n.default=function my(e){var n=(0,c.useState)({}),t=(0,d.default)(n,2),f=(t[0],t[1],(0,c.useState)([])),v=(0,d.default)(f,2),b=(v[0],v[1],(0,c.useState)(0)),j=(0,d.default)(b,2),h=(j[0],j[1],(0,c.useState)(!0)),k=(0,d.default)(h,2),w=k[0],_=k[1];(0,c.useEffect)((function(){y()}),[]);var y=function(){var e=(0,i.default)((0,u.default)().mark((function _callee(){var e;return(0,u.default)().wrap((function _callee$(n){for(;;)switch(n.prev=n.next){case 0:return n.next=2,(0,x.phoneLogin)();case 2:e=n.sent,console.log("isok",e),_(e);case 5:case"end":return n.stop()}}),_callee)})));return function getok(){return e.apply(this,arguments)}}();(0,c.useEffect)((function(){}),[]);var N=function getPhoneNumber(e){console.log("点击获取手机事件",e.detail.cloudID),function getLogin(e){p().cloud.callFunction({name:"getPhoneNum",data:{weRunData:p().cloud.CloudID(e.detail.cloudID)}}).then((function(e){var n,t,o,a,s,u,i,d,r;console.log("res222",e);var c=null==e||null===(n=e.result)||void 0===n||null===(t=n.event)||void 0===t||null===(o=t.weRunData)||void 0===o||null===(a=o.data)||void 0===a?void 0:a.phoneNumber,m=null==e||null===(s=e.result)||void 0===s||null===(u=s.context)||void 0===u?void 0:u.tencentcloud_uin,f={tableName:"userInfo",keyValue:{openId:null==e||null===(i=e.result)||void 0===i||null===(d=i.event)||void 0===d||null===(r=d.userInfo)||void 0===r?void 0:r.openId},okFun:function okFun(e){var n,t;console.log("q",e),(0,x.updateTableid)({id:null==e||null===(n=e.data)||void 0===n||null===(t=n[0])||void 0===t?void 0:t._id,tableName:"userInfo",objData:{tencentcloud_uin:m,authInfo:{authPhonenum:c}},okFun:function okFun(e){y()}})}};(0,x.getTable)((0,l.default)({},f))}))}(e)};return(0,g.jsxs)(r.View,{className:"myContent",children:[(0,g.jsxs)(r.View,{className:"myImage",children:[(0,g.jsx)(s.default,{round:!0,width:"100px",height:"100px",src:"cloud://cloud1-5g5xrgza12a0dd6d.636c-cloud1-5g5xrgza12a0dd6d-1253665791/images/images-2.jpg"}),!w&&(0,g.jsx)(r.View,{className:"loginBtn",children:(0,g.jsx)(a.default,{type:"primary",size:"mini","open-type":"getPhoneNumber",lang:"zh_CN",onGetPhoneNumber:function onGetPhoneNumber(e){console.log("info",e),N(e)},children:"登录"})})]}),(0,g.jsxs)(r.View,{className:"cellArr",children:[(0,g.jsx)(o.default,{icon:"manager",title:"打卡记录",isLink:!0}),(0,g.jsx)(o.default,{title:"微信客服",icon:"wechat",isLink:!0,value:"",onClick:function onClick(){p().openCustomerServiceChat({corpId:"wwb04af9a97514271c",extInfo:{url:"https://work.weixin.qq.com/kfid/kfc70f3f112c97a54c5"},success:function success(e){}})}}),(0,g.jsx)(o.default,{icon:"friends",title:"关于我们",isLink:!0,onClick:function onClick(){p().navigateTo({url:"/pages/my/components/AbountUs/index"})}})]}),(0,g.jsx)(m.default,{active:2})]})}},"./src/pages/my/index.tsx":function(e,n,t){var o=t("webpack/container/remote/@tarojs/runtime"),a=t("./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[9].use[1]!./src/pages/my/index.tsx");Page((0,o.createPageConfig)(a.default,"pages/my/index",{root:{cn:[]}},{navigationBarTitleText:"我的"}||{}))}},function(e){e.O(0,["taro","vendors","common"],(function(){return n="./src/pages/my/index.tsx",e(e.s=n);var n}));e.O()}]); \ No newline at end of file diff --git a/src/app.config.ts b/src/app.config.ts index 4afa00e..868e946 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -10,6 +10,8 @@ export default { "pages/mountainPeak/index", "pages/my/index", "pages/my/components/Version/index", + "pages/my/components/AbountUs/index", + ], permission: { "scope.userLocation": { diff --git a/src/pages/components/ActiveCard/index.tsx b/src/pages/components/ActiveCard/index.tsx index 871d9d3..a9951ee 100644 --- a/src/pages/components/ActiveCard/index.tsx +++ b/src/pages/components/ActiveCard/index.tsx @@ -54,7 +54,7 @@ const ActiveCard = (props: any) => { {/* 活动状态 0 待开放 1开放中 2已取消 3进行中 4已结束 5已关闭 */} diff --git a/src/pages/my/components/AbountUs/index.scss b/src/pages/my/components/AbountUs/index.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/my/components/AbountUs/index.tsx b/src/pages/my/components/AbountUs/index.tsx new file mode 100644 index 0000000..ff9fbae --- /dev/null +++ b/src/pages/my/components/AbountUs/index.tsx @@ -0,0 +1,17 @@ +import { View } from "@tarojs/components"; +import react, { useEffect } from "react"; +import { Collapse, CollapseItem, Toast } from "@antmjs/vantui"; +import "./index.scss"; + +const AbountUs = () => { + useEffect(() => { + // 设置标题 + definePageConfig({ + navigationBarTitleText: "关于我们", + }); + }, []); + + return AbountUs; +}; + +export default AbountUs; diff --git a/src/pages/my/index.tsx b/src/pages/my/index.tsx index 8451164..f75a1c5 100644 --- a/src/pages/my/index.tsx +++ b/src/pages/my/index.tsx @@ -16,7 +16,15 @@ import "./index.module.scss"; import { Tab, Tabs } from "@antmjs/vantui"; import Taro from "@tarojs/taro"; import ActiveCard from "../components/ActiveCard"; -import { addTable, getOpenid, getTable, getTableid, isLogin, phoneLogin, updateTableid } from "../../utils/index"; +import { + addTable, + getOpenid, + getTable, + getTableid, + isLogin, + phoneLogin, + updateTableid, +} from "../../utils/index"; const my = (props: any) => { // const [active, setActive] = react.useState(props?.active ?? 0); @@ -24,7 +32,7 @@ const my = (props: any) => { const [userInfo, setuserInfo] = useState({}); //用户信息 const [detailsData, setdetailsData] = useState([]); //活动详情 const [currentIndex, setcurrentIndex] = useState(0); - const [isin, setisin] = useState(true); //0初始 1未登录 2有手机号 + const [isin, setisin] = useState(true); //0初始 1未登录 2有手机号 useEffect(() => { getok(); @@ -37,7 +45,7 @@ const my = (props: any) => { const getok = async () => { let isOk: any = await phoneLogin(); console.log("isok", isOk); - setisin(isOk) + setisin(isOk); // setisin(isOk?'2':'1'); }; @@ -53,30 +61,30 @@ const my = (props: any) => { .then((res: any) => { console.log("res222", res); let phoneNumber = res?.result?.event?.weRunData?.data?.phoneNumber; - let tencentcloud_uin=res?.result?.context?.tencentcloud_uin - let openId:any=res?.result?.event?.userInfo?.openId - let postData={ - tableName:'userInfo', + let tencentcloud_uin = res?.result?.context?.tencentcloud_uin; + let openId: any = res?.result?.event?.userInfo?.openId; + let postData = { + tableName: "userInfo", keyValue: { openId: openId }, - okFun:((res:any)=>{ - console.log('q',res) + okFun: (res: any) => { + console.log("q", res); updateTableid({ - id:res?.data?.[0]?._id, - tableName:"userInfo", - objData:{ - tencentcloud_uin:tencentcloud_uin, //微信号 - authInfo:{ - authPhonenum:phoneNumber //手机号 - } + id: res?.data?.[0]?._id, + tableName: "userInfo", + objData: { + tencentcloud_uin: tencentcloud_uin, //微信号 + authInfo: { + authPhonenum: phoneNumber, //手机号 + }, }, - okFun:(res:any)=>{ - getok() - } - }) - }) - } - getTable({...postData}) - + okFun: (res: any) => { + getok(); + }, + }); + }, + }; + getTable({ ...postData }); + // setisin(true); }); }; @@ -211,8 +219,18 @@ const my = (props: any) => { }); }} /> - { + // 跳转到目的页面，打开新页面 + Taro.navigateTo({ + url: "/pages/my/components/AbountUs/index", + }); + }} + /> + {/* { url: "/pages/my/components/Version/index", }); }} - /> + /> */} {/* tabbar */}