diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue
index 55e9bb57a..af8274182 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue	
@@ -5,6 +5,8 @@
 		// 考虑到用户刷新网页时会丢失全局数据、页面栈、页面数据等，因此直接跳回首页即可
 
 		async onLaunch(param) {
+			// 在App.vue文件中获取到页面到URL (初始化WXsdj)
+			window.localStorage.setItem('scanUrl',location.href.split('#')[0])
 			//应用的生命周期  应用启动后触发
 			// #ifdef H5 || APP-VUE
 			// H5 刷新时获取当前页面路径
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/weixin-js-sdk.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/weixin-js-sdk.js
new file mode 100644
index 000000000..1b5014bfc
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/weixin-js-sdk.js	
@@ -0,0 +1 @@
+!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){if(!o.jWeixin){var n,c={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},a=function(){var e={};for(var n in c)e[c[n]]=n;return e}(),i=o.document,t=i.title,r=navigator.userAgent.toLowerCase(),s=navigator.platform.toLowerCase(),d=!(!s.match("mac")&&!s.match("win")),u=-1!=r.indexOf("wxdebugger"),l=-1!=r.indexOf("micromessenger"),p=-1!=r.indexOf("android"),f=-1!=r.indexOf("iphone")||-1!=r.indexOf("ipad"),m=(n=r.match(/micromessenger\/(\d+\.\d+\.\d+)/)||r.match(/micromessenger\/(\d+\.\d+)/))?n[1]:"",g={initStartTime:L(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},h={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:f?1:p?2:-1,clientVersion:m,url:encodeURIComponent(location.href)},v={},S={_completes:[]},y={state:0,data:{}};O(function(){g.initEndTime=L()});var I=!1,_=[],w={config:function(e){B("config",v=e);var t=!1!==v.check;O(function(){if(t)M(c.config,{verifyJsApiList:C(v.jsApiList),verifyOpenTagList:C(v.openTagList)},function(){S._complete=function(e){g.preVerifyEndTime=L(),y.state=1,y.data=e},S.success=function(e){h.isPreVerifyOk=0},S.fail=function(e){S._fail?S._fail(e):y.state=-1};var t=S._completes;return t.push(function(){!function(){if(!(d||u||v.debug||m<"6.0.2"||h.systemType<0)){var i=new Image;h.appId=v.appId,h.initTime=g.initEndTime-g.initStartTime,h.preVerifyTime=g.preVerifyEndTime-g.preVerifyStartTime,w.getNetworkType({isInnerInvoke:!0,success:function(e){h.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+h.version+"&o="+h.isPreVerifyOk+"&s="+h.systemType+"&c="+h.clientVersion+"&a="+h.appId+"&n="+h.networkType+"&i="+h.initTime+"&p="+h.preVerifyTime+"&u="+h.url;i.src=n}})}}()}),S.complete=function(e){for(var n=0,i=t.length;n<i;++n)t[n]();S._completes=[]},S}()),g.preVerifyStartTime=L();else{y.state=1;for(var e=S._completes,n=0,i=e.length;n<i;++n)e[n]();S._completes=[]}}),w.invoke||(w.invoke=function(e,n,i){o.WeixinJSBridge&&WeixinJSBridge.invoke(e,x(n),i)},w.on=function(e,n){o.WeixinJSBridge&&WeixinJSBridge.on(e,n)})},ready:function(e){0!=y.state?e():(S._completes.push(e),!l&&v.debug&&e())},error:function(e){m<"6.0.2"||(-1==y.state?e(y.data):S._fail=e)},checkJsApi:function(e){M("checkJsApi",{jsApiList:C(e.jsApiList)},(e._complete=function(e){if(p){var n=e.checkResult;n&&(e.checkResult=JSON.parse(n))}e=function(e){var n=e.checkResult;for(var i in n){var t=a[i];t&&(n[t]=n[i],delete n[i])}return e}(e)},e))},onMenuShareTimeline:function(e){P(c.onMenuShareTimeline,{complete:function(){M("shareTimeline",{title:e.title||t,desc:e.title||t,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(n){P(c.onMenuShareAppMessage,{complete:function(e){"favorite"===e.scene?M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""}):M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""},n)}},n)},onMenuShareQQ:function(e){P(c.onMenuShareQQ,{complete:function(){M("shareQQ",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){P(c.onMenuShareWeibo,{complete:function(){M("shareWeiboApp",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){P(c.onMenuShareQZone,{complete:function(){M("shareQZone",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},updateTimelineShareData:function(e){M("updateTimelineShareData",{title:e.title,link:e.link,imgUrl:e.imgUrl},e)},updateAppMessageShareData:function(e){M("updateAppMessageShareData",{title:e.title,desc:e.desc,link:e.link,imgUrl:e.imgUrl},e)},startRecord:function(e){M("startRecord",{},e)},stopRecord:function(e){M("stopRecord",{},e)},onVoiceRecordEnd:function(e){P("onVoiceRecordEnd",e)},playVoice:function(e){M("playVoice",{localId:e.localId},e)},pauseVoice:function(e){M("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){M("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){P("onVoicePlayEnd",e)},uploadVoice:function(e){M("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){M("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){M("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){M("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(p){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){},previewImage:function(e){M(c.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){M("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){M("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===I?(I=!0,M("getLocalImgData",{localId:e.localId},(e._complete=function(e){if(I=!1,0<_.length){var n=_.shift();wx.getLocalImgData(n)}},e))):_.push(e)},getNetworkType:function(e){M("getNetworkType",{},(e._complete=function(e){e=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e}(e)},e))},openLocation:function(e){M("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){M(c.getLocation,{type:(e=e||{}).type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){M("hideOptionMenu",{},e)},showOptionMenu:function(e){M("showOptionMenu",{},e)},closeWindow:function(e){M("closeWindow",{},e=e||{})},hideMenuItems:function(e){M("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){M("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){M("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){M("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){M("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(f){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){M(c.openAddress,{},(e._complete=function(e){e=function(e){return e.postalCode=e.addressPostalCode,delete e.addressPostalCode,e.provinceName=e.proviceFirstStageName,delete e.proviceFirstStageName,e.cityName=e.addressCitySecondStageName,delete e.addressCitySecondStageName,e.countryName=e.addressCountiesThirdStageName,delete e.addressCountiesThirdStageName,e.detailInfo=e.addressDetailInfo,delete e.addressDetailInfo,e}(e)},e))},openProductSpecificView:function(e){M(c.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,card_ext:r.cardExt};i.push(a)}M(c.addCard,{card_list:i},(e._complete=function(e){var n=e.card_list;if(n){for(var i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){M("chooseCard",{app_id:v.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,code:r.code};i.push(a)}M(c.openCard,{card_list:i},e)},consumeAndShareCard:function(e){M(c.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){M(c.chooseWXPay,V(e),e)},openEnterpriseRedPacket:function(e){M(c.openEnterpriseRedPacket,V(e),e)},startSearchBeacons:function(e){M(c.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){M(c.stopSearchBeacons,{},e)},onSearchBeacons:function(e){P(c.onSearchBeacons,e)},openEnterpriseChat:function(e){M("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){M("launchMiniProgram",{targetAppId:e.targetAppId,path:function(e){if("string"==typeof e&&0<e.length){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}(e.path),envVersion:e.envVersion},e)},openBusinessView:function(e){M("openBusinessView",{businessType:e.businessType,queryString:e.queryString||"",envVersion:e.envVersion},(e._complete=function(n){if(p){var e=n.extraData;if(e)try{n.extraData=JSON.parse(e)}catch(e){n.extraData={}}}},e))},miniProgram:{navigateBack:function(e){e=e||{},O(function(){M("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){O(function(){M("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){O(function(){M("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){O(function(){M("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(e){O(function(){e({miniprogram:"miniprogram"===o.__wxjs_environment})})}}},T=1,k={};return i.addEventListener("error",function(e){if(!p){var n=e.target,i=n.tagName,t=n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i)if(-1!=t.indexOf("wxlocalresource://")){e.preventDefault(),e.stopPropagation();var o=n["wx-id"];if(o||(o=T++,n["wx-id"]=o),k[o])return;k[o]=!0,wx.ready(function(){wx.getLocalImgData({localId:t,success:function(e){n.src=e.localData}})})}}},!0),i.addEventListener("load",function(e){if(!p){var n=e.target,i=n.tagName;n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i){var t=n["wx-id"];t&&(k[t]=!1)}}},!0),e&&(o.wx=o.jWeixin=w),w}function M(n,e,i){o.WeixinJSBridge?WeixinJSBridge.invoke(n,x(e),function(e){A(n,e,i)}):B(n,i)}function P(n,i,t){o.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),A(n,e,i)}):B(n,t||i)}function x(e){return(e=e||{}).appId=v.appId,e.verifyAppId=v.appId,e.verifySignType="sha1",e.verifyTimestamp=v.timestamp+"",e.verifyNonceStr=v.nonceStr,e.verifySignature=v.signature,e}function V(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function A(e,n,i){"openEnterpriseChat"!=e&&"openBusinessView"!==e||(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=function(e,n){var i=e,t=a[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",v.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function C(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],o=c[t];o&&(e[n]=o)}return e}}function B(e,n){if(!(!v.debug||n&&n.isInnerInvoke)){var i=a[e];i&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||"")}}function L(){return(new Date).getTime()}function O(e){l&&(o.WeixinJSBridge?e():i.addEventListener&&i.addEventListener("WeixinJSBridgeReady",e,!1))}});
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/wxFn.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/wxFn.js
new file mode 100644
index 000000000..bae39e5c7
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/wxFn.js	
@@ -0,0 +1,79 @@
+import wx from '@/common/js/weixin-js-sdk.js';
+export default {
+	methods: {
+		data(){
+			return {
+				wxInit:false
+			}
+		},
+		// 初始化wx
+		initWx(arr = ["getLocation"]) {
+			const promise = new Promise((resolve, reject) => {
+				// let url = window.location.href
+				let url = /(Android)/i.test(navigator.userAgent) ? location.href.split('#')[0] : window
+					.localStorage
+					.getItem('scanUrl')
+				this.HTTP_GET("weixinapi/getweixinwebaccess_token?url=" + encodeURIComponent(url)).then((
+					success) => {
+					if (!success) {
+						resolve(false)
+						return
+					}
+					wx.config({
+						debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+						appId: success.appid, // 必填，公众号的唯一标识
+						timestamp: success.timestamp, // 必填，生成签名的时间戳
+						nonceStr: success.noncestr, // 必填，生成签名的随机串
+						signature: success.certificate, // 必填，签名
+						jsApiList: arr // 必填，需要使用的JS接口列表
+					});
+					wx.ready(() => {
+						this.wxInit = true
+						this.TOAST("wx初始化成功")
+						resolve(true)
+					})
+					wx.error(() => {
+						this.TOAST("wx初始化失败")
+						resolve(false)
+					})
+				})
+			})
+			return promise
+		},
+		// 获取定位
+		async getLocation() {
+			return new Promise(async (resolve) => {
+				if (!this.wxInit) {
+					let res = await this.initWx(["getLocation"])
+					if(!res){
+						resolve(false)
+						return
+					}
+				}
+				if(!wx.getLocation){
+					this.TOAST("无效方法")
+					resolve(false)
+				}
+				wx.getLocation({
+					type: "gcj02", // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+					success: function(res) {
+						var latitude = res.latitude; // 纬度，浮点数，范围为90 ~ -90
+						var longitude = res.longitude; // 经度，浮点数，范围为180 ~ -180。
+						var speed = res.speed; // 速度，以米/每秒计
+						var accuracy = res.accuracy; // 位置精度
+						console.log(res)
+						resolve({
+							lat:latitude,
+							lng:longitude
+						})
+					},
+					fail: function(error) {
+						this.TOAST("定位失败")
+						resolve(false)
+					}
+				});
+			})
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue
index 5dcbbe85e..7e50b7936 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AttendanceCard/list.vue	
@@ -1,305 +1,316 @@
-<template> 
-  <view class="">
-  	<view v-if="ready" class="contentBox">
-		<view class="rules">
-			<view class="">
+<template>
+	<view class="">
+		<view v-if="ready" class="contentBox">
+			<view class="rules">
 				<view class="">
-					上班 {{info.WorkTime}}
+					<view class="">
+						上班 {{info.WorkTime}}
+					</view>
+					<view class="">
+						{{info.UserWorkTime?info.UserWorkTime.substring(8)+' 打卡':'未打卡'}}
+					</view>
 				</view>
 				<view class="">
-					{{info.UserWorkTime?info.UserWorkTime.substring(8)+' 打卡':'未打卡'}}
+					<view class="">
+						下班 {{info.CloseTime}}
+					</view>
+					<view class="">
+						{{info.UserCloseTime?info.UserCloseTime.substring(8)+' 打卡':'未打卡'}}
+					</view>
 				</view>
 			</view>
-			<view class="">
-				<view class="">
-					下班 {{info.CloseTime}}
+			<view class="content" id="attendContent">
+				<view id="show">{{now}}</view>
+				<view class="pen" @click="action('dk')">
+					<img :class="{gray:info.AttendanceType != 1}" id="attimg" :src="imgsrc" alt="" width="100%">
 				</view>
-				<view class="">
-					{{info.UserCloseTime?info.UserCloseTime.substring(8)+' 打卡':'未打卡'}}
+				<view class="title">
+					{{info.AttendanceTypeString}}
 				</view>
 			</view>
-		</view>
-		<view class="content" id="attendContent">
-			<view id="show">{{now}}</view>
-			<view class="pen" @click="action('dk')">
-				 <img :class="{gray:info.AttendanceType != 1}" id="attimg" :src="imgsrc" alt="" width="100%">
-			</view>
-			<view class="title">
-				{{info.AttendanceTypeString}}
+			<view class="footer">
+				<img src="../../common/images/2.png" alt="" width="100%">
 			</view>
 		</view>
-		<view class="footer">
-			<img src="../../common/images/2.png" alt="" width="100%">
-		</view>
-    </view> 
-	<view id='container'></view>
-  </view>
-    
-</template> 
-  
-  
-<script> 
-/* 
- * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
- * Copyright (c) 2013-2020 上海力软信息技术有限公司 
- * 创建人：超级管理员 
- * 日  期：2022-03-10 15:30 
- * 描  述：考勤打卡 
- */
-  
-/** 
- * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
- * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/AttendanceCard/list", "style": { "navigationBarTitleText": "考勤打卡" } } 
- *  
- * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
- * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
- */
-  
-import get from 'lodash/get'
-import set from 'lodash/set'
-import moment from 'moment'
-import customPageMixins from '@/common/custompage.js'
-//导入图片
-import dk from '../../common/images/dk.png'
-import dkred from '../../common/images/dkred.png'
-import dkyellow from '../../common/images/dkyellow.png'
-  
-export default { 
-  mixins: [customPageMixins], 
-  
-  data() { 
-    return { 
-      // 页面相关参数 
-	  info:{},
-      now: null, 
-	  imgsrc:dk,
-      ready: false, 
-	  timer:'',
-	  map:null,
-    } 
-  }, 
-  
-  async onLoad() { 
-    await this.init() 
-  }, 
-  
-  methods: { 
-    // 页面初始化 
-    async init() { 
-      this.LOADING('加载数据中...') 
-  
-      this.now = this.getCurrentTime()
-	  this.timer = setInterval(this.getCurrentTime,1000)
-	  await this.judgeIsDK()
-	  
-      this.ready = true
-      this.HIDE_LOADING() 
-    },
-	
-    // 点击 「打卡」按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'dk': 
-			if(this.imgsrc == dkred){
-				return
+		<view id='container'></view>
+	</view>
+
+</template>
+
+
+<script>
+	/* 
+	 * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+	 * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+	 * 创建人：超级管理员 
+	 * 日  期：2022-03-10 15:30 
+	 * 描  述：考勤打卡 
+	 */
+
+	/** 
+	 * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+	 * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+	 * { "path": "pages/AttendanceCard/list", "style": { "navigationBarTitleText": "考勤打卡" } } 
+	 *  
+	 * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+	 * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+	 */
+
+	import get from 'lodash/get'
+	import set from 'lodash/set'
+	import moment from 'moment'
+	import customPageMixins from '@/common/custompage.js'
+	import wxFn from '@/common/wxFn.js'
+	//导入图片
+	import dk from '../../common/images/dk.png'
+	import dkred from '../../common/images/dkred.png'
+	import dkyellow from '../../common/images/dkyellow.png'
+
+	export default {
+		mixins: [customPageMixins, wxFn],
+
+		data() {
+			return {
+				// 页面相关参数 
+				info: {},
+				now: null,
+				imgsrc: dk,
+				ready: false,
+				timer: '',
+				map: null,
 			}
-			this.LOADING()
-			this.HTTP_POST('learun/adms/attendance/clockin', {}, '打卡失败').then(success => {
+		},
+
+		async onLoad() {
+			await this.init()
+		},
+
+		methods: {
+			// 页面初始化 
+			async init() {
+				this.LOADING('加载数据中...')
+
+				this.now = this.getCurrentTime()
+				this.timer = setInterval(this.getCurrentTime, 1000)
+				await this.judgeIsDK()
+
+				this.ready = true
 				this.HIDE_LOADING()
-				if(!success) { 
-					this.TOAST('打卡失败') 
+			},
+
+			// 点击 「打卡」按钮 
+			async action(type) {
+				switch (type) {
+					case 'dk':
+						if (this.imgsrc == dkred) {
+							return
+						}
+						this.LOADING()
+						this.HTTP_POST('learun/adms/attendance/clockin', {}, '打卡失败').then(success => {
+							this.HIDE_LOADING()
+							if (!success) {
+								this.TOAST('打卡失败')
+								return
+							}
+							this.TOAST('打卡成功', 'success')
+							setTimeout(this.back, 500)
+
+						})
+						return
+
+					default:
+						break
+				}
+			},
+			//获取打卡信息
+			async judgeIsDK() {
+				let success = await this.HTTP_GET('learun/adms/attendance/IsAttendance', {}, '判断当前时间是否可以打卡失败')
+				if (!success) {
 					return
-				} 
-				this.TOAST('打卡成功','success') 
-				setTimeout(this.back,500)
-			    
-			}) 
-			return
-		  
-        default: break
-      } 
-    },
-	//判断当前时间是否可以打卡
-	async judgeIsDK(){
-		let success = await this.HTTP_GET('learun/adms/attendance/IsAttendance',{},'判断当前时间是否可以打卡失败')
-		if(!success){return}
-		this.info = success.data
-		this.imgsrc=dk;
-		// if ([1].includes(this.info.AttendanceType)) {
-		// 	this.imgsrc=dk;
-		// } else if ([2,3].includes(this.info.AttendanceType)) {
-		// 	this.imgsrc=dkyellow;
-		// }else {
-		// 	this.imgsrc=dkred;
-		// }
-		if(![5].includes(this.info.AttendanceType)){
-			if(!window.BMapGL) await this.loadJScript()
-			this.map = new BMapGL.Map('container');
-			await this.isFieldPersonnel()
-		}
-	},
-	//返回
-	back(){
-		this.NAV_BACK()
-	},
-	//获取当前时间
-	 getCurrentTime() {
-		 let nowDate = new Date();
-	 　　let hh = nowDate.getHours();
-	 　　let mf = nowDate.getMinutes()<10 ? '0'+nowDate.getMinutes() : nowDate.getMinutes();
-	 　　let ss = nowDate.getSeconds()<10 ? '0'+nowDate.getSeconds() : nowDate.getSeconds();
-	 　　this.now = hh+':'+mf+':'+ss;
-	 },
-	 // 判断是否外勤打卡
-	 async isFieldPersonnel(){
-		 let point = new BMapGL.Point(this.info.GPSLon,this.info.GPSLat)
-		 await this.getDistance(point)
-	 },
-	 //异步加载地图
-	 loadJScript() {
-		 return new Promise((resolve,reject)=>{
-		    window.initMap = function(){
-			  resolve(BMapGL)
-		    }
-			var script = document.createElement('script');
-			script.type = 'text/javascript';
-			script.src = 'https://api.map.baidu.com/api?v=1.0&type=webgl&ak=j1TvNK854LRvVuxuAhNNxdhKVB0KbEZD'+'&callback='+'initMap';
-			script.onerror = reject
-			document.head.appendChild(script);
-		 })
-	 },
-	 // 计算距离打卡点的距离
-	 // 签到状态(1正常打卡，2迟到打卡，3早退打卡，4外勤打卡，5不在考勤时间范围)
-	 async getDistance(myP1) {
-	   // new BMapGL.Point(116.404, 39.915)
-	   let myP2 = await this.local();
-	   if(!myP2) {
-		   this.TOAST('获取定位失败！') 
-		   return
-	   }
-	   let distance = this.map.getDistance(myP1, myP2).toFixed(2)
-	   console.log('距离',distance,'打卡坐标：',myP1,'当前坐标：',myP2)
-	   if(Number(distance) > Number(this.info.GPSRange)){
-		   this.$set(this.info,'AttendanceType',4)
-		   this.$set(this.info,'AttendanceTypeString','外勤打卡')
-	   }
-	 },
-	// 获取当前位置
-	local() {
-	   return new Promise((resolve) => {
-		   let that = this
-		 uni.getLocation({
-		 	type: 'gcj02',
-			isHighAccuracy:true,
-		 	success(res) {
-				// let point = new BMapGL.Point(res.longitude,res.latitude)
-				// console.log(point)
-				new BMapGL.Convertor().translate([{lng: res.longitude, lat: res.latitude}], 3, 5, data => {
-				  resolve(data.points[0])
+				}
+				this.info = success.data
+				this.imgsrc = dk;
+				// if ([1].includes(this.info.AttendanceType)) {
+				// 	this.imgsrc=dk;
+				// } else if ([2,3].includes(this.info.AttendanceType)) {
+				// 	this.imgsrc=dkyellow;
+				// }else {
+				// 	this.imgsrc=dkred;
+				// }
+				if (![5].includes(this.info.AttendanceType)) {
+					if (!window.BMapGL) await this.loadJScript()
+					this.map = new BMapGL.Map('container');
+					await this.isFieldPersonnel()
+				}
+			},
+			//返回
+			back() {
+				this.NAV_BACK()
+			},
+			//获取当前时间
+			getCurrentTime() {
+				let nowDate = new Date();
+				let hh = nowDate.getHours();
+				let mf = nowDate.getMinutes() < 10 ? '0' + nowDate.getMinutes() : nowDate.getMinutes();
+				let ss = nowDate.getSeconds() < 10 ? '0' + nowDate.getSeconds() : nowDate.getSeconds();
+				this.now = hh + ':' + mf + ':' + ss;
+			},
+			// 判断是否外勤打卡
+			async isFieldPersonnel() {
+				let point = new BMapGL.Point(this.info.GPSLon, this.info.GPSLat)
+				await this.getDistance(point)
+			},
+			//异步加载地图
+			loadJScript() {
+				return new Promise((resolve, reject) => {
+					window.initMap = function() {
+						resolve(BMapGL)
+					}
+					var script = document.createElement('script');
+					script.type = 'text/javascript';
+					script.src =
+						'https://api.map.baidu.com/api?v=1.0&type=webgl&ak=j1TvNK854LRvVuxuAhNNxdhKVB0KbEZD' +
+						'&callback=' + 'initMap';
+					script.onerror = reject
+					document.head.appendChild(script);
 				})
-		 	},
-			fail(){
-				resolve(false)
-			}
-		 });
-	   });
-	 },
-  },
-  destroyed() {
-  	clearInterval(this.timer)
-  }
-} 
-</script> 
+			},
+			// 计算距离打卡点的距离
+			// 签到状态(1正常打卡，2迟到打卡，3早退打卡，4外勤打卡，5不在考勤时间范围)
+			async getDistance(myP1) {
+				// new BMapGL.Point(116.404, 39.915)
+				let myP2 = await this.local();
+				if (!myP2) {
+					this.TOAST('获取定位失败！')
+					return
+				}
+				let distance = this.map.getDistance(myP1, myP2).toFixed(2)
+				console.log('距离', distance, '打卡坐标：', myP1, '当前坐标：', myP2)
+				if (Number(distance) > Number(this.info.GPSRange)) {
+					this.$set(this.info, 'AttendanceType', 4)
+					this.$set(this.info, 'AttendanceTypeString', '外勤打卡')
+				}
+			},
+			// 获取当前位置
+			local() {
+				return new Promise(async (resolve) => {
+					let res = await this.getLocation()
+					if (!res) {
+						resolve(false)
+					}
+					new BMapGL.Convertor().translate([res], 3, 5, data => {
+						if(res.status = 0){
+							alert(res.points[0].lng)
+							resolve(res.points[0])
+						}else{
+							resolve(false)
+						}
+					  
+					})
+				});
+			},
+		},
+		destroyed() {
+			clearInterval(this.timer)
+		}
+	}
+</script>
+
+<style lang="less">
+	uni-page-body {
+		height: 100%;
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.content {
+		width: 48%;
+		height: 50%;
+		position: absolute;
+		top: 15%;
+		left: 50%;
+		transform: translate(-50%, 10%);
+	}
+
+	.title {
+		font-size: 14px;
+		text-align: center;
+		color: #333;
+		margin-top: 8px;
+	}
+
+	.rules {
+		display: flex;
+		justify-content: space-between;
+		color: #666;
+		padding: 15px;
+		line-height: 24px;
+	}
+
+	.rules>* {
+		width: 49%;
+		background-color: #BDE4FF;
+		padding: 8px;
+		border-radius: 8px 12px;
+	}
+
+	.rules>*>*:first-child {
+		color: #333;
+	}
+
+	#show {
+		text-align: center;
+		height: 200rpx;
+		font-size: 56rpx;
+	}
 
-<style lang="less">	
-uni-page-body{
-	height: 100%;
-	width: 100%;
-	background-color: #fff;
-}
-  .content {
-	width: 48%;
-	height: 50%;
-	position: absolute;
-	top: 15%;
-	left: 50%;
-	transform: translate(-50%, 10%);
-}
-.title{
-	font-size: 14px;
-	text-align: center;
-	color: #333;
-	margin-top: 8px;
-}
-.rules{
-	display: flex;
-	justify-content: space-between;
-	color: #666;
-	padding: 15px;
-	line-height: 24px;
-}
-.rules>*{
-	width: 49%;
-	background-color: #BDE4FF;
-	padding: 8px;
-	border-radius: 8px 12px;
-}
-.rules>*>*:first-child{
-	color: #333;
-}
-#show {
-	text-align: center;
-	height: 200rpx;
-	font-size: 56rpx;
-}
+	.pen {
+		// height: 48%;
+		border-radius: 50%;
+		background-color: #e7f5ff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.pen {
-	// height: 48%;
-	border-radius: 50%;
-	background-color: #e7f5ff;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
+	.pen2 {
+		width: 91%;
+		height: 91%;
+		border-radius: 50%;
+		background-color: #bde4ff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.pen2 {
-	width: 91%;
-	height: 91%;
-	border-radius: 50%;
-	background-color: #bde4ff;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
+	.pen3 {
+		width: 84%;
+		height: 84%;
+		border-radius: 50%;
+		background-color: #0c86d8;
+		text-align: center;
+		font-size: 68rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #ffff;
+	}
 
-.pen3 {
-	width: 84%;
-	height: 84%;
-	border-radius: 50%;
-	background-color: #0c86d8;
-	text-align: center;
-	font-size: 68rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	color: #ffff;
-}
+	.footer {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		overflow: hidden;
+	}
 
-.footer {
-	width: 100%;
-	position: fixed;
-	left: 0;
-	bottom: 0;
-	overflow: hidden;
-}
-.gray{
-  -webkit-filter: grayscale(100%);
-  -moz-filter: grayscale(100%);
-  -ms-filter: grayscale(100%);
-  -o-filter: grayscale(100%);
-  filter: grayscale(100%);
-  filter: progid:DXImageTransform.Microsoft.BasicImage(grayscale=1);
-  filter: gray;
-}
+	.gray {
+		-webkit-filter: grayscale(100%);
+		-moz-filter: grayscale(100%);
+		-ms-filter: grayscale(100%);
+		-o-filter: grayscale(100%);
+		filter: grayscale(100%);
+		filter: progid:DXImageTransform.Microsoft.BasicImage(grayscale=1);
+		filter: gray;
+	}
 </style>
\ No newline at end of file