diff --git a/config/index.js b/config/index.js index dfb50b2..93e0224 100644 --- a/config/index.js +++ b/config/index.js @@ -2,7 +2,7 @@ const config = { // 开发环境 development: { - BASE_URL: 'http://192.168.110.56:8000', + BASE_URL: 'https://www.cnxhyc.com/jq', API_PREFIX: '', // MQTT 配置 MQTT_HOST: 'www.cnxhyc.com', diff --git a/manifest.json b/manifest.json index 5e1e02f..b9a3e2f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "星汉物联", "appid" : "__UNI__A21EF43", "description" : "设备管控", - "versionName" : "1.0.3", + "versionName" : "1.0.4", "versionCode" : "100", "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages/670/HBY670.vue b/pages/670/HBY670.vue index 8bb9956..7a6dc83 100644 --- a/pages/670/HBY670.vue +++ b/pages/670/HBY670.vue @@ -591,8 +591,8 @@ that.formData.address = res.address; let personnelInfo = res.personnelInfo; if (personnelInfo) { - that.formData.company = personnelInfo.name; - that.formData.usrname = personnelInfo.unitName; + that.formData.company = personnelInfo.unitName; + that.formData.usrname = personnelInfo.name; that.formData.job = personnelInfo.position; that.formData.usrid = personnelInfo.code } @@ -2100,12 +2100,14 @@ } let requestSend = () => { + + let json = { deviceId: this.device.id, deviceImei: this.device.deviceImei ? this.device.deviceImei : this.formData.imei, - name: this.formData.company, - position: this.formData.usrname, - unitName: this.formData.job, + unitName: this.formData.company, + name: this.formData.usrname, + position: this.formData.job, code: this.formData.usrid }; api.sendUsr(json).then((res) => { @@ -2257,10 +2259,10 @@ // 发送下一个包 currentPacket++; - setTimeout(sendNextPacket, 2000); + setTimeout(sendNextPacket, 200); }).catch(err => { if (err.code == '10007') { - setTimeout(sendNextPacket,2000); + setTimeout(sendNextPacket,200); } else { requestSend(); } @@ -2282,7 +2284,7 @@ these.HoldYouHand("word transmit start", 120, f.deviceId, f.writeServiceId, f .wirteCharactId).then( () => { - setTimeout(sendText, 2000); + setTimeout(sendText, 200); }).catch((ex) => { requestSend(); // console.log("握手没有成功", ex); diff --git a/pages/common/user/index.vue b/pages/common/user/index.vue index aa5feb1..f44fb35 100644 --- a/pages/common/user/index.vue +++ b/pages/common/user/index.vue @@ -22,9 +22,14 @@ 隐私协议 + + + 版本更新 ({{appVersion}}) + + - 关于我们 ({{appVersion}}) + 关于我们 @@ -88,6 +93,25 @@ }, methods: { + //版本更新 + gotoAppStore(){ + let os=uni.getSystemInfoSync().platform; + let url='' + if(os==='ios'){ + url='https://apps.apple.com/cn/app/星汉物联/id6752555460' + } + + else if(os==='android'){ + url='https://www.pgyer.com/xhwl'; + } + + plus.runtime.openURL(url, (res) => { + uni.showToast({ + title: '打开失败', + icon: 'none' + }); + }); + }, // 取消 handleDisagree() { this.showAgreement = false, diff --git a/static/images/common/ver.png b/static/images/common/ver.png new file mode 100644 index 0000000..e282b6c Binary files /dev/null and b/static/images/common/ver.png differ diff --git a/utils/update.js b/utils/update.js index 41726bf..dbb7dee 100644 --- a/utils/update.js +++ b/utils/update.js @@ -62,7 +62,7 @@ function checkAndUpdateWgt(updateUrl) { appId: "xhyc" }, success: (res) => { - // console.log("res=>",res) + // console.log("res=>",res)//坑,404居然进success if (res.statusCode === 200) { res.type = '1'; resolve(res);