front/merchapp
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: front:19620542e6c68b710aa3aebd1535c9e44cc0fd0a
Branches Tags
front:main
front:feat-tanjy
..
compare: front:716e05aef25b38825f89619e8452dd9e088cca71
Branches Tags
front:main
front:feat-tanjy

No commits in common. "19620542e6c68b710aa3aebd1535c9e44cc0fd0a" and "716e05aef25b38825f89619e8452dd9e088cca71" have entirely different histories.
19620542e6 ... 716e05aef2

5 changed files with 198 additions and 310 deletions
Show Stats Expand all files Collapse all files

6
java-mall-app-shop-admin/.hbuilderx/launch.json
View File

@ -4,9 +4,6 @@
"version" : "0.0",
"configurations" : [
{
"app" : {
"launchtype" : "local"
},
"app-plus" : {
"launchtype" : "remote"
},
@ -23,8 +20,7 @@
"type" : "uniCloud"
},
{
"customPlaygroundType" : "device",
"playground" : "standard",
"playground" : "custom",
"type" : "uni-app:app-android"
},
{

4
java-mall-app-shop-admin/manifest.json
View File

@ -34,8 +34,6 @@
"minSdkVersion": 21,
"compileSdkVersion": 30,
"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.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<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.CAMERA\"/>",
"<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.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
@ -171,4 +170,3 @@
"fallbackLocale": "zh-Hans"
}
/* 5+App特有相关 */

43
java-mall-app-shop-admin/pages/order/components/OrderItem.vue
View File

@ -465,12 +465,6 @@ import {
GetInitiativeOrderRefund,
GetOrderPicking,
} from "@/api/order";
import {
makePhoneCall,
} from "@/utils/callPhone";
export default {
props: {
orderItem: {
@ -662,27 +656,24 @@ export default {
);
},
makePhone(phone) {
console.log(makePhoneCall);
// #ifdef H5
uni.showToast({
title: "H5环境不支持",
icon: "none",
});
// #endif
makePhoneCall(phone)
// // #ifdef H5
// uni.showToast({
// title: "H5环境不支持",
// icon: "none",
// });
// // #endif
// // #ifdef APP-PLUS
// uni.makePhoneCall({
// phoneNumber: phone,
// success: function () {
// console.log("拨打电话成功");
// },
// fail: function () {
// console.log("拨打电话失败");
// },
// });
// // #endif
// #ifdef APP-PLUS
uni.makePhoneCall({
phoneNumber: phone,
success: function () {
console.log("拨打电话成功");
},
fail: function () {
console.log("拨打电话失败");
},
});
// #endif
},
copy(num, type) {
uni.setClipboardData({

41
java-mall-app-shop-admin/pages/order/components/retrunOrderItem.vue
View File

@ -280,12 +280,6 @@ import {
} from "@/api/order";
import tuiRadio from "@/components/tui-radio/tui-radio.vue";
import tuiRadioGroup from "@/components/tui-radio-group/tui-radio-group.vue";
import {
makePhoneCall,
} from "@/utils/callPhone";
export default {
props: {
orderItem: {
@ -474,25 +468,24 @@ export default {
this.returnOrderType = type;
},
makePhone(phone) {
makePhoneCall(phone)
// // #ifdef H5
// uni.showToast({
// title: "H5环境不支持",
// icon: "none",
// });
// // #endif
// #ifdef H5
uni.showToast({
title: "H5环境不支持",
icon: "none",
});
// #endif
// // #ifdef APP-PLUS
// uni.makePhoneCall({
// phoneNumber: phone,
// success: function () {
// console.log("拨打电话成功");
// },
// fail: function () {
// console.log("拨打电话失败");
// },
// });
// // #endif
// #ifdef APP-PLUS
uni.makePhoneCall({
phoneNumber: phone,
success: function () {
console.log("拨打电话成功");
},
fail: function () {
console.log("拨打电话失败");
},
});
// #endif
},
copy(num, type) {
uni.setClipboardData({

90
java-mall-app-shop-admin/utils/callPhone.js
View File

@ -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" });
}
}