From 3738c2abe0c795e1484aa2e08aedf8c2e82c639d Mon Sep 17 00:00:00 2001 From: qiaocl <3189782663@qq.com> Date: Fri, 13 May 2022 09:22:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E9=85=8D=E7=BD=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 110 +- BLEPages/adult/F01B.vue | 828 ++--- BLEPages/adult/F01PRO.vue | 474 +++ BLEPages/adult/H01pro.vue | 31 +- BLEPages/adult/H09B.vue | 867 ++--- BLEPages/adult/PCD01pro.vue | 22 +- BLEPages/adult/PCL01.vue | 9 +- assets/common.scss | 5 +- components/drawer/drawer.vue | 260 +- components/signup/signup.vue | 16 +- components/userLogin.vue | 5 +- config.js | 26 +- main.js | 6 +- manifest.json | 2 +- pageTwo/compk/pkdetail.vue | 7 +- pageTwo/home/index.vue | 217 -- pageTwo/login/detail.vue | 136 +- pageTwo/login/login.vue | 647 ++-- pageTwo/login/userinfo.vue | 490 +-- pageTwo/me/adduser.vue | 477 +-- pageTwo/me/detail.vue | 586 ++-- pageTwo/me/feedBack.vue | 186 +- pageTwo/me/history.vue | 313 +- pageTwo/me/info.vue | 168 +- pageTwo/me/manage.vue | 210 +- pageTwo/survey/survey.vue | 707 ++-- pages.json | 433 +-- pages/compk/compk.vue | 327 +- pages/index/active.vue | 720 ++-- pages/index/index.vue | 1239 +++---- pages/me/me.vue | 573 +-- pages/search/devType.vue | 870 +++-- pages/target/target.vue | 599 ++-- static/H09B-成人测脂.gif | Bin 19342 -> 0 bytes store/actions.js | 167 +- store/index.js | 257 +- tools/data4.js | 570 +-- tools/model.js | 6 + tools/tools.js | 501 +-- uni.scss | 5 +- .../mp-weixin/BLEpages/adult/F01B.js.map | 2 +- .../mp-weixin/BLEpages/adult/F01PRO.js.map | 1 + .../mp-weixin/BLEpages/adult/H01pro.js.map | 2 +- .../mp-weixin/BLEpages/adult/H09B.js.map | 2 +- .../mp-weixin/BLEpages/adult/PCD01pro.js.map | 2 +- .../mp-weixin/BLEpages/adult/PCL01.js.map | 2 +- .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../mp-weixin/common/runtime.js.map | 2 +- .../.sourcemap/mp-weixin/common/vendor.js.map | 2 +- .../mp-weixin/components/drawer/drawer.js.map | 2 +- .../mp-weixin/components/header/head.js.map | 2 +- .../mark-slide-list/mark-slide-list.js.map | 2 +- .../ren-calendar/ren-calendar.js.map | 2 +- .../mp-weixin/components/signup/signup.js.map | 2 +- .../components/target/firstweight.js.map | 2 +- .../components/target/manuaRecord.js.map | 2 +- .../components/target/targetWeight.js.map | 2 +- .../u-parse/components/wxParseAudio.js.map | 2 +- .../u-parse/components/wxParseImg.js.map | 2 +- .../components/wxParseTemplate0.js.map | 2 +- .../components/wxParseTemplate1.js.map | 2 +- .../components/wxParseTemplate10.js.map | 2 +- .../components/wxParseTemplate11.js.map | 2 +- .../components/wxParseTemplate2.js.map | 2 +- .../components/wxParseTemplate3.js.map | 2 +- .../components/wxParseTemplate4.js.map | 2 +- .../components/wxParseTemplate5.js.map | 2 +- .../components/wxParseTemplate6.js.map | 2 +- .../components/wxParseTemplate7.js.map | 2 +- .../components/wxParseTemplate8.js.map | 2 +- .../components/wxParseTemplate9.js.map | 2 +- .../u-parse/components/wxParseVideo.js.map | 2 +- .../components/u-parse/u-parse.js.map | 2 +- .../mp-weixin/components/userLogin.js.map | 2 +- .../mp-weixin/pageTwo/compk/pkdetail.js.map | 2 +- .../mp-weixin/pageTwo/home/index.js.map | 2 +- .../mp-weixin/pageTwo/login/detail.js.map | 2 +- .../mp-weixin/pageTwo/login/login.js.map | 2 +- .../mp-weixin/pageTwo/login/userinfo.js.map | 2 +- .../mp-weixin/pageTwo/me/adduser.js.map | 2 +- .../mp-weixin/pageTwo/me/detail.js.map | 2 +- .../mp-weixin/pageTwo/me/feedBack.js.map | 2 +- .../mp-weixin/pageTwo/me/history.js.map | 2 +- .../mp-weixin/pageTwo/me/info.js.map | 2 +- .../mp-weixin/pageTwo/me/manage.js.map | 2 +- .../mp-weixin/pageTwo/survey/survey.js.map | 2 +- .../mp-weixin/pages/compk/compk.js.map | 2 +- .../mp-weixin/pages/index/active.js.map | 2 +- .../mp-weixin/pages/index/index.js.map | 2 +- .../.sourcemap/mp-weixin/pages/me/me.js.map | 2 +- .../mp-weixin/pages/search/devType.js.map | 2 +- .../mp-weixin/pages/target/target.js.map | 2 +- .../components/qiun-data-charts.js.map | 2 +- .../dist/dev/mp-weixin/BLEPages/adult/F01B.js | 114 +- .../dev/mp-weixin/BLEPages/adult/F01B.json | 1 + .../dev/mp-weixin/BLEPages/adult/F01PRO.js | 604 ++++ .../dev/mp-weixin/BLEPages/adult/F01PRO.json | 6 + .../dev/mp-weixin/BLEPages/adult/F01PRO.wxml | 1 + .../dev/mp-weixin/BLEPages/adult/H01pro.js | 111 +- .../dev/mp-weixin/BLEPages/adult/H01pro.json | 1 + .../dist/dev/mp-weixin/BLEPages/adult/H09B.js | 107 +- .../dev/mp-weixin/BLEPages/adult/H09B.json | 1 + .../dev/mp-weixin/BLEPages/adult/PCD01pro.js | 102 +- .../mp-weixin/BLEPages/adult/PCD01pro.json | 1 + .../dev/mp-weixin/BLEPages/adult/PCL01.js | 89 +- .../dev/mp-weixin/BLEPages/adult/PCL01.json | 1 + unpackage/dist/dev/mp-weixin/app.json | 7 +- unpackage/dist/dev/mp-weixin/common/main.js | 62 +- unpackage/dist/dev/mp-weixin/common/main.wxss | 5 +- .../dist/dev/mp-weixin/common/runtime.js | 2 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 3058 +++++++++-------- .../dev/mp-weixin/components/drawer/drawer.js | 98 +- .../mp-weixin/components/drawer/drawer.wxml | 2 +- .../dev/mp-weixin/components/header/head.js | 228 -- .../dev/mp-weixin/components/header/head.json | 7 - .../dev/mp-weixin/components/header/head.wxml | 1 - .../mark-slide-list/mark-slide-list.js | 94 +- .../components/ren-calendar/ren-calendar.js | 94 +- .../dev/mp-weixin/components/signup/signup.js | 82 +- .../mp-weixin/components/signup/signup.wxml | 2 +- .../components/target/firstweight.js | 96 +- .../components/target/manuaRecord.js | 96 +- .../components/target/targetWeight.js | 96 +- .../u-parse/components/wxParseAudio.js | 68 +- .../u-parse/components/wxParseImg.js | 68 +- .../u-parse/components/wxParseTemplate0.js | 70 +- .../u-parse/components/wxParseTemplate1.js | 70 +- .../u-parse/components/wxParseTemplate10.js | 70 +- .../u-parse/components/wxParseTemplate11.js | 70 +- .../u-parse/components/wxParseTemplate2.js | 70 +- .../u-parse/components/wxParseTemplate3.js | 70 +- .../u-parse/components/wxParseTemplate4.js | 70 +- .../u-parse/components/wxParseTemplate5.js | 70 +- .../u-parse/components/wxParseTemplate6.js | 70 +- .../u-parse/components/wxParseTemplate7.js | 70 +- .../u-parse/components/wxParseTemplate8.js | 70 +- .../u-parse/components/wxParseTemplate9.js | 70 +- .../u-parse/components/wxParseVideo.js | 68 +- .../mp-weixin/components/u-parse/u-parse.js | 72 +- .../dev/mp-weixin/components/userLogin.js | 101 +- .../dev/mp-weixin/pageTwo/compk/pkdetail.js | 138 +- .../dev/mp-weixin/pageTwo/compk/pkdetail.json | 1 + .../dist/dev/mp-weixin/pageTwo/home/index.js | 340 -- .../dev/mp-weixin/pageTwo/home/index.json | 6 - .../dev/mp-weixin/pageTwo/home/index.wxml | 1 - .../dev/mp-weixin/pageTwo/home/index.wxss | 59 - .../dev/mp-weixin/pageTwo/login/detail.js | 121 +- .../dev/mp-weixin/pageTwo/login/detail.json | 1 + .../dev/mp-weixin/pageTwo/login/detail.wxss | 20 +- .../dist/dev/mp-weixin/pageTwo/login/login.js | 205 +- .../dev/mp-weixin/pageTwo/login/login.json | 1 + .../dev/mp-weixin/pageTwo/login/login.wxml | 2 +- .../dev/mp-weixin/pageTwo/login/userinfo.js | 118 +- .../dev/mp-weixin/pageTwo/login/userinfo.json | 1 + .../dev/mp-weixin/pageTwo/login/userinfo.wxml | 2 +- .../dist/dev/mp-weixin/pageTwo/me/adduser.js | 115 +- .../dev/mp-weixin/pageTwo/me/adduser.json | 1 + .../dist/dev/mp-weixin/pageTwo/me/detail.js | 114 +- .../dist/dev/mp-weixin/pageTwo/me/detail.json | 1 + .../dist/dev/mp-weixin/pageTwo/me/detail.wxml | 2 +- .../dist/dev/mp-weixin/pageTwo/me/feedBack.js | 152 +- .../dev/mp-weixin/pageTwo/me/feedBack.json | 1 + .../dist/dev/mp-weixin/pageTwo/me/history.js | 113 +- .../dev/mp-weixin/pageTwo/me/history.json | 1 + .../dist/dev/mp-weixin/pageTwo/me/info.js | 381 +- .../dist/dev/mp-weixin/pageTwo/me/info.json | 1 + .../dist/dev/mp-weixin/pageTwo/me/manage.js | 116 +- .../dist/dev/mp-weixin/pageTwo/me/manage.json | 1 + .../dev/mp-weixin/pageTwo/survey/survey.js | 117 +- .../dev/mp-weixin/pageTwo/survey/survey.json | 1 + .../dist/dev/mp-weixin/pages/compk/compk.js | 89 +- .../dist/dev/mp-weixin/pages/compk/compk.json | 1 + .../dist/dev/mp-weixin/pages/index/active.js | 114 +- .../dev/mp-weixin/pages/index/active.json | 1 + .../dist/dev/mp-weixin/pages/index/index.js | 187 +- .../dist/dev/mp-weixin/pages/index/index.json | 1 + .../dist/dev/mp-weixin/pages/index/index.wxml | 2 +- unpackage/dist/dev/mp-weixin/pages/me/me.js | 125 +- unpackage/dist/dev/mp-weixin/pages/me/me.json | 1 + unpackage/dist/dev/mp-weixin/pages/me/me.wxml | 2 +- .../dev/mp-weixin/pages/search/devType.js | 154 +- .../dev/mp-weixin/pages/search/devType.json | 1 + .../dist/dev/mp-weixin/pages/target/target.js | 115 +- .../dev/mp-weixin/pages/target/target.json | 1 + .../dist/dev/mp-weixin/project.config.json | 41 +- .../dev/mp-weixin/project.private.config.json | 7 + .../mp-weixin/static/H09B-成人测脂.gif | Bin 19342 -> 0 bytes .../components/qiun-data-charts.js | 100 +- 188 files changed, 11646 insertions(+), 10992 deletions(-) create mode 100644 BLEPages/adult/F01PRO.vue delete mode 100644 pageTwo/home/index.vue delete mode 100644 static/H09B-成人测脂.gif create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/BLEpages/adult/F01PRO.js.map create mode 100644 unpackage/dist/dev/mp-weixin/BLEPages/adult/F01PRO.js create mode 100644 unpackage/dist/dev/mp-weixin/BLEPages/adult/F01PRO.json create mode 100644 unpackage/dist/dev/mp-weixin/BLEPages/adult/F01PRO.wxml delete mode 100644 unpackage/dist/dev/mp-weixin/components/header/head.js delete mode 100644 unpackage/dist/dev/mp-weixin/components/header/head.json delete mode 100644 unpackage/dist/dev/mp-weixin/components/header/head.wxml delete mode 100644 unpackage/dist/dev/mp-weixin/pageTwo/home/index.js delete mode 100644 unpackage/dist/dev/mp-weixin/pageTwo/home/index.json delete mode 100644 unpackage/dist/dev/mp-weixin/pageTwo/home/index.wxml delete mode 100644 unpackage/dist/dev/mp-weixin/pageTwo/home/index.wxss delete mode 100644 unpackage/dist/dev/mp-weixin/static/H09B-成人测脂.gif diff --git a/App.vue b/App.vue index 022a39e..9b4d691 100644 --- a/App.vue +++ b/App.vue @@ -1,55 +1,63 @@ diff --git a/BLEPages/adult/H01pro.vue b/BLEPages/adult/H01pro.vue index 17c66c7..eb1a490 100644 --- a/BLEPages/adult/H01pro.vue +++ b/BLEPages/adult/H01pro.vue @@ -41,7 +41,7 @@ } }, computed: { - ...mapState(["user", "isConnected", "isBluetoothTyle"]), + ...mapState(["user", "isConnected", "isBluetoothTyle","appTheme"]), info() { return this.user } @@ -74,12 +74,19 @@ }, onLoad(options) { let that = this + // 导航栏颜色 + uni.setNavigationBarColor({ + frontColor: '#ffffff', + backgroundColor: this.appTheme, + }) + // that.textW = "" that.textH = "" if (options && options.deviceId) { - that.macAddr = options.deviceId that.deviceId = options.deviceId - that.createBLEConnection() + that.closeBLEConnection() + that.closeBluetoothAdapter() + that.openBluetoothAdapter() } that.onBLEConnectionStateChange() uni.onBluetoothAdapterStateChange(function(res) { @@ -139,22 +146,26 @@ var that = this; that.isConnection = 0 uni.onBluetoothDeviceFound(res => { - console.log('开始监听寻找到新设备的事件', res); res.devices.forEach(device => { if (!device.name && !device.localName) { return } - if (device.deviceId.indexOf(that.deviceId) != -1) { - that.stopBluetoothDevicesDiscovery() //取消蓝牙搜索 + console.log('开始监听寻找到新设备的事件', device); + if (device.name.indexOf('My') != -1) { clearTimeout(myTime); let buff = device.advertisData.slice(-6) device.mac = new Uint8Array(buff) // 保存广播数据中的mac地址,这是由于iOS不直接返回mac地址 let tempMac = Array.from(device.mac) + console.log('开始监听寻找到新设备的事件0', device) device.macAddr = that.$tools.ab2hex(tempMac, ':').toUpperCase() - that.deviceId = device.macAddr - that.macAddr = device.macAddr - that.createBLEConnection() - return; + if (device.deviceId.indexOf(that.deviceId) != -1 || device.macAddr.indexOf(that.deviceId) != -1) { + console.log('开始监听寻找到新设备的事件1', that.deviceId) + that.stopBluetoothDevicesDiscovery() //取消蓝牙搜索 + that.deviceId = device.deviceId + that.macAddr = device.macAddr + that.createBLEConnection() + return; + } } }) }); diff --git a/BLEPages/adult/H09B.vue b/BLEPages/adult/H09B.vue index 7e5fd8c..8ae2196 100644 --- a/BLEPages/adult/H09B.vue +++ b/BLEPages/adult/H09B.vue @@ -1,448 +1,457 @@ diff --git a/components/signup/signup.vue b/components/signup/signup.vue index 97a0596..d3ce04a 100644 --- a/components/signup/signup.vue +++ b/components/signup/signup.vue @@ -29,7 +29,7 @@ 出生日期 - + {{info.birthday?info.birthday:"请选择"}} @@ -65,6 +65,9 @@ userInfo: function() { return this.user }, + endDate() { + return this.$tools.getDate("start") + } }, mounted() { var agedata = [] @@ -114,10 +117,13 @@ height: that.userInfo.height, sex: that.userInfo.sex, }).then((res) => { - that.$store.dispatch("getUserInfo", { - familyid: that.userInfo.familyid, - }) - that.$store.dispatch("getFamilyList"); + if (res.code == 0) { + that.$store.commit('changeMeasureResult', res.data) + that.$store.dispatch("getUserInfo", { + familyid: that.userInfo.familyid, + }) + that.$store.dispatch("getFamilyList"); + } }) }, }, diff --git a/components/userLogin.vue b/components/userLogin.vue index bf7d3e0..0bd8f9e 100644 --- a/components/userLogin.vue +++ b/components/userLogin.vue @@ -44,7 +44,10 @@ uni.getUserProfile({ desc: '登录', success: (infoRes) => { - console.log("getUserProfile授权成功", infoRes, that.url); + console.log("getUserProfile授权成功", infoRes, uni.getStorageSync('tenantid')); + that.$store.dispatch("getConfig", { + tenantId: uni.getStorageSync('tenantid') + }) uni.redirectTo({ url: `/pageTwo/login/login?name=` + infoRes.userInfo.nickName + "&headimg=" + infoRes.userInfo.avatarUrl + "&url=" + that.url diff --git a/config.js b/config.js index 7d71987..06388d6 100644 --- a/config.js +++ b/config.js @@ -1,29 +1,17 @@ - const accountInfo = wx.getAccountInfoSync(); const appid = accountInfo.miniProgram.appId uni.setStorageSync('appid', appid) let host = "" if (process.env.NODE_ENV === 'development') { - console.log("开发环境") - // host = "https://ttybapi.pcxbc.com" - host = "https://ttybapi.pcxbc.com" + console.log("开发环境") + // host = "https://ttybapi.pcxbc.com" + host = "https://ybapi.pcxbc.com" } else { - console.log("生产环境") - host = "https://ybapi.pcxbc.com" + console.log("生产环境") + host = "https://ybapi.pcxbc.com" } -// // 设备管理 -// let baseUrl = {} -// if (appid === 'wx3e83b37ba682faf5') { -// console.log("每日一称儿童") -// baseUrl.adult = "wxd230a93791c03259" -// baseUrl.device = "wx6f48cc32c5c0a4a2" -// } else if (appid === 'wx44df5e42ddf16203') { -// console.log("小秤匠") -// baseUrl.adult = "wx39cf431caa22b5c8" -// baseUrl.device = "wx6f48cc32c5c0a4a2" -// } console.log("appid", appid) module.exports = { - appid, - host + appid, + host, }; diff --git a/main.js b/main.js index d3646b8..cba18b8 100644 --- a/main.js +++ b/main.js @@ -22,14 +22,14 @@ Vue.prototype.$model = model; // 环境配置 import config from './config.js' Vue.prototype.config = config; - +console.log("uni.setStorageSync", store) Vue.config.productionTip = false App.mpType = 'app' //让页面onLoad在onLaunch后执行 Vue.prototype.$onLaunched = new Promise(resolve => { - Vue.prototype.$isResolve = resolve + Vue.prototype.$isResolve = resolve }) const app = new Vue({ - ...App + ...App }) app.$mount() diff --git a/manifest.json b/manifest.json index ddd8e2d..2bf64ec 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx3e83b37ba682faf5", + "appid" : "wxd230a93791c03259", "setting" : { "urlCheck" : true, "minified" : true, diff --git a/pageTwo/compk/pkdetail.vue b/pageTwo/compk/pkdetail.vue index e0af234..0be8000 100644 --- a/pageTwo/compk/pkdetail.vue +++ b/pageTwo/compk/pkdetail.vue @@ -85,6 +85,11 @@ export default { onLoad(options) { let that = this + // 导航栏颜色 + uni.setNavigationBarColor({ + frontColor: '#ffffff', + backgroundColor: this.appTheme, + }) console.log("options", options) if (options.info) { that.infoID = JSON.parse(options.info) @@ -92,7 +97,7 @@ } }, computed: { - ...mapState(["user"]), + ...mapState(["user","appTheme"]), }, methods: { handleSharepic(id) { diff --git a/pageTwo/home/index.vue b/pageTwo/home/index.vue deleted file mode 100644 index 17b3bfa..0000000 --- a/pageTwo/home/index.vue +++ /dev/null @@ -1,217 +0,0 @@ - - - - - diff --git a/pageTwo/login/detail.vue b/pageTwo/login/detail.vue index 927ba25..438dbfe 100644 --- a/pageTwo/login/detail.vue +++ b/pageTwo/login/detail.vue @@ -1,76 +1,88 @@ diff --git a/pageTwo/login/login.vue b/pageTwo/login/login.vue index d25996c..bef8808 100644 --- a/pageTwo/login/login.vue +++ b/pageTwo/login/login.vue @@ -1,340 +1,351 @@ diff --git a/pageTwo/login/userinfo.vue b/pageTwo/login/userinfo.vue index 6de41e9..d9aa4e1 100644 --- a/pageTwo/login/userinfo.vue +++ b/pageTwo/login/userinfo.vue @@ -1,262 +1,268 @@ diff --git a/pageTwo/me/adduser.vue b/pageTwo/me/adduser.vue index e63817f..e4bbbc2 100644 --- a/pageTwo/me/adduser.vue +++ b/pageTwo/me/adduser.vue @@ -1,253 +1,258 @@ diff --git a/pageTwo/me/detail.vue b/pageTwo/me/detail.vue index 40f4958..de4482f 100644 --- a/pageTwo/me/detail.vue +++ b/pageTwo/me/detail.vue @@ -1,319 +1,325 @@ diff --git a/pageTwo/me/feedBack.vue b/pageTwo/me/feedBack.vue index 8ce97f6..5caa798 100644 --- a/pageTwo/me/feedBack.vue +++ b/pageTwo/me/feedBack.vue @@ -1,103 +1,115 @@