diff --git a/App.vue b/App.vue index 7c61dc98..e8dd25a9 100644 --- a/App.vue +++ b/App.vue @@ -17,7 +17,7 @@ console.log("getSystemInfo", e.platform) } }) - if (platform === 'ios') { // ios首次安装没有网络 + if (platform === 'ios') { // ios首次安装没有网络 uni.onNetworkStatusChange(function(res) { if (res.isConnected == true) { that.handleCityList() @@ -64,7 +64,7 @@ handleoginversion(info) { let that = this that.$model.getloginversion({}).then(res => { - console.log("小程序版本信息返回", res) + console.log("是否登录及版本号", res) that.handleCancelUpdate(res.code) // #ifdef APP-PLUS diff --git a/element/manuallyAdd/record.vue b/element/manuallyAdd/record.vue index 270ec45c..367c8d20 100644 --- a/element/manuallyAdd/record.vue +++ b/element/manuallyAdd/record.vue @@ -12,7 +12,7 @@ - + 项目 @@ -52,6 +52,9 @@ 个 + + + 身高 diff --git a/manifest.json b/manifest.json index f697f40d..20ccae19 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "Reedaw", "appid" : "__UNI__20604F1", "description" : "面向儿童青少年的健康体质测量APP", - "versionName" : "1.2.6", - "versionCode" : 126, + "versionName" : "1.2.7", + "versionCode" : 127, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pageTwo/devices/G02.vue b/pageTwo/devices/G02.vue index f191829a..8e244d65 100644 --- a/pageTwo/devices/G02.vue +++ b/pageTwo/devices/G02.vue @@ -241,7 +241,7 @@ deviceId: that.info.deviceId, success: res => { console.log('断开蓝牙连接成功'); - that.$store.commit("changeBluetooth", false); + that.$store.commit("changeConnected", false); } }); }, diff --git a/pageTwo/devices/PCL.vue b/pageTwo/devices/PCL.vue index a522fb99..dda52161 100644 --- a/pageTwo/devices/PCL.vue +++ b/pageTwo/devices/PCL.vue @@ -165,12 +165,17 @@ this.$tools.msg("请输入身高") return } + let weight = "" if (that.unit == "斤") { - that.weight = that.weight / 2 + weight = that.weight / 2 + }else if (that.unit == "lb") { + weight =Number(that.weight * 0.4536).toFixed(2) + }else{ + weight = that.weight } that.$model.getmeasurefunit({ adc: that.imp, - weight: that.weight, + weight: weight, height: that.height, aud_id: that.info.id }).then(res => { diff --git a/pageTwo/history/history.vue b/pageTwo/history/history.vue index 80fac702..6932db66 100644 --- a/pageTwo/history/history.vue +++ b/pageTwo/history/history.vue @@ -1,10 +1,9 @@