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 - - 扫码 - - + 扫码 - + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/single.vue index db777e1ae..2adc2ddf4 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoBasic_PayFee/PayFee/single.vue @@ -264,8 +264,16 @@ export default{ getpayfeetotal(){ let value = 0 this.FinaChargesStandardList.map(item=>{ + let strValue = item.SJAmount.toString() + // if(strValue.split(".")[1]&&strValue.split(".")[1].length>2){ + // item.SJAmount = strValue.match(/^\d+(?:\.\d{0,2})?/) + // } if(/^-?\d+(,\d{3})*(\.\d{1,2})?$/.test(item.SJAmount)){ - value += Number(item.SJAmount) + if(strValue.indexOf(".") == -1&&Number(item.SJAmount)%1 === 0){ + item.SJAmount = Number(item.SJAmount) + } + value = this.numSub(value,Number(item.SJAmount)) + // value += Number(item.SJAmount) } }) this.payfeetotal = value @@ -280,6 +288,23 @@ export default{ }) this.item = item }, + numSub(num1, num2) { + var baseNum, baseNum1, baseNum2; + var precision;// 精度 + try { + baseNum1 = num1.toString().split(".")[1].length; + } catch (e) { + baseNum1 = 0; + } + try { + baseNum2 = num2.toString().split(".")[1].length; + } catch (e) { + baseNum2 = 0; + } + baseNum = Math.pow(10, Math.max(baseNum1, baseNum2)); + precision = (baseNum1 >= baseNum2) ? baseNum1 : baseNum2; + return ((num1 * baseNum + num2 * baseNum) / baseNum).toFixed(precision); + } }, created() { this.init() diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue index 8fdd22950..74f0e473b 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue @@ -1,39 +1,73 @@ diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/img-stuEnter/scanbtn.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/img-stuEnter/scanbtn.png new file mode 100644 index 000000000..0024cdd51 Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/img-stuEnter/scanbtn.png differ diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/img-stuEnter/titlelogo.png b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/img-stuEnter/titlelogo.png new file mode 100644 index 000000000..47f522904 Binary files /dev/null and b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/static/img-stuEnter/titlelogo.png differ