update

admin/config.js

@@ -470,7 +470,7 @@ function mf(number, decimals, dec_point, thousands_sep) {
 var StateCode = {};
 var User_BindConnectModel = {};
 
-;(function (factory) {
+(function (factory) {
     if (typeof define === "function" && define.amd) {
         // AMD模式
         define(factory);

admin/diy-pc/static/shop/default/js/product_item.js

@@ -22,7 +22,6 @@ $(function() {
                     //defaultSelectValue : rowData.categoryId || '',
                     showRoot : true
                 }            
-
                 var categoryTree = Public.categoryTree($('#category_id'), opts, 'product_category');
             }
 

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "lancer-admin",
+  "name": "xiaofa-admin",
   "version": "2.0.12-dev",
   "private": true,
   "author": "Yutao",
@@ -26,6 +26,7 @@
   "dependencies": {
     "@logicflow/core": "^1.0.2",
     "@logicflow/extension": "^1.0.2",
+    "@vuemap/vue-amap": "^0.1.17",
     "axios": "^0.26.1",
     "clipboard": "^2.0.10",
     "core-js": "^3.21.1",
@@ -95,11 +96,11 @@
     "svg-sprite-loader": "^6.0.11",
     "vab-templates": "^0.0.5",
     "vue-eslint-parser": "^8.0.1",
-    "vue-template-compiler": "^2.6.14",
     "vue-plugin-utils": "1.0.3",
+    "vue-template-compiler": "^2.6.14",
     "webpack": "4.46.0",
-    "webpackbar": "^5.0.2",
+    "webpack-ld": "^1.0.2",
-    "webpack-ld": "^1.0.2"
+    "webpackbar": "^5.0.2"
   },
   "gitHooks": {
     "pre-commit": "lint-staged"

public/config.js

@@ -524,7 +524,6 @@ var User_BindConnectModel = {};
     return SYS.CONFIG;
 }));
 
-
 // utils.js
 if ('undefined' == typeof window.verifyUtils)
 {

public/index.html

@@ -25,6 +25,12 @@
       window.SYS = {CONFIG:{}, URL:{}};
     </script>
 
+    <!-- <script src="https://webapi.amap.com/maps?v=1.4.15&key=a00a7af766135e741fee8505247afb0b&plugin=AMap.CircleEditor"></script> -->
+    <script>
+      window._AMapSecurityConfig = {
+        securityJsCode:"07788e7ebd7e913985722bfc5986999f"
+    }
+    </script>    
     <script type="text/javascript" src="<%= VUE_APP_ADMIN_URL %>/config.js?v=<%= VUE_APP_VER %>"></script>
     <script type="text/javascript" src="<%= VUE_APP_ADMIN_URL %>/im/libs3.6.0.min.js?v=<%= VUE_APP_VER %>"></script>
     <script type="text/javascript" src="<%= VUE_APP_ADMIN_URL %>/im/im.js?v=<%= VUE_APP_VER %>"></script>

src/api/printer/printer.js

@@ -0,0 +1,200 @@
+import request from '@/utils/request'
+import { URL } from '@/config'
+
+
+//总后台-获取小票机品牌列表
+export function getReceiptMachineList(params){
+  return request({
+    url: URL.shop.store.printer.getReceiptMachineList,
+    method: 'get',
+    params,
+  })
+}
+
+//总后台-添加小票机品牌
+/**
+ * @param {
+ * model_name:飞鹅云打印机PF-V7       打票机型号
+ * intro:飞鹅云打印机PF-V7            打票机型号备注名
+ * brand_name:飞鹅                   品牌名
+ * website_url:www.feieyun.com       官网URL
+ * paper_with:58                     纸张宽度
+ * }  
+ * @returns 
+ */
+export function addReceiptMachine(params){
+  return request({
+    url: URL.shop.store.printer.addReceiptMachine,
+    method: 'post',
+    params,
+  })
+}
+
+//总后台-删除小票机品牌
+/**
+ * @param { model_id } 
+ * @returns 
+ */
+export function delectReceiptMachine(params){
+  return request({
+    url: URL.shop.store.printer.delectReceiptMachine,
+    method: 'post',
+    params,
+  })
+}
+
+//总后台-更新小票机品牌
+/**
+ * @param {
+* model_name:飞鹅云打印机PF-V7       打票机型号
+* intro:飞鹅云打印机PF-V7            打票机型号备注名
+* brand_name:飞鹅                   品牌名
+* website_url:www.feieyun.com       官网URL
+* paper_with:58                     纸张宽度
+* }  
+* @returns 
+*/
+export function updateReceiptMachine(params){
+  return request({
+    url: URL.shop.store.printer.updateReceiptMachine,
+    method: 'post',
+    params,
+  })
+}
+
+
+// 商家端-获取打印机列表
+export function getPrinterList(params){
+  return request({
+    url: URL.shop.store.printer.getPrinterList,
+    method: 'get',
+    params,
+  })
+}
+// 商家端-获取打印机详情
+/**
+ * @param {id}  打印机id 
+ * @returns 
+ */
+export function getPrinterDetail(params){
+  return request({
+    url: URL.shop.store.printer.getPrinterDetail,
+    method: 'get',
+    params,
+  })
+}
+// 商家端-获取品牌列表
+/**
+ * @param {count}  数量
+ * @returns 
+ */
+export function getPrinterModelList(params){
+  return request({
+    url: URL.shop.store.printer.getPrinterModelList,
+    method: 'get',
+    params,
+  })
+}
+
+// 商家端-获取打印区域列表
+/**
+ * @param {count}  数量
+ * @returns 
+ */
+export function getPrinterflagList(params){
+  return request({
+    url: URL.shop.store.printer.getPrinterflagList,
+    method: 'get',
+    params,
+  })
+}
+
+// 商家端-添加打印机
+/**
+ * @param {
+* model_id:1                  打票机型号ID
+* printer_name:核销台打印机    打票机备注名
+* printer_sn:922441475        打票机编号
+* printer_key:r6ZXPvHH        打票机密钥
+* region_id:1                 打票机摆放区域ID
+* paper_with:58               纸张宽度
+* printer_id:1                打票机自增ID
+* website_url:https://www.feieyun.com  打印机网站地址
+* }  数量
+* @returns 
+*/
+
+export function addPrinter(params){
+ return request({
+   url: URL.shop.store.printer.addPrinter,
+   method: 'post',
+   params,
+ })
+}
+
+//商家端-删除打印机
+/**
+ * @param { printer_id:0}  打票机自增ID
+ * @returns 
+ */
+export function delectPrinter(params){
+  return request({
+    url: URL.shop.store.printer.delectPrinter,
+    method: 'post',
+    params,
+  })
+ }
+
+
+// 商家端-更新打印机信息
+/**
+ * @param {
+ * model_id:1                  打票机型号ID
+ * printer_name:核销台打印机    打票机备注名
+ * printer_sn:922441475        打票机编号
+ * printer_key:r6ZXPvHH        打票机密钥
+ * region_id:1                 打票机摆放区域ID
+ * paper_with:58               纸张宽度
+ * printer_id:1                打票机自增ID
+ * website_url:https://www.feieyun.com  打印机网站地址
+ * }  数量
+ * @returns 
+ */
+
+export function updatePrinterInfo(params){
+  return request({
+    url: URL.shop.store.printer.updatePrinterInfo,
+    method: 'post',
+    params,
+  })
+}
+
+//商家端-更新打印机状态
+/**
+ * @param {printer_id,status}  
+ * @returns 
+ */
+
+export function updatePrnterStatus(params){
+  return request({
+    url: URL.shop.store.printer.updatePrnterStatus,
+    method: 'post',
+    params,
+  })
+}
+
+
+// 商家端-测试打印
+/**
+ * @param {orderId}  DD-20241112-1
+ * @returns 
+ */
+export function testPrinter(params){
+  return request({
+    url: URL.shop.store.printer.testPrinter,
+    method: 'post',
+    params,
+  })
+}
+
+

src/baiduMap/index.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
-import BaiduMap from 'vue-baidu-map'
+// import BaiduMap from 'vue-baidu-map'
+import BaiduMap from './../components/baidu_Map_xiufu'
 
 // 百度地图
 // Vue.use(BaiduMap, {
@@ -13,4 +14,5 @@ Vue.use(BaiduMap, {
   ak: 'xSeK5okwxCQbcwdGoOufv2EMuMdvsVFI',
 })
 
+
 export default BaiduMap

src/components/baidu_Map_xiufu/overlays/Circle.vue

@@ -8,44 +8,50 @@ export default {
   render() {},
   mixins: [commonMixin('overlay')],
   props: {
-    center: {
+    center: {},
-    },
+    radius: {},
-    radius: {
-    },
     strokeColor: {
-      type: String
+      type: String,
     },
     strokeWeight: {
-      type: Number
+      type: Number,
     },
     strokeOpacity: {
-      type: Number
+      type: Number,
     },
     strokeStyle: {
-      type: String
+      type: String,
     },
     fillColor: {
-      type: String
+      type: String,
     },
     fillOpacity: {
-      type: Number
+      type: Number,
     },
     massClear: {
       type: Boolean,
-      default: true
+      default: true,
     },
     clicking: {
       type: Boolean,
-      default: true
+      default: true,
     },
     editing: {
       type: Boolean,
-      default: false
+      default: false,
-    }
+    },
   },
   watch: {
     'center.lng'(val, oldVal) {
-      const {BMap, originInstance, isEditing, disableEditing, enableEditing, center, editing} = this
+      const {
+        BMap,
+        originInstance,
+        isEditing,
+        disableEditing,
+        enableEditing,
+        center,
+        editing,
+      } = this
       if (!isEditing) {
         disableEditing()
         const lng = val
@@ -56,7 +62,15 @@ export default {
       }
     },
     'center.lat'(val, oldVal) {
-      const {BMap, originInstance, isEditing, disableEditing, enableEditing, center, editing} = this
+      const {
+        BMap,
+        originInstance,
+        isEditing,
+        disableEditing,
+        enableEditing,
+        center,
+        editing,
+      } = this
       if (!isEditing) {
         disableEditing()
         const lat = val
@@ -67,7 +81,13 @@ export default {
       }
     },
     radius(val, oldVal) {
-      const {originInstance, isEditing, disableEditing, enableEditing, editing} = this
+      const {
+        originInstance,
+        isEditing,
+        disableEditing,
+        enableEditing,
+        editing,
+      } = this
       if (!isEditing) {
         disableEditing()
         originInstance.setRadius(val)
@@ -96,11 +116,13 @@ export default {
       val ? this.enableEditing() : this.disableEditing()
     },
     massClear(val) {
-      val ? this.originInstance.enableMassClear() : this.originInstance.disableMassClear()
+      val
+        ? this.originInstance.enableMassClear()
+        : this.originInstance.disableMassClear()
     },
     clicking(val) {
       this.reload()
-    }
+    },
   },
   methods: {
     dragStartHandler() {
@@ -111,8 +133,15 @@ export default {
       this.bindEditingNodeEvents()
     },
     bindEditingNodeEvents() {
-      const {originInstance, editingKey, dragStartHandler, dragEndHandler} = this
+      const { originInstance, editingKey, dragStartHandler, dragEndHandler } =
-      originInstance[editingKey].forEach($node => {
+        this
+      var key = editingKey
+      if (editingKey == undefined) {
+        key = 'nc'
+      } else {
+        key = editingKey
+      }
+      originInstance[key].forEach(($node) => {
         $node.addEventListener('dragstart', dragStartHandler)
         $node.addEventListener('dragend', dragEndHandler)
       })
@@ -137,15 +166,40 @@ export default {
         }
         overlay.disableEditing()
         for (const key in overlay) {
-          if (overlay[key] && overlay[key].length === 0 && ~stack.indexOf(key)) {
+          if (
+            overlay[key] &&
+            overlay[key].length === 0 &&
+            ~stack.indexOf(key)
+          ) {
             this.editingKey = key
           }
         }
       }, 0)
     },
     load() {
-      const {BMap, map, center, radius, strokeColor, strokeWeight, strokeOpacity, strokeStyle, fillColor, fillOpacity, editing, massClear, clicking, enableEditing, disableEditing, getEditingKey, editingKey} = this
+      const {
-      const overlay = new BMap.Circle(createPoint(BMap, {lng: center.lng, lat: center.lat}), radius, {
+        BMap,
+        map,
+        center,
+        radius,
+        strokeColor,
+        strokeWeight,
+        strokeOpacity,
+        strokeStyle,
+        fillColor,
+        fillOpacity,
+        editing,
+        massClear,
+        clicking,
+        enableEditing,
+        disableEditing,
+        getEditingKey,
+        editingKey,
+      } = this
+      const overlay = new BMap.Circle(
+        createPoint(BMap, { lng: center.lng, lat: center.lat }),
+        radius,
+        {
           strokeColor,
           strokeWeight,
           strokeOpacity,
@@ -154,9 +208,11 @@ export default {
           fillOpacity,
           // enableEditing: editing,
           enableMassClear: massClear,
-        enableClicking: clicking
+          enableClicking: clicking,
-      })
+        }
+      )
       this.originInstance = overlay
+
       map.addOverlay(overlay)
       bindEvents.call(this, overlay)
       // 解决圆形组件无法双向绑定的问题
@@ -164,7 +220,7 @@ export default {
       setTimeout(() => {
         editing ? enableEditing() : disableEditing()
       }, 0)
-    }
+    },
-  }
+  },
 }
 </script>

src/config/net.config.js

@@ -1,8 +1,7 @@
+
 /**
  * @description 导出网络配置
  **/
-
-
 let admin_url = process.env.VUE_APP_ADMIN_URL
 let base_url = process.env.VUE_APP_BASE_URL
 let api_url = process.env.VUE_APP_API_URL
@@ -1008,6 +1007,29 @@ let url = {
           del: api_url + '/admin/shop/shop-store-product-tag/del',
         },
       },
+      printer:{
+        //总后台-获取小票机品牌列表
+        getReceiptMachineList:api_url + '/admin/shop/store/printer/model/page',
+        addReceiptMachine:api_url + '/admin/shop/store/printer/model/add/new',
+        delectReceiptMachine : api_url + '/admin/shop/store/printer/model/delete',
+        updateReceiptMachine : api_url + '/admin/shop/store/printer/model/update',
+        //商家端-获取打印机列表
+        getPrinterList: api_url + '/admin/shop/store/printer/page',
+        //商家端-获取打印机详情
+        getPrinterDetail: api_url + '/admin/shop/store/printer/detail',
+        //商家端-获取打印机品牌下拉列表
+        getPrinterModelList: api_url + '/admin/shop/store/printer/model/list',
+        //商家端-获取打印机区域列表
+        getPrinterflagList:  api_url + '/admin/shop/store/printer/region/list',
+        addPrinter:api_url + '/admin/shop/store/printer/add/new',
+        delectPrinter: api_url + '/admin/shop/store/printer/delete',
+        //商家端-更新打印机信息
+        updatePrinterInfo: api_url + '/admin/shop/store/printer/update',
+        //商家端-更新打印机状态
+        updatePrnterStatus: api_url + '/admin/shop/store/printer/status/update',
+        //商家端-测试打印
+        testPrinter:api_url + '/admin/shop/store/printer/print/order'
+      }
     },
     user: {
       delivery: {
@@ -1303,6 +1325,9 @@ let url = {
         getList: api_url + '/admin/admin/admin-log-error/list',
       },
     },
+    printer:{
+
+    }
   },
   order: {
     add: api_url + '/order/add',

src/config/setting.config.js

@@ -3,7 +3,7 @@
  */
 module.exports = {
   // 标题，此项修改后需要重启项目！！！ (包括初次加载雪花屏的标题 页面的标题 浏览器的标题)
-  title: '澜驰商城',
+  title: '小发同城',
   // 标题分隔符
   titleSeparator: ' - ',
   // 标题是否反转
@@ -13,7 +13,7 @@ module.exports = {
   // 简写
   abbreviation: 'lancerdt Multi-Vendor Marketplace Platform',
   // pro版本copyright可随意修改
-  copyright: 'Copyright 2024 上海澜驰数字科技有限公司 版权所有',
+  copyright: 'Copyright 2024 小发同城科技有限公司 版权所有',
   // 缓存路由的最大数量
   keepAliveMaxNum: 20,
   // 路由模式，可选值为 history 或 hash
@@ -32,7 +32,7 @@ module.exports = {
   recordRoute: true,
   // 是否开启logo，不显示时设置false，请填写src/icon路径下的图标名称
   // 如需使用内置RemixIcon图标，请自行去logo组件切换注释代码(内置svg雪碧图较大，对性能有一定影响)
-  logo: 'LOGO',
+  logo: 'xiaofa-logo',
   // 语言类型zh、en
   i18n: 'zh',
   // 消息框消失时间

src/icon/xiaofa-logo.svg

@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="170px" height="170px" viewBox="0 0 170 170" enable-background="new 0 0 170 170" xml:space="preserve">  <image id="image0" width="170" height="170" x="0" y="0"
+    xlink:href="data:image/png;base64,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
+MDQrMDA6MDA2n1wbAAAAAElFTkSuQmCC" />
+</svg>

src/main.js

@@ -3,21 +3,25 @@ import App from './App'
 import i18n from './i18n'
 import store from './store'
 import router from './router'
-// import baiduMap from './baiduMap'
+import baiduMap from './baiduMap'
-import baiduMap from './components/baidu_Map_xiufu'
+
 import '@/vab'
 import './assets/css/diy.css'
 
+//import VueAMap, {initAMapApiLoader} from '@vuemap/vue-amap';
+// import '@vuemap/vue-amap/dist/style.css'
+
+
 import { sprintf, translateTitle as __ } from '@/utils/i18n'
 
+// Vue.use(VueAMap);
 
+// initAMapApiLoader({
+//   key: 'a00a7af766135e741fee8505247afb0b',
+//   plugins:['AMap.CircleEditor'],
+// })
 
 
-Vue.use(baiduMap, {
-  // ak 是在百度地图开发者平台申请的密钥 详见 http://lbsyun.baidu.com/apiconsole/key */
-  ak: 'xSeK5okwxCQbcwdGoOufv2EMuMdvsVFI',
-})
-
 /**
  * @description 正式环境默认使用mock，正式项目记得注释后再打包
  */

src/utils/routes.js

@@ -13,6 +13,26 @@ import icon from "../views/403.vue"
  */
 export function convertRouter(asyncRoutes) {
   return asyncRoutes.map((route) => {
+
+    if(route.meta.title == '设置'){
+
+       const obj = {
+        path: "/receiptMachine",
+        "component":"@/views/settings/config/receiptMachine",
+        name: "Vab86001",
+        redirect: null,
+        meta: {
+            title: "小票机品牌",
+            icon: "",
+            noClosable: 0,
+            hidden: null
+        },
+        menuHidden: false
+      }
+
+      route.children.push(obj);
+  }
+
     if(route.meta.title == "基础"){
               
       const cloudPrintRoute = {
@@ -44,7 +64,7 @@ export function convertRouter(asyncRoutes) {
             },
             {
               path: "/addCloudPrint",
-                "component":"@/views/store/base/cloudPrint/addCloudPrint",
+                "component":"@/views/store/base/cloudPrint/editCloudPrint",
                 name: "Vab81002",
                 redirect: null,
                 meta: {
@@ -82,8 +102,8 @@ export function convertRouter(asyncRoutes) {
                 menuHidden: false
             },
             {
-              path: "/addTemplateManagement",
+              path: "/templateManagementAdd",
-              "component":"@/views/store/base/cloudPrint/addTemplateManagement",
+              "component":"@/views/store/base/cloudPrint/editTemplateManagement",
               name: "Vab81005",
               redirect: null,
               meta: {
@@ -95,7 +115,7 @@ export function convertRouter(asyncRoutes) {
               menuHidden: false
             },
             {
-              path: "/editTemplateManagement",
+              path: "/templateManagementEdit",
               "component":"@/views/store/base/cloudPrint/editTemplateManagement",
               name: "Vab81006",
               redirect: null,
@@ -164,6 +184,45 @@ export function convertRouter(asyncRoutes) {
                 },
                 menuHidden: false
             },
+            {
+              path: "/selfPickUpSite",
+                "component":"@/views/store/base/distributionSetup/selfPickUpSite",
+                name: "Vab82004",
+                redirect: null,
+                meta: {
+                    title: "自提点列表",
+                    icon: "",
+                    noClosable: 0,
+                    hidden: true
+                },
+                menuHidden: false
+            },
+            {
+              path: "/selfPickUpSiteAdd",
+                "component":"@/views/store/base/distributionSetup/editSelfPickUpSite",
+                name: "Vab82005",
+                redirect: null,
+                meta: {
+                    title: "编辑自提点",
+                    icon: "",
+                    noClosable: 0,
+                    hidden: true
+                },
+                menuHidden: false
+            },
+            {
+              path: "/selfPickUpSiteEdit",
+                "component":"@/views/store/base/distributionSetup/editSelfPickUpSite",
+                name: "Vab82006",
+                redirect: null,
+                meta: {
+                    title: "编辑自提点",
+                    icon: "",
+                    noClosable: 0,
+                    hidden: true
+                },
+                menuHidden: false
+            },
         ]
     
       }

src/vab/components/VabLogo/index.vue

@@ -8,8 +8,8 @@
     <router-link to="/">
       <span class="logo">
         <!-- 使用自定义svg示例 -->
-        <!--<vab-icon v-if="logo" :icon="logo" is-custom-svg />-->
+        <vab-icon v-if="logo" :icon="logo" is-custom-svg />
-        <vab-icon v-if="logo" :icon="avatar" is-custom-svg />
+        <!-- <vab-icon v-if="logo" :icon="avatar" is-custom-svg /> -->
       </span>
       <span
         class="title"
@@ -150,8 +150,6 @@
   }
 }
 
-
-
 //.vab-side-bar:not(.is-collapse) .logo{
 //  margin-left: 21px;
 //  float: left;
@@ -162,5 +160,4 @@
 //  //line-height:60px;
 //  margin-left:10px;
 //}
-
 </style>

src/vab/components/VabTheme/components/VabThemeSetting.vue

@@ -69,11 +69,7 @@
         .then(({ value }) => {
           if (value !== 'vabp') {
             // 留给没有购买VueAdminBeautifulPro框架的人的赠言：既然你已经找到这里了，那说明你的能力很出众，也应该很喜欢这个框架吧，但是不绑定github账号依旧看不到源码的，所以加我qq买一个吧
-              this.$baseMessage(
+            this.$baseMessage('秘钥不正确！', 'error', 'vab-hey-message-error')
-                '秘钥不正确！',
-                'error',
-                'vab-hey-message-error'
-              )
           }
           let path = this.$route.path + '/index.vue'
           const _path = this.$route.path

src/views/login/index.vue

@@ -13,9 +13,7 @@
           :rules="rules"
         >
           <div class="title">{{ title }}</div>
-          <div class="title-tips">
+          <div class="title-tips"></div>
-
-          </div>
           <el-form-item prop="user_account">
             <el-input
               v-model.trim="form.user_account"
@@ -176,7 +174,7 @@
   },
   mounted() {
     this.changeCode()
-        if (URL.api_url == "https://demo.lancerdt.com") {
+    if (URL.api_url == 'https://demo.lancerdt.com') {
       this.form.user_account = 'demoadmin'
       this.form.user_password = '111111'
     }
@@ -332,7 +330,7 @@
     left: 5px;
     z-index: $base-z-index;
     font-size: 16px;
-      color: #d7dee3;
+    color: #ccc;
     cursor: pointer;
     user-select: none;
   }
@@ -342,7 +340,7 @@
     right: 25px;
     left: -35px;
     font-size: 16px;
-      color: #d7dee3;
+    color: #ccc;
     cursor: pointer;
     user-select: none;
   }

src/views/product/productList/components/addProductEdit.vue

@@ -19,7 +19,11 @@
                 v-model="categoryId"
                 filterable
                 :options="categoryOptions"
-                  :props="{ label: 'category_name', value: 'category_id', children:'sub'}"
+                :props="{
+                  label: 'category_name',
+                  value: 'category_id',
+                  children: 'sub',
+                }"
                 :style="{ width: '90%' }"
                 @change="onCategoryChange"
                 :disabled="false"
@@ -29,13 +33,22 @@
           <el-col :md="18">
             <el-form-item :label="__('商品类型')">
               <el-radio-group v-model="productForm.kind_id" @change="radChange">
-                  <el-radio :disabled="!row.category_virtual_enable" :label="1201">
+                <el-radio
+                  :disabled="!row.category_virtual_enable"
+                  :label="1201"
+                >
                   {{ __('实体商品') }}
                 </el-radio>
-                  <el-radio :disabled="!row.category_virtual_enable" :label="1202">
+                <el-radio
+                  :disabled="!row.category_virtual_enable"
+                  :label="1202"
+                >
                   {{ __('虚拟商品（服务类商品）') }}
                 </el-radio>
-                  <el-radio :disabled="!row.category_virtual_enable" :label="1203">
+                <el-radio
+                  :disabled="!row.category_virtual_enable"
+                  :label="1203"
+                >
                   {{ __('电子卡券') }}
                 </el-radio>
               </el-radio-group>
@@ -194,9 +207,7 @@
                     <el-form-item :label="__('上下架')">
                       <el-switch
                         v-model="batchObj.item_enable"
-
                         :active-value="1001"
-
                         :inactive-value="1002"
                       />
                     </el-form-item>
@@ -228,9 +239,24 @@
               >
                 <template slot="header" slot-scope="scope">
                   <!-- 这里是自定义表头内容 -->
-                  <div v-if="scope.column.property === 'item_market_price' || scope.column.property === 'item_unit_price' || scope.column.property === 'item_advice_price' || scope.column.property === 'item_unit_points' || scope.column.property === 'item_quantity' || scope.column.property === 'item_weight'">
+                  <div
+                    v-if="
+                      scope.column.property === 'item_market_price' ||
+                      scope.column.property === 'item_unit_price' ||
+                      scope.column.property === 'item_advice_price' ||
+                      scope.column.property === 'item_unit_points' ||
+                      scope.column.property === 'item_quantity' ||
+                      scope.column.property === 'item_weight'
+                    "
+                  >
                     <span>{{ scope.column.label }}</span>
-                    <vab-icon :data-key="scope.column.property" icon="more-2-line" style="cursor:pointer;" :title="__('批量设置')"  @click="batOper"/>
+                    <vab-icon
+                      :data-key="scope.column.property"
+                      icon="more-2-line"
+                      style="cursor: pointer"
+                      :title="__('批量设置')"
+                      @click="batOper"
+                    />
                   </div>
                   <div v-else>
                     <span>{{ scope.column.label }}</span>
@@ -268,16 +294,12 @@
                   <el-switch
                     v-else-if="scope.column.property === 'item_enable'"
                     v-model="scope.row.item_enable"
-
                     :active-value="1001"
-
                     :inactive-value="1002"
                   />
                   <el-switch
                     v-else-if="scope.column.property === 'item_is_default'"
                     v-model="scope.row.item_is_default"
-
-
                   />
                   <el-input
                     v-else-if="scope.column.property === 'item_market_price'"
@@ -724,7 +746,7 @@
           </el-col>
         </el-form>
       </el-row>
-      <el-row>
+      <el-row style="margin-bottom: 68px">
         <div class="tit_font">{{ __('详细介绍') }}</div>
         <el-divider />
         <el-row class="quill">
@@ -759,15 +781,6 @@
         <!--        </el-row>-->
       </el-row>
     </el-scrollbar>
-    <el-row style="padding-top: 20px">
-      <el-col :offset="12" :span="12">
-        <el-button @click="close">{{ __('取消') }}</el-button>
-        <el-button :loading="saveBtnLoading" type="primary" @click="save">
-          {{ __('保存') }}
-        </el-button>
-      </el-col>
-    </el-row>
-
 
     <el-dialog
       append-to-body
@@ -876,6 +889,19 @@
         <el-button @click="closeEditSpecItem">{{ __('取消') }}</el-button>
       </template>
     </el-dialog>
+    <el-row style="padding-top: 20px" class="footer">
+      <el-col :offset="12" :span="12">
+        <el-button size="medium" @click="close">{{ __('取消') }}</el-button>
+        <el-button
+          size="medium"
+          :loading="saveBtnLoading"
+          type="primary"
+          @click="save"
+        >
+          {{ __('保存') }}
+        </el-button>
+      </el-col>
+    </el-row>
   </el-dialog>
 </template>
 
@@ -887,7 +913,10 @@
 import quillEditor from '@/components/quill/quillEditor'
 import picUpload from '@/components/material/PicUpload'
 import { get } from '@/api/base/product/type'
-  import {categoryTree as getCategoryTree, get as getCategory} from '@/api/base/product/category'
+import {
+  categoryTree as getCategoryTree,
+  get as getCategory,
+} from '@/api/base/product/category'
 import { list as tags } from '@/api/store/product/tag'
 import { transports } from '@/api/store/transport/type'
 import { getPayCardTypes } from '@/api/card/type'
@@ -1129,7 +1158,7 @@
         {
           label: this.__('属性编号'),
           property: 'item_number',
-          },/*
+        } /*
           {
             label: this.__('条形码'),
             property: 'item_barcode',
@@ -1137,7 +1166,7 @@
           {
             label: this.__('重量[kg]'),
             property: 'item_weight',
-          },*/
+          },*/,
         {
           label: this.__('市场价'),
           property: 'item_market_price',
@@ -1282,27 +1311,34 @@
       this.$forceUpdate()
     },
     getStoreBase() {
-        if (this.configs.config.supplier_market_enable && 2 == this.configs.store_type) {
+      if (
-          const unitPriceIndex = this.expHead.findIndex(item => item.property === 'item_unit_price');
+        this.configs.config.supplier_market_enable &&
+        2 == this.configs.store_type
+      ) {
+        const unitPriceIndex = this.expHead.findIndex(
+          (item) => item.property === 'item_unit_price'
+        )
 
         if (unitPriceIndex !== -1) {
-            this.expHead[unitPriceIndex].label = this.__('成本价');
+          this.expHead[unitPriceIndex].label = this.__('成本价')
 
           this.expHead.splice(unitPriceIndex + 1, 0, {
             label: this.__('建议零售价'),
             property: 'item_advice_price',
-            });
+          })
         }
 
-          const unitIndex = this.virtualHead.findIndex(item => item.property === 'item_unit_price');
+        const unitIndex = this.virtualHead.findIndex(
+          (item) => item.property === 'item_unit_price'
+        )
 
         if (unitIndex !== -1) {
-            this.virtualHead[unitIndex].label = this.__('成本价');
+          this.virtualHead[unitIndex].label = this.__('成本价')
 
           this.virtualHead.splice(unitIndex + 1, 0, {
             label: this.__('建议零售价'),
             property: 'item_advice_price',
-            });
+          })
         }
       }
     },
@@ -1373,9 +1409,7 @@
       var that = this
       this.$refs['specItemForm'].validate(async (valid) => {
         if (valid) {
-            const { msg, status, data } = await doEditSpecItem(
+          const { msg, status, data } = await doEditSpecItem(this.specItemForm)
-              this.specItemForm
-            )
           if (200 == status) {
             // 修改规格编辑后数据
             if (that.specItemForm.spec_item_id) {
@@ -1424,9 +1458,7 @@
       //新增
       for (let j = 0; j <= specItemList.length - 1; j++) {
         for (let i = 0; i <= spec.specItems.length - 1; i++) {
-            if (
+          if (spec.specItems[i].spec_item_id == specItemList[j].spec_item_id) {
-              spec.specItems[i].spec_item_id == specItemList[j].spec_item_id
-            ) {
             exists_new_sii.push(specItemList[j].spec_item_id)
             break
           }
@@ -1437,9 +1469,7 @@
       for (let i = 0; i <= spec.specItems.length - 1; i++) {
         for (let j = 0; j <= specItemList.length - 1; j++) {
           //更改最新值
-            if (
+          if (spec.specItems[i].spec_item_id == specItemList[j].spec_item_id) {
-              spec.specItems[i].spec_item_id == specItemList[j].spec_item_id
-            ) {
             this.$set(
               spec.specItems,
               i,
@@ -1516,8 +1546,7 @@
             // 移除勾选
             for (let i = 0; i < that.checkSpec[row.spec_id].length; i++) {
               if (
-                  that.checkSpec[row.spec_id][i].spec_item_id ==
+                that.checkSpec[row.spec_id][i].spec_item_id == row.spec_item_id
-                  row.spec_item_id
               ) {
                 that.checkSpec[row.spec_id].splice(i, 1)
               }
@@ -1846,7 +1875,7 @@
       console.info(row)
 
       if (row.length > 0) {
-          const category_id = row[row.length-1];
+        const category_id = row[row.length - 1]
         const category = this.findTree(this.categoryOptions, category_id)
 
         if (category != null) {
@@ -2232,12 +2261,19 @@
       }
       const specData = this.specData
       for (let i = 0; i < specData.length; i++) {
-          if (specData[i].item_unit_price <= 0 && specData[i].item_unit_points <= 0) {
+        if (
+          specData[i].item_unit_price <= 0 &&
+          specData[i].item_unit_points <= 0
+        ) {
           this.$baseMessage('商品零售价及积分不能同时为0', 'warning')
           return
         }
 
-          if (this.configs.config.supplier_market_enable && 2 == this.configs.store_type && specData[i].item_advice_price <= 0) {
+        if (
+          this.configs.config.supplier_market_enable &&
+          2 == this.configs.store_type &&
+          specData[i].item_advice_price <= 0
+        ) {
           this.$baseMessage('商品建议零售价不能为0', 'warning')
           return
         }
@@ -2379,21 +2415,21 @@
     async getCategoryTree() {
       const { data } = await getCategoryTree()
 
-        const treeData = this.tree(data);
+      const treeData = this.tree(data)
       console.info(treeData)
       //遍历，将空子集设置为null
-        this.categoryOptions = treeData;
+      this.categoryOptions = treeData
     },
 
     tree(data) {
       for (let i = 0; i < data.length; i++) {
-          let item = data[i];
+        let item = data[i]
 
         // item.sub 不等于 undefined && item.sub.length 大于 0 时
         if (item.sub && item.sub.length > 0) {
-            item.sub = this.tree(item.sub);
+          item.sub = this.tree(item.sub)
         } else {
-            delete item.sub;
+          delete item.sub
         }
       }
 
@@ -2401,7 +2437,7 @@
     },
     findTree(data, idx) {
       for (let i = 0; i < data.length; i++) {
-          let item = data[i];
+        let item = data[i]
 
         if (item.category_id == idx) {
           return item
@@ -2409,9 +2445,9 @@
 
         // item.sub 不等于 undefined && item.sub.length 大于 0 时
         if (item.sub && item.sub.length > 0) {
-            const tmp =  this.findTree(item.sub, idx);
+          const tmp = this.findTree(item.sub, idx)
           if (tmp != null) {
-              return tmp;
+            return tmp
           }
         }
       }
@@ -2611,20 +2647,20 @@
     },
 
     batOper(e) {
-        const key = e.target.dataset.key;
+      const key = e.target.dataset.key
-        let title = "";
+      let title = ''
-        if (key == "item_market_price") {
+      if (key == 'item_market_price') {
-          title =  this.__('批量设置市场价');
+        title = this.__('批量设置市场价')
-        } else if (key == "item_unit_price") {
+      } else if (key == 'item_unit_price') {
-          title =  this.__('批量设置价格');
+        title = this.__('批量设置价格')
-        } else if (key == "item_unit_points") {
+      } else if (key == 'item_unit_points') {
-          title =  this.__('批量设置积分');
+        title = this.__('批量设置积分')
-        } else if (key == "item_quantity") {
+      } else if (key == 'item_quantity') {
-          title =  this.__('批量设置库存');
+        title = this.__('批量设置库存')
-        } else if (key == "item_weight") {
+      } else if (key == 'item_weight') {
-          title =  this.__('批量设置重量');
+        title = this.__('批量设置重量')
-        } else if (key == "item_advice_price") {
+      } else if (key == 'item_advice_price') {
-          title =  this.__('批量设置建议零售价');
+        title = this.__('批量设置建议零售价')
       }
 
       this.$prompt(title, {
@@ -2649,9 +2685,11 @@
 </script>
 <style lang="scss" scoped>
 .tit_font {
-    font-size: 21px;
+  padding: 10px 0;
   line-height: inherit;
-    color: #333;
+  font-size: 21px;
+  font-weight: bold;
+  color: #000;
 }
 
 .add-product-upload .el-upload {
@@ -2706,7 +2744,7 @@
 }
 
 .quill {
-    padding-bottom: 50px;
+  margin-bottom: 58px;
 }
 
 ::v-deep {
@@ -2731,5 +2769,28 @@
   .pic-upload--picture-card {
     margin: 0 5px;
   }
+
+  .center-dialog {
+    padding-bottom: 58px;
+    position: relative;
+    overflow: hidden;
+  }
+
+  .footer {
+    position: fixed; /* 使用fixed定位 */
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 58px;
+    line-height: 58px;
+    background: #fff;
+    color: white;
+    text-align: center;
+    z-index: 1;
+    display: flex;
+    padding-top: 0 !important;
+    justify-content: center;
+    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.35);
+  }
 }
 </style>

src/views/settings/config/receiptMachine.vue

@@ -0,0 +1,425 @@
+<template>
+  <div class="receipt-machine-container">
+    <div class="head">
+      <div class="head-add-btn">
+        <el-button
+          icon="el-icon-plus"
+          type="primary"
+          size="medium"
+          @click="handleShowDialog"
+        >
+          添加小票机品牌
+        </el-button>
+      </div>
+      <div class="head-content">
+        <span class="name">小票机名称：</span>
+        <el-input
+          placeholder="请输入自提点名称"
+          suffix-icon="el-icon-search"
+          v-model="brandName"
+          size="medium"
+          class="input-with-select"
+        ></el-input>
+        <el-button type="primary" size="medium" @click="handleSearch">
+          搜索
+        </el-button>
+        <el-button size="medium" @click="handleClear">清除条件</el-button>
+      </div>
+    </div>
+    <el-table
+      :data="tableData"
+      :height="tableConfig.height"
+      style="width: 100%"
+      :stripe="true"
+    >
+      <el-table-column
+        align="center"
+        v-for="(item, index) in tabColumn"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :width="item.width"
+      >
+        <template #default="{ row, $index }">
+          <div class="" v-if="item.label == '操作'">
+            <el-button
+              type="text"
+              size="small"
+              @click="handleEdit(row, $index)"
+            >
+              编辑
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="handleDelectReceipt(row)"
+            >
+              删除
+            </el-button>
+            <!-- <el-button type="text" size="small">禁用</el-button> -->
+          </div>
+          <div v-else-if="item.label == '序号'">
+            {{ $index + 1 }}
+          </div>
+          <div v-else>
+            {{ row[item.prop] }}
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog
+      class="receipt-machine-dialog"
+      :title="dialogTitle"
+      :top="'40vh'"
+      :width="'700px'"
+      :visible.sync="showDialog"
+      :before-close="handleCloseDialog"
+    >
+      <el-form
+        ref="formDialog"
+        class="form-dialog"
+        :model="formDialog"
+        :rules="formDialogRules"
+        label-width="160px"
+      >
+        <el-form-item label="打票机型号" prop="model_name">
+          <el-input
+            v-model="formDialog.model_name"
+            placeholder="飞鹅云打印机PF-V7"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="打票机型号备注名" prop="intro">
+          <el-input
+            v-model="formDialog.intro"
+            placeholder="飞鹅云打印机PF-V7"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="品牌名" prop="brand_name">
+          <el-input
+            v-model="formDialog.brand_name"
+            placeholder="飞鹅"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="官网URL" prop="website_url">
+          <el-input
+            v-model="formDialog.website_url"
+            placeholder="www.feieyun.com"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="纸张宽度" prop="paper_with">
+          <el-input v-model="formDialog.paper_with" placeholder="58"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="medium" @click="handleCloseDialog">取 消</el-button>
+        <el-button size="medium" type="primary" @click="handleSubmitForm">
+          确 定
+        </el-button>
+      </span>
+    </el-dialog>
+    <el-pagination
+      background
+      :current-page="params.pageNum"
+      :layout="layout"
+      :page-size="params.pageSize"
+      :total="total"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    />
+  </div>
+</template>
+
+<script>
+import {
+  getReceiptMachineList,
+  addReceiptMachine,
+  delectReceiptMachine,
+  updateReceiptMachine,
+} from '@/api/printer/printer'
+export default {
+  data() {
+    return {
+      showDialog: false,
+      isEdit: false,
+      dialogTitle: '添加小票机品牌',
+      formDialog: {
+        model_name: '',
+        intro: '',
+        brand_name: '',
+        website_url: '',
+        paper_with: '',
+      },
+      formDialogRules: {
+        model_name: [
+          { required: true, message: '请输入打票机型号', trigger: 'blur' },
+        ],
+        intro: [
+          {
+            required: true,
+            message: '请输入打票机型号备注名',
+            trigger: 'blur',
+          },
+        ],
+        brand_name: [
+          { required: true, message: '请输入品牌名', trigger: 'blur' },
+        ],
+        website_url: [
+          { required: true, message: '请输入官网URL', trigger: 'blur' },
+        ],
+        paper_with: [
+          { required: true, message: '请输入纸张宽度', trigger: 'blur' },
+        ],
+      },
+      tableConfig: {
+        height: window.innerHeight - 220 - 150,
+      },
+      layout: 'total, sizes, prev, pager, next, jumper',
+      total: 0,
+      params: {
+        pageNum: 1,
+        pageSize: 20,
+      },
+      brandName: null,
+      tabColumn: [
+        {
+          prop: 'index',
+          label: '序号',
+          width: '51',
+        },
+        {
+          prop: 'brand_name',
+          label: '小票机品牌名称',
+        },
+        {
+          prop: 'model_name',
+          label: '小票机型号名称',
+        },
+        {
+          prop: 'created_at',
+          label: '创建时间',
+        },
+        {
+          prop: 'paper_with',
+          label: '纸张宽度',
+        },
+        {
+          prop: 'operation',
+          label: '操作',
+        },
+      ],
+      tableData: [
+        {
+          model_id: 1,
+          brand_name: '飞鹅云打印机',
+          model_name: '飞鹅云打印机PF-V5',
+          intro: '飞鹅云打印机PF-V58-W',
+          website_url: 'www.feieyun.com',
+          paper_with: 58,
+          status: 1,
+          created_by: 1,
+          updated_by: 1,
+          created_at: '2024-10-29 15:17:01',
+          updated_at: '2024-10-29 15:17:01',
+        },
+      ],
+    }
+  },
+  created() {
+    this.getReceiptMachineList()
+  },
+  methods: {
+    async getReceiptMachineList() {
+      let res = await getReceiptMachineList(this.params)
+      if (res && res.status == 200) {
+        this.total = res.data.total
+        this.tableData = res.data.items
+      } else {
+        this.$message({
+          type: 'error',
+          message: res.msg || '服务器异常',
+        })
+      }
+    },
+    handleShowDialog() {
+      this.showDialog = true
+    },
+    handleDelectReceipt(row) {
+      this.$confirm('您确认删除这个小票机?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(async () => {
+          let res = await delectReceiptMachine({ model_id: row.model_id })
+          if (res && res.status == 200) {
+            this.$message({
+              type: 'success',
+              message: '删除成功!',
+            })
+            this.getReceiptMachineList()
+          } else {
+            this.$message({
+              type: 'error',
+              message: res.msg,
+            })
+          }
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除',
+          })
+        })
+    },
+    handleSubmitForm() {
+      this.$refs['formDialog'].validate(async (valid) => {
+        if (valid) {
+          let res = this.isEdit
+            ? await updateReceiptMachine(this.formDialog)
+            : await addReceiptMachine(this.formDialog)
+          if (res && res.status == 200) {
+            this.$message({
+              type: 'success',
+              message: this.isEdit ? '修改成功' : '添加成功!',
+            })
+            this.showDialog = false
+            this.isEdit = false
+            this.getReceiptMachineList()
+          } else {
+            this.$message({
+              type: 'error',
+              message: res.msg,
+            })
+          }
+        }
+      })
+    },
+    handleSearch() {
+      this.params = {
+        keyword: this.brandName,
+        ...this.params,
+      }
+      this.getReceiptMachineList()
+    },
+    handleClear() {
+      this.brandName = ''
+      this.params = {
+        pageNum: 1,
+        paper_with: 20,
+      }
+      this.getReceiptMachineList()
+    },
+    handleSwitch() {},
+    handleEdit(row) {
+      this.showDialog = true
+      this.isEdit = true
+      this.formDialog = row
+    },
+    handleCloseDialog() {
+      this.showDialog = false
+      if (this.isEdit) {
+        this.formDialog = {
+          model_name: '',
+          intro: '',
+          brand_name: '',
+          website_url: '',
+          paper_with: '',
+        }
+        this.isEdit = false
+      }
+    },
+    handleSizeChange(pageSize) {
+      this.params.pageSize = pageSize
+      this.getReceiptMachineList()
+    },
+    handleCurrentChange(pageNum) {
+      this.params.pageNum = pageNum
+      this.getReceiptMachineList()
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.receipt-machine-container {
+  padding: 0 20px !important;
+  .head {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-shadow: inset 0 -1px 0 #efefef;
+
+    .head-add-btn {
+    }
+
+    .head-content {
+      display: flex;
+      align-items: center;
+      text-align: center;
+      margin: 20px 0;
+
+      .name {
+        font-weight: bold;
+      }
+
+      .input-with-select {
+        margin: 0 10px;
+        width: 270px;
+      }
+    }
+  }
+
+  .receipt-machine-dialog {
+    .el-dialog {
+      border: 0;
+      border-radius: 6px;
+      background-clip: padding-box;
+      box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+    }
+
+    .el-dialog__header {
+      padding: 12px 20px;
+      border-bottom: 1px solid #f2f2f2;
+
+      .el-dialog__title {
+        font-size: 16px;
+        color: rgba(0, 0, 0, 0.8);
+        font-weight: 600;
+      }
+
+      .el-dialog__headerbtn {
+        top: 12px;
+      }
+    }
+
+    .el-dialog__body {
+      padding: 40px 20px;
+      font-size: 12px;
+      line-height: 1.5;
+      color: #666;
+      min-height: 108px;
+      overflow-y: auto;
+      max-height: 620px;
+      overflow: auto;
+
+      .form-dialog {
+        min-height: 150px;
+      }
+
+      .el-input__inner {
+        height: 38px;
+        width: 410px;
+      }
+    }
+
+    .el-dialog__footer {
+      border-top: 1px solid #f2f2f2;
+      padding: 10px;
+    }
+
+    .el-form-item__label {
+      padding: 0 24px 0 0px;
+    }
+  }
+}
+</style>

src/views/store/base/cloudPrint/addCloudPrint.vue

@@ -1,746 +0,0 @@
-<template>
-  <div class="addCloudPrint-container">
-    
-    <div class="block-content block-content-set">
-        <div class="title">打印机设置</div>
-        <el-form ref="formSet" class="form-block" :model="form" label-width="120px" :rules="rules">
-            <el-form-item label="活动名称" prop="activityName">
-                <el-input v-model="form.activityName" :maxlength="20" placeholder="请输入内容" size="medium" show-word-limit></el-input>
-            </el-form-item>
-            <el-form-item label="设备品牌" prop="brand">
-                <el-select size="medium" v-model="form.brand" placeholder="请选择活动区域">
-                    <el-option 
-                        v-for="(item,index) of options" 
-                        :key="index" 
-                        :label="item.label" 
-                        :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="打印机编号" prop="printerNumber">
-                <el-input v-model="form.printerNumber"  placeholder="请输入内容" size="medium"></el-input>
-                <label class="tips">
-                    <label class="lable-name">找不到设备编号？
-                        <div class="lable-box">
-                            <div class="img"></div>
-                        </div>                             
-                    </label>
-                </label>
-            </el-form-item>
-            <el-form-item label="打印机密钥" prop="printerKey">
-                <el-input v-model="form.printerKey"  placeholder="请输入打印机密钥" size="medium" ></el-input>
-            </el-form-item>
-            <el-form-item label="URL" prop="url">
-                <el-input v-model="form.url"  placeholder="http://open.10ss.net:8888" size="medium" ></el-input>
-            </el-form-item>
-            <el-form-item label="打印来源" class="form-activity-item" prop="activityType">
-                <el-checkbox-group v-model="form.activityType" >
-                    <el-checkbox class="el-item-checkbox" label="收银台" name="type" ></el-checkbox>
-                    <el-checkbox class="el-item-checkbox" label="网店" name="type" ></el-checkbox>
-                </el-checkbox-group>
-            </el-form-item>
-            <el-form-item label="纸张宽度" class="form-page-size-item">
-                <el-radio-group v-model="form.resource">
-                    <el-radio class="el-item-radio" label="58">58mm</el-radio>
-                    <el-radio class="el-item-radio" label="80" :disabled="isDisabled" >80mm</el-radio>
-                </el-radio-group>
-                <div class="page-tips">80mm宽度仅支持“飞蛾打印机（新接口）”“芯烨云打印机”两种品牌。</div>
-            </el-form-item>
-        </el-form>
-    </div>
-    <div class="block-content">
-        <div class="title">商品订单</div>
-        <el-table
-            :data="tableOrderData"
-            class="order-table"
-            style="width: 100%">
-            <el-table-column align="center" prop="printTimingName" label="打印时机">
-
-            </el-table-column>
-            <el-table-column align="center" width="100px" prop="state" label="状态" class-name="table-column-item">
-                <template slot-scope="scope">
-                    <el-switch
-                        v-model="scope.row.state"
-                        :active-value="1"
-                        :inactive-value="0"
-
-                        @change="handerState(scope.row)"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column align="center" size="medium" prop="tepOptions" label="使用模板" >
-                <template slot-scope="scope">
-                    <el-select v-model="form.tepOptions[scope.$index]" placeholder="请选择小票模板" @change="handleTepOptions(scope.row,scope.$index)">
-                        <el-option
-                            v-for="(item,index) of tableOrderData[scope.$index].tepOptions"
-                            :key="item.value + index"
-                            :label="item.label"
-                            :value="item.value"
-                        >
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" width="700" prop="printableItemTypesList" label="可打印商品类型">
-                <template slot-scope="scope">
-                    <el-checkbox-group :true-label=1 :false-label=2 v-model="printableItemTypesCheckList[scope.$index]" class="checkbox-groups">
-                        <el-checkbox  v-for="(item,index) of tableOrderData[scope.$index].printableItemTypesList" 
-                            :key="index" 
-                            :label="item.label">
-                            {{ item.name }}
-                        </el-checkbox>
-                    </el-checkbox-group>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" width="500" prop="orderLogisticsModeList" label="实体、批发商品需打印的订单物流方式">
-                <template slot-scope="scope">
-                    <el-checkbox-group :true-label=1 :false-label=2 v-model="orderLogisticsModeCheckList[scope.$index]">
-                        <el-checkbox  
-                        v-for="(item,index) of tableOrderData[scope.$index].orderLogisticsModeList" 
-                            :key="index" 
-                            :label="item.label">
-                            {{ item.name }}
-                    </el-checkbox>
-                    </el-checkbox-group>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" prop="printConnectionNum" label="打印联数">
-                <template slot-scope="scope">
-                    <el-select v-model="tableOrderData[scope.$index].uniteOptions[scope.$index]" placeholder="请选择联数">
-                        <el-option
-                            v-for="(item,index) of tableOrderData[scope.$index].uniteOptions"
-                            :key="index"
-                            :label="item.label"
-                            :value="item.value"
-                        >
-                        </el-option>
-                    </el-select>
-                    <span style="margin-left: 10px;">联</span>
-                </template>
-            </el-table-column>
-        </el-table>
-    </div>
-    <div class="block-content">
-        <div class="title">订单退款</div>
-        <el-table
-            :data="tableOrderData"
-            class="order-table"
-            style="width: 100%">
-            <el-table-column align="center" prop="printTimingName" label="打印时机">
-
-            </el-table-column>
-            <el-table-column align="center" width="100px" prop="state" label="状态" class-name="table-column-item">
-                <template slot-scope="scope">
-                    <el-switch
-                        v-model="scope.row.state"
-                        :active-value="1"
-                        :inactive-value="0"
-
-                        @change="handerState(scope.row)"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column align="center" size="medium" prop="tepOptions" label="使用模板" >
-                <template slot-scope="scope">
-                    <el-select v-model="form.tepOptions[scope.$index]" placeholder="请选择小票模板" @change="handleTepOptions(scope,scope.$index)">
-                        <el-option
-                            v-for="(item,index) of tableOrderData[scope.$index].tepOptions"
-                            :key="item.value + index"
-                            :label="item.label"
-                            :value="item.value"
-                        >
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" width="700" prop="printableItemTypesList" label="可打印商品类型">
-                <template slot-scope="scope">
-                    <el-checkbox-group :true-label=1 :false-label=2 v-model="printableItemTypesCheckList[scope.$index]" class="checkbox-groups">
-                        <el-checkbox  v-for="(item,index) of tableOrderData[scope.$index].printableItemTypesList" 
-                            :key="index" 
-                            :label="item.label">
-                            {{ item.name }}
-                        </el-checkbox>
-                    </el-checkbox-group>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" width="500" prop="" label="">
-                
-            </el-table-column>
-            <el-table-column align="center" prop="printConnectionNum" label="打印联数">
-                <template slot-scope="scope">
-                    <el-select v-model="tableOrderData[scope.$index].uniteOptions[scope.$index]" placeholder="请选择联数">
-                        <el-option
-                            v-for="(item,index) of tableOrderData[scope.$index].uniteOptions"
-                            :key="index"
-                            :label="item.label"
-                            :value="item.value"
-                        >
-                        </el-option>
-                    </el-select>
-                    <span style="margin-left: 10px;">联</span>
-                </template>
-            </el-table-column>
-        </el-table>
-    </div>
-    <div class="block-content">
-        <div class="title">核销凭证</div>
-        <el-table
-            :data="tableOrderData"
-            class="order-table"
-            style="width: 100%">
-            <el-table-column align="center" prop="printTimingName" label="打印时机">
-
-            </el-table-column>
-            <el-table-column align="center" width="100px" prop="state" label="状态" class-name="table-column-item">
-                <template slot-scope="scope">
-                    <el-switch
-                        v-model="scope.row.state"
-                        :active-value="1"
-                        :inactive-value="0"
-
-                        @change="handerState(scope.row)"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column align="center" size="medium" prop="tepOptions" label="使用模板" >
-                <template slot-scope="scope">
-                    <el-select v-model="form.tepOptions[scope.$index]" placeholder="请选择小票模板">
-                        <el-option
-                            v-for="(item,index) of tableOrderData[scope.$index].tepOptions"
-                            :key="index"
-                            :label="item.label"
-                            :value="item.value"
-                        >
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" width="700" prop="printableItemTypesList" label="可打印商品类型">
-                <template slot-scope="scope">
-                    <el-checkbox-group :true-label=1 :false-label=2 v-model="printableItemTypesCheckList[scope.$index]" class="checkbox-groups">
-                        <el-checkbox  v-for="(item,index) of tableOrderData[scope.$index].printableItemTypesList" 
-                            :key="index" 
-                            :label="item.label">
-                            {{ item.name }}
-                        </el-checkbox>
-                    </el-checkbox-group>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" width="500" prop="" label=""></el-table-column>
-            <el-table-column align="center" prop="printConnectionNum" label="打印联数">
-                <template slot-scope="scope">
-                    <el-select v-model="tableOrderData[scope.$index].uniteOptions[scope.$index]" placeholder="请选择联数">
-                        <el-option
-                            v-for="(item,index) of tableOrderData[scope.$index].uniteOptions"
-                            :key="index"
-                            :label="item.label"
-                            :value="item.value"
-                        >
-                        </el-option>
-                    </el-select>
-                    <span style="margin-left: 10px;">联</span>
-                </template>
-            </el-table-column>
-        </el-table>
-    </div>
-    <div class="footer">
-        <el-button class="btn" size="medium">取消</el-button>
-        <el-button class="btn" size="medium">测试打印</el-button>
-        <el-button class="btn" size="medium" type="primary" @click="onSubmit">保存</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import { forEachRight } from 'lodash';
-import { type } from 'vue-plugin-utils'
-export default {
-    name:"addCloudPrint",
-    data(){
-        return{
-            isDisabled:true,
-            rules:{
-                activityName:
-                [
-                    { required: true, message: '请输入打印机名称', trigger: 'blur' }
-                ],
-                brand:
-                [
-                    { required: true, message: '请选择打印机品牌', trigger: 'change' }
-                ],
-                printerNumber:
-                [
-                    { required: true, message: '请输入打印机编号', trigger: 'blur' }
-                ],
-                activityType:
-                [
-                    { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
-                ],
-                printerKey:
-                [
-                    { required: true, message: '请输入打印机编号', trigger: 'blur' }
-                ],
-                url:
-                [
-                    { required: true, message: '请填写URL', trigger: 'blur' },
-                    //{ pattern: /^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/, message: '请输入有效的网址', trigger: 'blur' }
-                ]
-            },
-            options:[
-                {
-                    value: '选项1',
-                    label: '365云打印S2(编号kdt2)'
-                },
-                {
-                    value: '选项2',
-                    label: '飞鹅打印机'
-                }
-            ],
-            form:{
-                activityName:"",
-                brand:"选项1",
-                printerNumber:'',
-                printerKey:'',
-                url:'',
-                activityType:[],
-                tepOptions:[],
-                resource:'58',
-            },
-            tepOptions:
-            [
-                {
-                    value: 1,
-                    label: '黄金糕'
-                },
-                {
-                    value: 2,
-                    label: '黄金糕2'
-                }
-            ],
-            printableItemTypesCheckList:
-            [
-                [1,2,3,4,5,6,7,8,9,10],[1,2,3,4,5,6,7,8,9,10]
-            ],
-            orderLogisticsModeCheckList:
-            [
-                [1,2,3,4],
-                [1,2,3,4]
-            ],
-            tableOrderData:
-            [
-                {
-                    printTimingName:"下单打印",
-                    state:0,
-                    printableItemTypesList:
-                    [   
-                        {
-                            label:1,
-                            name:"虚拟商品"
-                        }, 
-                        {
-                            label:2,
-                            name:"电子卡密"
-                        },
-                        {
-                            label:3,
-                            name:"计次时商品"
-                        },
-                        {
-                            label:4,
-                            name:"批发商品"
-                        },
-                        {
-                            label:5,
-                            name:"预约到店"
-                        },
-                        {
-                            label:6,
-                            name:"简牛生活"
-                        },
-                        {
-                            label:7,
-                            name:"当面付"
-                        },
-                        {
-                            label:8,
-                            name:"称重商品"
-                        },
-                        {
-                            label:9,
-                            name:"实体商品"
-                        },
-                        {
-                            label:10,
-                            name:"实体商品"
-                        },               
-                    ],
-                    orderLogisticsModeList:
-                    [
-                        {
-                            label:1,
-                            name:"快递"
-                        },
-                        {
-                            label:2,
-                            name:"自提"
-                        }, 
-                        {
-                            label:3,
-                            name:"同城配送"
-                        }, 
-                        {
-                            label:4,
-                            name:"无需物流"
-                        },  
-                    ],
-                    uniteOptions:
-                    [
-                        {
-                            value: 1,
-                            label: 1
-                        },
-                        {
-                            value: 2,
-                            label: 2
-                        },
-                        {
-                            value: 3,
-                            label: 3
-                        },
-                        {
-                            value: 4,
-                            label: 4
-                        },
-                    ]
-                },
-                {
-                    printTimingName:"付款后",
-                    state:1,
-                    printableItemTypesList:
-                    [   
-                        {
-                            label:1,
-                            name:"虚拟商品"
-                        }, 
-                        {
-                            label:2,
-                            name:"电子卡密"
-                        },
-                        {
-                            label:3,
-                            name:"计次时商品"
-                        },
-                        {
-                            label:4,
-                            name:"批发商品"
-                        },
-                        {
-                            label:5,
-                            name:"预约到店"
-                        },
-                        {
-                            label:6,
-                            name:"简牛生活"
-                        },
-                        {
-                            label:7,
-                            name:"当面付"
-                        },
-                        {
-                            label:8,
-                            name:"称重商品"
-                        },
-                        {
-                            label:9,
-                            name:"实体商品"
-                        },
-                        {
-                            label:10,
-                            name:"实体商品"
-                        },               
-                    ],
-                    orderLogisticsModeList:
-                    [
-                        {
-                            label:1,
-                            name:"快递"
-                        },
-                        {
-                            label:2,
-                            name:"自提"
-                        }, 
-                        {
-                            label:3,
-                            name:"同城配送"
-                        }, 
-                        {
-                            label:4,
-                            name:"无需物流"
-                        },  
-                    ],
-                    uniteOptions:
-                    [
-                        {
-                            value: 1,
-                            label: 1
-                        },
-                        {
-                            value: 2,
-                            label: 2
-                        },
-                        {
-                            value: 3,
-                            label: 3
-                        },
-                        {
-                            value: 4,
-                            label: 4
-                        },
-                    ]
-                }
-            ],
-        }
-    },
-    watch:{
-        form:{
-            handler(val){
-                if(val.value == '选项2'){
-                    this.isDisabled = false;
-                }else{
-                    this.isDisabled = true;
-                }
-            },
-            deep:true
-        }
-    },
-    created(){
-        this.getTepOptions();
-    },
-    methods:{
-        getTepOptions(){
-            
-            this.tableOrderData.forEach((item,index)=>{
-                item.tepOptions = this.tepOptions;
-                
-            })
-            this.form.tepOptions = Array.from(Array(this.tableOrderData.length), item=>null);
-            console.log("created",this.form);           
-        },
-        handerState(item,index){
-            //this.$set(this.tableOrderData,index,this.tableOrderData[index]);
-        },
-        handerStoreCheckbox(index){
-            
-        },
-        handleTepOptions(item,index){
-            // this.tableOrderData[index].tepOptions[index].value = item;
-            // console.log("handleTepOptions",this.tableOrderData);
-        },
-        onSubmit(){
-            this.$refs['formSet'].validate((valid)=>{
-                if(valid){
-                    let isError = false;
-                    let msg = '';                  
-                    this.tableOrderData.forEach((item,index) => {
-                        if(item.state == 1 && this.form.tepOptions[index] == null){
-                            isError = true;
-                            msg = '状态开启时请选择使用模板';
-                        }   
-                    });
-                    if(isError){
-                        this.$baseMessage(msg, 'error')
-                    }
-                }    
-            })
-        },
-    }
-}
-</script>
-
-<style lang="scss" >
-.addCloudPrint-container{
-    padding: 0 !important;  
-    background: #f6f8f9 !important;
-    padding-bottom: 40px !important;  
-    
-    .title{
-        padding: 20px;
-        font-size: 16px;
-        font-weight: 700;
-        border-bottom: 1px solid #f2f2f2;
-        line-height: 1;
-    }
-
-    .block-content{
-
-        margin-bottom: 20px;
-        background: #fff;
-
-        &-set{
-            
-            .el-input{
-                width: 415px;
-                height: 38px;
-            }
-        }
-
-        .form-block{
-            padding: 20px 0;
-        }
-
-        .order-table{
-            
-            padding: 20px 10px;
-
-            tbody{
-
-                tr {
-                    background: #fff;
-                }
-
-                td{
-                    border-bottom: 10px solid #fff !important;
-                    background: #f6f8f9;
-
-                    div{
-                        background: #f6f8f9;
-                    }
-                }
-            }
-
-            
-        }
-
-        .has-gutter{
-            th{
-                background: #fff;
-                border: none;
-            }
-        }
-
-        .el-form-item__label{
-            padding: 0 15px 0 0 !important;
-        }
-
-        .tips{
-           
-            margin-left: 10px;
-            color: #fb6638;
-            
-            .lable-name{
-                
-                position: relative;
-                
-                &:hover{
-              
-                    .lable-box{
-                        opacity: 1;
-                    }
-                }
-                
-                .lable-box{
-
-                    position: absolute;
-                    top: -50px;
-                    left: 122px;
-                    padding: 8px 16px;
-                    width: 357px;
-                    height: 132px;
-                    background-color: #fff;
-                    background-clip: padding-box;
-                    border-radius: 4px;
-                    box-shadow: 0 1px 6px rgba(0, 0, 0, .2);
-                    white-space: nowrap;
-                    opacity: 0;
-                    transition: opacity 0.4s ease-out;
-
-                    &::after{
-                        content: "";
-                        display: block;
-                        width: 0px;
-                        height: 0px;
-                        border: 5px solid transparent;
-                        border-right: 5px solid white;
-                        position: relative;
-                        top: -60%;
-                        left: -26px;
-                    }
-
-                    .img{
-                        position: relative;
-                        background-image: url(../../../../assets/sn.png);
-                        background-size: cover;
-                        width: 100%;
-                        height: 100%;
-                        z-index: 1;
-                    }
-                }
-            }                 
-        }
-
-        .form-activity-item,.form-page-size-item{
-
-            .el-form-item__content{
-                margin-left: 123px !important;
-            }           
-        }
-
-        .page-tips{
-            line-height: 20px;
-            margin-top: 8px;
-            color: #999;
-        }
-
-        .el-item-checkbox{
-
-            .el-checkbox__input{
-                transform : scale(130%)
-            }
-        }
-
-        .el-item-radio{
-
-            .el-radio__input{
-                transform : scale(130%)               
-            }
-
-            .el-radio__input.is-checked .el-radio__inner::after{
-                transform: translate(-50%, -50%) scale(1.2) !important;
-            }
-        }
-    }
-
-    .el-table_1_column_1{
-        div{
-            font-weight: bold !important;
-        }  
-    }
-
-    .checkbox-groups{
-        display: flex;
-        flex-flow: wrap;
-        padding-left: 40px;
-    }
-
-    .footer{
-        position: fixed; /* 使用fixed定位 */
-        left: 0;
-        bottom: 0;
-        width: 100%;
-        height: 58px;
-        background: #fff;
-        color: white;
-        text-align: center;
-        z-index: 1;
-        
-        display: flex;
-        justify-content: center;
-        padding: 10px 0;
-
-        .btn{
-            margin: 0 5px;
-        }
-    }
-}
-</style>

src/views/store/base/cloudPrint/plotterManager.vue

@@ -15,45 +15,50 @@
       <el-input
         placeholder="请输入打印机名称"
         suffix-icon="el-icon-search"
-                v-model="inputData"
+        v-model="printerName"
         size="medium"
-                class="input-with-select">
+        class="input-with-select"
-            </el-input>
+      ></el-input>
-            <el-button
+      <el-button type="primary" size="medium" @click="handleSearch">
-                type="primary"
-                size="medium"
-                @click="handleAdd"
-            >
         搜索
       </el-button>
-            <el-button
+      <el-button size="medium" @click="handleClear">清除条件</el-button>
-                size="medium"
-                @click="handleClear"
-            >
-            清除条件
-            </el-button>
     </div>
     <el-table
       :data="tableData"
       :height="tableConfig.height"
       :cell-class-name="handerColor"
-            style="width: 100%">
+      style="width: 100%"
-            <el-table-column align="center" v-for="(item,index) in tabColumn" :key="index"
+    >
+      <el-table-column
+        align="center"
+        v-for="(item, index) in tabColumn"
+        :key="index"
         :prop="item.prop"
         :label="item.label"
       >
-            <template #default="{ row }" v-if="item.label == '操作'">
+        <template #default="{ row, $index }" v-if="item.label == '操作'">
-                <el-button type="text" size="small" @click="handleSkipEdit">编辑</el-button>
+          <el-button
-                <el-button type="text" size="small">删除</el-button>
+            type="text"
-                <el-button type="text" size="small">禁用</el-button>
+            size="small"
+            @click="handleSkipEdit(row, $index)"
+          >
+            编辑
+          </el-button>
+          <el-button type="text" size="small" @click="handerDelectPrint(row)">
+            删除
+          </el-button>
+          <el-button type="text" size="small" @click="handerDisabledPrint(row)">
+            {{ row.status == '禁用' ? '启用' : '禁用' }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
     <el-pagination
       background
-            :current-page="queryForm.pageNum"
+      :current-page="params.pageNum"
       :layout="layout"
-            :page-size="queryForm.pageSize"
+      :page-size="params.pageSize"
       :total="total"
       @current-change="handleCurrentChange"
       @size-change="handleSizeChange"
@@ -62,102 +67,186 @@
 </template>
 
 <script>
+import {
+  getPrinterList,
+  delectPrinter,
+  updatePrnterStatus,
+} from '@/api/printer/printer'
 export default {
-    name:"plotterManager",
+  name: 'plotterManager',
   data() {
     return {
-            inputData:'',
+      layout: 'total, sizes, prev, pager, next, jumper',
+      total: 0,
+      printerName: '',
       tableConfig: {
         height: window.innerHeight - 220 - 150,
       },
-            queryForm: {
+      params: {
-                stime: null,
-                etime: null,
-                kind_id:null,
-                order_state_id:null,
         pageNum: 1,
         pageSize: 20,
       },
       tabColumn: [
         {
-                    prop:"cloudName",
+          prop: 'printer_name',
-                    label:"打印机名称",
+          label: '打印机名称',
         },
         {
-                    prop:"brand",
+          prop: 'model_name',
-                    label:"设备品牌",
+          label: '设备品牌',
         },
         {
-                    prop:"printSource",
+          prop: 'region',
-                    label:"打印来源",
+          label: '打印来源',
         },
         {
-                    prop:"pageSize",
+          prop: 'paper_with',
-                    label:"纸张大小",
+          label: '纸张大小',
         },
         {
-                    prop:"printReceipt",
+          prop: 'printReceipt',
-                    label:"打印小票",
+          label: '打印小票',
         },
         {
-                    prop:"state",
+          prop: 'status',
-                    label:"状态",
+          label: '状态',
         },
         {
-                    prop:"operation",
+          prop: 'operation',
-                    label:"操作",
+          label: '操作',
-                }
+        },
       ],
       tableData: [
         {
-
+          printer_name: '飞蛾',
-                    cloudName: '飞蛾',
+          model_name: '365云打印S2(编号kdt2)',
-                    brand: '365云打印S2(编号kdt2)',
+          region: '收银台',
-                    printSource: '收银台',
+          paper_with: 58,
-                    pageSize:"58mm",
+          printReceipt: '',
-                    printReceipt:"",
+          status: 1,
-                    state:"启用",
+          operation: '操作',
-                    operation:"操作"
         },
-                {
+      ],
-                    cloudName: '飞蛾',
-                    brand: '365云打印S2(编号kdt2)',
-                    printSource: '收银台',
-                    pageSize:"58mm",
-                    printReceipt:"",
-                    state:"停用",
-                    operation:"操作"
-                },                 
-            ]
     }
   },
+  created() {
+    this.getPrinterList()
+  },
   methods: {
+    async handerDisabledPrint(item) {
+      let res = await updatePrnterStatus({
+        printer_id: item.printer_id,
+        status: item.status == '禁用' ? 1 : 0,
+      })
+      if (res && res.status == 200) {
+        this.$message({
+          type: 'success',
+          message: item.status == '禁用' ? '启动成功' : '禁用成功',
+        })
+        this.getPrinterList()
+      } else {
+        this.$message({
+          type: 'error',
+          message: res.msg,
+        })
+      }
+    },
+    handerDelectPrint(item) {
+      this.$confirm('您确认删除这个打印机吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(async () => {
+          let res = await delectPrinter({ printer_id: item.printer_id })
+          if (res && res.status == 200) {
+            this.$message({
+              type: 'success',
+              message: '删除成功!',
+            })
+            await this.getPrinterList()
+          } else {
+            this.$message({
+              type: 'error',
+              message: res.msg,
+            })
+          }
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除',
+          })
+        })
+    },
+    async getPrinterList() {
+      let res = await getPrinterList(this.params)
+      if (res.status == 200) {
+        this.total = res.data.total
+        this.tableData = res.data.items
+        this.tableData.forEach((item) => {
+          item.paper_with += 'mm'
+          if (item.status == 1) {
+            item.status = '启用'
+          } else {
+            item.status = '禁用'
+          }
+        })
+      } else {
+        this.$message({
+          type: 'error',
+          message: res.msg || '服务器异常',
+        })
+      }
+    },
     handleSkip() {
-            this.$router.push({path:"/addCloudPrint"})
+      this.$router.push({ path: '/addCloudPrint' })
     },
-        handleClear(){
+    async handleClear() {
-            this.inputData = '';
+      this.printerName = ''
+      this.params = {
+        pageNum: 1,
+        paper_with: 20,
+      }
+      await this.getPrinterList()
     },
-        handleSkipEdit(){
+    handleSkipEdit(row, index) {
-            this.$router.push({path:"/editCloudPrint",query:{ printId : 1}})
+      this.$router.push({
+        path: '/editCloudPrint',
+        query: { id: row.printer_id },
+      })
     },
     handerColor({ row, column, rowIndex, columnIndex }) {
       if (row) {
-                if(row.state == '启用' && columnIndex == 5){
+        if (row.status == '启用' && columnIndex == 5) {
-                    return "state-on";
+          return 'status-on'
         }
-                if(row.state == '停用' && columnIndex == 5){
+        if (row.status == '停用' && columnIndex == 5) {
-                    return "state-off";
+          return 'status-off'
         }
       }
     },
+    handleSearch() {
+      this.params = {
+        keyword: this.printerName,
+        ...this.params,
       }
+      this.getPrinterList()
+    },
+    handleSizeChange(pageSize) {
+      this.params.pageSize = pageSize
+      this.getPrinterList()
+    },
+    handleCurrentChange(pageNum) {
+      this.params.pageNum = pageNum
+      this.getPrinterList()
+    },
+  },
 }
 </script>
 
 <style lang="scss">
 .plotterManager-container {
-
   .head {
     padding-bottom: 20px;
     box-shadow: inset 0 -1px 0 #efefef;
@@ -179,8 +268,7 @@ export default {
     }
   }
 
-        .state-{
+  .status- {
-
     &on {
       .cell {
         color: #48c978 !important;

src/views/store/base/cloudPrint/templateManagement.vue

@@ -5,7 +5,7 @@
         icon="el-icon-plus"
         type="primary"
         size="medium"
-            @click="handleSkip"
+        @click="handleSkipAdd"
       >
         添加新模板
       </el-button>
@@ -17,43 +17,47 @@
         suffix-icon="el-icon-search"
         v-model="inputData"
         size="medium"
-                class="input-with-select">
+        class="input-with-select"
-            </el-input>
+      ></el-input>
       <span class="name">模板类型:</span>
-            <el-select v-model="optionValue" placeholder="全部" size="medium" class="input-with-select">
+      <el-select
+        v-model="optionValue"
+        placeholder="全部"
+        size="medium"
+        class="input-with-select"
+      >
         <el-option
           v-for="item in options"
           :key="item.value"
           :label="item.label"
-                :value="item.value">
+          :value="item.value"
-                </el-option>
+        ></el-option>
       </el-select>
-            <el-button
+      <el-button type="primary" size="medium" @click="handleAdd">
-                type="primary"
-                size="medium"
-                @click="handleAdd"
-            >
         搜索
       </el-button>
-            <el-button
+      <el-button size="medium" @click="handleClear">清除条件</el-button>
-                size="medium"
-                @click="handleClear"
-            >
-            清除条件
-            </el-button>
     </div>
     <el-table
       :data="tableData"
       :height="tableConfig.height"
       :cell-class-name="handerColor"
-            style="width: 100%">
+      style="width: 100%"
-            <el-table-column align="center" v-for="(item,index) in tabColumn" :key="index"
+    >
+      <el-table-column
+        align="center"
+        v-for="(item, index) in tabColumn"
+        :key="index"
         :prop="item.prop"
         :label="item.label"
       >
         <template #default="{ row }" v-if="item.label == '操作'">
-                <el-button type="text" size="small" @click="handleCheck">查看</el-button>
+          <el-button type="text" size="small" @click="handleCheck">
-                <el-button type="text" size="small">编辑</el-button>
+            查看
+          </el-button>
+          <el-button type="text" size="small" @click="handleSkipEdit()">
+            编辑
+          </el-button>
           <el-button type="text" size="small">禁用</el-button>
         </template>
       </el-table-column>
@@ -74,24 +78,33 @@
 import receiptDialog from './receiptDialog'
 
 export default {
-    name:"plotterManager",
+  name: 'plotterManager',
   components: { receiptDialog },
   data() {
     return {
+      total: 0,
+      layout: 'total, sizes, prev, pager, next, jumper',
+      queryForm: {
+        stime: null,
+        etime: null,
+        kind_id: null,
+        order_state_id: null,
+        pageNum: 1,
+        pageSize: 20,
+      },
       inputData: '',
       optionValue: '',
       tableConfig: {
         height: window.innerHeight - 220 - 150,
       },
-            options:
+      options: [
-                [
         {
           value: '选项1',
-                        label: '黄金糕'
+          label: '黄金糕',
         },
         {
           value: '选项2',
-                        label: '双皮奶'
+          label: '双皮奶',
         },
       ],
       queryForm: {
@@ -104,81 +117,76 @@ export default {
       },
       tabColumn: [
         {
-                    prop:"tepName",
+          prop: 'tepName',
-                    label:"模版名称",
+          label: '模版名称',
         },
         {
-                    prop:"tepType",
+          prop: 'tepType',
-                    label:"模版类型",
+          label: '模版类型',
         },
         {
-                    prop:"state",
+          prop: 'state',
-                    label:"状态",
+          label: '状态',
         },
         {
-                    prop:"createTime",
+          prop: 'createTime',
-                    label:"创建时间",
+          label: '创建时间',
         },
         {
-                    prop:"operation",
+          prop: 'operation',
-                    label:"操作",
+          label: '操作',
-                }
+        },
       ],
       tableData: [
         {
-
           tepName: '福家优鲜 线上超市',
           tepType: '订单打印',
           state: '已停用',
-                    createTime:"2024-05-07 14:47:55",
+          createTime: '2024-05-07 14:47:55',
-                    operation:"操作"
+          operation: '操作',
         },
         {
           tepName: '飞蛾',
           tepType: '365云打印S2(编号kdt2)',
-                    state:"已使用",
+          state: '已使用',
-                    createTime:"2024-05-07 14:47:55",
+          createTime: '2024-05-07 14:47:55',
-                    operation:"操作"
+          operation: '操作',
         },
-            ]
+      ],
     }
   },
   methods: {
-        handleSkip(){
+    handleSkipAdd() {
-            this.$router.push({path:"/addTemplateManagement"})
+      this.$router.push({ path: '/templateManagementAdd' })
+    },
+    handleSkipEdit() {
+      this.$router.push({ path: '/templateManagementEdit' })
     },
     handleClear() {
-            this.inputData = '';
+      this.inputData = ''
     },
     handleCheck() {
-            this.$refs['receiptDialog'].showDialog();
+      this.$refs['receiptDialog'].showDialog()
-        },
-        handleAdd(){
-
-        },
-        handleSizeChange(){
-
-        },
-        handleCurrentChange(){
-
     },
+    handleAdd() {},
+    handleSizeChange() {},
+    handleCurrentChange() {},
     handerColor({ row, column, rowIndex, columnIndex }) {
       if (row) {
         if (row.state == '已使用' && columnIndex == 2) {
-                    return "state-on";
+          return 'state-on'
         }
         if (row.state == '已停用' && columnIndex == 2) {
-                    return "state-off";
+          return 'state-off'
         }
       }
     },
-    }
+  },
 }
 </script>
 
 <style lang="scss">
 .plotterManager-container {
-
   .head {
     padding-bottom: 20px;
     box-shadow: inset 0 -1px 0 #efefef;
@@ -201,7 +209,6 @@ export default {
   }
 
   .state- {
-
     &on {
       .cell {
         color: #48c978 !important;

src/views/store/base/distributionSetup/distributionMode.vue

@@ -5,15 +5,22 @@
         <div class="name">同城配送</div>
         <el-switch
           v-model="isCitySwitch"
-                    :active-text="switchText" @change="handleSwitchText">
+          :active-text="switchText"
-                </el-switch>
+          @change="handleSwitchText"
+        ></el-switch>
       </div>
       <div class="item-2">
-                <div class="tips">启用同城配送后，在配送范围内的买家可以选择同城配送，你可以接入第三方配送，也可以自己配送。</div>
+        <div class="tips">
+          启用同城配送后，在配送范围内的买家可以选择同城配送，你可以接入第三方配送，也可以自己配送。
+        </div>
         <div class="compile-block">
-                    <span class="compile-item">默认配送方式 </span>
+          <span class="compile-item" @click="handelShowDialog()">
+            默认配送方式
+          </span>
           <span class="segmentation">|</span>
-                    <span class="compile-item" @click="skipu()">编辑同城配送</span>
+          <span class="compile-item" @click="handleCitySkip()">
+            编辑同城配送
+          </span>
         </div>
       </div>
     </div>
@@ -21,21 +28,28 @@
       <div class="item">
         <div class="name">上门自提</div>
         <el-switch
-                    v-model="isCitySwitch"
+          v-model="isVisitSwitch"
-                    :active-text="switchText" @change="handleSwitchText">
+          :active-text="visitSwitchText"
-                </el-switch>
+          @change="handleVisitSwitchText"
+        ></el-switch>
       </div>
       <div class="item-2">
-                <div class="tips">启用上门自提后，买家可以就近选择商品自提点，买家下单后，您需要确保买家指定的自提点商品库存充足。</div>
+        <div class="tips">
+          启用上门自提后，买家可以就近选择商品自提点，买家下单后，您需要确保买家指定的自提点商品库存充足。
+        </div>
         <div class="compile-block">
-                    <span class="compile-item">查看自提点 </span>
+          <span class="compile-item" @click="handleVisitSkip()">
+            查看自提点
+          </span>
         </div>
       </div>
     </div>
     <div class="footer">
       <div class="item-title">文字设置</div>
       <div class="item-block">
-                <div class="item tips">修改文字后，手机端商城和PC端商城显示修改后的文字。</div>
+        <div class="item tips">
+          修改文字后，手机端商城和PC端商城显示修改后的文字。
+        </div>
         <div class="item">
           <div class="item-lable">同城配送</div>
           <el-input
@@ -45,8 +59,7 @@
             maxlength="4"
             show-word-limit
             class="item-input"
-                    >
+          ></el-input>
-                    </el-input>
         </div>
         <div class="item">
           <div class="item-lable">上门自提</div>
@@ -57,8 +70,7 @@
             maxlength="4"
             show-word-limit
             class="item-input"
-                    >
+          ></el-input>
-                    </el-input>
         </div>
         <div class="item">
           <div class="item-lable">等待自提</div>
@@ -69,8 +81,7 @@
             maxlength="4"
             show-word-limit
             class="item-input"
-                    >
+          ></el-input>
-                    </el-input>
         </div>
         <div class="item">
           <div class="item-lable">配送时间</div>
@@ -81,8 +92,7 @@
             maxlength="4"
             show-word-limit
             class="item-input"
-                    >
+          ></el-input>
-                    </el-input>
         </div>
         <div class="item">
           <div class="item-lable">自提时间</div>
@@ -93,29 +103,83 @@
             maxlength="4"
             show-word-limit
             class="item-input"
-                    >
+          ></el-input>
-                    </el-input>
         </div>
         <el-button class="btn" type="primary" size="medium">保存</el-button>
       </div>
     </div>
+    <el-dialog
+      class="default-delivery-dialog"
+      :title="'默认配送方式'"
+      :top="'40vh'"
+      :width="'520px'"
+      :visible.sync="showDialog"
+      :before-close="handleCloseDialog"
+    >
+      <el-form
+        ref="form"
+        class="form-dialog"
+        :model="formDialog"
+        :rules="formDialogRules"
+        label-width="110px"
+      >
+        <el-form-item label="默认配送方式" prop="distributionModeType">
+          <el-select v-model="formDialog.distributionModeType">
+            <el-option
+              :label="item.label"
+              :value="item.value"
+              placeholder="请默认配送方式"
+              v-for="(item, index) of distributionModeOpction"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="medium" @click="showDialog = false">取 消</el-button>
+        <el-button size="medium" type="primary" @click="showDialog = false">
+          确 定
+        </el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 export default {
-    name:"distributionMode",
+  name: 'distributionMode',
   data() {
     return {
       isCitySwitch: false,
+      isVisitSwitch: false,
+      showDialog: false,
       switchText: '关闭',
+      visitSwitchText: '关闭',
       form: {
         cityText: '同城配送',
         crvMoreText: '上门自提',
         awaitPickUpText: '等待自提',
         deliveryTimeText: '配送时间',
-                pickUpTimeText:'自提时间'
+        pickUpTimeText: '自提时间',
-            }
+      },
+      formDialog: {
+        distributionModeType: 0,
+      },
+      formDialogRules: {
+        distributionModeType: [
+          { required: true, message: '请选择默认配送方式', trigger: 'change' },
+        ],
+      },
+      distributionModeOpction: [
+        {
+          value: 0,
+          label: '商家配送',
+        },
+        {
+          value: 1,
+          label: '码科速送',
+        },
+      ],
     }
   },
   methods: {
@@ -126,16 +190,31 @@ export default {
         this.switchText = '关闭'
       }
     },
-        skipu(){
+    handleVisitSwitchText(isSwitch) {
-            this.$router.push({ path: '/localDelivery' });
+      if (isSwitch) {
-        }
+        this.visitSwitchText = '开启'
+      } else {
+        this.visitSwitchText = '关闭'
       }
+    },
+    handleVisitSkip() {
+      this.$router.push({ path: '/selfPickUpSite' })
+    },
+    handleCitySkip() {
+      this.$router.push({ path: '/localDelivery' })
+    },
+    handelShowDialog() {
+      this.showDialog = true
+    },
+    handleCloseDialog() {
+      this.showDialog = false
+    },
+  },
 }
 </script>
 
 <style lang="scss">
 .distributionMode-container {
-
   padding: 0 !important;
   background: #f6f8f9 !important;
 
@@ -164,8 +243,6 @@ export default {
       justify-content: space-between;
       padding: 20px;
 
-            
-            
       .compile-block {
         color: #1890ff;
 
@@ -228,5 +305,54 @@ export default {
       }
     }
   }
+
+  .default-delivery-dialog {
+    .el-dialog {
+      border: 0;
+      border-radius: 6px;
+      background-clip: padding-box;
+      box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+    }
+
+    .el-dialog__header {
+      padding: 12px 20px;
+      border-bottom: 1px solid #f2f2f2;
+
+      .el-dialog__title {
+        font-size: 16px;
+        color: rgba(0, 0, 0, 0.8);
+        font-weight: 600;
+      }
+
+      .el-dialog__headerbtn {
+        top: 12px;
+      }
+    }
+
+    .el-dialog__body {
+      padding: 16px 20px;
+      font-size: 12px;
+      line-height: 1.5;
+      color: #666;
+      min-height: 108px;
+      overflow-y: auto;
+      max-height: 620px;
+      overflow: auto;
+
+      .form-dialog {
+        min-height: 150px;
+      }
+
+      .el-input__inner {
+        height: 38px;
+        width: 198px;
+      }
+    }
+
+    .el-dialog__footer {
+      border-top: 1px solid #f2f2f2;
+      padding: 10px;
+    }
+  }
 }
 </style>

src/views/store/base/distributionSetup/distributionSetupConfig/config.js

@@ -0,0 +1,221 @@
+export const distributionOpction =[
+    {
+        value:0,
+        label:'飞速达'
+    },
+    {
+        value:1,
+        label:'快速达'
+    },
+    {
+        value:2,
+        label:'快速达-臻选型'
+    },
+    {
+        value:3,
+        label:'快速达-臻选型-45'
+    },
+    {
+        value:4,
+        label:'快速达-时效性'
+    },
+    {
+        value:5,
+        label:'快速达-普惠型'
+    },
+    {
+        value:6,
+        label:'及时达'
+    },
+    {
+        value:7,
+        label:'集中送'
+    },
+    {
+        value:8,
+        label:'跑腿-帮送'
+    },
+    {
+        value:9,
+        label:'及时达-新'
+    },
+    {
+        value:10,
+        label:'光速达-40'
+    },
+    {
+        value:11,
+        label:'光速达-45'
+    },
+    {
+        value:12,
+        label:'光速达-50'
+    },
+    {
+        value:13,
+        label:'光速达-55'
+    },
+    {
+        value:14,
+        label:'快速达-7590'
+    },
+    {
+        value:15,
+        label:'快速达-6090'
+    },
+]
+
+export const checkList = [
+    {
+        label:1,
+        name:'商家配送'
+    },
+    {
+        label:2,
+        name:'第三方配送'
+    }
+]
+
+export const distributionList =[
+    {
+        label:1,
+        imgUrl:require('@/assets/distribution_images/dada.png')
+    },
+    {
+        label:2,
+        imgUrl:require('@/assets/distribution_images/meituan.png')
+    },
+    {
+        label:3,
+        imgUrl:require('@/assets/distribution_images/sf.png')
+    },
+    {
+        label:4,
+        imgUrl:require('@/assets/distribution_images/ss.png')
+    },
+    {
+        label:5,
+        imgUrl:require('@/assets/distribution_images/uu.png')
+    }
+]
+
+export const goodsTypeData = {
+    "1": "快餐",
+    "2": "药品",
+    "3": "百货",
+    "4": "脏衣服收",
+    "5": "干净衣服派",
+    "6": "生鲜",
+    "8": "高端饮品",
+    "9": "现场勘验",
+    "10": "快递",
+    "12": "文件",
+    "13": "蛋糕",
+    "14": "鲜花",
+    "15": "数码",
+    "16": "服装",
+    "17": "汽配",
+    "18": "珠宝",
+    "20": "披萨",
+    "21": "中餐",
+    "22": "水产",
+    "27": "专人直送",
+    "32": "中端饮品",
+    "33": "便利店",
+    "34": "面包糕点",
+    "35": "火锅",
+    "36": "证照",
+    "40": "烧烤小龙虾",
+    "41": "外部落地配",
+    "47": "烟酒行",
+    "48": "成人用品",
+    "55": "宠物用品",
+    "56": "母婴用品",
+    "57": "美妆用品",
+    "58": "家居建材",
+    "59": "眼镜行",
+    "60": "图文广告",
+    "99": "其他"
+}
+
+export const mapMinPriceTypeOpciotn = [
+    {
+        value:0,
+        label:'商品原价'
+    },
+    {
+        value:1,
+        label:'商品折后价'
+    },
+    {
+        value:2,
+        label:'订单实付价'
+    }
+]
+
+export const freightReliefTypeOpction = [
+    {
+        value:0,
+        label:'商品原价'
+    },
+    {
+        value:1,
+        label:'商品折后价'
+    },
+]
+
+export const weekListConfig =[
+        {
+            label:7,
+            name:'周日',
+            isDisabled:false
+        },
+        {
+            label:1,
+            name:'周一',
+            isDisabled:false
+        },
+        {
+            label:2,
+            name:'周二',
+            isDisabled:false
+        },
+        {
+            label:3,
+            name:'周三',
+            isDisabled:false
+            
+        },
+        {
+            label:4,
+            name:'周四',
+            isDisabled:false
+        },
+        {
+            label:5,
+            name:'周五',
+            isDisabled:false
+        },
+        {
+            label:6,
+            name:'周六',
+            isDisabled:false
+            
+        }
+]
+
+export const periodOpction = [
+  {
+    value:0,
+    label:'天'
+  },
+  {
+    value:1,
+    label:'小时'
+  },
+  {
+    value:60,
+    label:'分钟'
+  },
+]
+

src/views/store/base/distributionSetup/editSelfPickUpSite.vue

@@ -0,0 +1,470 @@
+<template>
+  <div class="edit-self-pick-up-site-container">
+    <div class="block">
+      <div class="head">自提点基本信息</div>
+      <div class="content">
+        <div class="left">
+          <el-form ref="form" :model="form" label-width="180px" :rules="rules">
+            <el-form-item label="自提点类型" prop="type">
+              <el-radio-group v-model="form.type" @change="handleRadioType">
+                <el-radio :label="0">使用已有门店</el-radio>
+                <el-radio :label="1">自定义自提点</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <div v-if="form.type == 0">
+              <el-form-item label="门店名称" prop="name">
+                <el-select
+                  v-model="form.name"
+                  placeholder="请选择门店"
+                  class="input-address"
+                >
+                  <el-option
+                    v-for="(item, index) of nameOpction"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="门店详细地址" prop="address">
+                <el-input
+                  disabled
+                  class="input-address"
+                  v-model="form.address"
+                  placeholder="门店详细地址"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="门店营业时间" required>
+                <div class="time-block">
+                  <el-time-picker
+                    class="input-time"
+                    type="date"
+                    placeholder="开始时间"
+                    v-model="form.time1"
+                    style="width: 100%"
+                  ></el-time-picker>
+                  <span class="line">-</span>
+                  <el-time-picker
+                    class="input-time"
+                    placeholder="结束时间"
+                    v-model="form.time2"
+                    style="width: 100%"
+                  ></el-time-picker>
+                </div>
+              </el-form-item>
+            </div>
+            <div v-if="form.type == 1">
+              <el-form-item label="自提点名称" prop="pickName">
+                <el-input
+                  class="input-address"
+                  v-model="form.pickName"
+                  placeholder="请输入自提点名称"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="自提点所在地" prop="queryArea.city.name">
+                <Area v-model="queryArea" width="400" />
+              </el-form-item>
+              <el-form-item label="自提点详细地址" prop="pickAddress">
+                <keyword
+                  :keyword="form.pickAddress"
+                  :location="queryArea.city.name"
+                  :style="{ width: '400px' }"
+                  @getAddress="getAddress"
+                />
+              </el-form-item>
+              <el-form-item label="门店营业时间" required>
+                <div class="time-block">
+                  <el-form-item prop="pickTime1">
+                    <el-time-picker
+                      class="input-time"
+                      type="date"
+                      placeholder="开始时间"
+                      v-model="form.pickTime1"
+                      style="width: 100%"
+                    ></el-time-picker>
+                  </el-form-item>
+                  <span class="line">-</span>
+                  <el-form-item prop="pickTime2">
+                    <el-time-picker
+                      class="input-time"
+                      placeholder="结束时间"
+                      v-model="form.pickTime2"
+                      style="width: 100%"
+                    ></el-time-picker>
+                  </el-form-item>
+                </div>
+              </el-form-item>
+            </div>
+          </el-form>
+        </div>
+        <div class="right">
+          <baidu-map class="map" :center="center" :zoom="15">
+            <!-- <bm-overlay
+              pane="labelPane"
+              :class="{ sample: true }"
+              v-if="showOverlay"
+              @draw="draw"
+            >
+              <div>{{ form.pickName }}</div>
+            </bm-overlay> -->
+            <bm-marker v-if="showOverlay" :position="center" :dragging="true">
+              <bm-label
+                class="bm-lable"
+                v-if="showOverlay"
+                :content="form.pickName"
+                :labelStyle="{
+                  fontSize: '12px',
+                  display: showOverlay ? 'table' : 'inline',
+                }"
+                :offset="{ width: -35, height: 35 }"
+              />
+            </bm-marker>
+          </baidu-map>
+        </div>
+      </div>
+    </div>
+    <div class="block">
+      <div class="head">自提点联系管理</div>
+      <el-form
+        class="bottom-form"
+        ref="form"
+        :model="form"
+        label-width="100px"
+        :rules="rules"
+      >
+        <el-form-item class="item-block">
+          <el-form-item label="联系人" prop="contacts">
+            <el-input
+              class="input-address"
+              v-model="form.contacts"
+              placeholder="请输入联系人"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="联系电话"
+            style="margin-left: 50px"
+            prop="mobile"
+          >
+            <el-input
+              class="input-address"
+              v-model="form.mobile"
+              placeholder="请输入自提点电话"
+            ></el-input>
+          </el-form-item>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="footer">
+      <el-button class="btn" size="medium">取消</el-button>
+      <el-button class="btn" size="medium" type="primary" @click="handerSubmit">
+        保存
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+// 校验手机
+const validateMobile = function (rule, value, callback) {
+  const phoneRegex = /^1[3-9]\d{9}$/
+  if (!value) {
+    return callback(new Error('手机号码不能为空'))
+  }
+  if (!phoneRegex.test(value)) {
+    return callback(new Error('请输入正确的手机号码'))
+  }
+  callback()
+}
+
+import Area from '@/components/VabArea/area'
+import keyword from '@/components/baiduMap/keyword'
+export default {
+  components: { Area, keyword },
+  data() {
+    return {
+      showOverlay: false,
+      center: {
+        lng: 0,
+        lat: 0,
+      },
+      form: {
+        type: 0,
+        name: null,
+        address: '',
+        time1: '',
+        time2: '',
+        pickName: '',
+        pickAddress: '',
+        pickTime1: '',
+        pickTime2: '',
+        lng: 0,
+        lat: 0,
+        contacts: '',
+        mobile: null,
+      },
+      queryArea: {
+        province: { code: '', name: '' },
+        city: { code: '', name: '' },
+        district: { code: '', name: '' },
+      },
+      rules: {
+        type: [
+          { required: true, message: '请选择自提点类型', trigger: 'change' },
+        ],
+        name: [{ required: true, message: '请选择门店', trigger: 'change' }],
+        address: [
+          { required: true, message: '请输入门店详细地址', trigger: 'blur' },
+        ],
+        pickName: [
+          { required: true, message: '请输入自提点名称', trigger: 'blur' },
+        ],
+        time1: [
+          {
+            type: 'date',
+            required: true,
+            message: '请选择开始时间',
+            trigger: 'change',
+          },
+        ],
+        time2: [
+          {
+            type: 'date',
+            required: true,
+            message: '请选择结束时间',
+            trigger: 'change',
+          },
+        ],
+        'queryArea.city.name': [
+          { required: true, message: '请选择自提点所在地', trigger: 'change' },
+        ],
+        pickAddress: [
+          { required: true, message: '请输入自提点详细地址', trigger: 'blur' },
+        ],
+        pickTime1: [
+          {
+            type: 'date',
+            required: true,
+            message: '请选择开始时间',
+            trigger: 'change',
+          },
+        ],
+        pickTime2: [
+          {
+            type: 'date',
+            required: true,
+            message: '请选择结束时间',
+            trigger: 'change',
+          },
+        ],
+        contacts: [
+          { required: true, message: '请输入联系人', trigger: 'blur' },
+        ],
+        mobile: [
+          { required: true, message: '请输入自提点电话', trigger: 'blur' },
+          { validator: validateMobile.bind(this), trigger: 'blur' },
+        ],
+      },
+
+      nameOpction: [
+        {
+          value: 0,
+          label: '岛内价',
+        },
+        {
+          value: 1,
+          label: '哒哒',
+        },
+      ],
+    }
+  },
+  created() {},
+  methods: {
+    validateMobile() {},
+    getAddress(address) {
+      this.form.pickAddress = address.value
+      this.form.lng = address.lng
+      this.form.lat = address.lat
+      this.center.lng = address.lng
+      this.center.lat = address.lat
+      this.showOverlay = true
+    },
+    draw({ el, BMap, map }) {
+      const pixel = map.pointToOverlayPixel(
+        new BMap.Point(this.center.lng, this.center.lat)
+      )
+      console.log(el)
+      el.style.left = pixel.x - 60 + 'px'
+      el.style.top = pixel.y - 20 + 'px'
+    },
+    handleRadioType(e) {
+      if (e == 0) {
+        this.showOverlay = false
+      }
+    },
+    checkPickNameLength(text) {
+      switch (text.length) {
+        case 5:
+          return -10
+
+        default:
+          return0
+      }
+    },
+    handerSubmit() {},
+  },
+}
+</script>
+
+<style lang="scss">
+.edit-self-pick-up-site-container {
+  padding: 10px !important;
+  .block {
+    .head {
+      padding: 10px 20px 20px 20px;
+      font-size: 16px;
+      font-weight: bold;
+      color: #333;
+      box-shadow: inset 0 -1px 0 #efefef;
+    }
+    .content {
+      padding: 60px 0;
+      display: flex;
+
+      .right {
+        flex: 1;
+        margin-left: 100px;
+
+        .map {
+          width: 100%;
+          height: 420px;
+
+          .sample {
+            position: absolute;
+            z-index: 2;
+            border: 1px solid blue;
+            background-color: white;
+            white-space: nowrap;
+            cursor: default;
+            padding: 3px;
+            font-size: 12px;
+            line-height: 14px;
+          }
+
+          .BMapLabel {
+            background: #000 !important;
+            border: none !important;
+            padding: 5px 10px !important;
+            background: #0a87ff !important;
+            font-weight: 500;
+            border-radius: 3px;
+            outline: none;
+            color: #fff;
+            box-shadow: 0px 2px 6px 2px rgba(0, 0, 0, 0.7);
+          }
+        }
+      }
+
+      .el-form-item {
+        margin-bottom: 40px;
+      }
+
+      .line {
+        padding: 0 10px;
+      }
+    }
+  }
+
+  .bottom-form {
+    padding: 50px 0;
+
+    .item-block {
+      .el-form-item__content {
+        display: flex;
+      }
+    }
+  }
+
+  .el-input__inner {
+    height: 38px;
+    line-height: 38px;
+    font-size: 14px;
+  }
+
+  .input-address {
+    .el-input__inner {
+      width: 400px;
+    }
+  }
+
+  .time-block {
+    display: flex;
+  }
+
+  .input-time {
+    width: 127px !important;
+
+    .el-input__inner {
+      width: 127px;
+    }
+  }
+
+  .el-form-item__label {
+    padding-right: 30px !important;
+  }
+
+  .el-radio__input {
+    transform: scale(130%);
+  }
+
+  .el-radio__inner {
+    background: #fff !important;
+  }
+
+  .el-radio__input.is-checked .el-radio__inner::after {
+    transform: translate(-50%, -50%) scale(1.2) !important;
+    background-color: #1890ff !important;
+    width: 5px !important;
+    height: 5px !important;
+  }
+
+  .el-checkbox__inner {
+    height: 18px;
+    width: 18px;
+
+    &::after {
+      box-sizing: content-box;
+      content: '';
+      border: 2px solid #fff;
+      border-left: 0;
+      border-top: 0;
+      height: 8px;
+      width: 4px;
+      left: 5px;
+      top: 1px;
+      position: absolute;
+      transition: transform 0.15s ease-in 0.05s;
+      transform-origin: center;
+    }
+  }
+
+  .footer {
+    position: fixed; /* 使用fixed定位 */
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 58px;
+    background: #fff;
+    color: white;
+    text-align: center;
+    z-index: 1;
+
+    display: flex;
+    justify-content: center;
+    padding: 10px 0;
+
+    .btn {
+      margin: 0 5px;
+    }
+  }
+}
+</style>

src/views/store/base/distributionSetup/logisticsInterface.vue

@@ -1,13 +1,172 @@
 <template>
-    <div class="">物流接口</div>
+  <div class="logisticsInterface-container">
+    <div class="content" :style="{ height: minHeight + 'px' }">
+      <el-form ref="form" class="form-dialog" :model="form" label-width="160px">
+        <el-form-item label="类型选择" prop="">
+          <el-radio-group v-model="form.typeSelect">
+            <el-radio :label="0">快递鸟</el-radio>
+            <el-radio :label="1">快递100</el-radio>
+            <el-radio :label="2">阿里云</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="快递鸟套餐" prop="" v-if="form.typeSelect == 0">
+          <el-radio-group v-model="form.setMeal">
+            <el-radio :label="0">免费</el-radio>
+            <el-radio :label="1">付费</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="用户ID" prop="" v-if="form.typeSelect == 0">
+          <el-input clear="form-input" v-model="form.userID"></el-input>
+        </el-form-item>
+        <el-form-item label="API Key" prop="" v-if="form.typeSelect == 0">
+          <el-input
+            clear="form-input"
+            v-model="form.kuaidiniaoApiKey"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="京东商家编码" prop="" v-if="form.typeSelect == 0">
+          <el-input clear="form-input" v-model="form.code"></el-input>
+          <div class="tips">
+            若您使用京东物流，则需填写“京东商家编码”，否则将会造成物流信息无法查询
+          </div>
+        </el-form-item>
+        <el-form-item label="接口类型" prop="" v-if="form.typeSelect == 1">
+          <el-radio-group v-model="form.apiType">
+            <el-radio :label="0" disabled>免费版</el-radio>
+            <el-radio :label="1">限量免费</el-radio>
+            <el-radio :label="2">企业接口</el-radio>
+          </el-radio-group>
+          <div class="tips">因快递100接口变更，免费版功能暂时关闭</div>
+        </el-form-item>
+        <el-form-item
+          label="授权密钥（Key）"
+          prop=""
+          v-if="form.typeSelect == 1"
+        >
+          <el-input
+            clear="form-input"
+            v-model="form.kuaidi100ApiKey"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="数据缓存时间" prop="" v-if="form.typeSelect == 1">
+          <el-input v-model="form.dataTimeNum">
+            <label slot="append">分钟</label>
+          </el-input>
+          <div class="tips">
+            正式接口可能存在次数限制问题，设置缓存时间后在指定时间内只调取缓存并不调用接口（数据可能会延迟）
+          </div>
+        </el-form-item>
+        <el-form-item label="APPCODE" prop="" v-if="form.typeSelect == 2">
+          <el-input clear="form-input" v-model="form.ailiAPPCODE"></el-input>
+        </el-form-item>
+        <div class="tips" style="margin-left: 54px">
+          提示：请到阿里云开通“
+          <a
+            href="https://market.aliyun.com/products/56928004/cmapi023201.html?spm=5176.730005.productlist.d_cmapi023201.29343524ubjjnd&amp;innerSource=search_%E5%85%A8%E7%90%83%E5%BF%AB%E9%80%92%E7%89%A9%E6%B5%81%E6%9F%A5%E8%AF%A2#sku=yuncode1720100000"
+            target="_blank"
+            class="express"
+          >
+            全球快递物流查询
+          </a>
+          ”服务，获取appcode填入此处
+        </div>
+      </el-form>
+    </div>
+    <div class="footer">
+      <el-button class="btn" size="medium" type="primary" @click="handerSubmit">
+        保存
+      </el-button>
+    </div>
+  </div>
 </template>
 
 <script>
 export default {
-
+  data() {
+    return {
+      minHeight: window.innerHeight - 220,
+      form: {
+        typeSelect: 0,
+        setMeal: 0,
+        userID: null,
+        kuaidiniaoApiKey: null,
+        code: null,
+        apiType: 0,
+        kuaidi100ApiKey: null,
+        dataTimeNum: 5,
+        ailiAPPCODE: null,
+      },
+    }
+  },
+  methods: {
+    handerSubmit() {},
+  },
 }
 </script>
 
-<style>
+<style lang="scss">
+.logisticsInterface-container {
+  position: relative;
+  padding: 0 !important;
+  background: #f6f8f9 !important;
 
+  .content {
+    padding: 20px;
+    background: #fff;
+
+    .tips {
+      color: #999;
+    }
+  }
+
+  .footer {
+    position: fixed; /* 使用fixed定位 */
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 58px;
+    background: #fff;
+    color: white;
+    text-align: center;
+    z-index: 1;
+
+    display: flex;
+    justify-content: center;
+    padding: 10px 0;
+
+    .btn {
+      margin: 0 5px;
+    }
+  }
+
+  .el-input {
+    width: 270px;
+    height: 38px;
+  }
+
+  .el-input__inner {
+    width: 270px;
+    height: 38px;
+    line-height: 38px;
+  }
+
+  .el-form-item__label {
+    padding-right: 20px !important;
+  }
+
+  .el-radio__input {
+    transform: scale(130%);
+  }
+
+  .el-radio__inner {
+    background: #fff !important;
+  }
+
+  .el-radio__input.is-checked .el-radio__inner::after {
+    transform: translate(-50%, -50%) scale(1.2) !important;
+    background-color: #1890ff !important;
+    width: 5px !important;
+    height: 5px !important;
+  }
+}
 </style>

src/views/store/base/distributionSetup/selfPickUpSite.vue

@@ -0,0 +1,200 @@
+<template>
+  <div class="self-pick-up-site-container">
+    <div class="head">
+      <div class="head-add-btn">
+        <el-button
+          icon="el-icon-plus"
+          type="primary"
+          size="medium"
+          @click="handleSkip"
+        >
+          添加自提点
+        </el-button>
+      </div>
+      <div class="head-content">
+        <span class="name">自提点名称：</span>
+        <el-input
+          placeholder="请输入自提点名称"
+          suffix-icon="el-icon-search"
+          v-model="inputData"
+          size="medium"
+          class="input-with-select"
+        ></el-input>
+        <el-button type="primary" size="medium" @click="handleSearch">
+          搜索
+        </el-button>
+        <el-button size="medium" @click="handleClear">清除条件</el-button>
+      </div>
+    </div>
+    <el-table
+      :data="tableData"
+      :height="tableConfig.height"
+      style="width: 100%"
+      :stripe="true"
+    >
+      <el-table-column
+        align="center"
+        v-for="(item, index) in tabColumn"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :width="item.width"
+      >
+        <template #default="{ row, $index }">
+          <div class="" v-if="item.label == '操作'">
+            <el-button
+              type="text"
+              size="small"
+              @click="handleSkipEdit(row, $index)"
+            >
+              编辑
+            </el-button>
+            <el-button type="text" size="small">删除</el-button>
+            <el-button type="text" size="small">禁用</el-button>
+          </div>
+          <div v-else-if="item.label == '状态'">
+            <el-switch
+              v-model="row[item.prop]"
+              :active-value="1"
+              :inactive-value="0"
+            />
+          </div>
+          <div v-else>
+            {{ row[item.prop] }}
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      background
+      :current-page="queryForm.pageNum"
+      :layout="layout"
+      :page-size="queryForm.pageSize"
+      :total="total"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    />
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      total: 0,
+      layout: 'total, sizes, prev, pager, next, jumper',
+      queryForm: {
+        stime: null,
+        etime: null,
+        kind_id: null,
+        order_state_id: null,
+        pageNum: 1,
+        pageSize: 20,
+      },
+      tableConfig: {
+        height: window.innerHeight - 220 - 150,
+      },
+      inputData: null,
+      tabColumn: [
+        {
+          prop: 'serialNumber',
+          label: '序号',
+          width: '51',
+        },
+        {
+          prop: 'name',
+          label: '自提点名称',
+        },
+        {
+          prop: 'address',
+          label: '自提点地址',
+        },
+        {
+          prop: 'contact',
+          label: '自提点联系人',
+        },
+        {
+          prop: 'mobile',
+          label: '自提点联系电话',
+        },
+        {
+          prop: 'time',
+          label: '自提时间',
+        },
+        {
+          prop: 'state',
+          label: '状态',
+        },
+        {
+          prop: 'operation',
+          label: '操作',
+        },
+      ],
+      tableData: [
+        {
+          serialNumber: 1,
+          name: '福家优先超市',
+          address: '桂贵南路与郁江东路交汇处大龙城市广场1-3楼',
+          contact: '赵福生',
+          mobile: '13888888888',
+          time: '07:30 - 22:30',
+          state: 0,
+        },
+        {
+          serialNumber: 2,
+          name: '福家优先超市',
+          address: '桂贵南路与郁江东路交汇处大龙城市广场1-3楼',
+          contact: '赵福生',
+          mobile: '13888888888',
+          time: '07:30 - 22:30',
+          state: 0,
+        },
+      ],
+    }
+  },
+  methods: {
+    handleSkip() {
+      this.$router.push({ path: '/selfPickUpSiteAdd' })
+    },
+    handleCurrentChange() {},
+    handleSizeChange() {},
+    handleSearch() {},
+    handleClear() {},
+    handleSwitch() {},
+    handleSkipEdit() {
+      this.$router.push({ path: '/selfPickUpSiteEdit' })
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.self-pick-up-site-container {
+  padding: 0 20px !important;
+  .head {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-shadow: inset 0 -1px 0 #efefef;
+
+    .head-add-btn {
+    }
+
+    .head-content {
+      display: flex;
+      align-items: center;
+      text-align: center;
+      margin: 20px 0;
+
+      .name {
+        font-weight: bold;
+      }
+
+      .input-with-select {
+        margin: 0 10px;
+        width: 270px;
+      }
+    }
+  }
+}
+</style>

src/views/store/sellerconfig/index.vue

@@ -273,7 +273,6 @@
         this.sc_order_process.push(2020)
       }
 
-
       index = this.sc_order_process.indexOf(2030)
       if (index === -1) {
         this.sc_order_process.push(2030)
@@ -305,6 +304,7 @@
 .font-config {
   text-align: center;
   display: block;
+  margin-top: 8px;
 }
 
 .button-config .el-icon-setting:before {

src/views/store/setupshop/index.vue

@@ -57,7 +57,11 @@
             </el-col>
             <el-col :span="12">
               <div class="grid-content bg-purple">
-                <el-form-item :label="__('店铺banner')" label-width="150px" prop="store_banner">
+                <el-form-item
+                  :label="__('店铺banner')"
+                  label-width="150px"
+                  prop="store_banner"
+                >
                   <upload
                     height="48px"
                     :image="storeForm.store_banner"
@@ -229,7 +233,12 @@
               <el-form-item
                 label-width="150px"
                 prop="img"
-                style="margin-top: 30px; margin-left: -150px;height: 76px;line-height: 76px;"
+                style="
+                  margin-top: 30px;
+                  margin-left: -150px;
+                  height: 76px;
+                  line-height: 76px;
+                "
               >
                 <upload
                   height="76px"
@@ -254,9 +263,7 @@
               <el-form-item prop="check">
                 <el-switch
                   v-model="item.check"
-
                   active-text="启动"
-
                   inactive-text="停用"
                   @change="handleEdit(getSlideShowForm())"
                 />
@@ -385,9 +392,7 @@
           <el-form-item :label="__('是否开票')" prop="check">
             <el-switch
               v-model="storeConfigForm.sc_is_enabled_invoice"
-
               active-text="启动"
-
               inactive-text="停用"
               @change="handleEdit(getStoreConfigForm())"
             />
@@ -597,10 +602,7 @@
     },
 
     async handleEdit(params) {
-        this.$baseConfirm(
+      this.$baseConfirm(this.__('修改立马生效,是否继续？'), null, async () => {
-          this.__('修改立马生效,是否继续？'),
-          null,
-          async () => {
         const { msg, status } = await storeSetUp(params)
         if (200 == status) {
           this.$baseMessage(msg, 'success')
@@ -608,8 +610,7 @@
           this.$baseMessage(msg, 'error')
         }
         await this.fetchData()
-          }
+      })
-        )
     },
     handleParams() {
       let params = Object.assign({}, this.form)

vab.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   // 开发工具控制台名字显示
-  webpackBarName: 'lancer-admin',
+  webpackBarName: 'xiaofa-admin',
   // 浏览器注释显示
   webpackBanner:
-    ' build: lancer-admin \n copyright: https://www.lancerdt.com \n time: ',
+    ' build: xiaofa-admin \n copyright: https://www.lancerdt.com \n time: ',
 }