Funny il y a 3 ans
Parent
commit
18c2d2aa8b

+ 44 - 8
src/App.vue

@@ -2,7 +2,7 @@
   <div id="app">
     <router-view />
     <!-- 语音播报 -->
-    <iframe id="iframeDom" allow="autoplay" style="display:none" src="../static/audio/alone.mp3"></iframe>
+    <iframe id="iframeDom" allow="autoplay" style="display:none" :src="src"></iframe>
     <audio class="audio" ref="audio" :src="url" controls autoplay hidden>
     </audio>
   </div>
@@ -10,21 +10,55 @@
 
 <script>
 import { getSoundMsg } from "./api/setting.js";
-import audio1 from "../static/audio/new-order.mp3";
-import audio2 from "../static/audio/alone.mp3";
+import bus from "./common/bus.js";
 export default {
   name: "App",
   data() {
     return {
       url: "../static/audio/test.mp3",
-      audioList: [audio1, audio2],
+      audioList: [
+        require("../static/audio/new-order.mp3"),
+        require("../static/audio/新提示音+语音 1-1.mp3"),
+        require("../static/audio/新提示音+语音 1-2.mp3"),
+        require("../static/audio/新提示音+语音 1-3.mp3"),
+        require("../static/audio/新提示音+语音 1-4.mp3"),
+        require("../static/audio/新提示音+语音 1-5.mp3"),
+      ],
+      src: require("../static/audio/alone.mp3"),
+      timer: null,
+      openMsg: false,
     };
   },
+  created() {
+    console.log(1111);
+  },
   mounted() {
-    console.log(this.audioList);
-    setInterval(() => {
-      this.getSoundMsg();
-    }, 5000);
+    console.log(2222);
+    bus.$on("closeGetSoundMsg", () => {
+      console.log("进来准备关闭新订单提醒声音了");
+      clearInterval(this.timer);
+      this.timer = null;
+    });
+    bus.$on("openGetSoundMsg", () => {
+      console.log("进来准备开启新订单提醒声音了");
+      this.timer = setInterval(() => {
+        this.getSoundMsg();
+      }, 5000);
+    });
+    // 诱导用户出发点击动作,否则页面刷新后不会自动播放音频
+    let userInfo = localStorage.getItem("userInfo");
+    if (userInfo) {
+      let nickname = JSON.parse(userInfo).nickname;
+      this.$confirm(`当前登录账号:${nickname}`, "提示", {
+        confirmButtonText: "确定",
+        showCancelButton: false,
+        type: "warning",
+      }).then(() => {});
+    }
+  },
+  beforeDestroy() {
+    clearInterval(this.timer);
+    this.timer = null;
   },
   methods: {
     getSoundMsg() {
@@ -35,6 +69,8 @@ export default {
             let url = this.audioList.filter((v) => {
               return v.includes(name);
             })[0];
+            console.log("name", name);
+            console.log("url", url);
             this.url = url + "?t=" + new Date().getTime();
           }
         } else {

+ 12 - 7
src/components/accountCompoents/coupon.vue

@@ -3,19 +3,24 @@
     <div class="list">
       <div class="item" v-for="(v,i) in couponList" :key="i">
         <div class="top-content">
-          <div class="money">
+          <div class="money" v-if="v.type === 1">
             <span class="samll-size">¥</span>
-            <span class="big-size">1</span>
+            <span class="big-size">{{v.money}}</span>
           </div>
-          <div class="man-jian">满8减1</div>
-          <div class="time">2021.09.01-2021-09-30</div>
+          <div class="money" v-if="v.type === 2">
+            <span class="big-size">{{v.discount}}</span>
+            <span class="samll-size">折</span>
+          </div>
+          <div class="man-jian" v-if="v.type === 2">最高可减{{v.maxDiscount}}元</div>
+          <div class="man-jian" v-if="v.type === 1">{{v.name}}</div>
+          <div class="time">{{v.validStartTime.slice(0,10)}}--{{v.validEndTime}}</div>
         </div>
         <div class="bottom">
           <div class="lei-xing">
-            类型:<span>满减券</span>
+            类型:<span>{{v.type === 1 ? '满减劵' : '折扣'}}</span>
           </div>
           <div class="lei-xing">
-            数量:<span>20张</span>
+            数量:<span>{{Number(v.num)}}张</span>
           </div>
         </div>
       </div>
@@ -56,7 +61,7 @@ export default {
       this.getCouponList();
     },
     getCouponList() {
-      getCouponList({ status: 0 }).then((res) => {
+      getCouponList({ status: 0, isNew: 1 }).then((res) => {
         if (res.code === 200) {
           this.couponList = res.data.data;
           this.total = res.data.totalNums || 0;

+ 1 - 1
src/components/orderComponents/orderList.vue

@@ -10,7 +10,7 @@
             <div class="order_item_header">
               <div class="order_item_header_l">
                 <div v-if="item.daySeq" class="Serial_number">#{{item.daySeq}}</div>
-                <img :src="item.logo" class="logo">
+                <img :src="item.logo || item.waimaiLogo" class="logo">
                 <span class="name">{{item.shopName}}</span>
                 <div class="sign_time" v-if="item.waimaiOrderId && item.takeType==1">{{item.exceptTime}}前送达</div>
                 <div class="sign_txt" v-if="item.waimaiOrderId && item.takeType==0">立即送达</div>

+ 6 - 3
src/views/home.vue

@@ -26,11 +26,11 @@
 import sidebar from "../common/sider.vue";
 import headerVue from "../common/header.vue";
 import { mapState } from "vuex";
+import bus from "../common/bus.js";
 export default {
   data() {
     return {
       audio: null,
-      
     };
   },
   computed: {
@@ -40,8 +40,10 @@ export default {
     sidebar,
     headerVue,
   },
-  created() {},
-  
+  created() {
+    bus.$emit("openGetSoundMsg");
+  },
+
   methods: {
     loginOut() {
       this.$confirm("此操作将退出当前登录用户, 是否继续?", "提示", {
@@ -50,6 +52,7 @@ export default {
         type: "warning",
       }).then(() => {
         localStorage.clear("token");
+        bus.$emit("closeGetSoundMsg");
         this.$router.push({
           path: "/login",
         });