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 @@
+
+
+
+ 连接中,请稍后
+ 连接成功,开始测量
+ 连接失败,点击重新连接
+ {{text}}
+
+
+
+
+ 提示:
+ 1.请确定设备已开机
+ 2.请确定手机蓝牙及位置信息已打开
+
+
+
+
+
+
+ 测量结果提示
+
+ 本次测量身高为:{{height}}
+
+
+ 上次测量体重为:kg
+
+ 取消
+ 保存测量结果
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+ 没有搜到想要的?点击重新搜索
+
+
+
+
+
+
+
+
+
+
+ {{item.macAddr}}
+
+
+
+ 提示:
+ 1.请确定设备已绑定
+ 2.请确定设备已开机
+ 3.请确定手机蓝牙及位置信息已打开
+
+
+
+
+
+
+
\ 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 @@
-
+
-
+
{{item.record_time}}
@@ -15,8 +15,7 @@
{{item.v3}}{{item.v3_name}}
+ :color="isActive==item.id?'#FEC407':'#dfdfdf'">
@@ -51,14 +50,15 @@
ranklist: [],
page: 1,
type: "add",
- lastPage: 1,
+ lastPage: '',
isActive: null,
- acd_id: ""
+ acd_id: "",
}
},
onLoad(options) {
let that = this
that.acd_id = options.acd_id
+ that.type = options.type ? options.type : 'add'
that.getList()
},
onReachBottom() {
@@ -106,9 +106,11 @@
clickItemMethod(item) {
let that = this
if (that.acd_id == "6") return
- uni.navigateTo({
- url: "/pages/history/historyDetail?type=" + that.acd_id + '&id=' + item.id
- })
+ if (that.type == 'add') {
+ uni.navigateTo({
+ url: "/pages/history/historyDetail?type=" + that.acd_id + '&id=' + item.id
+ })
+ }
},
getList(page) {
@@ -134,7 +136,8 @@
})
},
handleEdit(id) {
- this.isActive = id
+ let that = this
+ that.isActive = that.isActive == id ? null : id
},
}
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e1dd10dc..f89c1b3b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,13 +1,13 @@
-
+
-
-
+
+
{{item.card_name}}{{item.record_time}}
@@ -24,10 +24,7 @@
-
-
-
+ 蓝牙连接
手动记录
@@ -83,9 +80,9 @@
headerIndex
},
computed: {
- ...mapState(["user"]),
+ ...mapState(["user", "familayList"]),
},
- onLoad() {
+ onLoad(options) {
let that = this
let systemInfo = uni.getSystemInfoSync();
this.isAndroid = systemInfo.platform.toLowerCase() === 'android';
@@ -104,7 +101,9 @@
this.$i18n.locale = e.code;
}
})
- that.handleUserList()
+ if (options && options.type == 1) {
+ that.handleUserList()
+ }
},
methods: {
// 成员列表
@@ -113,7 +112,7 @@
that.$model.getUserList({
type: 2
}).then(res => {
- console.log("用户列表", res)
+ console.log("用户列表", res, uni.getStorageSync('userid'))
if (res.code != 0) {
that.$tools.msg(res.msg)
return
@@ -121,14 +120,17 @@
that.$store.commit('changeFamilay', res.data)
if (res.data.length) {
that.$store.dispatch('getUserInfo', {
- aud_id:uni.getStorageSync('userid')?uni.getStorageSync('userid'): res.data[0].id
+ aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : res.data[
+ 0].id
})
that.$store.dispatch("getCardList", {
- aud_id:uni.getStorageSync('userid')?uni.getStorageSync('userid'): res.data[0].id
+ aud_id: uni.getStorageSync('userid') ? uni.getStorageSync('userid') : res.data[
+ 0].id
})
}
}).catch(err => {})
},
+
// 设置数据页卡片
handleCard() {
uni.navigateTo({
@@ -138,7 +140,7 @@
// 报告页
handlerReport(item) {
uni.navigateTo({
- url: "/pages/" + item.card_key + '/' + item.card_key + "?acd_id=" + item.acd_id
+ url: item.page_url_report + "?acd_id = " + item.acd_id
})
},
// 手动添加
diff --git a/pages/login/forgetPassword.vue b/pages/login/forgetPassword.vue
index 8e54c249..002ebf3e 100644
--- a/pages/login/forgetPassword.vue
+++ b/pages/login/forgetPassword.vue
@@ -1,6 +1,6 @@
-
+
@@ -31,17 +31,16 @@
-
+
确认
-
@@ -55,7 +54,7 @@
password2: "",
disabled: false,
second: 60,
- value: 0,
+ value: 1,
type: ""
}
},
@@ -70,7 +69,6 @@
handleTelLogin() {
let that = this
let phoneType = that.phone.indexOf("@") !== -1
- console.log("phoneType", phoneType)
if (that.value == 0) {
that.$tools.msg("请先确认勾选协议")
return
@@ -115,22 +113,24 @@
}
uni.setStorageSync('token', res.data.token)
uni.setStorageSync('aan_id', res.data.aan_id)
+ that.$tools.msg("设置成功,进入程序中")
setTimeout(function() {
uni.switchTab({
- url: "/pages/index/index"
+ url: "/pages/index/index?type=1"
})
- }, 2000)
+ }, 1000)
}).catch(err => {})
},
// 获取验证码
handleCode() {
let that = this
- if (!that.phone) {
- that.$tools.msg(that.$t("login.phonetip"))
+ let phoneType = that.phone.indexOf("@") !== -1
+ if (!phoneType && !(/^1[3456789]\d{9}$/.test(that.phone))) {
+ that.$tools.msg("请输入正确的手机号")
return
}
- if (!(/^1[3456789]\d{9}$/.test(that.phone))) {
- that.$tools.msg(that.$t("login.phonetipsTwo"))
+ if (phoneType && !(/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(that.phone))) {
+ that.$tools.msg("请输入正确的邮箱")
return
}
//
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 316ca460..1bbb3f08 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,10 +1,14 @@
+
+
+ 青测
+
{{$t("login.title")}}
- 切换登录
+ 切换登录
@@ -28,18 +32,18 @@
密码
- 忘记密码?
+ 忘记密码?
-
+
{{$t("login.btn")}}
{{$t("login.register")}}
@@ -58,7 +62,7 @@
password: "",
disabled: false,
second: 60,
- value: 0,
+ value: 1,
isCode: true,
}
},
@@ -70,7 +74,6 @@
handleTelLogin() {
let that = this
let phoneType = that.phone.indexOf("@") !== -1
- console.log("phoneType", phoneType)
if (that.value == 0) {
that.$tools.msg("请先确认勾选协议")
return
@@ -101,24 +104,26 @@
that.$tools.msg(res.msg)
return
}
+ that.$tools.msg("登录成功,进入程序中")
uni.setStorageSync('token', res.data.token)
uni.setStorageSync('aan_id', res.data.aan_id)
setTimeout(function() {
uni.reLaunch({
- url: "/pages/index/index"
+ url: "/pages/index/index?type=1"
})
- }, 3000)
+ }, 1000)
}).catch(err => {})
},
// 获取验证码
handleCode() {
let that = this
- if (!that.phone) {
- that.$tools.msg(that.$t("login.phonetip"))
+ let phoneType = that.phone.indexOf("@") !== -1
+ if (!phoneType && !(/^1[3456789]\d{9}$/.test(that.phone))) {
+ that.$tools.msg("请输入正确的手机号")
return
}
- if (!(/^1[3456789]\d{9}$/.test(that.phone))) {
- that.$tools.msg(that.$t("login.phonetipsTwo"))
+ if (phoneType && !(/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(that.phone))) {
+ that.$tools.msg("请输入正确的邮箱")
return
}
//
@@ -164,10 +169,10 @@
.content {
width: 100%;
height: 100vh;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
+ // display: flex;
+ // flex-direction: column;
+ // align-items: center;
+ // justify-content: center;
}
.bg {
@@ -179,16 +184,42 @@
background: $maincolor;
}
+ .top {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ justify-content: center;
+ position: relative;
+ top: 80px;
+ z-index: 99;
+
+ image {
+ width: 70px;
+ height: 70px;
+ margin: auto;
+ margin-bottom: 10px;
+ border-radius: 50%;
+ }
+
+ text {
+ display: block;
+ width: 100%;
+ text-align: center;
+ }
+ }
+
.login {
- width: 75%;
+ width: 86%;
height: auto;
background: #fff;
border-radius: 10px;
- padding: 10px 15px;
+ padding: 10px 0;
background-color: #fff;
z-index: 99;
- position: relative;
- margin-left: calc(10% - 40px);
+ position: absolute;
+ left: 7%;
+ top: 28%;
box-shadow: 0px 1px 5px 2px #dfe2e1fc;
.title {
@@ -197,6 +228,7 @@
font-size: 40rpx;
font-weight: bold;
margin-bottom: 15px;
+ margin-left: 15px;
}
.toggle {
@@ -210,6 +242,7 @@
display: flex;
align-items: center;
font-size: 28rpx;
+ margin: 0 15px;
justify-content: space-between;
flex-wrap: wrap;
@@ -274,10 +307,10 @@
}
.btngroup {
- width: 100%;
height: 35px;
line-height: 35px;
display: flex;
+ margin: 0 15px;
justify-content: center;
text {
@@ -287,8 +320,8 @@
}
.btnlogin {
- width: 100%;
- margin: 15px 0;
+ width: calc(100% - 30px);
+ margin: 15px;
height: 42px;
line-height: 42px;
background: $btncolor;
@@ -302,6 +335,7 @@
.xieyi {
font-size: 12px;
color: $textcolor;
+ margin-left: 10px;
text {
border-bottom: 1px solid $textcolor;
diff --git a/pages/me/manage.vue b/pages/me/manage.vue
index 279a16de..f6d28654 100644
--- a/pages/me/manage.vue
+++ b/pages/me/manage.vue
@@ -13,7 +13,7 @@
{{item.gender==1?'男':'女'}}
- {{item.birthday}}
+ {{item.age}}岁
@@ -60,7 +60,7 @@
if (res.code != 0) return
that.$tools.msg("删除成功!");
that.familayList.splice(ind, 1)
- that.$store.commit('changeFamilay', that.familayList)
+ that.handleUserList()
})
} else if (res.cancel) {
that.$tools.msg("您已取消删除!");
@@ -68,16 +68,36 @@
}
});
},
+ handleUserList() {
+ let that = this
+ that.$model.getUserList({
+ type: 2
+ }).then(res => {
+ if (res.code != 0) {
+ that.$tools.msg(res.msg)
+ return
+ }
+ that.$store.commit('changeFamilay', res.data)
+ if (res.data.length) {
+ that.$store.dispatch('getUserInfo', {
+ aud_id: res.data[0].id
+ })
+ that.$store.dispatch("getCardList", {
+ aud_id: res.data[0].id
+ })
+ }
+ }).catch(err => {})
+ },
//编辑
editorInfo(item) {
uni.navigateTo({
- url: "/pages/index/userInfo?info=" + JSON.stringify(item)
+ url: "/pages/me/userInfo?info=" + JSON.stringify(item)
})
},
//添加
handleAddUser() {
uni.navigateTo({
- url: "/pages/index/userInfo"
+ url: "/pages/me/userInfo"
})
},
}
diff --git a/pages/me/me.vue b/pages/me/me.vue
index e8deb4b4..bd1c6682 100644
--- a/pages/me/me.vue
+++ b/pages/me/me.vue
@@ -1,13 +1,19 @@
-
+
+
+
+ {{user.nickname}}
+
+
+
- 用户管理
+ 成员管理
@@ -34,7 +40,7 @@
-
+
退出登录
\ No newline at end of file
diff --git a/pages/score/score.vue b/pages/score/score.vue
index a02713b3..1e5fd0ec 100644
--- a/pages/score/score.vue
+++ b/pages/score/score.vue
@@ -4,145 +4,258 @@
-
-
+ 本次估分成绩为
+
+
-
+ {{score?score:'--'}}
+ 估分历史
+
-
-
-
-
-
-
- {{ite.name}}
-
-
-
-
+
+ {{item.name}}
+
+
+
+ {{ite.name}}
+ 切换项目
-
-
-
-
- 身高(cm)
-
-
- {{ite.height?ite.height:0}}
-
+
+ {{it.name}}
+
+
+
+
+
+
+
+
+
+ {{it.value?it.value:'请选择'}}
+
+
+
+
+ {{it.unit}}
-
-
- 体重(kg)
-
-
- {{ite.Weight?ite.Weight:0}}
-
-
-
-
- BMI
-
- {{ite.BMI?ite.BMI:0}}
-
-
-
-
-
-
-
-
- 本次数据({{ite.unit}})
-
- {{ite.cnt?ite.cnt:0}}
-
-
-
+
+ {{it.value}}{{it.unit}}
+ {{it.proportion_value}}
- 开始估分
+ 重新估分
+ 开始估分
-
+
+
+
+
+ 请选择
+
+
+
+
+ {{item.name}}
+
+
+
+ 取消
+ 确定
+
+
+
+
\ No newline at end of file
diff --git a/pages/setting/password.vue b/pages/setting/password.vue
new file mode 100644
index 00000000..1af95fe5
--- /dev/null
+++ b/pages/setting/password.vue
@@ -0,0 +1,139 @@
+
+
+
+
+
+ 密码
+
+
+
+
+
+ 确认密码
+
+
+
+
+
+ 确认
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/setting/phone.vue b/pages/setting/phone.vue
new file mode 100644
index 00000000..70ed6374
--- /dev/null
+++ b/pages/setting/phone.vue
@@ -0,0 +1,209 @@
+
+
+
+
+
+ 手机号
+
+
+
+
+
+ 验证码
+
+
+
+
+
+
+ 确认
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
new file mode 100644
index 00000000..a0a86564
--- /dev/null
+++ b/pages/setting/setting.vue
@@ -0,0 +1,116 @@
+
+
+
+ 头像
+
+
+
+ 昵称
+
+ {{user.nickname}}
+
+
+
+
+
+ 手机号
+
+ {{user.my_tel}}
+
+
+
+
+ 邮箱
+
+ {{user.my_email}}
+
+
+
+
+ 设置密码
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/skip/skip.vue b/pages/skip/skip.vue
index db7eae11..31b60265 100644
--- a/pages/skip/skip.vue
+++ b/pages/skip/skip.vue
@@ -2,7 +2,7 @@
-
+ 设备连接
今日个数{{info?info.today_jump_num:'--'}}
今日时长{{info?info.today_jump_time:'--'}}
@@ -10,11 +10,11 @@
-
+
{{info?info.last_record_time:'--'}}
@@ -161,7 +161,6 @@