Compare commits
No commits in common. "19620542e6c68b710aa3aebd1535c9e44cc0fd0a" and "716e05aef25b38825f89619e8452dd9e088cca71" have entirely different histories.
19620542e6
...
716e05aef2
@ -4,9 +4,6 @@
|
|||||||
"version" : "0.0",
|
"version" : "0.0",
|
||||||
"configurations" : [
|
"configurations" : [
|
||||||
{
|
{
|
||||||
"app" : {
|
|
||||||
"launchtype" : "local"
|
|
||||||
},
|
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
"launchtype" : "remote"
|
"launchtype" : "remote"
|
||||||
},
|
},
|
||||||
@ -23,8 +20,7 @@
|
|||||||
"type" : "uniCloud"
|
"type" : "uniCloud"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"customPlaygroundType" : "device",
|
"playground" : "custom",
|
||||||
"playground" : "standard",
|
|
||||||
"type" : "uni-app:app-android"
|
"type" : "uni-app:app-android"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@ -34,8 +34,6 @@
|
|||||||
"minSdkVersion": 21,
|
"minSdkVersion": 21,
|
||||||
"compileSdkVersion": 30,
|
"compileSdkVersion": 30,
|
||||||
"permissions": [
|
"permissions": [
|
||||||
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
|
|
||||||
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
|
||||||
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
|
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
||||||
@ -45,6 +43,7 @@
|
|||||||
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
|
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
|
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
|
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
|
||||||
|
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
|
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
|
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
|
||||||
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
|
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
|
||||||
@ -171,4 +170,3 @@
|
|||||||
"fallbackLocale": "zh-Hans"
|
"fallbackLocale": "zh-Hans"
|
||||||
}
|
}
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
|
|
||||||
|
|||||||
@ -465,12 +465,6 @@ import {
|
|||||||
GetInitiativeOrderRefund,
|
GetInitiativeOrderRefund,
|
||||||
GetOrderPicking,
|
GetOrderPicking,
|
||||||
} from "@/api/order";
|
} from "@/api/order";
|
||||||
|
|
||||||
import {
|
|
||||||
makePhoneCall,
|
|
||||||
} from "@/utils/callPhone";
|
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
orderItem: {
|
orderItem: {
|
||||||
@ -662,27 +656,24 @@ export default {
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
makePhone(phone) {
|
makePhone(phone) {
|
||||||
console.log(makePhoneCall);
|
// #ifdef H5
|
||||||
|
uni.showToast({
|
||||||
|
title: "H5环境不支持",
|
||||||
|
icon: "none",
|
||||||
|
});
|
||||||
|
// #endif
|
||||||
|
|
||||||
makePhoneCall(phone)
|
// #ifdef APP-PLUS
|
||||||
// // #ifdef H5
|
uni.makePhoneCall({
|
||||||
// uni.showToast({
|
phoneNumber: phone,
|
||||||
// title: "H5环境不支持",
|
success: function () {
|
||||||
// icon: "none",
|
console.log("拨打电话成功");
|
||||||
// });
|
},
|
||||||
// // #endif
|
fail: function () {
|
||||||
|
console.log("拨打电话失败");
|
||||||
// // #ifdef APP-PLUS
|
},
|
||||||
// uni.makePhoneCall({
|
});
|
||||||
// phoneNumber: phone,
|
// #endif
|
||||||
// success: function () {
|
|
||||||
// console.log("拨打电话成功");
|
|
||||||
// },
|
|
||||||
// fail: function () {
|
|
||||||
// console.log("拨打电话失败");
|
|
||||||
// },
|
|
||||||
// });
|
|
||||||
// // #endif
|
|
||||||
},
|
},
|
||||||
copy(num, type) {
|
copy(num, type) {
|
||||||
uni.setClipboardData({
|
uni.setClipboardData({
|
||||||
|
|||||||
@ -280,12 +280,6 @@ import {
|
|||||||
} from "@/api/order";
|
} from "@/api/order";
|
||||||
import tuiRadio from "@/components/tui-radio/tui-radio.vue";
|
import tuiRadio from "@/components/tui-radio/tui-radio.vue";
|
||||||
import tuiRadioGroup from "@/components/tui-radio-group/tui-radio-group.vue";
|
import tuiRadioGroup from "@/components/tui-radio-group/tui-radio-group.vue";
|
||||||
|
|
||||||
import {
|
|
||||||
makePhoneCall,
|
|
||||||
} from "@/utils/callPhone";
|
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
orderItem: {
|
orderItem: {
|
||||||
@ -474,25 +468,24 @@ export default {
|
|||||||
this.returnOrderType = type;
|
this.returnOrderType = type;
|
||||||
},
|
},
|
||||||
makePhone(phone) {
|
makePhone(phone) {
|
||||||
makePhoneCall(phone)
|
// #ifdef H5
|
||||||
// // #ifdef H5
|
uni.showToast({
|
||||||
// uni.showToast({
|
title: "H5环境不支持",
|
||||||
// title: "H5环境不支持",
|
icon: "none",
|
||||||
// icon: "none",
|
});
|
||||||
// });
|
// #endif
|
||||||
// // #endif
|
|
||||||
|
|
||||||
// // #ifdef APP-PLUS
|
// #ifdef APP-PLUS
|
||||||
// uni.makePhoneCall({
|
uni.makePhoneCall({
|
||||||
// phoneNumber: phone,
|
phoneNumber: phone,
|
||||||
// success: function () {
|
success: function () {
|
||||||
// console.log("拨打电话成功");
|
console.log("拨打电话成功");
|
||||||
// },
|
},
|
||||||
// fail: function () {
|
fail: function () {
|
||||||
// console.log("拨打电话失败");
|
console.log("拨打电话失败");
|
||||||
// },
|
},
|
||||||
// });
|
});
|
||||||
// // #endif
|
// #endif
|
||||||
},
|
},
|
||||||
copy(num, type) {
|
copy(num, type) {
|
||||||
uni.setClipboardData({
|
uni.setClipboardData({
|
||||||
|
|||||||
@ -1,90 +0,0 @@
|
|||||||
// 动态请求打电话权限(通用方法)
|
|
||||||
export function requestCallPermission() {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
if (uni.getSystemInfoSync().platform !== 'android') {
|
|
||||||
// 非安卓设备直接返回(如iOS不需要此权限)
|
|
||||||
resolve(true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
plus.android.requestPermissions(
|
|
||||||
["android.permission.CALL_PHONE"],
|
|
||||||
(result) => {
|
|
||||||
const granted = result.granted || [];
|
|
||||||
const deniedAlways = result.deniedAlways || [];
|
|
||||||
|
|
||||||
if (granted.includes("android.permission.CALL_PHONE")) {
|
|
||||||
resolve(true);
|
|
||||||
} else if (deniedAlways.length > 0) {
|
|
||||||
// 永久拒绝,引导至设置页
|
|
||||||
uni.showModal({
|
|
||||||
title: "权限不足",
|
|
||||||
content: "请在设置中开启电话权限以使用拨号功能",
|
|
||||||
confirmText: "去设置",
|
|
||||||
success: (res) => {
|
|
||||||
if (res.confirm) {
|
|
||||||
plus.runtime.openURL("app-settings:");
|
|
||||||
}
|
|
||||||
resolve(false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
// 临时拒绝,提示用户
|
|
||||||
uni.showToast({ title: "需要电话权限才能拨号", icon: "none" });
|
|
||||||
resolve(false);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
(err) => {
|
|
||||||
console.error("权限请求失败:", err);
|
|
||||||
resolve(false);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// 判断是否为华为设备
|
|
||||||
export function isHuaweiDevice() {
|
|
||||||
return new Promise((resolve) => {
|
|
||||||
uni.getSystemInfo({
|
|
||||||
success: (res) => {
|
|
||||||
const brand = (res.brand || '').toLowerCase();
|
|
||||||
resolve(brand.includes('huawei'));
|
|
||||||
},
|
|
||||||
fail: () => resolve(false)
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// 统一拨号入口(根据设备类型选择方式)
|
|
||||||
export async function makePhoneCall(phoneNumber) {
|
|
||||||
if (!phoneNumber) {
|
|
||||||
uni.showToast({ title: "请输入正确的手机号", icon: "none" });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 先请求权限
|
|
||||||
const hasPermission = await requestCallPermission();
|
|
||||||
if (!hasPermission) return;
|
|
||||||
|
|
||||||
// 判断设备类型
|
|
||||||
const isHuawei = await isHuaweiDevice();
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (isHuawei) {
|
|
||||||
// 华为设备使用plus原生API,显示拨号界面(避免直接拨号失败)
|
|
||||||
plus.device.dial(phoneNumber, false);
|
|
||||||
} else {
|
|
||||||
// 其他设备使用uni标准API
|
|
||||||
uni.makePhoneCall({
|
|
||||||
phoneNumber: phoneNumber,
|
|
||||||
fail: (err) => {
|
|
||||||
console.error("拨号失败:", err);
|
|
||||||
uni.showToast({ title: "拨号失败,请重试", icon: "none" });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error("拨号异常:", err);
|
|
||||||
uni.showToast({ title: "系统不支持该操作", icon: "none" });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user