diff --git a/java-mall-app-shop-admin/App.vue b/java-mall-app-shop-admin/App.vue index d62fcec..5881d47 100644 --- a/java-mall-app-shop-admin/App.vue +++ b/java-mall-app-shop-admin/App.vue @@ -4,6 +4,7 @@ import APPUpdate, { getCurrentNo } from "@/config/appUpdate"; // #endif import { mapState, mapActions } from "vuex"; import { webSocketManager } from "@/utils/socket.js"; +import {GetRingStatus} from '@/api/ring.js'; export default { data() { return { @@ -142,14 +143,19 @@ export default { }, // 新增方法 - 处理推送声音 // 修改handlePushSound方法 - handlePushSound(pushData) { + async handlePushSound(pushData) { console.log(pushData.payload); try { // 获取category决定使用哪种声音 const category = pushData.payload.category; - + var AUDIO = uni.createInnerAudioContext(); - + let res = await GetRingStatus(); + console.log("声音",res); + if(res.data.ringtone_is_enable!==1){ + console.log("没声音"); + return; + } // 设置音频源 let soundFile = ""; switch (category) { diff --git a/java-mall-app-shop-admin/api/ring.js b/java-mall-app-shop-admin/api/ring.js new file mode 100644 index 0000000..8b5fc86 --- /dev/null +++ b/java-mall-app-shop-admin/api/ring.js @@ -0,0 +1,21 @@ +import http from "../utils/http"; +import config from "../config/config"; + +export function GetRingStatus() { + return http({ + url: '/shop/shop-store-base/get', + method: 'get', + baseURL: config.adminApi, + }); +} +export function UpdateRingStatus(formData) { + return http({ + url: '/shop/shop-store-base/storeSetUp', + method: 'post', + baseURL: config.adminApi, + data: formData, // 提交表单数据 + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' // 设置请求头为表单格式 + } + }); +} \ No newline at end of file diff --git a/java-mall-app-shop-admin/pages.json b/java-mall-app-shop-admin/pages.json index 99321ec..023dbef 100644 --- a/java-mall-app-shop-admin/pages.json +++ b/java-mall-app-shop-admin/pages.json @@ -271,6 +271,13 @@ "style": { "navigationBarTitleText": "我的举报" } + }, + { + "path" : "pages/my/rings/rings", + "style" : + { + "navigationBarTitleText" : "铃声设置" + } } ], "globalStyle": { diff --git a/java-mall-app-shop-admin/pages/my/my.vue b/java-mall-app-shop-admin/pages/my/my.vue index 3f6b413..0347f48 100644 --- a/java-mall-app-shop-admin/pages/my/my.vue +++ b/java-mall-app-shop-admin/pages/my/my.vue @@ -151,7 +151,7 @@ iconStyle="marginRight:6px; color: #62BBAE" :border="false" isLink - url="/pages/my/printer/printerList" + url="/pages/my/rings/rings" icon="bell-fill" title="铃声设置" > diff --git a/java-mall-app-shop-admin/pages/my/rings/rings.vue b/java-mall-app-shop-admin/pages/my/rings/rings.vue new file mode 100644 index 0000000..f02480b --- /dev/null +++ b/java-mall-app-shop-admin/pages/my/rings/rings.vue @@ -0,0 +1,107 @@ + + + + +