修改ios17.0版本My蓝牙搜索不到问题
This commit is contained in:
parent
0696de4515
commit
fc5c8f3ef4
|
|
@ -26,18 +26,24 @@
|
||||||
<view class="btnGroup">
|
<view class="btnGroup">
|
||||||
<view class="wxbtn" v-if="iswxphone">
|
<view class="wxbtn" v-if="iswxphone">
|
||||||
<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-if="value==1">
|
<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-if="value==1">
|
||||||
<view><image src="../../static/phone.png"></image></view>
|
<view>
|
||||||
|
<image src="../../static/phone.png"></image>
|
||||||
|
</view>
|
||||||
<text>手机号快捷登录</text>
|
<text>手机号快捷登录</text>
|
||||||
</button>
|
</button>
|
||||||
<button v-else @click="handleIsTel">
|
<button v-else @click="handleIsTel">
|
||||||
<view><image src="../../static/phone.png"></image></view>
|
<view>
|
||||||
|
<image src="../../static/phone.png"></image>
|
||||||
|
</view>
|
||||||
<text>手机号快捷登录</text>
|
<text>手机号快捷登录</text>
|
||||||
</button>
|
</button>
|
||||||
</view>
|
</view>
|
||||||
<view class="xieyi">
|
<view class="xieyi">
|
||||||
<checkbox-group @change="checkboxChange" class="group">
|
<checkbox-group @change="checkboxChange" class="group">
|
||||||
<checkbox :value="1" style="transform:scale(0.7)" />同意{{configBox.title}}<text
|
<label>
|
||||||
@click="handlexieyi">《个人信息保护政策》</text>
|
<checkbox :value="1" style="transform:scale(0.7)" />同意{{configBox.title}}
|
||||||
|
<text @click="handlexieyi" @click.stop>《个人信息保护政策》</text>
|
||||||
|
</label>
|
||||||
</checkbox-group>
|
</checkbox-group>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -276,11 +282,17 @@
|
||||||
line-height: 35px;
|
line-height: 35px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 10px;
|
left: 10px;
|
||||||
right: 120px;
|
right: 0px;
|
||||||
z-index: 88;
|
z-index: 88;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.yanzhengma {
|
||||||
|
input {
|
||||||
|
right: 120px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.btnlogin {
|
.btnlogin {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin: 20px 0;
|
margin: 20px 0;
|
||||||
|
|
|
||||||
|
|
@ -200,16 +200,17 @@
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (device.name.indexOf("My") != -1) {
|
if (device.name.indexOf("My") != -1) {
|
||||||
console.log("My01", device.name.indexOf('My'))
|
|
||||||
clearTimeout(myTime);
|
clearTimeout(myTime);
|
||||||
let buff = device.advertisData.slice(-6)
|
let buff = device.advertisData.slice(-6)
|
||||||
device.mac = new Uint8Array(buff) // 保存广播数据中的mac地址,这是由于iOS不直接返回mac地址
|
device.mac = new Uint8Array(buff) // 保存广播数据中的mac地址,这是由于iOS不直接返回mac地址
|
||||||
let tempMac = Array.from(device.mac)
|
let tempMac = Array.from(device.mac)
|
||||||
device.macAddr = that.$tools.ab2hex(tempMac, ':').toUpperCase()
|
device.macAddr = that.$tools.ab2hex(tempMac, ':').toUpperCase()
|
||||||
|
if (device.macAddr != "") {
|
||||||
that.handleDevice(device)
|
that.handleDevice(device)
|
||||||
|
}
|
||||||
|
console.log("My", device)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// console.log("设备列表", that.devicesList)
|
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
that.handleMyTime()
|
that.handleMyTime()
|
||||||
|
|
@ -249,6 +250,7 @@
|
||||||
weight: 0,
|
weight: 0,
|
||||||
imp: 0
|
imp: 0
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
|
console.log("2222", res)
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
res.data.deviceId = sn
|
res.data.deviceId = sn
|
||||||
that.devList.push(res.data);
|
that.devList.push(res.data);
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1758,7 +1758,7 @@ function initData(vueOptions, context) {
|
||||||
try {
|
try {
|
||||||
data = data.call(context); // 支持 Vue.prototype 上挂的数据
|
data = data.call(context); // 支持 Vue.prototype 上挂的数据
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"成人","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
|
if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"成人","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
|
||||||
console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data);
|
console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -8801,7 +8801,7 @@ function type(obj) {
|
||||||
|
|
||||||
function flushCallbacks$1(vm) {
|
function flushCallbacks$1(vm) {
|
||||||
if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
|
if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
|
||||||
if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"成人","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
|
if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"成人","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
|
||||||
var mpInstance = vm.$scope;
|
var mpInstance = vm.$scope;
|
||||||
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
|
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
|
||||||
']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
|
']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
|
||||||
|
|
@ -8822,14 +8822,14 @@ function nextTick$1(vm, cb) {
|
||||||
//1.nextTick 之前 已 setData 且 setData 还未回调完成
|
//1.nextTick 之前 已 setData 且 setData 还未回调完成
|
||||||
//2.nextTick 之前存在 render watcher
|
//2.nextTick 之前存在 render watcher
|
||||||
if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
|
if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
|
||||||
if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"成人","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
|
if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"成人","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
|
||||||
var mpInstance = vm.$scope;
|
var mpInstance = vm.$scope;
|
||||||
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
|
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
|
||||||
']:nextVueTick');
|
']:nextVueTick');
|
||||||
}
|
}
|
||||||
return nextTick(cb, vm)
|
return nextTick(cb, vm)
|
||||||
}else{
|
}else{
|
||||||
if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"成人","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
|
if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"成人","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
|
||||||
var mpInstance$1 = vm.$scope;
|
var mpInstance$1 = vm.$scope;
|
||||||
console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
|
console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
|
||||||
']:nextMPTick');
|
']:nextMPTick');
|
||||||
|
|
@ -8925,7 +8925,7 @@ var patch = function(oldVnode, vnode) {
|
||||||
});
|
});
|
||||||
var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
|
var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
|
||||||
if (Object.keys(diffData).length) {
|
if (Object.keys(diffData).length) {
|
||||||
if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"成人","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
|
if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"成人","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
|
||||||
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
|
console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
|
||||||
']差量更新',
|
']差量更新',
|
||||||
JSON.stringify(diffData));
|
JSON.stringify(diffData));
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
<view class="content data-v-111bb4d3"><view class="top data-v-111bb4d3"><image src="{{configBox.logo}}" class="data-v-111bb4d3"></image><text class="data-v-111bb4d3">{{configBox.title}}</text></view><view class="edit data-v-111bb4d3"><view class="ts data-v-111bb4d3"><view class="data-v-111bb4d3">短信验证码登录</view></view><view class="editem data-v-111bb4d3"><view class="input data-v-111bb4d3"><input class="uni-input data-v-111bb4d3" placeholder="请输入手机号" data-event-opts="{{[['input',[['__set_model',['','phone','$event',[]]]]]]}}" value="{{phone}}" bindinput="__e"/></view><view class="input yanzheng data-v-111bb4d3"><view class="yanzhengma data-v-111bb4d3"><input class="uni-input data-v-111bb4d3" placeholder="请输入验证码" data-event-opts="{{[['input',[['__set_model',['','code','$event',[]]]]]]}}" value="{{code}}" bindinput="__e"/></view><button class="code data-v-111bb4d3" type="none" disabled="{{disabled}}" value="{{codeInfo}}" data-event-opts="{{[['tap',[['handleCode',['$event']]]],['input',[['__set_model',['','codeInfo','$event',[]]]]]]}}" bindtap="__e" bindinput="__e">{{(second<60?second+'S后重发':'获取验证码')+''}}</button></view></view><view data-event-opts="{{[['tap',[['handleTelLogin',['$event']]]]]}}" class="btnlogin data-v-111bb4d3" bindtap="__e">登录</view></view><view class="btnGroup data-v-111bb4d3"><block wx:if="{{iswxphone}}"><view class="wxbtn data-v-111bb4d3"><block wx:if="{{value==1}}"><button open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e" class="data-v-111bb4d3"><view class="data-v-111bb4d3"><image src="../../static/phone.png" class="data-v-111bb4d3"></image></view><text class="data-v-111bb4d3">手机号快捷登录</text></button></block><block wx:else><button data-event-opts="{{[['tap',[['handleIsTel',['$event']]]]]}}" bindtap="__e" class="data-v-111bb4d3"><view class="data-v-111bb4d3"><image src="../../static/phone.png" class="data-v-111bb4d3"></image></view><text class="data-v-111bb4d3">手机号快捷登录</text></button></block></view></block><view class="xieyi data-v-111bb4d3"><checkbox-group data-event-opts="{{[['change',[['checkboxChange',['$event']]]]]}}" class="group data-v-111bb4d3" bindchange="__e"><checkbox style="transform:scale(0.7);" value="{{1}}" class="data-v-111bb4d3"></checkbox>{{"同意"+configBox.title}}<text data-event-opts="{{[['tap',[['handlexieyi',['$event']]]]]}}" bindtap="__e" class="data-v-111bb4d3">《个人信息保护政策》</text></checkbox-group></view></view></view>
|
<view class="content data-v-111bb4d3"><view class="top data-v-111bb4d3"><image src="{{configBox.logo}}" class="data-v-111bb4d3"></image><text class="data-v-111bb4d3">{{configBox.title}}</text></view><view class="edit data-v-111bb4d3"><view class="ts data-v-111bb4d3"><view class="data-v-111bb4d3">短信验证码登录</view></view><view class="editem data-v-111bb4d3"><view class="input data-v-111bb4d3"><input class="uni-input data-v-111bb4d3" placeholder="请输入手机号" data-event-opts="{{[['input',[['__set_model',['','phone','$event',[]]]]]]}}" value="{{phone}}" bindinput="__e"/></view><view class="input yanzheng data-v-111bb4d3"><view class="yanzhengma data-v-111bb4d3"><input class="uni-input data-v-111bb4d3" placeholder="请输入验证码" data-event-opts="{{[['input',[['__set_model',['','code','$event',[]]]]]]}}" value="{{code}}" bindinput="__e"/></view><button class="code data-v-111bb4d3" type="none" disabled="{{disabled}}" value="{{codeInfo}}" data-event-opts="{{[['tap',[['handleCode',['$event']]]],['input',[['__set_model',['','codeInfo','$event',[]]]]]]}}" bindtap="__e" bindinput="__e">{{(second<60?second+'S后重发':'获取验证码')+''}}</button></view></view><view data-event-opts="{{[['tap',[['handleTelLogin',['$event']]]]]}}" class="btnlogin data-v-111bb4d3" bindtap="__e">登录</view></view><view class="btnGroup data-v-111bb4d3"><block wx:if="{{iswxphone}}"><view class="wxbtn data-v-111bb4d3"><block wx:if="{{value==1}}"><button open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e" class="data-v-111bb4d3"><view class="data-v-111bb4d3"><image src="../../static/phone.png" class="data-v-111bb4d3"></image></view><text class="data-v-111bb4d3">手机号快捷登录</text></button></block><block wx:else><button data-event-opts="{{[['tap',[['handleIsTel',['$event']]]]]}}" bindtap="__e" class="data-v-111bb4d3"><view class="data-v-111bb4d3"><image src="../../static/phone.png" class="data-v-111bb4d3"></image></view><text class="data-v-111bb4d3">手机号快捷登录</text></button></block></view></block><view class="xieyi data-v-111bb4d3"><checkbox-group data-event-opts="{{[['change',[['checkboxChange',['$event']]]]]}}" class="group data-v-111bb4d3" bindchange="__e"><label class="data-v-111bb4d3"><checkbox style="transform:scale(0.7);" value="{{1}}" class="data-v-111bb4d3"></checkbox>{{"同意"+configBox.title+''}}<text data-event-opts="{{[['tap',[['handlexieyi',['$event']],['',['$event']]]]]}}" catchtap="__e" class="data-v-111bb4d3">《个人信息保护政策》</text></label></checkbox-group></view></view></view>
|
||||||
|
|
@ -86,9 +86,12 @@
|
||||||
line-height: 35px;
|
line-height: 35px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 10px;
|
left: 10px;
|
||||||
right: 120px;
|
right: 0px;
|
||||||
z-index: 88;
|
z-index: 88;
|
||||||
}
|
}
|
||||||
|
.edit .yanzhengma input.data-v-111bb4d3 {
|
||||||
|
right: 120px;
|
||||||
|
}
|
||||||
.edit .btnlogin.data-v-111bb4d3 {
|
.edit .btnlogin.data-v-111bb4d3 {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
margin: 20px 0;
|
margin: 20px 0;
|
||||||
|
|
|
||||||
|
|
@ -342,19 +342,19 @@ var _default = {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (device.name.indexOf("My") != -1) {
|
if (device.name.indexOf("My") != -1) {
|
||||||
console.log("My01", device.name.indexOf('My'));
|
|
||||||
clearTimeout(myTime);
|
clearTimeout(myTime);
|
||||||
var _buff6 = device.advertisData.slice(-6);
|
var _buff6 = device.advertisData.slice(-6);
|
||||||
device.mac = new Uint8Array(_buff6); // 保存广播数据中的mac地址,这是由于iOS不直接返回mac地址
|
device.mac = new Uint8Array(_buff6); // 保存广播数据中的mac地址,这是由于iOS不直接返回mac地址
|
||||||
var _tempMac6 = Array.from(device.mac);
|
var _tempMac6 = Array.from(device.mac);
|
||||||
device.macAddr = that.$tools.ab2hex(_tempMac6, ':').toUpperCase();
|
device.macAddr = that.$tools.ab2hex(_tempMac6, ':').toUpperCase();
|
||||||
|
if (device.macAddr != "") {
|
||||||
that.handleDevice(device);
|
that.handleDevice(device);
|
||||||
|
}
|
||||||
|
console.log("My", device);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// console.log("设备列表", that.devicesList)
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
that.handleMyTime();
|
that.handleMyTime();
|
||||||
},
|
},
|
||||||
handleDevice: function handleDevice(device) {
|
handleDevice: function handleDevice(device) {
|
||||||
|
|
@ -392,6 +392,7 @@ var _default = {
|
||||||
weight: 0,
|
weight: 0,
|
||||||
imp: 0
|
imp: 0
|
||||||
}).then(function (res) {
|
}).then(function (res) {
|
||||||
|
console.log("2222", res);
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
res.data.deviceId = sn;
|
res.data.deviceId = sn;
|
||||||
that.devList.push(res.data);
|
that.devList.push(res.data);
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
},
|
},
|
||||||
"compileType": "miniprogram",
|
"compileType": "miniprogram",
|
||||||
"libVersion": "",
|
"libVersion": "",
|
||||||
"appid": "wxd230a93791c03259",
|
"appid": "wx3e83b37ba682faf5",
|
||||||
"projectname": "成人",
|
"projectname": "成人",
|
||||||
"condition": {
|
"condition": {
|
||||||
"search": {
|
"search": {
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "",
|
"name": "",
|
||||||
"pathName": "BLEPages/child/B03B",
|
"pathName": "/BLEPages/child/H01pro",
|
||||||
"query": "",
|
"query": "",
|
||||||
"launchMode": "default",
|
"launchMode": "default",
|
||||||
"scene": null
|
"scene": null
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue