diff --git a/api/common/login.js b/api/common/login.js index 960fb0e..62ce6a6 100644 --- a/api/common/login.js +++ b/api/common/login.js @@ -4,7 +4,8 @@ export function login(data) { return request({ url: '/app/auth/login', method: 'POST', - data: data + data: data, + isAuthen:false }) } // 注册发送验证码 diff --git a/config/index.js b/config/index.js index 6ec3377..5459c4c 100644 --- a/config/index.js +++ b/config/index.js @@ -2,7 +2,7 @@ const config = { // 开发环境 development: { - BASE_URL: 'http://192.168.110.57:8000',//http://139.224.253.23:8000 + BASE_URL: 'http://139.224.253.23:8000',//http://139.224.253.23:8000 API_PREFIX: '', // MQTT 配置 MQTT_HOST: 'www.cnxhyc.com', diff --git a/manifest.json b/manifest.json index 6dadd96..ffa9fe6 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "星汉物联", "appid" : "__UNI__A21EF43", "description" : "设备管控", - "versionName" : "1.0.12", + "versionName" : "1.0.13", "versionCode" : "100", "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages/018A/HBY018A.vue b/pages/018A/HBY018A.vue index d91775e..bcb5419 100644 --- a/pages/018A/HBY018A.vue +++ b/pages/018A/HBY018A.vue @@ -95,7 +95,7 @@ - + diff --git a/pages/100/HBY100.vue b/pages/100/HBY100.vue index e25470a..eff28dd 100644 --- a/pages/100/HBY100.vue +++ b/pages/100/HBY100.vue @@ -223,25 +223,30 @@ - - 产品信息 - - - - 产品参数 - - - - 操作说明 - - - - 操作视频 - + + + + + + + 产品信息 + + + + 产品参数 + + + + 操作说明 + + + + 操作视频 - - + + + - + - + - diff --git a/pages/102/HBY102.vue b/pages/102/HBY102.vue index 4379aef..0e779f9 100644 --- a/pages/102/HBY102.vue +++ b/pages/102/HBY102.vue @@ -147,7 +147,7 @@ - + diff --git a/pages/6107/BJQ6107.vue b/pages/6107/BJQ6107.vue index 609be9a..d8995ed 100644 --- a/pages/6107/BJQ6107.vue +++ b/pages/6107/BJQ6107.vue @@ -183,7 +183,7 @@ - + diff --git a/utils/BleHelper.js b/utils/BleHelper.js index 7e42bc8..18ae9e1 100644 --- a/utils/BleHelper.js +++ b/utils/BleHelper.js @@ -775,7 +775,7 @@ class BleHelper { str: str, hexs: hexs }; - // console.log("监听到特征值:" + JSON.stringify(recData)); + console.log("监听到特征值:" + JSON.stringify(recData)); if (this.cfg.receivDataCallback) { if (this.cfg.receivDataCallback.length > 0) { diff --git a/utils/request.js b/utils/request.js index a25cc90..1b50db0 100644 --- a/utils/request.js +++ b/utils/request.js @@ -48,8 +48,11 @@ const request = (options) => { reject(err); } }; - - if (!options.url.includes('/login')) { + //是否添加身份验证,undefined时默认需要 + if(options.isAuthen===undefined){ + options.isAuthen=true; + } + if (options.isAuthen) { const token = uni.getStorageSync('token'); const clientid = uni.getStorageSync('clientID'); if (token) {