feat 代码优化

src/components/Home.vue

@@ -319,7 +319,8 @@ export default {
       });
     },
     getRefreshOrder () {
-      if (this.params.status === 94) {
+      let noRefresh = [93,94]
+      if (noRefresh.includes(this.params.status)) {
         return;
       }
       let orderIds = this.orderList.map((v) => {

src/components/settingComponents/voiceSetting.vue

@@ -9,101 +9,7 @@
           <el-switch @change="updateConfig" v-model="openAutoorder" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
         </div>
       </div>
-<div class="voice-content">
-      <div class="top-set" style="border-bottom: 1px solid #eee;">
-        <div class="t-left">
-          自动发单设置
-        </div>
-      
-      </div>
-      <div class="voice-list">
-        <el-row>
-          <el-col :span="8">
-            <div class="item">
-              <div class="left">
-                <img @click="play(index)" src="../../../static/image/voice-icon.png" class="voice-icon" />
-                <span>自动发单</span>
-              </div>
-              <div class="right">
-                <el-switch @change="autodelivery" v-model="openAutodelivery" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
-              </div>
-            </div>
-          </el-col>
-            <el-col :span="8">
-            <div class="item">
-              <div class="left">
-                <img @click="play(index)" src="../../../static/image/voice-icon.png" class="voice-icon" />
-                <span>预定单自动发单</span>
-              </div>
-              <div class="right">
-                <el-switch @change="changetemp2" v-model="modeltemp2" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-         
-      </div>
-    </div>
-    <div class="voice-content">
-      <div class="top-set" style="border-bottom: 1px solid #eee;">
-        <div class="t-left">
-          同步设置
-        </div>
-      
-      </div>
-      <div class="voice-list">
-        <el-row>
-          <el-col :span="8">
-            <div class="item">
-              <div class="left">
-                <img @click="play(index)" src="../../../static/image/voice-icon.png" class="voice-icon" />
-                <span>同步订单给骑手</span>
-              </div>
-              <div class="right">
-                <el-switch @change="autodelivery" v-model="openAutodelivery" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
-              </div>
-            </div>
-          </el-col>
-           <el-col :span="8">
-            <div class="item">
-              <div class="left">
-                <img @click="play(index)" src="../../../static/image/voice-icon.png" class="voice-icon" />
-                <span>同步外卖订单备注给骑手</span>
-              </div>
-              <div class="right">
-                <el-switch @change="changetemp2" v-model="modeltemp2" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
-              </div>
-            </div>
-          </el-col>
-           <el-col :span="8">
-            <div class="item">
-              <div class="left">
-                <img @click="play(index)" src="../../../static/image/voice-icon.png" class="voice-icon" />
-                <span>同步商家备注给骑手</span>
-              </div>
-              <div class="right">
-                <el-switch @change="changetemp2" v-model="modeltemp2" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
-              </div>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="item">
-              <div class="left">
-                <img @click="play(index)" src="../../../static/image/voice-icon.png" class="voice-icon" />
-                <span>订单详情显示出图片</span>
-              </div>
-              <div class="right">
-                <el-switch @change="changetemp2" v-model="modeltemp2" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-      
-      </div>
-    </div>
-
-
-      <!-- <div class="top-set">
+      <div class="top-set">
         <div class="t-left">
           自动配送
           <span @click="openSetTime">[时长设置]</span>
@@ -112,7 +18,7 @@
           <span>默认下单{{autodeliveryOrderTime}}分钟后</span>
           <el-switch @change="autodelivery" v-model="openAutodelivery" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
         </div>
-      </div> -->
+      </div>
       <div class="top-set">
         <div class="t-left">
           自动打印
@@ -122,6 +28,92 @@
           <el-switch @change="updateConfig" v-model="openPrintSwitch" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
         </div>
       </div>
+      <div class="voice-content">
+        <div class="top-set" style="border-bottom: 1px solid #eee;">
+          <div class="t-left">
+            自动发单设置
+          </div>
+        </div>
+        <div class="voice-list">
+          <el-row>
+            <el-col :span="24">
+              <div class="item">
+                <div class="left">
+                  <span>即时单自动发单</span>
+                </div>
+                <div class="right">
+                  <el-switch @change="autodelivery" v-model="openAutodelivery" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="24">
+              <div class="item">
+                <div class="left">
+                  <span>预定单自动发单</span>
+                </div>
+                <div class="right">
+                  <el-switch @change="changetemp2" v-model="modeltemp2" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+
+        </div>
+      </div>
+      <div class="voice-content">
+        <div class="top-set" style="border-bottom: 1px solid #eee;">
+          <div class="t-left">
+            同步设置
+          </div>
+
+        </div>
+        <div class="voice-list">
+          <el-row>
+            <el-col :span="24">
+              <div class="item">
+                <div class="left">
+                  <span>同步订单给骑手</span>
+                </div>
+                <div class="right">
+                  <el-switch @change="autodelivery" v-model="openAutodelivery" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="24">
+              <div class="item">
+                <div class="left">
+                  <span>同步外卖订单备注给骑手</span>
+                </div>
+                <div class="right">
+                  <el-switch @change="changetemp2" v-model="modeltemp2" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="24">
+              <div class="item">
+                <div class="left">
+                  <span>同步商家备注给骑手</span>
+                </div>
+                <div class="right">
+                  <el-switch @change="changetemp2" v-model="modeltemp2" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="24">
+              <div class="item">
+                <div class="left">
+                  <span>订单详情显示出图片</span>
+                </div>
+                <div class="right">
+                  <el-switch @change="changetemp2" v-model="modeltemp2" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+
+        </div>
+      </div>
+
     </template>
     <div class="voice-content">
       <div class="top-set" style="border-bottom: 1px solid #eee;">
@@ -130,7 +122,7 @@
         </div>
         <div class="t-right">
           <span>一键开启</span>
-          <el-switch @change="changeMessageStatus" v-model="msasterSwitch" :active-value="1" :inactive-value="0"  active-color="#FC7200" inactive-color="#999" />
+          <el-switch @change="changeMessageStatus" v-model="msasterSwitch" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
         </div>
       </div>
       <div class="voice-list">
@@ -180,7 +172,7 @@ import {
 } from "../../api/setting.js";
 // import { floorListDelivery } from "../../api/shop.js";
 export default {
-  data () {
+  data() {
     return {
       voiceList: [],
       openAutodelivery: 0,
@@ -197,29 +189,29 @@ export default {
   },
   watch: {
     "$store.state.userInfo": {
-      handler (newVal, oldVal) {
+      handler(newVal, oldVal) {
         this.memberType = newVal.memberType;
       },
       deep: true,
     },
   },
-  created () {
+  created() {
     this.getConfig();
     this.queryPushMessageStatus();
     // this.floorListDelivery();
   },
   methods: {
-    openSetTime () {
+    openSetTime() {
       if (this.openAutodelivery) {
-        this.centerDialogVisible = true
+        this.centerDialogVisible = true;
       } else {
         this.$message({
-          type: 'info',
-          message: '请先开启自动配送再设置时长！'
-        })
+          type: "info",
+          message: "请先开启自动配送再设置时长！",
+        });
       }
     },
-    play (index) {
+    play(index) {
       let src = "https://pc.liebaoai.cn/audio/alone.mp3";
       switch (index) {
         case 0:
@@ -256,7 +248,7 @@ export default {
       let mp3 = new Audio(src);
       mp3.play(); //播放 mp3这个音频对象
     },
-    confirm () {
+    confirm() {
       // if (!this.autodeliveryIds.length) {
       //   return this.$message({
       //     type: "error",
@@ -281,14 +273,14 @@ export default {
     //     }
     //   });
     // },
-    changeMessageStatus () {
+    changeMessageStatus() {
       this.voiceList = this.voiceList.map((v) => {
         v.msasterSwitch = this.msasterSwitch;
         return v;
       });
       this.updateSavePushMessageStatus();
     },
-    getConfig () {
+    getConfig() {
       this.centerDialogVisible = false;
       getConfig().then((res) => {
         if (res.code === 200) {
@@ -307,7 +299,7 @@ export default {
         }
       });
     },
-    queryPushMessageStatus () {
+    queryPushMessageStatus() {
       queryPushMessageStatus().then((res) => {
         if (res.code === 200) {
           this.voiceList = res.data;
@@ -319,7 +311,7 @@ export default {
         }
       });
     },
-    updateSavePushMessageStatus () {
+    updateSavePushMessageStatus() {
       updateSavePushMessageStatus({ orderPushMessages: this.voiceList }).then(
         (res) => {
           if (res.code === 200) {
@@ -337,7 +329,7 @@ export default {
         }
       );
     },
-    autodelivery () {
+    autodelivery() {
       if (this.openAutodelivery === 1) {
         this.centerDialogVisible = true;
         // this.autodeliveryIds = this.deliveryIdList
@@ -347,7 +339,7 @@ export default {
         this.updateConfig();
       }
     },
-    updateConfig () {
+    updateConfig() {
       let params = {
         autodeliveryOrderTime: this.autodeliveryOrderTime * 60,
         // autodeliveryIds: this.autodeliveryIds.toString(),