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", "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"
}, },
{ {

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

@ -1,41 +1,39 @@
{ {
"name" : "小发同城", "name": "小发同城",
"appid" : "__UNI__95F809F", "appid": "__UNI__95F809F",
"package" : "com.xiaofa.shopAdmin", "package": "com.xiaofa.shopAdmin",
"description" : "", "description": "",
"versionName" : "1.0.0", "versionName": "1.0.0",
"versionCode" : 100, "versionCode": 100,
"transformPx" : false, "transformPx": false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus": {
"usingComponents" : true, "usingComponents": true,
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler": "uni-app",
"compilerVersion" : 3, "compilerVersion": 3,
"splashscreen" : { "splashscreen": {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender": true,
"waiting" : true, "waiting": true,
"autoclose" : true, "autoclose": true,
"delay" : 0 "delay": 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules" : { "modules": {
"Maps" : {}, "Maps": {},
"Camera" : {}, "Camera": {},
"Record" : {}, "Record": {},
"VideoPlayer" : {}, "VideoPlayer": {},
"UIWebview" : {}, "UIWebview": {},
"Push" : {} "Push": {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute": {
/* android打包配置 */ /* android打包配置 */
"android" : { "android": {
"targetSdkVersion" : 30, "targetSdkVersion": 30,
"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\"/>",
@ -53,83 +52,83 @@
] ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : { "ios": {
"privacyDescription" : { "privacyDescription": {
"NSPhotoLibraryAddUsageDescription" : "此App会在上传头像图片服务中访问您的相机权限", "NSPhotoLibraryAddUsageDescription": "此App会在上传头像图片服务中访问您的相机权限",
"NSPhotoLibraryUsageDescription" : "此App会在上传头像图片服务中访问您的相机权限", "NSPhotoLibraryUsageDescription": "此App会在上传头像图片服务中访问您的相机权限",
"NSCameraUsageDescription" : "此App会在上传头像图片服务中访问您的相机权限", "NSCameraUsageDescription": "此App会在上传头像图片服务中访问您的相机权限",
"NSMicrophoneUsageDescription" : "此APP会在使用声音识别服务中使用您的麦克风权限", "NSMicrophoneUsageDescription": "此APP会在使用声音识别服务中使用您的麦克风权限",
"NSLocationWhenInUseUsageDescription" : "此App会在使用导航服务中使用您的定位权限", "NSLocationWhenInUseUsageDescription": "此App会在使用导航服务中使用您的定位权限",
"NSLocationAlwaysUsageDescription" : "此App会在使用导航服务中使用您的定位权限", "NSLocationAlwaysUsageDescription": "此App会在使用导航服务中使用您的定位权限",
"NSLocationAlwaysAndWhenInUseUsageDescription" : "此App会在使用导航服务中使用您的定位权限" "NSLocationAlwaysAndWhenInUseUsageDescription": "此App会在使用导航服务中使用您的定位权限"
}, },
"dSYMs" : false, "dSYMs": false,
"UIBackgroundModes" : "audio" "UIBackgroundModes": "audio"
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : { "sdkConfigs": {
"maps" : {}, "maps": {},
"push" : { "push": {
"unipush" : { "unipush": {
"version" : "2", "version": "2",
"offline" : false, "offline": false,
"appid" : "rQxaGAKl7t83KlTubAaKC3", "appid": "rQxaGAKl7t83KlTubAaKC3",
"appkey" : "QSElTn6ttq5nmrIZtFhCT" "appkey": "QSElTn6ttq5nmrIZtFhCT"
} }
} }
}, },
"icons" : { "icons": {
"android" : { "android": {
"hdpi" : "unpackage/res/icons/72x72.png", "hdpi": "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png", "xhdpi": "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png", "xxhdpi": "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png" "xxxhdpi": "unpackage/res/icons/192x192.png"
}, },
"ios" : { "ios": {
"appstore" : "unpackage/res/icons/1024x1024.png", "appstore": "unpackage/res/icons/1024x1024.png",
"ipad" : { "ipad": {
"app" : "unpackage/res/icons/76x76.png", "app": "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png", "app@2x": "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png", "notification": "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x": "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png", "proapp@2x": "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png", "settings": "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x": "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png", "spotlight": "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png" "spotlight@2x": "unpackage/res/icons/80x80.png"
}, },
"iphone" : { "iphone": {
"app@2x" : "unpackage/res/icons/120x120.png", "app@2x": "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png", "app@3x": "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png", "notification@2x": "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png", "notification@3x": "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png", "settings@2x": "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png", "settings@3x": "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png", "spotlight@2x": "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png" "spotlight@3x": "unpackage/res/icons/120x120.png"
} }
} }
}, },
"splashscreen" : { "splashscreen": {
"androidStyle" : "default", "androidStyle": "default",
"useOriginalMsgbox" : true "useOriginalMsgbox": true
} }
}, },
"uniStatistics" : { "uniStatistics": {
"enable" : true "enable": true
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp" : {}, "quickapp": {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin": {
"appid" : "", "appid": "",
"setting" : { "setting": {
"urlCheck" : false "urlCheck": false
}, },
"usingComponents" : true "usingComponents": true
}, },
"h5" : { "h5": {
// "devServer" : { // "devServer" : {
// "https" : true, // "https" : true,
// "host" : "127.0.0.1", // "host" : "127.0.0.1",
@ -147,28 +146,27 @@
// } // }
// } // }
// }, // },
"title" : "小发商城商家中心", "title": "小发商城商家中心",
"template" : "index.html", "template": "index.html",
"router" : { "router": {
"mode" : "history", "mode": "history",
"base" : "/mchapp/" "base": "/mchapp/"
} }
}, },
"mp-alipay" : { "mp-alipay": {
"usingComponents" : true "usingComponents": true
}, },
"mp-baidu" : { "mp-baidu": {
"usingComponents" : true "usingComponents": true
}, },
"mp-toutiao" : { "mp-toutiao": {
"usingComponents" : true "usingComponents": true
}, },
"uniStatistics" : { "uniStatistics": {
"enable" : false, "enable": false,
"version" : "2" "version": "2"
}, },
"vueVersion" : "2", "vueVersion": "2",
"fallbackLocale" : "zh-Hans" "fallbackLocale": "zh-Hans"
} }
/* 5+App特有相关 */ /* 5+App特有相关 */

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

@ -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({

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

@ -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({

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