Browse Source

feat 代码优化;bugfix

Funny 2 năm trước cách đây
mục cha
commit
33e7f977b2

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 2 - 0
src/common/areadata.js


+ 5 - 2
src/common/qrCode.vue

@@ -15,10 +15,10 @@
       <div class="code-bottom">
         <div id="qrcode" ref="qrcode" class="code-img"></div>
         <div class="des">请使用手机打开{{ paymentType == 1 ? '支付宝' : '微信' }}扫描二维码完成支付</div>
-        <!-- <div class="guo-qi">
+        <div class="guo-qi">
           <span @click.stop="refreshCode()">点击刷新</span>
           重新获取二维码
-        </div> -->
+        </div>
       </div>
     </div>
   </el-dialog>
@@ -113,6 +113,9 @@ export default {
 
 <style lang="scss" scoped>
 .pay-dialog {
+  /deep/ .el-dialog {
+    border-radius: 10px;
+  }
   /deep/ .el-dialog__header {
     padding: 0;
   }

+ 5 - 8
src/components/accountCompoents/couponIndex.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="coupon">
-    <div class="recharge_coupon_bottom">
+    <div class="recharge_coupon_bottom" v-if="couponList.length">
       <div class="recharge_coupon_bottom_item" v-for="(item,index) in couponList" :key="index">
         <div class="recharge_coupon_bottom_left">
           <div class="recharge_coupon_bottom_left_num">
@@ -28,10 +28,7 @@
         </div>
       </div>
     </div>
-    <!-- <div style="text-align: center;margin-top: 20px;">
-      <el-pagination :current-page.sync="params.pageNum" @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-sizes="[10, 20, 50, 100]" :page-size="params.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" background>
-      </el-pagination>
-    </div> -->
+    <el-empty v-else style="padding-top:10%;" description="暂无可用优惠券"></el-empty>
   </div>
 </template>
 
@@ -39,7 +36,7 @@
 import { getCouponList, getCouponExplain } from "../../api/amount.js";
 import tool from "../../api/tool.js";
 export default {
-  name: 'couponIndex',
+  name: "couponIndex",
   data() {
     return {
       couponList: [],
@@ -112,10 +109,10 @@ export default {
 
 <style lang="scss" scoped>
 .coupon {
-  height: calc(100vh - 274px);
+  height: calc(100vh - 184px);
   background-color: #fff;
   .recharge_coupon_bottom {
-    margin: 15px 17px;
+    padding: 15px 17px;
     display: flex;
     flex-wrap: wrap;
     .recharge_coupon_bottom_item {

+ 19 - 33
src/components/accountCompoents/invalidCoupon.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="coupon">
-    <div class="recharge_coupon_bottom">
+    <div class="recharge_coupon_bottom" v-if="couponList.length">
       <div class="recharge_coupon_bottom_item" v-for="(item,index) in couponList" :key="index">
         <div class="recharge_coupon_bottom_left">
           <div class="recharge_coupon_bottom_left_num">
@@ -22,17 +22,15 @@
             <div>{{item.name}}</div>
             <div>有效期:{{item.validStartTime}} - {{item.validEndTime}}</div>
           </div>
-          <div class="recharge_coupon_bottom_number">
-            <span>x{{item.num}}张</span>
-          </div>
+
+        </div>
+        <div class="recharge_coupon_bottom_number">
+          x{{item.num}}张
         </div>
         <img class="img" src="../../../static/image/invalid-coupon.png" alt="">
       </div>
     </div>
-    <!-- <div style="text-align: center;margin-top: 20px;">
-      <el-pagination :current-page.sync="params.pageNum" @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-sizes="[10, 20, 50, 100]" :page-size="params.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" background>
-      </el-pagination>
-    </div> -->
+    <el-empty v-else style="padding-top:10%;" description="暂无已过期优惠券"></el-empty>
   </div>
 </template>
 
@@ -113,10 +111,10 @@ export default {
 
 <style lang="scss" scoped>
 .coupon {
-  height: calc(100vh - 274px);
+  height: calc(100vh - 184px);
   background-color: #fff;
   .recharge_coupon_bottom {
-    margin: 15px 17px;
+    padding: 15px 17px;
     display: flex;
     flex-wrap: wrap;
     .recharge_coupon_bottom_item {
@@ -200,34 +198,22 @@ export default {
             color: #cccccc;
           }
         }
-        .recharge_coupon_bottom_number {
-          display: flex;
-          align-items: center;
-          span {
-            width: 63px;
-            height: 22px;
-            line-height: 22px;
-            border: 1px solid #cccccc;
-            border-radius: 18px;
-            text-align: center;
-            font-size: 12px;
-            font-family: PingFang SC;
-            font-weight: 500;
-            color: #cccccc;
-            cursor: pointer;
-            &:hover {
-              background-color: #cccccc;
-              color: #ffffff;
-            }
-          }
-        }
+      }
+      .recharge_coupon_bottom_number {
+        position: absolute;
+        top: 40px;
+        right: 8px;
+        font-size: 12px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #cccccc;
       }
       .img {
         position: absolute;
         top: 0;
         right: 0;
-        width: 72px;
-        height: 72px;
+        width: 52px;
+        height: 42px;
       }
     }
   }

+ 19 - 5
src/components/manualCreate.vue

@@ -75,7 +75,9 @@
             <el-select size="small" class="item1" v-model="form.platformType" placeholder="请选择物品来源">
               <el-option v-for="(v,i) in goodsSource" :key="i" :label="v.name" :value="v.type"></el-option>
             </el-select>
-            <el-input v-if="form.platformType" type="number" class="item2" v-model="form.daySeq" size="small" placeholder="请输入订单流水号"></el-input>
+            <!-- <el-input v-if="form.platformType" type="number" class="item2" v-model="form.daySeq" size="small" placeholder="请输入订单流水号"></el-input> -->
+            <el-input-number v-if="form.platformType" type="number" class="item2" v-model="form.daySeq" size="small" :min="1" placeholder="请输入订单流水号"></el-input-number>
+            <div class="tips" v-else>系统将自动为您分配订单流水号</div>
           </el-form-item>
           <el-form-item label="物品重量" required>
             <div class="printer-num">
@@ -212,7 +214,6 @@ export default {
         taxpayerId: "",
         transport: "0",
         platformType: 0,
-        daySeq: "",
       },
       chooseMapAddress: 1, // 1 发件选择地址2 收件选择地址
       showChooseShop: false,
@@ -585,11 +586,14 @@ export default {
           message: "请填写平台流水号!",
         });
       }
-        console.log('重量1:',this.form.weight);
+      console.log("重量1:", this.form.weight);
 
       let reg = new RegExp(/^[1-9]\d*$/g);
-      if (!reg.test(Number(this.form.weight))|| Number(this.form.weight) > 50) {
-        console.log('重量:',this.form.weight);
+      if (
+        !reg.test(Number(this.form.weight)) ||
+        Number(this.form.weight) > 50
+      ) {
+        console.log("重量:", this.form.weight);
         this.$refs.weight.focus();
         return this.$message({
           type: "error",
@@ -697,6 +701,12 @@ export default {
       sendValuation(this.form).then((res) => {
         this.isLoading = false;
         if (res.code == 200) {
+          if (!res.data.optionals || !res.data.optionals.length) {
+            return this.$message({
+              type: "error",
+              message: `暂无可用运力!`,
+            });
+          }
           res.data.optionals.forEach((item) => {
             item.optionals = item.optionals ? item.optionals : [];
             item.lowOptionals = item.lowOptionals ? item.lowOptionals : [];
@@ -813,6 +823,10 @@ export default {
         margin-left: 20px;
         width: 50%;
       }
+      .tips {
+        margin-left: 20px;
+        color: #999999;
+      }
       .map {
         height: 25px;
         width: 25px;

+ 15 - 5
src/components/orderComponents/orderDetail.vue

@@ -6,7 +6,9 @@
         <div class="detail_title2">商品详情</div>
         <div class="shop_detail" v-for="(item,i) in orderDetail.detailItems" :key="i">
           <div class="info">
-            <img v-if="item.foodPic" :src="item.foodPic" alt="" srcset="">
+            <!-- <img v-if="item.foodPic" :src="item.foodPic" alt="" srcset=""> -->
+            <el-image class="img" :src="item.foodPic" :preview-src-list="showPreview">
+            </el-image>
             <div class="shop_title">{{item.foodName}}</div>
           </div>
           <div class="shop_num">x{{item.quantity}}</div>
@@ -136,6 +138,13 @@ export default {
     buttonStatus: Number,
     orderDetail: Object,
   },
+  computed: {
+    showPreview() {
+      return this.orderDetail.detailItems.map((v) => {
+        return v.foodPic;
+      });
+    },
+  },
   methods: {
     takeOUtType(type) {
       let name = "";
@@ -170,9 +179,9 @@ export default {
   box-sizing: border-box;
   .detail_title2 {
     width: 100%;
-    font-size: 12px;
+    font-size: 13px;
     font-weight: 600;
-    color: #777777;
+    color: #333333;
     margin-bottom: 15px;
   }
   .shop_detail {
@@ -184,7 +193,8 @@ export default {
       flex-grow: 1;
       display: flex;
       align-items: flex-start;
-      img {
+      .img {
+        flex-shrink: 0;
         width: 47px;
         height: 47px;
         border-radius: 4px 4px 4px 4px;
@@ -217,7 +227,7 @@ export default {
       font-size: 14px;
       font-weight: 400;
       // width: 80px;
-      color: #b1b1b1;
+      color: #999999;
     }
     .cont {
       font-size: 14px;

+ 4 - 3
src/components/orderComponents/orderList.vue

@@ -36,10 +36,10 @@
               </div>
               <el-button size="small" @click.native="itemAddRemark(list[curIdx].id, list[curIdx])" class="btn_bots">添加备注</el-button>
               <el-button v-if="list[curIdx].waimaiOrderId" size="small" @click.native="settingTime(list[curIdx])" class="btn_bots btn">{{
-                  list[curIdx].delayTime ? "修改定时" : "定时发单"
+                  list[curIdx].delayTime ? "修改定时" : "预约发单"
                 }}</el-button>
               <el-button v-else size="small" @click.native="cancelOrder(list[curIdx].id)" class="btn_bots">取消订单</el-button>
-              <el-button size="small" @click.native="settingTime(list[curIdx])" class="btn_bots ">预约发单</el-button>
+              <!-- <el-button size="small" @click.native="settingTime(list[curIdx])" class="btn_bots ">预约发单</el-button> -->
               <el-button size="small" @click.native="sendNow(list[curIdx])" class="btn_bots btn">发起配送</el-button>
               <!-- <el-dropdown-item @click.native="orderPrinter(list[curIdx].waimaiOrderId,list[curIdx].id)"><span style="color: #fc7200">补打小票</span></el-dropdown-item> -->
 
@@ -67,6 +67,7 @@
             </div>
             <!-- 已取消 -->
             <div class="btns" v-if="buttonStatus === -1">
+              <el-button size="small" @click.native="orderPrinter(list[curIdx].waimaiOrderId)" v-if="list[curIdx].waimaiOrderId&&list[curIdx].cancelType===4" class="btn_bots">补打小票</el-button>
               <el-button size='small' @click.native="orderPrinter(list[curIdx].waimaiOrderId,list[curIdx].id)" class="btn_bots btn">再来一单</el-button>
             </div>
             <!-- 已完成 -->
@@ -153,7 +154,7 @@
                 <el-tag class="header_r">{{
                   showCancelType(item.cancelType)
                 }}</el-tag>
-                <!-- <el-button size='small' class="btn" @click.stop="orderBack(item.id)">撤回订单</el-button> -->
+                <!-- <el-button v-if="item.cancelType===4&&item.waimaiOrderId" size='small' class="btn" @click.stop="orderPrinter(item.waimaiOrderId,item.id)">补打小票</el-button> -->
                 <el-button size="small" class="btn" @click.stop="againOrder(item)">再来一单</el-button>
               </div>
               <!-- 猎豹平台已完成 -->

+ 66 - 11
src/components/orderComponents/orderTrack.vue

@@ -20,7 +20,20 @@
       <!-- 配送信息 ( 待接单无配送信息 ) -->
       <div class="send-info" v-if="trackOrder.deliveryName">
         <div class="send-tlt">配送信息</div>
-        <div class="label">
+        <div class="delivery">
+          <img class="img" :src="trackOrder.deliveryLogo" alt="">
+          <div class="con">
+            <div class="delivery-top">
+              <div class="left">{{trackOrder.shipperName}}</div>
+              <div class="right">{{trackOrder.shipperPhone}}</div>
+            </div>
+            <div class="delivery-bot">
+              <div class="left">{{trackOrder.deliveryName}}客服</div>
+              <div class="right">{{ trackOrder.customerPhone }}</div>
+            </div>
+          </div>
+        </div>
+        <!-- <div class="label">
           <div class="label-tlt">接单平台:</div>
           <div class="label-right">
             <img :src="trackOrder.deliveryLogo" class="send-logo" />
@@ -40,7 +53,7 @@
           <div class="label-right">
             <span>{{ trackOrder.customerPhone }}</span>
           </div>
-        </div>
+        </div> -->
         <div class="label">
           <div class="label-tlt">接单时间:</div>
           <div class="label-right">
@@ -58,9 +71,10 @@
       <div class="send-info">
         <div class="send-tlt">发单信息</div>
         <div class="label">
-          <div class="label-tlt">配送费用:</div>
+          <div class="label-tlt">支付金额:</div>
           <div class="label-right">
             <span>¥{{ trackOrder.payAmount }}</span>
+            <div class="detail">明细</div>
           </div>
         </div>
         <div class="label">
@@ -72,11 +86,6 @@
       </div>
       <!-- 收件地址信息、配送进度 -->
       <div class="address-box">
-        <!-- <div class="address-info">
-          <img src="../../../static/image/address-shou.png" class="address-icon" />
-          <div class="address-content">【苏州市工业园区】娄葑街道通园路80号(56文创园)C栋1楼 18015468888-1157</div>
-        </div> -->
-        <!-- 进度列表 -->
         <div class="process">
           <el-timeline>
             <el-timeline-item class="p-item" v-for="(v, i) in trackOrder.itemList" :key="i" type="info" size="large" :icon="i ? 'el-icon-success' : 'el-icon-circle-check'">
@@ -269,11 +278,51 @@ export default {
       margin-bottom: 20px;
       border-bottom: 2px dotted #f0f0f0;
       .send-tlt {
-        font-size: 12px;
+        font-size: 13px;
         font-weight: bold;
-        color: #777777;
+        color: #333333;
         margin-bottom: 15px;
       }
+      .delivery {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        .img {
+          flex-shrink: 0;
+          width: 44px;
+          height: 44px;
+          background: rgba(255, 255, 255, 0.39);
+          box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.16);
+          border-radius: 8px;
+          margin-right: 10px;
+        }
+        .con {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+          width: calc(100% - 54px);
+          .delivery-top,
+          .delivery-bot {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            font-size: 14px;
+            line-height: 20px;
+            color: #007aff;
+            .left {
+              max-width: 60%;
+              overflow: hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+            }
+          }
+          .delivery-bot {
+            color: #999999;
+          }
+        }
+      }
       .label {
         display: flex;
         justify-content: space-between;
@@ -282,12 +331,18 @@ export default {
           flex-shrink: 0;
           font-size: 14px;
           font-weight: 400;
-          color: #b1b1b1;
+          color: #999999;
         }
         .label-right {
           display: flex;
           flex-wrap: wrap;
           align-items: center;
+          .detail {
+            color: #fc7200;
+            font-size: 14px;
+            margin-left: 10px;
+            cursor: pointer;
+          }
           .send-logo {
             width: 16px;
             height: 16px;

+ 36 - 15
src/components/shopCompoents/bindDelivery.vue

@@ -28,18 +28,20 @@
             </div>
           </div>
           <div v-if="type === 5 && [2,3].includes(v.bindStatus)" :class="['status',v.bindStatus === 2 ? '' : 'bt-refuse']">{{v.bindStatus === 2 ? '审核中' : '审核失败'}}</div>
-          <div class="but" v-if="[1,9].includes(type)">
-            <div @click="bind(v)" v-if="!v.dadaBindType" class="but-con">绑定</div>
-          </div>
-          <div class="but" v-else-if="[5].includes(type)">
-            <div @click="bind(v)" v-if="v.bindStatus === 3 || !v.bindStatus" class="but-con">绑定</div>
-          </div>
-          <div class="but" v-else>
-            <div @click="bind(v)" v-if="!v.bindStatus" class="but-con">绑定</div>
-          </div>
-          <div class="but" @click="release(v)" v-if="v.bindStatus === 1">
-            <div class="but-con unbind">解绑</div>
-          </div>
+          <template v-if="memberType === 2">
+            <div class="but" v-if="[1,9].includes(type)">
+              <div @click="bind(v)" v-if="!v.dadaBindType" class="but-con">绑定</div>
+            </div>
+            <div class="but" v-else-if="[5].includes(type)">
+              <div @click="bind(v)" v-if="v.bindStatus === 3 || !v.bindStatus" class="but-con">绑定</div>
+            </div>
+            <div class="but" v-else>
+              <div @click="bind(v)" v-if="!v.bindStatus" class="but-con">绑定</div>
+            </div>
+            <div class="but" @click="release(v)" v-if="v.bindStatus === 1">
+              <div class="but-con unbind">解绑</div>
+            </div>
+          </template>
         </div>
       </div>
     </div>
@@ -65,7 +67,7 @@
     <el-dialog :title="title" :visible.sync="centerDialogVisible" width="40%" center>
       <el-form v-if="title === 'UU跑腿绑定'" :model="UUData" ref="UUData" label-width="80px" class="demo-ruleForm">
         <el-form-item label="城市" prop="cityName">
-          <el-input v-model="UUData.cityName" placeholder="请输入当前城市名称"></el-input>
+          <el-cascader style="width: 100%;" :show-all-levels="false" v-model="cityName" :options="areaData"></el-cascader>
         </el-form-item>
         <el-form-item label="手机号" prop="mobile">
           <el-input v-model="UUData.mobile" placeholder="请输入用户手机号"></el-input>
@@ -127,8 +129,9 @@ import {
   getBindDeliveryShopList,
   unBindAptNew,
 } from "../../api/shop";
+import areaData from "../../common/areadata.js";
 export default {
-  name: 'bindDelivery',
+  name: "bindDelivery",
   data() {
     return {
       deliveryList: [],
@@ -142,6 +145,7 @@ export default {
         mobile: "",
         validateCode: "",
       },
+      cityName: [],
       title: "UU跑腿绑定",
       count: 60,
       showCode: false,
@@ -160,6 +164,7 @@ export default {
       centerDialogVisible3: false,
       sfId: "",
       sfId2: "",
+      areaData: [],
     };
   },
   watch: {
@@ -199,6 +204,14 @@ export default {
     },
   },
   created() {
+    this.areaData = areaData.map(({ name, code, children }) => ({
+      value: code,
+      label: name,
+      children: children.map(({ name, code }) => ({
+        value: code,
+        label: name,
+      })),
+    }));
     if (this.memberType !== 1) {
       this.getDeliveryList();
     }
@@ -314,7 +327,7 @@ export default {
     changeTab(i) {
       this.curIndex = i;
       if ([1, 2, 5, 9, 13].includes(this.type)) {
-        this.sfId = ''
+        this.sfId = "";
         this.getBindDeliveryShopList();
       } else {
         let shop = this.deliveryList[i];
@@ -422,6 +435,14 @@ export default {
       });
     },
     bindUU() {
+      this.UUData.cityName = this.areaData
+        .find((v) => {
+          return v.value === this.cityName[0];
+        })
+        .children.find((v) => {
+          return v.value === this.cityName[1];
+        }).label;
+      // console.log("cityName", this.UUData.cityName);
       if (!this.UUData.cityName.trim()) {
         return this.$message({
           message: "城市不能为空",

+ 5 - 1
src/components/shopCompoents/bindTakeOut.vue

@@ -28,7 +28,11 @@
             <div class="but-con unbind">解绑</div>
           </div>
         </div>
-        <div class="shop-bind" @click="goBind">
+        <div class="shop-bind" v-if="waimaiList.length&&[6,7,8].includes(waimaiList[curIndex].type)">
+          <img src="../../../static/image/icon-customer.png" alt="" srcset="">
+          <div class="name">联系客服绑定</div>
+        </div>
+        <div class="shop-bind" @click="goBind" v-else>
           <img src="../../../static/image/icon-add.png" alt="" srcset="">
           <div class="name">绑定{{waimaiList[curIndex] && waimaiList[curIndex].name}}</div>
         </div>

+ 2 - 2
src/components/shopCompoents/bindUsbPrint.vue

@@ -28,10 +28,10 @@
           <el-input v-model="form.name" placeholder="给这台打印机取个名字吧" autocomplete="off" style="width: 100%">
           </el-input>
         </el-form-item>
-        <el-form-item label="自动打印接单" prop="deviceSecret">
+        <el-form-item label="接单自动打印" prop="deviceSecret">
           <el-switch v-model="form.openOrderPrint" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
         </el-form-item>
-        <el-form-item label="自动打印取消单" prop="deviceSecret">
+        <el-form-item label="取消单自动打印" prop="deviceSecret">
           <el-switch v-model="form.openOrderCancelPrint" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
         </el-form-item>
         <el-form-item label="打印份数">

+ 39 - 2
src/components/waimaiComponents/deliverySetting.vue

@@ -1,6 +1,22 @@
 <template>
   <div class="delivery-setting">
     <div class="model">
+      <div class="title">接单设置</div>
+      <div class="list">
+        <div class="item" v-for="(v,i) in list3" :key=i>
+          <div class="left">
+            <div class="left-top">
+              <div class="name">{{v.name}}</div>
+            </div>
+            <div class="left-bot">{{v.tips}}</div>
+          </div>
+          <div class="right">
+            <el-switch @change="change(v)" v-model="v.value" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="model">
       <div class="title">自动发单设置</div>
       <div class="list">
         <div class="item" v-for="(v,i) in list" :key=i>
@@ -86,7 +102,7 @@ export default {
           setContent: "设置时长",
           value: 1,
           field: "openAutodelivery",
-          tips: "冲突绑定模式,不支持自动发单",
+          tips: "冲突绑定模式,不支持自动发单",
           time: 0,
         },
         {
@@ -118,6 +134,14 @@ export default {
           tips: "关闭后打印的客户联小票将看不到商品价格",
         },
       ],
+      list3: [
+        {
+          name: "自动接单",
+          value: 1,
+          field: "openAutoorder",
+          tips: "非冲突绑定模式,不支持自动接单",
+        }
+      ],
       billDeliveryIds: [], // 推荐运力
       shieldDeliveryIds: [], // 屏蔽运力
       deliveryList: [],
@@ -224,6 +248,10 @@ export default {
             v.value = res.data[v.field];
             return v;
           });
+          this.list3 = this.list3.map((v) => {
+            v.value = res.data[v.field];
+            return v;
+          });
         } else {
           this.$message({
             type: "error",
@@ -270,6 +298,15 @@ export default {
 </script>
 
 <style lang="scss" scoped  type="text/css">
+/deep/ .el-button--default:hover {
+  background-color: rgba(252, 114, 0, 0.2);
+  border-color: rgba(252, 114, 0, 0.2);
+  color: #fc7200;
+}
+/deep/ .el-button--primary {
+  background-color: #fc7200;
+  border-color: #fc7200;
+}
 .model {
   .title {
     position: relative;
@@ -289,7 +326,7 @@ export default {
   .title::before {
     width: 3px;
     height: 16px;
-    background: rgba(252, 114, 0, 0.39);
+    background: #fc7200;
     border-radius: 2px;
     content: "";
     position: absolute;

+ 2 - 2
src/components/waimaiComponents/printerAdd.vue

@@ -27,10 +27,10 @@
           <el-input clearable v-model="form.deviceSecret" placeholder="查看打印机底部标签" autocomplete="off" style="width: 100%">
           </el-input>
         </el-form-item>
-        <el-form-item label="自动打印接单" prop="deviceSecret">
+        <el-form-item label="接单自动打印" prop="deviceSecret">
           <el-switch v-model="form.openOrderPrint" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
         </el-form-item>
-        <el-form-item label="自动打印取消单" prop="deviceSecret">
+        <el-form-item label="取消单自动打印" prop="deviceSecret">
           <el-switch v-model="form.openOrderCancelPrint" :active-value="1" :inactive-value="0" active-color="#FC7200" inactive-color="#999" />
         </el-form-item>
         <el-form-item label="打印份数">

BIN
static/image/icon-customer.png


BIN
static/image/invalid-coupon.png