diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 2d5428c1..b27ec300 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,7 +2,7 @@ "version" : "1.0", "configurations" : [ { - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" }, { diff --git a/App.vue b/App.vue index dfe19949..a337f6f9 100644 --- a/App.vue +++ b/App.vue @@ -1,13 +1,140 @@ diff --git a/androidPrivacy.json b/androidPrivacy.json new file mode 100644 index 00000000..0d726ca9 --- /dev/null +++ b/androidPrivacy.json @@ -0,0 +1,3 @@ +{ + "prompt" : "template" +} diff --git a/assets/common.scss b/assets/common.scss index b9962d04..753b17bb 100644 --- a/assets/common.scss +++ b/assets/common.scss @@ -639,22 +639,24 @@ border-radius: 10px; margin: 0 15px 10px; font-size: 14px; - padding: 25px 10px; + padding: 25px 10px 15px; color: #fff; .status { + float: right; margin-bottom: 25px; text { width: auto; color: #333; background-color: #fff; - border-radius: 15px; - padding: 5px 10px; + border-radius: 10px; + padding: 8px 10px; } } .item { + width: 100%; display: flex; justify-content: space-between; @@ -1139,4 +1141,144 @@ } } - \ No newline at end of file + // 测量也 + .weightPages { + .text { + width: 100%; + text-align: center; + font-size: 16px; + margin-top: 20px; + color: $textcolor; + } + + .title { + width: 100%; + text-align: center; + height: 45px; + line-height: 45px; + font-size: 18px; + font-weight: bold; + } + + .image { + text-align: center; + + image { + width: 200px; + height: 200px; + margin: auto; + margin-top: 20px; + } + } + + + .tips { + width: auto; + margin-top: 25px; + padding-left: 20px; + line-height: 30px; + font-size: 12px; + color: #999; + + text { + display: block; + + } + } + + .wrapper { + position: fixed; + top: 0; + bottom: 0; + right: 0; + left: 0; + z-index: 99; + display: flex; + align-items: center; + justify-content: center; + background-color: rgba(0, 0, 0, 0.4); + + .Blue { + width: 75%; + padding: 15px; + background: #fff; + z-index: 999; + border-radius: 5px; + text-align: center; + line-height: 30px; + + .h4 { + font-size: 16px; + font-weight: 700; + margin-bottom: 10px; + } + + .Blue-box { + display: flex; + align-items: center; + text-align: left; + height: 40px; + line-height: 40px; + margin-bottom: 15px; + + text { + font-size: 18px; + font-weight: 700; + margin: 0 5px; + color: $textcolor; + } + } + + input { + width: 85px; + background: #f7f7f7; + padding: 7px 5px; + margin-right: 10px; + border-radius: 5px; + } + } + + + .Blue-btn { + width: 45%; + background: $textcolor; + border-radius: 5px; + font-size: 14px; + margin-top: 10px; + margin-bottom: 5px; + height: 35px; + line-height: 35px; + float: right; + color: #fff; + } + + .Blue-close { + background: #dfdfdf !important; + float: left !important; + color: #333; + } + } + + + .btnGroup { + width: 100%; + display: flex; + + .btnClose, + .baocun { + width: 150px; + background-color: $textcolor; + border: 1px solid #f7f7f7; + color: #fff; + text-align: center; + padding: 7px; + border-radius: 10px; + margin: 15px auto; + } + + .btnClose { + background-color: #dfdfdf; + color: #fff; + } + } + } \ No newline at end of file diff --git a/cardlist.json b/cardlist.json index ff7a5750..c61978cb 100644 --- a/cardlist.json +++ b/cardlist.json @@ -1,7 +1,7 @@ { "selectllist": [{ "id": "1", - "key": "Weight", + "key": "2", "disabled": true, "size": "big", "name": "身体数据", @@ -23,7 +23,7 @@ }, { "id": "2", "size": "big", - "key": "Skip", + "key": "6", "disabled": true, "unit": "个", "name": "跳绳数据", @@ -39,7 +39,7 @@ }, { "id": "3", "disabled": true, - "key": "Lung", + "key": "8", "size": "small", "name": "肺活量", "unit": "ml", @@ -115,6 +115,7 @@ "month": 0, "id": "08dbd378-27d1-42d2-87fc-dca513adb60f", "height": 178.00, + "type": "false", "fat_r": 0.00, "muscle": 0.00, "water": 0.00, @@ -140,6 +141,7 @@ }, { "createtime": "2023-10-23 11:28:30.0000000", "month": 0, + "type": "false", "id": "08dbd378-20a5-4991-84f4-a9702018f416", "height": 178.00, "fat_r": 0.00, @@ -172,6 +174,7 @@ "fat_r": 0.00, "muscle": 0.00, "water": 0.00, + "type": "false", "bone": 0.00, "kcal": 0.00, "fat_w": 0.00, diff --git a/components/drawer.vue b/components/drawer.vue index 6a4f5f85..8c2df0b8 100644 --- a/components/drawer.vue +++ b/components/drawer.vue @@ -19,7 +19,7 @@ {{item.gender==1?'男':'女'}} - {{item.birthday}} + {{item.age}}岁 @@ -54,6 +54,7 @@ toggle(val) { let that = this uni.setStorageSync('userid', val.id) + uni.setStorageSync('gender', val.gender) that.$store.dispatch("getUserInfo", { aud_id: val.id }); @@ -64,9 +65,11 @@ }, //添加 addInfo() { + let that = this uni.navigateTo({ - url: "/pages/index/userInfo" + url: "/pages/me/userInfo" }) + that.$store.commit("changeDrawe", false); }, clear() { this.$store.commit("changeDrawe", false); diff --git a/components/headerIndex.vue b/components/headerIndex.vue index 9f619a25..5d75c482 100644 --- a/components/headerIndex.vue +++ b/components/headerIndex.vue @@ -57,17 +57,17 @@ return {}; }, computed: { - ...mapState(["user", "familayList"]), - userList() { - return this.familayList - } + ...mapState({ + user: state => state.user, + userList: state => state.familayList + }) }, + mounted() {}, methods: { - // 添加成员 handleAddUser() { uni.navigateTo({ - url: "/pages/index/userInfo" + url: "/pages/me/userInfo" }) }, } @@ -84,6 +84,10 @@ view { width: 100%; } + + last-child { + margin-top: 2px !important; + } } .area { diff --git a/components/manuallyAdd/skipAdd.vue b/components/manuallyAdd/skipAdd.vue index dc688aa3..07fd7dc4 100644 --- a/components/manuallyAdd/skipAdd.vue +++ b/components/manuallyAdd/skipAdd.vue @@ -23,7 +23,7 @@ 个数 - 个 + diff --git a/manifest.json b/manifest.json index 7b2e56da..5985b165 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "青测", "appid" : "__UNI__E0E1A21", "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", + "versionName" : "1.0.5", + "versionCode" : 105, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -18,8 +18,7 @@ }, /* 模块配置 */ "modules" : { - "Bluetooth" : {}, - "Camera" : {} + "Bluetooth" : {} }, /* 应用发布信息 */ "distribute" : { @@ -41,19 +40,77 @@ "", "", "" - ] + ], + "abiFilters" : [ "arm64-v8a", "x86" ] }, /* ios打包配置 */ "ios" : { - "dSYMs" : false + "dSYMs" : false, + "idfa" : false, + "privacyDescription" : { + "NSBluetoothAlwaysUsageDescription" : "连接设备" + } }, /* SDK配置 */ "sdkConfigs" : { "share" : {}, "ad" : {} + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } + }, + "splashscreen" : { + "androidStyle" : "common", + "android" : { + "hdpi" : "static/logo.png", + "xhdpi" : "static/logo.png", + "xxhdpi" : "static/logo.png" + }, + "useOriginalMsgbox" : true } } }, + "permissions" : { + "Android" : [ + { + "name" : "android.permission.READ_EXTERNAL_STORAGE", + "desc" : "读取外部存储" + }, + { + "name" : "android.permission.WRITE_EXTERNAL_STORAGE", + "desc" : "写入外部存储" + } + ] + }, /* 快应用特有相关 */ "quickapp" : {}, /* 小程序特有相关 */ diff --git a/pages.json b/pages.json index c958ec23..e0124a7b 100644 --- a/pages.json +++ b/pages.json @@ -11,17 +11,6 @@ } } }, - { - "path": "pages/index/userInfo", - "style": { - "navigationBarTitleText": "资料", - "app-plus": { - "titleNView": { - "backgroundImage": "linear-gradient(to right, #477EFF, #39D9C9)" - } - } - } - }, { "path": "pages/card/card", "style": { @@ -164,6 +153,17 @@ } } }, + { + "path": "pages/me/userInfo", + "style": { + "navigationBarTitleText": "资料", + "app-plus": { + "titleNView": { + "backgroundImage": "linear-gradient(to right, #477EFF, #39D9C9)" + } + } + } + }, { "path": "pages/score/score", "style": { @@ -216,6 +216,90 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } + }, + { + "path": "pages/setting/setting", + "style": { + "navigationBarTitleText": "设置", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "backgroundImage": "linear-gradient(to right, #477EFF, #39D9C9)" + } + } + } + }, + { + "path": "pages/setting/password", + "style": { + "navigationBarTitleText": "修改密码", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "backgroundImage": "linear-gradient(to right, #477EFF, #39D9C9)" + } + } + } + }, + { + "path": "pages/setting/email", + "style": { + "navigationBarTitleText": "绑定邮箱", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "backgroundImage": "linear-gradient(to right, #477EFF, #39D9C9)" + } + } + } + }, + { + "path": "pages/setting/phone", + "style": { + "navigationBarTitleText": "绑定手机号", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "backgroundImage": "linear-gradient(to right, #477EFF, #39D9C9)" + } + } + } + }, + { + "path": "pages/devices/devices", + "style": { + "navigationBarTitleText": "蓝牙搜索", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "backgroundImage": "linear-gradient(to right, #477EFF, #39D9C9)" + } + } + } + }, + { + "path": "pages/devices/G02", + "style": { + "navigationBarTitleText": "测量", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "backgroundImage": "linear-gradient(to right, #477EFF, #39D9C9)" + } + } + } + }, + { + "path": "pages/business/business", + "style": { + "navigationBarTitleText": "设备管理", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "backgroundImage": "linear-gradient(to right, #477EFF, #39D9C9)" + } + } + } } ], "globalStyle": { @@ -240,6 +324,11 @@ "iconPath": "static/ping.png", "selectedIconPath": "static/ping2.png", "text": "估分" + }, { + "pagePath": "pages/business/business", + "iconPath": "static/shou.png", + "selectedIconPath": "static/shou2.png", + "text": "设备" }, { "pagePath": "pages/me/me", diff --git a/pages/body/components/charts.vue b/pages/body/components/charts.vue index 2e94f36f..41ddf9e8 100644 --- a/pages/body/components/charts.vue +++ b/pages/body/components/charts.vue @@ -4,17 +4,21 @@ - + + ~ - + + @@ -132,17 +136,17 @@ handStartTimeH(e) { let that = this if (that.endTime) { - if (Date.parse(e.target.value) > Date.parse(that.endTime)) { + if (Date.parse(e) > Date.parse(that.endTime)) { that.$tools.msg("请选择正确的时间") return } } else { - if (Date.parse(e.target.value) > Date.parse(that.endDate)) { + if (Date.parse(e) > Date.parse(that.endDate)) { that.$tools.msg("请选择正确的时间") return } } - that.startTime = e.target.value + that.startTime = e let endtime = that.endTime ? that.endTime : that.endDate that.$store.dispatch("GetBodyTrendList", { aud_id: that.user.id, @@ -155,20 +159,20 @@ handEndTimeH(e) { let that = this if (that.startTime) { - if (Date.parse(e.target.value) < Date.parse(that.startTime)) { + if (Date.parse(e) < Date.parse(that.startTime)) { that.$tools.msg("请选择正确的时间") return } } else { - if (Date.parse(e.target.value) < Date.parse(that.startDate)) { + if (Date.parse(e) < Date.parse(that.startDate)) { that.$tools.msg("请选择正确的时间") return } } - that.endTime = e.target.value + that.endTime = e let startTime = that.startTime ? that.startTime : that.startDate that.$store.dispatch("GetBodyTrendList", { - aud_id: that.user.id, + aud_id: uni.getStorageSync('userid'), s_time: startTime, e_time: that.endTime }) diff --git a/pages/body/components/report.vue b/pages/body/components/report.vue index 32599615..80e4816c 100644 --- a/pages/body/components/report.vue +++ b/pages/body/components/report.vue @@ -43,7 +43,7 @@ 手动记录 - + 连接设备 @@ -113,7 +113,7 @@ data() { return { infoList: [], - infoListTop:{} + infoListTop: {} } }, props: { diff --git a/pages/login/register.vue b/pages/business/business.vue similarity index 100% rename from pages/login/register.vue rename to pages/business/business.vue diff --git a/pages/card/card.vue b/pages/card/card.vue index 921f4aad..7035a058 100644 --- a/pages/card/card.vue +++ b/pages/card/card.vue @@ -33,6 +33,8 @@ + 保存卡片 + @@ -69,6 +71,9 @@ that.$store.dispatch('getUserInfo', { aud_id: that.user.id }) + uni.switchTab({ + url: "/pages/index/index" + }) }).catch(err => {}) }, @@ -77,14 +82,14 @@ let that = this that.cardList.user.splice(index, 1) that.cardList.all.push(item) - that.handleGradeList() + // that.handleGradeList() }, // 添加已有的卡片 addCard(item, index) { let that = this that.cardList.all.splice(index, 1) that.cardList.user.push(item) - that.handleGradeList() + // that.handleGradeList() }, } } @@ -148,4 +153,10 @@ } } } + + .btn { + width: auto; + margin: 40px 15px 0; + background: $btncolor !important; + } \ No newline at end of file diff --git a/pages/compk/pkdetail.vue b/pages/compk/pkdetail.vue index babda56d..db7cccd2 100644 --- a/pages/compk/pkdetail.vue +++ b/pages/compk/pkdetail.vue @@ -8,7 +8,7 @@ {{memInfo.name?memInfo.name:memInfo.nickname}} 性别:{{memInfo.gender=='0'?'未知':memInfo.gender=='1'?'男':'女'}} - 年龄:{{user.age}}岁 + 年龄:{{user.age}}岁 diff --git a/pages/devices/G02.vue b/pages/devices/G02.vue new file mode 100644 index 00000000..721d2d8c --- /dev/null +++ b/pages/devices/G02.vue @@ -0,0 +1,270 @@ + + + + + \ No newline at end of file diff --git a/pages/devices/devices.vue b/pages/devices/devices.vue new file mode 100644 index 00000000..af23437e --- /dev/null +++ b/pages/devices/devices.vue @@ -0,0 +1,461 @@ + + + + + \ No newline at end of file diff --git a/pages/history/history.vue b/pages/history/history.vue index 5cffe19b..b6c2eb5a 100644 --- a/pages/history/history.vue +++ b/pages/history/history.vue @@ -1,10 +1,10 @@