From 2efd8fcca498641cc0c31eaef7281cea8007a7f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-9N9MIRBL=5C=E7=90=A5?= <2838199541@qq.com> Date: Thu, 4 Jan 2024 19:16:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.0.6=20=202024-01-04=20xh=20?= =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=202=E3=80=81=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E6=B0=B4=E7=94=B5=E6=88=BF=E7=A7=9F=E8=B4=B9=E7=94=A8=E6=80=BB?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=88=9B=E5=BB=BA=E5=92=8C=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 34 +++---- app.json | 5 +- pages/login/login.wxml | 2 +- pages/my/my.wxml | 11 +++ pages/openLockLog/openLockLog.wxml | 6 -- pages/rentManagement/rentManagement.js | 28 ++++-- pagesA/orderList/orderList.js | 176 +++++++++++++++++++++++++++++++++ pagesA/orderList/orderList.json | 10 ++ pagesA/orderList/orderList.wxml | 62 ++++++++++++ pagesA/orderList/orderList.wxss | 36 +++++++ project.config.json | 150 ++++++++++++++-------------- static/images/logo2.jpg | Bin 0 -> 15096 bytes utils/ICINPakage/ICINLocker.js | 16 +-- utils/request.js | 10 +- 14 files changed, 418 insertions(+), 128 deletions(-) create mode 100644 pagesA/orderList/orderList.js create mode 100644 pagesA/orderList/orderList.json create mode 100644 pagesA/orderList/orderList.wxml create mode 100644 pagesA/orderList/orderList.wxss create mode 100644 static/images/logo2.jpg diff --git a/app.js b/app.js index 1887cbe..6aa13df 100644 --- a/app.js +++ b/app.js @@ -10,8 +10,8 @@ App({ onLaunch() { this.globalData.sysinfo = wx.getSystemInfoSync() // wx885b65d99da00084 - // wx20de9fe5943934a1 公寓 - plugin.init('wx20de9fe5943934a1', '458f9df0-3405-66a9-1cdb-49d5f4197e6a') + // wx20de9fe5943934a1 公寓 '458f9df0-3405-66a9-1cdb-49d5f4197e6a' + plugin.init('wx885b65d99da00084', '4f24f9d7-3cae-4f3b-b48C-5429544f617b') .then(function(res){ console.log('res', res) if(res.code != 200){ @@ -20,21 +20,21 @@ App({ }) } }) - // wx.login({ - // success (res) { - // if (res.code) { - // let data={ - // code:res.code - // } - // WXAPI.getOpenId(data).then(res=>{ - // console.log(res) - // wx.setStorageSync('openid', res.openid) - // }) - // } else { - // console.log('登录失败！' + res.errMsg) - // } - // } - // }) + wx.login({ + success (res) { + if (res.code) { + let data={ + code:res.code + } + WXAPI.getOpenId(data).then(res=>{ + console.log(res) + wx.setStorageSync('openid', res.openid) + }) + } else { + console.log('登录失败！' + res.errMsg) + } + } + }) // 展示本地存储能力 var logs = wx.getStorageSync('token') || '' var userRole = wx.getStorageSync('userRole') || '' diff --git a/app.json b/app.json index f223a0c..2a112fe 100644 --- a/app.json +++ b/app.json @@ -36,14 +36,15 @@ "faceinfo/faceinfo", "selectFace/selectFace", "newconstructionitem/newconstructionitem", - "activatePayment/activatePayment" + "activatePayment/activatePayment", + "orderList/orderList" ] } ], "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#02BFFF", - "navigationBarTitleText": "智慧公寓管理系统", + "navigationBarTitleText": "小之锁", "navigationBarTextStyle": "white" }, "plugins": { diff --git a/pages/login/login.wxml b/pages/login/login.wxml index 915e900..6acfe76 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -1,7 +1,7 @@ - + diff --git a/pages/my/my.wxml b/pages/my/my.wxml index e9ef35f..ad57bb8 100644 --- a/pages/my/my.wxml +++ b/pages/my/my.wxml @@ -77,6 +77,17 @@ + + + + + 订单列表 + + + + + + - diff --git a/pages/rentManagement/rentManagement.js b/pages/rentManagement/rentManagement.js index 686b74f..348a575 100644 --- a/pages/rentManagement/rentManagement.js +++ b/pages/rentManagement/rentManagement.js @@ -43,7 +43,8 @@ Page({ leases:{}, selectKey:'', selectRoomName:'', - pid:'' + pid:'', + siteOrder:{} }, /** @@ -225,13 +226,24 @@ validObject(obj) { }, rentMethods(e){ let leases = e.currentTarget.dataset.item - // wx.setStorageSync('leases', leases) - // wx.navigateTo({ - // url: '/pages/paymentInterface/paymentInterface?type=1', - // data:{ - - // } - // }) + let data={ + q:JSON.stringify({ + sid:leases.siteId + }) + } + WXAPI.getItemsPay(data).then(res2=>{ + if(res2.success){ + this.setData({ + siteOrder:res2.data.list[0] + }) + }else{ + wx.showToast({ + title: res2.message, + duration:200, + icon:'none' + }) + } + }) this.setData({ show:true, leases diff --git a/pagesA/orderList/orderList.js b/pagesA/orderList/orderList.js new file mode 100644 index 0000000..23a6ae8 --- /dev/null +++ b/pagesA/orderList/orderList.js @@ -0,0 +1,176 @@ +// pagesA/orderList/orderList.js +const app = getApp() +const WXAPI = require('../../utils/request') +import moment from '../../utils/moment' +var util = require('../../utils/util'); +Page({ + + /** + * 页面的初始数据 + */ + data: { + active:0, + orderLogList:[], + pageSize:10, + pageNum:1, + radio:'2', + leases:{}, + show:false + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getOrderList() + }, + + onChange(event){ + this.setData({ + active:event.detail.name + }) + if(event.detail.name=='0'){ + this.getOrderList() + }else if(event.detail.name==1){ + this.getOrderList() + }else if(event.detail.name==2){ + this.getOrderList() + } + }, + onClose() { + this.setData({ show: false }); + }, + confirmMethods(event) { + this.confimPay() + }, + confimPay(){ + let leases =this.data.leases + let userInfo = wx.getStorageSync('userInfo') + var data = { + description: "交租", + productName: "交租", + total: parseInt(leases.monthRent)*100,//parseInt(this.data.leases.expand.rent)*100, + userId: leases.cardId, + cardId:leases.cardId, + openid:wx.getStorageSync('openid'), + appid:'wx20de9fe5943934a1', + uid:userInfo.id, + eid:userInfo.enterpriseId, + orderType:1, + payType:this.data.radio, + expand:JSON.stringify({ + phone:leases.phone, + nickname:leases.name + }) + } + // WXAPI.miniPrepayOrder(data).then(res=>{ + // let dataOne={ + // code: "wx/updatePrepayStatus", + // data: { + // orderNo: res.data.data.orderNo, + // status:0 + // } + // } + // WXAPI.sendCommand(dataOne).then(res2=>{ + // if(res2.success){ + // wx.showToast({ + // title: "支付成功", + // duration: 2000, + // icon: 'success' + // }) + // }else{ + // wx.showToast({ + // title: res2.message, + // duration: 2000, + // icon: 'error' + // }) + // } + // }) + // }) + }, + onChangeRadio(event){ + this.setData({ + radio: event.detail, + }); + }, + rentMethods(e){ + let leases = e.currentTarget.dataset.item + this.setData({ + show:true, + leases + }) + }, + getOrderList(){ + let data={ + pageSize:this.data.pageSize, + pageNum:this.data.pageNum, + q:JSON.stringify({ + orderStatus:this.data.active + }) + } + WXAPI.getSiteOrder(data).then(res=>{ + if(res.success){ + res.data.list.map(li=>{ + li.createTime = moment(li.createTime).format('YYYY-MM-DD HH:mm:ss') + }) + this.setData({ + orderLogList:res.data.list + }) + }else{ + wx.showToast({ + title: res.message, + duration:200, + icon:'none' + }) + } + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pagesA/orderList/orderList.json b/pagesA/orderList/orderList.json new file mode 100644 index 0000000..861b550 --- /dev/null +++ b/pagesA/orderList/orderList.json @@ -0,0 +1,10 @@ +{ + "usingComponents": { + "van-tab": "../../components/dist/tab/index", + "van-tabs": "../../components/dist/tabs/index", + "van-empty": "../../components/dist/empty/index", + "van-radio": "../../components/dist/radio/index", + "van-radio-group": "../../components/dist/radio-group/index", + "van-dialog": "../../components/dist/dialog/index" + } +} \ No newline at end of file diff --git a/pagesA/orderList/orderList.wxml b/pagesA/orderList/orderList.wxml new file mode 100644 index 0000000..2352d87 --- /dev/null +++ b/pagesA/orderList/orderList.wxml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + 去支付 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 现金 + 刷卡 + 微信支付 + + \ No newline at end of file diff --git a/pagesA/orderList/orderList.wxss b/pagesA/orderList/orderList.wxss new file mode 100644 index 0000000..1614ec3 --- /dev/null +++ b/pagesA/orderList/orderList.wxss @@ -0,0 +1,36 @@ +/* pagesA/orderList/orderList.wxss */ +.box{ + padding: 10rpx; + box-shadow: 10px ; +} +.voucher-list{ + box-sizing: border-box; + padding: 10rpx; + width: 100%; +} +.voucher-item{ + width: 90%; + margin: 20rpx auto; + border-radius: 20rpx; + border: 2rpx solid #eee; + box-shadow: 2rpx 2rpx 10rpx #eee; + padding: 20rpx; +} +.voucheritem{ + display: flex; + justify-content: space-between; + padding: 10rpx; +} +.btn{ + margin-top: 10rpx; + width: 20%; + height: 50rpx; + border: 2rpx solid #e54857; + border-radius: 10rpx; + text-align: center; + line-height: 50rpx; + background-color: #e54857; + color: #ffffff; + font-size: 32rpx; + margin: 0 0 0 80%; +} diff --git a/project.config.json b/project.config.json index 0a5e63b..aea2608 100644 --- a/project.config.json +++ b/project.config.json @@ -1,82 +1,82 @@ { - "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "packOptions": { - "ignore": [ - { - "value": ".eslintrc.js", - "type": "file" - } - ], - "include": [] + "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", + "packOptions": { + "ignore": [ + { + "value": ".eslintrc.js", + "type": "file" + } + ], + "include": [] + }, + "setting": { + "urlCheck": false, + "es6": false, + "enhance": true, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": false, + "coverView": true, + "nodeModules": false, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "uglifyFileName": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "lazyloadPlaceholderEnable": false, + "useMultiFrameRuntime": true, + "useApiHook": true, + "useApiHostProcess": true, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" }, - "setting": { - "urlCheck": false, - "es6": false, - "enhance": true, - "postcss": true, - "preloadBackgroundData": false, - "minified": true, - "newFeature": false, - "coverView": true, - "nodeModules": false, - "autoAudits": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "uglifyFileName": false, - "checkInvalidKey": true, - "checkSiteMap": true, - "uploadWithSourceMap": true, - "compileHotReLoad": false, - "lazyloadPlaceholderEnable": false, - "useMultiFrameRuntime": true, - "useApiHook": true, - "useApiHostProcess": true, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "enableEngineNative": false, - "useIsolateContext": false, - "userConfirmedBundleSwitch": false, - "packNpmManually": false, - "packNpmRelationList": [], - "minifyWXSS": true, - "disableUseStrict": false, - "minifyWXML": true, - "showES6CompileOption": false, - "useCompilerPlugins": false + "enableEngineNative": false, + "useIsolateContext": true, + "userConfirmedBundleSwitch": false, + "packNpmManually": false, + "packNpmRelationList": [], + "minifyWXSS": true, + "disableUseStrict": false, + "minifyWXML": true, + "showES6CompileOption": false, + "useCompilerPlugins": false + }, + "compileType": "miniprogram", + "libVersion": "2.23.4", + "appid": "wx885b65d99da00084", + "projectname": "appltegy", + "editorSetting": { + "tabIndent": "insertSpaces", + "tabSize": 4 + }, + "simulatorType": "wechat", + "simulatorPluginLibVersion": { + "qywx_simulator_plugin": "2.4.0" + }, + "condition": { + "search": { + "list": [] }, - "compileType": "miniprogram", - "libVersion": "2.23.4", - "appid": "wx20de9fe5943934a1", - "projectname": "appltegy", - "editorSetting": { - "tabIndent": "insertSpaces", - "tabSize": 4 + "conversation": { + "list": [] }, - "simulatorType": "wechat", - "simulatorPluginLibVersion": { - "qywx_simulator_plugin": "2.4.0" + "game": { + "list": [] }, - "condition": { - "search": { - "list": [] - }, - "conversation": { - "list": [] - }, - "game": { - "list": [] - }, - "plugin": { - "list": [] - }, - "gamePlugin": { - "list": [] - }, - "miniprogram": { - "list": [] - } + "plugin": { + "list": [] + }, + "gamePlugin": { + "list": [] + }, + "miniprogram": { + "list": [] } + } } \ No newline at end of file diff --git a/static/images/logo2.jpg b/static/images/logo2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..eaf585e01ca56978f56efd2d09710bcced3c6f90 GIT binary patch literal 15096 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 literal 0 HcmV?d00001 diff --git a/utils/ICINPakage/ICINLocker.js b/utils/ICINPakage/ICINLocker.js index c046bf4..307be74 100644 --- a/utils/ICINPakage/ICINLocker.js +++ b/utils/ICINPakage/ICINLocker.js @@ -2653,7 +2653,6 @@ export default class ICINLocker { ) ) ); - console.log("2656", authCode); authCodeLen = (authCode.length / 2).toString(16).PadLeft(2, "0"); } let reqData = @@ -2668,18 +2667,6 @@ export default class ICINLocker { endTime + authCodeLen + authCode; - console.log("2672", authUserId+"---", - keyId+"---", - userId+"---", - _pwdNo+"---", - pwd+"---", - useCountLimit+"---", - token+"---", - startTime+"---", - endTime+"---", - authCodeLen+"---", - authCode); - console.log("2673", reqData, reqData.length, reqData.length / 2, (reqData.length / 2).toString(16), typeof ((reqData.length / 2).toString(16))); let reqDataLength = (reqData.length / 2).toString(16).PadLeft(2, "0"); let dataModular = cmdId + subCmdId + reqDataLength + reqData; let dataModularLength = (dataModular.length / 2) @@ -3800,7 +3787,6 @@ export default class ICINLocker { String.prototype.PadLeft = function (len, charStr) { var s = this + ""; - console.log("3794", s); return new Array(len - s.length + 1).join(charStr, "") + s; }; @@ -3855,7 +3841,7 @@ function getIIData() { function datasubpck(datahex) { var arrayObj = new Array(); let dataPackageLength = packageSize - console.log('分包大小', dataPackageLength, datahex) + console.log('分包大小', dataPackageLength) for (var i = 0; i < datahex.length; i += dataPackageLength) { // 预加 最大包长度，如果依然小于总数据长度，可以取最大包数据大小 if (i + dataPackageLength < datahex.length) { diff --git a/utils/request.js b/utils/request.js index 0a20089..f611aaa 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,7 +1,7 @@ const app = getApp() let subDomain = '' // 子域名,没有就等于 -const API_BASE_URL = 'https://apartmentcloud.xiaozhisz.cn/' // 主域名 -// const API_BASE_URL = 'http://test.zhiweisz.cn/' // 主域名 +// const API_BASE_URL = 'https://apartmentcloud.xiaozhisz.cn/' // 主域名 +const API_BASE_URL = 'http://test.zhiweisz.cn/' // 主域名 // const API_BASE_URL = 'https://yktms-cs.utsz.edu.cn/' // 主域名 import JSEncrypt from '../js_sdk/jsencrypt-Rsa/jsencrypt/jsencrypt.min.js'; function setCode(str, text) { @@ -11,8 +11,8 @@ function setCode(str, text) { let data = encryptStr.encrypt(text.toString()); // 进行加密 return data; } -// let tenantIdEnter='100' -let tenantIdEnter='1200' +let tenantIdEnter='100' +// let tenantIdEnter='1200' function setTenantId(tenantId){ tenantIdEnter=tenantId wx.setStorageSync('tenantId',tenantId) @@ -507,4 +507,6 @@ module.exports = { getDeviceOperateUserInfo:(data)=>requestOne('v1/device/isp/operateUserInfo','POST',data), // bleUnlockRecord: (data) => request('v1/zg/bleUnlockRecord','POST', data),//上传蓝牙开锁记录 // bleRspRecord: (data) => request3('http://192.168.1.34:8900/iot/v1/ble/deviceReport','POST', data),//传输蓝牙返回数据包 + getItemsPay:(data)=>request('v1/price/get/items','POST',data),//计算待支付金额，生成对应订单 + getSiteOrder:(data)=>request('v1/price/get/siteOrder','POST',data),//获取计算待支付金额订单 } \ No newline at end of file