diff --git a/admin/config.js b/admin/config.js
index 74dff55..095759e 100644
--- a/admin/config.js
+++ b/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);
@@ -484,7 +484,7 @@ var User_BindConnectModel = {};
         window.SYS = {};
     }
 
-
+    
     SYS.VER   = 'undefined' != typeof SYS.VER ?  SYS.VER : '1.0.28';
     SYS.DEBUG = 'undefined' != typeof SYS.DEBUG ?  SYS.DEBUG : 0;
 
diff --git a/admin/diy-pc/static/shop/default/js/product_item.js b/admin/diy-pc/static/shop/default/js/product_item.js
index de54260..dc1b273 100644
--- a/admin/diy-pc/static/shop/default/js/product_item.js
+++ b/admin/diy-pc/static/shop/default/js/product_item.js
@@ -21,8 +21,7 @@ $(function() {
                     //defaultSelectValue : '-1',
                     //defaultSelectValue : rowData.categoryId || '',
                     showRoot : true
-                }
-
+                }            
                 var categoryTree = Public.categoryTree($('#category_id'), opts, 'product_category');
             }
 
diff --git a/package.json b/package.json
index 448323c..80852a1 100644
--- a/package.json
+++ b/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"
diff --git a/public/config.js b/public/config.js
index 74dff55..615c7bb 100644
--- a/public/config.js
+++ b/public/config.js
@@ -524,7 +524,6 @@ var User_BindConnectModel = {};
     return SYS.CONFIG;
 }));
 
-
 // utils.js
 if ('undefined' == typeof window.verifyUtils)
 {
diff --git a/public/index.html b/public/index.html
index 9afd673..d6a3b7b 100644
--- a/public/index.html
+++ b/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>
diff --git a/src/api/printer/printer.js b/src/api/printer/printer.js
new file mode 100644
index 0000000..6d2e807
--- /dev/null
+++ b/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,
+  })
+}
+
+
diff --git a/src/assets/time-selector.jpg b/src/assets/time-selector.jpg
new file mode 100644
index 0000000..b0b3cef
Binary files /dev/null and b/src/assets/time-selector.jpg differ
diff --git a/src/assets/xiaofa-logo.png b/src/assets/xiaofa-logo.png
new file mode 100644
index 0000000..1160a0f
Binary files /dev/null and b/src/assets/xiaofa-logo.png differ
diff --git a/src/baiduMap/index.js b/src/baiduMap/index.js
index 547d846..48978c4 100644
--- a/src/baiduMap/index.js
+++ b/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
diff --git a/src/components/baiduMap/keyword.vue b/src/components/baiduMap/keyword.vue
index dddf1b7..5252298 100644
--- a/src/components/baiduMap/keyword.vue
+++ b/src/components/baiduMap/keyword.vue
@@ -28,69 +28,69 @@ prop:
 </template>
 
 <script>
-  export default {
-    props: {
-      keyword: {
-        type: String,
-        default: '',
-      },
-      location: {
-        type: String,
-        default: '',
-      },
+export default {
+  props: {
+    keyword: {
+      type: String,
+      default: '',
     },
-    data() {
-      return {
-        key: '',
-        addressList: [],
-        loading: false,
-        selectAddress: {},
+    location: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      key: '',
+      addressList: [],
+      loading: false,
+      selectAddress: {},
+    }
+  },
+  watch: {
+    keyword(newVal, oldVal) {
+      this.key = newVal
+    },
+    // key(newVal, oldVal) {
+    //   this.getAddress({
+    //     value: newVal,
+    //   })
+    // },
+  },
+  methods: {
+    searchcomplete(results) {
+      if (results && results.as) {
+        this.addressList = results.as
+      } else {
+        this.addressList = {}
       }
     },
-    watch: {
-      keyword(newVal, oldVal) {
-        this.key = newVal
-      },
-      // key(newVal, oldVal) {
-      //   this.getAddress({
-      //     value: newVal,
-      //   })
-      // },
+    querySearchAsync(queryString, cb) {
+      clearTimeout(this.timeout)
+      this.timeout = setTimeout(() => {
+        cb(this.createStateFilter())
+      }, 500)
     },
-    methods: {
-      searchcomplete(results) {
-        if (results && results.as) {
-          this.addressList = results.as
-        } else {
-          this.addressList = {}
-        }
-      },
-      querySearchAsync(queryString, cb) {
-        clearTimeout(this.timeout)
-        this.timeout = setTimeout(() => {
-          cb(this.createStateFilter())
-        }, 500)
-      },
-      createStateFilter() {
-        let addressList = this.addressList
-        if (this.addressList.length > 0) {
-          return addressList.map((address) => {
-            return {
-              value: address.address,
-              lat: address.point.lat,
-              lng: address.point.lng,
-            }
-          })
-        } else {
-          return []
-        }
-      },
-      getAddress(item) {
-        this.$emit('getAddress', item)
-      },
-      change(val) {
-        this.$emit('change', val)
-      },
+    createStateFilter() {
+      let addressList = this.addressList
+      if (this.addressList.length > 0) {
+        return addressList.map((address) => {
+          return {
+            value: address.address,
+            lat: address.point.lat,
+            lng: address.point.lng,
+          }
+        })
+      } else {
+        return []
+      }
     },
-  }
+    getAddress(item) {
+      this.$emit('getAddress', item)
+    },
+    change(val) {
+      this.$emit('change', val)
+    },
+  },
+}
 </script>
diff --git a/src/components/baidu_Map_xiufu/overlays/Circle.vue b/src/components/baidu_Map_xiufu/overlays/Circle.vue
index 02860d0..f781937 100644
--- a/src/components/baidu_Map_xiufu/overlays/Circle.vue
+++ b/src/components/baidu_Map_xiufu/overlays/Circle.vue
@@ -1,132 +1,161 @@
 <script>
 import commonMixin from '../base/mixins/common.js'
 import bindEvents from '../base/bindEvent.js'
-import {createPoint} from '../base/factory.js'
+import { createPoint } from '../base/factory.js'
 
 export default {
   name: 'bm-circle',
-  render () {},
+  render() {},
   mixins: [commonMixin('overlay')],
   props: {
-    center: {
-    },
-    radius: {
-    },
+    center: {},
+    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
+    'center.lng'(val, oldVal) {
+      const {
+        BMap,
+        originInstance,
+        isEditing,
+        disableEditing,
+        enableEditing,
+        center,
+        editing,
+      } = this
       if (!isEditing) {
         disableEditing()
         const lng = val
         if (val.toString() !== oldVal.toString() && lng >= -180 && lng <= 180) {
-          originInstance.setCenter(createPoint(BMap, {lng, lat: center.lat}))
+          originInstance.setCenter(createPoint(BMap, { lng, lat: center.lat }))
         }
         editing && enableEditing()
       }
     },
-    'center.lat' (val, oldVal) {
-      const {BMap, originInstance, isEditing, disableEditing, enableEditing, center, editing} = this
+    'center.lat'(val, oldVal) {
+      const {
+        BMap,
+        originInstance,
+        isEditing,
+        disableEditing,
+        enableEditing,
+        center,
+        editing,
+      } = this
       if (!isEditing) {
         disableEditing()
         const lat = val
         if (val.toString() !== oldVal.toString() && lat >= -74 && lat <= 74) {
-          originInstance.setCenter(createPoint(BMap, {lng: center.lng, lat}))
+          originInstance.setCenter(createPoint(BMap, { lng: center.lng, lat }))
         }
         editing && enableEditing()
       }
     },
-    radius (val, oldVal) {
-      const {originInstance, isEditing, disableEditing, enableEditing, editing} = this
+    radius(val, oldVal) {
+      const {
+        originInstance,
+        isEditing,
+        disableEditing,
+        enableEditing,
+        editing,
+      } = this
       if (!isEditing) {
         disableEditing()
         originInstance.setRadius(val)
         editing && enableEditing()
       }
     },
-    strokeColor (val) {
+    strokeColor(val) {
       this.originInstance.setStrokeColor(val)
     },
-    strokeOpacity (val) {
+    strokeOpacity(val) {
       this.originInstance.setStrokeOpacity(val)
     },
-    strokeWeight (val) {
+    strokeWeight(val) {
       this.originInstance.setStrokeWeight(val)
     },
-    strokeStyle (val) {
+    strokeStyle(val) {
       this.originInstance.setStrokeStyle(val)
     },
-    fillColor (val) {
+    fillColor(val) {
       this.originInstance.setFillColor(val)
     },
-    fillOpacity (val) {
+    fillOpacity(val) {
       this.originInstance.setFillOpacity(val)
     },
-    editing (val) {
+    editing(val) {
       val ? this.enableEditing() : this.disableEditing()
     },
-    massClear (val) {
-      val ? this.originInstance.enableMassClear() : this.originInstance.disableMassClear()
+    massClear(val) {
+      val
+        ? this.originInstance.enableMassClear()
+        : this.originInstance.disableMassClear()
     },
-    clicking (val) {
+    clicking(val) {
       this.reload()
-    }
+    },
   },
   methods: {
-    dragStartHandler () {
+    dragStartHandler() {
       this.isEditing = true
     },
-    dragEndHandler () {
+    dragEndHandler() {
       this.isEditing = false
       this.bindEditingNodeEvents()
     },
-    bindEditingNodeEvents () {
-      const {originInstance, editingKey, dragStartHandler, dragEndHandler} = this
-      originInstance[editingKey].forEach($node => {
+    bindEditingNodeEvents() {
+      const { originInstance, editingKey, dragStartHandler, dragEndHandler } =
+        this
+      var key = editingKey
+      if (editingKey == undefined) {
+        key = 'nc'
+      } else {
+        key = editingKey
+      }
+      originInstance[key].forEach(($node) => {
         $node.addEventListener('dragstart', dragStartHandler)
         $node.addEventListener('dragend', dragEndHandler)
       })
     },
-    enableEditing () {
-      const {originInstance, bindEditingNodeEvents} = this
+    enableEditing() {
+      const { originInstance, bindEditingNodeEvents } = this
       originInstance.enableEditing()
       bindEditingNodeEvents()
     },
-    disableEditing () {
-      const {originInstance} = this
+    disableEditing() {
+      const { originInstance } = this
       originInstance.disableEditing()
     },
-    getEditingKey (overlay) {
+    getEditingKey(overlay) {
       const stack = []
       overlay.enableEditing()
       setTimeout(() => {
@@ -137,26 +166,53 @@ 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 overlay = new BMap.Circle(createPoint(BMap, {lng: center.lng, lat: center.lat}), radius, {
+    load() {
+      const {
+        BMap,
+        map,
+        center,
+        radius,
         strokeColor,
         strokeWeight,
         strokeOpacity,
         strokeStyle,
         fillColor,
         fillOpacity,
-        // enableEditing: editing,
-        enableMassClear: massClear,
-        enableClicking: clicking
-      })
+        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,
+          strokeStyle,
+          fillColor,
+          fillOpacity,
+          // enableEditing: editing,
+          enableMassClear: massClear,
+          enableClicking: clicking,
+        }
+      )
       this.originInstance = overlay
+
       map.addOverlay(overlay)
       bindEvents.call(this, overlay)
       // 解决圆形组件无法双向绑定的问题
@@ -164,7 +220,7 @@ export default {
       setTimeout(() => {
         editing ? enableEditing() : disableEditing()
       }, 0)
-    }
-  }
+    },
+  },
 }
 </script>
diff --git a/src/config/net.config.js b/src/config/net.config.js
index a72a845..65d0de7 100644
--- a/src/config/net.config.js
+++ b/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',
diff --git a/src/config/setting.config.js b/src/config/setting.config.js
index 6b7215e..689f7d0 100644
--- a/src/config/setting.config.js
+++ b/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',
   // 消息框消失时间
diff --git a/src/icon/xiaofa-logo.svg b/src/icon/xiaofa-logo.svg
new file mode 100644
index 0000000..96d2eed
--- /dev/null
+++ b/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,iVBORw0KGgoAAAANSUhEUgAAAKoAAACqCAYAAAA9dtSCAAAAIGNIUk0AAHomAACAhAAA+gAAAIDo
+AAB1MAAA6mAAADqYAAAXcJy6UTwAAAAGYktHRAD/AP8A/6C9p5MAAAAJcEhZcwAAFiUAABYlAUlS
+JPAAACkLSURBVHja7Z15eFTl9ce/d5vJ7EsWskAgGBZBi1qL4lLABSlYoCCbooIoKkL9aVGoUlqV
+ogJFMSqLgLQiIFRawSKFKiAoiwrIviYEErJPZsssd/39MSYS5s5kJpktYT7Pw/Nk5t77vudevnPv
+e8973nMISZIkJPFD4jiIdidEuwOizQHBUgv2dBG4wmIIFivgZcFbagGXG7zVBt7mBOH2gK+yAADo
+dDMkVQpogxa00QCoVaDNJkCpAGU2guncEYqueaDMJpAGHUi9DqReC4Jh4n3qCQmRFKoP0e2Ga+de
+sEdOwnvoGPjiEp9I7U4INjtERx0giJHtlCJB6jSgDHqQei1IvQ50x/ZQ3tATiuu7Q933VpAqVbwv
+TUJwVQpVdLshVtaAL6+Ee+8BOLfsgGvnNyDcXLxNa4SkYqDuezu0A/tBdetNoDMzQGakXpXivWqE
+KnEc3Lv2wbnpf/DsPwD+UiW48goQnsQSZ0D7Uxgwme1AZ2cgpfdN0AzqD1XfPiAVinibFhPatFAF
+mx1cYTFcW3bAtmINuLMX4m1SRKE658L42Gho7usHRZc8kAZ9vE2KGm1SqFzRBdhWroPzi+0QzhaB
+t9pBtLmz9CERAGnQQZGfB82gu2AYPwpMXm68zYo4bUaoYk0tXLv3w7Z8Neq27gS8fLxNig8KGuoB
+fWF8/EGo7+gNMtUUb4siQqsXquB0wr50NWwffgL21FmAE+JtUmLAUFB0y4d+3HAYnnkUlFYbb4ta
+RKsVKl9aBufGrahdsKTNjT0jDdMpB6YXJ0M7+B7QuTnxNqdZtDqh8tU1qH39XTg3bgVbdBFEpH2b
+bRSJIqHIzYFm6L0wT58COjMj3iaFRasRqmCphWPdJlS//AZEiz3e5rRqCL0Gaa++AP1Dw0GlmeNt
+Tmg2J7pQJUlC3eYvUfPn+WAPn4CUHINGBpoC06ML0mc9B82wgSAoKt4WBSVhhSqJIvjCYtQsWAr7
+8jUAe5W+xUcZgqGgGzcc5ulToOiSB5BkvE2StzMRhSrxPCxz34d18T8gXCyPtzlXBXR2BgwTx8L0
+xykJOUWbcEL17D+Iyikz4fnux3ibclWi6NUdmYveREqfX8bblEYkjFAljoP1nRWwzFsEoaI63uZc
+1ZDpZpifnwTj85MSJpYgIYTKl1XAMqcA1sUfAXzyZSkRkCgSxomjkTrredA5WfE2J/5Cde87gIqn
+Z4A9eDze1yKJDIpe3ZG5ZC5SbrkprnbETaiS2w37qg0of3ZmwsWBJmmMpGKQuXA29OOGg4jTi1Zc
+hCqxLCqemg776n8D3qRIWwVKBvoxQ9Fu6VwQcRi3xlyoQlUNyp+cjrp/bYn5ySZpOZph9yFz8Rug
+2qXHtN+YCpWvrEbZiCfg2vNDco6+lSJRJNS33ICsT5fFNF4gZtMQ7MkzKBn4INy7v0uKtBVDCCLc
+3x5Ayb1j4T1+Omb9xkSonh8Oo3TIBHgPJd/s2wreY6dQMmQ83Lv3x6S/qD/63Xt+QOnISRBLK2Jy
+QkliC5WZjqw170Hd77ao9hNVoXp+OIzSoRMgJEXapqEz05G1fglUd/SOWh9REyp78ixKh4wHd+Z8
+1IxPkjjQ1+QiZ+NKKHt0jUr7UREqX1mNkoEPwnvoeJtd/ZmkMRJBQNmzK9pvWxMVb0DEX6aEKp8L
+ij2YFOnVBCFJYI+ewqURj4OvqIp4+xEVqsSyKH9yBlx7fojZBUqSWLj3HULFpBcgsWxE242YUEW3
+G+VP+Wackn7SqxdCEFG38X+omPQiRLc7Yu3SkWrIsepTOFb/Ox7Xpk1CaFTQP/4g4PZAqLbAc/AY
++KLwloWTJgPEWltc7Lev/Qyq22+G4YlxkbkekXiZcu87gAv9RyRsFJTq3juRuWKB7DbJ7UHZqKfg
+PXQsav0TGjXodmmQvCz40tCW1jBdO6PDjvWgs9o1+l6wWCHU2nA+//agx1NZ7ZC1bhEklxuVk18G
+d+581M4vEJKKQe72T6GKQIhgi++ofFkFKp6ekbAiBQBKpwXTXj74V3S5QSiimzxXP3EMzH94skGo
+otUGwWqHUFEN65JVsndKUq8FofPPbkKZjeBKgoudNBmQvW4RUm67GQCQ8/nfUfncX+Dasj2q53kl
+hJtDxdMz0P4/H/n94MKlRWNUieNQO6cgGfTcBOo7eoPJzYGiSx7U/fpAO2wgDONHwfSHSQGPoXOy
+QGk1stvcu/YGPE7RoytytnwM1R29QZAkCJKEovs1yFr7HrRjhgAxzmjNHjyO2jkFkLiW3chaJFTr
+O8tRu/ijmJ54a4PKTIfi+u6y27jzJQHHnfpxw2W/l3gedZu2yW4jTQZkb1iGlF/18rfDoEfmigVI
+nzcThCa2wc+1iz+C9Z3lLWqj2UL17D8Iy7zFyTVOTUBntwOdLf/Yc38d+M6o7H2D7PdinQt8pfzi
+R7HWBuemrUAA1xCpSoFxynhkLHwNdE5m7C4CL8AybzE8+w82u4lmCVXieVROmZlcLRoCyl/0ACnz
+CJd4Ho51m2SPofNywQQQN19RDaE88HWvmTUftQUfBtxOUBT0E0Yha/1iUDEUq1BRjcopMyHxzUsk
+ErZQJVGEZe77yXX3IaJ/fCwImewjQq0NfEmZ7DG6UfeDoOXfc/miCxDKAgf5SG4Pql+YjeqZcyHY
+5HN0EXHKhuL57kdY5r4PSQzfzx62xXxhMayL/xGXE21tkCYDUm7+hew2/uIlcBcuyW5L+eX1Adv0
+HjkVUt+Wue+jatprsjNE7l37UDbyKQghusoiiXXxP8AXFod9XHjuKUlCzYKlyTQ7IWJ46mGQSqXs
+Nq64BExH/1ylpFYDxXXdA7YpVNdAcV23kPr37D0Aa8FKGKZOAPmTC44rLkHNX98BaTJAYTL421V0
+EVKdK2rXRLhYjpoFS5H53hyAIEI+LiyhOjd/6UtYliQkFN3zA27T3PtrqO+8xX8DQYA06AIeZ35x
+MszTngrdCJIEQf384KTSzMhaVRBw97KHn426v9W+fA20g++GdvA9IR8TslAFSy1q/jw/7ln1mLxc
+mF6agrrPvwR/oRSCxeob6wlR8j5QFJiOOWCu6QT9hNGwffgJ3Nu+DunQYGNBUqsBAvhJg5pjNrbo
+dEiNGtCoA29Xp0TmugWD5VHz5/lQ9fklKHNoNQZCFqpz/edgD5+I/kk0geL67jBMGA3DY2MgOuog
+WqzwnjoH7uhJODdug3vXvoj0Q2hU0D80Aprf3gPlL64FnZkBQsGA0qpRumMP0EIH9tUOe/gEnOs/
+h+HJh0PaPySh8tU1qHrp9YRIoqt7eERD0lnKoANl0IHJ6wAM7Af9Ew/hnPHaFvdheuFpmF+aAsro
+P4ZT3nIjmPxO4E6cifelaNVInICqP82DZsQg0GmpTe4f0lt/7esFCZOOPNi6HM++AxHpw3PomKxI
+Ad8YTzviN/G+DG0CscqC2tcLQtq3yTsqX1oGx8at8T4nAICq321gMuUzdEiiCMfqzyLSj3vb1/Ae
+PwNljy5+2wiShPGpR2B9a1mTb8fsiTNw7dgTUp9EihLKG3qCTJH3ErAnz4Ivj3zk/JUIVTVR7+Ny
+HBu3wvT8k01mDGxSqM6NW8EVlSB0R0L00I4YFHCb6KiD93DkgmNs761E+juvyua2Z3IyoZ84BrZ3
+VgRtwzKnAJY5od0xFL2uRYft6wEZoQpOFy72HwkhBkKNNVxRCZwbt8L49KNB9wv66BeddahdsCQh
+IvYJnRaq2wJnQeaKS8BfvBRGi8Fx7fgWgqU24HbdA4NBqCL3hqwfMwyUySi7zb1zT5sUKeBbEVC7
+YAlEZ13Q/YIK1bZ0VcIUG2M6tgfTsX3A7eyPJyBUWyLWH3umKGhmF+UvegT1k4YDaTLA8KR8JLzo
+8cL61gcRO69EhDt7Abalq4LuE/DRL9RYYPtwXbzPoQFF1zyQxsDVk+u27YxshxwP5z83Q3Pvr2U3
+UwYdtCMGw3vwaMv6IQikvjINlEn+5U2stQI0HfJsVDgIlTUQKhMjsMj24TroHx0JKlW+7lVAoXq+
++c5XWzRBMDwzPmAtJMFqg3PDFxHv0/7xBqTOfgF0urz7xPjUONTMfLNFfdB5udAOuTfgdiotFVkf
+FwBRyBNiXfIRambOi3i7zYE9dRaeb76DZsh98tcp4EksW50wBXBJox4pvW8MuN29+7uozE9LdS44
+N2yGMYBTmko1wfynZ2F5bWGz+9ANHwi6feA3XoKhQUWpQjSp17W8kUjBCbAuWx1QqLJjVK7oAuq2
+hjZNGAuMkx8FpZWf9pN4HtYl0VtlYP/HpxCD/AjUA/s3O2KezstF6l/+kPBV82JF3davwQVY8SAr
+VNvKdYmTspyhoerXJ+BmodYGvuhi1LrnCovBFZcG3K68rjsU3cJ/qSJSlMhY+Ipv7j2JDy/n054M
+fkIVbHY4v4jtasVgKK7pBOX1gadF2RNnwZ0LP74xVITyKnj2Bs78Quo00D/6QNjtqu68Ber+0U3V
+2BpxfrFdNuDbb4zKFRZDOFsYb3t/NjC/I6i0wGM0z57vIXm8UbXBsf4/0D/ygGzUPUEQ0I0dhuqX
+3gx5nEylmZFRMFt2iYocXHEJ3LvCTJjLMFD3vRV0gJk80eOBK4FuSPUIZwvBFRaDurFx8LjflXdt
+2Qne6kiImSgAME2dGHBZhsSyqH17WdRtcG3ZDvZ0keyUKgDQ6akhzVQBABgGaXNnQtGtc8j9k0Y9
+bEtXhSVW9T13QjOof8Dt7q/3wbVzb8jtxQre6oBry06kXCHURo9+ieNgW7E6YbLwUWnmhiQKcnhP
+nI3ZjI1t6aqga320QwaACDBPfzmawXdBN+r+8K6DQY+0uTNBhhi7qex9o2/xnkwCC8A3vKuaPgeS
+K3K5oSIFIQG2Fav98gA0Eqp7176EmYkCAOP/PR7wbR8A7Mtit9rAvWtf0Gm+lBt6gsnPC9qG4oae
+aPfuX4O+QAlO+eFDyq96IfODpn22TH4eslYtDBj9JXq8qHz6j2CjmMKopXBnL/jFFTcSqnPT/+Jt
+YwOEKgWqX98ScLtgtcG1OzJB0qHAnbsA9kxRwO1UqgnqIN4J0mxExjuvBlxPL0kS6rZ9jeoZc2Sz
+ihAUBe3wQUibN1M+xoAgoOjRFe23rYaiS+BhhfOf/4Hjn5tjdt2ay5VabBCq6HbDsz8y8ZyRgOnW
+GcrrAy9y44ougi+MnlvqSkSbHd79h4LuY3z2sYDbMt6dDVWQYYxQXoWqP7wK+8pPULdtV8D9TFMn
+IPXVaX7fq+7ojfZbV4Pp1CHgse5d+1D13F9axeoEz/4DjdJWNghVqKwBf6ky3vY1oO57W8DHFwC4
+tu6EaHfE1Cbr0o+DJlBQ5OdBdUVsAKFQIO3Nl6AfOyygY18SRVjfXQn2yElIdW6Uj5sK79FTkEu0
+SCiVME97CukL/gxCqwGhVsEw+VG0/9+aoNlP2DOFKH9sWkQDd6IJf6kSQuXPsbENQuXLK8GVJ071
+ElOQu1Os3vavhD10DOzpoqD7GB4e0eiz/tEHYJgcPNbSuWEzLPMWNXwWa22oeHI6hOrAQczGqROQ
+tW4xMj8uQMZbfw5an5QrLUfp4EfBnQ1ueyLBlVeAL//5xtkgVO/eAyA8ifFIIE0GsGfOg6+qkX3T
+9hw8Grf4TNsHqxrd6SRRhGB3wLV7P6pnzkXls7N8Gxga+sfHIuPd2QGz8gEAe7oQVS/+1e9x7Pn2
+e1Q990rA6VuCpqH9TX/ohg0MLtILJSgf+wy4M61HpABAeDh49/48FG1wUDq27Ii3bQ2ItTaU3v8I
+FF06Q/mLa2Ga8QxSevUA4Jvbt8xfEjfb6gNgCK0GXGk57B99Cuf6TWBPFTZy+BseGYm0+X8KKiKJ
+ZVE+4fmAU8COj/8FSBLaLZ3brKlW7vxFlAwcB+504kzghINjyw4Yn30cwE9CFd1uuHZ+kzBOfgAA
+x4M9fhrs8dNwrP0MqrvvgOGx0WC6dAZ7JH7LtvmSMjg+2QTP/kOwf/wppDp/X6T6/nuQ8f5fg4vU
+60Xlc6/A8+33QftzrP436JwspM1+MayEw96jp3Bp2GNRnV6ONq6d30B0u0GqVD6hunbuTeiM0QDg
+/nI33F/uBpWZDqEqfi8EQnkVKh6fFnQf0eZosqa989//hX1l04HpqrvvgOr2m5vczw+agub+e2Bd
+2LK8pPGEcHNw7dwL7cD+vjEqe+RkvG0KGaG8KrysKAQBdYAo/Wjh2bUPXID1W5Ioom7rTpSNmQzJ
+7ZG1l+7UAZph96HDrn+hw//WQjv0vrDTtyu75yPj7VfQuewg0gtmI+W2m8Hkd4p5xumWUq9NGgC8
+P7bd1OYpt9wIzeC7Y96v66tvYHh0pN/37m+/R/n452WP0Q7/DbQP3A9Vn1+Cbp8ZMMYhHOjMdJim
+jIdx0kPgq6rBnTkP79FTcO/cg7ovvpIduiQS9dqkJY4Dfz52jvNIk3fuW0CpgGh3QLRYAQBCrRX8
+pQooe3aDolfPoNOwkscLMQrRV7Zla6AfN7zBdypJErjTRbg0ZEJDSR0qMx10+2xoRwyCbtRvwXTM
+iVoQNaFgwORkgcnJgrpfH5imjIfEsuAulMJz4Cg8e36AZ+8BcGfPJ5SvlT9/ERLHgRbtjpg7ziOJ
+a9c+352rmdmTBZsdoi3yWWBEuwOizdGQ1Iw7XYiy0U9DYlnoHn4AmoF9kXLT9aDbZ4PQqECEkYIR
++CmX/393Qiir8IUgNjEmloNQKKDIz4MiPw/6Ub8FX1GF4uti//Rp8jraHaBFuxOi3Rlve5rNlXeu
+cOEKL0RlRk64VAH+UgVIox7eQ8dQPnEa2B+PI33hKzBOmdDsrM+S1wvv4ROwLlkF+/K1AIC6L7bD
+POMZKH9xLQhl0xFcsu3yPGoXLk+ouykA1OuTlOwOCLb4VHeLzIn47lzNxbH2s6jMfQvVFrAnzsD9
+7fcovX98Q7SS9Z0VIRdFuxxJEOA5fBylw59AyYCHGkQKAM4NX6BkwEMoHf4EPIePQ2pGCk7voeOw
+LV4V9nHRRrDZINkdIHmLFYIjehmGo34i5ZWNptpCRZIkuL79PqqhgtaCFbg0ZEKjnPvcuWLYVnwS
+ch57wWZH3Ze7UTZuKi7cPBiuzV9BtPrfWESrDa7NX+HCzYNRNm4q6rbtCvnuKPE8at/+wJdDIMEQ
+HC7wFito9nRRQqTsafaJVFnAFZdC2aNrWMdxpwtR+cSLUbUtUER+7bxF0A27D8qfZttkz6umFtbF
+q+D89HOwJ86GvtyG4+BcuxF1G7aA6ZoH9d13wPjsRCjycgMe4tjwhW8WLAEhBBHs6SLQzUn8n1BI
+UpNeC4nnIbEcJI6DaHPA/fVeVP5+VtwK2kp1LpQ/Pg0dtq9vWDcliSKEagu8R06ibtO2FjvqJZYF
+e/QU2KOnYF24HKp+faAbOxQpN/cC07E9SIMOBE2Dr7bA8trbcbkOocIXFoMWfnLptGYs8xbB8cmm
+gNslgQdYDhLLQbQ7fMufo5VKPUTYo6fg2v4t1Pf+Gt7vD8O6bA28+w+CPXs+KmNm9449cO/YA1Kn
+Bd2pPejsdtCNGgK+ohLsicTJiCOHYLGCKBs3VbKv2hBvW65K6LxciFZb3O7srQX9uOGg+SCpFZNE
+l0B1UJM0hrfUgkzElYhJklyO5HKDFKzJx06SxEaw2kDyttY7K5Xk6oC3OUEScqFmSZIkEITbA5KN
+YxBykiShwFZZEKeC2EmShA4JgKbTzW224sZVB8OAzvBP4y7YHJCuSEdEaNRRrSIdSeh0M2gpgiVo
+kgSm/fb1ft/xVTUoHxVGpegmUP36FrRb9Lrf97aVn6B2zrsAfDVezS89C6ZTDionvxyVWNxII6lS
+QNMGLdh4WxIA0qiHomvo6RnjCXu6EKI18H+6XF4qrqQsojZQBh0UXfwTtfkKDiuguL4bMj98C8rr
+u0PieXiPnETt35YmfIof2qAFHSxtTrxR3XkLsta+H28zQqJszGTUbdoWbzMCkjZ/JgzjR4H8KRUl
+QdNIe2UaIIiovSxLSyJCGQ2gCXXzCiXEAoKhQSawfVfamsjUbdwG/SONU7gTCgbml6eCPXEGdZ8n
+TibHKyHUKpB0iMlhk7RuXDv3wPre3/2+pwx6tFv8BhQ39Iy3iQGhzSaQoWRJTtIG4HjUvPwm7Gs+
+81uqQudkIu2VPzR7vVW0IVKUIOtXSSZpu1DpP5dtrJwyE57vfmz4LPE87Os2oerFv0JiE/O1mjIb
+QdOdO8bbjmbBl5ZDjHHkF6lWBc1BGgkU1+Y3vPCEC3NNJ/k2u3dBSu8bGj7bVq7zfRZF2FdtgG3Z
+WlAGHahf9QJfWt6sxYfRhO7cEbSiax4kimx166aqZ82H6787Ytqn+r5+yFw+P6p9pBfMhqrPL5t3
+cIB5RuV13WT9uACgG/Vb6Eb9tuGz5c33YXn1raieYzhIFAlF1zzQtNkISqeGaG1dUVSi1RbzX74Y
+g5BIMkUZcU8HQdPy6YFI0u/7cHNcRRtKpwZtNoIk9DpQhsT1pSa5uqEMBhB6HWhSrwWpb96YKBFQ
+D7oLmoH9otpH3ZYdcG3+KuJ2kVo10t95FQAgeVlYQymodpVRr0+a1OsSqxx2mGgG9oNp6mMtb6gJ
+whVqKHZRRkPDPqLLDef6z6N+Hq2Nen3SBMOA7tQB+Ob7lreaJCpwlyrg/uqbkPbVDh3g5zUQHU44
+P9sa0vHeA0fifbqNoDt1AMEwvvyoyl49EjZTRhLfatXyh38f0r55F7/zE6pgc4R8fKJRn02GBABF
+kMJjSZLEk3ptkgCg7nsrJFViuSWSRBfSlPieHknlK+UO/JQanVSpoO57O9wJVMInVKp+PwtVv58V
+bzP8YM8UwbVjT8NnuXhU0euFZ4+vlpLk8UYkT61cMjXyilBOKjMdnY7vgG3JR7Cv+QzcyXMJOX2q
+7ns7SJXPp9zg7dUN7NcqhZqo2Ao+hK3gw4bPXaUSv32EKgtK+o9ssi1Sq4F2+G+C7iO6PHDv2guh
+ogrI79Ro25Wp4U0vPA3KZIB5xhQYJo2Da/d+WOcvDph9MF7oLnPvNQhVeetNkFKYhKnel+RnlL16
+IPvTD4LuI1RbcDEE0VMZqY38u5TZCN2QAdAM6AvbirWoeubleJ8uAEBKYaC89aaGzw1CpTMzwGS2
+A3++pFkNx5vMj96JeJtCrTUhhxXBbZaf5qXzcsEXXQCd1wFMnn8FaoKhwZ1MnKx+TGY70JkZP9tf
+/weVkQo6O6PVClU/bnjE2+RKylqdULkAiddSbuwJZ9EFpM2e3jDuuxz+UgWc/wlvUiOa0NkZoC5b
+UdsQbkOqVEjpfVOzGk0SfyRBaDLnq+rO3lDd2Vt2m2v7twmVXTCl902NflCN4sI0g+6Kt31JZJB4
+HqLL7fvn9sjm/6+vHuI9eEy2DSonC4ZJD4GUieIX61yo+csC4LKq2fHmSi02Eqq6762gOueG1WCS
+6OM9egol/UeipP9IlI18EnyQZdZcofxdUd2vT8BSm9aCDxPqbkp1zm3wn9bTKBiRUChgmjgWVTPf
+BJE4P64WEcpKAMpkAJVmDrHF2CPVueDZfwiAb32T5A3s85R4DiLHgbyi5mnKTdeBbpfuf30qqmD7
++3okChIBmCaO9Svw5hdNq7nv16iZ9z4ka+ut5nc5oawEME57Cub/ezzepkYGjvf9u0KoTKcOsru7
+tn0N7kxRvK1ugDTooLnP/87vJ1QmPw/KLp0bLQBrzYSyEiCRcjDRHdu37Hx5HhLPh7SvUFWD6ll/
+i3vhjctRdukMJt8/24vfIhvSoIf6N/3jbW+SyxBCKEYhVFkgVFkAlvP9awJJEGCZU5BQY1MAUP+m
+P0iD3u972dVghvGjAEViZ/5oS5BGPRTd8wGG9puXBwL7Ri9HYllILAvR7oQQQswAV1gMx4Yv4n3q
+jVHQPu3JXSO5L5m8XKgH9I232W0eQqVCu2Xz0H7bGmSuegcpt9wYtGR7/THB0jAJFitCqR1W+9Yy
+8BdK430JGqEe0BdMgAqDAW+bpice9L2EcIkzfmkOip5doaqxBt2Hzs2Ji210qhGGiWMB+KKtVLfL
+O+Pd279t+FvZ61pQRv9HY71vVXLWQQwiVEmS4N65F7ZF/4Dup1xUrv/u9AWzxBOGgumJBwNfq0Ab
+Um7/FRTd8sEePRXfE2ghaa++ELe+SZMBuod+B1XvG0PaX3ldN9nvzbOeg2HSOABASu8bQGr877pC
+VY3s31ci2uyonjkXAKDo2hnm6ZPBnT2Pui3bYflrQdzKoCu65SPl9l8F3B5QqFSqGfpxv0P1jDfi
+YnhrRvfIA0id+SyYjjl+/sBgMAEmW1JCSGDGnS70/UEQEGoCi83+8b/g+eY7X38d24OgaSi650PR
+PR/68aNgfe/vqPnTvJjPUunH/Q5UamBfdtAU/sZnJoDpFJ/HYmuG1Kih6JIXlkgJtarZrinB6YL1
+fV+mPqbbNdCOGCy7H3f+Iix/WfDzF1ekyqSMhoCxANGE6ZQD4zMTgu4TVKikVgPTi5MhUcmSFOHg
+3vND2MdQJgMomeUhfFUN+CCPconnYf/gYwjlVaDSzMj8aCGYAPmxCI3650c7QYDOyvDv78KlmN5N
+JYqE6cXJDVW2A9GkAjWD7wadmx0zw9sC7KFjQcV1ORLPw3v8NBxrN4JQ+t+BuXPF4M7Jl6qXWBb2
+VRtQPWs+SIMe7Za+CdXNvQL2RaenQj3Q5yOn0s2y08Z8jAuP0LnZ0Ay+u+n9mtqByW0P3dABsL7d
+OrN4XBrxBJwR8heGk51buFQBOt2/QokkihBrbWBPnYPnwFHYlq8Be+gYsjZ8AIKi/PZnj58Bd+58
+w1qo+oAU9kwRnP/aDPbIKYBhYJr2JDRDBjRpl270b+H67w5Q6amgZOzjzhZG5sKHiG7oADC5TQ95
+QvLqm6dPgW3FJ5DsdaHs3mbR3Be6b9lz4EjDmnTAd/fz/HAE1iUfw/vDYXBFFxpN3ar73SbfzsEj
+sL27EpY5BfIdMQzS5kyH6fcTZYV+Jeq77wCT3wlMXgfZGSDnp7GbBCD0GpinTwlp35CESmdmIO3V
+F1A17TWAT0y/aiC3iugKrYSmdvQQCOVVvnnyK6uEUBS0wwZCO2JQwOM9V8SBOj/bCu3wQWCPnYJr
+517YPlgdcLrS/KdnZcenEsuhLkjUPWnUw/j0IzD9/rGQs/AxHbKRs+nvILRqkFccw5eWx849RVNI
+e/WFRstNgu4earv6h4bDumItuMMnY3MiYRJoYRtXdDGk4w3jR0IzsD8kjod0hVAJmgr6Bi9YbX4i
+dG//BiX9R4I9XRg06IVKM0P7O/kVpuzpwoDipjLT0W7pXGgG3w1CJi+qxLIQ69yyPwBFN/mSSOzZ
+8+Fe9mbD9OgC/UOhLx8KWahUmhlps55D+djJkBJwtqqlExOOdZ9DfV8/EAwddoUTz37/SDNftP3R
+Jo9V3tATyp5d/b6XRBG2Zav9D6AoKK7tgqzV70IZIMONJIpw/HMzPAePIv3Nl2SFLHeM81+xeewT
+DIW0Wc+FFQMclt9JO2wgdFFYRJcIeI+dgtSMStuix4vat5Y2u1/+UoXsXV901sG9a5/f96TR93av
+DJKGyb1rHyqfeQnWhcvBHgntCSi53HDv/i4Sl7JJdOOGQztsYFjHhCVUgqKQOmMq6OzQxhWtCdHm
+gGgLP1jcvXt/Q7aT5sAeP41LYyaDPVUI6TL/pffQcbCnzvnbWVOLiskvgT0t/3bu3vM9yh6a6qsi
+yHEoe/T/IFhqm7bj1DnwxdFfgUxnZyB1xtSQXvwuJ2xPPpPfCfqfAinaEnxpObgwUq1LggDXzj2o
+GP9ci+uJsoeOoWz0Uz9PgwKwf/RPSHXugPuXP/a835y+e9c+lI18CsJl58EeP42q6XOCpuyRWBaW
+vy2NyYuUfuJYMFdkcgmF8INOSRLmP06Bc+N/wf4Y3Rcr0eVp8dt8qEjOOrDHTkHRKbhPT/KyYM8W
+wbVtF2rf/iCgmMLF++NxXBozGdlrF0Gw2WFftibo/p5vvkfVH19HRsFsEEoFXFt2oHzSi41ECgDg
+eNiXrYHkZWF+aQoUnTs1eAgkngdfVomaWfPhXPPviF5PORS9usP8xykBi2IEg5Ck5s2Xufd8j9Kh
+j0Gsit6vkNCoZbN6AL63+UgvIaFzMpvMcid5WfDFpVFLKla/DIM7G9o6JuOzE0FlZqD2zfeCFg2u
+Pz+6Y3tfBJZOA9f2byFUVIM7ez7q06Zkuhk5n62Aqs/NzTq+2UIFAMsbBaiaOa/Vlf5JElskikT6
+7BdgnjG12W20KNrE9PyTME4cHe/rkCTBMU4cDdPzT7aojRbdUQGAv1SOkkHjoj5eTdI6UfTqjvab
+V4HOblnFwxYLFQDce3/AhbseAOFOpqxM8jOSikHuV/+E6tZmViK8jIgEmqpu/SUyF74GKJPp1ZP8
+hJJB5sLXIiJSIEJCBQDduBHQjxkat+uSJLHQjxkK3bgREWsvIo/+eiSWxaXRT8O5aVvSE3CVIlEk
+tIPvQvb6pWEtxWmKiK4xIRQKtFv8BlS33BDr65MkQVD17oV2i9+MqEiBCN9R6+HLK1Fy71h4j51q
+M1kBkwRHIggoe3RBzherwHSI/NKlqKzaozMzkPXJooDLf5O0PZjcbGSteS8qIgWiJFQAUPboiqyV
+b4POTG95Y0kSGjLdjMwPF0B5/bXR6yOaJ6C6ozcy17wHKinWNguZbkbWxwVQ9789uv1E+0TU/W5D
+9voloK/JhUQQ0e4uSYyQCAJ0xxxkf7IImnujn1AvKi9TcniPn0b56KfhbeW5rJL4UPTsiqw170X1
+cX85MRMq4PMGlI14HK59h5J+1laKRJFQ9e6FrE+WRO3FSY6Y5uqhMzOQvWE5tIOTZYJaK9rBdyH7
+02UxFSkQ4ztqPRLLomLSi7Cv/QzwJgNZWgVKBvoxQ9Fu6dyIO/NDIS5CBQDJ7YZ91QaUPzszGXWV
+4EgqBpkLZ0M/bjgIVehpjSJJ3IRaj3vfAVQ8PQPswePxNCNJABS9uiNzyVyk3BLf8qNxFyoA8GUV
+sMwpgHXxRwmbMuhqQ6JIGCeORuqs50HnZMXbnMQQKgBIHAfrOytgmbcIQkV1vM25qiHTzTA/PwnG
+5yeBjMN4VI6EEWo9nv0HUTllZpspyNbaUPTqjsxFbyKlT2QCniNFwgkV8K03t8x9H9bF/4BwMfSk
+EEmaD52dAcPEsTD9cUqj8uOJQkIKFfAl7eILi1GzYCnsy9cAbGhlE5OEB8FQ0I0bDvP0KVB0yWtW
+coiY2JmoQq1HkiTUbf4SNX+eD/bwiYTMJNgqoSkwPbogfdZz0AwbGHYuqFiT8EKtR7DUwrFuE6pf
+fgOipWW5nq52CL0Gaa++AP1DwxO6/Hsjm1uLUOvhq2tQ+/q7cG7cCrboYjJmIEQkioQiNweaoffC
+PH1KyJmeE4VWJ9R6+NIyODduRe2CJeDOJlaF5ESD6ZQD04uToR18T9zKabaUVivUegSnE/alq2H7
+8BOwp862+tqtEYOhoOiWD/244TA88ygorTbeFrWIVi/UesSaWrh274dt+WrUbd0JeK9SL4GChnpA
+XxgffxDqO3qDTDXF26KI0GaEejlc0QXYVq6D84vtEM4Wgbfa2+xqWIkASIMOivw8aAbdBcP4UQFL
+ibdm2qRQ6xFsdnCFxXBt2QHbijVtbixLdc6F8bHR0NzXD4ouebJ1o9oKbVqolyNxHNy79sG56X/w
+7D8A/lIluPIKEJ7WEWIopTBgMtuBzs5ASu+boBnUH6q+fRJmLj7aXDVCvRzR7YZYWQO+vBLuvQfg
+3LIDrp3fJFxcrKRioO57O7QD+0F1602gMzNAZqQm5BRntLkqhSqH6HbDtXMv2CMn4T10DHxxCUS7
+A6LdCcFmh+ioAyLts6VIkDoNKIMepF4LUq8D3bE9lDf0hOL67lD3vfWqFKUcSaEGQOI4iHanT6w2
+BwRLLdjTReAKiyFYrICXBW+pBVxu8FYbeJsThNsD/qeaBnS6GZIqBbRBC9poANQq0GYToFSAMhvB
+dO4IRdc8UGYTSIMOpF4HUq8FwSRTd8rx/8Frnpq5xcZcAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDI0
+LTExLTA1VDIwOjMyOjA0KzAwOjAwENfFeAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyNC0xMS0wNVQy
+MDozMjowNCswMDowMGGKfcQAAAAodEVYdGRhdGU6dGltZXN0YW1wADIwMjQtMTEtMDVUMjA6MzI6
+MDQrMDA6MDA2n1wbAAAAAElFTkSuQmCC" />
+</svg>
diff --git a/src/main.js b/src/main.js
index 24193b1..44fc0ee 100644
--- a/src/main.js
+++ b/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 './components/baidu_Map_xiufu'
+import baiduMap from './baiduMap'
+
 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，正式项目记得注释后再打包
  */
diff --git a/src/utils/routes.js b/src/utils/routes.js
index 683e5d7..5ebaa47 100644
--- a/src/utils/routes.js
+++ b/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",
-              "component":"@/views/store/base/cloudPrint/addTemplateManagement",
+              path: "/templateManagementAdd",
+              "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
+            },
         ]
     
       }
diff --git a/src/vab/components/VabAppMain/index.vue b/src/vab/components/VabAppMain/index.vue
index 41eecdf..25397b9 100644
--- a/src/vab/components/VabAppMain/index.vue
+++ b/src/vab/components/VabAppMain/index.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-  export default {
-    name: 'VabAppMain',
-  }
+export default {
+  name: 'VabAppMain',
+}
 </script>
diff --git a/src/vab/components/VabLogo/index.vue b/src/vab/components/VabLogo/index.vue
index 53737ef..29b9660 100644
--- a/src/vab/components/VabLogo/index.vue
+++ b/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="avatar" is-custom-svg />
+        <vab-icon v-if="logo" :icon="logo" is-custom-svg />
+        <!-- <vab-icon v-if="logo" :icon="avatar" is-custom-svg /> -->
       </span>
       <span
         class="title"
@@ -24,143 +24,140 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
-  import { getList } from '@/api/base/config'
-  import { translateTitle as __ } from '@/utils/i18n'
+import { mapGetters } from 'vuex'
+import { getList } from '@/api/base/config'
+import { translateTitle as __ } from '@/utils/i18n'
 
-  export default {
-    name: 'VabLogo',
-    computed: {
-      ...mapGetters({
-        logo: 'settings/logo',
-        avatar: 'user/avatar',
-        title: 'settings/title',
-        theme: 'settings/theme',
-      }),
+export default {
+  name: 'VabLogo',
+  computed: {
+    ...mapGetters({
+      logo: 'settings/logo',
+      avatar: 'user/avatar',
+      title: 'settings/title',
+      theme: 'settings/theme',
+    }),
+  },
+  data() {
+    return {
+      site_name: '',
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    __,
+    async fetchData() {
+      const { data } = await getList()
+      this.site_name = data.site_name
     },
-    data() {
-      return {
-        site_name: '',
-      }
-    },
-    created() {
-      this.fetchData()
-    },
-    methods: {
-      __,
-      async fetchData() {
-        const { data } = await getList()
-        this.site_name = data.site_name
-      },
-    },
-  }
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  @mixin container {
-    position: relative;
-    height: $base-top-bar-height;
-    overflow: hidden;
-    line-height: $base-top-bar-height;
-    background: transparent;
-  }
+@mixin container {
+  position: relative;
+  height: $base-top-bar-height;
+  overflow: hidden;
+  line-height: $base-top-bar-height;
+  background: transparent;
+}
 
-  @mixin logo {
-    display: inline-block;
-    width: 32px;
-    height: 32px;
-    border-radius: 50%;
-    color: $base-title-color;
-    vertical-align: middle;
-  }
+@mixin logo {
+  display: inline-block;
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  color: $base-title-color;
+  vertical-align: middle;
+}
 
-  @mixin title {
-    display: inline-block;
-    margin-left: 10px;
-    overflow: hidden;
-    font-size: 20px;
-    line-height: 55px;
-    color: $base-title-color;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    vertical-align: middle;
-  }
+@mixin title {
+  display: inline-block;
+  margin-left: 10px;
+  overflow: hidden;
+  font-size: 20px;
+  line-height: 55px;
+  color: $base-title-color;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  vertical-align: middle;
+}
 
-  .logo-container {
-    &-horizontal,
-    &-common {
-      @include container;
+.logo-container {
+  &-horizontal,
+  &-common {
+    @include container;
 
-      .logo {
-        svg,
-        img {
-          @include logo;
-        }
-      }
-
-      .title {
-        @include title;
+    .logo {
+      svg,
+      img {
+        @include logo;
       }
     }
 
-    &-vertical,
-    &-column,
-    &-comprehensive,
-    &-float {
-      @include container;
+    .title {
+      @include title;
+    }
+  }
 
+  &-vertical,
+  &-column,
+  &-comprehensive,
+  &-float {
+    @include container;
+
+    height: $base-logo-height;
+    line-height: $base-logo-height;
+    text-align: center;
+
+    .logo {
+      svg,
+      img {
+        @include logo;
+      }
+    }
+
+    .title {
+      @include title;
+      max-width: $base-left-menu-width - 60;
+    }
+  }
+
+  &-column {
+    background: $base-column-second-menu-background !important;
+
+    .logo {
+      position: fixed;
+      top: 0;
+      display: block;
+      width: $base-left-menu-width-min;
       height: $base-logo-height;
-      line-height: $base-logo-height;
-      text-align: center;
-
-      .logo {
-        svg,
-        img {
-          @include logo;
-        }
-      }
-
-      .title {
-        @include title;
-        max-width: $base-left-menu-width - 60;
-      }
+      margin: 0;
+      background: $base-column-first-menu-background;
     }
 
-    &-column {
+    .title {
+      padding-right: 15px;
+      padding-left: 15px;
+      margin-left: $base-left-menu-width-min !important;
+      color: $base-color-black !important;
       background: $base-column-second-menu-background !important;
-
-      .logo {
-        position: fixed;
-        top: 0;
-        display: block;
-        width: $base-left-menu-width-min;
-        height: $base-logo-height;
-        margin: 0;
-        background: $base-column-first-menu-background;
-      }
-
-      .title {
-        padding-right: 15px;
-        padding-left: 15px;
-        margin-left: $base-left-menu-width-min !important;
-        color: $base-color-black !important;
-        background: $base-column-second-menu-background !important;
-        @include title;
-      }
+      @include title;
     }
   }
+}
 
-
-
-  //.vab-side-bar:not(.is-collapse) .logo{
-  //  margin-left: 21px;
-  //  float: left;
-  //}
-  //
-  //.vab-side-bar:not(.is-collapse) .title{
-  //  float: left;
-  //  //line-height:60px;
-  //  margin-left:10px;
-  //}
-
+//.vab-side-bar:not(.is-collapse) .logo{
+//  margin-left: 21px;
+//  float: left;
+//}
+//
+//.vab-side-bar:not(.is-collapse) .title{
+//  float: left;
+//  //line-height:60px;
+//  margin-left:10px;
+//}
 </style>
diff --git a/src/vab/components/VabTheme/components/VabThemeSetting.vue b/src/vab/components/VabTheme/components/VabThemeSetting.vue
index 61efcf8..8adead3 100644
--- a/src/vab/components/VabTheme/components/VabThemeSetting.vue
+++ b/src/vab/components/VabTheme/components/VabThemeSetting.vue
@@ -36,196 +36,192 @@
 </template>
 
 <script>
-  import { translateTitle } from '@/utils/i18n'
-  import { mapGetters } from 'vuex'
+import { translateTitle } from '@/utils/i18n'
+import { mapGetters } from 'vuex'
 
-  export default {
-    name: 'VabThemeSetting',
-    computed: {
-      ...mapGetters({
-        theme: 'settings/theme',
-      }),
+export default {
+  name: 'VabThemeSetting',
+  computed: {
+    ...mapGetters({
+      theme: 'settings/theme',
+    }),
+  },
+  methods: {
+    translateTitle,
+    handleOpenTheme() {
+      this.$baseEventBus.$emit('theme')
     },
-    methods: {
-      translateTitle,
-      handleOpenTheme() {
-        this.$baseEventBus.$emit('theme')
-      },
-      randomTheme() {
-        this.$baseEventBus.$emit('random-theme')
-      },
-      buy() {
-        window.open('https://vue-admin-beautiful.com/authorization')
-      },
-      getCode() {
-        this.$prompt(
-          '请输入秘钥(秘钥请在源码中查看，跳转后需登录购买时绑定的github账号)',
-          '温馨提示',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
+    randomTheme() {
+      this.$baseEventBus.$emit('random-theme')
+    },
+    buy() {
+      window.open('https://vue-admin-beautiful.com/authorization')
+    },
+    getCode() {
+      this.$prompt(
+        '请输入秘钥(秘钥请在源码中查看，跳转后需登录购买时绑定的github账号)',
+        '温馨提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }
+      )
+        .then(({ value }) => {
+          if (value !== 'vabp') {
+            // 留给没有购买VueAdminBeautifulPro框架的人的赠言：既然你已经找到这里了，那说明你的能力很出众，也应该很喜欢这个框架吧，但是不绑定github账号依旧看不到源码的，所以加我qq买一个吧
+            this.$baseMessage('秘钥不正确！', 'error', 'vab-hey-message-error')
           }
-        )
-          .then(({ value }) => {
-            if (value !== 'vabp') {
-              // 留给没有购买VueAdminBeautifulPro框架的人的赠言：既然你已经找到这里了，那说明你的能力很出众，也应该很喜欢这个框架吧，但是不绑定github账号依旧看不到源码的，所以加我qq买一个吧
-              this.$baseMessage(
-                '秘钥不正确！',
-                'error',
-                'vab-hey-message-error'
-              )
-            }
-            let path = this.$route.path + '/index.vue'
-            const _path = this.$route.path
-            switch (_path) {
-              case '/workbench':
-                path = '/index/workbench.vue'
-                break
-              case '/vab/icon/remixIcon':
-                path = '/vab/icon/remixIcon.vue'
-                break
-              case '/vab/icon/iconSelector':
-                path = '/vab/icon/iconSelector.vue'
-                break
-              case '/vab/table/comprehensiveTable':
-                path = '/vab/table/comprehensiveTable.vue'
-                break
-              case '/vab/table/inlineEditTable':
-                path = '/vab/table/inlineEditTable.vue'
-                break
-              case '/vab/table/customTable':
-                path = '/vab/table/customTable.vue'
-                break
-              case '/vab/form/comprehensiveForm':
-                path = '/vab/form/comprehensiveForm.vue'
-                break
-              case '/vab/form/stepForm':
-                path = '/vab/form/stepForm.vue'
-                break
-              case '/other/dynamicSegment/test1/1':
-                path = '/other/dynamicSegment/test1.vue'
-                break
-              case '/other/dynamicSegment/test2?id=1':
-                path = '/other/dynamicSegment/test2.vue'
-                break
-              case '/other/drag/dialogDrag':
-                path = '/other/drag/dialogDrag.vue'
-                break
-              case '/other/drag/cardDrag':
-                path = '/other/drag/cardDrag.vue'
-                break
-              case '/other/drag/flowSheetDrag':
-                path = '/other/drag/flowSheetDrag.vue'
-                break
-              case '/vab/editor/richTextEditor':
-                path = '/vab/editor/richTextEditor.vue'
-                break
-              case '/vab/editor/markdownEditor':
-                path = '/vab/editor/markdownEditor.vue'
-                break
-              case '/other/menu1/menu1-1/menu1-1-1/menu1-1-1-1':
-                path =
-                  '/other/nested/menu1/menu1-1/menu1-1-1/menu1-1-1-1/index.vue'
-                break
-              case '/other/excel/exportExcel':
-                path = '/other/excel/exportExcel.vue'
-                break
-              case '/other/excel/exportSelectedExcel':
-                path = '/other/excel/exportSelectedExcel.vue'
-                break
-              case '/other/excel/exportMergeHeaderExcel':
-                path = '/other/excel/exportMergeHeaderExcel.vue'
-                break
-            }
-            window.open(
-              `https://gitee.com/lancerdt/lancerdt.git/blob/master/src/views${path}`
-            )
-          })
-          .catch(() => {})
-      },
-      removeLocalStorage() {
-        localStorage.clear()
-        location.reload()
-      },
+          let path = this.$route.path + '/index.vue'
+          const _path = this.$route.path
+          switch (_path) {
+            case '/workbench':
+              path = '/index/workbench.vue'
+              break
+            case '/vab/icon/remixIcon':
+              path = '/vab/icon/remixIcon.vue'
+              break
+            case '/vab/icon/iconSelector':
+              path = '/vab/icon/iconSelector.vue'
+              break
+            case '/vab/table/comprehensiveTable':
+              path = '/vab/table/comprehensiveTable.vue'
+              break
+            case '/vab/table/inlineEditTable':
+              path = '/vab/table/inlineEditTable.vue'
+              break
+            case '/vab/table/customTable':
+              path = '/vab/table/customTable.vue'
+              break
+            case '/vab/form/comprehensiveForm':
+              path = '/vab/form/comprehensiveForm.vue'
+              break
+            case '/vab/form/stepForm':
+              path = '/vab/form/stepForm.vue'
+              break
+            case '/other/dynamicSegment/test1/1':
+              path = '/other/dynamicSegment/test1.vue'
+              break
+            case '/other/dynamicSegment/test2?id=1':
+              path = '/other/dynamicSegment/test2.vue'
+              break
+            case '/other/drag/dialogDrag':
+              path = '/other/drag/dialogDrag.vue'
+              break
+            case '/other/drag/cardDrag':
+              path = '/other/drag/cardDrag.vue'
+              break
+            case '/other/drag/flowSheetDrag':
+              path = '/other/drag/flowSheetDrag.vue'
+              break
+            case '/vab/editor/richTextEditor':
+              path = '/vab/editor/richTextEditor.vue'
+              break
+            case '/vab/editor/markdownEditor':
+              path = '/vab/editor/markdownEditor.vue'
+              break
+            case '/other/menu1/menu1-1/menu1-1-1/menu1-1-1-1':
+              path =
+                '/other/nested/menu1/menu1-1/menu1-1-1/menu1-1-1-1/index.vue'
+              break
+            case '/other/excel/exportExcel':
+              path = '/other/excel/exportExcel.vue'
+              break
+            case '/other/excel/exportSelectedExcel':
+              path = '/other/excel/exportSelectedExcel.vue'
+              break
+            case '/other/excel/exportMergeHeaderExcel':
+              path = '/other/excel/exportMergeHeaderExcel.vue'
+              break
+          }
+          window.open(
+            `https://gitee.com/lancerdt/lancerdt.git/blob/master/src/views${path}`
+          )
+        })
+        .catch(() => {})
     },
-  }
+    removeLocalStorage() {
+      localStorage.clear()
+      location.reload()
+    },
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .vab-theme-setting {
-    position: fixed;
-    top: 50%;
-    right: 0;
-    z-index: $base-z-index + 1;
-    padding: 10px 0 0 0;
+.vab-theme-setting {
+  position: fixed;
+  top: 50%;
+  right: 0;
+  z-index: $base-z-index + 1;
+  padding: 10px 0 0 0;
+  margin: 0;
+  text-align: center;
+  cursor: pointer;
+  background: $base-color-white;
+  border: 1px solid $base-border-color;
+  border-top-left-radius: $base-border-radius + 3;
+  border-bottom-left-radius: $base-border-radius + 3;
+  box-shadow: 0 0 50px 0 rgb(82 63 105 / 15%);
+  transform: translateY(-50%);
+
+  > li {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 8px 10px 10px;
     margin: 0;
-    text-align: center;
-    cursor: pointer;
-    background: $base-color-white;
-    border: 1px solid $base-border-color;
-    border-top-left-radius: $base-border-radius + 3;
-    border-bottom-left-radius: $base-border-radius + 3;
-    box-shadow: 0 0 50px 0 rgb(82 63 105 / 15%);
-    transform: translateY(-50%);
+    list-style: none;
 
-    > li {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      padding: 0 8px 10px 10px;
-      margin: 0;
-      list-style: none;
-
-      &:nth-child(2) {
-        [class*='ri-'] {
-          animation: rotate 6s linear infinite;
-        }
+    &:nth-child(2) {
+      [class*='ri-'] {
+        animation: rotate 6s linear infinite;
       }
+    }
 
-      $colors: (
-        1: #3698fd,
-        2: #1bc3bb,
-        3: #faa500,
-        4: #b37feb,
-        5: #ef4c5d,
-      );
+    $colors: (
+      1: #3698fd,
+      2: #1bc3bb,
+      3: #faa500,
+      4: #b37feb,
+      5: #ef4c5d,
+    );
 
-      @each $key, $color in $colors {
-        &:nth-child(#{$key}) {
-          a {
-            color: $color;
-            background: mix($base-color-white, $color, 90%);
-            transition: color 0.15s ease, background-color 0.15s ease,
-              border-color 0.15s ease, box-shadow 0.15s ease,
-              -webkit-box-shadow 0.15s ease;
+    @each $key, $color in $colors {
+      &:nth-child(#{$key}) {
+        a {
+          color: $color;
+          background: mix($base-color-white, $color, 90%);
+          transition: color 0.15s ease, background-color 0.15s ease,
+            border-color 0.15s ease, box-shadow 0.15s ease,
+            -webkit-box-shadow 0.15s ease;
 
-            &:hover {
-              color: $base-color-white;
-              background: $color;
-            }
+          &:hover {
+            color: $base-color-white;
+            background: $color;
           }
         }
       }
+    }
 
-      a {
-        display: inline-block;
-        width: 60px;
-        height: 60px;
-        padding-top: 10px;
-        text-align: center;
-        background: #f6f8f9;
-        border-radius: $base-border-radius + 3;
+    a {
+      display: inline-block;
+      width: 60px;
+      height: 60px;
+      padding-top: 10px;
+      text-align: center;
+      background: #f6f8f9;
+      border-radius: $base-border-radius + 3;
 
-        p {
-          padding: 0;
-          margin: 0;
-          overflow: hidden;
-          font-size: $base-font-size-small;
-          line-height: 25px;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
+      p {
+        padding: 0;
+        margin: 0;
+        overflow: hidden;
+        font-size: $base-font-size-small;
+        line-height: 25px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
       }
     }
   }
+}
 </style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 4430beb..98fe1a5 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -13,9 +13,7 @@
           :rules="rules"
         >
           <div class="title">{{ title }}</div>
-          <div class="title-tips">
-
-          </div>
+          <div class="title-tips"></div>
           <el-form-item prop="user_account">
             <el-input
               v-model.trim="form.user_account"
@@ -94,303 +92,303 @@
 </template>
 
 <script>
-  import { mapActions, mapGetters } from 'vuex'
-  import { translateTitle } from '@/utils/i18n'
-  import { isPassword } from 'vue-plugin-utils'
-  import { URL } from '@/config'
+import { mapActions, mapGetters } from 'vuex'
+import { translateTitle } from '@/utils/i18n'
+import { isPassword } from 'vue-plugin-utils'
+import { URL } from '@/config'
 
-  export default {
-    name: 'Login',
-    directives: {
-      focus: {
-        inserted(el) {
-          el.querySelector('input').focus()
-        },
+export default {
+  name: 'Login',
+  directives: {
+    focus: {
+      inserted(el) {
+        el.querySelector('input').focus()
       },
     },
-    beforeRouteLeave(to, from, next) {
-      clearInterval(this.timer)
-      next()
-    },
-    data() {
-      const validateUsername = (rule, value, callback) => {
-        if ('' === value)
-          callback(new Error(this.translateTitle('用户名不能为空')))
-        else callback()
-      }
-      const validatePassword = (rule, value, callback) => {
-        if (!isPassword(value))
-          callback(new Error(this.translateTitle('密码不能少于6位')))
-        else callback()
-      }
-      return {
-        form: {
-          user_account: '',
-          user_password: '',
-          verify_code: '',
-        },
-        rules: {
-          user_account: [
-            {
-              required: true,
-              trigger: 'blur',
-              validator: validateUsername,
-            },
-          ],
-          user_password: [
-            {
-              required: true,
-              trigger: 'blur',
-              validator: validatePassword,
-            },
-          ],
-          verify_code: [
-            {
-              required: true,
-              trigger: 'blur',
-              message: '验证码不能空',
-            },
-          ],
-        },
-        loading: false,
-        passwordType: 'password',
-        redirect: undefined,
-        timer: 0,
-        codeUrl: URL.verifyCode,
-        previewText: '',
-        verify_token: '',
-      }
-    },
-    computed: {
-      ...mapGetters({
-        title: 'settings/title',
-      }),
-    },
-    watch: {
-      $route: {
-        handler(route) {
-          this.redirect = (route.query && route.query.redirect) || '/'
-        },
-        immediate: true,
+  },
+  beforeRouteLeave(to, from, next) {
+    clearInterval(this.timer)
+    next()
+  },
+  data() {
+    const validateUsername = (rule, value, callback) => {
+      if ('' === value)
+        callback(new Error(this.translateTitle('用户名不能为空')))
+      else callback()
+    }
+    const validatePassword = (rule, value, callback) => {
+      if (!isPassword(value))
+        callback(new Error(this.translateTitle('密码不能少于6位')))
+      else callback()
+    }
+    return {
+      form: {
+        user_account: '',
+        user_password: '',
+        verify_code: '',
       },
+      rules: {
+        user_account: [
+          {
+            required: true,
+            trigger: 'blur',
+            validator: validateUsername,
+          },
+        ],
+        user_password: [
+          {
+            required: true,
+            trigger: 'blur',
+            validator: validatePassword,
+          },
+        ],
+        verify_code: [
+          {
+            required: true,
+            trigger: 'blur',
+            message: '验证码不能空',
+          },
+        ],
+      },
+      loading: false,
+      passwordType: 'password',
+      redirect: undefined,
+      timer: 0,
+      codeUrl: URL.verifyCode,
+      previewText: '',
+      verify_token: '',
+    }
+  },
+  computed: {
+    ...mapGetters({
+      title: 'settings/title',
+    }),
+  },
+  watch: {
+    $route: {
+      handler(route) {
+        this.redirect = (route.query && route.query.redirect) || '/'
+      },
+      immediate: true,
     },
-    mounted() {
-      this.changeCode()
-        if (URL.api_url == "https://demo.lancerdt.com") {
-             this.form.user_account = 'demoadmin'
-             this.form.user_password = '111111'
-        }
+  },
+  mounted() {
+    this.changeCode()
+    if (URL.api_url == 'https://demo.lancerdt.com') {
+      this.form.user_account = 'demoadmin'
+      this.form.user_password = '111111'
+    }
 
-      // 为了演示效果，会在官网演示页自动登录到首页，正式开发可删除
-      if (
-        document.domain === 'vue-admin-beautiful.com' ||
-        document.domain === 'chu1204505056.gitee.io'
-      ) {
-        this.previewText = '（演示地址验证码可不填）'
-        this.timer = setTimeout(() => {
-          this.handleLogin()
-        }, 5000)
-      }
+    // 为了演示效果，会在官网演示页自动登录到首页，正式开发可删除
+    if (
+      document.domain === 'vue-admin-beautiful.com' ||
+      document.domain === 'chu1204505056.gitee.io'
+    ) {
+      this.previewText = '（演示地址验证码可不填）'
+      this.timer = setTimeout(() => {
+        this.handleLogin()
+      }, 5000)
+    }
+  },
+  methods: {
+    ...mapActions({
+      login: 'user/login',
+    }),
+    translateTitle,
+    handlePassword() {
+      this.passwordType === 'password'
+        ? (this.passwordType = '')
+        : (this.passwordType = 'password')
+      this.$nextTick(() => {
+        this.$refs.password.focus()
+      })
     },
-    methods: {
-      ...mapActions({
-        login: 'user/login',
-      }),
-      translateTitle,
-      handlePassword() {
-        this.passwordType === 'password'
-          ? (this.passwordType = '')
-          : (this.passwordType = 'password')
-        this.$nextTick(() => {
-          this.$refs.password.focus()
-        })
-      },
-      handleRoute() {
-        return this.redirect === '/404' || this.redirect === '/403'
-          ? '/'
-          : this.redirect
-      },
-      handleLogin() {
-        this.$refs.form.validate(async (valid) => {
-          if (valid) {
-            try {
-              this.loading = true
-              this.form.verify_token = this.verify_token
-              let code = await this.login(this.form)
-              if (1003 == code || 1005 == code) {
-                this.changeCode()
-              }
-
-              let routes = this.$router.options.routes
-              if (routes) {
-                if (!routes.some((route) => route.path === this.redirect)) {
-                  this.redirect = '/index'
-                }
-              }
-              await this.$router.push(this.handleRoute())
-            } finally {
-              this.loading = false
+    handleRoute() {
+      return this.redirect === '/404' || this.redirect === '/403'
+        ? '/'
+        : this.redirect
+    },
+    handleLogin() {
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          try {
+            this.loading = true
+            this.form.verify_token = this.verify_token
+            let code = await this.login(this.form)
+            if (1003 == code || 1005 == code) {
+              this.changeCode()
             }
+
+            let routes = this.$router.options.routes
+            if (routes) {
+              if (!routes.some((route) => route.path === this.redirect)) {
+                this.redirect = '/index'
+              }
+            }
+            await this.$router.push(this.handleRoute())
+          } finally {
+            this.loading = false
           }
-        })
-      },
-      changeCode() {
-        // this.codeUrl = `https://www.oschina.net/action/user/captcha?timestamp=${new Date().getTime()}`
-        this.verify_token = new Date().getTime()
-        this.codeUrl = URL.verifyCode + '?verify_token=' + this.verify_token
-      },
+        }
+      })
     },
-  }
+    changeCode() {
+      // this.codeUrl = `https://www.oschina.net/action/user/captcha?timestamp=${new Date().getTime()}`
+      this.verify_token = new Date().getTime()
+      this.codeUrl = URL.verifyCode + '?verify_token=' + this.verify_token
+    },
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-  .login-container {
-    height: 100vh;
-    background: url('~@/assets/login_images/background.jpg') center center fixed
-      no-repeat;
-    background-size: cover;
+.login-container {
+  height: 100vh;
+  background: url('~@/assets/login_images/background.jpg') center center fixed
+    no-repeat;
+  background-size: cover;
+}
+
+.login-form {
+  position: relative;
+  max-width: 100%;
+  padding: 4.5vh;
+  margin: calc((100vh - 475px) / 2) 5vw 5vw;
+  overflow: hidden;
+  background: url('~@/assets/login_images/login_form.png');
+  background-size: 100% 100%;
+
+  .title {
+    font-size: 36px;
+    font-weight: 500;
+    color: $base-color-white;
+    text-align: center;
   }
 
-  .login-form {
+  .title-tips {
+    margin-top: 29px;
+    font-size: 26px;
+    font-weight: 400;
+    color: $base-color-white;
+  }
+
+  .login-btn {
+    margin: auto;
+    display: inherit;
+    width: 100%;
+    height: 50px;
+    margin-top: 5px;
+    border: 0;
+    font-size: 18px;
+
+    &:hover {
+      opacity: 0.9;
+    }
+
+    .forget-passwordword {
+      width: 100%;
+      margin-top: 40px;
+      text-align: left;
+
+      .forget-password {
+        width: 129px;
+        height: 19px;
+        font-size: 20px;
+        font-weight: 400;
+        color: rgba(92, 102, 240, 1);
+      }
+    }
+  }
+
+  .tips {
+    margin-bottom: 10px;
+    font-size: $base-font-size-default;
+    color: $base-color-white;
+
+    span {
+      &:first-of-type {
+        margin-right: 16px;
+      }
+    }
+  }
+
+  .title-container {
     position: relative;
-    max-width: 100%;
-    padding: 4.5vh;
-    margin: calc((100vh - 475px) / 2) 5vw 5vw;
-    overflow: hidden;
-    background: url('~@/assets/login_images/login_form.png');
-    background-size: 100% 100%;
 
     .title {
-      font-size: 36px;
-      font-weight: 500;
-      color: $base-color-white;
+      margin: 0 auto 40px auto;
+      font-size: 34px;
+      font-weight: bold;
+      color: $base-color-blue;
       text-align: center;
     }
+  }
 
-    .title-tips {
-      margin-top: 29px;
-      font-size: 26px;
-      font-weight: 400;
-      color: $base-color-white;
-    }
+  i {
+    position: absolute;
+    top: 8px;
+    left: 5px;
+    z-index: $base-z-index;
+    font-size: 16px;
+    color: #ccc;
+    cursor: pointer;
+    user-select: none;
+  }
 
-    .login-btn {
-      margin: auto;
-      display: inherit;
-      width: 100%;
-      height: 50px;
-      margin-top: 5px;
-      border: 0;
-      font-size: 18px;
+  .show-password {
+    position: absolute;
+    right: 25px;
+    left: -35px;
+    font-size: 16px;
+    color: #ccc;
+    cursor: pointer;
+    user-select: none;
+  }
 
-      &:hover {
-        opacity: 0.9;
+  ::v-deep {
+    .el-form-item {
+      padding-right: 0;
+      margin: 20px 0;
+      color: #454545;
+      background: transparent;
+      border: 1px solid transparent;
+      border-radius: 2px;
+
+      &__content {
+        min-height: $base-input-height;
+        line-height: $base-input-height;
       }
 
-      .forget-passwordword {
-        width: 100%;
-        margin-top: 40px;
-        text-align: left;
-
-        .forget-password {
-          width: 129px;
-          height: 19px;
-          font-size: 20px;
-          font-weight: 400;
-          color: rgba(92, 102, 240, 1);
-        }
-      }
-    }
-
-    .tips {
-      margin-bottom: 10px;
-      font-size: $base-font-size-default;
-      color: $base-color-white;
-
-      span {
-        &:first-of-type {
-          margin-right: 16px;
-        }
-      }
-    }
-
-    .title-container {
-      position: relative;
-
-      .title {
-        margin: 0 auto 40px auto;
-        font-size: 34px;
-        font-weight: bold;
-        color: $base-color-blue;
-        text-align: center;
-      }
-    }
-
-    i {
-      position: absolute;
-      top: 8px;
-      left: 5px;
-      z-index: $base-z-index;
-      font-size: 16px;
-      color: #d7dee3;
-      cursor: pointer;
-      user-select: none;
-    }
-
-    .show-password {
-      position: absolute;
-      right: 25px;
-      left: -35px;
-      font-size: 16px;
-      color: #d7dee3;
-      cursor: pointer;
-      user-select: none;
-    }
-
-    ::v-deep {
-      .el-form-item {
-        padding-right: 0;
-        margin: 20px 0;
-        color: #454545;
-        background: transparent;
-        border: 1px solid transparent;
-        border-radius: 2px;
-
-        &__content {
-          min-height: $base-input-height;
-          line-height: $base-input-height;
-        }
-
-        &__error {
-          position: absolute;
-          top: 100%;
-          left: 18px;
-          font-size: $base-font-size-small;
-          line-height: 18px;
-          color: $base-color-red;
-        }
-      }
-
-      .el-input {
-        box-sizing: border-box;
-
-        input {
-          height: 48px;
-          padding-left: 35px;
-          font-size: $base-font-size-default;
-          line-height: 58px;
-          background: #f6f4fc;
-          border: 0;
-        }
-      }
-
-      .code {
+      &__error {
         position: absolute;
-        top: 4px;
-        right: 4px;
-        cursor: pointer;
-        border-radius: $base-border-radius;
+        top: 100%;
+        left: 18px;
+        font-size: $base-font-size-small;
+        line-height: 18px;
+        color: $base-color-red;
       }
     }
+
+    .el-input {
+      box-sizing: border-box;
+
+      input {
+        height: 48px;
+        padding-left: 35px;
+        font-size: $base-font-size-default;
+        line-height: 58px;
+        background: #f6f4fc;
+        border: 0;
+      }
+    }
+
+    .code {
+      position: absolute;
+      top: 4px;
+      right: 4px;
+      cursor: pointer;
+      border-radius: $base-border-radius;
+    }
   }
+}
 </style>
diff --git a/src/views/product/productList/components/addProductEdit.vue b/src/views/product/productList/components/addProductEdit.vue
index 775853a..dba2ef6 100644
--- a/src/views/product/productList/components/addProductEdit.vue
+++ b/src/views/product/productList/components/addProductEdit.vue
@@ -13,35 +13,48 @@
         <div class="tit_font">{{ __('基本信息') }}</div>
         <el-divider />
         <el-form label-width="80px">
-            <el-col :md="6">
-              <el-form-item :label="__('商品分类')">
-                <el-cascader
-                  v-model="categoryId"
-                  filterable
-                  :options="categoryOptions"
-                  :props="{ label: 'category_name', value: 'category_id', children:'sub'}"
-                  :style="{ width: '90%' }"
-                  @change="onCategoryChange"
-                  :disabled="false"
-                />
-              </el-form-item>
-            </el-col>
-            <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>
-                  <el-radio :disabled="!row.category_virtual_enable" :label="1202">
-                    {{ __('虚拟商品（服务类商品）') }}
-                  </el-radio>
-                  <el-radio :disabled="!row.category_virtual_enable" :label="1203">
-                    {{ __('电子卡券') }}
-                  </el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-          </el-form>
+          <el-col :md="6">
+            <el-form-item :label="__('商品分类')">
+              <el-cascader
+                v-model="categoryId"
+                filterable
+                :options="categoryOptions"
+                :props="{
+                  label: 'category_name',
+                  value: 'category_id',
+                  children: 'sub',
+                }"
+                :style="{ width: '90%' }"
+                @change="onCategoryChange"
+                :disabled="false"
+              />
+            </el-form-item>
+          </el-col>
+          <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>
+                <el-radio
+                  :disabled="!row.category_virtual_enable"
+                  :label="1202"
+                >
+                  {{ __('虚拟商品（服务类商品）') }}
+                </el-radio>
+                <el-radio
+                  :disabled="!row.category_virtual_enable"
+                  :label="1203"
+                >
+                  {{ __('电子卡券') }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-form>
       </el-row>
       <el-row>
         <div class="tit_font">{{ __('辅助属性') }}</div>
@@ -194,9 +207,7 @@
                     <el-form-item :label="__('上下架')">
                       <el-switch
                         v-model="batchObj.item_enable"
-
                         :active-value="1001"
-
                         :inactive-value="1002"
                       />
                     </el-form-item>
@@ -220,20 +231,35 @@
               <el-table-column align="center" type="index" width="50" />
               <el-table-column
                 v-for="item in specHead"
-                :align="item.property=='color_img' ? 'left' : 'center'"
+                :align="item.property == 'color_img' ? 'left' : 'center'"
                 :key="item.spec_item_id"
                 :label="item.label"
                 :property="item.property"
                 :width="getItemWidth(item.property)"
               >
-                <template slot="header"  slot-scope="scope">
+                <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'">
-                    <span>{{scope.column.label}}</span>
-                    <vab-icon :data-key="scope.column.property" icon="more-2-line" style="cursor:pointer;" :title="__('批量设置')"  @click="batOper"/>
+                  <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"
+                    />
                   </div>
                   <div v-else>
-                    <span>{{scope.column.label}}</span>
+                    <span>{{ scope.column.label }}</span>
                   </div>
                 </template>
                 <template slot-scope="scope">
@@ -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,260 +889,276 @@
         <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>
 
 <script>
-  import { translateTitle as __ } from '@/utils/i18n'
-  import { getxfz, saveProduct } from '@/api/product/base'
-  import { productInfoByPid } from '@/api/product/info'
-  import { getItemListByPid } from '@/api/product/item'
-  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 { list as tags } from '@/api/store/product/tag'
-  import { transports } from '@/api/store/transport/type'
-  import { getPayCardTypes } from '@/api/card/type'
-  import { getCouponsList } from '@/api/store/activity/base'
-  import {
-    doDelete,
-    doEdit as doEditSpecItem,
-    getList as getSpecItemList,
-  } from '@/api/product/spec/item'
-  import { URL } from '@/config'
-  import { getStoreCategoryTree } from '@/api/store/product/category'
-  import { renderTime } from '@/utils/date'
-  import { getToken } from '@/utils/token'
-  import { mapGetters } from 'vuex'
+import { translateTitle as __ } from '@/utils/i18n'
+import { getxfz, saveProduct } from '@/api/product/base'
+import { productInfoByPid } from '@/api/product/info'
+import { getItemListByPid } from '@/api/product/item'
+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 { list as tags } from '@/api/store/product/tag'
+import { transports } from '@/api/store/transport/type'
+import { getPayCardTypes } from '@/api/card/type'
+import { getCouponsList } from '@/api/store/activity/base'
+import {
+  doDelete,
+  doEdit as doEditSpecItem,
+  getList as getSpecItemList,
+} from '@/api/product/spec/item'
+import { URL } from '@/config'
+import { getStoreCategoryTree } from '@/api/store/product/category'
+import { renderTime } from '@/utils/date'
+import { getToken } from '@/utils/token'
+import { mapGetters } from 'vuex'
 
-  export default {
-    name: 'AddProduct',
-    components: { quillEditor, picUpload },
-    props: {},
-    data() {
-      return {
-        categoryOptions: [],
-        categoryId:null,
-        params: {
-          authorization: '',
+export default {
+  name: 'AddProduct',
+  components: { quillEditor, picUpload },
+  props: {},
+  data() {
+    return {
+      categoryOptions: [],
+      categoryId: null,
+      params: {
+        authorization: '',
+      },
+      batchObj: {
+        item_is_default: false,
+        item_enable: 1001,
+        item_market_price: undefined,
+        item_unit_price: undefined,
+        item_unit_points: undefined,
+        item_quantity: undefined,
+      }, // 批量操作对象
+      loading: false,
+      shop_product_assist_index: [],
+      shop_product_index: {},
+      shop_product_item: {},
+      shop_product_detail: {},
+      shop_product_image: [],
+      shop_product_info: {},
+      shop_product_base: {},
+      shop_product_valid_period: {},
+      row: {}, // 类型对象数据
+      spanArr: {},
+      specImageIdList: [], // 选中的spec 是image类型 spec_id 集合
+      productTags: [], // 产品标签
+      roleList: [],
+      storeCategoryTree: [], // 店铺分类树数据
+      transports: [], // 运费
+      paycardTypes: [], // 次卡
+      activityArr: [], // 优惠券售卖
+      couponCardTypes: [], // 券码售卖
+      categoryProps: {
+        value: 'store_product_cat_id',
+        label: 'store_product_cat_name',
+        children: 'nodes',
+        multiple: true,
+      },
+      specId: undefined,
+      specItemForm: {},
+      detailForm: {
+        product_detail: '',
+        product_tags: [],
+      },
+      specTableData: [],
+      product_state_idOptions: [
+        {
+          label: this.__('立即开售'),
+          value: 1001,
         },
-        batchObj: {
-          item_is_default: false,
-          item_enable: 1001,
-          item_market_price: undefined,
-          item_unit_price: undefined,
-          item_unit_points: undefined,
-          item_quantity: undefined,
-        }, // 批量操作对象
-        loading: false,
-        shop_product_assist_index: [],
-        shop_product_index: {},
-        shop_product_item: {},
-        shop_product_detail: {},
-        shop_product_image: [],
-        shop_product_info: {},
-        shop_product_base: {},
-        shop_product_valid_period: {},
-        row: {}, // 类型对象数据
-        spanArr: {},
-        specImageIdList: [], // 选中的spec 是image类型 spec_id 集合
-        productTags: [], // 产品标签
-        roleList: [],
-        storeCategoryTree: [], // 店铺分类树数据
-        transports: [], // 运费
-        paycardTypes: [], // 次卡
-        activityArr: [], // 优惠券售卖
-        couponCardTypes: [], // 券码售卖
-        categoryProps: {
-          value: 'store_product_cat_id',
-          label: 'store_product_cat_name',
-          children: 'nodes',
-          multiple: true,
+        {
+          label: this.__('定时开售'),
+          value: 1002,
         },
-        specId: undefined,
-        specItemForm: {},
-        detailForm: {
-          product_detail: '',
-          product_tags: [],
+      ],
+      roleLists: [
+        {
+          label: this.__('物流配送'),
+          value: 10,
         },
-        specTableData: [],
-        product_state_idOptions: [
-          {
-            label: this.__('立即开售'),
-            value: 1001,
-          },
-          {
-            label: this.__('定时开售'),
-            value: 1002,
-          },
-        ],
-        roleLists: [
-          {
-            label: this.__('物流配送'),
-            value: 10,
-          },
-          {
-            label: this.__('门店自提'),
-            value: 5,
-          },
-          {
-            label: this.__('到店服务'),
-            value: 5,
-          },
-        ],
-        payment_type_idOptions: [
-          {
-            label: this.__('先预约后支付'),
-            value: 1,
-          },
-          {
-            label: this.__('先支付后预约'),
-            value: 0,
-          },
-        ],
-        product_inventory_lockOptions: [
-          {
-            label: this.__('下单锁定'),
-            value: 1001,
-          },
-          {
-            label: this.__('支付锁定'),
-            value: 1002,
-          },
-        ],
-        product_valid_periodOptions: [
-          {
-            label: this.__('长期有效'),
-            value: 1001,
-          },
-          {
-            label: this.__('自定义有效期'),
-            value: 1002,
-          },
-          {
-            label: this.__('有效时长'),
-            value: 1003,
-          },
-        ],
-        product_valid_typeOptions: [
-          {
-            label: this.__('到店服务'),
-            value: 1001,
-          },
-          {
-            label: this.__('上门服务'),
-            value: 1002,
-          },
-        ],
-        product_service_date_flagOptions: [
-          {
-            label: this.__('否'),
-            value: 0,
-          },
-          {
-            label: this.__('是'),
-            value: 1,
-          },
-        ],
-        product_service_contactor_flagOptions: [
-          {
-            label: this.__('否'),
-            value: 1,
-          },
-          {
-            label: this.__('是'),
-            value: 2,
-          },
-        ],
-        validForm: {
-          product_valid_period: 1001,
-          product_valid_type: 1001,
-          product_service_date_flag: 0,
-          product_service_contactor_flag: 1,
+        {
+          label: this.__('门店自提'),
+          value: 5,
         },
-        productForm: {
-          product_sale_time: '',
-          product_video: '',
-          product_buy_limit: undefined,
-          product_number: '',
-          product_name: '',
-          product_inventory_lock: 1001,
-          payment_type_id: 0,
-          product_state_id: 1001,
-          contract_type_ids: [],
-          product_transport_id: [],
-          transport_type_id: undefined,
-          store_category_ids: [],
-          voucher_activity_id: [],
-          coupon_type_id: [],
-          product_service: '',
-          product_param: '',
-          product_detail: '',
-          product_id: undefined,
-          product_tips: '',
+        {
+          label: this.__('到店服务'),
+          value: 5,
         },
-        productRules: {
-          product_name: [
-            {
-              required: true,
-              message: '请输入商品名称',
-              trigger: 'blur',
-            },
-          ],
+      ],
+      payment_type_idOptions: [
+        {
+          label: this.__('先预约后支付'),
+          value: 1,
         },
-        action: URL.action,
-        virtualHead: [
+        {
+          label: this.__('先支付后预约'),
+          value: 0,
+        },
+      ],
+      product_inventory_lockOptions: [
+        {
+          label: this.__('下单锁定'),
+          value: 1001,
+        },
+        {
+          label: this.__('支付锁定'),
+          value: 1002,
+        },
+      ],
+      product_valid_periodOptions: [
+        {
+          label: this.__('长期有效'),
+          value: 1001,
+        },
+        {
+          label: this.__('自定义有效期'),
+          value: 1002,
+        },
+        {
+          label: this.__('有效时长'),
+          value: 1003,
+        },
+      ],
+      product_valid_typeOptions: [
+        {
+          label: this.__('到店服务'),
+          value: 1001,
+        },
+        {
+          label: this.__('上门服务'),
+          value: 1002,
+        },
+      ],
+      product_service_date_flagOptions: [
+        {
+          label: this.__('否'),
+          value: 0,
+        },
+        {
+          label: this.__('是'),
+          value: 1,
+        },
+      ],
+      product_service_contactor_flagOptions: [
+        {
+          label: this.__('否'),
+          value: 1,
+        },
+        {
+          label: this.__('是'),
+          value: 2,
+        },
+      ],
+      validForm: {
+        product_valid_period: 1001,
+        product_valid_type: 1001,
+        product_service_date_flag: 0,
+        product_service_contactor_flag: 1,
+      },
+      productForm: {
+        product_sale_time: '',
+        product_video: '',
+        product_buy_limit: undefined,
+        product_number: '',
+        product_name: '',
+        product_inventory_lock: 1001,
+        payment_type_id: 0,
+        product_state_id: 1001,
+        contract_type_ids: [],
+        product_transport_id: [],
+        transport_type_id: undefined,
+        store_category_ids: [],
+        voucher_activity_id: [],
+        coupon_type_id: [],
+        product_service: '',
+        product_param: '',
+        product_detail: '',
+        product_id: undefined,
+        product_tips: '',
+      },
+      productRules: {
+        product_name: [
           {
-            label: this.__('主图'),
-            property: 'main_color_img',
-          },
-          {
-            label: this.__('图片'),
-            property: 'color_img',
-          },
-          {
-            label: this.__('属性编号'),
-            property: 'item_number',
-          },
-          {
-            label: this.__('市场价'),
-            property: 'item_market_price',
-          },
-          {
-            label: this.__('零售价'),
-            property: 'item_unit_price',
-          },
-          {
-            label: this.__('需要积分'),
-            property: 'item_unit_points',
-          },
-          {
-            label: this.__('库存'),
-            property: 'item_quantity',
-          },
-          {
-            label: this.__('上下架'),
-            property: 'item_enable',
-          },
-          {
-            label: this.__('是否默认'),
-            property: 'item_is_default',
+            required: true,
+            message: '请输入商品名称',
+            trigger: 'blur',
           },
         ],
-        expHead: [
-          {
-            label: this.__('主图'),
-            property: 'main_color_img',
-          },
-          {
-            label: this.__('图片'),
-            property: 'color_img',
-          },
-          {
-            label: this.__('属性编号'),
-            property: 'item_number',
-          },/*
+      },
+      action: URL.action,
+      virtualHead: [
+        {
+          label: this.__('主图'),
+          property: 'main_color_img',
+        },
+        {
+          label: this.__('图片'),
+          property: 'color_img',
+        },
+        {
+          label: this.__('属性编号'),
+          property: 'item_number',
+        },
+        {
+          label: this.__('市场价'),
+          property: 'item_market_price',
+        },
+        {
+          label: this.__('零售价'),
+          property: 'item_unit_price',
+        },
+        {
+          label: this.__('需要积分'),
+          property: 'item_unit_points',
+        },
+        {
+          label: this.__('库存'),
+          property: 'item_quantity',
+        },
+        {
+          label: this.__('上下架'),
+          property: 'item_enable',
+        },
+        {
+          label: this.__('是否默认'),
+          property: 'item_is_default',
+        },
+      ],
+      expHead: [
+        {
+          label: this.__('主图'),
+          property: 'main_color_img',
+        },
+        {
+          label: this.__('图片'),
+          property: 'color_img',
+        },
+        {
+          label: this.__('属性编号'),
+          property: 'item_number',
+        } /*
           {
             label: this.__('条形码'),
             property: 'item_barcode',
@@ -1137,24 +1166,24 @@
           {
             label: this.__('重量[kg]'),
             property: 'item_weight',
-          },*/
-          {
-            label: this.__('市场价'),
-            property: 'item_market_price',
-          },
-          {
-            label: this.__('零售价'),
-            property: 'item_unit_price',
-          },
-          {
-            label: this.__('需要积分'),
-            property: 'item_unit_points',
-          },
-          {
-            label: this.__('库存'),
-            property: 'item_quantity',
-          },
-          /*{
+          },*/,
+        {
+          label: this.__('市场价'),
+          property: 'item_market_price',
+        },
+        {
+          label: this.__('零售价'),
+          property: 'item_unit_price',
+        },
+        {
+          label: this.__('需要积分'),
+          property: 'item_unit_points',
+        },
+        {
+          label: this.__('库存'),
+          property: 'item_quantity',
+        },
+        /*{
             label: this.__('采购价'),
             property: 'item_purchase_price',
           },
@@ -1166,865 +1195,847 @@
             label: this.__('销售税率'),
             property: 'item_sales_rate',
           },*/
-          {
-            label: this.__('上下架'),
-            property: 'item_enable',
-          },
-          {
-            label: this.__('是否默认'),
-            property: 'item_is_default',
-          },
-        ],
-        specHead: [],
-        specData: [],
-        allSpecData: [],
-        newSpecItemIdRow: [],
-        assistArr: {},
-        checkBrand: undefined, // 选中的品牌列表
-        checkSpec: {}, // 选中的spec 列表
-        brands: [], // 品牌数据
-        assists: [], // 辅助属性数据
-        specs: [], // 规格参数数据
-        allowCheckSpecRow: [],
+        {
+          label: this.__('上下架'),
+          property: 'item_enable',
+        },
+        {
+          label: this.__('是否默认'),
+          property: 'item_is_default',
+        },
+      ],
+      specHead: [],
+      specData: [],
+      allSpecData: [],
+      newSpecItemIdRow: [],
+      assistArr: {},
+      checkBrand: undefined, // 选中的品牌列表
+      checkSpec: {}, // 选中的spec 列表
+      brands: [], // 品牌数据
+      assists: [], // 辅助属性数据
+      specs: [], // 规格参数数据
+      allowCheckSpecRow: [],
 
-        title: '',
-        dialogFormVisible: false,
-        tableVisible: false,
-        editVisible: false,
-        specTitle: '',
-        saveBtnLoading: false,
-      }
-    },
-    watch: {
-      // 监控spec 勾选事件
-      checkSpec: {
-        handler(newVal, oldVal) {
-          console.info('newVal')
-          console.info(newVal)
-          console.info(JSON.stringify(this.specs))
+      title: '',
+      dialogFormVisible: false,
+      tableVisible: false,
+      editVisible: false,
+      specTitle: '',
+      saveBtnLoading: false,
+    }
+  },
+  watch: {
+    // 监控spec 勾选事件
+    checkSpec: {
+      handler(newVal, oldVal) {
+        console.info('newVal')
+        console.info(newVal)
+        console.info(JSON.stringify(this.specs))
 
-          const arr = []
+        const arr = []
 
-          //重新排序
-          this.specs.forEach((spec) => {
-            let spec_id = spec.spec_id
-            const element = newVal[spec_id]
-            if (element.length > 0) arr.push(element)
-          })
+        //重新排序
+        this.specs.forEach((spec) => {
+          let spec_id = spec.spec_id
+          const element = newVal[spec_id]
+          if (element.length > 0) arr.push(element)
+        })
 
-          /*
+        /*
           for (let spec_id in newVal) {
             const element = newVal[spec_id]
             if (element.length > 0) arr.push(element)
           }
           */
 
-          const descartes = this.descartes(arr)
-          // 构造表头数据
-          this.creSpecHead(arr)
-          // 构造表数据
-          this.creSpecData(descartes)
-
-          // 计算合并列
-          this.initRowspan()
-        },
-        deep: true,
-      },
-    },
-    computed: {
-      ...mapGetters({
-        token: 'user/token',
-        configs: 'routes/configs',
-      }),
-    },
-
-    async created() {
-      await this.getCategoryTree()
-      this.getStoreBase()
-      // 获取商品标签
-      this.getProductTags()
-      // 获取快递类型
-      this.getTransports()
-      // 获取次卡数据
-      this.getPayCardTypes()
-      // 获取代金券数据
-      this.getCouponsFun()
-      // 获取券码数据
-      this.getCouponCardTypes()
-      // 获取店铺分类树数据
-      this.getStoreCategoryTree()
-      this.params.authorization = getToken()
-      this.getxfz()
-    },
-    methods: {
-      // 清空  card_type_id
-      radChanges(row) {
-        if (row) {
-          this.productForm.voucher_activity_id = ''
-          this.productForm.coupon_type_id = ''
-        }
-        this.$forceUpdate()
-      },
-      // 清空 voucher_activity_id
-      radChangesTypeId(row) {
-        if (row) {
-          this.productForm.card_type_id = ''
-          this.productForm.coupon_type_id = ''
-        }
-        this.$forceUpdate()
-      },
-      // 清空 coupon_type_id
-      radChangesVAId(row) {
-        if (row) {
-          this.productForm.card_type_id = ''
-          this.productForm.voucher_activity_id = ''
-        }
-        this.$forceUpdate()
-      },
-      getStoreBase() {
-        if (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.splice(unitPriceIndex + 1, 0, {
-              label: this.__('建议零售价'),
-              property: 'item_advice_price',
-            });
-          }
-
-          const unitIndex = this.virtualHead.findIndex(item => item.property === 'item_unit_price');
-
-          if (unitIndex !== -1) {
-            this.virtualHead[unitIndex].label = this.__('成本价');
-
-            this.virtualHead.splice(unitIndex + 1, 0, {
-              label: this.__('建议零售价'),
-              property: 'item_advice_price',
-            });
-          }
-        }
-      },
-
-      batchHandle() {
-        for (const key in this.batchObj) {
-          this.specData.forEach((item, index) => {
-            this.$set(this.specData[index], key, this.batchObj[key])
-          })
-        }
-      },
-      batchInput(e, key) {
-        let value = e.target.value
-        value = Math.round(value * Math.pow(10, 4)) / Math.pow(10, 4) //四舍五入
-        value = Number(value).toFixed(4) //补足位数
-        e.target.value = value
-        this.batchObj[key] = value
-      },
-      // 计算合并列的下标和数量
-      initRowspan() {
-        const image = this.getFirstImageSpec()
-        if (!image) return
-        let data = this.specData
-        let index = 1
-        let currIndex = 0
-        this.spanArr[image] = {}
-        for (let i = 0; i <= data.length - 1; i++) {
-          if (i === data.length - 1) {
-            this.spanArr[image][currIndex] = index
-            return
-          }
-          if (data[i][image] === data[i + 1][image]) {
-            index++
-          } else {
-            this.spanArr[image][currIndex] = index
-            currIndex = i + 1
-            index = 1
-          }
-        }
-      },
-      getFirstImageSpec() {
-        let specs = this.specs
-        let checkSpec = this.checkSpec
-        let sp = specs.find((spec) => {
-          let spec_id = spec.spec_id
-          let checkSpecElement = checkSpec[spec_id]
-          return checkSpecElement.length > 0 && spec.spec_format === 'image'
-        })
-        return sp ? sp.spec_id : null
-      },
-      // 四舍五入返回四位有效数字
-      handleInput(e, scope) {
-        let value = e.target.value
-        const index = scope.$index
-        value = Math.round(value * Math.pow(10, 4)) / Math.pow(10, 4) //四舍五入
-        value = Number(value).toFixed(4) //补足位数
-        this.specData[index][scope.column.property] = value
-      },
-      // 维护选中的类型image的spec
-      initSpecImageList() {
-        this.specImageIdList = []
-        this.specs.forEach((spec) => {
-          if (spec.spec_format === 'image')
-            this.specImageIdList.push(spec.spec_id)
-        })
-      },
-      saveSpecItem() {
-        var that = this
-        this.$refs['specItemForm'].validate(async (valid) => {
-          if (valid) {
-            const { msg, status, data } = await doEditSpecItem(
-              this.specItemForm
-            )
-            if (200 == status) {
-              // 修改规格编辑后数据
-              if (that.specItemForm.spec_item_id) {
-                for (let i = 0; i < that.specData.length; i++) {
-                  for (let j = 0; j < that.specs.length; j++) {
-                    for (let k = 0; k < that.specs[j].specItems.length; k++) {
-                      if (
-                        that.specs[j].specItems[k].spec_item_id ===
-                        that.specItemForm.spec_item_id
-                      ) {
-                        that.specs[j].specItems[k].spec_item_name =
-                          that.specItemForm.spec_item_name
-                      }
-                    }
-                  }
-                }
-              }
-
-              this.$baseMessage(msg, 'success')
-            } else {
-              this.$baseMessage(msg, 'error')
-            }
-            await this.upDateSpecItem()
-            this.closeEditSpecItem()
-          } else {
-            return false
-          }
-        })
-      },
-      async upDateSpecItem() {
-        // 更新
-        const specItemList = await this.getSpecItemList(this.specId)
-        this.specTableData = specItemList
-        const spec = this.specs.find((item) => item.spec_id === this.specId)
-
-        const checkSpecItems = this.checkSpec[this.specId]
-
-        //如下实现spec.specItems = specItemList
-
-        //spec.specItems未被删除的spec_item_id
-        let exists_sii = []
-
-        //新增数据-已经存在的编号
-        let exists_new_sii = []
-
-        //新增
-        for (let j = 0; j <= specItemList.length - 1; j++) {
-          for (let i = 0; i <= spec.specItems.length - 1; i++) {
-            if (
-              spec.specItems[i].spec_item_id == specItemList[j].spec_item_id
-            ) {
-              exists_new_sii.push(specItemList[j].spec_item_id)
-              break
-            }
-          }
-        }
-
-        //修改更改后的值
-        for (let i = 0; i <= spec.specItems.length - 1; i++) {
-          for (let j = 0; j <= specItemList.length - 1; j++) {
-            //更改最新值
-            if (
-              spec.specItems[i].spec_item_id == specItemList[j].spec_item_id
-            ) {
-              this.$set(
-                spec.specItems,
-                i,
-                Object.assign(spec.specItems[i], specItemList[j])
-              )
-              exists_sii.push(spec.specItems[i].spec_item_id)
-              break
-            }
-
-            if (spec.specItems.length - 1 == j) {
-            } else if (spec.specItems.length - 1 > j) {
-              //删除
-              //查找被删除的元素index
-            } else {
-              //新增
-              //spec.specItems.push(specItemList[j]);
-              //exists_sii.push(specItemList[j].spec_item_id);
-            }
-          }
-        }
-
-        let add_flag = false //为新增操作
-
-        //新增
-        for (let j = 0; j <= specItemList.length - 1; j++) {
-          if (exists_new_sii.indexOf(specItemList[j].spec_item_id) > -1) {
-          } else {
-            //console.info("新增-specItemList[j]");
-            //console.info(specItemList[j]);
-            //新增
-            spec.specItems.push(specItemList[j])
-            add_flag = true
-          }
-        }
-
-        if (!add_flag) {
-          //删除
-          for (let i = 0; i <= spec.specItems.length - 1; i++) {
-            if (exists_sii.indexOf(spec.specItems[i].spec_item_id) > -1) {
-            } else {
-              spec.specItems.splice(i, 1)
-            }
-          }
-
-          //删除
-          for (let i = 0; i <= checkSpecItems.length - 1; i++) {
-            if (exists_sii.indexOf(checkSpecItems[i].spec_item_id) > -1) {
-            } else {
-              checkSpecItems.splice(i, 1)
-            }
-          }
-        }
-
-        this.$forceUpdate()
-
-        //console.info("this.specs");
-        //console.info(this.specs);
-        //console.info(this.checkSpec);
-      },
-      detSpecItem(row) {
-        var that = this
-        if (row.spec_item_id) {
-          this.$baseConfirm(this.__('你确定要删除当前项吗'), null, async () => {
-            const { msg, status } = await doDelete({
-              spec_item_id: row.spec_item_id,
-            })
-            if (200 == status) {
-              for (let i = 0; i < that.specData.length; i++) {
-                let index = row.spec_id + '_' + row.spec_item_id
-                if (that.specData[i][index] === row.spec_item_id) {
-                  that.specData.splice(i, 1)
-                }
-              }
-              // 移除勾选
-              for (let i = 0; i < that.checkSpec[row.spec_id].length; i++) {
-                if (
-                  that.checkSpec[row.spec_id][i].spec_item_id ==
-                  row.spec_item_id
-                ) {
-                  that.checkSpec[row.spec_id].splice(i, 1)
-                }
-              }
-
-              this.$baseMessage(msg, 'success')
-              //await this.upDateSpecItem()
-            } else {
-              this.$baseMessage(msg, 'error')
-            }
-            await this.upDateSpecItem()
-          })
-        }
-      },
-      closeEditSpecItem() {
-        this.specItemForm = {}
-        this.editVisible = false
-      },
-      showEditSpecItem(spec_id) {
-        this.specId = spec_id
-        this.editSpecItem()
-      },
-      editSpecItem(row) {
-        if (row) {
-          this.specTitle = '编辑'
-          this.specItemForm = Object.assign({}, row)
-          this.editVisible = true
-          return
-        }
-        this.specTitle = '新增'
-        this.specItemForm = {
-          spec_id: this.specId,
-        }
-        this.editVisible = true
-      },
-      async showTable(spec_id) {
-        this.specId = spec_id
-        this.specTableData = await this.getSpecItemList(spec_id)
-        this.tableVisible = true
-      },
-      async getSpecItemList(spec_id) {
-        const { data } = await getSpecItemList({ spec_id: spec_id })
-        return data
-      },
-      // 合并列
-      spanMethod({ row, column, rowIndex, columnIndex }) {
-        if (
-          column.property === 'main_color_img' ||
-          column.property === 'color_img'
-        ) {
-          // if (this.specImageIdList.length === 0) {
-          let image = this.getFirstImageSpec()
-          if (!image) {
-            if (rowIndex === 0) {
-              return {
-                rowspan: this.specData.length,
-                colspan: 1,
-              }
-            } else {
-              return {
-                rowspan: 0,
-                colspan: 0,
-              }
-            }
-          } else {
-            const _row = this.spanArr[image][rowIndex]
-            const _col = _row > 0 ? 1 : 0
-            return {
-              rowspan: _row,
-              colspan: _col,
-            }
-          }
-        }
-      },
-      radChange(val) {
-        // 清空选中的规格参数
-        for (let key in this.checkSpec) {
-          this.$set(this.checkSpec, key, [])
-        }
-        if (val) {
-          this.specHead = Array.from(this.expHead)
-        } else {
-          this.specHead = Array.from(this.virtualHead)
-        }
-      },
-      showProperty(property) {
-        const obj = this.expHead.find((item) => item.property === property)
-        return obj ? true : false
-      },
-      handleAvatarSuccess(name, image, scop) {
-        this.specData[scop.$index][name] = image
-      },
-      handleDelColorImg(name, image, scop) {
-        const color_id = this.specData[scop.$index]['color_id']
-        for (let i = 0; i < this.specData.length; i++) {
-          const spec = this.specData[i]
-          if (spec.color_id === color_id) {
-            this.specData[i][name] = image
-            this.specData[i]['colorImg'] = image
-          }
-        }
-      },
-      handleSuccess(name, images, scop) {
-        images.forEach((image) => {
-          this.specData[scop.$index][name].push(image)
-        })
-      },
-      // 构建表头数据
-      creSpecHead(arr) {
-        this.specHead = []
-        let sp = this.specs
-        arr.forEach((specs) => {
-          const spec = sp.find((item) => item.spec_id === specs[0].spec_id)
-          if (spec) {
-            const obj = {
-              label: spec.spec_name,
-              property: spec.spec_id.toString(),
-            }
-            this.specHead.push(obj)
-          }
-        })
-        const head =
-          this.productForm.kind_id === 1201 ? this.expHead : this.virtualHead
-        this.specHead = this.specHead.concat(head)
-      },
-      getProductAssistsIndex() {
-        let assists = this.assists
-        let assistArr = this.assistArr
-        if (!assists || !assistArr) return []
-
-        let assistsIndexs = []
-        for (let assist_id in assistArr) {
-          const assist = assists.find(
-            (item) => item.assist_id === Number(assist_id)
-          )
-          if (assist) {
-            let obj = {
-              assist_id: Number(assist_id),
-            }
-            let format = assist.assist_format
-            if (format === 'text' || format === 'radio') {
-              obj.assist_item_id = assistArr[assist_id]
-            } else {
-              obj.assist_item_id = assistArr[assist_id].toString()
-            }
-            assistsIndexs.push(obj)
-          }
-        }
-        return assistsIndexs
-      },
-      // 构建表数据
-      creSpecData(descartes) {
-        //return ;
-        //存入参考数据
-        //存在的ssid
-        let ssid_row = []
-        for (let i = 0; i < this.specData.length; i++) {
-          if (this.allSpecData.length == 0) {
-            this.allSpecData.push(Object.assign({}, this.specData[i]))
-            break
-          }
-
-          for (let j = 0; j < this.allSpecData.length; j++) {
-            if (
-              typeof this.allSpecData[j]['siid'] !== 'undefined' &&
-              typeof this.specData[i]['siid'] !== 'undefined' &&
-              this.allSpecData[j]['siid'] == this.specData[i]['siid']
-            ) {
-              this.allSpecData[j] = Object.assign({}, this.specData[i])
-              ssid_row.push(this.allSpecData[j]['siid'])
-              break
-            }
-            /*
-            if (j == this.allSpecData.length-1)
-            {
-              this.allSpecData.push(Object.assign({}, this.specData[i]));
-            }*/
-          }
-        }
-        for (let i = 0; i < this.specData.length; i++) {
-          if (ssid_row.indexOf(this.specData[i]['ssid']) > -1) {
-          } else {
-            this.allSpecData.push(Object.assign({}, this.specData[i]))
-          }
-        }
-
-        this.specData = []
-        // 当specs 为空时
-        if (!this.specs || this.specs.length === 0) {
-          const obj = {
-            main_color_img: this.default_image,
-            color_img: [],
-            item_enable: 1001,
-            item_is_default: false,
-            item_market_price: undefined,
-            item_unit_price: undefined,
-            item_advice_price: undefined,
-            item_unit_points: undefined,
-            item_quantity: undefined,
-          }
-          this.specData.push(obj)
-          return
-        }
-
-        for (let i = 0; i < descartes.length; i++) {
-          let obj = {
-            category_id: this.row.category_id,
-            main_color_img: this.default_image,
-            color_img: [],
-            item_enable: 1001,
-            item_is_default: false,
-            item_market_price: undefined,
-            item_unit_price: undefined,
-            item_advice_price: undefined,
-            item_unit_points: undefined,
-            item_quantity: undefined,
-          }
-
-          let spec_item_ids = []
-          let id = ''
-
-          if (Array.isArray(descartes[i])) {
-            descartes[i].forEach((spec) => {
-              let spec_id = spec.spec_id
-              let spec_item_id = spec.spec_item_id
-              id = spec_id + '_' + spec_item_id
-              obj[spec.spec_id] = spec.spec_item_name
-              obj[id] = spec.spec_item_id
-
-              spec_item_ids.push(spec_item_id)
-            })
-          } else {
-            let spec_id = descartes[i].spec_id
-            let spec_item_id = descartes[i].spec_item_id
-            id = spec_id + '_' + spec_item_id
-            obj[spec_id] = descartes[i].spec_item_name
-            obj[id] = spec_item_id
-
-            spec_item_ids.push(spec_item_id)
-          }
-
-          spec_item_ids.sort(function (a, b) {
-            return a - b
-          })
-          let spec_item_ids_str = spec_item_ids.join('-')
-
-          obj['siid'] = spec_item_ids_str
-
-          console.info(obj)
-          //判断目前填充的数据
-          for (let j = 0; j < this.allSpecData.length; j++) {
-            if (
-              typeof this.allSpecData[j]['siid'] !== 'undefined' &&
-              this.allSpecData[j]['siid'] == spec_item_ids_str
-            ) {
-              //obj = Object.assign(obj, this.allSpecData[j])
-
-              obj.category_id = this.allSpecData[j].category_id
-              obj.colorImg = this.allSpecData[j].colorImg
-              obj.color_id = this.allSpecData[j].color_id
-              obj.color_img = this.allSpecData[j].color_img
-              obj.item_barcode = this.allSpecData[j].item_barcode
-              obj.item_enable = this.allSpecData[j].item_enable
-              obj.item_id = this.allSpecData[j].item_id
-              obj.item_is_default = this.allSpecData[j].item_is_default
-              obj.item_market_price = this.allSpecData[j].item_market_price
-              obj.item_number = this.allSpecData[j].item_number
-              obj.item_quantity = this.allSpecData[j].item_quantity
-              obj.item_unit_points = this.allSpecData[j].item_unit_points
-              obj.item_unit_price = this.allSpecData[j].item_unit_price
-              obj.item_advice_price = this.allSpecData[j].item_advice_price
-              obj.item_weight = this.allSpecData[j].item_weight
-              obj.main_color_img = this.allSpecData[j].main_color_img
-            }
-          }
-
-          this.specData.push(obj)
-        }
-      },
-      // 生成笛卡尔积
-      descartes(array) {
-        if (!array || array.length === 0) return [[]]
-
-        return [].reduce.call(array, function (col, set) {
-          const res = []
-          col.forEach(function (c) {
-            set.forEach(function (s) {
-              const t = [].concat(Array.isArray(c) ? c : [c])
-              t.push(s)
-              res.push(t)
-            })
-          })
-          return res
-        })
-      },
-      __,
-
-      resetData() {
-        this.checkSpec = {}
-        this.specs = []
-      },
-      async showEdit(row) {
-        this.resetData()
-        this.dialogFormVisible = true
-        this.loading = true
-        // 记载数据
-        const productId = Number(row.product_id)
-        this.productForm.product_id = productId
-        this.productForm.text_category_id = row.category_name
-        await this.getProductInfo(productId)
-        await this.getProductItem(productId)
-        await this.getCategory(this.shop_product_index.category_id)
-
-        this.categoryId = this.shop_product_index.category_id
-
-        // 初始化表头数据
-        this.specHead = Array.from(this.expHead)
-        this.shop_product_base = Object.assign({}, row)
-        await this.getType(this.shop_product_index.type_id, productId)
-
-        // 初始化数据
-        this.initData()
-        this.loading = false
-      },
-      async onCategoryChange(row) {
-        console.info(row)
-
-        if (row.length > 0) {
-          const category_id = row[row.length-1];
-          const category = this.findTree(this.categoryOptions, category_id)
-
-          if (category != null) {
-            //判断更改后的商品类型是否一致，不一致不可以改!
-            if (this.shop_product_index.type_id == category.type_id) {
-              this.productForm.category_id = category.category_id
-              this.productForm.text_category_id = category.category_name
-              this.productForm.category_name = category.category_name
-            } else {
-              this.$baseMessage('商品类型不一致，不可以更改分类！', 'error')
-            }
-          }
-        }
-      },
-      initData() {
-        // 初始化数据
-        // initBrand()
-        // this.initBrand()
-        // initAssists()
-        this.initAssists()
-        // initDetail()
-        this.initDetail()
-        // initProduct()
-        this.initProduct()
-        if (this.shop_product_index.kind_id === 1202) {
-          this.initValid()
-        }
-        // initSpec()
-        this.initSpec()
-        // initItems()
-        this.initItems()
-        // initTableHead()
-        this.initTableHead()
-        // 计算合并列
-        this.initRowspan()
-      },
-      // 初始化 辅助属性
-      initAssists() {
-        let assists = this.assists
-        this.shop_product_assist_index.forEach((assist, index) => {
-          const assistId = assist.assist_id
-
-          const _assist = assists.find(
-            (item) => item.assist_id === Number(assistId)
-          )
-
-          let format = _assist.assist_format
-          if (format === 'text') {
-            this.$set(this.assistArr, assistId, assist.assist_item_id)
-          } else if (format === 'radio' || format === 'select') {
-            this.$set(this.assistArr, assistId, Number(assist.assist_item_id))
-          } else {
-            const assist_item_id = assist.assist_item_id.split(',').map(Number)
-            this.$set(this.assistArr, assistId, assist_item_id)
-          }
-        })
-      },
-      // 初始化虚拟产品数据
-      initValid() {
-        let shopProductValidPeriod = this.shop_product_valid_period
-        if (!shopProductValidPeriod) return
-        this.validForm = {
-          product_valid_period: shopProductValidPeriod.product_valid_period,
-          product_valid_type: shopProductValidPeriod.product_valid_type,
-          product_validity_end: shopProductValidPeriod.product_validity_end,
-          product_service_date_flag:
-            shopProductValidPeriod.product_service_date_flag,
-          product_service_contactor_flag:
-            shopProductValidPeriod.product_service_contactor_flag,
-        }
-      },
-      // 初始化 规格属性
-      initSpec() {
-        let that = this
-        const strSpecs = this.shop_product_info
-          ? this.shop_product_info.product_spec
-          : ''
-        const specs = JSON.parse(strSpecs)
-        console.info('+++++++++++++++++')
-        console.info(specs)
-        specs.forEach((spec, index) => {
-          const spec_id = Number(spec.id)
-
-          //设置允许点选的规格信息
-          that.allowCheckSpecRow.push(spec_id)
-
-          const idsArr = spec.item.map((obj) => Number(obj.id))
-          const items = this.getSpecItemByIds(spec_id, idsArr)
-          // 设置spec 勾选数据
-          this.$set(this.checkSpec, spec_id, items)
-          console.info(items)
-          items.forEach((item, index) => {
-            that.newSpecItemIdRow.push(item.spec_item_id)
-          })
-        })
-      },
-      initTableHead() {
-        const checkSpec = this.checkSpec
-        let arr = []
-        for (let key in checkSpec) {
-          const element = checkSpec[key]
-          if (element.length > 0) arr.push(element)
-        }
         const descartes = this.descartes(arr)
         // 构造表头数据
         this.creSpecHead(arr)
         // 构造表数据
-        //this.creSpecData(descartes)
+        this.creSpecData(descartes)
+
+        // 计算合并列
+        this.initRowspan()
       },
-      initItems() {
-        const productItems = this.shop_product_item
-        const shop_product_image = this.shop_product_image
+      deep: true,
+    },
+  },
+  computed: {
+    ...mapGetters({
+      token: 'user/token',
+      configs: 'routes/configs',
+    }),
+  },
 
-        let tmpSpecData = []
-        this.specData = []
-        // const image_id = this.specImageIdList[0]
-        productItems.forEach((productItem, index) => {
-          let obj = {
-            main_color_img: '',
-            color_id: productItem.color_id,
-            color_img: [],
-            item_id: productItem.item_id,
-            item_barcode: productItem.item_barcode,
-            item_number: productItem.item_number,
-            item_weight: productItem.item_weight,
-            item_market_price: productItem.item_market_price,
-            item_unit_price: productItem.item_unit_price,
-            item_advice_price: productItem.item_advice_price,
-            item_unit_points: productItem.item_unit_points,
-            item_quantity: productItem.item_quantity,
-            item_enable: productItem.item_enable,
-            item_is_default: productItem.item_is_default == 1 ? true : false,
-            item_purchase_price: productItem.item_purchase_price,
-            item_purchase_rate: productItem.item_purchase_rate,
-            item_sales_rate: productItem.item_sales_rate,
-          }
+  async created() {
+    await this.getCategoryTree()
+    this.getStoreBase()
+    // 获取商品标签
+    this.getProductTags()
+    // 获取快递类型
+    this.getTransports()
+    // 获取次卡数据
+    this.getPayCardTypes()
+    // 获取代金券数据
+    this.getCouponsFun()
+    // 获取券码数据
+    this.getCouponCardTypes()
+    // 获取店铺分类树数据
+    this.getStoreCategoryTree()
+    this.params.authorization = getToken()
+    this.getxfz()
+  },
+  methods: {
+    // 清空  card_type_id
+    radChanges(row) {
+      if (row) {
+        this.productForm.voucher_activity_id = ''
+        this.productForm.coupon_type_id = ''
+      }
+      this.$forceUpdate()
+    },
+    // 清空 voucher_activity_id
+    radChangesTypeId(row) {
+      if (row) {
+        this.productForm.card_type_id = ''
+        this.productForm.coupon_type_id = ''
+      }
+      this.$forceUpdate()
+    },
+    // 清空 coupon_type_id
+    radChangesVAId(row) {
+      if (row) {
+        this.productForm.card_type_id = ''
+        this.productForm.voucher_activity_id = ''
+      }
+      this.$forceUpdate()
+    },
+    getStoreBase() {
+      if (
+        this.configs.config.supplier_market_enable &&
+        2 == this.configs.store_type
+      ) {
+        const unitPriceIndex = this.expHead.findIndex(
+          (item) => item.property === 'item_unit_price'
+        )
 
-          const strSpec = productItem.item_spec
-          const itemSpecs = JSON.parse(strSpec ? strSpec : [])
-          let spec_item_ids = []
+        if (unitPriceIndex !== -1) {
+          this.expHead[unitPriceIndex].label = this.__('成本价')
 
-          if (itemSpecs.length > 0) {
-            itemSpecs.forEach((spec, ind) => {
-              const spec_id = Number(spec.id)
-              let spec_item_id = Number(spec.item.id)
-              let id = spec_id + '_' + spec_item_id
-              obj[spec_id] = spec.item.name
-              obj[id] = spec_item_id
+          this.expHead.splice(unitPriceIndex + 1, 0, {
+            label: this.__('建议零售价'),
+            property: 'item_advice_price',
+          })
+        }
 
-              spec_item_ids.push(spec_item_id)
-            })
-          }
+        const unitIndex = this.virtualHead.findIndex(
+          (item) => item.property === 'item_unit_price'
+        )
 
-          if (itemSpecs.length > 0 && itemSpecs[0].spec_format) {
-            let image_id = this.getFirstImageSpec()
-            itemSpecs.forEach((spec, ind) => {
-              if (image_id && image_id === Number(spec.id)) {
-                const item_id = Number(spec.item.id)
-                obj.main_color_img = this.getMainImage(item_id)
-                obj.color_img = this.getOtherImage(item_id)
-                // 控件图片回显属性（固定格式[{url:''}]）
-                obj.colorImg = obj.color_img.map((item) => {
-                  return {
-                    url: item,
+        if (unitIndex !== -1) {
+          this.virtualHead[unitIndex].label = this.__('成本价')
+
+          this.virtualHead.splice(unitIndex + 1, 0, {
+            label: this.__('建议零售价'),
+            property: 'item_advice_price',
+          })
+        }
+      }
+    },
+
+    batchHandle() {
+      for (const key in this.batchObj) {
+        this.specData.forEach((item, index) => {
+          this.$set(this.specData[index], key, this.batchObj[key])
+        })
+      }
+    },
+    batchInput(e, key) {
+      let value = e.target.value
+      value = Math.round(value * Math.pow(10, 4)) / Math.pow(10, 4) //四舍五入
+      value = Number(value).toFixed(4) //补足位数
+      e.target.value = value
+      this.batchObj[key] = value
+    },
+    // 计算合并列的下标和数量
+    initRowspan() {
+      const image = this.getFirstImageSpec()
+      if (!image) return
+      let data = this.specData
+      let index = 1
+      let currIndex = 0
+      this.spanArr[image] = {}
+      for (let i = 0; i <= data.length - 1; i++) {
+        if (i === data.length - 1) {
+          this.spanArr[image][currIndex] = index
+          return
+        }
+        if (data[i][image] === data[i + 1][image]) {
+          index++
+        } else {
+          this.spanArr[image][currIndex] = index
+          currIndex = i + 1
+          index = 1
+        }
+      }
+    },
+    getFirstImageSpec() {
+      let specs = this.specs
+      let checkSpec = this.checkSpec
+      let sp = specs.find((spec) => {
+        let spec_id = spec.spec_id
+        let checkSpecElement = checkSpec[spec_id]
+        return checkSpecElement.length > 0 && spec.spec_format === 'image'
+      })
+      return sp ? sp.spec_id : null
+    },
+    // 四舍五入返回四位有效数字
+    handleInput(e, scope) {
+      let value = e.target.value
+      const index = scope.$index
+      value = Math.round(value * Math.pow(10, 4)) / Math.pow(10, 4) //四舍五入
+      value = Number(value).toFixed(4) //补足位数
+      this.specData[index][scope.column.property] = value
+    },
+    // 维护选中的类型image的spec
+    initSpecImageList() {
+      this.specImageIdList = []
+      this.specs.forEach((spec) => {
+        if (spec.spec_format === 'image')
+          this.specImageIdList.push(spec.spec_id)
+      })
+    },
+    saveSpecItem() {
+      var that = this
+      this.$refs['specItemForm'].validate(async (valid) => {
+        if (valid) {
+          const { msg, status, data } = await doEditSpecItem(this.specItemForm)
+          if (200 == status) {
+            // 修改规格编辑后数据
+            if (that.specItemForm.spec_item_id) {
+              for (let i = 0; i < that.specData.length; i++) {
+                for (let j = 0; j < that.specs.length; j++) {
+                  for (let k = 0; k < that.specs[j].specItems.length; k++) {
+                    if (
+                      that.specs[j].specItems[k].spec_item_id ===
+                      that.specItemForm.spec_item_id
+                    ) {
+                      that.specs[j].specItems[k].spec_item_name =
+                        that.specItemForm.spec_item_name
+                    }
                   }
-                })
+                }
               }
-            })
+            }
+
+            this.$baseMessage(msg, 'success')
           } else {
-            if (shop_product_image) {
-              let image = shop_product_image[0]
-              obj.main_color_img = image.item_image_default
-              let other = image.item_image_other
-              if (other) {
-                obj.color_img = other.split(',')
-              } else {
-                obj.color_img = []
+            this.$baseMessage(msg, 'error')
+          }
+          await this.upDateSpecItem()
+          this.closeEditSpecItem()
+        } else {
+          return false
+        }
+      })
+    },
+    async upDateSpecItem() {
+      // 更新
+      const specItemList = await this.getSpecItemList(this.specId)
+      this.specTableData = specItemList
+      const spec = this.specs.find((item) => item.spec_id === this.specId)
+
+      const checkSpecItems = this.checkSpec[this.specId]
+
+      //如下实现spec.specItems = specItemList
+
+      //spec.specItems未被删除的spec_item_id
+      let exists_sii = []
+
+      //新增数据-已经存在的编号
+      let exists_new_sii = []
+
+      //新增
+      for (let j = 0; j <= specItemList.length - 1; j++) {
+        for (let i = 0; i <= spec.specItems.length - 1; i++) {
+          if (spec.specItems[i].spec_item_id == specItemList[j].spec_item_id) {
+            exists_new_sii.push(specItemList[j].spec_item_id)
+            break
+          }
+        }
+      }
+
+      //修改更改后的值
+      for (let i = 0; i <= spec.specItems.length - 1; i++) {
+        for (let j = 0; j <= specItemList.length - 1; j++) {
+          //更改最新值
+          if (spec.specItems[i].spec_item_id == specItemList[j].spec_item_id) {
+            this.$set(
+              spec.specItems,
+              i,
+              Object.assign(spec.specItems[i], specItemList[j])
+            )
+            exists_sii.push(spec.specItems[i].spec_item_id)
+            break
+          }
+
+          if (spec.specItems.length - 1 == j) {
+          } else if (spec.specItems.length - 1 > j) {
+            //删除
+            //查找被删除的元素index
+          } else {
+            //新增
+            //spec.specItems.push(specItemList[j]);
+            //exists_sii.push(specItemList[j].spec_item_id);
+          }
+        }
+      }
+
+      let add_flag = false //为新增操作
+
+      //新增
+      for (let j = 0; j <= specItemList.length - 1; j++) {
+        if (exists_new_sii.indexOf(specItemList[j].spec_item_id) > -1) {
+        } else {
+          //console.info("新增-specItemList[j]");
+          //console.info(specItemList[j]);
+          //新增
+          spec.specItems.push(specItemList[j])
+          add_flag = true
+        }
+      }
+
+      if (!add_flag) {
+        //删除
+        for (let i = 0; i <= spec.specItems.length - 1; i++) {
+          if (exists_sii.indexOf(spec.specItems[i].spec_item_id) > -1) {
+          } else {
+            spec.specItems.splice(i, 1)
+          }
+        }
+
+        //删除
+        for (let i = 0; i <= checkSpecItems.length - 1; i++) {
+          if (exists_sii.indexOf(checkSpecItems[i].spec_item_id) > -1) {
+          } else {
+            checkSpecItems.splice(i, 1)
+          }
+        }
+      }
+
+      this.$forceUpdate()
+
+      //console.info("this.specs");
+      //console.info(this.specs);
+      //console.info(this.checkSpec);
+    },
+    detSpecItem(row) {
+      var that = this
+      if (row.spec_item_id) {
+        this.$baseConfirm(this.__('你确定要删除当前项吗'), null, async () => {
+          const { msg, status } = await doDelete({
+            spec_item_id: row.spec_item_id,
+          })
+          if (200 == status) {
+            for (let i = 0; i < that.specData.length; i++) {
+              let index = row.spec_id + '_' + row.spec_item_id
+              if (that.specData[i][index] === row.spec_item_id) {
+                that.specData.splice(i, 1)
               }
+            }
+            // 移除勾选
+            for (let i = 0; i < that.checkSpec[row.spec_id].length; i++) {
+              if (
+                that.checkSpec[row.spec_id][i].spec_item_id == row.spec_item_id
+              ) {
+                that.checkSpec[row.spec_id].splice(i, 1)
+              }
+            }
+
+            this.$baseMessage(msg, 'success')
+            //await this.upDateSpecItem()
+          } else {
+            this.$baseMessage(msg, 'error')
+          }
+          await this.upDateSpecItem()
+        })
+      }
+    },
+    closeEditSpecItem() {
+      this.specItemForm = {}
+      this.editVisible = false
+    },
+    showEditSpecItem(spec_id) {
+      this.specId = spec_id
+      this.editSpecItem()
+    },
+    editSpecItem(row) {
+      if (row) {
+        this.specTitle = '编辑'
+        this.specItemForm = Object.assign({}, row)
+        this.editVisible = true
+        return
+      }
+      this.specTitle = '新增'
+      this.specItemForm = {
+        spec_id: this.specId,
+      }
+      this.editVisible = true
+    },
+    async showTable(spec_id) {
+      this.specId = spec_id
+      this.specTableData = await this.getSpecItemList(spec_id)
+      this.tableVisible = true
+    },
+    async getSpecItemList(spec_id) {
+      const { data } = await getSpecItemList({ spec_id: spec_id })
+      return data
+    },
+    // 合并列
+    spanMethod({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === 'main_color_img' ||
+        column.property === 'color_img'
+      ) {
+        // if (this.specImageIdList.length === 0) {
+        let image = this.getFirstImageSpec()
+        if (!image) {
+          if (rowIndex === 0) {
+            return {
+              rowspan: this.specData.length,
+              colspan: 1,
+            }
+          } else {
+            return {
+              rowspan: 0,
+              colspan: 0,
+            }
+          }
+        } else {
+          const _row = this.spanArr[image][rowIndex]
+          const _col = _row > 0 ? 1 : 0
+          return {
+            rowspan: _row,
+            colspan: _col,
+          }
+        }
+      }
+    },
+    radChange(val) {
+      // 清空选中的规格参数
+      for (let key in this.checkSpec) {
+        this.$set(this.checkSpec, key, [])
+      }
+      if (val) {
+        this.specHead = Array.from(this.expHead)
+      } else {
+        this.specHead = Array.from(this.virtualHead)
+      }
+    },
+    showProperty(property) {
+      const obj = this.expHead.find((item) => item.property === property)
+      return obj ? true : false
+    },
+    handleAvatarSuccess(name, image, scop) {
+      this.specData[scop.$index][name] = image
+    },
+    handleDelColorImg(name, image, scop) {
+      const color_id = this.specData[scop.$index]['color_id']
+      for (let i = 0; i < this.specData.length; i++) {
+        const spec = this.specData[i]
+        if (spec.color_id === color_id) {
+          this.specData[i][name] = image
+          this.specData[i]['colorImg'] = image
+        }
+      }
+    },
+    handleSuccess(name, images, scop) {
+      images.forEach((image) => {
+        this.specData[scop.$index][name].push(image)
+      })
+    },
+    // 构建表头数据
+    creSpecHead(arr) {
+      this.specHead = []
+      let sp = this.specs
+      arr.forEach((specs) => {
+        const spec = sp.find((item) => item.spec_id === specs[0].spec_id)
+        if (spec) {
+          const obj = {
+            label: spec.spec_name,
+            property: spec.spec_id.toString(),
+          }
+          this.specHead.push(obj)
+        }
+      })
+      const head =
+        this.productForm.kind_id === 1201 ? this.expHead : this.virtualHead
+      this.specHead = this.specHead.concat(head)
+    },
+    getProductAssistsIndex() {
+      let assists = this.assists
+      let assistArr = this.assistArr
+      if (!assists || !assistArr) return []
+
+      let assistsIndexs = []
+      for (let assist_id in assistArr) {
+        const assist = assists.find(
+          (item) => item.assist_id === Number(assist_id)
+        )
+        if (assist) {
+          let obj = {
+            assist_id: Number(assist_id),
+          }
+          let format = assist.assist_format
+          if (format === 'text' || format === 'radio') {
+            obj.assist_item_id = assistArr[assist_id]
+          } else {
+            obj.assist_item_id = assistArr[assist_id].toString()
+          }
+          assistsIndexs.push(obj)
+        }
+      }
+      return assistsIndexs
+    },
+    // 构建表数据
+    creSpecData(descartes) {
+      //return ;
+      //存入参考数据
+      //存在的ssid
+      let ssid_row = []
+      for (let i = 0; i < this.specData.length; i++) {
+        if (this.allSpecData.length == 0) {
+          this.allSpecData.push(Object.assign({}, this.specData[i]))
+          break
+        }
+
+        for (let j = 0; j < this.allSpecData.length; j++) {
+          if (
+            typeof this.allSpecData[j]['siid'] !== 'undefined' &&
+            typeof this.specData[i]['siid'] !== 'undefined' &&
+            this.allSpecData[j]['siid'] == this.specData[i]['siid']
+          ) {
+            this.allSpecData[j] = Object.assign({}, this.specData[i])
+            ssid_row.push(this.allSpecData[j]['siid'])
+            break
+          }
+          /*
+            if (j == this.allSpecData.length-1)
+            {
+              this.allSpecData.push(Object.assign({}, this.specData[i]));
+            }*/
+        }
+      }
+      for (let i = 0; i < this.specData.length; i++) {
+        if (ssid_row.indexOf(this.specData[i]['ssid']) > -1) {
+        } else {
+          this.allSpecData.push(Object.assign({}, this.specData[i]))
+        }
+      }
+
+      this.specData = []
+      // 当specs 为空时
+      if (!this.specs || this.specs.length === 0) {
+        const obj = {
+          main_color_img: this.default_image,
+          color_img: [],
+          item_enable: 1001,
+          item_is_default: false,
+          item_market_price: undefined,
+          item_unit_price: undefined,
+          item_advice_price: undefined,
+          item_unit_points: undefined,
+          item_quantity: undefined,
+        }
+        this.specData.push(obj)
+        return
+      }
+
+      for (let i = 0; i < descartes.length; i++) {
+        let obj = {
+          category_id: this.row.category_id,
+          main_color_img: this.default_image,
+          color_img: [],
+          item_enable: 1001,
+          item_is_default: false,
+          item_market_price: undefined,
+          item_unit_price: undefined,
+          item_advice_price: undefined,
+          item_unit_points: undefined,
+          item_quantity: undefined,
+        }
+
+        let spec_item_ids = []
+        let id = ''
+
+        if (Array.isArray(descartes[i])) {
+          descartes[i].forEach((spec) => {
+            let spec_id = spec.spec_id
+            let spec_item_id = spec.spec_item_id
+            id = spec_id + '_' + spec_item_id
+            obj[spec.spec_id] = spec.spec_item_name
+            obj[id] = spec.spec_item_id
+
+            spec_item_ids.push(spec_item_id)
+          })
+        } else {
+          let spec_id = descartes[i].spec_id
+          let spec_item_id = descartes[i].spec_item_id
+          id = spec_id + '_' + spec_item_id
+          obj[spec_id] = descartes[i].spec_item_name
+          obj[id] = spec_item_id
+
+          spec_item_ids.push(spec_item_id)
+        }
+
+        spec_item_ids.sort(function (a, b) {
+          return a - b
+        })
+        let spec_item_ids_str = spec_item_ids.join('-')
+
+        obj['siid'] = spec_item_ids_str
+
+        console.info(obj)
+        //判断目前填充的数据
+        for (let j = 0; j < this.allSpecData.length; j++) {
+          if (
+            typeof this.allSpecData[j]['siid'] !== 'undefined' &&
+            this.allSpecData[j]['siid'] == spec_item_ids_str
+          ) {
+            //obj = Object.assign(obj, this.allSpecData[j])
+
+            obj.category_id = this.allSpecData[j].category_id
+            obj.colorImg = this.allSpecData[j].colorImg
+            obj.color_id = this.allSpecData[j].color_id
+            obj.color_img = this.allSpecData[j].color_img
+            obj.item_barcode = this.allSpecData[j].item_barcode
+            obj.item_enable = this.allSpecData[j].item_enable
+            obj.item_id = this.allSpecData[j].item_id
+            obj.item_is_default = this.allSpecData[j].item_is_default
+            obj.item_market_price = this.allSpecData[j].item_market_price
+            obj.item_number = this.allSpecData[j].item_number
+            obj.item_quantity = this.allSpecData[j].item_quantity
+            obj.item_unit_points = this.allSpecData[j].item_unit_points
+            obj.item_unit_price = this.allSpecData[j].item_unit_price
+            obj.item_advice_price = this.allSpecData[j].item_advice_price
+            obj.item_weight = this.allSpecData[j].item_weight
+            obj.main_color_img = this.allSpecData[j].main_color_img
+          }
+        }
+
+        this.specData.push(obj)
+      }
+    },
+    // 生成笛卡尔积
+    descartes(array) {
+      if (!array || array.length === 0) return [[]]
+
+      return [].reduce.call(array, function (col, set) {
+        const res = []
+        col.forEach(function (c) {
+          set.forEach(function (s) {
+            const t = [].concat(Array.isArray(c) ? c : [c])
+            t.push(s)
+            res.push(t)
+          })
+        })
+        return res
+      })
+    },
+    __,
+
+    resetData() {
+      this.checkSpec = {}
+      this.specs = []
+    },
+    async showEdit(row) {
+      this.resetData()
+      this.dialogFormVisible = true
+      this.loading = true
+      // 记载数据
+      const productId = Number(row.product_id)
+      this.productForm.product_id = productId
+      this.productForm.text_category_id = row.category_name
+      await this.getProductInfo(productId)
+      await this.getProductItem(productId)
+      await this.getCategory(this.shop_product_index.category_id)
+
+      this.categoryId = this.shop_product_index.category_id
+
+      // 初始化表头数据
+      this.specHead = Array.from(this.expHead)
+      this.shop_product_base = Object.assign({}, row)
+      await this.getType(this.shop_product_index.type_id, productId)
+
+      // 初始化数据
+      this.initData()
+      this.loading = false
+    },
+    async onCategoryChange(row) {
+      console.info(row)
+
+      if (row.length > 0) {
+        const category_id = row[row.length - 1]
+        const category = this.findTree(this.categoryOptions, category_id)
+
+        if (category != null) {
+          //判断更改后的商品类型是否一致，不一致不可以改!
+          if (this.shop_product_index.type_id == category.type_id) {
+            this.productForm.category_id = category.category_id
+            this.productForm.text_category_id = category.category_name
+            this.productForm.category_name = category.category_name
+          } else {
+            this.$baseMessage('商品类型不一致，不可以更改分类！', 'error')
+          }
+        }
+      }
+    },
+    initData() {
+      // 初始化数据
+      // initBrand()
+      // this.initBrand()
+      // initAssists()
+      this.initAssists()
+      // initDetail()
+      this.initDetail()
+      // initProduct()
+      this.initProduct()
+      if (this.shop_product_index.kind_id === 1202) {
+        this.initValid()
+      }
+      // initSpec()
+      this.initSpec()
+      // initItems()
+      this.initItems()
+      // initTableHead()
+      this.initTableHead()
+      // 计算合并列
+      this.initRowspan()
+    },
+    // 初始化 辅助属性
+    initAssists() {
+      let assists = this.assists
+      this.shop_product_assist_index.forEach((assist, index) => {
+        const assistId = assist.assist_id
+
+        const _assist = assists.find(
+          (item) => item.assist_id === Number(assistId)
+        )
+
+        let format = _assist.assist_format
+        if (format === 'text') {
+          this.$set(this.assistArr, assistId, assist.assist_item_id)
+        } else if (format === 'radio' || format === 'select') {
+          this.$set(this.assistArr, assistId, Number(assist.assist_item_id))
+        } else {
+          const assist_item_id = assist.assist_item_id.split(',').map(Number)
+          this.$set(this.assistArr, assistId, assist_item_id)
+        }
+      })
+    },
+    // 初始化虚拟产品数据
+    initValid() {
+      let shopProductValidPeriod = this.shop_product_valid_period
+      if (!shopProductValidPeriod) return
+      this.validForm = {
+        product_valid_period: shopProductValidPeriod.product_valid_period,
+        product_valid_type: shopProductValidPeriod.product_valid_type,
+        product_validity_end: shopProductValidPeriod.product_validity_end,
+        product_service_date_flag:
+          shopProductValidPeriod.product_service_date_flag,
+        product_service_contactor_flag:
+          shopProductValidPeriod.product_service_contactor_flag,
+      }
+    },
+    // 初始化 规格属性
+    initSpec() {
+      let that = this
+      const strSpecs = this.shop_product_info
+        ? this.shop_product_info.product_spec
+        : ''
+      const specs = JSON.parse(strSpecs)
+      console.info('+++++++++++++++++')
+      console.info(specs)
+      specs.forEach((spec, index) => {
+        const spec_id = Number(spec.id)
+
+        //设置允许点选的规格信息
+        that.allowCheckSpecRow.push(spec_id)
+
+        const idsArr = spec.item.map((obj) => Number(obj.id))
+        const items = this.getSpecItemByIds(spec_id, idsArr)
+        // 设置spec 勾选数据
+        this.$set(this.checkSpec, spec_id, items)
+        console.info(items)
+        items.forEach((item, index) => {
+          that.newSpecItemIdRow.push(item.spec_item_id)
+        })
+      })
+    },
+    initTableHead() {
+      const checkSpec = this.checkSpec
+      let arr = []
+      for (let key in checkSpec) {
+        const element = checkSpec[key]
+        if (element.length > 0) arr.push(element)
+      }
+      const descartes = this.descartes(arr)
+      // 构造表头数据
+      this.creSpecHead(arr)
+      // 构造表数据
+      //this.creSpecData(descartes)
+    },
+    initItems() {
+      const productItems = this.shop_product_item
+      const shop_product_image = this.shop_product_image
+
+      let tmpSpecData = []
+      this.specData = []
+      // const image_id = this.specImageIdList[0]
+      productItems.forEach((productItem, index) => {
+        let obj = {
+          main_color_img: '',
+          color_id: productItem.color_id,
+          color_img: [],
+          item_id: productItem.item_id,
+          item_barcode: productItem.item_barcode,
+          item_number: productItem.item_number,
+          item_weight: productItem.item_weight,
+          item_market_price: productItem.item_market_price,
+          item_unit_price: productItem.item_unit_price,
+          item_advice_price: productItem.item_advice_price,
+          item_unit_points: productItem.item_unit_points,
+          item_quantity: productItem.item_quantity,
+          item_enable: productItem.item_enable,
+          item_is_default: productItem.item_is_default == 1 ? true : false,
+          item_purchase_price: productItem.item_purchase_price,
+          item_purchase_rate: productItem.item_purchase_rate,
+          item_sales_rate: productItem.item_sales_rate,
+        }
+
+        const strSpec = productItem.item_spec
+        const itemSpecs = JSON.parse(strSpec ? strSpec : [])
+        let spec_item_ids = []
+
+        if (itemSpecs.length > 0) {
+          itemSpecs.forEach((spec, ind) => {
+            const spec_id = Number(spec.id)
+            let spec_item_id = Number(spec.item.id)
+            let id = spec_id + '_' + spec_item_id
+            obj[spec_id] = spec.item.name
+            obj[id] = spec_item_id
+
+            spec_item_ids.push(spec_item_id)
+          })
+        }
+
+        if (itemSpecs.length > 0 && itemSpecs[0].spec_format) {
+          let image_id = this.getFirstImageSpec()
+          itemSpecs.forEach((spec, ind) => {
+            if (image_id && image_id === Number(spec.id)) {
+              const item_id = Number(spec.item.id)
+              obj.main_color_img = this.getMainImage(item_id)
+              obj.color_img = this.getOtherImage(item_id)
               // 控件图片回显属性（固定格式[{url:''}]）
               obj.colorImg = obj.color_img.map((item) => {
                 return {
@@ -2032,704 +2043,754 @@
                 }
               })
             }
-          }
-
-          spec_item_ids.sort(function (a, b) {
-            return a - b
           })
-          let spec_item_ids_str = spec_item_ids.join('-')
-
-          obj['siid'] = spec_item_ids_str
-
-          tmpSpecData.push(obj)
-          //this.specData.push(obj)
-        })
-
-        this.specData = Object.assign([], tmpSpecData)
-        this.allSpecData = Object.assign([], this.specData)
-      },
-      initDetail() {
-        const productDetail = this.shop_product_detail
-        // 售后服务
-        this.detailForm.product_service = productDetail.product_service
-        // 规格参数
-        this.detailForm.product_param = productDetail.product_param
-        // 商品描述
-        this.detailForm.product_detail = productDetail.product_detail
-        // 商品标签
-        const productTags = productDetail.product_tags
-        if (productTags !== 'null' && productTags) {
-          this.detailForm.product_tags = productTags.split(',').map(Number)
-        }
-      },
-      initProduct() {
-        const productBase = this.shop_product_base
-        const productIndex = this.shop_product_index
-        const shopProductInfo = this.shop_product_info
-        // 商品卖点
-        this.productForm.product_tips = productBase.product_tips
-        // 视频地址
-        this.productForm.product_video = productBase.product_video
-        // 运费设置id
-        let transportTypeId = productBase.transport_type_id
-        let transports = this.transports
-        if (!transportTypeId && transports && transports.length > 0) {
-          this.productForm.transport_type_id = transports[0].transport_type_id
         } else {
-          this.productForm.transport_type_id = transportTypeId
-        }
-        // 商品状态
-        this.productForm.product_state_id = productBase.product_state_id
-
-        // 发售日期
-        this.productForm.product_sale_time = productBase.product_sale_time
-        //
-        this.productForm.product_inventory_lock =
-          productBase.product_inventory_lock
-        this.productForm.product_name = productIndex.product_name
-        this.productForm.product_number = productIndex.product_number
-        this.productForm.kind_id = productIndex.kind_id
-        this.productForm.payment_type_id = productIndex.payment_type_id
-        this.productForm.product_buy_limit = shopProductInfo.product_buy_limit
-        // 初始化商品的品牌
-        this.checkBrand = this.shop_product_index.brand_id
-      },
-      // 获取其它图片集合
-      getOtherImage(color_id) {
-        const productImage = this.getProductImage(color_id)
-        if (!productImage) return []
-        const strImageOther = productImage.item_image_other
-        if (strImageOther) {
-          return strImageOther.split(',')
-        }
-        return []
-      },
-      // 获取主图
-      getMainImage(color_id) {
-        const productImage = this.getProductImage(color_id)
-        if (!productImage) return ''
-        return productImage.item_image_default
-      },
-      // 获取图片对象
-      getProductImage(color_id) {
-        const productImages = this.shop_product_image
-        for (let i = 0; i < productImages.length; i++) {
-          const colorId = productImages[i].color_id
-          if (color_id === colorId) {
-            return productImages[i]
+          if (shop_product_image) {
+            let image = shop_product_image[0]
+            obj.main_color_img = image.item_image_default
+            let other = image.item_image_other
+            if (other) {
+              obj.color_img = other.split(',')
+            } else {
+              obj.color_img = []
+            }
+            // 控件图片回显属性（固定格式[{url:''}]）
+            obj.colorImg = obj.color_img.map((item) => {
+              return {
+                url: item,
+              }
+            })
           }
         }
-        return null
-      },
-      // 根据 spec_id 和 spec_item_id 获取items
-      getSpecItemByIds(spec_id, idsArr) {
-        const specs = this.specs
-        let itemArr = []
-        let items = []
-        for (let i = 0; i < specs.length; i++) {
-          if (specs[i].spec_id === spec_id) {
-            items = specs[i].specItems
+
+        spec_item_ids.sort(function (a, b) {
+          return a - b
+        })
+        let spec_item_ids_str = spec_item_ids.join('-')
+
+        obj['siid'] = spec_item_ids_str
+
+        tmpSpecData.push(obj)
+        //this.specData.push(obj)
+      })
+
+      this.specData = Object.assign([], tmpSpecData)
+      this.allSpecData = Object.assign([], this.specData)
+    },
+    initDetail() {
+      const productDetail = this.shop_product_detail
+      // 售后服务
+      this.detailForm.product_service = productDetail.product_service
+      // 规格参数
+      this.detailForm.product_param = productDetail.product_param
+      // 商品描述
+      this.detailForm.product_detail = productDetail.product_detail
+      // 商品标签
+      const productTags = productDetail.product_tags
+      if (productTags !== 'null' && productTags) {
+        this.detailForm.product_tags = productTags.split(',').map(Number)
+      }
+    },
+    initProduct() {
+      const productBase = this.shop_product_base
+      const productIndex = this.shop_product_index
+      const shopProductInfo = this.shop_product_info
+      // 商品卖点
+      this.productForm.product_tips = productBase.product_tips
+      // 视频地址
+      this.productForm.product_video = productBase.product_video
+      // 运费设置id
+      let transportTypeId = productBase.transport_type_id
+      let transports = this.transports
+      if (!transportTypeId && transports && transports.length > 0) {
+        this.productForm.transport_type_id = transports[0].transport_type_id
+      } else {
+        this.productForm.transport_type_id = transportTypeId
+      }
+      // 商品状态
+      this.productForm.product_state_id = productBase.product_state_id
+
+      // 发售日期
+      this.productForm.product_sale_time = productBase.product_sale_time
+      //
+      this.productForm.product_inventory_lock =
+        productBase.product_inventory_lock
+      this.productForm.product_name = productIndex.product_name
+      this.productForm.product_number = productIndex.product_number
+      this.productForm.kind_id = productIndex.kind_id
+      this.productForm.payment_type_id = productIndex.payment_type_id
+      this.productForm.product_buy_limit = shopProductInfo.product_buy_limit
+      // 初始化商品的品牌
+      this.checkBrand = this.shop_product_index.brand_id
+    },
+    // 获取其它图片集合
+    getOtherImage(color_id) {
+      const productImage = this.getProductImage(color_id)
+      if (!productImage) return []
+      const strImageOther = productImage.item_image_other
+      if (strImageOther) {
+        return strImageOther.split(',')
+      }
+      return []
+    },
+    // 获取主图
+    getMainImage(color_id) {
+      const productImage = this.getProductImage(color_id)
+      if (!productImage) return ''
+      return productImage.item_image_default
+    },
+    // 获取图片对象
+    getProductImage(color_id) {
+      const productImages = this.shop_product_image
+      for (let i = 0; i < productImages.length; i++) {
+        const colorId = productImages[i].color_id
+        if (color_id === colorId) {
+          return productImages[i]
+        }
+      }
+      return null
+    },
+    // 根据 spec_id 和 spec_item_id 获取items
+    getSpecItemByIds(spec_id, idsArr) {
+      const specs = this.specs
+      let itemArr = []
+      let items = []
+      for (let i = 0; i < specs.length; i++) {
+        if (specs[i].spec_id === spec_id) {
+          items = specs[i].specItems
+          break
+        }
+      }
+      for (let i = 0; i < idsArr.length; i++) {
+        for (let j = 0; j < items.length; j++) {
+          const item = items[j]
+          if (item.spec_item_id === idsArr[i]) {
+            itemArr.push(item)
             break
           }
         }
-        for (let i = 0; i < idsArr.length; i++) {
-          for (let j = 0; j < items.length; j++) {
-            const item = items[j]
-            if (item.spec_item_id === idsArr[i]) {
-              itemArr.push(item)
-              break
-            }
-          }
-        }
-        return itemArr
-      },
-      close() {
-        this.reset()
-        this.dialogFormVisible = false
-      },
-      reset() {
-        this.batchObj = {
-          item_is_default: false,
-          item_enable: 1001,
-          item_market_price: undefined,
-          item_unit_price: undefined,
-          item_unit_points: undefined,
-          item_quantity: undefined,
-          item_purchase_price: undefined,
-          item_purchase_rate: undefined,
-          item_sales_rate: undefined,
-        }
-        this.productForm = {
-          product_sale_time: '',
-          product_video: '',
-          product_buy_limit: undefined,
-          product_number: '',
-          kind_id: 1201,
-          product_name: '',
-          product_inventory_lock: 1001,
-          product_state_id: 1002,
-          contract_type_ids: [],
-          product_transport_id: [],
+      }
+      return itemArr
+    },
+    close() {
+      this.reset()
+      this.dialogFormVisible = false
+    },
+    reset() {
+      this.batchObj = {
+        item_is_default: false,
+        item_enable: 1001,
+        item_market_price: undefined,
+        item_unit_price: undefined,
+        item_unit_points: undefined,
+        item_quantity: undefined,
+        item_purchase_price: undefined,
+        item_purchase_rate: undefined,
+        item_sales_rate: undefined,
+      }
+      this.productForm = {
+        product_sale_time: '',
+        product_video: '',
+        product_buy_limit: undefined,
+        product_number: '',
+        kind_id: 1201,
+        product_name: '',
+        product_inventory_lock: 1001,
+        product_state_id: 1002,
+        contract_type_ids: [],
+        product_transport_id: [],
 
-          transport_type_id: undefined,
-          store_category_ids: [],
-          product_service: '',
-          product_param: '',
-          product_detail: '',
-          product_id: undefined,
-          product_tips: '',
-        }
-        this.validForm = {
-          product_valid_period: 1001,
-          product_valid_type: 1001,
-          product_service_date_flag: 0,
-          product_service_contactor_flag: 1,
-        }
-        this.detailForm = {
-          product_detail: '',
-          product_tags: [],
-        }
-        this.specData = []
-        this.checkBrand = undefined
-      },
-      save() {
-        // 校验字段
-        if (!this.productForm.product_name) {
-          this.$baseMessage('请输入商品名称！', 'error')
+        transport_type_id: undefined,
+        store_category_ids: [],
+        product_service: '',
+        product_param: '',
+        product_detail: '',
+        product_id: undefined,
+        product_tips: '',
+      }
+      this.validForm = {
+        product_valid_period: 1001,
+        product_valid_type: 1001,
+        product_service_date_flag: 0,
+        product_service_contactor_flag: 1,
+      }
+      this.detailForm = {
+        product_detail: '',
+        product_tags: [],
+      }
+      this.specData = []
+      this.checkBrand = undefined
+    },
+    save() {
+      // 校验字段
+      if (!this.productForm.product_name) {
+        this.$baseMessage('请输入商品名称！', 'error')
+        return
+      }
+
+      this.creProductSpec()
+      this.parColorImg()
+
+      let assistArr = this.assistArr
+      let checkBrand = this.checkBrand
+      let detailForm = this.detailForm
+      let productForm = this.productForm
+      let validForm = this.validForm
+      let assistsIndex = this.getProductAssistsIndex()
+
+      // 格式化日期
+      if (productForm.product_sale_time) {
+        productForm.product_sale_time = renderTime(
+          productForm.product_sale_time
+        )
+      }
+      if (validForm.product_validity_end) {
+        validForm.product_validity_end = renderTime(
+          validForm.product_validity_end
+        )
+      }
+
+      let productObj = {
+        assistsIndex: assistsIndex,
+        brand_id: checkBrand ? checkBrand : 0,
+        assists: assistArr ? assistArr : '',
+        productDetail: detailForm ? detailForm : '',
+        productBase: productForm ? productForm : '',
+        productSpec: this.getProductSpec(),
+        valid: validForm ? validForm : '',
+      }
+      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
+        ) {
+          this.$baseMessage('商品零售价及积分不能同时为0', 'warning')
           return
         }
 
-        this.creProductSpec()
-        this.parColorImg()
-
-        let assistArr = this.assistArr
-        let checkBrand = this.checkBrand
-        let detailForm = this.detailForm
-        let productForm = this.productForm
-        let validForm = this.validForm
-        let assistsIndex = this.getProductAssistsIndex()
-
-        // 格式化日期
-        if (productForm.product_sale_time) {
-          productForm.product_sale_time = renderTime(
-            productForm.product_sale_time
-          )
+        if (
+          this.configs.config.supplier_market_enable &&
+          2 == this.configs.store_type &&
+          specData[i].item_advice_price <= 0
+        ) {
+          this.$baseMessage('商品建议零售价不能为0', 'warning')
+          return
         }
-        if (validForm.product_validity_end) {
-          validForm.product_validity_end = renderTime(
-            validForm.product_validity_end
-          )
-        }
-
-        let productObj = {
-          assistsIndex: assistsIndex,
-          brand_id: checkBrand ? checkBrand : 0,
-          assists: assistArr ? assistArr : '',
-          productDetail: detailForm ? detailForm : '',
-          productBase: productForm ? productForm : '',
-          productSpec: this.getProductSpec(),
-          valid: validForm ? validForm : '',
-        }
-        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) {
-            this.$baseMessage('商品零售价及积分不能同时为0', 'warning')
-            return
-          }
-
-          if (this.configs.config.supplier_market_enable && 2 == this.configs.store_type && specData[i].item_advice_price <= 0) {
-            this.$baseMessage('商品建议零售价不能为0', 'warning')
-            return
-          }
-        }
-        this.saveProduct(
-          JSON.stringify(productObj),
-          JSON.stringify(this.specData)
-        )
-      },
-      async getxfz() {
-        const { data } = await getxfz()
-        this.roleList = data.items
-      },
-      // 将colorImg 数组格式保存为color_img json格式
-      parColorImg() {
-        // 处理列合并导致后面 color_img 数据为空
-        const specData = this.specData
-        if (specData.length > 2) {
-          let img = specData[0].color_img
-          // 有image 类型的spec时，并且被选中了
-          let element = this.getFirstImageSpec()
-          if (element) {
-            // image 类型spec id
-            for (let i = 1; i <= specData.length - 1; i++) {
-              if (specData[i - 1][element] === specData[i][element]) {
-                specData[i].color_img = img
-                continue
-              }
-              img = specData[i].color_img
-            }
-          } else {
-            // 没有image 类型的spec被选中
-            specData.forEach((item, index) => {
-              item.color_img = img
-            })
-          }
-        }
-      },
-      closeTableVisible() {
-        this.specId = undefined
-        this.tableVisible = false
-      },
-      async getType(type_id, productId) {
-        const { data } = await get({ type_id: type_id, product_id: productId })
-        this.brands = data.brands
-        this.assists = data.assists
-        this.specs = data.specs
-        // 维护image类型的spec
-        // this.initSpecImageList()
-        // // 动态添加vue 属性
-        this.initAssistArr(this.assists)
-        this.initCheckSpecArr(this.specs)
-      },
-      // 初始化vue属性 assistArr
-      initAssistArr(assists) {
-        if (!assists) return
-        assists.forEach((assist) => {
-          const assist_id = assist.assist_id
-          let assist_format = assist.assist_format
-          if (assist_format === 'text' || assist_format === 'radio') {
-            this.$set(this.assistArr, assist_id, '')
-          } else {
-            this.$set(this.assistArr, assist_id, [])
-          }
-        })
-      },
-      // 初始化vue属性 checkSpec
-      initCheckSpecArr(specs) {
-        // if (!specs) {
-        //   // 当specs为null 时初始化specData数据（specs为null 不能触发watch 监控事件）
-        //   this.creSpecData([])
-        //   return
-        // }
-        specs.forEach((spec) => {
-          const spec_id = spec.spec_id
-          this.$set(this.checkSpec, spec_id, [])
-        })
-      },
-      // 获取 shop_product_index，shop_product_item，shop_product_detail，shop_product_image
-      async getProductInfo(product_id) {
-        const { data } = await productInfoByPid({
-          product_id: product_id,
-        })
-        this.shop_product_index = data.shop_product_index
-        this.handleShopProductIndex(this.shop_product_index)
-        this.shop_product_info = data.shop_product_info
-        this.shop_product_detail = data.shop_product_detail
-        this.shop_product_image = data.shop_product_image
-        this.shop_product_assist_index = data.shop_product_assist_index
-        if (this.shop_product_index.kind_id === 1202) {
-          this.shop_product_valid_period = data.shop_product_valid_period
-        }
-      },
-      // 获取 shop_product_item
-      async getProductItem(product_id) {
-        const { data } = await getItemListByPid({
-          product_id: product_id,
-        })
-        this.shop_product_item = data
-      },
-      async getCategory(category_id) {
-        const { data } = await getCategory({ category_id: Number(category_id) })
-        this.productForm.category_id = data.category_id
-        this.productForm.category_name = data.category_name
-      },
-      async getPayCardTypes() {
-        var that = this
-        let params = {
-          pay_type: 2,
-        }
-        const { data } = await getPayCardTypes(params)
-        this.paycardTypes = data
-      },
-      async getCouponCardTypes() {
-        var that = this
-        let params = {
-          pay_type: 3,
-        }
-        const { data } = await getPayCardTypes(params)
-        this.couponCardTypes = data
-      },
-      async getCouponsFun() {
-        var that = this
-        let params = {
-          activity_type_id: 1105,
-          activity_type: 3,
-        }
-        const { data } = await getCouponsList(params)
-        this.activityArr = data
-      },
-      async getTransports() {
-        const { data } = await transports()
-        this.transports = data
-      },
-      async getStoreCategoryTree() {
-        const { data } = await getStoreCategoryTree()
-        this.storeCategoryTree = data
-      },
-      async getCategoryTree() {
-        const { data } = await getCategoryTree()
-
-        const treeData = this.tree(data);
-        console.info(treeData)
-        //遍历，将空子集设置为null
-        this.categoryOptions = treeData;
-      },
-
-      tree(data) {
-        for (let i = 0; i < data.length; 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);
-          } else {
-            delete item.sub;
-          }
-        }
-
-        return data
-      },
-      findTree(data, idx) {
-        for (let i = 0; i < data.length; i++) {
-          let item = data[i];
-
-          if (item.category_id == idx) {
-            return item
-          }
-
-          // item.sub 不等于 undefined && item.sub.length 大于 0 时
-          if (item.sub && item.sub.length > 0) {
-            const tmp =  this.findTree(item.sub, idx);
-            if (tmp != null) {
-              return tmp;
-            }
-          }
-        }
-
-        return null
-      },
-      async getProductTags() {
-        const { data } = await tags({ pageSize: 500 })
-        this.productTags = data.items
-      },
-      async saveProduct(productObj, productItems) {
-        this.$refs['productForm'].validate(async (valid) => {
-          if (valid) {
-            this.loading = true
-            this.saveBtnLoading = true
-            const { msg, status } = await saveProduct({
-              productObj: productObj,
-              productItems: productItems,
-            })
-            this.loading = false
-            this.saveBtnLoading = false
-            if (200 == status) {
-              this.$baseMessage(msg, 'success')
-            } else {
-              this.$baseMessage(msg, 'error')
-            }
-            this.close()
-            this.$emit('fetch-data')
-          }
-        })
-      },
-      handleShopProductIndex(shop_product_index) {
-        let storeCategoryIds = shop_product_index.store_category_ids
-        if (storeCategoryIds) {
-          this.productForm.store_category_ids = storeCategoryIds
-            .split(',')
-            .map(Number)
-          console.log(this.productForm.store_category_ids)
-        }
-        let contractTypeIds = this.shop_product_index.contract_type_ids
-        if (contractTypeIds) {
-          this.productForm.contract_type_ids = contractTypeIds
-            .split(',')
-            .map(Number)
-        }
-        let productTransportId = this.shop_product_index.product_transport_id
-        if (productTransportId) {
-          this.productForm.product_transport_id = productTransportId
-            .split(',')
-            .map((item) => Number(item))
-        }
-        let voucherActivityId = shop_product_index.voucher_activity_id
-        if (voucherActivityId) {
-          this.productForm.voucher_activity_id = Number(voucherActivityId)
-        } else {
-          this.productForm.voucher_activity_id = ''
-        }
-        // if (voucherActivityId) {
-        //   this.productForm.voucher_activity_id = voucherActivityId
-        //     .split(',')
-        //     .map(Number)
-        // } else {
-        //   this.productForm.voucher_activity_id = '';
-        // }
-        let couponTypeId = shop_product_index.coupon_type_id
-        console.log(couponTypeId)
-        if (couponTypeId) {
-          this.productForm.coupon_type_id = couponTypeId
-        } else {
-          this.productForm.coupon_type_id = ''
-        }
-
-        if (shop_product_index.card_type_id != 0) {
-          this.productForm.card_type_id = shop_product_index.card_type_id
-        }
-        this.productForm.store_id = shop_product_index.store_id
-      },
-      // 获取product_spec
-      getProductSpec() {
-        let specs = Object.values(this.checkSpec).filter(
-          (item) => item.length > 0
-        )
-        const specsArr = []
-        specs.forEach((spec) => {
-          const specId = spec[0].spec_id
-          const sp = this.specs.find((item) => item.spec_id === specId)
-          const obj = {
-            id: sp.spec_id,
-            name: sp.spec_name,
-            item: [],
-            spec_format: sp.spec_format,
-          }
-          spec.forEach((item) => {
-            const itemObj = {
-              id: item.spec_item_id,
-              name: item.spec_item_name,
-            }
-            obj.item.push(itemObj)
-          })
-          specsArr.push(obj)
-        })
-
-        //重新排序
-        const arr = []
-        this.specs.forEach((spec) => {
-          let spec_id = spec.spec_id
-
-          specsArr.forEach((sa) => {
-            let id = sa.id
-            if (spec_id == id) {
-              arr.push(sa)
-            }
-          })
-        })
-
-        return arr ? arr : ''
-      },
-      // 获取 item_spec
-      creProductSpec() {
-        let head = this.getSpecHead()
-        this.specData.forEach((row) => {
-          const objs = []
-          head.forEach((spec) => {
-            let spec_id = spec.spec_id
-            let specItems = spec.specItems
-            let spec_item = specItems.find((item) => {
-              let spec_item_id = item.spec_item_id
-              let id = spec_id + '_' + spec_item_id
-              return spec_item_id === row[id]
-            })
-            if (spec_item) {
-              let obj = {
-                id: spec_id,
-                name: spec.spec_name,
-                item: {
-                  id: spec_item.spec_item_id,
-                  name: row[spec.spec_id],
-                },
-              }
-              objs.push(obj)
-            }
-          })
-          const objStr = JSON.stringify(objs)
-          row.product_spec = objStr
-        })
-      },
-      // 获取选中的表头字段集合（选中的spec对象）
-      getSpecHead() {
-        let head = Object.values(this.checkSpec)
-          .filter((item) => item.length > 0)
-          .map((item) => item[0].spec_id)
-        const headObj = []
-        this.specs.forEach((spec) => {
-          head.forEach((item) => {
-            if (spec.spec_id === item) {
-              headObj.push(spec)
-            }
-          })
-        })
-        return headObj
-      },
-
-      // 获取选中的表头宽度
-      getItemWidth (property)  {
-        let width = null
-
-        switch (property) {
-          case 'main_color_img':
-            width = 80
-            break
-          case 'color_img':
-            width = null
-            break
-          case 'item_barcode':
-            width = 120
-            break
-          case 'item_advice_price':
-            width = 120
-            break
-          case 'item_weight':
-          case 'item_market_price':
-          case 'item_unit_price':
-          case 'item_unit_points':
-          case 'item_quantity':
-            width = 100
-            break
-          case 'item_enable':
-          case 'item_is_default':
-            width = 90
-            break
-          default:
-            width = 120
-            break
-        }
-
-        return width
-      },
-
-      batOper (e) {
-        const key = e.target.dataset.key;
-        let title = "";
-        if (key == "item_market_price") {
-          title =  this.__('批量设置市场价');
-        } else if (key == "item_unit_price") {
-          title =  this.__('批量设置价格');
-        } else if (key == "item_unit_points") {
-          title =  this.__('批量设置积分');
-        } else if (key == "item_quantity") {
-          title =  this.__('批量设置库存');
-        } else if (key == "item_weight") {
-          title =  this.__('批量设置重量');
-        } else if (key == "item_advice_price") {
-          title =  this.__('批量设置建议零售价');
-        }
-
-        this.$prompt(title, {
-          confirmButtonText: this.__('确定'),
-          cancelButtonText: this.__('取消'),
-        })
-          .then(({ value }) => {
-            if (value) {
-              this.specData.forEach((item, index) => {
-                this.specData[index][key] = Number(value) || ''
-
-                this.$forceUpdate()
-              })
-            }
-
-            this.$forceUpdate()
-          })
-          .catch(() => {})
-      },
+      }
+      this.saveProduct(
+        JSON.stringify(productObj),
+        JSON.stringify(this.specData)
+      )
     },
-  }
+    async getxfz() {
+      const { data } = await getxfz()
+      this.roleList = data.items
+    },
+    // 将colorImg 数组格式保存为color_img json格式
+    parColorImg() {
+      // 处理列合并导致后面 color_img 数据为空
+      const specData = this.specData
+      if (specData.length > 2) {
+        let img = specData[0].color_img
+        // 有image 类型的spec时，并且被选中了
+        let element = this.getFirstImageSpec()
+        if (element) {
+          // image 类型spec id
+          for (let i = 1; i <= specData.length - 1; i++) {
+            if (specData[i - 1][element] === specData[i][element]) {
+              specData[i].color_img = img
+              continue
+            }
+            img = specData[i].color_img
+          }
+        } else {
+          // 没有image 类型的spec被选中
+          specData.forEach((item, index) => {
+            item.color_img = img
+          })
+        }
+      }
+    },
+    closeTableVisible() {
+      this.specId = undefined
+      this.tableVisible = false
+    },
+    async getType(type_id, productId) {
+      const { data } = await get({ type_id: type_id, product_id: productId })
+      this.brands = data.brands
+      this.assists = data.assists
+      this.specs = data.specs
+      // 维护image类型的spec
+      // this.initSpecImageList()
+      // // 动态添加vue 属性
+      this.initAssistArr(this.assists)
+      this.initCheckSpecArr(this.specs)
+    },
+    // 初始化vue属性 assistArr
+    initAssistArr(assists) {
+      if (!assists) return
+      assists.forEach((assist) => {
+        const assist_id = assist.assist_id
+        let assist_format = assist.assist_format
+        if (assist_format === 'text' || assist_format === 'radio') {
+          this.$set(this.assistArr, assist_id, '')
+        } else {
+          this.$set(this.assistArr, assist_id, [])
+        }
+      })
+    },
+    // 初始化vue属性 checkSpec
+    initCheckSpecArr(specs) {
+      // if (!specs) {
+      //   // 当specs为null 时初始化specData数据（specs为null 不能触发watch 监控事件）
+      //   this.creSpecData([])
+      //   return
+      // }
+      specs.forEach((spec) => {
+        const spec_id = spec.spec_id
+        this.$set(this.checkSpec, spec_id, [])
+      })
+    },
+    // 获取 shop_product_index，shop_product_item，shop_product_detail，shop_product_image
+    async getProductInfo(product_id) {
+      const { data } = await productInfoByPid({
+        product_id: product_id,
+      })
+      this.shop_product_index = data.shop_product_index
+      this.handleShopProductIndex(this.shop_product_index)
+      this.shop_product_info = data.shop_product_info
+      this.shop_product_detail = data.shop_product_detail
+      this.shop_product_image = data.shop_product_image
+      this.shop_product_assist_index = data.shop_product_assist_index
+      if (this.shop_product_index.kind_id === 1202) {
+        this.shop_product_valid_period = data.shop_product_valid_period
+      }
+    },
+    // 获取 shop_product_item
+    async getProductItem(product_id) {
+      const { data } = await getItemListByPid({
+        product_id: product_id,
+      })
+      this.shop_product_item = data
+    },
+    async getCategory(category_id) {
+      const { data } = await getCategory({ category_id: Number(category_id) })
+      this.productForm.category_id = data.category_id
+      this.productForm.category_name = data.category_name
+    },
+    async getPayCardTypes() {
+      var that = this
+      let params = {
+        pay_type: 2,
+      }
+      const { data } = await getPayCardTypes(params)
+      this.paycardTypes = data
+    },
+    async getCouponCardTypes() {
+      var that = this
+      let params = {
+        pay_type: 3,
+      }
+      const { data } = await getPayCardTypes(params)
+      this.couponCardTypes = data
+    },
+    async getCouponsFun() {
+      var that = this
+      let params = {
+        activity_type_id: 1105,
+        activity_type: 3,
+      }
+      const { data } = await getCouponsList(params)
+      this.activityArr = data
+    },
+    async getTransports() {
+      const { data } = await transports()
+      this.transports = data
+    },
+    async getStoreCategoryTree() {
+      const { data } = await getStoreCategoryTree()
+      this.storeCategoryTree = data
+    },
+    async getCategoryTree() {
+      const { data } = await getCategoryTree()
+
+      const treeData = this.tree(data)
+      console.info(treeData)
+      //遍历，将空子集设置为null
+      this.categoryOptions = treeData
+    },
+
+    tree(data) {
+      for (let i = 0; i < data.length; 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)
+        } else {
+          delete item.sub
+        }
+      }
+
+      return data
+    },
+    findTree(data, idx) {
+      for (let i = 0; i < data.length; i++) {
+        let item = data[i]
+
+        if (item.category_id == idx) {
+          return item
+        }
+
+        // item.sub 不等于 undefined && item.sub.length 大于 0 时
+        if (item.sub && item.sub.length > 0) {
+          const tmp = this.findTree(item.sub, idx)
+          if (tmp != null) {
+            return tmp
+          }
+        }
+      }
+
+      return null
+    },
+    async getProductTags() {
+      const { data } = await tags({ pageSize: 500 })
+      this.productTags = data.items
+    },
+    async saveProduct(productObj, productItems) {
+      this.$refs['productForm'].validate(async (valid) => {
+        if (valid) {
+          this.loading = true
+          this.saveBtnLoading = true
+          const { msg, status } = await saveProduct({
+            productObj: productObj,
+            productItems: productItems,
+          })
+          this.loading = false
+          this.saveBtnLoading = false
+          if (200 == status) {
+            this.$baseMessage(msg, 'success')
+          } else {
+            this.$baseMessage(msg, 'error')
+          }
+          this.close()
+          this.$emit('fetch-data')
+        }
+      })
+    },
+    handleShopProductIndex(shop_product_index) {
+      let storeCategoryIds = shop_product_index.store_category_ids
+      if (storeCategoryIds) {
+        this.productForm.store_category_ids = storeCategoryIds
+          .split(',')
+          .map(Number)
+        console.log(this.productForm.store_category_ids)
+      }
+      let contractTypeIds = this.shop_product_index.contract_type_ids
+      if (contractTypeIds) {
+        this.productForm.contract_type_ids = contractTypeIds
+          .split(',')
+          .map(Number)
+      }
+      let productTransportId = this.shop_product_index.product_transport_id
+      if (productTransportId) {
+        this.productForm.product_transport_id = productTransportId
+          .split(',')
+          .map((item) => Number(item))
+      }
+      let voucherActivityId = shop_product_index.voucher_activity_id
+      if (voucherActivityId) {
+        this.productForm.voucher_activity_id = Number(voucherActivityId)
+      } else {
+        this.productForm.voucher_activity_id = ''
+      }
+      // if (voucherActivityId) {
+      //   this.productForm.voucher_activity_id = voucherActivityId
+      //     .split(',')
+      //     .map(Number)
+      // } else {
+      //   this.productForm.voucher_activity_id = '';
+      // }
+      let couponTypeId = shop_product_index.coupon_type_id
+      console.log(couponTypeId)
+      if (couponTypeId) {
+        this.productForm.coupon_type_id = couponTypeId
+      } else {
+        this.productForm.coupon_type_id = ''
+      }
+
+      if (shop_product_index.card_type_id != 0) {
+        this.productForm.card_type_id = shop_product_index.card_type_id
+      }
+      this.productForm.store_id = shop_product_index.store_id
+    },
+    // 获取product_spec
+    getProductSpec() {
+      let specs = Object.values(this.checkSpec).filter(
+        (item) => item.length > 0
+      )
+      const specsArr = []
+      specs.forEach((spec) => {
+        const specId = spec[0].spec_id
+        const sp = this.specs.find((item) => item.spec_id === specId)
+        const obj = {
+          id: sp.spec_id,
+          name: sp.spec_name,
+          item: [],
+          spec_format: sp.spec_format,
+        }
+        spec.forEach((item) => {
+          const itemObj = {
+            id: item.spec_item_id,
+            name: item.spec_item_name,
+          }
+          obj.item.push(itemObj)
+        })
+        specsArr.push(obj)
+      })
+
+      //重新排序
+      const arr = []
+      this.specs.forEach((spec) => {
+        let spec_id = spec.spec_id
+
+        specsArr.forEach((sa) => {
+          let id = sa.id
+          if (spec_id == id) {
+            arr.push(sa)
+          }
+        })
+      })
+
+      return arr ? arr : ''
+    },
+    // 获取 item_spec
+    creProductSpec() {
+      let head = this.getSpecHead()
+      this.specData.forEach((row) => {
+        const objs = []
+        head.forEach((spec) => {
+          let spec_id = spec.spec_id
+          let specItems = spec.specItems
+          let spec_item = specItems.find((item) => {
+            let spec_item_id = item.spec_item_id
+            let id = spec_id + '_' + spec_item_id
+            return spec_item_id === row[id]
+          })
+          if (spec_item) {
+            let obj = {
+              id: spec_id,
+              name: spec.spec_name,
+              item: {
+                id: spec_item.spec_item_id,
+                name: row[spec.spec_id],
+              },
+            }
+            objs.push(obj)
+          }
+        })
+        const objStr = JSON.stringify(objs)
+        row.product_spec = objStr
+      })
+    },
+    // 获取选中的表头字段集合（选中的spec对象）
+    getSpecHead() {
+      let head = Object.values(this.checkSpec)
+        .filter((item) => item.length > 0)
+        .map((item) => item[0].spec_id)
+      const headObj = []
+      this.specs.forEach((spec) => {
+        head.forEach((item) => {
+          if (spec.spec_id === item) {
+            headObj.push(spec)
+          }
+        })
+      })
+      return headObj
+    },
+
+    // 获取选中的表头宽度
+    getItemWidth(property) {
+      let width = null
+
+      switch (property) {
+        case 'main_color_img':
+          width = 80
+          break
+        case 'color_img':
+          width = null
+          break
+        case 'item_barcode':
+          width = 120
+          break
+        case 'item_advice_price':
+          width = 120
+          break
+        case 'item_weight':
+        case 'item_market_price':
+        case 'item_unit_price':
+        case 'item_unit_points':
+        case 'item_quantity':
+          width = 100
+          break
+        case 'item_enable':
+        case 'item_is_default':
+          width = 90
+          break
+        default:
+          width = 120
+          break
+      }
+
+      return width
+    },
+
+    batOper(e) {
+      const key = e.target.dataset.key
+      let title = ''
+      if (key == 'item_market_price') {
+        title = this.__('批量设置市场价')
+      } else if (key == 'item_unit_price') {
+        title = this.__('批量设置价格')
+      } else if (key == 'item_unit_points') {
+        title = this.__('批量设置积分')
+      } else if (key == 'item_quantity') {
+        title = this.__('批量设置库存')
+      } else if (key == 'item_weight') {
+        title = this.__('批量设置重量')
+      } else if (key == 'item_advice_price') {
+        title = this.__('批量设置建议零售价')
+      }
+
+      this.$prompt(title, {
+        confirmButtonText: this.__('确定'),
+        cancelButtonText: this.__('取消'),
+      })
+        .then(({ value }) => {
+          if (value) {
+            this.specData.forEach((item, index) => {
+              this.specData[index][key] = Number(value) || ''
+
+              this.$forceUpdate()
+            })
+          }
+
+          this.$forceUpdate()
+        })
+        .catch(() => {})
+    },
+  },
+}
 </script>
 <style lang="scss" scoped>
-  .tit_font {
-    font-size: 21px;
-    line-height: inherit;
-    color: #333;
+.tit_font {
+  padding: 10px 0;
+  line-height: inherit;
+  font-size: 21px;
+  font-weight: bold;
+  color: #000;
+}
+
+.add-product-upload .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.add-product-upload .el-upload:hover {
+  border-color: #409eff;
+}
+
+#main-uploader-icon {
+  font-size: 14px;
+  color: #8c939d;
+  width: 50px;
+  height: 50px;
+  line-height: 50px;
+  text-align: center;
+}
+
+#add-product-color-upload .el-upload--picture-card {
+  font-size: 14px;
+  color: #8c939d;
+  width: 50px;
+  height: 50px;
+  line-height: 50px;
+  text-align: center;
+}
+
+#add-product-color-upload .el-upload-list--picture-card .el-upload-list__item,
+#add-product-color-upload .el-upload-list__item-actions {
+  width: 50px;
+  height: 50px;
+}
+
+#img-avatar {
+  font-size: 14px;
+  color: #8c939d;
+  width: 50px;
+  height: 50px;
+  line-height: 50px;
+  text-align: center;
+}
+
+#main-avatar {
+  width: 50px;
+  height: 50px;
+  display: block;
+}
+
+.quill {
+  margin-bottom: 58px;
+}
+
+::v-deep {
+  .el-dialog__body {
+    padding-top: 10px;
   }
 
-  .add-product-upload .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
+  .pic-upload-list--picture-card .pic-upload-list--item {
+    margin: 0;
+    margin: 0 5px;
+  }
+
+  .pic-upload-source {
+    padding: 0;
+
+    .pic-upload-source-box {
+      height: 50px;
+      line-height: 50px;
+    }
+  }
+
+  .pic-upload--picture-card {
+    margin: 0 5px;
+  }
+
+  .center-dialog {
+    padding-bottom: 58px;
     position: relative;
     overflow: hidden;
   }
 
-  .add-product-upload .el-upload:hover {
-    border-color: #409eff;
-  }
-
-  #main-uploader-icon {
-    font-size: 14px;
-    color: #8c939d;
-    width: 50px;
-    height: 50px;
-    line-height: 50px;
+  .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);
   }
-
-  #add-product-color-upload .el-upload--picture-card {
-    font-size: 14px;
-    color: #8c939d;
-    width: 50px;
-    height: 50px;
-    line-height: 50px;
-    text-align: center;
-  }
-
-  #add-product-color-upload .el-upload-list--picture-card .el-upload-list__item,
-  #add-product-color-upload .el-upload-list__item-actions {
-    width: 50px;
-    height: 50px;
-  }
-
-  #img-avatar {
-    font-size: 14px;
-    color: #8c939d;
-    width: 50px;
-    height: 50px;
-    line-height: 50px;
-    text-align: center;
-  }
-
-  #main-avatar {
-    width: 50px;
-    height: 50px;
-    display: block;
-  }
-
-  .quill {
-    padding-bottom: 50px;
-  }
-
-  ::v-deep {
-    .el-dialog__body{
-      padding-top: 10px;
-    }
-
-    .pic-upload-list--picture-card .pic-upload-list--item {
-      margin: 0;
-      margin: 0 5px;
-    }
-
-    .pic-upload-source{
-      padding: 0;
-
-      .pic-upload-source-box{
-        height: 50px;
-        line-height: 50px;
-      }
-    }
-
-    .pic-upload--picture-card {
-      margin: 0 5px;
-    }
-  }
+}
 </style>
diff --git a/src/views/settings/config/receiptMachine.vue b/src/views/settings/config/receiptMachine.vue
new file mode 100644
index 0000000..b00960a
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/views/store/base/cloudPrint/addCloudPrint.vue b/src/views/store/base/cloudPrint/addCloudPrint.vue
deleted file mode 100644
index 9f89cba..0000000
--- a/src/views/store/base/cloudPrint/addCloudPrint.vue
+++ /dev/null
@@ -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>
diff --git a/src/views/store/base/cloudPrint/addTemplateManagement.vue b/src/views/store/base/cloudPrint/addTemplateManagement.vue
deleted file mode 100644
index ec82334..0000000
--- a/src/views/store/base/cloudPrint/addTemplateManagement.vue
+++ /dev/null
@@ -1,1630 +0,0 @@
-<template>
-    <div class="addTemplateManagement-container">
-        <div class="block-content block-content-set">
-            <div class="title">模版信息</div>
-            <el-form ref="formSet" class="form-block" :model="form" label-width="160px">
-                <el-form-item label="模版类型" class="form-page-size-item">
-                    <el-radio-group v-model="form.resource">
-                        <el-radio class="el-item-radio" :label="1">商品订单</el-radio>
-                        <el-radio class="el-item-radio" :label="2">订单退款</el-radio>
-                        <el-radio class="el-item-radio" :label="3">核销凭证</el-radio>
-                        <el-radio class="el-item-radio" :label="4">会员充值</el-radio>
-                        <el-radio class="el-item-radio" :label="5">收银交班</el-radio>
-                    </el-radio-group>
-                    <div class="tips">商品订单模板不包含礼品卡、酒店、知识付费、会员卡等非商品类型的订单打印；<br>模板创建后，类型将不可更改。</div>
-                </el-form-item>
-                <el-form-item label="模版名称" prop="tepName" :rules="{ required: true, message: '请输入模版名称', trigger: 'blur' }">
-                  <el-input v-model="form.tepName" :maxlength="20" placeholder="请输入模版名称" size="medium" show-word-limit></el-input>
-              </el-form-item>
-            </el-form>
-        </div>
-        <div class="content-container">
-            <div class="block-left">
-                <div class="title">模板编辑</div>
-                <div class="block-box">
-                    <div class="block-item">
-                        <div class="box-title">票头</div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['header_info']['template_status']" :true-label="1" :false-label="0" size="medium">小票名称</el-checkbox>
-                            <el-input class="receipt-input" v-model="printData['header_info']['template_name']" :maxlength="20" placeholder="请输入小票名称" size="medium" show-word-limit></el-input>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['header_info']['template_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['header_info']['template_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['header_info']['shop_name']" :true-label="1" :false-label="0" size="medium">商城名称（门店）</el-checkbox>                          
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['header_info']['shop_name_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['header_info']['shop_name_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>      
-                        </div>
-                        <div class="tips">多门店模式下，此处将显示下单门店的门店名称。</div>
-                        <div class="block-group" v-show="form.resource == 3">
-                            <el-checkbox class="group-checkbox-2" v-model="printData['header_info']['write_off_name']" :true-label="1" :false-label="0" size="medium">核销员名称</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['header_info']['write_off_time']" :true-label="1" :false-label="0" size="medium">核销时间</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['header_info']['order_no']" :true-label="1" :false-label="0" size="medium">订单编号</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['header_info']['write_off_type']" :true-label="1" :false-label="0" size="medium">核销类型</el-checkbox>
-                        </div>
-                        <div class="block-group" v-show="form.resource == 5">
-                            <el-checkbox class="group-checkbox-2" v-model="printData['header_info']['open_time']" :true-label="1" :false-label="0" size="medium">营业时间</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['header_info']['print_time']" :true-label="1" :false-label="0" size="medium">打印时间</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['header_info']['print_people']" :true-label="1" :false-label="0" size="medium">打印人</el-checkbox>
-                        </div>
-                        <div class="block-group" v-show="[1,2].includes(form.resource)">
-                            <el-checkbox class="group-checkbox" v-model="printData['header_info']['gen_num']" :true-label="1" :false-label="0" size="medium">取单号</el-checkbox>                          
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['header_info']['gen_num_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['header_info']['gen_num_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>      
-                        </div>
-                        <div class="block-group" v-show="form.resource == 1">
-                            <el-checkbox class="group-checkbox" v-model="printData['header_info']['order_sort']" :true-label="1" :false-label="0" size="medium">订单顺序号（日）</el-checkbox>                          
-                            <div class="block-select">
-                                <div class="block-select-name">前缀</div>
-                                <el-input class="receipt-input" v-model="printData['header_info']['order_sort_prefix']" :maxlength="4" placeholder="请输入订单顺序号（日）" size="medium" show-word-limit></el-input>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name" style="width: 100px;">排序订单</div>
-                                <el-select class="select-box" v-model="printData['header_info']['order_sort_type']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sortOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>     
-                        </div>
-                        <div class="block-group" v-show="form.resource == 1">
-                            <div class="group-checkbox"></div>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['header_info']['order_sort_font_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['header_info']['order_sort_font_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div> 
-                        </div>
-                        <div class="tips" v-show="form.resource == 1">每个自然日根据订单的付款时间所记录的有序自增编号，从001开始记录，每天0点重置。</div>
-                        <div class="block-group" v-show="[1,2].includes(form.resource)">
-                            <el-checkbox class="group-checkbox" v-model="printData['header_info']['quick_buy']" :true-label="1" :false-label="0" size="medium">快速购买渠道</el-checkbox>                          
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['header_info']['quick_buy_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['header_info']['quick_buy_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>      
-                        </div>
-                        <div class="tips" v-show="[1,2].includes(form.resource)">仅通过扫描快速购买渠道二维码产生的订单才会显示。</div>
-                        <div class="block-group" v-show="form.resource == 1">
-                            <el-checkbox class="group-checkbox" v-model="printData['header_info']['customer_mark']" :true-label="1" :false-label="0" size="medium">买家备注</el-checkbox>                          
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['header_info']['customer_mark_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['header_info']['customer_mark_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>      
-                        </div>
-                        <div class="block-group" v-show="form.resource == 1">
-                            <el-checkbox class="group-checkbox" v-model="printData['header_info']['selfsend_time']" :true-label="1" :false-label="0" size="medium">自提/配送时间</el-checkbox>                          
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['header_info']['selfsend_time_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['header_info']['selfsend_time_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>      
-                        </div>
-                        <div class="tips" v-show="form.resource == 1">仅同城、自提方式的实体订单会显示该时间信息。</div>
-                    </div>
-                </div>
-                <div class="block-box" v-show="form.resource == 4">
-                    <div class="block-item">
-                        <div class="box-title">充值信息</div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['recharge_info']['recharge_money']" :true-label="1" :false-label="0" size="medium" disabled>充值金额</el-checkbox>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['recharge_info']['recharge_money_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['recharge_info']['recharge_money_blod']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['recharge_info']['send_money']" :true-label="1" :false-label="0" size="medium">赠送金额</el-checkbox>                          
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['recharge_info']['send_money_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['recharge_info']['send_money_blod']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>      
-                        </div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['recharge_info']['customer_balance']" :true-label="1" :false-label="0" size="medium">账户余额</el-checkbox>                          
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['recharge_info']['customer_balance_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['recharge_info']['customer_balance_blod']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>      
-                        </div>
-                    </div>                        
-                </div>
-                <div class="block-box" v-show="form.resource == 5">
-                    <div class="block-item">
-                        <div class="box-title">收银员信息</div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox-1" v-model="printData['stand_info']['name']" :true-label="1" :false-label="0" size="medium">员工名称</el-checkbox>
-                            <el-checkbox class="group-checkbox-1" v-model="printData['stand_info']['start_time']" :true-label="1" :false-label="0" size="medium">开始时间</el-checkbox>
-                            <el-checkbox class="group-checkbox-1" v-model="printData['stand_info']['end_time']" :true-label="1" :false-label="0" size="medium">结束时间</el-checkbox>
-                        </div>
-                    </div>                        
-                </div>
-                <div class="block-box" v-show="form.resource == 5">
-                    <div class="block-item">
-                        <div class="box-title">日结营业汇总</div>
-                        <div class="block-group">
-                            <div class="block-group" style="margin: 0;padding: 0;">
-                                <el-checkbox class="group-checkbox-2" v-model="printData['finish_info']['all']" :true-label="1" :false-label="0" size="medium">总交易额</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['finish_info']['pay_order_count']" :true-label="1" :false-label="0" size="medium">支付订单数</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['finish_info']['sale_goods_count']" :true-label="1" :false-label="0" size="medium">出售商品件数</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['finish_info']['card_price']" :true-label="1" :false-label="0" size="medium">会员卡交易额</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['finish_info']['recharge_money_price']" :true-label="1" :false-label="0" size="medium">余额充值金额</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['finish_info']['refund_price']" :true-label="1" :false-label="0" size="medium">退款金额</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['finish_info']['refund_order_count']" :true-label="1" :false-label="0" size="medium">退款订单数</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['finish_info']['refund_goods_count']" :true-label="1" :false-label="0" size="medium">退款件数</el-checkbox>
-                            </div>
-                        </div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['finish_info']['real_money']" :true-label="1" :false-label="0" size="medium">实营收额</el-checkbox>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['finish_info']['real_money_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['finish_info']['real_money_blod']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>                         
-                        </div>
-                    </div>         
-                </div>
-                <div class="block-box" v-show="form.resource == 5">
-                    <div class="block-item">
-                        <div class="box-title">支付方式组成</div>
-                        <div class="block-group">
-                            <div class="block-group" style="margin: 0;padding: 0;">
-                                <el-checkbox class="group-checkbox-2" v-model="printData['pay_type_info']['wechat']" :true-label="1" :false-label="0" size="medium">微信</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['pay_type_info']['ali']" :true-label="1" :false-label="0" size="medium">支付宝</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['pay_type_info']['cash']" :true-label="1" :false-label="0" size="medium">现金</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['pay_type_info']['balance']" :true-label="1" :false-label="0" size="medium">余额</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['pay_type_info']['other']" :true-label="1" :false-label="0" size="medium">其他线下方式</el-checkbox>
-                            </div>
-                        </div>
-                    </div>         
-                </div>
-                <div class="block-box" v-show="form.resource == 5">
-                    <div class="block-item">
-                        <div class="box-title">核销记录</div>
-                        <div class="block-group">
-                            <div class="block-group" style="margin: 0;padding: 0;">
-                                <el-checkbox class="group-checkbox-2" v-model="printData['checkstand_writeoff']['self']" :true-label="1" :false-label="0" size="medium">自提订单</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['checkstand_writeoff']['virtual']" :true-label="1" :false-label="0" size="medium">虚拟核销订单</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['checkstand_writeoff']['timegoods']" :true-label="1" :false-label="0" size="medium">计次时卡券</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['checkstand_writeoff']['booking']" :true-label="1" :false-label="0" size="medium">预约到店</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['checkstand_writeoff']['giftpackage']" :true-label="1" :false-label="0" size="medium">礼包商品</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['checkstand_writeoff']['coupon']" :true-label="1" :false-label="0" size="medium">优惠券</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['checkstand_writeoff']['hotel']" :true-label="1" :false-label="0" size="medium">酒店预订</el-checkbox>
-                            </div>
-                        </div>
-                    </div>         
-                </div>
-                <div class="block-box" v-show="[1,2].includes(form.resource)">
-                    <div class="block-item">
-                        <div class="box-title">订单基础信息</div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox-1" v-model="printData['order_info']['order_no']" :true-label="1" :false-label="0" size="medium">订单编号</el-checkbox>
-                            <el-checkbox class="group-checkbox-1" v-model="printData['order_info']['order_from']" :true-label="1" :false-label="0" size="medium">订单来源</el-checkbox>
-                            <el-checkbox class="group-checkbox-1" v-model="printData['order_info']['order_goods_type']" :true-label="1" :false-label="0" size="medium">商品类型</el-checkbox>
-                            <el-checkbox class="group-checkbox-1" v-model="printData['order_info']['order_pay_type']" :true-label="1" :false-label="0" size="medium">支付方式</el-checkbox>
-                            <el-checkbox class="group-checkbox-1" v-model="printData['order_info']['order_status']" :true-label="1" :false-label="0" size="medium">订单状态</el-checkbox>
-                            <el-checkbox class="group-checkbox-1" v-model="printData['order_info']['order_dispatch_name']" :true-label="1" :false-label="0" size="medium">配送方式</el-checkbox>                          
-                        </div>
-                        <div class="block-group" style="margin-top: 10px;">
-                            <el-checkbox class="group-checkbox-1" v-model="printData['order_info']['order_create_time']" :true-label="1" :false-label="0" size="medium">下单时间</el-checkbox>
-                            <el-checkbox class="group-checkbox-1" v-model="printData['order_info']['order_pay_time']" :true-label="1" :false-label="0" size="medium">付款时间</el-checkbox>           
-                            <el-checkbox class="group-checkbox-1" v-model="printData['order_info']['order_finish_time']" :true-label="1" :false-label="0" size="medium">完成时间</el-checkbox>
-                            <el-checkbox style="margin-right: 40px;" class="group-checkbox-1" v-model="printData['order_info']['refund_create_time']" :true-label="1" :false-label="0" size="medium" v-show="form.resource == 2">申请退款时间</el-checkbox>
-                            <el-checkbox class="group-checkbox-1" v-model="printData['order_info']['refund_finish_time']" :true-label="1" :false-label="0" size="medium" v-show="form.resource == 2">退款完成时间</el-checkbox> 
-                        </div>
-                    </div>
-                </div>
-                <div class="block-box" v-show="[1,3].includes(form.resource)">
-                    <div class="block-item">
-                        <div class="box-title">商品信息</div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['make_info']['goods_name']" :true-label="1" :false-label="0" size="medium" disabled>商品名称</el-checkbox>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['make_info']['goods_name_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['make_info']['goods_name_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['make_info']['num']" :true-label="1" :false-label="0" size="medium" disabled>商品数量</el-checkbox>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['make_info']['num_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['make_info']['num_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
-                        <div class="block-group" style="margin-top: 30px;">
-                            <el-checkbox class="group-checkbox-1" v-model="printData['make_info']['goods_code']" :true-label="1" :false-label="0" size="medium">编码</el-checkbox>
-                            <el-checkbox class="group-checkbox-1" v-model="printData['make_info']['product_sn']" :true-label="1" :false-label="0" size="medium">条形码</el-checkbox>           
-                            <el-checkbox class="group-checkbox-1" v-model="printData['make_info']['attach']" :true-label="1" :false-label="0" size="medium">附加规格</el-checkbox>
-                        </div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['make_info']['price']" :true-label="1" :false-label="0" size="medium">商品金额</el-checkbox>
-                            <div class="block-select">
-                                <div style="width: 100px;" class="block-select-name">金额方式</div>
-                                <el-select class="select-box" v-model="printData['make_info']['goods_price_type']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['make_info']['gift_info']" :true-label="1" :false-label="0" size="medium">赠品明细</el-checkbox>
-                        </div>
-                        <div class="tips">显示“满赠”“消费奖励”活动所产生的赠品明细。</div>
-                    </div>         
-                </div>
-                <div class="block-box" v-show="form.resource == 2"  >
-                    <div class="block-item">
-                        <div class="box-title">退款商品信息</div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox-1" v-model="printData['make_info']['goods_name']" :true-label="1" :false-label="0" size="medium" disabled>商品名称</el-checkbox>
-                            <el-checkbox class="group-checkbox-1" v-model="printData['make_info']['num']" :true-label="1" :false-label="0" size="medium" disabled>商品数量</el-checkbox>
-                            <el-checkbox style="margin-right: 40px" class="group-checkbox-1" v-model="printData['make_info']['real_price']" :true-label="1" :false-label="0" size="medium">商品实付款</el-checkbox>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['make_info']['real_price_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['make_info']['real_price_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
-                    </div>         
-                </div>
-                <div class="block-box" v-show="form.resource == 2">
-                    <div class="block-item">
-                        <div class="box-title">退款原由/明细</div>
-                        <div class="block-group">
-                            <div class="block-group" style="margin: 0;padding: 0;">
-                                <el-checkbox class="group-checkbox-2" v-model="printData['refund']['type']" :true-label="1" :false-label="0" size="medium">退款方式</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['refund']['apply_time']" :true-label="1" :false-label="0" size="medium">申请售后时间</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['refund']['apply_money']" :true-label="1" :false-label="0" size="medium">申请售后金额</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['refund']['apply_reason']" :true-label="1" :false-label="0" size="medium">申请原因</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['refund']['apply_detail']" :true-label="1" :false-label="0" size="medium">退款金额明细</el-checkbox>
-                            </div>
-                        </div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['refund']['apply_real']" :true-label="1" :false-label="0" size="medium">实退金额</el-checkbox>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['refund']['apply_real_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['refund']['apply_real_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>                         
-                        </div>
-                        <div class="tips">退款方式包含后台关闭订单退款、逐一退款、售后（仅退款）、售后（退款退货）；<br>仅售后单才会显示“申请售后时间”“申请售后金额”“申请原因”</div>
-                    </div>         
-                </div>
-                <div class="block-box" v-show="form.resource == 1">
-                    <div class="block-item">
-                        <div class="box-title">订单金额</div>
-                        <div class="block-group">
-                            <div class="block-group" style="margin: 0;padding: 0;">
-                                <el-checkbox class="group-checkbox-2" v-model="printData['order_price']['goods_count']" :true-label="1" :false-label="0" size="medium">商品总件数</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['order_price']['price_detail']" :true-label="1" :false-label="0" size="medium">金额明细</el-checkbox>           
-                                <el-checkbox class="group-checkbox-2" v-model="printData['order_price']['discount_detail']" :true-label="1" :false-label="0" size="medium">优惠明细</el-checkbox>
-                            </div>
-                        </div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['order_price']['pay_price']" :true-label="1" :false-label="0" size="medium">实付金额</el-checkbox>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['make_info']['real_price_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['make_info']['real_price_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
-                    </div>         
-                </div>
-                <div class="block-box" v-show="form.resource == 1">
-                    <div class="block-item">
-                        <div class="box-title">其他订单信息</div>
-                        <div class="block-group">
-                            <div class="block-group" style="margin: 0;padding: 0;">
-                                <el-checkbox class="group-checkbox-2" v-model="printData['mark_info']['form_data']" :true-label="1" :false-label="0" size="medium">订单表单</el-checkbox>
-                            </div>
-                        </div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox" v-model="printData['mark_info']['saler_mark']" :true-label="1" :false-label="0" size="medium">商家备注</el-checkbox>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['mark_info']['saler_mark_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['mark_info']['saler_mark_bold']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
-                    </div>         
-                </div>
-                <div class="block-box" v-show="form.resource == 3">
-                    <div class="block-item">
-                        <div class="box-title">核销信息</div>
-                        <div class="block-group" v-show="[1,3].includes(form.resource)">
-                            <el-checkbox class="group-checkbox-2" v-model="printData['write_off_info']" :true-label="1" :false-label="0" size="medium">核销信息</el-checkbox>
-                        </div>
-                        <div class="tips">根据核销类型显示订单的核销自提点、门店、预约信息、酒店入住信息等。</div>
-                    </div>               
-                </div>
-                <div class="block-box"  v-show="form.resource != 5">
-                    <div class="block-item">
-                        <div class="box-title">{{form.resource == 1 ? '买家/收货信息' : '会员信息' }}</div>
-                        <div class="block-group">
-                            <div class="block-group" style="margin: 0;padding: 0;">
-                                <el-checkbox class="group-checkbox-2" v-model="printData['customer_info']['customer_name']" :true-label="1" :false-label="0" size="medium">买家昵称</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['customer_info']['customer_mobile']" :true-label="1" :false-label="0" size="medium" v-show="[4].includes(form.resource)">{{ form.resource == 4 ? '会员手机号' : '买家手机号'  }}</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['customer_info']['customer_realname']" :true-label="1" :false-label="0" size="medium">真实姓名</el-checkbox> 
-                                <el-checkbox class="group-checkbox-2" v-model="printData['customer_info']['customer_balance']" :true-label="1" :false-label="0" size="medium" v-show="[1,2,4].includes(form.resource)">余额</el-checkbox>        
-                                <el-checkbox class="group-checkbox-2" v-model="printData['customer_info']['customer_credit']" :true-label="1" :false-label="0" size="medium" v-show="[1,2,4].includes(form.resource)">积分</el-checkbox>
-                                <el-checkbox class="group-checkbox-2" v-model="printData['customer_info']['customer_remark']" :true-label="1" :false-label="0" size="medium">会员备注</el-checkbox>
-                            </div>
-                        </div>
-                        <div class="block-group" v-show="[1,2].includes(form.resource)">
-                            <el-checkbox class="group-checkbox" v-model="printData['customer_info']['customer_mobile']" :true-label="1" :false-label="0" size="medium">买家手机号</el-checkbox>
-                            <div class="block-select">
-                                <div class="block-select-name">脱敏</div>
-                                <el-select class="select-box" v-model="printData['customer_info']['customer_mobile_des']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in mobileOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
-                        <div class="block-group" v-show="form.resource == 1">
-                            <el-checkbox class="group-checkbox" v-model="printData['customer_info']['buyer_name']" :true-label="1" :false-label="0" size="medium">收货人姓名</el-checkbox>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['customer_info']['buyer_name_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['customer_info']['buyer_name_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
-                        <div class="block-group" v-show="form.resource == 1">
-                            <el-checkbox class="group-checkbox" v-model="printData['customer_info']['buyer_mobile']" :true-label="1" :false-label="0" size="medium">收货人联系方式</el-checkbox>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['customer_info']['buyer_mobile_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['customer_info']['buyer_mobile_blod']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">脱敏</div>
-                                <el-select class="select-box" v-model="printData['customer_info']['buyer_mobile_des']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in mobileOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
-                        <div class="block-group" v-show="form.resource == 1">
-                            <el-checkbox class="group-checkbox" v-model="printData['customer_info']['buyer_address']" :true-label="1" :false-label="0" size="medium">收货人地址</el-checkbox>
-                            <div class="block-select">
-                                <div class="block-select-name">字号</div>
-                                <el-select class="select-box" v-model="printData['customer_info']['buyer_address_size']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in sizeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                            <div class="block-select">
-                                <div class="block-select-name">粗体</div>
-                                <el-select class="select-box" v-model="printData['customer_info']['buyer_address_blod']" placeholder="请选择">
-                                    <el-option
-                                        v-for="item in boldOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                    </el-option>
-                                </el-select>
-                            </div>
-                        </div>
-                        <div class="block-group" v-show="form.resource == 1">
-                            <el-checkbox class="group-checkbox-2" v-model="printData['customer_info']['invoice']" :true-label="1" :false-label="0" size="medium">是否开具发票</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['customer_info']['invoice_info']" :true-label="1" :false-label="0" size="medium">发票信息</el-checkbox>                                        
-                        </div>
-                    </div>         
-                </div>
-                <div class="block-box" v-show="form.resource == 1">
-                    <div class="block-item">
-                        <div class="box-title">自提/预约门店</div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox-2" v-model="printData['pick_store']['store_name']" :true-label="1" :false-label="0" size="medium">门店名称</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['pick_store']['store_address']" :true-label="1" :false-label="0" size="medium">门店地址（预约地址）</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['pick_store']['store_contact']" :true-label="1" :false-label="0" size="medium">门店联系人</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['pick_store']['store_contact_name']" :true-label="1" :false-label="0" size="medium">门店联系方式</el-checkbox>
-                        </div>
-                        <div class="tips">仅自提、预约类型订单将显示此部分信息；<br>预约商品的地址若为自定义地址，则仅会显示“预约地址”字段，无门店名称、联系人及联系方式。</div>
-                    </div>
-                </div>
-                <div class="block-box" v-show="form.resource != 5">
-                    <div class="block-item">
-                        <div class="box-title">底部信息</div>
-                        <div class="block-group" v-show="[1,3,4].includes(form.resource)">
-                            <el-checkbox class="group-checkbox-2" v-model="printData['footer_info']['stand_name']" :true-label="1" :false-label="0" size="medium" v-show="[1].includes(form.resource)">收银员名称</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['footer_info']['cashier_name']" :true-label="1" :false-label="0" size="medium" v-show="[1].includes(form.resource)">导购员名称</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['footer_info']['shop_name']" :true-label="1" :false-label="0" size="medium" >商城名称</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['footer_info']['shop_phone']" :true-label="1" :false-label="0" size="medium" >商城联系方式</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['footer_info']['store_name']" :true-label="1" :false-label="0" size="medium">门店名称</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['footer_info']['store_phone']" :true-label="1" :false-label="0" size="medium">门店联系方式</el-checkbox>
-                        </div>
-                        <div class="block-group" v-show="[1,3,4].includes(form.resource)">
-                            <el-checkbox class="group-checkbox" v-model="printData['footer_info']['shop_qrcode']" :true-label="1" :false-label="0" size="medium" >二维码</el-checkbox>
-                            <el-select style="width: 160px;" class="select-box" v-model="printData['footer_info']['shop_qrcode_type']" placeholder="请选择">
-                                <el-option
-                                    v-for="item in qrCodeOptions"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                            <el-input style="width: 400px;" class="receipt-input" v-model="printData['footer_info']['shop_qrcode_url']"  placeholder="请输入链接地址" size="medium" ></el-input>                          
-                        </div>
-                        <div class="block-group">
-                            <el-checkbox class="group-checkbox-2" v-model="printData['footer_info']['manage']" :true-label="1" :false-label="0" size="medium" v-show="form.resource == 2">操作人</el-checkbox>
-                            <el-checkbox class="group-checkbox-2" v-model="printData['footer_info']['print_time']" :true-label="1" :false-label="0" size="medium">小票打印时间</el-checkbox>
-                        </div>
-                        <div class="block-group" v-show="[1,3,4].includes(form.resource)">
-                            <el-checkbox class="group-checkbox" v-model="printData['footer_info']['print_footer']" :true-label="1" :false-label="0" size="medium">自定义文本</el-checkbox>
-                            <el-input style="width: 560px;" v-model="printData['footer_info']['print_footer_info']" :maxlength="20" placeholder="请输入模版名称" size="medium" show-word-limit></el-input>
-                        </div>
-                    </div>
-                </div>                 
-            </div>
-            <div class="block-right">
-                <div class="title">预览图</div>
-                <div class="block-container">
-                    <!-- <div v-for="(item,index) of receiptConfig" :key="index" :class="[item.class,test(item.classText)]" :style="item.style" v-show=" item.show.length > 0 ?  test2(item.show) : test3(item.handerChekcItems)">
-                        {{ item.data != '' ? item.data  : item.dataKey.length > 0 ? printData[item.dataKey[0]][item.dataKey[1]] : '' }}
-                        <div v-if="item.children.length > 0 ">
-                            <div :style="group.style" :class="[group.class,test(group.classText)]" v-for="(group,index2) of item.children" :key="index2" v-show="(group.show)">
-                                {{ handerText(group)  }}
-                            </div>
-                        </div>
-                    </div> -->
-                    <div style="padding-bottom: 10px;" :class="['block-content','item-block',classItem('header_info','template_size','template_bold')]" v-show="showItem('header_info','template_status')">{{ printData.header_info.template_name || '小票名称' }}</div>
-                    <div style="padding-bottom: 10px;" :class="['block-content','item-block',classItem('header_info','shop_name_size','shop_name_bold')]" v-show="showItem('header_info','shop_name')">商城名称</div>
-                    <div class="block-content item-small-size" v-show="handerChekcItem('recharge_info',['recharge_money','send_money','customer_balance']) && [3].includes(form.resource)">
-                        <div class="item-block-left" v-show="showItem('header_info','write_off_name')">核销员：张三</div>
-                        <div class="item-block-left" v-show="showItem('header_info','write_off_time')">核销时间：2023-12-12 14:20:20</div>
-                        <div class="item-block-left" v-show="showItem('header_info','order_no')">订单编号：ES20231026111444527685</div>
-                        <div class="item-block-left" v-show="showItem('header_info','write_off_type')">核销类型：自提订单</div>
-                    </div>
-                    <div class="block-content item-small-size" v-show="handerChekcItem('header_info',['open_time','print_time','print_people']) && form.resource == 5">
-                        <div class="item-block-left" v-show="showItem('header_info','open_time')">营业时间：2023-02-17</div>
-                        <div class="item-block-left" v-show="showItem('header_info','print_time')">打印时间：2023-02-28 16:29:29</div>
-                        <div class="item-block-left" v-show="showItem('header_info','print_people')">打印人：张三</div>
-                    </div>
-                    <div class="block-content item-small-size" v-show="handerChekcItem('stand_info',['name','start_time','end_time']) && form.resource == 5">
-                        <div class="item-block-left" v-show="showItem('stand_info','name')">收银员：李四</div>
-                        <div class="item-block-left" v-show="showItem('stand_info','start_time')">开始：2023-02-28 16:29:29</div>
-                        <div class="item-block-left" v-show="showItem('stand_info','end_time')">结束：2023-02-28 16:29:29</div>
-                    </div>
-                    <div class="block-content item-small-size" v-show="handerChekcItem('finish_info',['all','pay_order_count','sale_goods_count','card_price','recharge_money_price','refund_price','refund_order_count','refund_goods_count','real_money']) && form.resource == 5">
-                        <div class="item-block gift-block">
-                            <div class="gift-boder"></div>
-                            <div class="gift-num item-small-size bold">营业汇总</div>
-                            <div class="gift-boder"></div>
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','all')">
-                            <div class="item-balance-info-name">总交易额</div>
-                            <div class="item-balance-info-num">31000</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','pay_order_count')">
-                            <div class="item-balance-info-name">支付订单数</div>
-                            <div class="item-balance-info-num">3600</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','sale_goods_count')">
-                            <div class="item-balance-info-name">出售商品件数</div>
-                            <div class="item-balance-info-num">5000</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','card_price')">
-                            <div class="item-balance-info-name">会员卡交易额</div>
-                            <div class="item-balance-info-num">3546</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','recharge_money_price')">
-                            <div class="item-balance-info-name">余额充值金额</div>
-                            <div class="item-balance-info-num">9555</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','refund_price')">
-                            <div class="item-balance-info-name">退款金额</div>
-                            <div class="item-balance-info-num">3000</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','refund_order_count')">
-                            <div class="item-balance-info-name">退款订单数</div>
-                            <div class="item-balance-info-num">30</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','refund_goods_count')">
-                            <div class="item-balance-info-name">退款件数</div>
-                            <div class="item-balance-info-num">20</div>  
-                        </div>
-                        <div :class="['item-block','item-balance-info',classItem('finish_info','real_money_size','real_money_blod')]"  v-show="showItem('finish_info','real_money')">
-                            <div class="item-balance-info-name">实营收额</div>
-                            <div class="item-balance-info-num">250000</div>  
-                        </div>
-                    </div>
-                    <div class="block-content item-small-size" v-show="handerChekcItem('pay_type_info',['wechat','ali','cash','balance','other']) && form.resource == 5">
-                        <div class="item-block gift-block">
-                            <div class="gift-boder"></div>
-                            <div class="gift-num item-small-size bold">支付方式组成</div>
-                            <div class="gift-boder"></div>
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('pay_type_info','wechat')">
-                            <div class="item-balance-info-name">微信</div>
-                            <div class="item-balance-info-num">31000</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('pay_type_info','ali')">
-                            <div class="item-balance-info-name">支付宝</div>
-                            <div class="item-balance-info-num">3600</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('pay_type_info','cash')">
-                            <div class="item-balance-info-name">现金</div>
-                            <div class="item-balance-info-num">5000</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('pay_type_info','balance')">
-                            <div class="item-balance-info-name">余额</div>
-                            <div class="item-balance-info-num">3546</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('pay_type_info','other')">
-                            <div class="item-balance-info-name">其他线下方式</div>
-                            <div class="item-balance-info-num">9555</div>  
-                        </div>
-                    </div>
-                    <div class="block-content item-small-size" v-show="handerChekcItem('checkstand_writeoff',['self','virtual','timegoods','booking','giftpackage','coupon','hotel']) && form.resource == 5">
-                        <div class="item-block gift-block">
-                            <div class="gift-boder"></div>
-                            <div class="gift-num item-small-size bold">核销记录</div>
-                            <div class="gift-boder"></div>
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','self')">
-                            <div class="item-balance-info-name">自提订单</div>
-                            <div class="item-balance-info-num">100单</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','virtual')">
-                            <div class="item-balance-info-name">虚拟核销订单</div>
-                            <div class="item-balance-info-num">200单</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','timegoods')">
-                            <div class="item-balance-info-name">计次时卡券</div>
-                            <div class="item-balance-info-num">5000</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','booking')">
-                            <div class="item-balance-info-name">余额</div>
-                            <div class="item-balance-info-num">35406</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','giftpackage')">
-                            <div class="item-balance-info-name">预约到店</div>
-                            <div class="item-balance-info-num">500次</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','coupon')">
-                            <div class="item-balance-info-name">优惠券</div>
-                            <div class="item-balance-info-num">30张</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','hotel')">
-                            <div class="item-balance-info-name">酒店预订</div>
-                            <div class="item-balance-info-num">5单</div>  
-                        </div>
-                    </div>
-                    <div class="block-content" v-show="handerChekcItem('header_info',['gen_num','order_sort','quick_buy','customer_mark','selfsend_time']) && [1,2].includes(form.resource)">
-                        <div :class="['item-block',classItem('header_info','gen_num_size','gen_num_bold')]" v-show="showItem('header_info','gen_num') ">#0001</div>
-                        <div :class="['item-block',classItem('header_info','order_sort_font_size','order_sort_font_bold')]" v-show="showItem('header_info','order_sort') && form.resource == 1">{{ printData.header_info.order_sort_prefix || '序号' }}</div>
-                        <div :class="['item-block',classItem('header_info','quick_buy_size','quick_buy_bold')]" v-show="showItem('header_info','quick_buy')">快速购买渠道名称</div>
-                        <div :class="['item-block-left',classItem('header_info','customer_mark_size','customer_mark_bold')]" v-show="showItem('header_info','customer_mark') && form.resource == 1">买家备注：多用一层包装袋，送到后请打电话，谢谢！！</div>
-                        <div :class="['item-block-left',classItem('header_info','selfsend_time_size','selfsend_time_bold')]" v-show="showItem('header_info','selfsend_time') && form.resource == 1">配送时间：10-25 14:00-14:30</div>
-                    </div>
-                    <div class="block-content item-small-size" v-show="handerChekcItem('order_info',['order_no','order_from','order_goods_type','order_pay_type','order_status','order_dispatch_name','order_create_time','order_pay_time','order_finish_time']) && [1,2].includes(form.resource)">
-                        <div class="item-block-left" v-show="showItem('order_info','order_no')">订单编号：ES20231026111444527685</div>
-                        <div class="item-block-left" v-show="showItem('order_info','order_from')">订单来源：微信小程序</div>
-                        <div class="item-block-left" v-show="showItem('order_info','order_goods_type')">商品类型：实体商品</div>
-                        <div class="item-block-left" v-show="showItem('order_info','order_pay_type')">支付方式：微信支付</div>
-                        <div class="item-block-left" v-show="showItem('order_info','order_status')">订单状态：已完成</div>
-                        <div class="item-block-left" v-show="showItem('order_info','order_dispatch_name')">配送方式：同城配送</div>
-                        <div class="item-block-left" v-show="showItem('order_info','order_create_time')">下单时间：2023-12-12 14:20:20</div>
-                        <div class="item-block-left" v-show="showItem('order_info','order_pay_time')">付款时间：2023-12-12 14:20:20</div>
-                        <div class="item-block-left" v-show="showItem('order_info','order_finish_time')">完成时间：2023-12-12 14:20:20</div>
-                        <div class="item-block-left" v-show="showItem('order_info','refund_create_time') && form.resource == 2">申请退款时间：2023-12-12 14:20:20</div>
-                        <div class="item-block-left" v-show="showItem('order_info','refund_finish_time') && form.resource == 2">退款完成时间：2023-12-12 14:20:20</div>
-                    </div>
-                    <div style="padding-bottom: 10px;" class="block-content" v-show="form.resource == 2">
-                        <div  class="item-block refund-block bold" v-show="showItem('make_info','gift_info')">
-                            <div class="refund-xing">*********************</div>
-                            <div class="refund-num item-small-size">退款商品</div>
-                            <div class="refund-xing">*********************</div>
-                        </div>
-                        <div class="item-block item-flex bold">
-                            <div class="item-flex-1">商品名称</div>
-                            <div class="item-flex-2">退款数量</div>
-                            <div class="item-flex-2" v-show="showItem('make_info','real_price')">实退款</div>
-                        </div>
-                        <div :class="['item-block-left',classItem('make_info','real_price_size','real_price_bold')]" v-show="showItem('make_info','goods_name')" style="padding: 0;">(退)可口可乐mini罐 经典碳酸饮料【新包装；200ml*12罐】</div>
-                        <div class="item-flex">
-                            <div class="item-flex-1"></div>
-                            <div class="item-flex-2" :class="classItem('make_info','real_price_size','real_price_bold')">
-                                [<span style="padding: 0 5px;">X 2</span>]
-                            </div>
-                            <div class="item-flex-2" :class="classItem('make_info','real_price_size','real_price_bold')" v-show="showItem('make_info','real_price')">¥54.5</div>
-                        </div>
-                        <div :class="['item-block-left',classItem('make_info','real_price_size','real_price_bold')]" v-show="showItem('make_info','goods_name')">(退)超薄液晶电视</div>
-                        <div class="item-flex">
-                            <div class="item-flex-1"></div> 
-                            <div class="item-flex-2" :class="classItem('make_info','real_price_size','real_price_bold')">
-                                1
-                            </div>
-                            <div class="item-flex-2" :class="classItem('make_info','real_price_size','real_price_bold')" v-show="showItem('make_info','real_price')">¥1999</div>
-                        </div>
-                    </div>
-                    <div class="block-content item-small-size" v-show="handerChekcItem('refund',['type','apply_time','apply_money','apply_reason','apply_real','apply_detail']) && form.resource == 2">
-                        <div class="item-block-left" v-show="showItem('refund','type')">退款方式：售后（仅退款）</div>
-                        <div class="item-block-left" v-show="showItem('refund','apply_time')">申请售后时间：2023-12-12 14:20:20</div>
-                        <div class="item-block item-flex" v-show="showItem('refund','apply_money')">申请金额：64.5</div>
-                        <div class="item-block-left" v-show="showItem('refund','apply_reason')">申请原因：拍多了。</div>
-                        <div :class="['item-block item-flex',classItem('refund','apply_real_size','apply_real_bold')]" v-show="showItem('refund','apply_real')">
-                            <div class="item-flex-1">实退金额</div>
-                            <div class="item-flex-2">64.5</div>
-                        </div>
-                        <div class="item-block-left" v-show="showItem('refund','apply_detail')">微信退款金额：50（原路退还）</div>
-                        <div class="item-block-left" v-show="showItem('refund','apply_detail')">余额退款金额：14.5</div>
-                    </div>
-                    <div style="padding-bottom: 10px;" class="block-content" v-show="[1,3].includes(form.resource)">
-                        <div class="item-block item-flex">
-                            <div class="item-flex-1">商品名称</div>
-                            <div class="item-flex-2">数量</div>
-                            <div class="item-flex-2" v-show="showItem('order_price','pay_price')">金额</div>
-                        </div>
-                        <div :class="['item-block-left',classItem('make_info','goods_name_size','goods_name_bold')]" v-show="showItem('make_info','goods_name')" style="padding: 0;">可口可乐mini罐 经典碳酸饮料【新包装；200ml*12罐】</div>
-                        <div class="item-small-size" v-show="showItem('make_info','goods_code')">123456789</div>
-                        <div style="margin: 0;" class="item-block-left item-small-size" v-show="showItem('make_info','product_sn')">6970448170051</div>
-                        <div class="item-flex">
-                            <div class="item-flex-1"></div>
-                            <div class="item-flex-2" :class="classItem('make_info','num_size','num_bold')">
-                                [<span style="padding: 0 5px;">X 2</span>]
-                            </div>
-                            <div class="item-flex-2" :class="classItem('order_price','pay_price_size','pay_price_bold')" v-show="showItem('order_price','pay_price')">¥54.5</div>
-                        </div>
-                        <div :class="['item-block-left',classItem('make_info','goods_name_size','goods_name_bold')]" v-show="showItem('make_info','goods_name')">超薄液晶电视</div>
-                        <div class="item-small-size" v-show="showItem('make_info','goods_code')">123456789</div>
-                        <div style="margin: 0;" class="item-block-left item-small-size" v-show="showItem('make_info','product_sn')">6970448170051</div>
-                        <div class="item-flex">
-                            <div class="item-flex-1"></div>
-                            <div class="item-flex-2" :class="classItem('make_info','num_size','num_bold')">
-                                1
-                            </div>
-                            <div class="item-flex-2" :class="classItem('order_price','pay_price_size','pay_price_bold')" v-show="showItem('order_price','pay_price')">¥1999</div>
-                        </div>
-                        <div v-show="showItem('make_info','attach')">
-                            <div class="item-block-left item-small-size">（上门安装服务）</div>
-                            <div class="item-flex">
-                                <div class="item-flex-1"></div>
-                                <div class="item-flex-2" >1</div>
-                                <div class="item-flex-2" v-show="showItem('make_info','price')">¥0</div>
-                            </div>
-                            <div class="item-block-left item-small-size">（3年延保）</div>
-                            <div class="item-flex">
-                                <div class="item-flex-1"></div>
-                                <div class="item-flex-2" >1</div>
-                                <div class="item-flex-2" v-show="showItem('make_info','price')">¥199.99</div>
-                            </div>
-                        </div>
-                        <div class="item-block gift-block" v-show="showItem('make_info','gift_info')">
-                            <div class="gift-boder"></div>
-                            <div class="gift-num item-small-size">赠品</div>
-                            <div class="gift-boder"></div>
-                        </div>
-                        <div v-show="showItem('make_info','gift_info')">
-                            <div class="item-block-left item-small-size" v-show="form.resource == 1"> 余额：50</div>
-                            <div class="item-block-left item-small-size" v-show="form.resource == 1"> 积分：50</div>
-                            <div class="item-block-left item-small-size"> 商品：冰红茶风味饮料x2；五香瓜子【150g；小包装】x1</div>
-                            <div class="item-block-left item-small-size" v-show="form.resource == 1"> 优惠券：元旦大促7折券x1</div>
-                            <div class="item-block-left item-small-size"  v-show="form.resource == 1"> 会员卡：超级会员卡Plus【365天】</div>
-                            <div class="item-block-left item-small-size"  v-show="form.resource == 1"> 礼品卡：超值复购大礼包x1</div>    
-                        </div>    
-                    </div>
-                    <div class="block-content" v-show="form.resource == 3 && printData.write_off_info">
-                        <div class="item-block item-size bold">#001</div>
-                        <div class="item-block-left item-small-size" >核销自提点：自提点名称</div>
-                        <div class="item-block-left item-small-size" >联系方式：123456789123</div>
-                        <div class="item-block-left item-small-size"> 地址：北京市朝阳区朝阳路1号</div>
-                        <div class="item-block-left item-small-size" > 营业时间：00:00~23:59</div>
-                        <div class="item-block-left item-small-size"  > 自提时间：10-20 14:00~14:30</div>
-                    </div>
-                    <div class="block-content" v-show="handerChekcItem('order_price',['goods_count','price_detail','price_detail','price_detail','discount_detail','discount_detail']) && form.resource == 1" >
-                        <div class="item-block item-balance-info item-small-size"  v-show="showItem('order_price','goods_count')">
-                            <div class="item-balance-info-name">商品件数</div>
-                            <div class="item-balance-info-num">3</div>  
-                        </div>
-                        <div class="item-block item-balance-info item-small-size" v-show="showItem('order_price','price_detail')">
-                            <div class="item-balance-info-name">商品总额</div>
-                            <div class="item-balance-info-num">800</div>
-                        </div>
-                        <div class="item-block item-balance-info item-small-size" v-show="showItem('order_price','price_detail')">
-                            <div class="item-balance-info-name">押金</div>
-                            <div class="item-balance-info-num">200</div>
-                        </div>
-                        <div class="item-block item-balance-info item-small-size" v-show="showItem('order_price','price_detail')">
-                            <div class="item-balance-info-name">运费</div>
-                            <div class="item-balance-info-num">10</div>
-                        </div>
-                        <div class="item-block item-balance-info item-small-size" v-show="showItem('order_price','discount_detail')">
-                            <div class="item-balance-info-name">会员权益</div>
-                            <div class="item-balance-info-num">3</div>
-                        </div>
-                        <div class="item-block item-balance-info item-small-size" v-show="showItem('order_price','discount_detail')">
-                            <div class="item-balance-info-name">秒杀</div>
-                            <div class="item-balance-info-num">-100</div>
-                        </div>
-                        <div :class="['item-block-left',classItem('order_price','pay_price_size','pay_price_bold')]" v-show="showItem('order_price','pay_price')">实付金额</div>
-                        <div :class="['item-block',classItem('make_info','real_price_size','real_price_bold')]" style="text-align: right;" v-show="showItem('make_info','real_price')">¥860.00</div>
-                    </div>
-                    <div class="block-content" v-show="handerChekcItem('recharge_info',['recharge_money','send_money','customer_balance']) && form.resource == 4" >
-                        <div :class="['item-block','item-balance-info', classItem('recharge_info','recharge_money_size','recharge_money_blod')]"  v-show="showItem('recharge_info','recharge_money')">
-                            <div class="item-balance-info-name">充值金额</div>
-                            <div class="item-balance-info-num">¥100.00</div>  
-                        </div>
-                        <div :class="['item-block','item-balance-info', classItem('recharge_info','send_money_size','send_money_blod')]"  v-show="showItem('recharge_info','send_money')">
-                            <div class="item-balance-info-name">赠送金额</div>
-                            <div class="item-balance-info-num">¥50.00</div>
-                        </div>
-                        <div :class="['item-block','item-balance-info', classItem('recharge_info','customer_balance_size','customer_balance_blod')]"  v-show="showItem('recharge_info','customer_balance')">
-                            <div class="item-balance-info-name">账户余额</div>
-                            <div class="item-balance-info-num">¥250.00</div>
-                        </div>
-                    </div>
-                    <div class="block-content" v-show="handerChekcItem('mark_info',['form_data','saler_mark'])  && form.resource == 1">
-                        <div class="item-small-size" v-show="showItem('mark_info','form_data')">
-                            <div class="item-block-left">表单信息：信息内容</div>
-                            <div class="item-block-left">表单信息：信息内容</div>
-                            <div class="item-block-left">表单信息：信息内容</div>
-                        </div>
-                        <div :class="['item-block-left',classItem('mark_info','saler_mark_size','saler_mark_bold')]" v-show="showItem('mark_info','saler_mark')">商家备注：老客户再赠送一箱牛奶；玻璃瓶包装轻拿轻放</div>
-                    </div>
-                    <div class="block-content" v-show="handerChekcItem('customer_info',['customer_name','customer_mobile','customer_realname','customer_balance','customer_credit','customer_remark']) && [1,2,3,4].includes(form.resource)">
-                        <div class="item-block item-balance-info item-small-size" v-show="showItem('customer_info','customer_name')">
-                            <div class="item-balance-info-name">会员名称</div>
-                            <div class="item-balance-info-num">AAAAAAA</div>
-                        </div>
-                        <div class="item-block item-balance-info item-small-size" v-show="showItem('customer_info','customer_mobile')">
-                            <div class="item-balance-info-name">会员手机号</div>
-                            <div class="item-balance-info-num">133{{printData.customer_info.customer_mobile_des == 1 ?'****': printData.customer_info.customer_mobile_des || '5555' }}3333</div>
-                        </div>
-                        <div class="item-block item-balance-info item-small-size" v-show="showItem('customer_info','customer_realname')">
-                            <div class="item-balance-info-name">姓名</div>
-                            <div class="item-balance-info-num">张三</div>
-                        </div>
-                        <div class="item-block item-balance-info item-small-size" v-show="showItem('customer_info','customer_balance')">
-                            <div class="item-balance-info-name">余额</div>
-                            <div class="item-balance-info-num">1200.5</div>
-                        </div>
-                        <div class="item-block item-balance-info item-small-size" v-show="showItem('customer_info','customer_credit')">
-                            <div class="item-balance-info-name">积分</div>
-                            <div class="item-balance-info-num">500</div>
-                        </div>
-                        <div class="item-block item-balance-info item-small-size" v-show="showItem('customer_info','customer_remark')">
-                            <div class="item-balance-info-name">备注：本店前100注册优质客户</div>
-                        </div>
-                    </div>
-                    <div class="block-content" v-show="handerChekcItem('customer_info',['buyer_name','buyer_mobile','buyer_address'])  && form.resource == 1">
-                        <div :class="['item-block-left',classItem('customer_info','buyer_name_size','buyer_name_blod')]" v-show="showItem('customer_info','buyer_name')">收货人：张三</div>
-                        <div :class="['item-block-left',classItem('customer_info','buyer_mobile_size','buyer_mobile_blod')]" v-show="showItem('customer_info','buyer_mobile')">联系方式：133{{printData.customer_info.buyer_mobile_des == 1 ?'****': printData.customer_info.buyer_mobile_des || '5555' }}3333</div>
-                        <div :class="['item-block-left',classItem('customer_info','buyer_address_size','buyer_address_blod')]" v-show="showItem('customer_info','buyer_address')">收货地址：北京市朝阳区朝阳路朝阳人民小区1号楼1栋1101</div>
-                    </div>
-                    <div class="block-content" v-show="handerChekcItem('customer_info',['invoice','invoice_info'])  && form.resource == 1">
-                        <div class="item-block-left item-small-size " v-show="showItem('customer_info','invoice')">发票：需要开具</div>
-                        <div v-show="showItem('customer_info','invoice_info')">
-                            <div class="item-block-left item-small-size ">抬头类型：企业</div>
-                            <div class="item-block-left item-small-size ">抬头信息：网络科技有限公司</div>
-                            <div class="item-block-left item-small-size ">税号：123456789</div>
-                        </div>
-                    </div>
-                    <div class="block-content" v-show="handerChekcItem('pick_store',['store_name','store_address','store_contact','store_contact_name'])  && form.resource == 1">
-                        <div class="item-block-left item-small-size " v-show="showItem('pick_store','store_name') ">自提门店：门店名称</div>
-                        <div class="item-block-left item-small-size " v-show="showItem('pick_store','store_address')">门店地址：北京市朝阳区朝阳路朝阳人民小区22号楼2栋2202</div>
-                        <div class="item-block-left item-small-size " v-show="showItem('pick_store','store_contact')">联系人：李四</div>
-                        <div class="item-block-left item-small-size " v-show="showItem('pick_store','store_contact_name')">联系方式：13111111111</div>
-                    </div>
-                    <div class="block-content" v-show="handerChekcItem('footer_info',['stand_name','cashier_name','shop_name','shop_phone','store_name','store_phone','shop_qrcode','print_time','print_footer']) && [1,3,4].includes(form.resource)" >
-                        <div class="item-block-left item-small-size " v-show="showItem('footer_info','stand_name') && [1].includes(form.resource)">收银员：名称</div>
-                        <div class="item-block-left item-small-size " v-show="showItem('footer_info','cashier_name') && [1].includes(form.resource)">导购员：名称</div>
-                        <div class="item-block item-small-size " v-show="showItem('footer_info','shop_name') ">商城名称</div>
-                        <div class="item-block item-small-size " v-show="showItem('footer_info','shop_phone')">010-12345678</div>
-                        <div class="item-block item-small-size " v-show="showItem('footer_info','store_name') ">门店名称</div>
-                        <div class="item-block item-small-size " v-show="showItem('footer_info','store_phone')">010-12345678</div>
-                        <div class="item-block" v-show="showItem('footer_info','shop_qrcode')">
-                            <img src="./../../../../assets/weChat.png" width="300" height="300"> 
-                        </div>
-                        <div :class="[[1,3,4].includes(form.resource) ? 'item-block' :'item-block-left' ,'item-small-size']" v-show="showItem('footer_info','print_time')">打印时间：2023-12-12 12:12:20</div>
-                        <div class="item-block item-small-size " v-show="showItem('footer_info','print_footer') ">{{ printData.footer_info.print_footer_info }}</div>
-                    </div>
-                    <div class="block-content" v-show="handerChekcItem('footer_info',['manage','print_time']) && form.resource == 2">
-                        <div class="item-block-left item-small-size " v-show="showItem('footer_info','manage') && form.resource == 2">操作人：李四</div>
-                        <div :class="[form.resource == 1 ? 'item-block' :'item-block-left' ,'item-small-size']" v-show="showItem('footer_info','print_time')">打印时间：2023-12-12 12:12:20</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="footer">
-            <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 { config, printData } from "./receiptConfig.js";
-export default {
-    name:'addTemplateManagement',
-    data(){
-        return{
-            form:{
-                resource:1,
-                tepName:"",
-            },
-            amoutOptions:[
-                {
-                    value:1,
-                    label:'售价'
-                },
-                {
-                    value:0,
-                    label:'实付款'
-                }
-            ],
-            sizeOptions:[
-                {
-                    value:1,
-                    label:'大'
-                },
-                {
-                    value:0,
-                    label:'小'
-                }
-            ],
-            boldOptions:[
-                {
-                    value:1,
-                    label:'加粗'
-                },
-                {
-                    value:0,
-                    label:'正常'
-                }
-            ],
-            sortOptions:[
-                {
-                    value:0,
-                    label:'全部',
-                },
-                {
-                    value:1,
-                    label:'仅网店订单',
-                },
-                {
-                    value:2,
-                    label:'仅收银台订单',
-                }
-            ],
-            mobileOptions:[
-                {
-                    value:1,
-                    label:'是'
-                },
-                {
-                    value:0,
-                    label:'否'
-                }
-            ],
-            qrCodeOptions:[
-                {
-                    value:0,
-                    label:'自定义链接(网址)'
-                },
-                {
-                    value:1,
-                    label:'微信小程序'
-                },
-                {
-                    value:2,
-                    label:'H5'
-                },
-            ],
-            printData:null,
-            printData:printData
-        }
-    },
-    created(){
-        //this.printData = JSON.parse(JSON.stringify(printData));
-        //console.log(this.printData);
-    },
-    methods:{
-        showItem(blockName,itemName){
-            if(!this.printData == null) return;
-            return this.printData[blockName][itemName] !=0 ? true : false
-        },
-        classItem(blockName,itemSizeName,itemBoldName){
-            
-            let arr = [];
-
-            if(this.printData[blockName][itemSizeName] == 1){
-                arr.push('item-size');
-            }else{
-                arr.push('item-small-size')
-            }
-
-            if(this.printData[blockName][itemBoldName] == 1){
-                arr.push('bold');
-            }
-
-            return arr;
-        },
-        handerChekcItem(itemName,keyGroups){
-            
-            for(var key of keyGroups){            
-                if(this.printData[itemName][key] == 1){
-                    return true;
-                }
-            }
-        },
-        showItem(blockName,itemName){
-            if(!this.printData == null) return;
-            return this.printData[blockName][itemName] !=0 ? true : false
-        }
-    }
-}
-</script>
-
-<style lang="scss">
-.addTemplateManagement-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;
-
-        .el-form-item__label{
-            margin-right: 20px;
-        }
-
-        .el-form-item__error{
-            padding: 10px 20px;
-            font-size: 14px;
-        }
-
-        .tips{
-            padding: 10px 20px;
-            line-height: 20px;
-        }
-    }
-
-    .content-container{
-
-        display: flex;
-
-
-        .block-left{
-            flex: 1;
-            margin-right: 20px;
-            background: #fff !important;
-        }
-
-        .block-right{
-            width: 440px ;
-            background: #fff;
-
-            .block-container{
-                padding: 10px;
-                margin: 20px 30px;
-                border: 1px solid #ededed;
-                border-radius: 10px;
-                background: #f8f8f9;
-            }
-
-            .block-content{
-                border-bottom: 1px dashed #ccc;
-                color: #333333 !important;
-                background: #f8f8f9;
-            }
-
-            .item-flex{
-                display: flex;
-                font-size: 16px;
-
-                .item-flex-1{
-                    flex: 2 1 0%;
-                    text-align: left;
-                }
-
-                .item-flex-2{
-                    flex: 1;
-                    text-align: right;
-                }
-            }
-
-            .item-balance-info{
-                display: flex;
-                justify-content: space-between;
-            }
-
-            .gift-block{
-                display: flex;
-                align-items: center;
-
-                .gift-num {
-                    padding: 0 10px;
-                }
-
-                .gift-boder{
-                    flex: 1; 
-                    border-bottom: 1px dashed #ccc;
-                }
-            }
-
-            .refund-block{
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                
-                font-size: 16px;
-                font-weight: bold;
-
-                .refund-xing{
-                    margin-top: 7px;
-                    line-height: 1;
-                }
-
-                .refund-num {
-                    padding: 0 10px;
-                }
-            }
-
-
-
-            .item-size{
-                font-size: 20px;
-            }
-
-            .item-small-size{
-                font-size: 16px;
-            }
-
-            .item-block{
-                margin: 10px 0;
-                text-align: center;
-            }
-
-            .item-block-left{
-                margin: 10px 0;
-                text-align: left;
-            }
-
-            .bold{
-                font-weight: 700;
-            }
-        }
-
-        .block-box{
-            padding: 20px;
-
-            .block-item{
-                padding: 20px;
-                background: #f8f8f9;
-            }
-
-            .box-title{
-                position: relative;
-                padding-left: 14px;
-                font-weight: bold;
-
-                &::before{
-                    position: absolute;
-                    left: 0;
-                    top: 2px;
-                    content: "";
-                    width: 4px;
-                    height: 16px;
-                    border-radius: 10px;
-                    background: var(--primary, #1890ff);
-                }
-            }
-
-            .block-group{
-                display: flex;
-                margin-top: 30px;
-                padding-left: 20px;
-                align-items: center;
-                font-size: 14px;
-
-                .group-checkbox{
-                    width: 160px;
-
-                    &-1{
-                        width: 86px;
-                        margin-right: 20px;
-
-                        .el-checkbox__label{
-                            color: #000;
-                        }
-                    }
-
-                    &-2{
-
-                        .el-checkbox__label{
-                            color: #000;
-                        }
-                    }
-
-                    .el-checkbox__label{
-                        color: #000;
-                    }
-                }
-
-                .receipt-input{
-                    width: 315px;
-                    margin-right: 30px;
-
-                    &-1{
-                        width: 119px;
-                    }
-                }
-
-                .block-select{
-                    display: flex;
-                    margin-right: 30px;
-                    height: 38px;
-                    line-height: 38px;
-                    font-size: 14px;
-
-                    &-name{
-                        line-height: 38px;
-                        width: 50px;
-                        text-align: center;
-                        border-radius: 4px 0 0 4px;
-                        color: #707070;
-                        background-color: #d7d7d7;
-                        border: 1px solid #ededed;
-                    }
-
-                    .select-box {
-                        width: 127px !important;
-                    }
-                }
-            }
-
-            .tips{
-                padding-left: 48px;
-                line-height: 20px;
-                margin-top: 10px;
-                color: #999;
-            }
-        }
-    }
-
-
-
-    .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-input__inner{
-        height: 38px !important;
-        line-height: 38px !important;
-    }
-    
-    .el-input .el-input__count{
-        font-size: 14px !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;
-            transform: rotate(45deg) scaleY(0);
-            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>
\ No newline at end of file
diff --git a/src/views/store/base/cloudPrint/editCloudPrint.vue b/src/views/store/base/cloudPrint/editCloudPrint.vue
index 9ac227f..a775228 100644
--- a/src/views/store/base/cloudPrint/editCloudPrint.vue
+++ b/src/views/store/base/cloudPrint/editCloudPrint.vue
@@ -1,752 +1,1116 @@
 <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 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="printer_name">
+          <el-input
+            v-model="form.printer_name"
+            :maxlength="20"
+            placeholder="请输入内容"
+            size="medium"
+            show-word-limit
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="设备品牌" prop="model_id">
+          <el-select
+            size="medium"
+            v-model="form.model_id"
+            placeholder="请选择设备品牌"
+            @change="handerChangeType"
+          >
+            <el-option
+              v-for="(item, index) of options"
+              :key="index"
+              :label="item.model_name"
+              :value="item.model_id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="打印机编号" prop="printer_sn">
+          <el-input
+            v-model="form.printer_sn"
+            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="printer_key">
+          <el-input
+            v-model="form.printer_key"
+            placeholder="请输入打印机密钥"
+            size="medium"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="URL" prop="website_url">
+          <el-input
+            v-model="form.website_url"
+            placeholder="http://open.10ss.net:8888"
+            size="medium"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="打印来源" class="form-activity-item" prop="flag">
+          <!-- <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-radio-group v-model="form.flag">
+            <el-radio
+              class="el-item-radio"
+              :label="item.region_id"
+              v-for="(item, index) of flagRadioGroup"
+              :key="index"
+              :disabled="item.status == 0"
+            >
+              {{ item.region }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="纸张宽度" class="form-page-size-item">
+          <el-radio-group v-model="form.paper_with">
+            <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>
-  </template>
-  
-  <script>
-  import { forEachRight } from 'lodash';
-  import { type } from 'vue-plugin-utils'
-  export default {
-      name:"addCloudPrint",
-      data(){
-          return{
-              printId:0,
-              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
-                          },
-                      ]
-                  }
-              ],
-          }
+    <!--商品订单-->
+    <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="scope.row.tep"
+              placeholder="请选择小票模板"
+              @change="handleTepOptions(scope.row, scope.$index)"
+            >
+              <el-option
+                v-for="(item, index) of 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="300"
+          prop="printableItemTypesList"
+          label="可打印商品类型"
+        >
+          <template slot-scope="scope">
+            <el-checkbox-group
+              :true-label="1"
+              :false-label="2"
+              v-model="shopOrderCheckList[scope.$index]"
+              class="checkbox-groups"
+            >
+              <el-checkbox
+                v-for="(item, index) of printableItemTypeCheckGroup"
+                :key="index"
+                :label="item.label"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="orderLogisticsModeList"
+          label="实体、批发商品需打印的订单物流方式"
+        >
+          <template slot-scope="scope">
+            <el-checkbox-group
+              :true-label="1"
+              :false-label="0"
+              v-model="shopOrderModeCheckList[scope.$index]"
+            >
+              <el-checkbox
+                v-for="(item, index) of orderLogisticsModeCheckGroup"
+                :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="scope.row.unite" placeholder="请选择联数">
+              <el-option
+                v-for="(item, index) of 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="tableOrderRefundData"
+        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="scope.row.tep"
+              placeholder="请选择小票模板"
+              @change="handleTepOptions(scope.row, scope.$index)"
+            >
+              <el-option
+                v-for="(item, index) of 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="300"
+          prop="printableItemTypesList"
+          label="可打印商品类型"
+        >
+          <template slot-scope="scope">
+            <el-checkbox-group
+              :true-label="1"
+              :false-label="2"
+              v-model="orderRefundCheckList[scope.$index]"
+              class="checkbox-groups"
+            >
+              <el-checkbox
+                v-for="(item, index) of printableItemTypeCheckGroup"
+                :key="index"
+                :label="item.label"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="orderLogisticsModeList"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="printConnectionNum"
+          label="打印联数"
+        >
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.unite" placeholder="请选择联数">
+              <el-option
+                v-for="(item, index) of 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="tableVerificationOrderData"
+        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="scope.row.tep"
+              placeholder="请选择小票模板"
+              @change="handleTepOptions(scope.row, scope.$index)"
+            >
+              <el-option
+                v-for="(item, index) of 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="300"
+          prop="printableItemTypesList"
+          label="可打印商品类型"
+        >
+          <template slot-scope="scope">
+            <el-checkbox-group
+              :true-label="1"
+              :false-label="2"
+              v-model="verificationCheckList"
+              class="checkbox-groups"
+            >
+              <el-checkbox
+                v-for="(item, index) of verificationCheckGroup"
+                :key="index"
+                :label="item.label"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="orderLogisticsModeList"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="printConnectionNum"
+          label="打印联数"
+        >
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.unite" placeholder="请选择联数">
+              <el-option
+                v-for="(item, index) of 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="tableMemberRechargeData"
+        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="scope.row.tep"
+              placeholder="请选择小票模板"
+              @change="handleTepOptions(scope.row, scope.$index)"
+            >
+              <el-option
+                v-for="(item, index) of 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="300"
+          prop="printableItemTypesList"
+          label=""
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="orderLogisticsModeList"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="printConnectionNum"
+          label="打印联数"
+        >
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.unite" placeholder="请选择联数">
+              <el-option
+                v-for="(item, index) of 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="tableCashierData"
+        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="scope.row.tep"
+              placeholder="请选择小票模板"
+              @change="handleTepOptions(scope.row, scope.$index)"
+            >
+              <el-option
+                v-for="(item, index) of 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="300"
+          prop="printableItemTypesList"
+          label=""
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="orderLogisticsModeList"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="printConnectionNum"
+          label="打印联数"
+        >
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.unite" placeholder="请选择联数">
+              <el-option
+                v-for="(item, index) of 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" @click="handerTestPrint" disabled>
+        测试打印
+      </el-button>
+      <el-button class="btn" size="medium" type="primary" @click="handerSubmit">
+        保存
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  getPrinterDetail,
+  getPrinterModelList,
+  getPrinterflagList,
+  addPrinter,
+  updatePrinterInfo,
+  testPrinter,
+} from '@/api/printer/printer'
+export default {
+  name: 'addCloudPrint',
+  data() {
+    return {
+      printer_id: null,
+      isDisabled: true,
+      rules: {
+        printer_name: [
+          { required: true, message: '请输入打印机名称', trigger: 'blur' },
+        ],
+        model_id: [
+          { required: true, message: '请选择打印机品牌', trigger: 'change' },
+        ],
+        printer_sn: [
+          { required: true, message: '请输入打印机编号', trigger: 'blur' },
+        ],
+        printer_key: [
+          { required: true, message: '请输入打印机编号', trigger: 'blur' },
+        ],
+        website_url: [
+          { required: true, message: '请填写URL', trigger: 'blur' },
+          //{ pattern: /^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/, message: '请输入有效的网址', trigger: 'blur' }
+        ],
       },
-      watch:{
-          form:{
-              handler(val){
-                  if(val.value == '选项2'){
-                      this.isDisabled = false;
-                  }else{
-                      this.isDisabled = true;
-                  }
-              },
-              deep:true
-          }
+      options: [
+        {
+          model_id: 58,
+          model_name: '365云打印S2(编号kdt2)',
+          website_url: 'www.test.com',
+        },
+      ],
+      form: {
+        printer_name: '',
+        model_id: null,
+        printer_sn: '',
+        printer_key: '',
+        website_url: '',
+        // activityType: [],
+        // tepOptions: [],
+        paper_with: 58,
+        flag: 1,
       },
-      created(){
-          this.getCloudPrintInfo();
-          this.getTepOptions();
-      },
-      methods:{
-          getCloudPrintInfo(){
-            this.printId = this.$route.query.printId;
-          },
-          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')
-                      }
-                  }    
-              })
-          },
+      flagRadioGroup: [
+        {
+          region_id: 1,
+          region: '收银台',
+          status: 1,
+        },
+      ],
+      printableItemTypeCheckGroup: [
+        {
+          label: 1,
+          name: '实体商品',
+        },
+        {
+          label: 2,
+          name: '虚拟商品',
+        },
+        {
+          label: 3,
+          name: '批发商品',
+        },
+        {
+          label: 4,
+          name: '预约到店',
+        },
+        {
+          label: 5,
+          name: '当面付',
+        },
+      ],
+      orderLogisticsModeCheckGroup: [
+        {
+          label: 1,
+          name: '快递',
+        },
+        {
+          label: 2,
+          name: '自提',
+        },
+        {
+          label: 3,
+          name: '同城配送',
+        },
+      ],
+      verificationCheckGroup: [
+        {
+          label: 1,
+          name: '自提订单',
+        },
+        {
+          label: 2,
+          name: '预约到店',
+        },
+        {
+          label: 3,
+          name: '优惠卷核销',
+        },
+        {
+          label: 4,
+          name: '礼包商品',
+        },
+        {
+          label: 5,
+          name: '酒店预订',
+        },
+      ],
+      tepOptions: [
+        {
+          value: 1,
+          label: '黄金糕',
+        },
+        {
+          value: 2,
+          label: '黄金糕2',
+        },
+      ],
+      shopOrderCheckList: [
+        [1, 2, 3, 4],
+        [1, 2, 3, 4],
+      ],
+      shopOrderModeCheckList: [
+        [1, 2, 3, 4],
+        [1, 2, 3, 4],
+      ],
+      orderRefundCheckList: [
+        [1, 2, 3, 4],
+        [1, 2, 3, 4],
+        [1, 2, 3, 4],
+        [1, 2, 3, 4],
+      ],
+      verificationCheckList: [1, 2, 3, 4],
+      uniteOptions: [
+        {
+          value: 1,
+          label: 1,
+        },
+        {
+          value: 2,
+          label: 2,
+        },
+        {
+          value: 3,
+          label: 3,
+        },
+        {
+          value: 4,
+          label: 4,
+        },
+      ],
+      tableOrderData: [
+        {
+          printTimingName: '付款后',
+          state: 0,
+          tep: null,
+          unite: 1,
+        },
+        {
+          printTimingName: '手动打印',
+          state: 0,
+          tep: null,
+          unite: 1,
+        },
+      ],
+      tableOrderRefundData: [
+        {
+          printTimingName: '申请售后退款',
+          state: 0,
+          tep: null,
+          unite: 1,
+        },
+        {
+          printTimingName: '售后退款完成',
+          state: 0,
+          tep: null,
+          unite: 1,
+        },
+        {
+          printTimingName: '关闭订单并退款',
+          state: 0,
+          tep: null,
+          unite: 1,
+        },
+        {
+          printTimingName: '逐一退款',
+          state: 0,
+          tep: null,
+          unite: 1,
+        },
+      ],
+      tableVerificationOrderData: [
+        {
+          printTimingName: '核销完成',
+          state: 0,
+          tep: null,
+          unite: 1,
+        },
+      ],
+      tableMemberRechargeData: [
+        {
+          printTimingName: '会员充值成功',
+          state: 0,
+          tep: null,
+          unite: 1,
+        },
+        {
+          printTimingName: '后台手动充值',
+          state: 0,
+          tep: null,
+          unite: 1,
+        },
+      ],
+      tableCashierData: [
+        {
+          printTimingName: '交接班成功',
+          state: 0,
+          tep: null,
+          unite: 1,
+        },
+      ],
+    }
+  },
+  watch: {
+    // form: {
+    //   handler(val) {
+    //     if (val.paper_with == 80) {
+    //       this.isDisabled = false
+    //     } else {
+    //       this.isDisabled = true
+    //     }
+    //   },
+    //   deep: true,
+    // },
+  },
+  created() {
+    let id = this.$route.query.id
+    if (id) {
+      this.printer_id = id
+      this.getPrinterDetail()
+    }
+    this.getPrinterModelList()
+    this.getPrinterflagList()
+  },
+  methods: {
+    async getPrinterModelList() {
+      let res = await getPrinterModelList({ count: 99 })
+      if (res && res.status == 200) {
+        this.options = res.data
+        if (this.form.model_id) {
+          this.form.website_url = this.options[0].website_url
+        }
+        if (this.options[0].paper_with == 80) {
+          this.isDisabled = false
+        }
       }
+    },
+    async getPrinterDetail() {
+      let res = await getPrinterDetail({ printer_id: this.printer_id })
+      if (res && res.status == 200) {
+        this.form = {
+          ...this.form,
+          ...res.data,
+        }
+      }
+    },
+    async getPrinterflagList() {
+      let res = await getPrinterflagList({ count: 99 })
+      if (res && res.status == 200) {
+        this.flagRadioGroup = res.data
+      }
+    },
+    handerChangeType(id) {
+      let item = this.options.find((item) => item.model_id == id)
+      if (item) {
+        this.form.website_url = item.website_url
+
+        if (item.paper_with == 58) {
+          this.isDisabled = true
+        } else {
+          this.isDisabled = false
+        }
+      }
+    },
+    handerState(item, index) {},
+    handerStoreCheckbox(index) {},
+    handleTepOptions(item, index) {},
+    async handerTestPrint() {
+      let res = testPrinter({ orderId: 'DD-20241112-1' })
+    },
+    async handerSubmit() {
+      let params = {
+        model_id: this.form.model_id,
+        printer_name: this.form.printer_name,
+        printer_sn: this.form.printer_sn,
+        printer_key: this.form.printer_key,
+        region_id: this.form.flag,
+        paper_with: this.form.paper_with,
+        website_url: this.form.website_url,
+      }
+      console.log(this.form)
+
+      if (this.printer_id) {
+        params = {
+          printer_id: this.form.printer_id,
+          ...params,
+        }
+      }
+
+      this.$refs['formSet'].validate(async (valid) => {
+        if (valid) {
+          let res = this.printer_id
+            ? await updatePrinterInfo(params)
+            : await addPrinter(params)
+          if (res && res.status == 200) {
+            this.$baseMessage(res.msg, 'success')
+            this.$router.push({ path: '/plotterManager' })
+          } else {
+            this.$baseMessage(res.msg, 'error')
+          }
+        }
+
+        // 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;
   }
-  </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;
-          }
-      }
+
+  .table-item-title {
+    font-weight: bold;
   }
-  </style>
-  
\ No newline at end of file
+
+  .block-content {
+    margin-bottom: 20px;
+    background: #fff;
+
+    .title {
+      color: #333;
+    }
+
+    &-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;
+          padding: 20px 10px;
+
+          div {
+            background: #f6f8f9;
+          }
+        }
+
+        .el-table__cell:first-child {
+          div {
+            font-weight: bold !important;
+            color: #000 !important;
+          }
+        }
+      }
+    }
+
+    .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;
+        cursor: pointer;
+
+        &:hover {
+          .lable-box {
+            opacity: 1;
+            visibility: visible;
+          }
+        }
+
+        .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, 0.2);
+          white-space: nowrap;
+          opacity: 0;
+          transition: opacity 0.4s ease-out;
+          visibility: hidden;
+
+          &::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__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;
+      }
+    }
+  }
+
+  .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>
diff --git a/src/views/store/base/cloudPrint/editTemplateManagement.vue b/src/views/store/base/cloudPrint/editTemplateManagement.vue
index a342f17..c56cd64 100644
--- a/src/views/store/base/cloudPrint/editTemplateManagement.vue
+++ b/src/views/store/base/cloudPrint/editTemplateManagement.vue
@@ -1,13 +1,3606 @@
 <template>
-    <div class="">76</div>
+  <div class="addTemplateManagement-container">
+    <div class="block-content block-content-set">
+      <div class="title">模版信息</div>
+      <el-form
+        ref="formSet"
+        class="form-block"
+        :model="form"
+        label-width="160px"
+      >
+        <el-form-item label="模版类型" class="form-page-size-item">
+          <el-radio-group v-model="form.resource">
+            <el-radio class="el-item-radio" :label="1">商品订单</el-radio>
+            <el-radio class="el-item-radio" :label="2">订单退款</el-radio>
+            <el-radio class="el-item-radio" :label="3">核销凭证</el-radio>
+            <el-radio class="el-item-radio" :label="4">会员充值</el-radio>
+            <el-radio class="el-item-radio" :label="5">收银交班</el-radio>
+          </el-radio-group>
+          <div class="tips">
+            商品订单模板不包含礼品卡、酒店、知识付费、会员卡等非商品类型的订单打印；
+            <br />
+            模板创建后，类型将不可更改。
+          </div>
+        </el-form-item>
+        <el-form-item
+          label="模版名称"
+          prop="tepName"
+          :rules="{
+            required: true,
+            message: '请输入模版名称',
+            trigger: 'blur',
+          }"
+        >
+          <el-input
+            v-model="form.tepName"
+            :maxlength="20"
+            placeholder="请输入模版名称"
+            size="medium"
+            show-word-limit
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="content-container">
+      <div class="block-left">
+        <div class="title">模板编辑</div>
+        <div class="block-box">
+          <div class="block-item">
+            <div class="box-title">票头</div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['header_info']['template_status']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                小票名称
+              </el-checkbox>
+              <el-input
+                class="receipt-input"
+                v-model="printData['header_info']['template_name']"
+                :maxlength="20"
+                placeholder="请输入小票名称"
+                size="medium"
+                show-word-limit
+              ></el-input>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['template_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['template_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['header_info']['shop_name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                商城名称（门店）
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['shop_name_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['shop_name_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="tips">多门店模式下，此处将显示下单门店的门店名称。</div>
+            <div class="block-group" v-show="form.resource == 3">
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['header_info']['write_off_name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                核销员名称
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['header_info']['write_off_time']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                核销时间
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['header_info']['order_no']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                订单编号
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['header_info']['write_off_type']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                核销类型
+              </el-checkbox>
+            </div>
+            <div class="block-group" v-show="form.resource == 5">
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['header_info']['open_time']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                营业时间
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['header_info']['print_time']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                打印时间
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['header_info']['print_people']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                打印人
+              </el-checkbox>
+            </div>
+            <div class="block-group" v-show="[1, 2].includes(form.resource)">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['header_info']['gen_num']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                取单号
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['gen_num_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['gen_num_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group" v-show="form.resource == 1">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['header_info']['order_sort']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                订单顺序号（日）
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">前缀</div>
+                <el-input
+                  class="receipt-input"
+                  v-model="printData['header_info']['order_sort_prefix']"
+                  :maxlength="4"
+                  placeholder="请输入订单顺序号（日）"
+                  size="medium"
+                  show-word-limit
+                ></el-input>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name" style="width: 100px">
+                  排序订单
+                </div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['order_sort_type']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sortOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group" v-show="form.resource == 1">
+              <div class="group-checkbox"></div>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['order_sort_font_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['order_sort_font_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="tips" v-show="form.resource == 1">
+              每个自然日根据订单的付款时间所记录的有序自增编号，从001开始记录，每天0点重置。
+            </div>
+            <div class="block-group" v-show="[1, 2].includes(form.resource)">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['header_info']['quick_buy']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                快速购买渠道
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['quick_buy_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['quick_buy_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="tips" v-show="[1, 2].includes(form.resource)">
+              仅通过扫描快速购买渠道二维码产生的订单才会显示。
+            </div>
+            <div class="block-group" v-show="form.resource == 1">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['header_info']['customer_mark']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                买家备注
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['customer_mark_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['customer_mark_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group" v-show="form.resource == 1">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['header_info']['selfsend_time']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                自提/配送时间
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['selfsend_time_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['header_info']['selfsend_time_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="tips" v-show="form.resource == 1">
+              仅同城、自提方式的实体订单会显示该时间信息。
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource == 4">
+          <div class="block-item">
+            <div class="box-title">充值信息</div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['recharge_info']['recharge_money']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+                disabled
+              >
+                充值金额
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['recharge_info']['recharge_money_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['recharge_info']['recharge_money_blod']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['recharge_info']['send_money']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                赠送金额
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['recharge_info']['send_money_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['recharge_info']['send_money_blod']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['recharge_info']['customer_balance']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                账户余额
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['recharge_info']['customer_balance_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['recharge_info']['customer_balance_blod']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource == 5">
+          <div class="block-item">
+            <div class="box-title">收银员信息</div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['stand_info']['name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                员工名称
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['stand_info']['start_time']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                开始时间
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['stand_info']['end_time']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                结束时间
+              </el-checkbox>
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource == 5">
+          <div class="block-item">
+            <div class="box-title">日结营业汇总</div>
+            <div class="block-group">
+              <div class="block-group" style="margin: 0; padding: 0">
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['finish_info']['all']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  总交易额
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['finish_info']['pay_order_count']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  支付订单数
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['finish_info']['sale_goods_count']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  出售商品件数
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['finish_info']['card_price']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  会员卡交易额
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['finish_info']['recharge_money_price']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  余额充值金额
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['finish_info']['refund_price']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  退款金额
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['finish_info']['refund_order_count']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  退款订单数
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['finish_info']['refund_goods_count']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  退款件数
+                </el-checkbox>
+              </div>
+            </div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['finish_info']['real_money']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                实营收额
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['finish_info']['real_money_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['finish_info']['real_money_blod']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource == 5">
+          <div class="block-item">
+            <div class="box-title">支付方式组成</div>
+            <div class="block-group">
+              <div class="block-group" style="margin: 0; padding: 0">
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['pay_type_info']['wechat']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  微信
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['pay_type_info']['ali']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  支付宝
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['pay_type_info']['cash']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  现金
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['pay_type_info']['balance']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  余额
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['pay_type_info']['other']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  其他线下方式
+                </el-checkbox>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource == 5">
+          <div class="block-item">
+            <div class="box-title">核销记录</div>
+            <div class="block-group">
+              <div class="block-group" style="margin: 0; padding: 0">
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['checkstand_writeoff']['self']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  自提订单
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['checkstand_writeoff']['virtual']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  虚拟核销订单
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['checkstand_writeoff']['timegoods']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  计次时卡券
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['checkstand_writeoff']['booking']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  预约到店
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['checkstand_writeoff']['giftpackage']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  礼包商品
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['checkstand_writeoff']['coupon']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  优惠券
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['checkstand_writeoff']['hotel']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  酒店预订
+                </el-checkbox>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="[1, 2].includes(form.resource)">
+          <div class="block-item">
+            <div class="box-title">订单基础信息</div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['order_info']['order_no']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                订单编号
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['order_info']['order_from']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                订单来源
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['order_info']['order_goods_type']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                商品类型
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['order_info']['order_pay_type']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                支付方式
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['order_info']['order_status']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                订单状态
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['order_info']['order_dispatch_name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                配送方式
+              </el-checkbox>
+            </div>
+            <div class="block-group" style="margin-top: 10px">
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['order_info']['order_create_time']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                下单时间
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['order_info']['order_pay_time']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                付款时间
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['order_info']['order_finish_time']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                完成时间
+              </el-checkbox>
+              <el-checkbox
+                style="margin-right: 40px"
+                class="group-checkbox-1"
+                v-model="printData['order_info']['refund_create_time']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+                v-show="form.resource == 2"
+              >
+                申请退款时间
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['order_info']['refund_finish_time']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+                v-show="form.resource == 2"
+              >
+                退款完成时间
+              </el-checkbox>
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="[1, 3].includes(form.resource)">
+          <div class="block-item">
+            <div class="box-title">商品信息</div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['make_info']['goods_name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+                disabled
+              >
+                商品名称
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['make_info']['goods_name_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['make_info']['goods_name_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['make_info']['num']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+                disabled
+              >
+                商品数量
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['make_info']['num_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['make_info']['num_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group" style="margin-top: 30px">
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['make_info']['goods_code']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                编码
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['make_info']['product_sn']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                条形码
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['make_info']['attach']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                附加规格
+              </el-checkbox>
+            </div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['make_info']['price']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                商品金额
+              </el-checkbox>
+              <div class="block-select">
+                <div style="width: 100px" class="block-select-name">
+                  金额方式
+                </div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['make_info']['goods_price_type']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['make_info']['gift_info']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                赠品明细
+              </el-checkbox>
+            </div>
+            <div class="tips">显示“满赠”“消费奖励”活动所产生的赠品明细。</div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource == 2">
+          <div class="block-item">
+            <div class="box-title">退款商品信息</div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['make_info']['goods_name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+                disabled
+              >
+                商品名称
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-1"
+                v-model="printData['make_info']['num']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+                disabled
+              >
+                商品数量
+              </el-checkbox>
+              <el-checkbox
+                style="margin-right: 40px"
+                class="group-checkbox-1"
+                v-model="printData['make_info']['real_price']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                商品实付款
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['make_info']['real_price_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['make_info']['real_price_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource == 2">
+          <div class="block-item">
+            <div class="box-title">退款原由/明细</div>
+            <div class="block-group">
+              <div class="block-group" style="margin: 0; padding: 0">
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['refund']['type']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  退款方式
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['refund']['apply_time']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  申请售后时间
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['refund']['apply_money']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  申请售后金额
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['refund']['apply_reason']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  申请原因
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['refund']['apply_detail']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  退款金额明细
+                </el-checkbox>
+              </div>
+            </div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['refund']['apply_real']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                实退金额
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['refund']['apply_real_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['refund']['apply_real_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="tips">
+              退款方式包含后台关闭订单退款、逐一退款、售后（仅退款）、售后（退款退货）；
+              <br />
+              仅售后单才会显示“申请售后时间”“申请售后金额”“申请原因”
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource == 1">
+          <div class="block-item">
+            <div class="box-title">订单金额</div>
+            <div class="block-group">
+              <div class="block-group" style="margin: 0; padding: 0">
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['order_price']['goods_count']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  商品总件数
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['order_price']['price_detail']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  金额明细
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['order_price']['discount_detail']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  优惠明细
+                </el-checkbox>
+              </div>
+            </div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['order_price']['pay_price']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                实付金额
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['make_info']['real_price_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['make_info']['real_price_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource == 1">
+          <div class="block-item">
+            <div class="box-title">其他订单信息</div>
+            <div class="block-group">
+              <div class="block-group" style="margin: 0; padding: 0">
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['mark_info']['form_data']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  订单表单
+                </el-checkbox>
+              </div>
+            </div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['mark_info']['saler_mark']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                商家备注
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['mark_info']['saler_mark_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['mark_info']['saler_mark_bold']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource == 3">
+          <div class="block-item">
+            <div class="box-title">核销信息</div>
+            <div class="block-group" v-show="[1, 3].includes(form.resource)">
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['write_off_info']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                核销信息
+              </el-checkbox>
+            </div>
+            <div class="tips">
+              根据核销类型显示订单的核销自提点、门店、预约信息、酒店入住信息等。
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource != 5">
+          <div class="block-item">
+            <div class="box-title">
+              {{ form.resource == 1 ? '买家/收货信息' : '会员信息' }}
+            </div>
+            <div class="block-group">
+              <div class="block-group" style="margin: 0; padding: 0">
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['customer_info']['customer_name']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  买家昵称
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['customer_info']['customer_mobile']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                  v-show="[4].includes(form.resource)"
+                >
+                  {{ form.resource == 4 ? '会员手机号' : '买家手机号' }}
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['customer_info']['customer_realname']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  真实姓名
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['customer_info']['customer_balance']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                  v-show="[1, 2, 4].includes(form.resource)"
+                >
+                  余额
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['customer_info']['customer_credit']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                  v-show="[1, 2, 4].includes(form.resource)"
+                >
+                  积分
+                </el-checkbox>
+                <el-checkbox
+                  class="group-checkbox-2"
+                  v-model="printData['customer_info']['customer_remark']"
+                  :true-label="1"
+                  :false-label="0"
+                  size="medium"
+                >
+                  会员备注
+                </el-checkbox>
+              </div>
+            </div>
+            <div class="block-group" v-show="[1, 2].includes(form.resource)">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['customer_info']['customer_mobile']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                买家手机号
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">脱敏</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['customer_info']['customer_mobile_des']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in mobileOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group" v-show="form.resource == 1">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['customer_info']['buyer_name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                收货人姓名
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['customer_info']['buyer_name_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['customer_info']['buyer_name_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group" v-show="form.resource == 1">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['customer_info']['buyer_mobile']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                收货人联系方式
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['customer_info']['buyer_mobile_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['customer_info']['buyer_mobile_blod']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">脱敏</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['customer_info']['buyer_mobile_des']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in mobileOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group" v-show="form.resource == 1">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['customer_info']['buyer_address']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                收货人地址
+              </el-checkbox>
+              <div class="block-select">
+                <div class="block-select-name">字号</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['customer_info']['buyer_address_size']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in sizeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+              <div class="block-select">
+                <div class="block-select-name">粗体</div>
+                <el-select
+                  class="select-box"
+                  v-model="printData['customer_info']['buyer_address_blod']"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in boldOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </div>
+            </div>
+            <div class="block-group" v-show="form.resource == 1">
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['customer_info']['invoice']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                是否开具发票
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['customer_info']['invoice_info']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                发票信息
+              </el-checkbox>
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource == 1">
+          <div class="block-item">
+            <div class="box-title">自提/预约门店</div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['pick_store']['store_name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                门店名称
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['pick_store']['store_address']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                门店地址（预约地址）
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['pick_store']['store_contact']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                门店联系人
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['pick_store']['store_contact_name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                门店联系方式
+              </el-checkbox>
+            </div>
+            <div class="tips">
+              仅自提、预约类型订单将显示此部分信息；
+              <br />
+              预约商品的地址若为自定义地址，则仅会显示“预约地址”字段，无门店名称、联系人及联系方式。
+            </div>
+          </div>
+        </div>
+        <div class="block-box" v-show="form.resource != 5">
+          <div class="block-item">
+            <div class="box-title">底部信息</div>
+            <div class="block-group" v-show="[1, 3, 4].includes(form.resource)">
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['footer_info']['stand_name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+                v-show="[1].includes(form.resource)"
+              >
+                收银员名称
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['footer_info']['cashier_name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+                v-show="[1].includes(form.resource)"
+              >
+                导购员名称
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['footer_info']['shop_name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                商城名称
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['footer_info']['shop_phone']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                商城联系方式
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['footer_info']['store_name']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                门店名称
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['footer_info']['store_phone']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                门店联系方式
+              </el-checkbox>
+            </div>
+            <div class="block-group" v-show="[1, 3, 4].includes(form.resource)">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['footer_info']['shop_qrcode']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                二维码
+              </el-checkbox>
+              <el-select
+                style="width: 160px"
+                class="select-box"
+                v-model="printData['footer_info']['shop_qrcode_type']"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in qrCodeOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+              <el-input
+                style="width: 400px"
+                class="receipt-input"
+                v-model="printData['footer_info']['shop_qrcode_url']"
+                placeholder="请输入链接地址"
+                size="medium"
+              ></el-input>
+            </div>
+            <div class="block-group">
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['footer_info']['manage']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+                v-show="form.resource == 2"
+              >
+                操作人
+              </el-checkbox>
+              <el-checkbox
+                class="group-checkbox-2"
+                v-model="printData['footer_info']['print_time']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                小票打印时间
+              </el-checkbox>
+            </div>
+            <div class="block-group" v-show="[1, 3, 4].includes(form.resource)">
+              <el-checkbox
+                class="group-checkbox"
+                v-model="printData['footer_info']['print_footer']"
+                :true-label="1"
+                :false-label="0"
+                size="medium"
+              >
+                自定义文本
+              </el-checkbox>
+              <el-input
+                style="width: 560px"
+                v-model="printData['footer_info']['print_footer_info']"
+                :maxlength="20"
+                placeholder="请输入模版名称"
+                size="medium"
+                show-word-limit
+              ></el-input>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="block-right">
+        <div class="title">预览图</div>
+        <div class="block-container">
+          <!-- <div v-for="(item,index) of receiptConfig" :key="index" :class="[item.class,test(item.classText)]" :style="item.style" v-show=" item.show.length > 0 ?  test2(item.show) : test3(item.handerChekcItems)">
+                        {{ item.data != '' ? item.data  : item.dataKey.length > 0 ? printData[item.dataKey[0]][item.dataKey[1]] : '' }}
+                        <div v-if="item.children.length > 0 ">
+                            <div :style="group.style" :class="[group.class,test(group.classText)]" v-for="(group,index2) of item.children" :key="index2" v-show="(group.show)">
+                                {{ handerText(group)  }}
+                            </div>
+                        </div>
+                    </div> -->
+          <div
+            style="padding-bottom: 10px"
+            :class="[
+              'block-content',
+              'item-block',
+              classItem('header_info', 'template_size', 'template_bold'),
+            ]"
+            v-show="showItem('header_info', 'template_status')"
+          >
+            {{ printData.header_info.template_name || '小票名称' }}
+          </div>
+          <div
+            style="padding-bottom: 10px"
+            :class="[
+              'block-content',
+              'item-block',
+              classItem('header_info', 'shop_name_size', 'shop_name_bold'),
+            ]"
+            v-show="showItem('header_info', 'shop_name')"
+          >
+            商城名称
+          </div>
+          <div
+            class="block-content item-small-size"
+            v-show="
+              handerChekcItem('recharge_info', [
+                'recharge_money',
+                'send_money',
+                'customer_balance',
+              ]) && [3].includes(form.resource)
+            "
+          >
+            <div
+              class="item-block-left"
+              v-show="showItem('header_info', 'write_off_name')"
+            >
+              核销员：张三
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('header_info', 'write_off_time')"
+            >
+              核销时间：2023-12-12 14:20:20
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('header_info', 'order_no')"
+            >
+              订单编号：ES20231026111444527685
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('header_info', 'write_off_type')"
+            >
+              核销类型：自提订单
+            </div>
+          </div>
+          <div
+            class="block-content item-small-size"
+            v-show="
+              handerChekcItem('header_info', [
+                'open_time',
+                'print_time',
+                'print_people',
+              ]) && form.resource == 5
+            "
+          >
+            <div
+              class="item-block-left"
+              v-show="showItem('header_info', 'open_time')"
+            >
+              营业时间：2023-02-17
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('header_info', 'print_time')"
+            >
+              打印时间：2023-02-28 16:29:29
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('header_info', 'print_people')"
+            >
+              打印人：张三
+            </div>
+          </div>
+          <div
+            class="block-content item-small-size"
+            v-show="
+              handerChekcItem('stand_info', [
+                'name',
+                'start_time',
+                'end_time',
+              ]) && form.resource == 5
+            "
+          >
+            <div
+              class="item-block-left"
+              v-show="showItem('stand_info', 'name')"
+            >
+              收银员：李四
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('stand_info', 'start_time')"
+            >
+              开始：2023-02-28 16:29:29
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('stand_info', 'end_time')"
+            >
+              结束：2023-02-28 16:29:29
+            </div>
+          </div>
+          <div
+            class="block-content item-small-size"
+            v-show="
+              handerChekcItem('finish_info', [
+                'all',
+                'pay_order_count',
+                'sale_goods_count',
+                'card_price',
+                'recharge_money_price',
+                'refund_price',
+                'refund_order_count',
+                'refund_goods_count',
+                'real_money',
+              ]) && form.resource == 5
+            "
+          >
+            <div class="item-block gift-block">
+              <div class="gift-boder"></div>
+              <div class="gift-num item-small-size bold">营业汇总</div>
+              <div class="gift-boder"></div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('finish_info', 'all')"
+            >
+              <div class="item-balance-info-name">总交易额</div>
+              <div class="item-balance-info-num">31000</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('finish_info', 'pay_order_count')"
+            >
+              <div class="item-balance-info-name">支付订单数</div>
+              <div class="item-balance-info-num">3600</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('finish_info', 'sale_goods_count')"
+            >
+              <div class="item-balance-info-name">出售商品件数</div>
+              <div class="item-balance-info-num">5000</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('finish_info', 'card_price')"
+            >
+              <div class="item-balance-info-name">会员卡交易额</div>
+              <div class="item-balance-info-num">3546</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('finish_info', 'recharge_money_price')"
+            >
+              <div class="item-balance-info-name">余额充值金额</div>
+              <div class="item-balance-info-num">9555</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('finish_info', 'refund_price')"
+            >
+              <div class="item-balance-info-name">退款金额</div>
+              <div class="item-balance-info-num">3000</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('finish_info', 'refund_order_count')"
+            >
+              <div class="item-balance-info-name">退款订单数</div>
+              <div class="item-balance-info-num">30</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('finish_info', 'refund_goods_count')"
+            >
+              <div class="item-balance-info-name">退款件数</div>
+              <div class="item-balance-info-num">20</div>
+            </div>
+            <div
+              :class="[
+                'item-block',
+                'item-balance-info',
+                classItem('finish_info', 'real_money_size', 'real_money_blod'),
+              ]"
+              v-show="showItem('finish_info', 'real_money')"
+            >
+              <div class="item-balance-info-name">实营收额</div>
+              <div class="item-balance-info-num">250000</div>
+            </div>
+          </div>
+          <div
+            class="block-content item-small-size"
+            v-show="
+              handerChekcItem('pay_type_info', [
+                'wechat',
+                'ali',
+                'cash',
+                'balance',
+                'other',
+              ]) && form.resource == 5
+            "
+          >
+            <div class="item-block gift-block">
+              <div class="gift-boder"></div>
+              <div class="gift-num item-small-size bold">支付方式组成</div>
+              <div class="gift-boder"></div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('pay_type_info', 'wechat')"
+            >
+              <div class="item-balance-info-name">微信</div>
+              <div class="item-balance-info-num">31000</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('pay_type_info', 'ali')"
+            >
+              <div class="item-balance-info-name">支付宝</div>
+              <div class="item-balance-info-num">3600</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('pay_type_info', 'cash')"
+            >
+              <div class="item-balance-info-name">现金</div>
+              <div class="item-balance-info-num">5000</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('pay_type_info', 'balance')"
+            >
+              <div class="item-balance-info-name">余额</div>
+              <div class="item-balance-info-num">3546</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('pay_type_info', 'other')"
+            >
+              <div class="item-balance-info-name">其他线下方式</div>
+              <div class="item-balance-info-num">9555</div>
+            </div>
+          </div>
+          <div
+            class="block-content item-small-size"
+            v-show="
+              handerChekcItem('checkstand_writeoff', [
+                'self',
+                'virtual',
+                'timegoods',
+                'booking',
+                'giftpackage',
+                'coupon',
+                'hotel',
+              ]) && form.resource == 5
+            "
+          >
+            <div class="item-block gift-block">
+              <div class="gift-boder"></div>
+              <div class="gift-num item-small-size bold">核销记录</div>
+              <div class="gift-boder"></div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('checkstand_writeoff', 'self')"
+            >
+              <div class="item-balance-info-name">自提订单</div>
+              <div class="item-balance-info-num">100单</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('checkstand_writeoff', 'virtual')"
+            >
+              <div class="item-balance-info-name">虚拟核销订单</div>
+              <div class="item-balance-info-num">200单</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('checkstand_writeoff', 'timegoods')"
+            >
+              <div class="item-balance-info-name">计次时卡券</div>
+              <div class="item-balance-info-num">5000</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('checkstand_writeoff', 'booking')"
+            >
+              <div class="item-balance-info-name">余额</div>
+              <div class="item-balance-info-num">35406</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('checkstand_writeoff', 'giftpackage')"
+            >
+              <div class="item-balance-info-name">预约到店</div>
+              <div class="item-balance-info-num">500次</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('checkstand_writeoff', 'coupon')"
+            >
+              <div class="item-balance-info-name">优惠券</div>
+              <div class="item-balance-info-num">30张</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('checkstand_writeoff', 'hotel')"
+            >
+              <div class="item-balance-info-name">酒店预订</div>
+              <div class="item-balance-info-num">5单</div>
+            </div>
+          </div>
+          <div
+            class="block-content"
+            v-show="
+              handerChekcItem('header_info', [
+                'gen_num',
+                'order_sort',
+                'quick_buy',
+                'customer_mark',
+                'selfsend_time',
+              ]) && [1, 2].includes(form.resource)
+            "
+          >
+            <div
+              :class="[
+                'item-block',
+                classItem('header_info', 'gen_num_size', 'gen_num_bold'),
+              ]"
+              v-show="showItem('header_info', 'gen_num')"
+            >
+              #0001
+            </div>
+            <div
+              :class="[
+                'item-block',
+                classItem(
+                  'header_info',
+                  'order_sort_font_size',
+                  'order_sort_font_bold'
+                ),
+              ]"
+              v-show="
+                showItem('header_info', 'order_sort') && form.resource == 1
+              "
+            >
+              {{ printData.header_info.order_sort_prefix || '序号' }}
+            </div>
+            <div
+              :class="[
+                'item-block',
+                classItem('header_info', 'quick_buy_size', 'quick_buy_bold'),
+              ]"
+              v-show="showItem('header_info', 'quick_buy')"
+            >
+              快速购买渠道名称
+            </div>
+            <div
+              :class="[
+                'item-block-left',
+                classItem(
+                  'header_info',
+                  'customer_mark_size',
+                  'customer_mark_bold'
+                ),
+              ]"
+              v-show="
+                showItem('header_info', 'customer_mark') && form.resource == 1
+              "
+            >
+              买家备注：多用一层包装袋，送到后请打电话，谢谢！！
+            </div>
+            <div
+              :class="[
+                'item-block-left',
+                classItem(
+                  'header_info',
+                  'selfsend_time_size',
+                  'selfsend_time_bold'
+                ),
+              ]"
+              v-show="
+                showItem('header_info', 'selfsend_time') && form.resource == 1
+              "
+            >
+              配送时间：10-25 14:00-14:30
+            </div>
+          </div>
+          <div
+            class="block-content item-small-size"
+            v-show="
+              handerChekcItem('order_info', [
+                'order_no',
+                'order_from',
+                'order_goods_type',
+                'order_pay_type',
+                'order_status',
+                'order_dispatch_name',
+                'order_create_time',
+                'order_pay_time',
+                'order_finish_time',
+              ]) && [1, 2].includes(form.resource)
+            "
+          >
+            <div
+              class="item-block-left"
+              v-show="showItem('order_info', 'order_no')"
+            >
+              订单编号：ES20231026111444527685
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('order_info', 'order_from')"
+            >
+              订单来源：微信小程序
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('order_info', 'order_goods_type')"
+            >
+              商品类型：实体商品
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('order_info', 'order_pay_type')"
+            >
+              支付方式：微信支付
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('order_info', 'order_status')"
+            >
+              订单状态：已完成
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('order_info', 'order_dispatch_name')"
+            >
+              配送方式：同城配送
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('order_info', 'order_create_time')"
+            >
+              下单时间：2023-12-12 14:20:20
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('order_info', 'order_pay_time')"
+            >
+              付款时间：2023-12-12 14:20:20
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('order_info', 'order_finish_time')"
+            >
+              完成时间：2023-12-12 14:20:20
+            </div>
+            <div
+              class="item-block-left"
+              v-show="
+                showItem('order_info', 'refund_create_time') &&
+                form.resource == 2
+              "
+            >
+              申请退款时间：2023-12-12 14:20:20
+            </div>
+            <div
+              class="item-block-left"
+              v-show="
+                showItem('order_info', 'refund_finish_time') &&
+                form.resource == 2
+              "
+            >
+              退款完成时间：2023-12-12 14:20:20
+            </div>
+          </div>
+          <div
+            style="padding-bottom: 10px"
+            class="block-content"
+            v-show="form.resource == 2"
+          >
+            <div
+              class="item-block refund-block bold"
+              v-show="showItem('make_info', 'gift_info')"
+            >
+              <div class="refund-xing">*********************</div>
+              <div class="refund-num item-small-size">退款商品</div>
+              <div class="refund-xing">*********************</div>
+            </div>
+            <div class="item-block item-flex bold">
+              <div class="item-flex-1">商品名称</div>
+              <div class="item-flex-2">退款数量</div>
+              <div
+                class="item-flex-2"
+                v-show="showItem('make_info', 'real_price')"
+              >
+                实退款
+              </div>
+            </div>
+            <div
+              :class="[
+                'item-block-left',
+                classItem('make_info', 'real_price_size', 'real_price_bold'),
+              ]"
+              v-show="showItem('make_info', 'goods_name')"
+              style="padding: 0"
+            >
+              (退)可口可乐mini罐 经典碳酸饮料【新包装；200ml*12罐】
+            </div>
+            <div class="item-flex">
+              <div class="item-flex-1"></div>
+              <div
+                class="item-flex-2"
+                :class="
+                  classItem('make_info', 'real_price_size', 'real_price_bold')
+                "
+              >
+                [
+                <span style="padding: 0 5px">X 2</span>
+                ]
+              </div>
+              <div
+                class="item-flex-2"
+                :class="
+                  classItem('make_info', 'real_price_size', 'real_price_bold')
+                "
+                v-show="showItem('make_info', 'real_price')"
+              >
+                ¥54.5
+              </div>
+            </div>
+            <div
+              :class="[
+                'item-block-left',
+                classItem('make_info', 'real_price_size', 'real_price_bold'),
+              ]"
+              v-show="showItem('make_info', 'goods_name')"
+            >
+              (退)超薄液晶电视
+            </div>
+            <div class="item-flex">
+              <div class="item-flex-1"></div>
+              <div
+                class="item-flex-2"
+                :class="
+                  classItem('make_info', 'real_price_size', 'real_price_bold')
+                "
+              >
+                1
+              </div>
+              <div
+                class="item-flex-2"
+                :class="
+                  classItem('make_info', 'real_price_size', 'real_price_bold')
+                "
+                v-show="showItem('make_info', 'real_price')"
+              >
+                ¥1999
+              </div>
+            </div>
+          </div>
+          <div
+            class="block-content item-small-size"
+            v-show="
+              handerChekcItem('refund', [
+                'type',
+                'apply_time',
+                'apply_money',
+                'apply_reason',
+                'apply_real',
+                'apply_detail',
+              ]) && form.resource == 2
+            "
+          >
+            <div class="item-block-left" v-show="showItem('refund', 'type')">
+              退款方式：售后（仅退款）
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('refund', 'apply_time')"
+            >
+              申请售后时间：2023-12-12 14:20:20
+            </div>
+            <div
+              class="item-block item-flex"
+              v-show="showItem('refund', 'apply_money')"
+            >
+              申请金额：64.5
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('refund', 'apply_reason')"
+            >
+              申请原因：拍多了。
+            </div>
+            <div
+              :class="[
+                'item-block item-flex',
+                classItem('refund', 'apply_real_size', 'apply_real_bold'),
+              ]"
+              v-show="showItem('refund', 'apply_real')"
+            >
+              <div class="item-flex-1">实退金额</div>
+              <div class="item-flex-2">64.5</div>
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('refund', 'apply_detail')"
+            >
+              微信退款金额：50（原路退还）
+            </div>
+            <div
+              class="item-block-left"
+              v-show="showItem('refund', 'apply_detail')"
+            >
+              余额退款金额：14.5
+            </div>
+          </div>
+          <div
+            style="padding-bottom: 10px"
+            class="block-content"
+            v-show="[1, 3].includes(form.resource)"
+          >
+            <div class="item-block item-flex">
+              <div class="item-flex-1">商品名称</div>
+              <div class="item-flex-2">数量</div>
+              <div
+                class="item-flex-2"
+                v-show="showItem('order_price', 'pay_price')"
+              >
+                金额
+              </div>
+            </div>
+            <div
+              :class="[
+                'item-block-left',
+                classItem('make_info', 'goods_name_size', 'goods_name_bold'),
+              ]"
+              v-show="showItem('make_info', 'goods_name')"
+              style="padding: 0"
+            >
+              可口可乐mini罐 经典碳酸饮料【新包装；200ml*12罐】
+            </div>
+            <div
+              class="item-small-size"
+              v-show="showItem('make_info', 'goods_code')"
+            >
+              123456789
+            </div>
+            <div
+              style="margin: 0"
+              class="item-block-left item-small-size"
+              v-show="showItem('make_info', 'product_sn')"
+            >
+              6970448170051
+            </div>
+            <div class="item-flex">
+              <div class="item-flex-1"></div>
+              <div
+                class="item-flex-2"
+                :class="classItem('make_info', 'num_size', 'num_bold')"
+              >
+                [
+                <span style="padding: 0 5px">X 2</span>
+                ]
+              </div>
+              <div
+                class="item-flex-2"
+                :class="
+                  classItem('order_price', 'pay_price_size', 'pay_price_bold')
+                "
+                v-show="showItem('order_price', 'pay_price')"
+              >
+                ¥54.5
+              </div>
+            </div>
+            <div
+              :class="[
+                'item-block-left',
+                classItem('make_info', 'goods_name_size', 'goods_name_bold'),
+              ]"
+              v-show="showItem('make_info', 'goods_name')"
+            >
+              超薄液晶电视
+            </div>
+            <div
+              class="item-small-size"
+              v-show="showItem('make_info', 'goods_code')"
+            >
+              123456789
+            </div>
+            <div
+              style="margin: 0"
+              class="item-block-left item-small-size"
+              v-show="showItem('make_info', 'product_sn')"
+            >
+              6970448170051
+            </div>
+            <div class="item-flex">
+              <div class="item-flex-1"></div>
+              <div
+                class="item-flex-2"
+                :class="classItem('make_info', 'num_size', 'num_bold')"
+              >
+                1
+              </div>
+              <div
+                class="item-flex-2"
+                :class="
+                  classItem('order_price', 'pay_price_size', 'pay_price_bold')
+                "
+                v-show="showItem('order_price', 'pay_price')"
+              >
+                ¥1999
+              </div>
+            </div>
+            <div v-show="showItem('make_info', 'attach')">
+              <div class="item-block-left item-small-size">
+                （上门安装服务）
+              </div>
+              <div class="item-flex">
+                <div class="item-flex-1"></div>
+                <div class="item-flex-2">1</div>
+                <div
+                  class="item-flex-2"
+                  v-show="showItem('make_info', 'price')"
+                >
+                  ¥0
+                </div>
+              </div>
+              <div class="item-block-left item-small-size">（3年延保）</div>
+              <div class="item-flex">
+                <div class="item-flex-1"></div>
+                <div class="item-flex-2">1</div>
+                <div
+                  class="item-flex-2"
+                  v-show="showItem('make_info', 'price')"
+                >
+                  ¥199.99
+                </div>
+              </div>
+            </div>
+            <div
+              class="item-block gift-block"
+              v-show="showItem('make_info', 'gift_info')"
+            >
+              <div class="gift-boder"></div>
+              <div class="gift-num item-small-size">赠品</div>
+              <div class="gift-boder"></div>
+            </div>
+            <div v-show="showItem('make_info', 'gift_info')">
+              <div
+                class="item-block-left item-small-size"
+                v-show="form.resource == 1"
+              >
+                余额：50
+              </div>
+              <div
+                class="item-block-left item-small-size"
+                v-show="form.resource == 1"
+              >
+                积分：50
+              </div>
+              <div class="item-block-left item-small-size">
+                商品：冰红茶风味饮料x2；五香瓜子【150g；小包装】x1
+              </div>
+              <div
+                class="item-block-left item-small-size"
+                v-show="form.resource == 1"
+              >
+                优惠券：元旦大促7折券x1
+              </div>
+              <div
+                class="item-block-left item-small-size"
+                v-show="form.resource == 1"
+              >
+                会员卡：超级会员卡Plus【365天】
+              </div>
+              <div
+                class="item-block-left item-small-size"
+                v-show="form.resource == 1"
+              >
+                礼品卡：超值复购大礼包x1
+              </div>
+            </div>
+          </div>
+          <div
+            class="block-content"
+            v-show="form.resource == 3 && printData.write_off_info"
+          >
+            <div class="item-block item-size bold">#001</div>
+            <div class="item-block-left item-small-size">
+              核销自提点：自提点名称
+            </div>
+            <div class="item-block-left item-small-size">
+              联系方式：123456789123
+            </div>
+            <div class="item-block-left item-small-size">
+              地址：北京市朝阳区朝阳路1号
+            </div>
+            <div class="item-block-left item-small-size">
+              营业时间：00:00~23:59
+            </div>
+            <div class="item-block-left item-small-size">
+              自提时间：10-20 14:00~14:30
+            </div>
+          </div>
+          <div
+            class="block-content"
+            v-show="
+              handerChekcItem('order_price', [
+                'goods_count',
+                'price_detail',
+                'price_detail',
+                'price_detail',
+                'discount_detail',
+                'discount_detail',
+              ]) && form.resource == 1
+            "
+          >
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('order_price', 'goods_count')"
+            >
+              <div class="item-balance-info-name">商品件数</div>
+              <div class="item-balance-info-num">3</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('order_price', 'price_detail')"
+            >
+              <div class="item-balance-info-name">商品总额</div>
+              <div class="item-balance-info-num">800</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('order_price', 'price_detail')"
+            >
+              <div class="item-balance-info-name">押金</div>
+              <div class="item-balance-info-num">200</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('order_price', 'price_detail')"
+            >
+              <div class="item-balance-info-name">运费</div>
+              <div class="item-balance-info-num">10</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('order_price', 'discount_detail')"
+            >
+              <div class="item-balance-info-name">会员权益</div>
+              <div class="item-balance-info-num">3</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('order_price', 'discount_detail')"
+            >
+              <div class="item-balance-info-name">秒杀</div>
+              <div class="item-balance-info-num">-100</div>
+            </div>
+            <div
+              :class="[
+                'item-block-left',
+                classItem('order_price', 'pay_price_size', 'pay_price_bold'),
+              ]"
+              v-show="showItem('order_price', 'pay_price')"
+            >
+              实付金额
+            </div>
+            <div
+              :class="[
+                'item-block',
+                classItem('make_info', 'real_price_size', 'real_price_bold'),
+              ]"
+              style="text-align: right"
+              v-show="showItem('make_info', 'real_price')"
+            >
+              ¥860.00
+            </div>
+          </div>
+          <div
+            class="block-content"
+            v-show="
+              handerChekcItem('recharge_info', [
+                'recharge_money',
+                'send_money',
+                'customer_balance',
+              ]) && form.resource == 4
+            "
+          >
+            <div
+              :class="[
+                'item-block',
+                'item-balance-info',
+                classItem(
+                  'recharge_info',
+                  'recharge_money_size',
+                  'recharge_money_blod'
+                ),
+              ]"
+              v-show="showItem('recharge_info', 'recharge_money')"
+            >
+              <div class="item-balance-info-name">充值金额</div>
+              <div class="item-balance-info-num">¥100.00</div>
+            </div>
+            <div
+              :class="[
+                'item-block',
+                'item-balance-info',
+                classItem(
+                  'recharge_info',
+                  'send_money_size',
+                  'send_money_blod'
+                ),
+              ]"
+              v-show="showItem('recharge_info', 'send_money')"
+            >
+              <div class="item-balance-info-name">赠送金额</div>
+              <div class="item-balance-info-num">¥50.00</div>
+            </div>
+            <div
+              :class="[
+                'item-block',
+                'item-balance-info',
+                classItem(
+                  'recharge_info',
+                  'customer_balance_size',
+                  'customer_balance_blod'
+                ),
+              ]"
+              v-show="showItem('recharge_info', 'customer_balance')"
+            >
+              <div class="item-balance-info-name">账户余额</div>
+              <div class="item-balance-info-num">¥250.00</div>
+            </div>
+          </div>
+          <div
+            class="block-content"
+            v-show="
+              handerChekcItem('mark_info', ['form_data', 'saler_mark']) &&
+              form.resource == 1
+            "
+          >
+            <div
+              class="item-small-size"
+              v-show="showItem('mark_info', 'form_data')"
+            >
+              <div class="item-block-left">表单信息：信息内容</div>
+              <div class="item-block-left">表单信息：信息内容</div>
+              <div class="item-block-left">表单信息：信息内容</div>
+            </div>
+            <div
+              :class="[
+                'item-block-left',
+                classItem('mark_info', 'saler_mark_size', 'saler_mark_bold'),
+              ]"
+              v-show="showItem('mark_info', 'saler_mark')"
+            >
+              商家备注：老客户再赠送一箱牛奶；玻璃瓶包装轻拿轻放
+            </div>
+          </div>
+          <div
+            class="block-content"
+            v-show="
+              handerChekcItem('customer_info', [
+                'customer_name',
+                'customer_mobile',
+                'customer_realname',
+                'customer_balance',
+                'customer_credit',
+                'customer_remark',
+              ]) && [1, 2, 3, 4].includes(form.resource)
+            "
+          >
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('customer_info', 'customer_name')"
+            >
+              <div class="item-balance-info-name">会员名称</div>
+              <div class="item-balance-info-num">AAAAAAA</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('customer_info', 'customer_mobile')"
+            >
+              <div class="item-balance-info-name">会员手机号</div>
+              <div class="item-balance-info-num">
+                133{{
+                  printData.customer_info.customer_mobile_des == 1
+                    ? '****'
+                    : printData.customer_info.customer_mobile_des || '5555'
+                }}3333
+              </div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('customer_info', 'customer_realname')"
+            >
+              <div class="item-balance-info-name">姓名</div>
+              <div class="item-balance-info-num">张三</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('customer_info', 'customer_balance')"
+            >
+              <div class="item-balance-info-name">余额</div>
+              <div class="item-balance-info-num">1200.5</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('customer_info', 'customer_credit')"
+            >
+              <div class="item-balance-info-name">积分</div>
+              <div class="item-balance-info-num">500</div>
+            </div>
+            <div
+              class="item-block item-balance-info item-small-size"
+              v-show="showItem('customer_info', 'customer_remark')"
+            >
+              <div class="item-balance-info-name">
+                备注：本店前100注册优质客户
+              </div>
+            </div>
+          </div>
+          <div
+            class="block-content"
+            v-show="
+              handerChekcItem('customer_info', [
+                'buyer_name',
+                'buyer_mobile',
+                'buyer_address',
+              ]) && form.resource == 1
+            "
+          >
+            <div
+              :class="[
+                'item-block-left',
+                classItem(
+                  'customer_info',
+                  'buyer_name_size',
+                  'buyer_name_blod'
+                ),
+              ]"
+              v-show="showItem('customer_info', 'buyer_name')"
+            >
+              收货人：张三
+            </div>
+            <div
+              :class="[
+                'item-block-left',
+                classItem(
+                  'customer_info',
+                  'buyer_mobile_size',
+                  'buyer_mobile_blod'
+                ),
+              ]"
+              v-show="showItem('customer_info', 'buyer_mobile')"
+            >
+              联系方式：133{{
+                printData.customer_info.buyer_mobile_des == 1
+                  ? '****'
+                  : printData.customer_info.buyer_mobile_des || '5555'
+              }}3333
+            </div>
+            <div
+              :class="[
+                'item-block-left',
+                classItem(
+                  'customer_info',
+                  'buyer_address_size',
+                  'buyer_address_blod'
+                ),
+              ]"
+              v-show="showItem('customer_info', 'buyer_address')"
+            >
+              收货地址：北京市朝阳区朝阳路朝阳人民小区1号楼1栋1101
+            </div>
+          </div>
+          <div
+            class="block-content"
+            v-show="
+              handerChekcItem('customer_info', ['invoice', 'invoice_info']) &&
+              form.resource == 1
+            "
+          >
+            <div
+              class="item-block-left item-small-size"
+              v-show="showItem('customer_info', 'invoice')"
+            >
+              发票：需要开具
+            </div>
+            <div v-show="showItem('customer_info', 'invoice_info')">
+              <div class="item-block-left item-small-size">抬头类型：企业</div>
+              <div class="item-block-left item-small-size">
+                抬头信息：网络科技有限公司
+              </div>
+              <div class="item-block-left item-small-size">税号：123456789</div>
+            </div>
+          </div>
+          <div
+            class="block-content"
+            v-show="
+              handerChekcItem('pick_store', [
+                'store_name',
+                'store_address',
+                'store_contact',
+                'store_contact_name',
+              ]) && form.resource == 1
+            "
+          >
+            <div
+              class="item-block-left item-small-size"
+              v-show="showItem('pick_store', 'store_name')"
+            >
+              自提门店：门店名称
+            </div>
+            <div
+              class="item-block-left item-small-size"
+              v-show="showItem('pick_store', 'store_address')"
+            >
+              门店地址：北京市朝阳区朝阳路朝阳人民小区22号楼2栋2202
+            </div>
+            <div
+              class="item-block-left item-small-size"
+              v-show="showItem('pick_store', 'store_contact')"
+            >
+              联系人：李四
+            </div>
+            <div
+              class="item-block-left item-small-size"
+              v-show="showItem('pick_store', 'store_contact_name')"
+            >
+              联系方式：13111111111
+            </div>
+          </div>
+          <div
+            class="block-content"
+            v-show="
+              handerChekcItem('footer_info', [
+                'stand_name',
+                'cashier_name',
+                'shop_name',
+                'shop_phone',
+                'store_name',
+                'store_phone',
+                'shop_qrcode',
+                'print_time',
+                'print_footer',
+              ]) && [1, 3, 4].includes(form.resource)
+            "
+          >
+            <div
+              class="item-block-left item-small-size"
+              v-show="
+                showItem('footer_info', 'stand_name') &&
+                [1].includes(form.resource)
+              "
+            >
+              收银员：名称
+            </div>
+            <div
+              class="item-block-left item-small-size"
+              v-show="
+                showItem('footer_info', 'cashier_name') &&
+                [1].includes(form.resource)
+              "
+            >
+              导购员：名称
+            </div>
+            <div
+              class="item-block item-small-size"
+              v-show="showItem('footer_info', 'shop_name')"
+            >
+              商城名称
+            </div>
+            <div
+              class="item-block item-small-size"
+              v-show="showItem('footer_info', 'shop_phone')"
+            >
+              010-12345678
+            </div>
+            <div
+              class="item-block item-small-size"
+              v-show="showItem('footer_info', 'store_name')"
+            >
+              门店名称
+            </div>
+            <div
+              class="item-block item-small-size"
+              v-show="showItem('footer_info', 'store_phone')"
+            >
+              010-12345678
+            </div>
+            <div
+              class="item-block"
+              v-show="showItem('footer_info', 'shop_qrcode')"
+            >
+              <img
+                src="./../../../../assets/weChat.png"
+                width="300"
+                height="300"
+              />
+            </div>
+            <div
+              :class="[
+                [1, 3, 4].includes(form.resource)
+                  ? 'item-block'
+                  : 'item-block-left',
+                'item-small-size',
+              ]"
+              v-show="showItem('footer_info', 'print_time')"
+            >
+              打印时间：2023-12-12 12:12:20
+            </div>
+            <div
+              class="item-block item-small-size"
+              v-show="showItem('footer_info', 'print_footer')"
+            >
+              {{ printData.footer_info.print_footer_info }}
+            </div>
+          </div>
+          <div
+            class="block-content"
+            v-show="
+              handerChekcItem('footer_info', ['manage', 'print_time']) &&
+              form.resource == 2
+            "
+          >
+            <div
+              class="item-block-left item-small-size"
+              v-show="showItem('footer_info', 'manage') && form.resource == 2"
+            >
+              操作人：李四
+            </div>
+            <div
+              :class="[
+                form.resource == 1 ? 'item-block' : 'item-block-left',
+                'item-small-size',
+              ]"
+              v-show="showItem('footer_info', 'print_time')"
+            >
+              打印时间：2023-12-12 12:12:20
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="footer">
+      <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 { config, printData } from './receiptConfig.js'
 export default {
+  name: 'addTemplateManagement',
+  data() {
+    return {
+      form: {
+        resource: 1,
+        tepName: '',
+      },
+      amoutOptions: [
+        {
+          value: 1,
+          label: '售价',
+        },
+        {
+          value: 0,
+          label: '实付款',
+        },
+      ],
+      sizeOptions: [
+        {
+          value: 1,
+          label: '大',
+        },
+        {
+          value: 0,
+          label: '小',
+        },
+      ],
+      boldOptions: [
+        {
+          value: 1,
+          label: '加粗',
+        },
+        {
+          value: 0,
+          label: '正常',
+        },
+      ],
+      sortOptions: [
+        {
+          value: 0,
+          label: '全部',
+        },
+        {
+          value: 1,
+          label: '仅网店订单',
+        },
+        {
+          value: 2,
+          label: '仅收银台订单',
+        },
+      ],
+      mobileOptions: [
+        {
+          value: 1,
+          label: '是',
+        },
+        {
+          value: 0,
+          label: '否',
+        },
+      ],
+      qrCodeOptions: [
+        {
+          value: 0,
+          label: '自定义链接(网址)',
+        },
+        {
+          value: 1,
+          label: '微信小程序',
+        },
+        {
+          value: 2,
+          label: 'H5',
+        },
+      ],
+      printData: null,
+      printData: printData,
+    }
+  },
+  created() {
+    //this.printData = JSON.parse(JSON.stringify(printData));
+    //console.log(this.printData);
+  },
+  methods: {
+    showItem(blockName, itemName) {
+      if (!this.printData == null) return
+      return this.printData[blockName][itemName] != 0 ? true : false
+    },
+    classItem(blockName, itemSizeName, itemBoldName) {
+      let arr = []
 
+      if (this.printData[blockName][itemSizeName] == 1) {
+        arr.push('item-size')
+      } else {
+        arr.push('item-small-size')
+      }
+
+      if (this.printData[blockName][itemBoldName] == 1) {
+        arr.push('bold')
+      }
+
+      return arr
+    },
+    handerChekcItem(itemName, keyGroups) {
+      for (var key of keyGroups) {
+        if (this.printData[itemName][key] == 1) {
+          return true
+        }
+      }
+    },
+    showItem(blockName, itemName) {
+      if (!this.printData == null) return
+      return this.printData[blockName][itemName] != 0 ? true : false
+    },
+  },
 }
 </script>
 
-<style>
+<style lang="scss">
+.addTemplateManagement-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;
+
+    .el-form-item__label {
+      margin-right: 20px;
+    }
+
+    .el-form-item__error {
+      padding: 10px 20px;
+      font-size: 14px;
+    }
+
+    .tips {
+      padding: 10px 20px;
+      line-height: 20px;
+    }
+  }
+
+  .content-container {
+    display: flex;
+
+    .block-left {
+      flex: 1;
+      margin-right: 20px;
+      background: #fff !important;
+    }
+
+    .block-right {
+      width: 440px;
+      background: #fff;
+
+      .block-container {
+        padding: 10px;
+        margin: 20px 30px;
+        border: 1px solid #ededed;
+        border-radius: 10px;
+        background: #f8f8f9;
+      }
+
+      .block-content {
+        border-bottom: 1px dashed #ccc;
+        color: #333333 !important;
+        background: #f8f8f9;
+      }
+
+      .item-flex {
+        display: flex;
+        font-size: 16px;
+
+        .item-flex-1 {
+          flex: 2 1 0%;
+          text-align: left;
+        }
+
+        .item-flex-2 {
+          flex: 1;
+          text-align: right;
+        }
+      }
+
+      .item-balance-info {
+        display: flex;
+        justify-content: space-between;
+      }
+
+      .gift-block {
+        display: flex;
+        align-items: center;
+
+        .gift-num {
+          padding: 0 10px;
+        }
+
+        .gift-boder {
+          flex: 1;
+          border-bottom: 1px dashed #ccc;
+        }
+      }
+
+      .refund-block {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        font-size: 16px;
+        font-weight: bold;
+
+        .refund-xing {
+          margin-top: 7px;
+          line-height: 1;
+        }
+
+        .refund-num {
+          padding: 0 10px;
+        }
+      }
+
+      .item-size {
+        font-size: 20px;
+      }
+
+      .item-small-size {
+        font-size: 16px;
+      }
+
+      .item-block {
+        margin: 10px 0;
+        text-align: center;
+      }
+
+      .item-block-left {
+        margin: 10px 0;
+        text-align: left;
+      }
+
+      .bold {
+        font-weight: 700;
+      }
+    }
+
+    .block-box {
+      padding: 20px;
+
+      .block-item {
+        padding: 20px;
+        background: #f8f8f9;
+      }
+
+      .box-title {
+        position: relative;
+        padding-left: 14px;
+        font-weight: bold;
+
+        &::before {
+          position: absolute;
+          left: 0;
+          top: 2px;
+          content: '';
+          width: 4px;
+          height: 16px;
+          border-radius: 10px;
+          background: var(--primary, #1890ff);
+        }
+      }
+
+      .block-group {
+        display: flex;
+        margin-top: 30px;
+        padding-left: 20px;
+        align-items: center;
+        font-size: 14px;
+
+        .group-checkbox {
+          width: 160px;
+
+          &-1 {
+            width: 86px;
+            margin-right: 20px;
+
+            .el-checkbox__label {
+              color: #000;
+            }
+          }
+
+          &-2 {
+            .el-checkbox__label {
+              color: #000;
+            }
+          }
+
+          .el-checkbox__label {
+            color: #000;
+          }
+        }
+
+        .receipt-input {
+          width: 315px;
+          margin-right: 30px;
+
+          &-1 {
+            width: 119px;
+          }
+        }
+
+        .block-select {
+          display: flex;
+          margin-right: 30px;
+          height: 38px;
+          line-height: 38px;
+          font-size: 14px;
+
+          &-name {
+            line-height: 38px;
+            width: 50px;
+            text-align: center;
+            border-radius: 4px 0 0 4px;
+            color: #707070;
+            background-color: #d7d7d7;
+            border: 1px solid #ededed;
+          }
+
+          .select-box {
+            width: 127px !important;
+          }
+        }
+      }
+
+      .tips {
+        padding-left: 48px;
+        line-height: 20px;
+        margin-top: 10px;
+        color: #999;
+      }
+    }
+  }
+
+  .el-item-radio {
+    .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-input__inner {
+    height: 38px !important;
+    line-height: 38px !important;
+  }
+
+  .el-input .el-input__count {
+    font-size: 14px !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;
+      transform: rotate(45deg) scaleY(0);
+      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>
\ No newline at end of file
diff --git a/src/views/store/base/cloudPrint/plotterManager.vue b/src/views/store/base/cloudPrint/plotterManager.vue
index ed05ece..6719276 100644
--- a/src/views/store/base/cloudPrint/plotterManager.vue
+++ b/src/views/store/base/cloudPrint/plotterManager.vue
@@ -1,197 +1,285 @@
 <template>
-    <div class="plotterManager-container">
-        <div class="head">
-            <el-button
-            icon="el-icon-plus"
-            type="primary"
-            size="medium"
-            @click="handleSkip"
-            >
-            添加打印机
-            </el-button>
-        </div>
-        <div class="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="handleAdd"
-            >
-            搜索
-            </el-button>
-            <el-button
-                size="medium"
-                @click="handleClear"
-            >
-            清除条件
-            </el-button>
-        </div>  
-        <el-table
-            :data="tableData"
-            :height="tableConfig.height"
-            :cell-class-name="handerColor"
-            style="width: 100%">
-            <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="handleSkipEdit">编辑</el-button>
-                <el-button type="text" size="small">删除</el-button>
-                <el-button type="text" size="small">禁用</el-button>
-            </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 class="plotterManager-container">
+    <div class="head">
+      <el-button
+        icon="el-icon-plus"
+        type="primary"
+        size="medium"
+        @click="handleSkip"
+      >
+        添加打印机
+      </el-button>
     </div>
+    <div class="content">
+      <span class="name">打印机名称：</span>
+      <el-input
+        placeholder="请输入打印机名称"
+        suffix-icon="el-icon-search"
+        v-model="printerName"
+        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>
+    <el-table
+      :data="tableData"
+      :height="tableConfig.height"
+      :cell-class-name="handerColor"
+      style="width: 100%"
+    >
+      <el-table-column
+        align="center"
+        v-for="(item, index) in tabColumn"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+      >
+        <template #default="{ row, $index }" v-if="item.label == '操作'">
+          <el-button
+            type="text"
+            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="params.pageNum"
+      :layout="layout"
+      :page-size="params.pageSize"
+      :total="total"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    />
+  </div>
 </template>
 
 <script>
+import {
+  getPrinterList,
+  delectPrinter,
+  updatePrnterStatus,
+} from '@/api/printer/printer'
 export default {
-    name:"plotterManager",
-    data(){
-        return{
-            inputData:'',
-            tableConfig: {
-                height: window.innerHeight - 220 - 150,
-            },
-            queryForm: {
-                stime: null,
-                etime: null,
-                kind_id:null,
-                order_state_id:null,
-                pageNum: 1,
-                pageSize: 20,
-            },
-            tabColumn:[
-                {
-                    prop:"cloudName",
-                    label:"打印机名称",
-                },
-                {
-                    prop:"brand",
-                    label:"设备品牌",
-                },
-                {
-                    prop:"printSource",
-                    label:"打印来源",
-                },
-                {
-                    prop:"pageSize",
-                    label:"纸张大小",
-                },
-                {
-                    prop:"printReceipt",
-                    label:"打印小票",
-                },
-                {
-                    prop:"state",
-                    label:"状态",
-                },
-                {
-                    prop:"operation",
-                    label:"操作",
-                }
-            ],
-            tableData: [
-                {
-
-                    cloudName: '飞蛾',
-                    brand: '365云打印S2(编号kdt2)',
-                    printSource: '收银台',
-                    pageSize:"58mm",
-                    printReceipt:"",
-                    state:"启用",
-                    operation:"操作"
-                },
-                {
-                    cloudName: '飞蛾',
-                    brand: '365云打印S2(编号kdt2)',
-                    printSource: '收银台',
-                    pageSize:"58mm",
-                    printReceipt:"",
-                    state:"停用",
-                    operation:"操作"
-                },                 
-            ]
-        }
-    },
-    methods:{
-        handleSkip(){
-            this.$router.push({path:"/addCloudPrint"})
+  name: 'plotterManager',
+  data() {
+    return {
+      layout: 'total, sizes, prev, pager, next, jumper',
+      total: 0,
+      printerName: '',
+      tableConfig: {
+        height: window.innerHeight - 220 - 150,
+      },
+      params: {
+        pageNum: 1,
+        pageSize: 20,
+      },
+      tabColumn: [
+        {
+          prop: 'printer_name',
+          label: '打印机名称',
         },
-        handleClear(){
-            this.inputData = '';
+        {
+          prop: 'model_name',
+          label: '设备品牌',
         },
-        handleSkipEdit(){
-            this.$router.push({path:"/editCloudPrint",query:{ printId : 1}})
+        {
+          prop: 'region',
+          label: '打印来源',
         },
-        handerColor({ row, column, rowIndex, columnIndex }){
-            if(row){
-                if(row.state == '启用' && columnIndex == 5){
-                    return "state-on";
-                }
-                if(row.state == '停用' && columnIndex == 5){
-                    return "state-off";
-                }
-            }
+        {
+          prop: 'paper_with',
+          label: '纸张大小',
         },
+        {
+          prop: 'printReceipt',
+          label: '打印小票',
+        },
+        {
+          prop: 'status',
+          label: '状态',
+        },
+        {
+          prop: 'operation',
+          label: '操作',
+        },
+      ],
+      tableData: [
+        {
+          printer_name: '飞蛾',
+          model_name: '365云打印S2(编号kdt2)',
+          region: '收银台',
+          paper_with: 58,
+          printReceipt: '',
+          status: 1,
+          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' })
+    },
+    async handleClear() {
+      this.printerName = ''
+      this.params = {
+        pageNum: 1,
+        paper_with: 20,
+      }
+      await this.getPrinterList()
+    },
+    handleSkipEdit(row, index) {
+      this.$router.push({
+        path: '/editCloudPrint',
+        query: { id: row.printer_id },
+      })
+    },
+    handerColor({ row, column, rowIndex, columnIndex }) {
+      if (row) {
+        if (row.status == '启用' && columnIndex == 5) {
+          return 'status-on'
+        }
+        if (row.status == '停用' && columnIndex == 5) {
+          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;
+  }
 
-        .head{
-            padding-bottom: 20px;
-            box-shadow: inset 0 -1px 0 #efefef;
-        }
+  .content {
+    display: flex;
+    align-items: center;
+    text-align: center;
+    margin: 20px 0;
 
-        .content{
-            display: flex;
-            align-items: center;
-            text-align: center;
-            margin: 20px 0;
+    .name {
+      font-weight: bold;
+    }
 
-            .name{
-                font-weight: bold;
-            }
+    .input-with-select {
+      margin: 0 10px;
+      width: 270px;
+    }
+  }
 
-            .input-with-select{
-                margin: 0 10px;
-                width: 270px;
-            }
-        }
+  .status- {
+    &on {
+      .cell {
+        color: #48c978 !important;
+      }
+    }
 
-        .state-{
-
-            &on{
-               .cell{
-                    color: #48c978 !important;       
-                } 
-            }
-
-            &off{
-                .cell{
-                    color: red !important;
-                }
-            }
-        }
+    &off {
+      .cell {
+        color: red !important;
+      }
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/store/base/cloudPrint/receiptDialog.vue b/src/views/store/base/cloudPrint/receiptDialog.vue
index 53c7f67..d4306e2 100644
--- a/src/views/store/base/cloudPrint/receiptDialog.vue
+++ b/src/views/store/base/cloudPrint/receiptDialog.vue
@@ -1,16 +1,16 @@
 <template>
-    <el-dialog
-        append-to-body
-        custom-class="center-dialog"
-        title="福家优鲜 线上超市"
-        top="0vh"
-        :visible.sync="isDialog"
-        width="400px"
-        @close="closeDialog"
-        class="receiptDialog-container"
-    >
+  <el-dialog
+    append-to-body
+    custom-class="center-dialog"
+    title="福家优鲜 线上超市"
+    top="0vh"
+    :visible.sync="isDialog"
+    width="400px"
+    @close="closeDialog"
+    class="receiptDialog-container"
+  >
     <div class="block-container">
-        <!-- <div v-for="(item,index) of receiptConfig" :key="index" :class="[item.class,test(item.classText)]" :style="item.style" v-show=" item.show.length > 0 ?  test2(item.show) : test3(item.handerChekcItems)">
+      <!-- <div v-for="(item,index) of receiptConfig" :key="index" :class="[item.class,test(item.classText)]" :style="item.style" v-show=" item.show.length > 0 ?  test2(item.show) : test3(item.handerChekcItems)">
             {{ item.data != '' ? item.data  : item.dataKey.length > 0 ? printData[item.dataKey[0]][item.dataKey[1]] : '' }}
             <div v-if="item.children.length > 0 ">
                 <div :style="group.style" :class="[group.class,test(group.classText)]" v-for="(group,index2) of item.children" :key="index2" v-show="(group.show)">
@@ -18,594 +18,1451 @@
                 </div>
             </div>
         </div> -->
-        <div style="padding-bottom: 10px;" :class="['block-content','item-block',classItem('header_info','template_size','template_bold')]" v-show="showItem('header_info','template_status')">{{ printData.header_info.template_name || '小票名称' }}</div>
-            <div style="padding-bottom: 10px;" :class="['block-content','item-block',classItem('header_info','shop_name_size','shop_name_bold')]" v-show="showItem('header_info','shop_name')">商城名称</div>         
-            <div class="block-content item-small-size" v-show="handerChekcItem('recharge_info',['recharge_money','send_money','customer_balance']) && [3].includes(form.resource)">
-                <div class="item-block-left" v-show="showItem('header_info','write_off_name')">核销员：张三</div>
-                <div class="item-block-left" v-show="showItem('header_info','write_off_time')">核销时间：2023-12-12 14:20:20</div>
-                <div class="item-block-left" v-show="showItem('header_info','order_no')">订单编号：ES20231026111444527685</div>
-                <div class="item-block-left" v-show="showItem('header_info','write_off_type')">核销类型：自提订单</div>
+      <div
+        style="padding-bottom: 10px"
+        :class="[
+          'block-content',
+          'item-block',
+          classItem('header_info', 'template_size', 'template_bold'),
+        ]"
+        v-show="showItem('header_info', 'template_status')"
+      >
+        {{ printData.header_info.template_name || '小票名称' }}
+      </div>
+      <div
+        style="padding-bottom: 10px"
+        :class="[
+          'block-content',
+          'item-block',
+          classItem('header_info', 'shop_name_size', 'shop_name_bold'),
+        ]"
+        v-show="showItem('header_info', 'shop_name')"
+      >
+        商城名称
+      </div>
+      <div
+        class="block-content item-small-size"
+        v-show="
+          handerChekcItem('recharge_info', [
+            'recharge_money',
+            'send_money',
+            'customer_balance',
+          ]) && [3].includes(form.resource)
+        "
+      >
+        <div
+          class="item-block-left"
+          v-show="showItem('header_info', 'write_off_name')"
+        >
+          核销员：张三
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('header_info', 'write_off_time')"
+        >
+          核销时间：2023-12-12 14:20:20
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('header_info', 'order_no')"
+        >
+          订单编号：ES20231026111444527685
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('header_info', 'write_off_type')"
+        >
+          核销类型：自提订单
+        </div>
+      </div>
+      <div
+        class="block-content item-small-size"
+        v-show="
+          handerChekcItem('header_info', [
+            'open_time',
+            'print_time',
+            'print_people',
+          ]) && form.resource == 5
+        "
+      >
+        <div
+          class="item-block-left"
+          v-show="showItem('header_info', 'open_time')"
+        >
+          营业时间：2023-02-17
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('header_info', 'print_time')"
+        >
+          打印时间：2023-02-28 16:29:29
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('header_info', 'print_people')"
+        >
+          打印人：张三
+        </div>
+      </div>
+      <div
+        class="block-content item-small-size"
+        v-show="
+          handerChekcItem('stand_info', ['name', 'start_time', 'end_time']) &&
+          form.resource == 5
+        "
+      >
+        <div class="item-block-left" v-show="showItem('stand_info', 'name')">
+          收银员：李四
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('stand_info', 'start_time')"
+        >
+          开始：2023-02-28 16:29:29
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('stand_info', 'end_time')"
+        >
+          结束：2023-02-28 16:29:29
+        </div>
+      </div>
+      <div
+        class="block-content item-small-size"
+        v-show="
+          handerChekcItem('finish_info', [
+            'all',
+            'pay_order_count',
+            'sale_goods_count',
+            'card_price',
+            'recharge_money_price',
+            'refund_price',
+            'refund_order_count',
+            'refund_goods_count',
+            'real_money',
+          ]) && form.resource == 5
+        "
+      >
+        <div class="item-block gift-block">
+          <div class="gift-boder"></div>
+          <div class="gift-num item-small-size bold">营业汇总</div>
+          <div class="gift-boder"></div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('finish_info', 'all')"
+        >
+          <div class="item-balance-info-name">总交易额</div>
+          <div class="item-balance-info-num">31000</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('finish_info', 'pay_order_count')"
+        >
+          <div class="item-balance-info-name">支付订单数</div>
+          <div class="item-balance-info-num">3600</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('finish_info', 'sale_goods_count')"
+        >
+          <div class="item-balance-info-name">出售商品件数</div>
+          <div class="item-balance-info-num">5000</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('finish_info', 'card_price')"
+        >
+          <div class="item-balance-info-name">会员卡交易额</div>
+          <div class="item-balance-info-num">3546</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('finish_info', 'recharge_money_price')"
+        >
+          <div class="item-balance-info-name">余额充值金额</div>
+          <div class="item-balance-info-num">9555</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('finish_info', 'refund_price')"
+        >
+          <div class="item-balance-info-name">退款金额</div>
+          <div class="item-balance-info-num">3000</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('finish_info', 'refund_order_count')"
+        >
+          <div class="item-balance-info-name">退款订单数</div>
+          <div class="item-balance-info-num">30</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('finish_info', 'refund_goods_count')"
+        >
+          <div class="item-balance-info-name">退款件数</div>
+          <div class="item-balance-info-num">20</div>
+        </div>
+        <div
+          :class="[
+            'item-block',
+            'item-balance-info',
+            classItem('finish_info', 'real_money_size', 'real_money_blod'),
+          ]"
+          v-show="showItem('finish_info', 'real_money')"
+        >
+          <div class="item-balance-info-name">实营收额</div>
+          <div class="item-balance-info-num">250000</div>
+        </div>
+      </div>
+      <div
+        class="block-content item-small-size"
+        v-show="
+          handerChekcItem('pay_type_info', [
+            'wechat',
+            'ali',
+            'cash',
+            'balance',
+            'other',
+          ]) && form.resource == 5
+        "
+      >
+        <div class="item-block gift-block">
+          <div class="gift-boder"></div>
+          <div class="gift-num item-small-size bold">支付方式组成</div>
+          <div class="gift-boder"></div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('pay_type_info', 'wechat')"
+        >
+          <div class="item-balance-info-name">微信</div>
+          <div class="item-balance-info-num">31000</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('pay_type_info', 'ali')"
+        >
+          <div class="item-balance-info-name">支付宝</div>
+          <div class="item-balance-info-num">3600</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('pay_type_info', 'cash')"
+        >
+          <div class="item-balance-info-name">现金</div>
+          <div class="item-balance-info-num">5000</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('pay_type_info', 'balance')"
+        >
+          <div class="item-balance-info-name">余额</div>
+          <div class="item-balance-info-num">3546</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('pay_type_info', 'other')"
+        >
+          <div class="item-balance-info-name">其他线下方式</div>
+          <div class="item-balance-info-num">9555</div>
+        </div>
+      </div>
+      <div
+        class="block-content item-small-size"
+        v-show="
+          handerChekcItem('checkstand_writeoff', [
+            'self',
+            'virtual',
+            'timegoods',
+            'booking',
+            'giftpackage',
+            'coupon',
+            'hotel',
+          ]) && form.resource == 5
+        "
+      >
+        <div class="item-block gift-block">
+          <div class="gift-boder"></div>
+          <div class="gift-num item-small-size bold">核销记录</div>
+          <div class="gift-boder"></div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('checkstand_writeoff', 'self')"
+        >
+          <div class="item-balance-info-name">自提订单</div>
+          <div class="item-balance-info-num">100单</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('checkstand_writeoff', 'virtual')"
+        >
+          <div class="item-balance-info-name">虚拟核销订单</div>
+          <div class="item-balance-info-num">200单</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('checkstand_writeoff', 'timegoods')"
+        >
+          <div class="item-balance-info-name">计次时卡券</div>
+          <div class="item-balance-info-num">5000</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('checkstand_writeoff', 'booking')"
+        >
+          <div class="item-balance-info-name">余额</div>
+          <div class="item-balance-info-num">35406</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('checkstand_writeoff', 'giftpackage')"
+        >
+          <div class="item-balance-info-name">预约到店</div>
+          <div class="item-balance-info-num">500次</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('checkstand_writeoff', 'coupon')"
+        >
+          <div class="item-balance-info-name">优惠券</div>
+          <div class="item-balance-info-num">30张</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('checkstand_writeoff', 'hotel')"
+        >
+          <div class="item-balance-info-name">酒店预订</div>
+          <div class="item-balance-info-num">5单</div>
+        </div>
+      </div>
+      <div
+        class="block-content"
+        v-show="
+          handerChekcItem('header_info', [
+            'gen_num',
+            'order_sort',
+            'quick_buy',
+            'customer_mark',
+            'selfsend_time',
+          ]) && [1, 2].includes(form.resource)
+        "
+      >
+        <div
+          :class="[
+            'item-block',
+            classItem('header_info', 'gen_num_size', 'gen_num_bold'),
+          ]"
+          v-show="showItem('header_info', 'gen_num')"
+        >
+          #0001
+        </div>
+        <div
+          :class="[
+            'item-block',
+            classItem(
+              'header_info',
+              'order_sort_font_size',
+              'order_sort_font_bold'
+            ),
+          ]"
+          v-show="showItem('header_info', 'order_sort') && form.resource == 1"
+        >
+          {{ printData.header_info.order_sort_prefix || '序号' }}
+        </div>
+        <div
+          :class="[
+            'item-block',
+            classItem('header_info', 'quick_buy_size', 'quick_buy_bold'),
+          ]"
+          v-show="showItem('header_info', 'quick_buy')"
+        >
+          快速购买渠道名称
+        </div>
+        <div
+          :class="[
+            'item-block-left',
+            classItem(
+              'header_info',
+              'customer_mark_size',
+              'customer_mark_bold'
+            ),
+          ]"
+          v-show="
+            showItem('header_info', 'customer_mark') && form.resource == 1
+          "
+        >
+          买家备注：多用一层包装袋，送到后请打电话，谢谢！！
+        </div>
+        <div
+          :class="[
+            'item-block-left',
+            classItem(
+              'header_info',
+              'selfsend_time_size',
+              'selfsend_time_bold'
+            ),
+          ]"
+          v-show="
+            showItem('header_info', 'selfsend_time') && form.resource == 1
+          "
+        >
+          配送时间：10-25 14:00-14:30
+        </div>
+      </div>
+      <div
+        class="block-content item-small-size"
+        v-show="
+          handerChekcItem('order_info', [
+            'order_no',
+            'order_from',
+            'order_goods_type',
+            'order_pay_type',
+            'order_status',
+            'order_dispatch_name',
+            'order_create_time',
+            'order_pay_time',
+            'order_finish_time',
+          ]) && [1, 2].includes(form.resource)
+        "
+      >
+        <div
+          class="item-block-left"
+          v-show="showItem('order_info', 'order_no')"
+        >
+          订单编号：ES20231026111444527685
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('order_info', 'order_from')"
+        >
+          订单来源：微信小程序
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('order_info', 'order_goods_type')"
+        >
+          商品类型：实体商品
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('order_info', 'order_pay_type')"
+        >
+          支付方式：微信支付
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('order_info', 'order_status')"
+        >
+          订单状态：已完成
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('order_info', 'order_dispatch_name')"
+        >
+          配送方式：同城配送
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('order_info', 'order_create_time')"
+        >
+          下单时间：2023-12-12 14:20:20
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('order_info', 'order_pay_time')"
+        >
+          付款时间：2023-12-12 14:20:20
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('order_info', 'order_finish_time')"
+        >
+          完成时间：2023-12-12 14:20:20
+        </div>
+        <div
+          class="item-block-left"
+          v-show="
+            showItem('order_info', 'refund_create_time') && form.resource == 2
+          "
+        >
+          申请退款时间：2023-12-12 14:20:20
+        </div>
+        <div
+          class="item-block-left"
+          v-show="
+            showItem('order_info', 'refund_finish_time') && form.resource == 2
+          "
+        >
+          退款完成时间：2023-12-12 14:20:20
+        </div>
+      </div>
+      <div
+        style="padding-bottom: 10px"
+        class="block-content"
+        v-show="form.resource == 2"
+      >
+        <div
+          class="item-block refund-block bold"
+          v-show="showItem('make_info', 'gift_info')"
+        >
+          <div class="refund-xing">*********************</div>
+          <div class="refund-num item-small-size">退款商品</div>
+          <div class="refund-xing">*********************</div>
+        </div>
+        <div class="item-block item-flex bold">
+          <div class="item-flex-1">商品名称</div>
+          <div class="item-flex-2">退款数量</div>
+          <div class="item-flex-2" v-show="showItem('make_info', 'real_price')">
+            实退款
+          </div>
+        </div>
+        <div
+          :class="[
+            'item-block-left',
+            classItem('make_info', 'real_price_size', 'real_price_bold'),
+          ]"
+          v-show="showItem('make_info', 'goods_name')"
+          style="padding: 0"
+        >
+          (退)可口可乐mini罐 经典碳酸饮料【新包装；200ml*12罐】
+        </div>
+        <div class="item-flex">
+          <div class="item-flex-1"></div>
+          <div
+            class="item-flex-2"
+            :class="
+              classItem('make_info', 'real_price_size', 'real_price_bold')
+            "
+          >
+            [
+            <span style="padding: 0 5px">X 2</span>
+            ]
+          </div>
+          <div
+            class="item-flex-2"
+            :class="
+              classItem('make_info', 'real_price_size', 'real_price_bold')
+            "
+            v-show="showItem('make_info', 'real_price')"
+          >
+            ¥54.5
+          </div>
+        </div>
+        <div
+          :class="[
+            'item-block-left',
+            classItem('make_info', 'real_price_size', 'real_price_bold'),
+          ]"
+          v-show="showItem('make_info', 'goods_name')"
+        >
+          (退)超薄液晶电视
+        </div>
+        <div class="item-flex">
+          <div class="item-flex-1"></div>
+          <div
+            class="item-flex-2"
+            :class="
+              classItem('make_info', 'real_price_size', 'real_price_bold')
+            "
+          >
+            1
+          </div>
+          <div
+            class="item-flex-2"
+            :class="
+              classItem('make_info', 'real_price_size', 'real_price_bold')
+            "
+            v-show="showItem('make_info', 'real_price')"
+          >
+            ¥1999
+          </div>
+        </div>
+      </div>
+      <div
+        class="block-content item-small-size"
+        v-show="
+          handerChekcItem('refund', [
+            'type',
+            'apply_time',
+            'apply_money',
+            'apply_reason',
+            'apply_real',
+            'apply_detail',
+          ]) && form.resource == 2
+        "
+      >
+        <div class="item-block-left" v-show="showItem('refund', 'type')">
+          退款方式：售后（仅退款）
+        </div>
+        <div class="item-block-left" v-show="showItem('refund', 'apply_time')">
+          申请售后时间：2023-12-12 14:20:20
+        </div>
+        <div
+          class="item-block item-flex"
+          v-show="showItem('refund', 'apply_money')"
+        >
+          申请金额：64.5
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('refund', 'apply_reason')"
+        >
+          申请原因：拍多了。
+        </div>
+        <div
+          :class="[
+            'item-block item-flex',
+            classItem('refund', 'apply_real_size', 'apply_real_bold'),
+          ]"
+          v-show="showItem('refund', 'apply_real')"
+        >
+          <div class="item-flex-1">实退金额</div>
+          <div class="item-flex-2">64.5</div>
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('refund', 'apply_detail')"
+        >
+          微信退款金额：50（原路退还）
+        </div>
+        <div
+          class="item-block-left"
+          v-show="showItem('refund', 'apply_detail')"
+        >
+          余额退款金额：14.5
+        </div>
+      </div>
+      <div
+        style="padding-bottom: 10px"
+        class="block-content"
+        v-show="[1, 3].includes(form.resource)"
+      >
+        <div class="item-block item-flex">
+          <div class="item-flex-1">商品名称</div>
+          <div class="item-flex-2">数量</div>
+          <div
+            class="item-flex-2"
+            v-show="showItem('order_price', 'pay_price')"
+          >
+            金额
+          </div>
+        </div>
+        <div
+          :class="[
+            'item-block-left',
+            classItem('make_info', 'goods_name_size', 'goods_name_bold'),
+          ]"
+          v-show="showItem('make_info', 'goods_name')"
+          style="padding: 0"
+        >
+          可口可乐mini罐 经典碳酸饮料【新包装；200ml*12罐】
+        </div>
+        <div
+          class="item-small-size"
+          v-show="showItem('make_info', 'goods_code')"
+        >
+          123456789
+        </div>
+        <div
+          style="margin: 0"
+          class="item-block-left item-small-size"
+          v-show="showItem('make_info', 'product_sn')"
+        >
+          6970448170051
+        </div>
+        <div class="item-flex">
+          <div class="item-flex-1"></div>
+          <div
+            class="item-flex-2"
+            :class="classItem('make_info', 'num_size', 'num_bold')"
+          >
+            [
+            <span style="padding: 0 5px">X 2</span>
+            ]
+          </div>
+          <div
+            class="item-flex-2"
+            :class="
+              classItem('order_price', 'pay_price_size', 'pay_price_bold')
+            "
+            v-show="showItem('order_price', 'pay_price')"
+          >
+            ¥54.5
+          </div>
+        </div>
+        <div
+          :class="[
+            'item-block-left',
+            classItem('make_info', 'goods_name_size', 'goods_name_bold'),
+          ]"
+          v-show="showItem('make_info', 'goods_name')"
+        >
+          超薄液晶电视
+        </div>
+        <div
+          class="item-small-size"
+          v-show="showItem('make_info', 'goods_code')"
+        >
+          123456789
+        </div>
+        <div
+          style="margin: 0"
+          class="item-block-left item-small-size"
+          v-show="showItem('make_info', 'product_sn')"
+        >
+          6970448170051
+        </div>
+        <div class="item-flex">
+          <div class="item-flex-1"></div>
+          <div
+            class="item-flex-2"
+            :class="classItem('make_info', 'num_size', 'num_bold')"
+          >
+            1
+          </div>
+          <div
+            class="item-flex-2"
+            :class="
+              classItem('order_price', 'pay_price_size', 'pay_price_bold')
+            "
+            v-show="showItem('order_price', 'pay_price')"
+          >
+            ¥1999
+          </div>
+        </div>
+        <div v-show="showItem('make_info', 'attach')">
+          <div class="item-block-left item-small-size">（上门安装服务）</div>
+          <div class="item-flex">
+            <div class="item-flex-1"></div>
+            <div class="item-flex-2">1</div>
+            <div class="item-flex-2" v-show="showItem('make_info', 'price')">
+              ¥0
             </div>
-            <div class="block-content item-small-size" v-show="handerChekcItem('header_info',['open_time','print_time','print_people']) && form.resource == 5">
-                <div class="item-block-left" v-show="showItem('header_info','open_time')">营业时间：2023-02-17</div>
-                <div class="item-block-left" v-show="showItem('header_info','print_time')">打印时间：2023-02-28 16:29:29</div>
-                <div class="item-block-left" v-show="showItem('header_info','print_people')">打印人：张三</div>
-            </div>
-            <div class="block-content item-small-size" v-show="handerChekcItem('stand_info',['name','start_time','end_time']) && form.resource == 5">
-                <div class="item-block-left" v-show="showItem('stand_info','name')">收银员：李四</div>
-                <div class="item-block-left" v-show="showItem('stand_info','start_time')">开始：2023-02-28 16:29:29</div>
-                <div class="item-block-left" v-show="showItem('stand_info','end_time')">结束：2023-02-28 16:29:29</div>
-            </div>
-            <div class="block-content item-small-size" v-show="handerChekcItem('finish_info',['all','pay_order_count','sale_goods_count','card_price','recharge_money_price','refund_price','refund_order_count','refund_goods_count','real_money']) && form.resource == 5">
-                <div class="item-block gift-block">
-                    <div class="gift-boder"></div>
-                    <div class="gift-num item-small-size bold">营业汇总</div>
-                    <div class="gift-boder"></div>
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','all')">
-                    <div class="item-balance-info-name">总交易额</div>
-                    <div class="item-balance-info-num">31000</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','pay_order_count')">
-                    <div class="item-balance-info-name">支付订单数</div>
-                    <div class="item-balance-info-num">3600</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','sale_goods_count')">
-                    <div class="item-balance-info-name">出售商品件数</div>
-                    <div class="item-balance-info-num">5000</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','card_price')">
-                    <div class="item-balance-info-name">会员卡交易额</div>
-                    <div class="item-balance-info-num">3546</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','recharge_money_price')">
-                    <div class="item-balance-info-name">余额充值金额</div>
-                    <div class="item-balance-info-num">9555</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','refund_price')">
-                    <div class="item-balance-info-name">退款金额</div>
-                    <div class="item-balance-info-num">3000</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','refund_order_count')">
-                    <div class="item-balance-info-name">退款订单数</div>
-                    <div class="item-balance-info-num">30</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('finish_info','refund_goods_count')">
-                    <div class="item-balance-info-name">退款件数</div>
-                    <div class="item-balance-info-num">20</div>  
-                </div>
-                <div :class="['item-block','item-balance-info',classItem('finish_info','real_money_size','real_money_blod')]"  v-show="showItem('finish_info','real_money')">
-                    <div class="item-balance-info-name">实营收额</div>
-                    <div class="item-balance-info-num">250000</div>  
-                </div>
-            </div>
-            <div class="block-content item-small-size" v-show="handerChekcItem('pay_type_info',['wechat','ali','cash','balance','other']) && form.resource == 5">
-                <div class="item-block gift-block">
-                    <div class="gift-boder"></div>
-                    <div class="gift-num item-small-size bold">支付方式组成</div>
-                    <div class="gift-boder"></div>
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('pay_type_info','wechat')">
-                    <div class="item-balance-info-name">微信</div>
-                    <div class="item-balance-info-num">31000</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('pay_type_info','ali')">
-                    <div class="item-balance-info-name">支付宝</div>
-                    <div class="item-balance-info-num">3600</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('pay_type_info','cash')">
-                    <div class="item-balance-info-name">现金</div>
-                    <div class="item-balance-info-num">5000</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('pay_type_info','balance')">
-                    <div class="item-balance-info-name">余额</div>
-                    <div class="item-balance-info-num">3546</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('pay_type_info','other')">
-                    <div class="item-balance-info-name">其他线下方式</div>
-                    <div class="item-balance-info-num">9555</div>  
-                </div>
-            </div>
-            <div class="block-content item-small-size" v-show="handerChekcItem('checkstand_writeoff',['self','virtual','timegoods','booking','giftpackage','coupon','hotel']) && form.resource == 5">
-                <div class="item-block gift-block">
-                    <div class="gift-boder"></div>
-                    <div class="gift-num item-small-size bold">核销记录</div>
-                    <div class="gift-boder"></div>
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','self')">
-                    <div class="item-balance-info-name">自提订单</div>
-                    <div class="item-balance-info-num">100单</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','virtual')">
-                    <div class="item-balance-info-name">虚拟核销订单</div>
-                    <div class="item-balance-info-num">200单</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','timegoods')">
-                    <div class="item-balance-info-name">计次时卡券</div>
-                    <div class="item-balance-info-num">5000</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','booking')">
-                    <div class="item-balance-info-name">余额</div>
-                    <div class="item-balance-info-num">35406</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','giftpackage')">
-                    <div class="item-balance-info-name">预约到店</div>
-                    <div class="item-balance-info-num">500次</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','coupon')">
-                    <div class="item-balance-info-name">优惠券</div>
-                    <div class="item-balance-info-num">30张</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('checkstand_writeoff','hotel')">
-                    <div class="item-balance-info-name">酒店预订</div>
-                    <div class="item-balance-info-num">5单</div>  
-                </div>
-            </div>
-            <div class="block-content" v-show="handerChekcItem('header_info',['gen_num','order_sort','quick_buy','customer_mark','selfsend_time']) && [1,2].includes(form.resource)">
-                <div :class="['item-block',classItem('header_info','gen_num_size','gen_num_bold')]" v-show="showItem('header_info','gen_num') ">#0001</div>
-                <div :class="['item-block',classItem('header_info','order_sort_font_size','order_sort_font_bold')]" v-show="showItem('header_info','order_sort') && form.resource == 1">{{ printData.header_info.order_sort_prefix || '序号' }}</div>
-                <div :class="['item-block',classItem('header_info','quick_buy_size','quick_buy_bold')]" v-show="showItem('header_info','quick_buy')">快速购买渠道名称</div>
-                <div :class="['item-block-left',classItem('header_info','customer_mark_size','customer_mark_bold')]" v-show="showItem('header_info','customer_mark') && form.resource == 1">买家备注：多用一层包装袋，送到后请打电话，谢谢！！</div>
-                <div :class="['item-block-left',classItem('header_info','selfsend_time_size','selfsend_time_bold')]" v-show="showItem('header_info','selfsend_time') && form.resource == 1">配送时间：10-25 14:00-14:30</div>
-            </div>
-            <div class="block-content item-small-size" v-show="handerChekcItem('order_info',['order_no','order_from','order_goods_type','order_pay_type','order_status','order_dispatch_name','order_create_time','order_pay_time','order_finish_time']) && [1,2].includes(form.resource)">
-                <div class="item-block-left" v-show="showItem('order_info','order_no')">订单编号：ES20231026111444527685</div>
-                <div class="item-block-left" v-show="showItem('order_info','order_from')">订单来源：微信小程序</div>
-                <div class="item-block-left" v-show="showItem('order_info','order_goods_type')">商品类型：实体商品</div>
-                <div class="item-block-left" v-show="showItem('order_info','order_pay_type')">支付方式：微信支付</div>
-                <div class="item-block-left" v-show="showItem('order_info','order_status')">订单状态：已完成</div>
-                <div class="item-block-left" v-show="showItem('order_info','order_dispatch_name')">配送方式：同城配送</div>
-                <div class="item-block-left" v-show="showItem('order_info','order_create_time')">下单时间：2023-12-12 14:20:20</div>
-                <div class="item-block-left" v-show="showItem('order_info','order_pay_time')">付款时间：2023-12-12 14:20:20</div>
-                <div class="item-block-left" v-show="showItem('order_info','order_finish_time')">完成时间：2023-12-12 14:20:20</div>
-                <div class="item-block-left" v-show="showItem('order_info','refund_create_time') && form.resource == 2">申请退款时间：2023-12-12 14:20:20</div>
-                <div class="item-block-left" v-show="showItem('order_info','refund_finish_time') && form.resource == 2">退款完成时间：2023-12-12 14:20:20</div>
-            </div>
-            <div style="padding-bottom: 10px;" class="block-content" v-show="form.resource == 2">
-                <div  class="item-block refund-block bold" v-show="showItem('make_info','gift_info')">
-                    <div class="refund-xing">*********************</div>
-                    <div class="refund-num item-small-size">退款商品</div>
-                    <div class="refund-xing">*********************</div>
-                </div>
-                <div class="item-block item-flex bold">
-                    <div class="item-flex-1">商品名称</div>
-                    <div class="item-flex-2">退款数量</div>
-                    <div class="item-flex-2" v-show="showItem('make_info','real_price')">实退款</div>
-                </div>
-                <div :class="['item-block-left',classItem('make_info','real_price_size','real_price_bold')]" v-show="showItem('make_info','goods_name')" style="padding: 0;">(退)可口可乐mini罐 经典碳酸饮料【新包装；200ml*12罐】</div>
-                <div class="item-flex">
-                    <div class="item-flex-1"></div>
-                    <div class="item-flex-2" :class="classItem('make_info','real_price_size','real_price_bold')">
-                        [<span style="padding: 0 5px;">X 2</span>]
-                    </div>
-                    <div class="item-flex-2" :class="classItem('make_info','real_price_size','real_price_bold')" v-show="showItem('make_info','real_price')">¥54.5</div>
-                </div>
-                <div :class="['item-block-left',classItem('make_info','real_price_size','real_price_bold')]" v-show="showItem('make_info','goods_name')">(退)超薄液晶电视</div>
-                <div class="item-flex">
-                    <div class="item-flex-1"></div> 
-                    <div class="item-flex-2" :class="classItem('make_info','real_price_size','real_price_bold')">
-                        1
-                    </div>
-                    <div class="item-flex-2" :class="classItem('make_info','real_price_size','real_price_bold')" v-show="showItem('make_info','real_price')">¥1999</div>
-                </div>
-            </div>
-            <div class="block-content item-small-size" v-show="handerChekcItem('refund',['type','apply_time','apply_money','apply_reason','apply_real','apply_detail']) && form.resource == 2">
-                <div class="item-block-left" v-show="showItem('refund','type')">退款方式：售后（仅退款）</div>
-                <div class="item-block-left" v-show="showItem('refund','apply_time')">申请售后时间：2023-12-12 14:20:20</div>
-                <div class="item-block item-flex" v-show="showItem('refund','apply_money')">申请金额：64.5</div>
-                <div class="item-block-left" v-show="showItem('refund','apply_reason')">申请原因：拍多了。</div>
-                <div :class="['item-block item-flex',classItem('refund','apply_real_size','apply_real_bold')]" v-show="showItem('refund','apply_real')">
-                    <div class="item-flex-1">实退金额</div>
-                    <div class="item-flex-2">64.5</div>
-                </div>
-                <div class="item-block-left" v-show="showItem('refund','apply_detail')">微信退款金额：50（原路退还）</div>
-                <div class="item-block-left" v-show="showItem('refund','apply_detail')">余额退款金额：14.5</div>
-            </div>
-            <div style="padding-bottom: 10px;" class="block-content" v-show="[1,3].includes(form.resource)">
-                <div class="item-block item-flex">
-                    <div class="item-flex-1">商品名称</div>
-                    <div class="item-flex-2">数量</div>
-                    <div class="item-flex-2" v-show="showItem('order_price','pay_price')">金额</div>
-                </div>
-                <div :class="['item-block-left',classItem('make_info','goods_name_size','goods_name_bold')]" v-show="showItem('make_info','goods_name')" style="padding: 0;">可口可乐mini罐 经典碳酸饮料【新包装；200ml*12罐】</div>
-                <div class="item-small-size" v-show="showItem('make_info','goods_code')">123456789</div>
-                <div style="margin: 0;" class="item-block-left item-small-size" v-show="showItem('make_info','product_sn')">6970448170051</div>
-                <div class="item-flex">
-                    <div class="item-flex-1"></div>
-                    <div class="item-flex-2" :class="classItem('make_info','num_size','num_bold')">
-                        [<span style="padding: 0 5px;">X 2</span>]
-                    </div>
-                    <div class="item-flex-2" :class="classItem('order_price','pay_price_size','pay_price_bold')" v-show="showItem('order_price','pay_price')">¥54.5</div>
-                </div>
-                <div :class="['item-block-left',classItem('make_info','goods_name_size','goods_name_bold')]" v-show="showItem('make_info','goods_name')">超薄液晶电视</div>
-                <div class="item-small-size" v-show="showItem('make_info','goods_code')">123456789</div>
-                <div style="margin: 0;" class="item-block-left item-small-size" v-show="showItem('make_info','product_sn')">6970448170051</div>
-                <div class="item-flex">
-                    <div class="item-flex-1"></div>
-                    <div class="item-flex-2" :class="classItem('make_info','num_size','num_bold')">
-                        1
-                    </div>
-                    <div class="item-flex-2" :class="classItem('order_price','pay_price_size','pay_price_bold')" v-show="showItem('order_price','pay_price')">¥1999</div>
-                </div>
-                <div v-show="showItem('make_info','attach')">
-                    <div class="item-block-left item-small-size">（上门安装服务）</div>
-                    <div class="item-flex">
-                        <div class="item-flex-1"></div>
-                        <div class="item-flex-2" >1</div>
-                        <div class="item-flex-2" v-show="showItem('make_info','price')">¥0</div>
-                    </div>
-                    <div class="item-block-left item-small-size">（3年延保）</div>
-                    <div class="item-flex">
-                        <div class="item-flex-1"></div>
-                        <div class="item-flex-2" >1</div>
-                        <div class="item-flex-2" v-show="showItem('make_info','price')">¥199.99</div>
-                    </div>
-                </div>
-                <div class="item-block gift-block" v-show="showItem('make_info','gift_info')">
-                    <div class="gift-boder"></div>
-                    <div class="gift-num item-small-size">赠品</div>
-                    <div class="gift-boder"></div>
-                </div>
-                <div v-show="showItem('make_info','gift_info')">
-                    <div class="item-block-left item-small-size" v-show="form.resource == 1"> 余额：50</div>
-                    <div class="item-block-left item-small-size" v-show="form.resource == 1"> 积分：50</div>
-                    <div class="item-block-left item-small-size"> 商品：冰红茶风味饮料x2；五香瓜子【150g；小包装】x1</div>
-                    <div class="item-block-left item-small-size" v-show="form.resource == 1"> 优惠券：元旦大促7折券x1</div>
-                    <div class="item-block-left item-small-size"  v-show="form.resource == 1"> 会员卡：超级会员卡Plus【365天】</div>
-                    <div class="item-block-left item-small-size"  v-show="form.resource == 1"> 礼品卡：超值复购大礼包x1</div>    
-                </div>    
-            </div>
-            <div class="block-content" v-show="form.resource == 3 && printData.write_off_info">
-                <div class="item-block item-size bold">#001</div>
-                <div class="item-block-left item-small-size" >核销自提点：自提点名称</div>
-                <div class="item-block-left item-small-size" >联系方式：123456789123</div>
-                <div class="item-block-left item-small-size"> 地址：北京市朝阳区朝阳路1号</div>
-                <div class="item-block-left item-small-size" > 营业时间：00:00~23:59</div>
-                <div class="item-block-left item-small-size"  > 自提时间：10-20 14:00~14:30</div>
-            </div>
-            <div class="block-content" v-show="handerChekcItem('order_price',['goods_count','price_detail','price_detail','price_detail','discount_detail','discount_detail']) && form.resource == 1" >
-                <div class="item-block item-balance-info item-small-size"  v-show="showItem('order_price','goods_count')">
-                    <div class="item-balance-info-name">商品件数</div>
-                    <div class="item-balance-info-num">3</div>  
-                </div>
-                <div class="item-block item-balance-info item-small-size" v-show="showItem('order_price','price_detail')">
-                    <div class="item-balance-info-name">商品总额</div>
-                    <div class="item-balance-info-num">800</div>
-                </div>
-                <div class="item-block item-balance-info item-small-size" v-show="showItem('order_price','price_detail')">
-                    <div class="item-balance-info-name">押金</div>
-                    <div class="item-balance-info-num">200</div>
-                </div>
-                <div class="item-block item-balance-info item-small-size" v-show="showItem('order_price','price_detail')">
-                    <div class="item-balance-info-name">运费</div>
-                    <div class="item-balance-info-num">10</div>
-                </div>
-                <div class="item-block item-balance-info item-small-size" v-show="showItem('order_price','discount_detail')">
-                    <div class="item-balance-info-name">会员权益</div>
-                    <div class="item-balance-info-num">3</div>
-                </div>
-                <div class="item-block item-balance-info item-small-size" v-show="showItem('order_price','discount_detail')">
-                    <div class="item-balance-info-name">秒杀</div>
-                    <div class="item-balance-info-num">-100</div>
-                </div>
-                <div :class="['item-block-left',classItem('order_price','pay_price_size','pay_price_bold')]" v-show="showItem('order_price','pay_price')">实付金额</div>
-                <div :class="['item-block',classItem('make_info','real_price_size','real_price_bold')]" style="text-align: right;" v-show="showItem('make_info','real_price')">¥860.00</div>
-            </div>
-            <div class="block-content" v-show="handerChekcItem('recharge_info',['recharge_money','send_money','customer_balance']) && form.resource == 4" >
-                <div :class="['item-block','item-balance-info', classItem('recharge_info','recharge_money_size','recharge_money_blod')]"  v-show="showItem('recharge_info','recharge_money')">
-                    <div class="item-balance-info-name">充值金额</div>
-                    <div class="item-balance-info-num">¥100.00</div>  
-                </div>
-                <div :class="['item-block','item-balance-info', classItem('recharge_info','send_money_size','send_money_blod')]"  v-show="showItem('recharge_info','send_money')">
-                    <div class="item-balance-info-name">赠送金额</div>
-                    <div class="item-balance-info-num">¥50.00</div>
-                </div>
-                <div :class="['item-block','item-balance-info', classItem('recharge_info','customer_balance_size','customer_balance_blod')]"  v-show="showItem('recharge_info','customer_balance')">
-                    <div class="item-balance-info-name">账户余额</div>
-                    <div class="item-balance-info-num">¥250.00</div>
-                </div>
-            </div>
-            <div class="block-content" v-show="handerChekcItem('mark_info',['form_data','saler_mark'])  && form.resource == 1">
-                <div class="item-small-size" v-show="showItem('mark_info','form_data')">
-                    <div class="item-block-left">表单信息：信息内容</div>
-                    <div class="item-block-left">表单信息：信息内容</div>
-                    <div class="item-block-left">表单信息：信息内容</div>
-                </div>
-                <div :class="['item-block-left',classItem('mark_info','saler_mark_size','saler_mark_bold')]" v-show="showItem('mark_info','saler_mark')">商家备注：老客户再赠送一箱牛奶；玻璃瓶包装轻拿轻放</div>
-            </div>
-            <div class="block-content" v-show="handerChekcItem('customer_info',['customer_name','customer_mobile','customer_realname','customer_balance','customer_credit','customer_remark']) && [1,2,3,4].includes(form.resource)">
-                <div class="item-block item-balance-info item-small-size" v-show="showItem('customer_info','customer_name')">
-                    <div class="item-balance-info-name">会员名称</div>
-                    <div class="item-balance-info-num">AAAAAAA</div>
-                </div>
-                <div class="item-block item-balance-info item-small-size" v-show="showItem('customer_info','customer_mobile')">
-                    <div class="item-balance-info-name">会员手机号</div>
-                    <div class="item-balance-info-num">133{{printData.customer_info.customer_mobile_des == 1 ?'****': printData.customer_info.customer_mobile_des || '5555' }}3333</div>
-                </div>
-                <div class="item-block item-balance-info item-small-size" v-show="showItem('customer_info','customer_realname')">
-                    <div class="item-balance-info-name">姓名</div>
-                    <div class="item-balance-info-num">张三</div>
-                </div>
-                <div class="item-block item-balance-info item-small-size" v-show="showItem('customer_info','customer_balance')">
-                    <div class="item-balance-info-name">余额</div>
-                    <div class="item-balance-info-num">1200.5</div>
-                </div>
-                <div class="item-block item-balance-info item-small-size" v-show="showItem('customer_info','customer_credit')">
-                    <div class="item-balance-info-name">积分</div>
-                    <div class="item-balance-info-num">500</div>
-                </div>
-                <div class="item-block item-balance-info item-small-size" v-show="showItem('customer_info','customer_remark')">
-                    <div class="item-balance-info-name">备注：本店前100注册优质客户</div>
-                </div>
-            </div>
-            <div class="block-content" v-show="handerChekcItem('customer_info',['buyer_name','buyer_mobile','buyer_address'])  && form.resource == 1">
-                <div :class="['item-block-left',classItem('customer_info','buyer_name_size','buyer_name_blod')]" v-show="showItem('customer_info','buyer_name')">收货人：张三</div>
-                <div :class="['item-block-left',classItem('customer_info','buyer_mobile_size','buyer_mobile_blod')]" v-show="showItem('customer_info','buyer_mobile')">联系方式：133{{printData.customer_info.buyer_mobile_des == 1 ?'****': printData.customer_info.buyer_mobile_des || '5555' }}3333</div>
-                <div :class="['item-block-left',classItem('customer_info','buyer_address_size','buyer_address_blod')]" v-show="showItem('customer_info','buyer_address')">收货地址：北京市朝阳区朝阳路朝阳人民小区1号楼1栋1101</div>
-            </div>
-            <div class="block-content" v-show="handerChekcItem('customer_info',['invoice','invoice_info'])  && form.resource == 1">
-                <div class="item-block-left item-small-size " v-show="showItem('customer_info','invoice')">发票：需要开具</div>
-                <div v-show="showItem('customer_info','invoice_info')">
-                    <div class="item-block-left item-small-size ">抬头类型：企业</div>
-                    <div class="item-block-left item-small-size ">抬头信息：网络科技有限公司</div>
-                    <div class="item-block-left item-small-size ">税号：123456789</div>
-                </div>
-            </div>
-            <div class="block-content" v-show="handerChekcItem('pick_store',['store_name','store_address','store_contact','store_contact_name'])  && form.resource == 1">
-                <div class="item-block-left item-small-size " v-show="showItem('pick_store','store_name') ">自提门店：门店名称</div>
-                <div class="item-block-left item-small-size " v-show="showItem('pick_store','store_address')">门店地址：北京市朝阳区朝阳路朝阳人民小区22号楼2栋2202</div>
-                <div class="item-block-left item-small-size " v-show="showItem('pick_store','store_contact')">联系人：李四</div>
-                <div class="item-block-left item-small-size " v-show="showItem('pick_store','store_contact_name')">联系方式：13111111111</div>
-            </div>
-            <div class="block-content" v-show="handerChekcItem('footer_info',['stand_name','cashier_name','shop_name','shop_phone','store_name','store_phone','shop_qrcode','print_time','print_footer']) && [1,3,4].includes(form.resource)" >
-                <div class="item-block-left item-small-size " v-show="showItem('footer_info','stand_name') && [1].includes(form.resource)">收银员：名称</div>
-                <div class="item-block-left item-small-size " v-show="showItem('footer_info','cashier_name') && [1].includes(form.resource)">导购员：名称</div>
-                <div class="item-block item-small-size " v-show="showItem('footer_info','shop_name') ">商城名称</div>
-                <div class="item-block item-small-size " v-show="showItem('footer_info','shop_phone')">010-12345678</div>
-                <div class="item-block item-small-size " v-show="showItem('footer_info','store_name') ">门店名称</div>
-                <div class="item-block item-small-size " v-show="showItem('footer_info','store_phone')">010-12345678</div>
-                <div class="item-block" v-show="showItem('footer_info','shop_qrcode')">
-                    <img src="./../../../../assets/weChat.png" width="300" height="300"> 
-                </div>
-                <div :class="[[1,3,4].includes(form.resource) ? 'item-block' :'item-block-left' ,'item-small-size']" v-show="showItem('footer_info','print_time')">打印时间：2023-12-12 12:12:20</div>
-                <div class="item-block item-small-size " v-show="showItem('footer_info','print_footer') ">{{ printData.footer_info.print_footer_info }}</div>
-            </div>
-            <div class="block-content" v-show="handerChekcItem('footer_info',['manage','print_time']) && form.resource == 2">
-                <div class="item-block-left item-small-size " v-show="showItem('footer_info','manage') && form.resource == 2">操作人：李四</div>
-                <div :class="[form.resource == 1 ? 'item-block' :'item-block-left' ,'item-small-size']" v-show="showItem('footer_info','print_time')">打印时间：2023-12-12 12:12:20</div>
+          </div>
+          <div class="item-block-left item-small-size">（3年延保）</div>
+          <div class="item-flex">
+            <div class="item-flex-1"></div>
+            <div class="item-flex-2">1</div>
+            <div class="item-flex-2" v-show="showItem('make_info', 'price')">
+              ¥199.99
             </div>
+          </div>
+        </div>
+        <div
+          class="item-block gift-block"
+          v-show="showItem('make_info', 'gift_info')"
+        >
+          <div class="gift-boder"></div>
+          <div class="gift-num item-small-size">赠品</div>
+          <div class="gift-boder"></div>
+        </div>
+        <div v-show="showItem('make_info', 'gift_info')">
+          <div
+            class="item-block-left item-small-size"
+            v-show="form.resource == 1"
+          >
+            余额：50
+          </div>
+          <div
+            class="item-block-left item-small-size"
+            v-show="form.resource == 1"
+          >
+            积分：50
+          </div>
+          <div class="item-block-left item-small-size">
+            商品：冰红茶风味饮料x2；五香瓜子【150g；小包装】x1
+          </div>
+          <div
+            class="item-block-left item-small-size"
+            v-show="form.resource == 1"
+          >
+            优惠券：元旦大促7折券x1
+          </div>
+          <div
+            class="item-block-left item-small-size"
+            v-show="form.resource == 1"
+          >
+            会员卡：超级会员卡Plus【365天】
+          </div>
+          <div
+            class="item-block-left item-small-size"
+            v-show="form.resource == 1"
+          >
+            礼品卡：超值复购大礼包x1
+          </div>
+        </div>
+      </div>
+      <div
+        class="block-content"
+        v-show="form.resource == 3 && printData.write_off_info"
+      >
+        <div class="item-block item-size bold">#001</div>
+        <div class="item-block-left item-small-size">
+          核销自提点：自提点名称
+        </div>
+        <div class="item-block-left item-small-size">
+          联系方式：123456789123
+        </div>
+        <div class="item-block-left item-small-size">
+          地址：北京市朝阳区朝阳路1号
+        </div>
+        <div class="item-block-left item-small-size">营业时间：00:00~23:59</div>
+        <div class="item-block-left item-small-size">
+          自提时间：10-20 14:00~14:30
+        </div>
+      </div>
+      <div
+        class="block-content"
+        v-show="
+          handerChekcItem('order_price', [
+            'goods_count',
+            'price_detail',
+            'price_detail',
+            'price_detail',
+            'discount_detail',
+            'discount_detail',
+          ]) && form.resource == 1
+        "
+      >
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('order_price', 'goods_count')"
+        >
+          <div class="item-balance-info-name">商品件数</div>
+          <div class="item-balance-info-num">3</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('order_price', 'price_detail')"
+        >
+          <div class="item-balance-info-name">商品总额</div>
+          <div class="item-balance-info-num">800</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('order_price', 'price_detail')"
+        >
+          <div class="item-balance-info-name">押金</div>
+          <div class="item-balance-info-num">200</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('order_price', 'price_detail')"
+        >
+          <div class="item-balance-info-name">运费</div>
+          <div class="item-balance-info-num">10</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('order_price', 'discount_detail')"
+        >
+          <div class="item-balance-info-name">会员权益</div>
+          <div class="item-balance-info-num">3</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('order_price', 'discount_detail')"
+        >
+          <div class="item-balance-info-name">秒杀</div>
+          <div class="item-balance-info-num">-100</div>
+        </div>
+        <div
+          :class="[
+            'item-block-left',
+            classItem('order_price', 'pay_price_size', 'pay_price_bold'),
+          ]"
+          v-show="showItem('order_price', 'pay_price')"
+        >
+          实付金额
+        </div>
+        <div
+          :class="[
+            'item-block',
+            classItem('make_info', 'real_price_size', 'real_price_bold'),
+          ]"
+          style="text-align: right"
+          v-show="showItem('make_info', 'real_price')"
+        >
+          ¥860.00
+        </div>
+      </div>
+      <div
+        class="block-content"
+        v-show="
+          handerChekcItem('recharge_info', [
+            'recharge_money',
+            'send_money',
+            'customer_balance',
+          ]) && form.resource == 4
+        "
+      >
+        <div
+          :class="[
+            'item-block',
+            'item-balance-info',
+            classItem(
+              'recharge_info',
+              'recharge_money_size',
+              'recharge_money_blod'
+            ),
+          ]"
+          v-show="showItem('recharge_info', 'recharge_money')"
+        >
+          <div class="item-balance-info-name">充值金额</div>
+          <div class="item-balance-info-num">¥100.00</div>
+        </div>
+        <div
+          :class="[
+            'item-block',
+            'item-balance-info',
+            classItem('recharge_info', 'send_money_size', 'send_money_blod'),
+          ]"
+          v-show="showItem('recharge_info', 'send_money')"
+        >
+          <div class="item-balance-info-name">赠送金额</div>
+          <div class="item-balance-info-num">¥50.00</div>
+        </div>
+        <div
+          :class="[
+            'item-block',
+            'item-balance-info',
+            classItem(
+              'recharge_info',
+              'customer_balance_size',
+              'customer_balance_blod'
+            ),
+          ]"
+          v-show="showItem('recharge_info', 'customer_balance')"
+        >
+          <div class="item-balance-info-name">账户余额</div>
+          <div class="item-balance-info-num">¥250.00</div>
+        </div>
+      </div>
+      <div
+        class="block-content"
+        v-show="
+          handerChekcItem('mark_info', ['form_data', 'saler_mark']) &&
+          form.resource == 1
+        "
+      >
+        <div
+          class="item-small-size"
+          v-show="showItem('mark_info', 'form_data')"
+        >
+          <div class="item-block-left">表单信息：信息内容</div>
+          <div class="item-block-left">表单信息：信息内容</div>
+          <div class="item-block-left">表单信息：信息内容</div>
+        </div>
+        <div
+          :class="[
+            'item-block-left',
+            classItem('mark_info', 'saler_mark_size', 'saler_mark_bold'),
+          ]"
+          v-show="showItem('mark_info', 'saler_mark')"
+        >
+          商家备注：老客户再赠送一箱牛奶；玻璃瓶包装轻拿轻放
+        </div>
+      </div>
+      <div
+        class="block-content"
+        v-show="
+          handerChekcItem('customer_info', [
+            'customer_name',
+            'customer_mobile',
+            'customer_realname',
+            'customer_balance',
+            'customer_credit',
+            'customer_remark',
+          ]) && [1, 2, 3, 4].includes(form.resource)
+        "
+      >
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('customer_info', 'customer_name')"
+        >
+          <div class="item-balance-info-name">会员名称</div>
+          <div class="item-balance-info-num">AAAAAAA</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('customer_info', 'customer_mobile')"
+        >
+          <div class="item-balance-info-name">会员手机号</div>
+          <div class="item-balance-info-num">
+            133{{
+              printData.customer_info.customer_mobile_des == 1
+                ? '****'
+                : printData.customer_info.customer_mobile_des || '5555'
+            }}3333
+          </div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('customer_info', 'customer_realname')"
+        >
+          <div class="item-balance-info-name">姓名</div>
+          <div class="item-balance-info-num">张三</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('customer_info', 'customer_balance')"
+        >
+          <div class="item-balance-info-name">余额</div>
+          <div class="item-balance-info-num">1200.5</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('customer_info', 'customer_credit')"
+        >
+          <div class="item-balance-info-name">积分</div>
+          <div class="item-balance-info-num">500</div>
+        </div>
+        <div
+          class="item-block item-balance-info item-small-size"
+          v-show="showItem('customer_info', 'customer_remark')"
+        >
+          <div class="item-balance-info-name">备注：本店前100注册优质客户</div>
+        </div>
+      </div>
+      <div
+        class="block-content"
+        v-show="
+          handerChekcItem('customer_info', [
+            'buyer_name',
+            'buyer_mobile',
+            'buyer_address',
+          ]) && form.resource == 1
+        "
+      >
+        <div
+          :class="[
+            'item-block-left',
+            classItem('customer_info', 'buyer_name_size', 'buyer_name_blod'),
+          ]"
+          v-show="showItem('customer_info', 'buyer_name')"
+        >
+          收货人：张三
+        </div>
+        <div
+          :class="[
+            'item-block-left',
+            classItem(
+              'customer_info',
+              'buyer_mobile_size',
+              'buyer_mobile_blod'
+            ),
+          ]"
+          v-show="showItem('customer_info', 'buyer_mobile')"
+        >
+          联系方式：133{{
+            printData.customer_info.buyer_mobile_des == 1
+              ? '****'
+              : printData.customer_info.buyer_mobile_des || '5555'
+          }}3333
+        </div>
+        <div
+          :class="[
+            'item-block-left',
+            classItem(
+              'customer_info',
+              'buyer_address_size',
+              'buyer_address_blod'
+            ),
+          ]"
+          v-show="showItem('customer_info', 'buyer_address')"
+        >
+          收货地址：北京市朝阳区朝阳路朝阳人民小区1号楼1栋1101
+        </div>
+      </div>
+      <div
+        class="block-content"
+        v-show="
+          handerChekcItem('customer_info', ['invoice', 'invoice_info']) &&
+          form.resource == 1
+        "
+      >
+        <div
+          class="item-block-left item-small-size"
+          v-show="showItem('customer_info', 'invoice')"
+        >
+          发票：需要开具
+        </div>
+        <div v-show="showItem('customer_info', 'invoice_info')">
+          <div class="item-block-left item-small-size">抬头类型：企业</div>
+          <div class="item-block-left item-small-size">
+            抬头信息：网络科技有限公司
+          </div>
+          <div class="item-block-left item-small-size">税号：123456789</div>
+        </div>
+      </div>
+      <div
+        class="block-content"
+        v-show="
+          handerChekcItem('pick_store', [
+            'store_name',
+            'store_address',
+            'store_contact',
+            'store_contact_name',
+          ]) && form.resource == 1
+        "
+      >
+        <div
+          class="item-block-left item-small-size"
+          v-show="showItem('pick_store', 'store_name')"
+        >
+          自提门店：门店名称
+        </div>
+        <div
+          class="item-block-left item-small-size"
+          v-show="showItem('pick_store', 'store_address')"
+        >
+          门店地址：北京市朝阳区朝阳路朝阳人民小区22号楼2栋2202
+        </div>
+        <div
+          class="item-block-left item-small-size"
+          v-show="showItem('pick_store', 'store_contact')"
+        >
+          联系人：李四
+        </div>
+        <div
+          class="item-block-left item-small-size"
+          v-show="showItem('pick_store', 'store_contact_name')"
+        >
+          联系方式：13111111111
+        </div>
+      </div>
+      <div
+        class="block-content"
+        v-show="
+          handerChekcItem('footer_info', [
+            'stand_name',
+            'cashier_name',
+            'shop_name',
+            'shop_phone',
+            'store_name',
+            'store_phone',
+            'shop_qrcode',
+            'print_time',
+            'print_footer',
+          ]) && [1, 3, 4].includes(form.resource)
+        "
+      >
+        <div
+          class="item-block-left item-small-size"
+          v-show="
+            showItem('footer_info', 'stand_name') && [1].includes(form.resource)
+          "
+        >
+          收银员：名称
+        </div>
+        <div
+          class="item-block-left item-small-size"
+          v-show="
+            showItem('footer_info', 'cashier_name') &&
+            [1].includes(form.resource)
+          "
+        >
+          导购员：名称
+        </div>
+        <div
+          class="item-block item-small-size"
+          v-show="showItem('footer_info', 'shop_name')"
+        >
+          商城名称
+        </div>
+        <div
+          class="item-block item-small-size"
+          v-show="showItem('footer_info', 'shop_phone')"
+        >
+          010-12345678
+        </div>
+        <div
+          class="item-block item-small-size"
+          v-show="showItem('footer_info', 'store_name')"
+        >
+          门店名称
+        </div>
+        <div
+          class="item-block item-small-size"
+          v-show="showItem('footer_info', 'store_phone')"
+        >
+          010-12345678
+        </div>
+        <div class="item-block" v-show="showItem('footer_info', 'shop_qrcode')">
+          <img src="./../../../../assets/weChat.png" width="300" height="300" />
+        </div>
+        <div
+          :class="[
+            [1, 3, 4].includes(form.resource)
+              ? 'item-block'
+              : 'item-block-left',
+            'item-small-size',
+          ]"
+          v-show="showItem('footer_info', 'print_time')"
+        >
+          打印时间：2023-12-12 12:12:20
+        </div>
+        <div
+          class="item-block item-small-size"
+          v-show="showItem('footer_info', 'print_footer')"
+        >
+          {{ printData.footer_info.print_footer_info }}
+        </div>
+      </div>
+      <div
+        class="block-content"
+        v-show="
+          handerChekcItem('footer_info', ['manage', 'print_time']) &&
+          form.resource == 2
+        "
+      >
+        <div
+          class="item-block-left item-small-size"
+          v-show="showItem('footer_info', 'manage') && form.resource == 2"
+        >
+          操作人：李四
+        </div>
+        <div
+          :class="[
+            form.resource == 1 ? 'item-block' : 'item-block-left',
+            'item-small-size',
+          ]"
+          v-show="showItem('footer_info', 'print_time')"
+        >
+          打印时间：2023-12-12 12:12:20
+        </div>
+      </div>
     </div>
-    </el-dialog>
+  </el-dialog>
 </template>
 
 <script>
-import { config, printData } from "./receiptConfig.js";
+import { config, printData } from './receiptConfig.js'
 export default {
-    data(){
-        return{
-            isDialog:false,
-            receiptConfig:config,
-            printData:printData,
-            form:{
-                resource:1,
-                tepName:"",
-            },
-        }
-    },
-    methods:{
-        showDialog(){
-            this.isDialog = true;
-        },
-        closeDialog(){
-            this.isDialog = false;
-        },
-        handleClass(str){
-            var _str = str.replace(/\['|'\]$/g, '"').replace(/','/g, '","');
-            debugger;
-            // return JSON.parse(_str);
-        },
-        handerText(group){
-            if(group){
-
-                if(group.data ){
-                    return group.data
-                }
-            }
-        },
-        handerChekcItem(itemName,keyGroups){
-            
-            for(var key of keyGroups){            
-                if(this.printData[itemName][key] == 1){
-                    return true;
-                }
-            }
-        },
-        // test(items){
-        //     if(items.length <= 0 ) return;
-
-        //     let arr = [];
-
-        //     if(this.printData[items[0]][items[1]] == 1){
-        //         arr.push('item-size');
-        //     }else{
-        //         arr.push('item-small-size')
-        //     }
-
-        //     if(this.printData[items[0]][items[2]] == 1){
-        //         arr.push('bold');
-        //     }
-
-        //     return arr;
-        // },
-        // test2(items){
-        //     if(items.length <= 0 ) return;
-        //     return this.printData[items[0]][items[1]] !=0 ? true : false
-        // },
-        // test3(items){
-        //     if(items.length <= 0 ) return;
-        //     for(var key of items[1]){            
-        //         if(this.printData[items[0]][key] == 1){
-        //             return true;
-        //         }
-        //     }
-        // },
-        classItem(blockName,itemSizeName,itemBoldName){
-            
-            let arr = [];
-
-            if(this.printData[blockName][itemSizeName] == 1){
-                arr.push('item-size');
-            }else{
-                arr.push('item-small-size')
-            }
-
-            if(this.printData[blockName][itemBoldName] == 1){
-                arr.push('bold');
-            }
-
-            return arr;
-        },
-        // classItem(blockName,itemName){
-            
-        //     let arr = [];
-
-        //     Object.keys(this.printData[blockName]).some(key=>{
-        //         console.log(key);
-        //         if(key.includes(itemName) && key.includes('size')){
-        //             if(this.printData[blockName][key] == 1){
-        //                 arr.push('item-size');
-        //             }else{
-        //                 arr.push('item-small-size')
-        //             }
-        //         }
-
-        //         if(key.includes(itemName) && key.includes('bold')){
-        //             if(this.printData[blockName][key] == 1){
-        //                 arr.push('bold');
-        //             }
-        //         }
-        //     })
-
-        //     return arr;
-        // },
-        showItem(blockName,itemName){
-            if(!this.printData == null) return;
-            return this.printData[blockName][itemName] !=0 ? true : false
-        }
+  data() {
+    return {
+      isDialog: false,
+      receiptConfig: config,
+      printData: printData,
+      form: {
+        resource: 1,
+        tepName: '',
+      },
     }
+  },
+  methods: {
+    showDialog() {
+      this.isDialog = true
+    },
+    closeDialog() {
+      this.isDialog = false
+    },
+    handleClass(str) {
+      var _str = str.replace(/\['|'\]$/g, '"').replace(/','/g, '","')
+      debugger
+      // return JSON.parse(_str);
+    },
+    handerText(group) {
+      if (group) {
+        if (group.data) {
+          return group.data
+        }
+      }
+    },
+    handerChekcItem(itemName, keyGroups) {
+      for (var key of keyGroups) {
+        if (this.printData[itemName][key] == 1) {
+          return true
+        }
+      }
+    },
+    // test(items){
+    //     if(items.length <= 0 ) return;
+
+    //     let arr = [];
+
+    //     if(this.printData[items[0]][items[1]] == 1){
+    //         arr.push('item-size');
+    //     }else{
+    //         arr.push('item-small-size')
+    //     }
+
+    //     if(this.printData[items[0]][items[2]] == 1){
+    //         arr.push('bold');
+    //     }
+
+    //     return arr;
+    // },
+    // test2(items){
+    //     if(items.length <= 0 ) return;
+    //     return this.printData[items[0]][items[1]] !=0 ? true : false
+    // },
+    // test3(items){
+    //     if(items.length <= 0 ) return;
+    //     for(var key of items[1]){
+    //         if(this.printData[items[0]][key] == 1){
+    //             return true;
+    //         }
+    //     }
+    // },
+    classItem(blockName, itemSizeName, itemBoldName) {
+      let arr = []
+
+      if (this.printData[blockName][itemSizeName] == 1) {
+        arr.push('item-size')
+      } else {
+        arr.push('item-small-size')
+      }
+
+      if (this.printData[blockName][itemBoldName] == 1) {
+        arr.push('bold')
+      }
+
+      return arr
+    },
+    // classItem(blockName,itemName){
+
+    //     let arr = [];
+
+    //     Object.keys(this.printData[blockName]).some(key=>{
+    //         console.log(key);
+    //         if(key.includes(itemName) && key.includes('size')){
+    //             if(this.printData[blockName][key] == 1){
+    //                 arr.push('item-size');
+    //             }else{
+    //                 arr.push('item-small-size')
+    //             }
+    //         }
+
+    //         if(key.includes(itemName) && key.includes('bold')){
+    //             if(this.printData[blockName][key] == 1){
+    //                 arr.push('bold');
+    //             }
+    //         }
+    //     })
+
+    //     return arr;
+    // },
+    showItem(blockName, itemName) {
+      if (!this.printData == null) return
+      return this.printData[blockName][itemName] != 0 ? true : false
+    },
+  },
 }
 </script>
 
 <style lang="scss">
-.receiptDialog-container{
+.receiptDialog-container {
+  .el-dialog__header {
+    position: sticky;
+    top: 0;
+    background-color: white;
+    z-index: 1001;
+  }
 
-    .el-dialog__header{
-        position: sticky;
-        top: 0;
-        background-color: white;
-        z-index: 1001;
+  .el-dialog {
+    height: 670px;
+    max-height: 670px;
+    overflow: hidden;
+    overflow-y: auto;
+  }
+
+  .el-dialog__title {
+    font-size: 16px !important;
+  }
+
+  .el-dialog__body {
+    padding: 10px !important;
+    color: #000;
+  }
+
+  .block-container {
+    padding: 10px;
+    border: 1px solid #ededed;
+    border-radius: 10px;
+    background: #f8f8f9;
+  }
+
+  .block-content {
+    border-bottom: 1px dashed #ccc;
+    color: #333333 !important;
+  }
+
+  .item-flex {
+    display: flex;
+    font-size: 16px;
+
+    .item-flex-1 {
+      flex: 2 1 0%;
+      text-align: left;
     }
 
-    .el-dialog {
-        height: 670px;
-        max-height: 670px;
-        overflow: hidden;
-        overflow-y: auto;
+    .item-flex-2 {
+      flex: 1;
+      text-align: right;
     }
-    
-    .el-dialog__title{
-        font-size: 16px !important;
+  }
+
+  .item-balance-info {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .gift-block {
+    display: flex;
+    align-items: center;
+
+    .gift-num {
+      padding: 0 10px;
     }
 
-    .el-dialog__body{
-        padding: 10px !important;
-        color: #000;
+    .gift-boder {
+      flex: 1;
+      border-bottom: 1px dashed #ccc;
+    }
+  }
+
+  .refund-block {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    font-size: 16px;
+    font-weight: bold;
+
+    .refund-xing {
+      margin-top: 7px;
+      line-height: 1;
     }
 
-    .block-container{
-        padding: 10px;
-        border: 1px solid #ededed;
-        border-radius: 10px;
-        background: #f8f8f9;
+    .refund-num {
+      padding: 0 10px;
     }
+  }
 
-    .block-content{
-        border-bottom: 1px dashed #ccc;
-        color: #333333 !important;
-    }
+  .item-size {
+    font-size: 20px;
+  }
 
-    .item-flex{
-        display: flex;
-        font-size: 16px;
+  .item-small-size {
+    font-size: 16px;
+  }
 
-        .item-flex-1{
-            flex: 2 1 0%;
-            text-align: left;
-        }
+  .item-block {
+    margin: 10px 0;
+    text-align: center;
+  }
 
-        .item-flex-2{
-            flex: 1;
-            text-align: right;
-        }
-    }
+  .item-block-left {
+    margin: 10px 0;
+    text-align: left;
+  }
 
-    .item-balance-info{
-        display: flex;
-        justify-content: space-between;
-    }
-
-    .gift-block{
-        display: flex;
-        align-items: center;
-
-        .gift-num {
-            padding: 0 10px;
-        }
-
-        .gift-boder{
-            flex: 1; 
-            border-bottom: 1px dashed #ccc;
-        }
-    }
-
-    .refund-block{
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        
-        font-size: 16px;
-        font-weight: bold;
-
-        .refund-xing{
-            margin-top: 7px;
-            line-height: 1;
-        }
-
-        .refund-num {
-            padding: 0 10px;
-        }
-    }
-
-    .item-size{
-        font-size: 20px;
-    }
-
-    .item-small-size{
-        font-size: 16px;
-    }
-
-    .item-block{
-        margin: 10px 0;
-        text-align: center;
-    }
-
-    .item-block-left{
-        margin: 10px 0;
-        text-align: left;
-    }
-
-    .bold{
-        font-weight: 700;
-    }
+  .bold {
+    font-weight: 700;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/store/base/cloudPrint/templateManagement.vue b/src/views/store/base/cloudPrint/templateManagement.vue
index abda818..1638de2 100644
--- a/src/views/store/base/cloudPrint/templateManagement.vue
+++ b/src/views/store/base/cloudPrint/templateManagement.vue
@@ -1,218 +1,225 @@
 <template>
-    <div class="plotterManager-container">
-        <div class="head">
-            <el-button
-            icon="el-icon-plus"
-            type="primary"
-            size="medium"
-            @click="handleSkip"
-            >
-            添加新模板
-            </el-button>
-        </div>
-        <div class="content">
-            <span class="name">模板名称:</span>
-            <el-input 
-                placeholder="请输入模板名称" 
-                suffix-icon="el-icon-search"
-                v-model="inputData"
-                size="medium" 
-                class="input-with-select">
-            </el-input>
-            <span class="name">模板类型:</span>
-            <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">
-                </el-option>
-            </el-select>
-            <el-button
-                type="primary"
-                size="medium"
-                @click="handleAdd"
-            >
-            搜索
-            </el-button>
-            <el-button
-                size="medium"
-                @click="handleClear"
-            >
-            清除条件
-            </el-button>
-        </div>  
-        <el-table
-            :data="tableData"
-            :height="tableConfig.height"
-            :cell-class-name="handerColor"
-            style="width: 100%">
-            <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">编辑</el-button>
-                <el-button type="text" size="small">禁用</el-button>
-            </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"
-        />
-        <receiptDialog ref="receiptDialog" />
+  <div class="plotterManager-container">
+    <div class="head">
+      <el-button
+        icon="el-icon-plus"
+        type="primary"
+        size="medium"
+        @click="handleSkipAdd"
+      >
+        添加新模板
+      </el-button>
     </div>
+    <div class="content">
+      <span class="name">模板名称:</span>
+      <el-input
+        placeholder="请输入模板名称"
+        suffix-icon="el-icon-search"
+        v-model="inputData"
+        size="medium"
+        class="input-with-select"
+      ></el-input>
+      <span class="name">模板类型:</span>
+      <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"
+        ></el-option>
+      </el-select>
+      <el-button type="primary" size="medium" @click="handleAdd">
+        搜索
+      </el-button>
+      <el-button size="medium" @click="handleClear">清除条件</el-button>
+    </div>
+    <el-table
+      :data="tableData"
+      :height="tableConfig.height"
+      :cell-class-name="handerColor"
+      style="width: 100%"
+    >
+      <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="handleSkipEdit()">
+            编辑
+          </el-button>
+          <el-button type="text" size="small">禁用</el-button>
+        </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"
+    />
+    <receiptDialog ref="receiptDialog" />
+  </div>
 </template>
 <script>
 import receiptDialog from './receiptDialog'
 
 export default {
-    name:"plotterManager",
-    components:{ receiptDialog },
-    data(){
-        return{
-            inputData:'',
-            optionValue:'',
-            tableConfig: {
-                height: window.innerHeight - 220 - 150,
-            },
-            options:
-                [
-                    {
-                        value: '选项1',
-                        label: '黄金糕'
-                    }, 
-                    {
-                        value: '选项2',
-                        label: '双皮奶'
-                    },
-                ],
-            queryForm: {
-                stime: null,
-                etime: null,
-                kind_id:null,
-                order_state_id:null,
-                pageNum: 1,
-                pageSize: 20,
-            },
-            tabColumn:[
-                {
-                    prop:"tepName",
-                    label:"模版名称",
-                },
-                {
-                    prop:"tepType",
-                    label:"模版类型",
-                },
-                {
-                    prop:"state",
-                    label:"状态",
-                },
-                {
-                    prop:"createTime",
-                    label:"创建时间",
-                },
-                {
-                    prop:"operation",
-                    label:"操作",
-                }
-            ],
-            tableData: [
-                {
-
-                    tepName: '福家优鲜 线上超市',
-                    tepType: '订单打印',
-                    state:'已停用',
-                    createTime:"2024-05-07 14:47:55",
-                    operation:"操作"
-                },
-                {
-                    tepName: '飞蛾',
-                    tepType: '365云打印S2(编号kdt2)',
-                    state:"已使用",
-                    createTime:"2024-05-07 14:47:55",
-                    operation:"操作"
-                },                 
-            ]
-        }
-    },
-    methods:{
-        handleSkip(){
-            this.$router.push({path:"/addTemplateManagement"})
+  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: [
+        {
+          value: '选项1',
+          label: '黄金糕',
         },
-        handleClear(){
-            this.inputData = '';
+        {
+          value: '选项2',
+          label: '双皮奶',
         },
-        handleCheck(){
-            this.$refs['receiptDialog'].showDialog();
+      ],
+      queryForm: {
+        stime: null,
+        etime: null,
+        kind_id: null,
+        order_state_id: null,
+        pageNum: 1,
+        pageSize: 20,
+      },
+      tabColumn: [
+        {
+          prop: 'tepName',
+          label: '模版名称',
         },
-        handleAdd(){
-
+        {
+          prop: 'tepType',
+          label: '模版类型',
         },
-        handleSizeChange(){
-
+        {
+          prop: 'state',
+          label: '状态',
         },
-        handleCurrentChange(){
-
+        {
+          prop: 'createTime',
+          label: '创建时间',
         },
-        handerColor({ row, column, rowIndex, columnIndex }){
-            if(row){
-                if(row.state == '已使用' && columnIndex == 2){
-                    return "state-on";
-                }
-                if(row.state == '已停用' && columnIndex == 2){
-                    return "state-off";
-                }
-            }
+        {
+          prop: 'operation',
+          label: '操作',
         },
+      ],
+      tableData: [
+        {
+          tepName: '福家优鲜 线上超市',
+          tepType: '订单打印',
+          state: '已停用',
+          createTime: '2024-05-07 14:47:55',
+          operation: '操作',
+        },
+        {
+          tepName: '飞蛾',
+          tepType: '365云打印S2(编号kdt2)',
+          state: '已使用',
+          createTime: '2024-05-07 14:47:55',
+          operation: '操作',
+        },
+      ],
     }
+  },
+  methods: {
+    handleSkipAdd() {
+      this.$router.push({ path: '/templateManagementAdd' })
+    },
+    handleSkipEdit() {
+      this.$router.push({ path: '/templateManagementEdit' })
+    },
+    handleClear() {
+      this.inputData = ''
+    },
+    handleCheck() {
+      this.$refs['receiptDialog'].showDialog()
+    },
+    handleAdd() {},
+    handleSizeChange() {},
+    handleCurrentChange() {},
+    handerColor({ row, column, rowIndex, columnIndex }) {
+      if (row) {
+        if (row.state == '已使用' && columnIndex == 2) {
+          return 'state-on'
+        }
+        if (row.state == '已停用' && columnIndex == 2) {
+          return 'state-off'
+        }
+      }
+    },
+  },
 }
 </script>
 
 <style lang="scss">
 .plotterManager-container {
+  .head {
+    padding-bottom: 20px;
+    box-shadow: inset 0 -1px 0 #efefef;
+  }
 
-        .head{
-            padding-bottom: 20px;
-            box-shadow: inset 0 -1px 0 #efefef;
-        }
+  .content {
+    display: flex;
+    align-items: center;
+    text-align: center;
+    margin: 20px 0;
 
-        .content{
-            display: flex;
-            align-items: center;
-            text-align: center;
-            margin: 20px 0;
+    .name {
+      font-weight: bold;
+    }
 
-            .name{
-                font-weight: bold;
-            }
+    .input-with-select {
+      margin: 0 10px;
+      width: 270px;
+    }
+  }
 
-            .input-with-select{
-                margin: 0 10px;
-                width: 270px;
-            }
-        }
+  .state- {
+    &on {
+      .cell {
+        color: #48c978 !important;
+      }
+    }
 
-        .state-{
-
-            &on{
-               .cell{
-                    color: #48c978 !important;       
-                } 
-            }
-
-            &off{
-                .cell{
-                    color: red !important;
-                }
-            }
-        }
+    &off {
+      .cell {
+        color: red !important;
+      }
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/store/base/components/LocationEdit.vue b/src/views/store/base/components/LocationEdit.vue
index ae58a06..7e97a7a 100644
--- a/src/views/store/base/components/LocationEdit.vue
+++ b/src/views/store/base/components/LocationEdit.vue
@@ -116,226 +116,226 @@
 </template>
 
 <script>
-  import { translateTitle as __ } from '@/utils/i18n'
-  import Area from '@/components/VabArea/area'
-  import keyword from '@/components/baiduMap/keyword'
-  import { storeSetUp } from '@/api/store/base'
+import { translateTitle as __ } from '@/utils/i18n'
+import Area from '@/components/VabArea/area'
+import keyword from '@/components/baiduMap/keyword'
+import { storeSetUp } from '@/api/store/base'
 
-  export default {
-    name: 'LocationEdit',
-    components: { keyword, Area },
-    data() {
-      return {
-        form: {},
-        title: '',
-        map_show: false,
-        zoom: 15,
-        mapCenter: { lng: '', lat: '' },
-        rules: {
-          store_district_id: [{ required: true, message: '省市区' }],
+export default {
+  name: 'LocationEdit',
+  components: { keyword, Area },
+  data() {
+    return {
+      form: {},
+      title: '',
+      map_show: false,
+      zoom: 15,
+      mapCenter: { lng: '', lat: '' },
+      rules: {
+        store_district_id: [{ required: true, message: '省市区' }],
 
-          store_area: [{ required: true, message: '省市区' }],
+        store_area: [{ required: true, message: '省市区' }],
 
-          store_address: [{ required: true, message: '详细地址' }],
+        store_address: [{ required: true, message: '详细地址' }],
 
-          store_longitude: [{ required: true, message: '经度' }],
-          store_latitude: [{ required: true, message: '纬度' }],
-          store_opening_hours: [
-            { required: true, message: '请选择营业时间', trigger: 'blur' },
-          ],
-          store_close_hours: [
-            { required: true, message: '请选择关闭时间', trigger: 'blur' },
-          ],
-        },
-        dialogFormVisible: false,
-        queryArea: {
-          province: { code: '', name: '' },
-          city: { code: '', name: '' },
-          district: { code: '', name: '' },
-        },
+        store_longitude: [{ required: true, message: '经度' }],
+        store_latitude: [{ required: true, message: '纬度' }],
+        store_opening_hours: [
+          { required: true, message: '请选择营业时间', trigger: 'blur' },
+        ],
+        store_close_hours: [
+          { required: true, message: '请选择关闭时间', trigger: 'blur' },
+        ],
+      },
+      dialogFormVisible: false,
+      queryArea: {
+        province: { code: '', name: '' },
+        city: { code: '', name: '' },
+        district: { code: '', name: '' },
+      },
+    }
+  },
+  created() {},
+  mounted() {
+    this.$forceUpdate()
+  },
+  methods: {
+    __,
+    showEdit(row) {
+      if (!row) {
+        this.title = this.__('添加')
+      } else {
+        this.title = this.__('编辑')
+        this.form = Object.assign({}, row)
+        this.initData(row)
       }
-    },
-    created() {},
-    mounted() {
+      this.dialogFormVisible = true
+
+      //不允许同时为0
+      if (this.form.store_longitude == 0 && this.form.store_latitude == 0) {
+        this.form.store_longitude = ''
+        this.form.store_latitude = ''
+      }
+
       this.$forceUpdate()
     },
-    methods: {
-      __,
-      showEdit(row) {
-        if (!row) {
-          this.title = this.__('添加')
-        } else {
-          this.title = this.__('编辑')
-          this.form = Object.assign({}, row)
-          this.initData(row)
-        }
-        this.dialogFormVisible = true
+    initData(row) {
+      if (row.store_area) {
+        this.form.store_area = row.store_area.split('/')
+      }
 
-        //不允许同时为0
-        if (this.form.store_longitude == 0 && this.form.store_latitude == 0) {
-          this.form.store_longitude = ''
-          this.form.store_latitude = ''
-        }
+      this.form.store_district_id = row.store_district_id.split('/')
 
-        this.$forceUpdate()
-      },
-      initData(row) {
-        if (row.store_area) {
-          this.form.store_area = row.store_area.split('/')
-        }
+      if (this.form.store_district_id.length > 0) {
+      } else {
+        this.form.store_district_id = ''
+      }
 
-        this.form.store_district_id = row.store_district_id.split('/')
+      this.initQueryArea(this.form.store_district_id, this.form.store_area)
 
-        if (this.form.store_district_id.length > 0) {
-        } else {
-          this.form.store_district_id = ''
-        }
-
-        this.initQueryArea(this.form.store_district_id, this.form.store_area)
-
-        // 地图回显地位
-        this.mapCenter.lat = this.form.store_latitude
-        this.mapCenter.lng = this.form.store_longitude
-      },
-
-      initQueryArea(store_district_id, store_area) {
-        if (!store_district_id && store_area) return
-        if (!store_area) return
-        if (store_district_id[0]) {
-          this.queryArea.province.code = store_district_id[0]
-        }
-        if (store_district_id[1]) {
-          this.queryArea.city.code = store_district_id[1]
-        }
-        if (store_district_id[2]) {
-          this.queryArea.district.code = store_district_id[2]
-        }
-        if (store_area[0]) {
-          this.queryArea.province.name = store_area[0]
-        }
-        if (store_area[1]) {
-          this.queryArea.city.name = store_area[1]
-        }
-        if (store_area[2]) {
-          this.queryArea.district.name = store_area[2]
-        }
-      },
-
-      /***
-       * 地图点击事件。
-       */
-      getClickInfo(e) {
-        this.mapCenter.lng = e.point.lng
-        this.mapCenter.lat = e.point.lat
-
-        this.form.store_latitude = this.mapCenter.lat
-        this.form.store_longitude = this.mapCenter.lng
-      },
-      syncCenterAndZoom(e) {
-        const { lng, lat } = e.target.getCenter()
-        this.mapCenter.lng = lng
-        this.mapCenter.lat = lat
-        this.zoom = e.target.getZoom()
-
-        console.info(this.zoom)
-        console.info(this.mapCenter)
-
-        this.form.store_latitude = this.mapCenter.lat
-        this.form.store_longitude = this.mapCenter.lng
-      },
-      getAddress(address) {
-        console.info('address')
-        console.info(address)
-        this.form.store_address = address.value
-        this.form.store_longitude = address.lng
-        this.form.store_latitude = address.lat
-        // 地图回显地位
-
-        this.mapCenter.lat = this.form.store_latitude
-        this.mapCenter.lng = this.form.store_longitude
-      },
-      changeAddr(addr) {
-        this.form.store_address = addr
-      },
-      close() {
-        this.dialogFormVisible = false
-
-        this.form = {}
-        this.queryArea = {
-          province: { code: '', name: '' },
-          city: { code: '', name: '' },
-          district: { code: '', name: '' },
-        }
-
-        this.$forceUpdate()
-      },
-      save() {
-        console.info(this.mapCenter)
-        let params = {}
-        params = this.form
-
-        delete params.store_district_id
-
-        if (this.queryArea.province.name) {
-          params.store_area = this.queryArea.province.name
-        }
-        if (this.queryArea.city.name) {
-          params.store_area += '/' + this.queryArea.city.name
-        }
-        if (this.queryArea.district.name) {
-          params.store_area += '/' + this.queryArea.district.name
-        }
-
-        if (this.queryArea.province.code) {
-          params.store_district_id = this.queryArea.province.code
-        }
-        if (this.queryArea.city.code) {
-          params.store_district_id += '/' + this.queryArea.city.code
-        }
-        if (this.queryArea.district.code) {
-          params.store_district_id += '/' + this.queryArea.district.code
-        }
-
-        this.$refs['form'].validate(async (valid) => {
-          if (valid) {
-            // const chain_category_id =
-            //   params.chain_category_id[
-            //   params.chain_category_id.length - 1
-            //     ]
-            // params.chain_category_id = chain_category_id
-
-            const { msg, status } = await storeSetUp(params)
-            if (200 == status) {
-              this.$baseMessage(msg, 'success')
-            } else {
-              this.$baseMessage(msg, 'error')
-            }
-            this.$emit('fetch-data')
-            this.close()
-          } else {
-            return false
-          }
-        })
-      },
+      // 地图回显地位
+      this.mapCenter.lat = this.form.store_latitude
+      this.mapCenter.lng = this.form.store_longitude
     },
-  }
+
+    initQueryArea(store_district_id, store_area) {
+      if (!store_district_id && store_area) return
+      if (!store_area) return
+      if (store_district_id[0]) {
+        this.queryArea.province.code = store_district_id[0]
+      }
+      if (store_district_id[1]) {
+        this.queryArea.city.code = store_district_id[1]
+      }
+      if (store_district_id[2]) {
+        this.queryArea.district.code = store_district_id[2]
+      }
+      if (store_area[0]) {
+        this.queryArea.province.name = store_area[0]
+      }
+      if (store_area[1]) {
+        this.queryArea.city.name = store_area[1]
+      }
+      if (store_area[2]) {
+        this.queryArea.district.name = store_area[2]
+      }
+    },
+
+    /***
+     * 地图点击事件。
+     */
+    getClickInfo(e) {
+      this.mapCenter.lng = e.point.lng
+      this.mapCenter.lat = e.point.lat
+
+      this.form.store_latitude = this.mapCenter.lat
+      this.form.store_longitude = this.mapCenter.lng
+    },
+    syncCenterAndZoom(e) {
+      const { lng, lat } = e.target.getCenter()
+      this.mapCenter.lng = lng
+      this.mapCenter.lat = lat
+      this.zoom = e.target.getZoom()
+
+      console.info(this.zoom)
+      console.info(this.mapCenter)
+
+      this.form.store_latitude = this.mapCenter.lat
+      this.form.store_longitude = this.mapCenter.lng
+    },
+    getAddress(address) {
+      console.info('address')
+      console.info(address)
+      this.form.store_address = address.value
+      this.form.store_longitude = address.lng
+      this.form.store_latitude = address.lat
+      // 地图回显地位
+
+      this.mapCenter.lat = this.form.store_latitude
+      this.mapCenter.lng = this.form.store_longitude
+    },
+    changeAddr(addr) {
+      this.form.store_address = addr
+    },
+    close() {
+      this.dialogFormVisible = false
+
+      this.form = {}
+      this.queryArea = {
+        province: { code: '', name: '' },
+        city: { code: '', name: '' },
+        district: { code: '', name: '' },
+      }
+
+      this.$forceUpdate()
+    },
+    save() {
+      console.info(this.mapCenter)
+      let params = {}
+      params = this.form
+
+      delete params.store_district_id
+
+      if (this.queryArea.province.name) {
+        params.store_area = this.queryArea.province.name
+      }
+      if (this.queryArea.city.name) {
+        params.store_area += '/' + this.queryArea.city.name
+      }
+      if (this.queryArea.district.name) {
+        params.store_area += '/' + this.queryArea.district.name
+      }
+
+      if (this.queryArea.province.code) {
+        params.store_district_id = this.queryArea.province.code
+      }
+      if (this.queryArea.city.code) {
+        params.store_district_id += '/' + this.queryArea.city.code
+      }
+      if (this.queryArea.district.code) {
+        params.store_district_id += '/' + this.queryArea.district.code
+      }
+
+      this.$refs['form'].validate(async (valid) => {
+        if (valid) {
+          // const chain_category_id =
+          //   params.chain_category_id[
+          //   params.chain_category_id.length - 1
+          //     ]
+          // params.chain_category_id = chain_category_id
+
+          const { msg, status } = await storeSetUp(params)
+          if (200 == status) {
+            this.$baseMessage(msg, 'success')
+          } else {
+            this.$baseMessage(msg, 'error')
+          }
+          this.$emit('fetch-data')
+          this.close()
+        } else {
+          return false
+        }
+      })
+    },
+  },
+}
 </script>
 <style>
-  .map {
-    width: 100%;
-    height: 300px;
-  }
-  .admin_info {
-    margin-top: 20px;
-    font-size: 18px;
-    color: #b1eca4;
-  }
-  .sel_time {
-    float: right;
-    width: 325px;
-    margin-right: 10px;
-  }
+.map {
+  width: 100%;
+  height: 300px;
+}
+.admin_info {
+  margin-top: 20px;
+  font-size: 18px;
+  color: #b1eca4;
+}
+.sel_time {
+  float: right;
+  width: 325px;
+  margin-right: 10px;
+}
 
-  .el-form-item--small.el-form-item {
-  }
+.el-form-item--small.el-form-item {
+}
 </style>
diff --git a/src/views/store/base/distributionSetup/distributionMode.vue b/src/views/store/base/distributionSetup/distributionMode.vue
index 4cd743c..f7b83b5 100644
--- a/src/views/store/base/distributionSetup/distributionMode.vue
+++ b/src/views/store/base/distributionSetup/distributionMode.vue
@@ -1,232 +1,358 @@
 <template>
-    <div class="distributionMode-container">
-        <div class="content-block">
-            <div class="item">
-                <div class="name">同城配送</div>
-                <el-switch
-                    v-model="isCitySwitch"
-                    :active-text="switchText" @change="handleSwitchText">
-                </el-switch>
-            </div>
-            <div class="item-2">
-                <div class="tips">启用同城配送后，在配送范围内的买家可以选择同城配送，你可以接入第三方配送，也可以自己配送。</div>
-                <div class="compile-block">
-                    <span class="compile-item">默认配送方式 </span>
-                    <span class="segmentation">|</span>
-                    <span class="compile-item" @click="skipu()">编辑同城配送</span>
-                </div>
-            </div>
+  <div class="distributionMode-container">
+    <div class="content-block">
+      <div class="item">
+        <div class="name">同城配送</div>
+        <el-switch
+          v-model="isCitySwitch"
+          :active-text="switchText"
+          @change="handleSwitchText"
+        ></el-switch>
+      </div>
+      <div class="item-2">
+        <div class="tips">
+          启用同城配送后，在配送范围内的买家可以选择同城配送，你可以接入第三方配送，也可以自己配送。
         </div>
-        <div class="content-block">
-            <div class="item">
-                <div class="name">上门自提</div>
-                <el-switch
-                    v-model="isCitySwitch"
-                    :active-text="switchText" @change="handleSwitchText">
-                </el-switch>
-            </div>
-            <div class="item-2">
-                <div class="tips">启用上门自提后，买家可以就近选择商品自提点，买家下单后，您需要确保买家指定的自提点商品库存充足。</div>
-                <div class="compile-block">
-                    <span class="compile-item">查看自提点 </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">
-                    <div class="item-lable">同城配送</div>
-                    <el-input
-                        type="text"
-                        placeholder="请输入内容"
-                        v-model="form.cityText"
-                        maxlength="4"
-                        show-word-limit
-                        class="item-input"
-                    >
-                    </el-input>
-                </div>
-                <div class="item">
-                    <div class="item-lable">上门自提</div>
-                    <el-input
-                        type="text"
-                        placeholder="请输入内容"
-                        v-model="form.crvMoreText"
-                        maxlength="4"
-                        show-word-limit
-                        class="item-input"
-                    >
-                    </el-input>
-                </div>
-                <div class="item">
-                    <div class="item-lable">等待自提</div>
-                    <el-input
-                        type="text"
-                        placeholder="请输入内容"
-                        v-model="form.awaitPickUpText"
-                        maxlength="4"
-                        show-word-limit
-                        class="item-input"
-                    >
-                    </el-input>
-                </div>
-                <div class="item">
-                    <div class="item-lable">配送时间</div>
-                    <el-input
-                        type="text"
-                        placeholder="请输入内容"
-                        v-model="form.deliveryTimeText"
-                        maxlength="4"
-                        show-word-limit
-                        class="item-input"
-                    >
-                    </el-input>
-                </div>
-                <div class="item">
-                    <div class="item-lable">自提时间</div>
-                    <el-input
-                        type="text"
-                        placeholder="请输入内容"
-                        v-model="form.pickUpTimeText"
-                        maxlength="4"
-                        show-word-limit
-                        class="item-input"
-                    >
-                    </el-input>
-                </div>
-                <el-button class="btn" type="primary" size="medium">保存</el-button>
-            </div>    
+        <div class="compile-block">
+          <span class="compile-item" @click="handelShowDialog()">
+            默认配送方式
+          </span>
+          <span class="segmentation">|</span>
+          <span class="compile-item" @click="handleCitySkip()">
+            编辑同城配送
+          </span>
         </div>
+      </div>
     </div>
+    <div class="content-block">
+      <div class="item">
+        <div class="name">上门自提</div>
+        <el-switch
+          v-model="isVisitSwitch"
+          :active-text="visitSwitchText"
+          @change="handleVisitSwitchText"
+        ></el-switch>
+      </div>
+      <div class="item-2">
+        <div class="tips">
+          启用上门自提后，买家可以就近选择商品自提点，买家下单后，您需要确保买家指定的自提点商品库存充足。
+        </div>
+        <div class="compile-block">
+          <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">
+          <div class="item-lable">同城配送</div>
+          <el-input
+            type="text"
+            placeholder="请输入内容"
+            v-model="form.cityText"
+            maxlength="4"
+            show-word-limit
+            class="item-input"
+          ></el-input>
+        </div>
+        <div class="item">
+          <div class="item-lable">上门自提</div>
+          <el-input
+            type="text"
+            placeholder="请输入内容"
+            v-model="form.crvMoreText"
+            maxlength="4"
+            show-word-limit
+            class="item-input"
+          ></el-input>
+        </div>
+        <div class="item">
+          <div class="item-lable">等待自提</div>
+          <el-input
+            type="text"
+            placeholder="请输入内容"
+            v-model="form.awaitPickUpText"
+            maxlength="4"
+            show-word-limit
+            class="item-input"
+          ></el-input>
+        </div>
+        <div class="item">
+          <div class="item-lable">配送时间</div>
+          <el-input
+            type="text"
+            placeholder="请输入内容"
+            v-model="form.deliveryTimeText"
+            maxlength="4"
+            show-word-limit
+            class="item-input"
+          ></el-input>
+        </div>
+        <div class="item">
+          <div class="item-lable">自提时间</div>
+          <el-input
+            type="text"
+            placeholder="请输入内容"
+            v-model="form.pickUpTimeText"
+            maxlength="4"
+            show-word-limit
+            class="item-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",
-    data(){
-        return{
-            isCitySwitch:false,
-            switchText:'关闭',
-            form:{
-                cityText:'同城配送',
-                crvMoreText:'上门自提',
-                awaitPickUpText:'等待自提',
-                deliveryTimeText:'配送时间',
-                pickUpTimeText:'自提时间'
-            }
-        }
-    },
-    methods:{
-        handleSwitchText(isSwitch){
-            if(isSwitch){
-                this.switchText = '开启'
-            }else{
-                this.switchText = '关闭'
-            }
+  name: 'distributionMode',
+  data() {
+    return {
+      isCitySwitch: false,
+      isVisitSwitch: false,
+      showDialog: false,
+      switchText: '关闭',
+      visitSwitchText: '关闭',
+      form: {
+        cityText: '同城配送',
+        crvMoreText: '上门自提',
+        awaitPickUpText: '等待自提',
+        deliveryTimeText: '配送时间',
+        pickUpTimeText: '自提时间',
+      },
+      formDialog: {
+        distributionModeType: 0,
+      },
+      formDialogRules: {
+        distributionModeType: [
+          { required: true, message: '请选择默认配送方式', trigger: 'change' },
+        ],
+      },
+      distributionModeOpction: [
+        {
+          value: 0,
+          label: '商家配送',
         },
-        skipu(){
-            this.$router.push({ path: '/localDelivery' });
-        }
+        {
+          value: 1,
+          label: '码科速送',
+        },
+      ],
     }
+  },
+  methods: {
+    handleSwitchText(isSwitch) {
+      if (isSwitch) {
+        this.switchText = '开启'
+      } else {
+        this.switchText = '关闭'
+      }
+    },
+    handleVisitSwitchText(isSwitch) {
+      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{
+.distributionMode-container {
+  padding: 0 !important;
+  background: #f6f8f9 !important;
 
-    padding: 0 !important;
-    background: #f6f8f9 !important;
+  .content-block {
+    display: flex;
+    flex-flow: column;
+    margin-bottom: 24px;
+    background: #fff;
 
-    .content-block{
-        display: flex;
-        flex-flow: column;
-        margin-bottom: 24px;
-        background: #fff;
+    .item {
+      display: flex;
+      padding: 16px 20px;
+      justify-content: space-between;
+      border-bottom: 1px solid #f2f2f2;
+      line-height: 1;
 
-        .item{
-            display: flex;
-            padding: 16px 20px;
-            justify-content: space-between;
-            border-bottom: 1px solid #f2f2f2;
-            line-height: 1;
-            
-            .name{
-                color: #333;
-                font-size: 16px;
-                font-weight: bold;
-            }
-        }
-
-        .item-2{
-            display: flex;
-            justify-content: space-between;
-            padding: 20px;
-
-            
-            
-            .compile-block{
-                color: #1890ff;
-
-                .segmentation{
-                    padding: 0 8px;
-                    color: #000;
-                }
-
-                .compile-item{
-                    cursor: pointer;
-                }
-            }
-        }
+      .name {
+        color: #333;
+        font-size: 16px;
+        font-weight: bold;
+      }
     }
 
-    .footer{
-        display: flex;
-        flex-flow: column;
-        background: #fff;
+    .item-2 {
+      display: flex;
+      justify-content: space-between;
+      padding: 20px;
 
-        .item-title{
-            padding: 16px 20px;
-            border-bottom: 1px solid #f2f2f2;
-            font-size: 16px;
-            font-weight: bold;
-            color: #333;
-            line-height: 1;
+      .compile-block {
+        color: #1890ff;
+
+        .segmentation {
+          padding: 0 8px;
+          color: #000;
         }
 
-        .item-block{
-            padding: 20px;
-            
-            .tips{
-                margin-bottom: 20px !important;
-            }
-
-            .item{
-                display: flex;
-                margin-bottom: 30px;
-                align-items:center;
-
-                &-lable{
-                    padding: 0 20px 0 10px;
-                    color: #333;
-                }
-                
-                .item-input{
-                    width: 200px;
-                    height: 38px;
-                    
-                    .el-input__inner{
-                        height: 38px;
-                        line-height: 38px;
-                    }
-                }
-            }
-
-            .btn{
-                margin-left: 84px;
-            }
+        .compile-item {
+          cursor: pointer;
         }
+      }
     }
+  }
+
+  .footer {
+    display: flex;
+    flex-flow: column;
+    background: #fff;
+
+    .item-title {
+      padding: 16px 20px;
+      border-bottom: 1px solid #f2f2f2;
+      font-size: 16px;
+      font-weight: bold;
+      color: #333;
+      line-height: 1;
+    }
+
+    .item-block {
+      padding: 20px;
+
+      .tips {
+        margin-bottom: 20px !important;
+      }
+
+      .item {
+        display: flex;
+        margin-bottom: 30px;
+        align-items: center;
+
+        &-lable {
+          padding: 0 20px 0 10px;
+          color: #333;
+        }
+
+        .item-input {
+          width: 200px;
+          height: 38px;
+
+          .el-input__inner {
+            height: 38px;
+            line-height: 38px;
+          }
+        }
+      }
+
+      .btn {
+        margin-left: 84px;
+      }
+    }
+  }
+
+  .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>
\ No newline at end of file
diff --git a/src/views/store/base/distributionSetup/distributionSetupConfig/config.js b/src/views/store/base/distributionSetup/distributionSetupConfig/config.js
new file mode 100644
index 0000000..f810292
--- /dev/null
+++ b/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:'分钟'
+  },
+]
+
diff --git a/src/views/store/base/distributionSetup/editSelfPickUpSite.vue b/src/views/store/base/distributionSetup/editSelfPickUpSite.vue
new file mode 100644
index 0000000..6090b3b
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/views/store/base/distributionSetup/localDelivery.vue b/src/views/store/base/distributionSetup/localDelivery.vue
index 3ae9a30..fcc2d64 100644
--- a/src/views/store/base/distributionSetup/localDelivery.vue
+++ b/src/views/store/base/distributionSetup/localDelivery.vue
@@ -1,1418 +1,2476 @@
 <template>
-    <div class="localDelivery-container">
-        <div class="item-block">
-            <div class="title">同城配送</div>
-            <div class="block">
-                <el-form ref="form" :model="form" label-width="160px" :rules="rules">
-                    <el-form-item label="配送方式" prop="distributionType">
-                        <el-checkbox-group v-model="form.distributionType">
-                            <el-checkbox v-for="(item,index) of checkList" 
-                            :key="item.label + index" 
-                            :label="item.label"
-                            size="medium" 
-                            >{{ item.name }}</el-checkbox>
-                        </el-checkbox-group>
-                        <div class="tips">开启后将由第三方平台为您配送。</div>
-                    </el-form-item>
-                    <div v-if="form.distributionType.includes(2)">
-                        <el-form-item prop="no3DistributionType" >
-                            <el-checkbox-group v-model="form.no3DistributionType" class="distribution-group">
-                                    <div :class="['distribution-box', {active:active == index }]" v-for="(item,index) of distributionList" :key="item.label + index"  @click.stop.prevent="btnClickImg($event,index)">
-                                        <el-checkbox 
-                                        :label="item.label"
-                                        @click.native="stopEvenPropagation($event)"
-                                        size="medium"
-                                        >
-                                        {{  }}
-                                        </el-checkbox>
-                                        <img
-                                            class="img" 
-                                            width="89"
-                                            height="23"
-                                            :src="item.imgUrl"
-                                        />
-                                    </div>
-                            </el-checkbox-group>
-                        </el-form-item>
-                        <el-form-item label="app_key" prop="dadaData.appKey" v-if="active == 0">
-                            <el-input v-model="form.dadaData.appKey"></el-input>
-                        </el-form-item>
-                        <el-form-item label="app_secret" prop="dadaData.appSecret" v-if="active == 0">
-                            <el-input v-model="form.dadaData.appSecret"></el-input>
-                        </el-form-item>
-                        <el-form-item label="商户ID" prop="dadaData.storeId" v-if="active == 0">
-                            <el-input v-model="form.dadaData.storeId"></el-input>
-                        </el-form-item>
-                        <el-form-item label="门店编码" prop="dadaData.shopCode" v-if="active == 0">
-                            <el-input v-model="form.dadaData.shopCode"></el-input>
-                        </el-form-item>
-                        <el-form-item label="城市选择" prop="" v-if="active == 0">
-                            <el-button type="primary" @click="getCity()">获取城市</el-button>
-                        </el-form-item>
-                        <el-form-item label="配送服务" prop="meituanData.distributionOpction" v-if="active == 1">
-                            <el-select v-model="form.meituanData.distributionOpction" placeholder="请选择配送服务">
-                                <el-option v-for="(item,index) of distributionOpction" 
-                                    :key="index + item.value" 
-                                    :label="item.label" 
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="AppKey" prop="meituanData.appKey" v-if="active == 1">
-                            <el-input v-model="form.meituanData.appKey"></el-input>
-                        </el-form-item>
-                        <el-form-item label="AppSecret" prop="meituanData.appSecret" v-if="active == 1">
-                            <el-input v-model="form.meituanData.appSecret"></el-input>
-                        </el-form-item>
-                        <el-form-item label="门店ID" prop="meituanData.storeId" v-if="active == 1">
-                            <el-input v-model="form.meituanData.storeId"></el-input>
-                        </el-form-item>
-                        <el-form-item label="支付方式" prop="meituanData.storeId" v-if="active == 1">
-                            <el-radio-group v-model="form.meituanData.payType">
-                                <el-radio :label="0">账期支付</el-radio>
-                                <el-radio :label="1">余额支付</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="开发者账号（dev_id）" prop="sfData.developerAccount" v-if="active == 2">
-                            <el-input v-model="form.sfData.developerAccount"></el-input>
-                        </el-form-item>
-                        <el-form-item label="开发者秘钥（dev_key）" prop="sfData.devKey" v-if="active == 2">
-                            <el-input v-model="form.sfData.devKey"></el-input>
-                        </el-form-item>
-                        <el-form-item label="店铺id" prop="sfData.storeId" v-if="active == 2">
-                            <el-input v-model="form.sfData.storeId"></el-input>
-                        </el-form-item>
-                        <el-form-item label="物品类型" prop="sfData.goodsType" v-if="active == 2">
-                            <el-select v-model="form.sfData.goodsType" placeholder="请选择物品类型">
-                                <el-option v-for="(item,index) of goodsTypeList" 
-                                    :key="index + item.value" 
-                                    :label="item.label" 
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="商户ID" prop="ssData.shopId" v-if="active == 3">
-                            <el-input v-model="form.ssData.storeId"></el-input>
-                        </el-form-item>
-                        <el-form-item label="App_key（Client_ID）" prop="ssData.appKey" v-if="active == 3">
-                            <el-input v-model="form.ssData.appKey"></el-input>
-                        </el-form-item>
-                        <el-form-item label="App_secret" prop="ssData.appSecret" v-if="active == 3">
-                            <el-input v-model="form.ssData.appSecret"></el-input>
-                        </el-form-item>
-                        <el-form-item label="门店ID" prop="ssData.storeId" v-if="active == 3">
-                            <el-input v-model="form.ssData.shopId"></el-input>
-                        </el-form-item>
-                        <el-form-item label="appid" prop="uuData.appId" v-if="active == 4">
-                            <el-input v-model="form.ssData.storeId"></el-input>
-                        </el-form-item>
-                        <el-form-item label="appkey" prop="uuData.appKey" v-if="active == 4">
-                            <el-input v-model="form.ssData.appKey"></el-input>
-                        </el-form-item>
-                        <el-form-item label="openid" prop="uuData.openId" v-if="active == 4">
-                            <el-input v-model="form.ssData.appSecret"></el-input>
-                        </el-form-item>
-                    </div>
-                    <el-form-item label="配送时间买家自选" prop="">
-                        <el-radio-group v-model="form.isDistribution">
-                            <el-radio :label="1">开启</el-radio>
-                            <el-radio :label="0">关闭</el-radio>
-                        </el-radio-group>
-                        <div class="tips">开启后，买家下单选择同城配送时，可选择配送时间，提交订单后，将在买家备注中显示。</div>
-                    </el-form-item>
-                    <el-form-item label="配送时间买家自选" prop="">
-                        <el-radio-group v-model="form.isAutomaticDelivery" class="automatic-delivery-radio">
-                            <el-radio :label="0">不启用</el-radio>
-                            <el-radio :label="1">下单后，在营业时间内，自动发货</el-radio>
-                            <el-radio :label="2" disabled>下单后，在自定义时间内，自动发货</el-radio>
-                            <el-radio :label="3">下单后，抵达订单配送时间时，自动发货</el-radio>
-                        </el-radio-group>
-                        <div class="in-advance-block" v-if="form.isAutomaticDelivery == 3">
-                            <div class="title-block">提前</div>
-                            <el-input class="time-input-block" v-model="form.inAdvanceTime" placeholder="">
-                                <label slot="append">分钟</label>
-                            </el-input>
-                            <div style="margin-left: 10px;">进行发货（若默认配送方式为第三方配送，则此时将订单推送至第三方平台）</div>
-                        </div>
-                        <div class="tips" style="color: #1890ff;">在自动发货时间内生成的订单自动发货，启用自动发货后，需要在配送管理列表同城配送处设置默认发货方式。</div>
-                        <div v-for="(group,groupIndex) of form.weekConfig" :key="groupIndex">
-                            <el-checkbox-group v-model="group.weekList" v-if="form.isAutomaticDelivery == 2">
-                                <el-checkbox v-for="(item,index) of group.weekListConfig" 
-                                :key="item.label + index" 
-                                :label="item.label"
-                                :disabled="item.disabled"
-                                @change="handleWeekList"
-                                >
-                                    {{ item.name }}
-                                </el-checkbox>
-                                <label class="el-checkbox is-checked delect-week" v-if="groupIndex >= 1" @click="delectWeek(groupIndex)">删除</label>
-                            </el-checkbox-group>
-                            <div class="time-list" v-for="(item2,index2) of group.timeList" :key="index2">
-                                <div v-if="form.isAutomaticDelivery == 2">
-                                    <el-time-select
-                                        v-model="item2.startTime"                              
-                                        :picker-options="group.pickerOptions"
-                                        placeholder="开始时间"
-                                        :class="group.isError ? 'error' : ''"
-                                        @change="checkTimeSelect(item2.startTime)"
-                                        >
-                                    </el-time-select>
-                                    <span class="division">-</span>
-                                    <el-time-select
-                                        v-model="item2.endTime"
-                                        :picker-options="group.pickerOptions"
-                                        placeholder="结束时间"
-                                        :class="group.isError ? 'error' : ''"
-                                        @change="checkTimeSelect(item2.endTime)"
-                                        >
-                                    </el-time-select>
-                                    <span class="add" v-show="showAdd(group.timeList.length,index2)" @click="handleAddTime(groupIndex)">添加</span>
-                                    <span class="add" v-show="showDelect(group.timeList.length,index2)" @click="handleDelectTime(groupIndex,index2)">删除</span>
-                                </div>
-                            </div>
-                            <div class="error-msg" v-if="group.errorMsg">{{group.errorMsg }}</div>
-                        </div>
-                        <div class="btn-week" v-show="form.isAutomaticDelivery == 2" @click="addWeekItem()">+添加星期</div>
-                    </el-form-item>
-                </el-form>  
+  <div class="localDelivery-container">
+    <div class="item-block">
+      <div class="title">同城配送</div>
+      <div class="block">
+        <el-form ref="form" :model="form" label-width="160px" :rules="rules">
+          <el-form-item label="配送方式" prop="distributionType">
+            <el-checkbox-group v-model="form.distributionType">
+              <el-checkbox
+                v-for="(item, index) of checkList"
+                :key="item.label + index"
+                :label="item.label"
+                size="medium"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+            <div class="tips">开启后将由第三方平台为您配送。</div>
+          </el-form-item>
+          <div v-if="form.distributionType.includes(2)">
+            <el-form-item prop="no3DistributionType">
+              <el-checkbox-group
+                v-model="form.no3DistributionType"
+                class="distribution-group"
+              >
+                <div
+                  :class="['distribution-box', { active: active == index }]"
+                  v-for="(item, index) of distributionList"
+                  :key="item.label + index"
+                  @click.stop.prevent="handleClickImg($event, index)"
+                >
+                  <el-checkbox
+                    :label="item.label"
+                    @click.native="stopEvenPropagation($event)"
+                    size="medium"
+                  >
+                    <img
+                      class="img"
+                      width="89"
+                      height="23"
+                      :src="item.imgUrl"
+                      @click.stop.prevent="handleClickImg($event, index)"
+                    />
+                  </el-checkbox>
+                </div>
+              </el-checkbox-group>
+            </el-form-item>
+            <el-form-item
+              label="app_key"
+              prop="dadaData.appKey"
+              v-if="active == 0"
+            >
+              <el-input v-model="form.dadaData.appKey"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="app_secret"
+              prop="dadaData.appSecret"
+              v-if="active == 0"
+            >
+              <el-input v-model="form.dadaData.appSecret"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="商户ID"
+              prop="dadaData.storeId"
+              v-if="active == 0"
+            >
+              <el-input v-model="form.dadaData.storeId"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="门店编码"
+              prop="dadaData.shopCode"
+              v-if="active == 0"
+            >
+              <el-input v-model="form.dadaData.shopCode"></el-input>
+            </el-form-item>
+            <el-form-item label="城市选择" prop="" v-if="active == 0">
+              <el-button type="primary" @click="getCity()">获取城市</el-button>
+            </el-form-item>
+            <el-form-item
+              label="配送服务"
+              prop="meituanData.distributionOpction"
+              v-if="active == 1"
+            >
+              <el-select
+                v-model="form.meituanData.distributionOpction"
+                placeholder="请选择配送服务"
+              >
+                <el-option
+                  v-for="(item, index) of distributionOpction"
+                  :key="index + item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item
+              label="AppKey"
+              prop="meituanData.appKey"
+              v-if="active == 1"
+            >
+              <el-input v-model="form.meituanData.appKey"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="AppSecret"
+              prop="meituanData.appSecret"
+              v-if="active == 1"
+            >
+              <el-input v-model="form.meituanData.appSecret"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="门店ID"
+              prop="meituanData.storeId"
+              v-if="active == 1"
+            >
+              <el-input v-model="form.meituanData.storeId"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="支付方式"
+              prop="meituanData.storeId"
+              v-if="active == 1"
+            >
+              <el-radio-group v-model="form.meituanData.payType">
+                <el-radio :label="0">账期支付</el-radio>
+                <el-radio :label="1">余额支付</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item
+              label="开发者账号（dev_id）"
+              prop="sfData.developerAccount"
+              v-if="active == 2"
+            >
+              <el-input v-model="form.sfData.developerAccount"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="开发者秘钥（dev_key）"
+              prop="sfData.devKey"
+              v-if="active == 2"
+            >
+              <el-input v-model="form.sfData.devKey"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="店铺id"
+              prop="sfData.storeId"
+              v-if="active == 2"
+            >
+              <el-input v-model="form.sfData.storeId"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="物品类型"
+              prop="sfData.goodsType"
+              v-if="active == 2"
+            >
+              <el-select
+                v-model="form.sfData.goodsType"
+                placeholder="请选择物品类型"
+              >
+                <el-option
+                  v-for="(item, index) of goodsTypeList"
+                  :key="index + item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item
+              label="商户ID"
+              prop="ssData.shopId"
+              v-if="active == 3"
+            >
+              <el-input v-model="form.ssData.storeId"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="App_key（Client_ID）"
+              prop="ssData.appKey"
+              v-if="active == 3"
+            >
+              <el-input v-model="form.ssData.appKey"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="App_secret"
+              prop="ssData.appSecret"
+              v-if="active == 3"
+            >
+              <el-input v-model="form.ssData.appSecret"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="门店ID"
+              prop="ssData.storeId"
+              v-if="active == 3"
+            >
+              <el-input v-model="form.ssData.shopId"></el-input>
+            </el-form-item>
+            <el-form-item label="appid" prop="uuData.appId" v-if="active == 4">
+              <el-input v-model="form.ssData.storeId"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="appkey"
+              prop="uuData.appKey"
+              v-if="active == 4"
+            >
+              <el-input v-model="form.ssData.appKey"></el-input>
+            </el-form-item>
+            <el-form-item
+              label="openid"
+              prop="uuData.openId"
+              v-if="active == 4"
+            >
+              <el-input v-model="form.ssData.appSecret"></el-input>
+            </el-form-item>
+          </div>
+          <el-form-item label="配送时间买家自选" prop="">
+            <el-radio-group v-model="form.isDistribution">
+              <el-radio :label="1">开启</el-radio>
+              <el-radio :label="0">关闭</el-radio>
+            </el-radio-group>
+            <div class="tips">
+              开启后，买家下单选择同城配送时，可选择配送时间，提交订单后，将在买家备注中显示。
             </div>
-        </div>
-        <div class="item-block">
-            <div class="title">配送区域设置</div>
-            <div class="block">
-                <el-form ref="form" :model="form" label-width="160px" :rules="rules">
-                    <el-form-item label="店铺地址" prop="shopAddress">
-                        <el-input class="shop-address" v-model="form.shopAddress" disabled>                       
-                        </el-input>
-                        <label class="btn-amend">修改</label>
-                        <div class="">配送区域以此地址为起点进行距离计算</div>
-                    </el-form-item>
-                    <el-form-item label="配送区域" prop="">
-                        <el-radio-group v-model="form.dispensingArea">
-                            <el-radio :label="0">按不同区域</el-radio>
-                            <el-radio :label="1">按不同距离</el-radio>
-                            <el-radio :label="2">按行政区域</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="划分方式" prop="">
-                        <el-radio-group v-model="form.divideType">
-                            <el-radio :label="0">半径</el-radio>
-                            <el-radio :label="1">自定义</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item>
-                        <div class="">当配送区域交叉时，以最低费用计算费用。 因考虑实际送货路况，配送费计算按骑行距离，非地图直线距离。</div>
-                    </el-form-item>
-                    <el-form-item>
-                        <div class="map-box">
-                            <div class="areas-block">
-                                <div class="areas-conetn">
-                                    <div :class="['areas-item',{ acitve:mapForm.radiusActive == index }]" v-for="(item,index) of mapForm.radiusList" :key="index" @click="handleRadiusActive(index)">
-                                        <div class="areas-head-block">
-                                            <div class="areas-title">
-                                                <i class="title-circle">
-                                                    <i class="content"></i>
-                                                </i>
-                                                区域{{ item.areaNum }}</div>
-                                            <div class="btn-delect" @click="delectRadiusItem(index)">删除</div>
-                                        </div>
-                                        <div class="areas-item-block">
-                                            <el-form ref="form" :model="mapForm.radiusList[index]" :rules="mapRules" label-width="90px" :show-message="false">
-                                                <el-form-item label="起送金额" prop="minPriceType">
-                                                    <div>按
-                                                        <el-select class="min-price-type-opction" v-model="mapForm.radiusList[index].minPriceType" placeholder="请选择">
-                                                            <el-option v-for="(opction,index2) of mapMinPriceTypeOpciotn" 
-                                                                :key="index2 + opction.value" 
-                                                                :label="opction.label" 
-                                                                :value="opction.value">
-                                                            </el-option>
-                                                        </el-select>
-                                                    </div>
-                                                </el-form-item>
-                                                <el-form-item label="" prop="minPrice">
-                                                    <div class="">满
-                                                        <el-input class="min-price-input" v-model="mapForm.radiusList[index].minPrice">                       
-                                                            <label slot="append">元</label>                                           
-                                                        </el-input>
-                                                        <label>起送</label>
-                                                    </div>
-                                                </el-form-item>
-                                                <el-form-item label="配送费" prop="deliveryCostAmount">
-                                                    <el-input class="delivery-cost-amout-input" v-model="mapForm.radiusList[index].deliveryCostAmount">                       
-                                                        <label slot="append">元</label>                                           
-                                                    </el-input>
-                                                </el-form-item>
-                                                <el-form-item label="运费减免" prop="freightReliefType">
-                                                    <div>按
-                                                        <el-select class="min-price-type-opction" v-model="mapForm.radiusList[index].freightReliefType" placeholder="请选择">
-                                                            <el-option v-for="(opction,index2) of freightReliefTypeOpction" 
-                                                                :key="index2 + opction.value" 
-                                                                :label="opction.label" 
-                                                                :value="opction.value">
-                                                            </el-option>
-                                                        </el-select>
-                                                    </div>
-                                                </el-form-item>
-                                                <el-form-item label="" prop="freightReliefAmout">
-                                                    <div class="">满
-                                                        <el-input class="min-price-input" v-model="mapForm.radiusList[index].freightReliefAmout">                       
-                                                            <label slot="append">元</label>                                           
-                                                        </el-input>
-                                                        <label>起送</label>
-                                                    </div>
-                                                </el-form-item>
-                                                <el-form-item label="" prop="derateAmout">
-                                                    <div class="">减免
-                                                        <el-input class="min-price-input" v-model="mapForm.radiusList[index].derateAmout">                       
-                                                            <label slot="append">元</label>                                           
-                                                        </el-input>
-                                                    </div>
-                                                </el-form-item>
-                                                <el-form-item label="半径" prop="radiusNum">
-                                                    <el-input class="delivery-cost-amout-input" v-model="mapForm.radiusList[index].circlePath.radius">                       
-                                                        <label slot="append">米</label>                                           
-                                                    </el-input>
-                                                </el-form-item>
-                                            </el-form>
-                                        </div>      
-                                    </div>
-                                    <div class="footer" @click="addRadiusItem()">
-                                        +添加配送区域{{ mapForm.radiusList.length}}/10                               
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="map-block">
-                                <baidu-map class="map"                                
-                                    style="display: flex; 
-                                    flex-direction: column" 
-                                    :center="{lng:110.083925,lat:23.393658}" 
-                                    :zoom="zoom"
-                                    :scroll-wheel-zoom="true"
-                                    @ready="handlerBaiduMap"                               
-                                >
-                                    <bm-navigation anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>                                   
-                                    <template v-for="(item,index) of this.mapForm.radiusList">
-                                        <!-- <bm-circle
-                                            v-if="mapReady"                                     
-                                            :key="'circle-' + index" 
-                                            :center="item.circlePath.center" 
-                                            :radius="item.circlePath.radius" 
-                                            stroke-color="#6fee0c" 
-                                            :stroke-opacity="1" 
-                                            :stroke-weight="3" 
-                                            fillColor="#d1f5ad"
-                                            :editing="mapForm.showCircleEditing && mapForm.radiusActive == index "
-                                            @click="handleRadiusActive($event,index)"
-                                            @lineupdate="updateCirclePath($event,index)"
-                                            >
-                                        </bm-circle> -->
-                                        <bm-circle
-                                            v-if="mapReady"                                     
-                                            :key="'circle-' + index" 
-                                            :center="item.circlePath.center" 
-                                            :radius="item.circlePath.radius" 
-                                            stroke-color="#6fee0c" 
-                                            :stroke-opacity="1" 
-                                            :stroke-weight="3" 
-                                            fillColor="#d1f5ad"
-                                            :editing="mapForm.showCircleEditing && mapForm.radiusActive == index "
-                                            @click="handleRadiusActive($event,index)"
-                                            @lineupdate="updateCirclePath($event,index)"
-                                            >
-                                        </bm-circle>
-                                        <bm-marker
-                                            v-if="mapForm.showRadiusCenter && mapForm.radiusActive == index"
-                                            :key="'marker-' +index"  
-                                            :position="item.circlePath.center" 
-                                            :dragging="mapForm.showRadiusMarker"
-                                            @click="onClickMarker"
-                                            :icon="{url: require('@/assets/dd-via.png'), size: {width: 11, height: 11}}"
-                                            @dragging="handleDragging($event,index)"
-                                            @mouseover="handleMarkerMouseovert()"                                        >                                         
-                                        </bm-marker>                                                     
-                                    </template>
-                                </baidu-map>
-                            </div>
-                        </div>
-                    </el-form-item>
-                </el-form>
+          </el-form-item>
+          <el-form-item label="自动发货" prop="">
+            <el-radio-group
+              v-model="form.isAutomaticDelivery"
+              class="automatic-delivery-radio"
+            >
+              <el-radio :label="0">不启用</el-radio>
+              <el-radio :label="1">下单后，在营业时间内，自动发货</el-radio>
+              <el-radio :label="2" disabled>
+                下单后，在自定义时间内，自动发货
+              </el-radio>
+              <el-radio :label="3">
+                下单后，抵达订单配送时间时，自动发货
+              </el-radio>
+            </el-radio-group>
+            <div class="in-advance-block" v-if="form.isAutomaticDelivery == 3">
+              <div class="title-block">提前</div>
+              <el-input
+                class="time-input-block"
+                v-model="form.inAdvanceTime"
+                placeholder=""
+              >
+                <label slot="append">分钟</label>
+              </el-input>
+              <div style="margin-left: 10px">
+                进行发货（若默认配送方式为第三方配送，则此时将订单推送至第三方平台）
+              </div>
             </div>
-        </div>
+            <div class="tips" style="color: #1890ff">
+              在自动发货时间内生成的订单自动发货，启用自动发货后，需要在配送管理列表同城配送处设置默认发货方式。
+            </div>
+            <div
+              v-for="(group, groupIndex) of form.weekConfig"
+              :key="groupIndex"
+            >
+              <el-checkbox-group
+                v-model="group.weekList"
+                v-if="form.isAutomaticDelivery == 2"
+              >
+                <el-checkbox
+                  v-for="(item, index) of group.weekListConfig"
+                  :key="item.label + index"
+                  :label="item.label"
+                  :disabled="item.disabled"
+                  @change="handleWeekList"
+                >
+                  {{ item.name }}
+                </el-checkbox>
+                <label
+                  class="el-checkbox is-checked delect-week"
+                  v-if="groupIndex >= 1"
+                  @click="delectWeek(groupIndex)"
+                >
+                  删除
+                </label>
+              </el-checkbox-group>
+              <div
+                class="time-list"
+                v-for="(item2, index2) of group.timeList"
+                :key="index2"
+              >
+                <div v-if="form.isAutomaticDelivery == 2">
+                  <el-time-select
+                    v-model="item2.startTime"
+                    :picker-options="group.pickerOptions"
+                    placeholder="开始时间"
+                    :class="group.isError ? 'error' : ''"
+                    @change="checkTimeSelect(item2.startTime)"
+                  ></el-time-select>
+                  <span class="division">-</span>
+                  <el-time-select
+                    v-model="item2.endTime"
+                    :picker-options="group.pickerOptions"
+                    placeholder="结束时间"
+                    :class="group.isError ? 'error' : ''"
+                    @change="checkTimeSelect(item2.endTime)"
+                  ></el-time-select>
+                  <span
+                    class="add"
+                    v-show="showAdd(group.timeList.length, index2)"
+                    @click="handleAddTime(groupIndex)"
+                  >
+                    添加
+                  </span>
+                  <span
+                    class="add"
+                    v-show="showDelect(group.timeList.length, index2)"
+                    @click="handleDelectTime(groupIndex, index2)"
+                  >
+                    删除
+                  </span>
+                </div>
+              </div>
+              <div class="error-msg" v-if="group.errorMsg">
+                {{ group.errorMsg }}
+              </div>
+            </div>
+            <div
+              class="btn-week"
+              v-show="form.isAutomaticDelivery == 2"
+              @click="addWeekItem()"
+            >
+              +添加星期
+            </div>
+          </el-form-item>
+          <div v-if="form.isDistribution == 1">
+            <el-form-item label="配送时段" prop="">
+              <el-radio-group v-model="form.deliveryPeriod">
+                <el-radio :label="0">全天</el-radio>
+                <el-radio :label="1" disabled>自定义</el-radio>
+              </el-radio-group>
+              <div class="tips">
+                自定义时间段，请将小程序升级至2.1.0版本及以上才能生效。
+                <br />
+                所设时间段为可配送时间段，手机端展示时间段会根据细分时段划分展示。
+              </div>
+            </el-form-item>
+            <el-form-item label="细分时段" prop="">
+              <el-radio-group v-model="form.subdivisionPeriod">
+                <el-radio :label="1">天</el-radio>
+                <el-radio :label="60">小时</el-radio>
+                <el-radio :label="30">30分钟</el-radio>
+                <el-radio :label="15">15分钟</el-radio>
+              </el-radio-group>
+              <div class="tips">
+                手机端选择送达时间，按时间段细分
+                <span class="example">
+                  查看示例
+                  <div class="example-img-box">
+                    <img
+                      class="example-img"
+                      :src="require('@/assets/time-selector.jpg')"
+                    />
+                  </div>
+                </span>
+              </div>
+            </el-form-item>
+            <el-form-item label="预约下单" prop="">
+              <el-radio-group v-model="form.orderAppointment.inAdvance">
+                <el-radio :label="0">无需提前</el-radio>
+                <el-radio :label="1">提前</el-radio>
+              </el-radio-group>
+              <el-input
+                class="orderAppointment-time-input"
+                v-model="form.orderAppointment.orderAppointmentTimeTime"
+                placeholder="请输入内容"
+                :disabled="form.orderAppointment.inAdvance == 0"
+              ></el-input>
+              <el-select
+                class="orderAppointment-time-select"
+                v-model="form.orderAppointment.orderAppointmentTimeType"
+                placeholder="请选择"
+                :disabled="form.orderAppointment.inAdvance == 0"
+              >
+                <el-option
+                  v-for="item in periodOpction"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+              <div class="tips">
+                按天时为自然天，不管当前几点，只能下明天以后的订单。
+              </div>
+            </el-form-item>
+            <el-form-item label="最长预约" prop="">
+              <el-radio-group v-model="form.maxAppointment.maxAppointmentType">
+                <el-radio :label="0">只能当天下单</el-radio>
+                <el-radio :label="1">可预约</el-radio>
+              </el-radio-group>
+              <el-input
+                class="maxAppointment-input"
+                v-model="form.maxAppointment.maxAppointmentSky"
+                placeholder="请输入内容"
+                :disabled="form.maxAppointment.maxAppointmentType == 0"
+              ></el-input>
+              天内下单
+              <div class="tips">
+                如，可预约7天内订单，那么就是今天+未来6天内的送达时间可以让买家选择
+              </div>
+            </el-form-item>
+            <el-form-item label="下单时默认选择" prop="">
+              <el-radio-group v-model="form.orderDefault">
+                <el-radio :label="0">默认不选中</el-radio>
+                <el-radio :label="1">当前时间最近可用时间段</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </div>
+        </el-form>
+      </div>
     </div>
+    <div class="item-block">
+      <div class="title">配送区域设置</div>
+      <div class="block">
+        <el-form ref="form" :model="form" label-width="160px" :rules="rules">
+          <el-form-item label="店铺地址" prop="shopAddress">
+            <el-input
+              class="shop-address"
+              v-model="form.shopAddress"
+              disabled
+            ></el-input>
+            <label class="btn-amend" @click="handleSkip()">修改</label>
+            <div class="">配送区域以此地址为起点进行距离计算</div>
+          </el-form-item>
+          <el-form-item label="配送区域" prop="">
+            <el-radio-group v-model="form.dispensingArea">
+              <el-radio :label="0">按不同区域</el-radio>
+              <el-radio :label="1">按不同距离</el-radio>
+              <el-radio :label="2">按行政区域</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            label="可配送区域"
+            prop=""
+            class="distribution-area"
+            v-if="form.dispensingArea == 2"
+          >
+            <el-select
+              v-model="form.cityList"
+              multiple
+              filterable
+              allow-create
+              default-first-option
+              placeholder="请选择文章标签"
+            >
+              <el-option
+                v-for="item in cityListOpction"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+            <el-checkbox
+              style="margin-left: 10px"
+              v-model="form.isNoLimit"
+              :true-label="1"
+              :false-label="0"
+            >
+              不限制
+            </el-checkbox>
+          </el-form-item>
+          <el-form-item
+            label="划分方式"
+            prop=""
+            v-if="form.dispensingArea != 2"
+          >
+            <el-radio-group v-model="form.divideType">
+              <el-radio :label="0">半径</el-radio>
+              <el-radio :label="1">自定义</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            label-width="210px"
+            label="距离"
+            v-if="form.dispensingArea == 1"
+          >
+            <el-input
+              class="distance-input"
+              v-model="form.distance.distanceNum"
+            >
+              <label slot="append">km</label>
+            </el-input>
+            <label class="distance-lable">内，重量</label>
+            <el-input class="distance-input" v-model="form.distance.weightNum">
+              <label slot="append">kg</label>
+            </el-input>
+            <label class="distance-lable">内，配送费用</label>
+            <el-input class="distance-input" v-model="form.distance.weightNum">
+              <label slot="append">元</label>
+            </el-input>
+          </el-form-item>
+          <el-form-item
+            label-width="210px"
+            label="距离每增加"
+            v-if="form.dispensingArea == 1"
+          >
+            <el-input
+              class="distance-input"
+              v-model="form.distanceAdd.distanceNum"
+            >
+              <label slot="append">km</label>
+            </el-input>
+            <label class="distance-lable">，运费将增加</label>
+            <el-input
+              class="distance-input"
+              v-model="form.distanceAdd.FreightAddNum"
+            >
+              <label slot="append">元</label>
+            </el-input>
+          </el-form-item>
+          <el-form-item
+            label-width="210px"
+            label="重量每增加"
+            v-if="form.dispensingArea == 1"
+          >
+            <el-input
+              class="distance-input"
+              v-model="form.weightAdd.weightAddNum"
+            >
+              <label slot="append">kg</label>
+            </el-input>
+            <label class="distance-lable">，运费将增加</label>
+            <el-input
+              class="distance-input"
+              v-model="form.weightAdd.FreightAddNum"
+            >
+              <label slot="append">元</label>
+            </el-input>
+          </el-form-item>
+          <el-form-item v-if="form.dispensingArea != 2">
+            <div class="">
+              当配送区域交叉时，以最低费用计算费用。
+              因考虑实际送货路况，配送费计算按骑行距离，非地图直线距离。
+            </div>
+          </el-form-item>
+          <el-form-item v-if="form.dispensingArea != 2">
+            <div class="map-box">
+              <div class="areas-block">
+                <div class="areas-conetn">
+                  <div v-if="form.divideType == 0">
+                    <div
+                      :class="[
+                        'areas-item',
+                        { acitve: mapForm.radiusActive == index },
+                      ]"
+                      v-for="(item, index) of mapForm.radiusList"
+                      :key="index"
+                      @click="handleRadiusActive('', index)"
+                    >
+                      <div class="areas-head-block">
+                        <div class="areas-title">
+                          <i class="title-circle">
+                            <i class="content"></i>
+                          </i>
+                          区域{{ item.areaNum }}
+                        </div>
+                        <div
+                          class="btn-delect"
+                          @click="delectRadiusItem(index)"
+                        >
+                          删除
+                        </div>
+                      </div>
+                      <div class="areas-item-block">
+                        <el-form
+                          ref="form"
+                          :model="mapForm.radiusList[index]"
+                          :rules="mapRules"
+                          label-width="90px"
+                          :show-message="false"
+                        >
+                          <el-form-item label="起送金额" prop="minPriceType">
+                            <div>
+                              按
+                              <el-select
+                                class="min-price-type-opction"
+                                v-model="mapForm.radiusList[index].minPriceType"
+                                placeholder="请选择"
+                              >
+                                <el-option
+                                  v-for="(
+                                    opction, index2
+                                  ) of mapMinPriceTypeOpciotn"
+                                  :key="index2 + opction.value"
+                                  :label="opction.label"
+                                  :value="opction.value"
+                                ></el-option>
+                              </el-select>
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="" prop="minPrice">
+                            <div class="">
+                              满
+                              <el-input
+                                class="min-price-input"
+                                v-model="mapForm.radiusList[index].minPrice"
+                              >
+                                <label slot="append">元</label>
+                              </el-input>
+                              <label>起送</label>
+                            </div>
+                          </el-form-item>
+                          <el-form-item
+                            label="配送费"
+                            prop="deliveryCostAmount"
+                            v-if="form.dispensingArea != 1"
+                          >
+                            <el-input
+                              class="delivery-cost-amout-input"
+                              v-model="
+                                mapForm.radiusList[index].deliveryCostAmount
+                              "
+                            >
+                              <label slot="append">元</label>
+                            </el-input>
+                          </el-form-item>
+                          <el-form-item
+                            label="运费减免"
+                            prop="freightReliefType"
+                          >
+                            <div>
+                              按
+                              <el-select
+                                class="min-price-type-opction"
+                                v-model="
+                                  mapForm.radiusList[index].freightReliefType
+                                "
+                                placeholder="请选择"
+                              >
+                                <el-option
+                                  v-for="(
+                                    opction, index2
+                                  ) of freightReliefTypeOpction"
+                                  :key="index2 + opction.value"
+                                  :label="opction.label"
+                                  :value="opction.value"
+                                ></el-option>
+                              </el-select>
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="" prop="freightReliefAmout">
+                            <div class="">
+                              满
+                              <el-input
+                                class="min-price-input"
+                                v-model="
+                                  mapForm.radiusList[index].freightReliefAmout
+                                "
+                              >
+                                <label slot="append">元</label>
+                              </el-input>
+                              <label>起送</label>
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="" prop="derateAmout">
+                            <div class="">
+                              减免
+                              <el-input
+                                class="min-price-input"
+                                v-model="mapForm.radiusList[index].derateAmout"
+                              >
+                                <label slot="append">元</label>
+                              </el-input>
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="半径" prop="radiusNum">
+                            <el-input
+                              type="number"
+                              class="delivery-cost-amout-input"
+                              v-model="
+                                mapForm.radiusList[index].circlePath.radius
+                              "
+                              @input="handleRaduiInput($event, index)"
+                            >
+                              <label slot="append">米</label>
+                            </el-input>
+                          </el-form-item>
+                        </el-form>
+                      </div>
+                    </div>
+                  </div>
+                  <div v-if="form.divideType == 1">
+                    <div
+                      :class="[
+                        'areas-item',
+                        { acitve: mapForm.customActive == index },
+                      ]"
+                      v-for="(item, index) of mapForm.customList"
+                      :key="index"
+                      @click="handlePolygonAcitve('', index)"
+                    >
+                      <div class="areas-head-block">
+                        <div class="areas-title">
+                          <i class="title-circle">
+                            <i class="content"></i>
+                          </i>
+                          区域{{ item.areaNum }}
+                        </div>
+                        <div
+                          class="btn-delect"
+                          @click="delectRadiusItem(index)"
+                        >
+                          删除
+                        </div>
+                      </div>
+                      <div class="areas-item-block">
+                        <el-form
+                          ref="form"
+                          :model="mapForm.radiusList[index]"
+                          :rules="mapRules"
+                          label-width="90px"
+                          :show-message="false"
+                        >
+                          <el-form-item label="起送金额" prop="minPriceType">
+                            <div>
+                              按
+                              <el-select
+                                class="min-price-type-opction"
+                                v-model="mapForm.customList[index].minPriceType"
+                                placeholder="请选择"
+                              >
+                                <el-option
+                                  v-for="(
+                                    opction, index2
+                                  ) of mapMinPriceTypeOpciotn"
+                                  :key="index2 + opction.value"
+                                  :label="opction.label"
+                                  :value="opction.value"
+                                ></el-option>
+                              </el-select>
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="" prop="minPrice">
+                            <div class="">
+                              满
+                              <el-input
+                                class="min-price-input"
+                                v-model="mapForm.customList[index].minPrice"
+                              >
+                                <label slot="append">元</label>
+                              </el-input>
+                              <label>起送</label>
+                            </div>
+                          </el-form-item>
+                          <el-form-item
+                            label="配送费"
+                            prop="deliveryCostAmount"
+                            v-if="form.dispensingArea != 1"
+                          >
+                            <el-input
+                              class="delivery-cost-amout-input"
+                              v-model="
+                                mapForm.customList[index].deliveryCostAmount
+                              "
+                            >
+                              <label slot="append">元</label>
+                            </el-input>
+                          </el-form-item>
+                          <el-form-item
+                            label="运费减免"
+                            prop="freightReliefType"
+                          >
+                            <div>
+                              按
+                              <el-select
+                                class="min-price-type-opction"
+                                v-model="
+                                  mapForm.customList[index].freightReliefType
+                                "
+                                placeholder="请选择"
+                              >
+                                <el-option
+                                  v-for="(
+                                    opction, index2
+                                  ) of freightReliefTypeOpction"
+                                  :key="index2 + opction.value"
+                                  :label="opction.label"
+                                  :value="opction.value"
+                                ></el-option>
+                              </el-select>
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="" prop="freightReliefAmout">
+                            <div class="">
+                              满
+                              <el-input
+                                class="min-price-input"
+                                v-model="
+                                  mapForm.customList[index].freightReliefAmout
+                                "
+                              >
+                                <label slot="append">元</label>
+                              </el-input>
+                              <label>起送</label>
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="" prop="derateAmout">
+                            <div class="">
+                              减免
+                              <el-input
+                                class="min-price-input"
+                                v-model="mapForm.customList[index].derateAmout"
+                              >
+                                <label slot="append">元</label>
+                              </el-input>
+                            </div>
+                          </el-form-item>
+                        </el-form>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="areas-conetn-footer" @click="addRadiusItem()">
+                    +添加配送区域{{
+                      form.divideType == 0
+                        ? mapForm.radiusList.length
+                        : mapForm.customList.length
+                    }}/10
+                  </div>
+                </div>
+              </div>
+              <div class="map-block">
+                <baidu-map
+                  class="map"
+                  style="display: flex; flex-direction: column"
+                  :center="center"
+                  :zoom="zoom"
+                  :mapClick="false"
+                  :scroll-wheel-zoom="true"
+                  @ready="handlerBaiduMap"
+                >
+                  <bm-navigation anchor="BMAP_ANCHOR_TOP_LEFT"></bm-navigation>
+                  <div class="radius-block" v-if="form.divideType == 0">
+                    <template v-for="(item, index) of this.mapForm.radiusList">
+                      <bm-circle
+                        v-if="mapReady && form.divideType == 0"
+                        :key="'circle-' + index"
+                        :center="item.circlePath.center"
+                        :radius="item.circlePath.radius"
+                        stroke-color="#6fee0c"
+                        :stroke-opacity="1"
+                        :stroke-weight="3"
+                        :massClear="false"
+                        fillColor="#d1f5ad"
+                        :editing="
+                          mapForm.showCircleEditing &&
+                          mapForm.radiusActive == index
+                        "
+                        @click="handleRadiusActive($event, index)"
+                        @lineupdate="updateCirclePath($event, index)"
+                      ></bm-circle>
+                      <bm-marker
+                        v-if="
+                          mapForm.showRadiusCenter &&
+                          mapForm.radiusActive == index
+                        "
+                        :key="'marker-' + index"
+                        :position="item.circlePath.center"
+                        :dragging="mapForm.showRadiusDragging"
+                        @click="onClickMarker"
+                        :icon="{
+                          url: require('@/assets/dd-via.png'),
+                          size: { width: 11, height: 11 },
+                        }"
+                        @dragging="handleDragging($event, index)"
+                        @mouseover="handleMarkerMouseovert()"
+                      >
+                        <bm-overlay
+                          v-if="
+                            mapForm.showRadiusCenter &&
+                            mapForm.radiusActive == index
+                          "
+                          pane="labelPane"
+                          :class="{ sample: true }"
+                          @initialize="initialize($event)"
+                          @draw="handleOverlayDraw"
+                        >
+                          <div>
+                            半径：{{
+                              mapForm.radiusList[mapForm.radiusActive]
+                                .circlePath.radius
+                            }}米
+                          </div>
+                        </bm-overlay>
+                      </bm-marker>
+                    </template>
+                  </div>
+                  <div class="custom-block" v-if="form.divideType == 1">
+                    <template v-for="(item, index) of this.mapForm.customList">
+                      <bm-polygon
+                        :key="'polygon-' + index"
+                        :path="item.polygonPath"
+                        stroke-color="#ff3cfd"
+                        :stroke-opacity="1"
+                        :stroke-weight="4"
+                        fillColor="#ff3cfd"
+                        :fillOpacity="0.4"
+                        :editing="
+                          mapForm.showCustomEditing &&
+                          mapForm.customActive == index
+                        "
+                        @click="handlePolygonAcitve($event, index)"
+                        @lineupdate="updatePolygonPath"
+                      />
+                      <bm-marker
+                        :key="'marker-' + index"
+                        v-if="
+                          mapForm.showCustomDragging &&
+                          mapForm.customActive == index
+                        "
+                        :position="item.oldCenter"
+                        :dragging="mapForm.showCustomDragging"
+                        @click="onClickMarker"
+                        :icon="{
+                          url: require('@/assets/dd-via.png'),
+                          size: { width: 11, height: 11 },
+                        }"
+                        @dragging="handleDragging($event, index)"
+                        @mouseover="handleMarkerMouseovert()"
+                      ></bm-marker>
+                    </template>
+                  </div>
+                </baidu-map>
+                <!-- <el-amap
+                  v-if="mapReady"
+                  :center="center"
+                  :zoom="zoom"
+                  @init="init"
+                >
+                  <template v-for="(item, index) of mapForm.radiusList">
+                    <el-amap-circle
+                      :key="'circle-' + index"
+                      strokeColor="#6fee0c"
+                      fillColor="#d1f5ad"
+                      :center="item.circlePath.center"
+                      :radius="item.circlePath.radius"
+                      :visible="true"
+                      :editable="
+                        mapForm.showCircleEditing &&
+                        mapForm.radiusActive == index
+                      "
+                      :draggable="false"
+                      @click="handleRadiusActive($event, index)"
+                      @mouseover="updateCirclePath"
+                      @mouseover
+                    />
+                  </template>
+                </el-amap> -->
+              </div>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div class="item-block distribution-amount" v-if="form.dispensingArea == 2">
+      <div class="title">配送价格</div>
+      <div class="block">
+        <el-form
+          ref="form"
+          :model="distributionForm"
+          label-width="160px"
+          :rules="distributionRules"
+          :show-message="false"
+        >
+          <el-form-item label="起送金额" prop="deliveryAmount">
+            <label class="distribution-block-lable">按</label>
+            <el-select
+              class="distribution-select"
+              v-model="distributionForm.priceType"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="(opction, index2) of mapMinPriceTypeOpciotn"
+                :key="index2 + opction.value"
+                :label="opction.label"
+                :value="opction.value"
+              ></el-option>
+            </el-select>
+            <label class="distribution-block-lable">满</label>
+            <el-input
+              class="distribution-input"
+              v-model="distributionForm.deliveryAmount"
+            >
+              <label slot="append">元</label>
+            </el-input>
+            <label class="distribution-block-lable">起送</label>
+            <div class="distribution-tips">
+              订单价格不满足时，买家无法下单
+              <br />
+              商品折后价：按商品参加所有生效优惠活动后的金额计算，不包含积分抵扣和优惠券优惠金额。
+              <br />
+              订单实付价：按订单最终的实际付款金额计算。
+            </div>
+          </el-form-item>
+          <el-form-item label="配送费" prop="distributionAmout">
+            <el-input
+              class="distribution-input"
+              v-model="distributionForm.distributionAmout"
+            >
+              <label slot="append">元</label>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="运费减免" prop="freightFullAmout">
+            <label class="distribution-block-lable">按</label>
+            <el-select
+              class="distribution-select"
+              v-model="distributionForm.freightType"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="(opction, index2) of mapMinPriceTypeOpciotn"
+                :key="index2 + opction.value"
+                :label="opction.label"
+                :value="opction.value"
+              ></el-option>
+            </el-select>
+            <label class="distribution-block-lable">满</label>
+            <el-input
+              class="distribution-input"
+              v-model="distributionForm.freightFullAmout"
+            >
+              <label slot="append">元</label>
+            </el-input>
+            <label class="distribution-block-lable">减免</label>
+            <el-input
+              class="distribution-input"
+              v-model="distributionForm.freightAmout"
+            >
+              <label slot="append">元</label>
+            </el-input>
+            <div class="tips">运费最低减为0</div>
+          </el-form-item>
+          <el-form-item label="配送费" prop="isStairSwitch">
+            <el-switch
+              v-model="distributionForm.isStairSwitch"
+              :active-text="switchText"
+              @change="handleSwitchText"
+            ></el-switch>
+          </el-form-item>
+          <el-form-item
+            label=""
+            prop=""
+            v-if="distributionForm.isStairSwitch == 1"
+          >
+            <label class="distribution-block-lable">半径</label>
+            <el-input
+              class="distribution-input"
+              v-model="distributionForm.radiusNum"
+            >
+              <label slot="append">km</label>
+            </el-input>
+            <label class="distribution-block-lable">内，重量</label>
+            <el-input
+              class="distribution-input"
+              v-model="distributionForm.radiusWeithNum"
+            >
+              <label slot="append">kg</label>
+            </el-input>
+            <label class="distribution-block-lable">内，配送费用</label>
+            <el-input
+              class="distribution-input"
+              v-model="distributionForm.radiusDistributionAmout"
+            >
+              <label slot="append">元</label>
+            </el-input>
+          </el-form-item>
+          <el-form-item
+            label=""
+            prop=""
+            v-if="distributionForm.isStairSwitch == 1"
+          >
+            <label class="distribution-block-lable">起送距离每增加</label>
+            <el-input
+              class="distribution-input"
+              v-model="distributionForm.freightDistanceNum"
+            >
+              <label slot="append">km</label>
+            </el-input>
+            <label class="distribution-block-lable">内，运费增加</label>
+            <el-input
+              class="distribution-input"
+              v-model="distributionForm.freightDistanceAmout"
+            >
+              <label slot="append">元</label>
+            </el-input>
+          </el-form-item>
+          <el-form-item
+            label=""
+            prop=""
+            v-if="distributionForm.isStairSwitch == 1"
+          >
+            <label class="distribution-block-lable">起送重量每增加</label>
+            <el-input
+              class="distribution-input"
+              v-model="distributionForm.freightWeigthNum"
+            >
+              <label slot="append">km</label>
+            </el-input>
+            <label class="distribution-block-lable">内，运费增加</label>
+            <el-input
+              class="distribution-input"
+              v-model="distributionForm.freightWeigthAmount"
+            >
+              <label slot="append">元</label>
+            </el-input>
+            <div class="tips">
+              不超过起送半径和重量时，按基础运费计算
+              <br />
+              实际配送距离大于起送半径，不满增加公里数，运费按增加计算；实际配送重量大于起送重量，不满增加重量，
+              <br />
+              运费按增加计算，依次类推
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </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 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
-            
-        }
-    ]
-
-import  { get } from '@/api/store/base'
+import { get } from '@/api/store/base'
+import { ChineseDistricts } from '@/components/VabArea/city-picker.data'
+import {
+  distributionOpction,
+  checkList,
+  distributionList,
+  goodsTypeData,
+  mapMinPriceTypeOpciotn,
+  freightReliefTypeOpction,
+  weekListConfig,
+  periodOpction,
+} from './distributionSetupConfig/config.js'
 export default {
-    name:"localDelivery",
-    data(){
-        return{
-            active:0,
-            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'
-                },
-            ],
-            checkList:[
-                {
-                    label:1,
-                    name:'商家配送'
-                },
-                {
-                    label:2,
-                    name:'第三方配送'
-                }
-            ],
-            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')
-                }
-            ],
-            rules:{
-                distributionType:
-                [ 
-                    {   type: 'array', required: true, message: '请至少选择一种配送方式', trigger: 'change' }
-                ],
-                no3DistributionType:[
-                    { type: 'array', required: true, message: '请至少选择一个平台配送服务', trigger: 'change' }
-                ], 
-                dadaData:{
-                    appKey:[
-                        { required: true, message: '请输入app_key', trigger: 'blur' }
-                    ],
-                    appSecret:[
-                        { required: true, message: '请输入app_secret', trigger: 'blur' }
-                    ],
-                    storeId:[
-                        { required: true, message: '请输入商户ID', trigger: 'blur' }
-                    ],
-                    shopCode:[
-                        { required: true, message: '请输入门店编码', trigger: 'blur' }
-                    ]
-                },
-                meituanData:{
-                    distributionOpction:[
-                        { required: true, message: '请选择配送服务', trigger: 'change' }
-                    ],
-                    appKey:[
-                        { required: true, message: '请输入AppKey', trigger: 'blur' }
-                    ],
-                    appSecret:[
-                        { required: true, message: '请输入AppSecret', trigger: 'blur' }
-                    ],
-                    storeId:[
-                        { required: true, message: '请输入商户ID', trigger: 'blur' }
-                    ],
-                },
-                sfData:{
-                    developerAccount:[
-                        { required: true, message: '请输入开发者账号（dev_id）', trigger: 'blur' }
-                    ],
-                    devKey:[
-                        { required: true, message: '请输入开发者秘钥（dev_key）', trigger: 'blur' }
-                    ],
-                    storeId:[
-                        { required: true, message: '请输入店铺id', trigger: 'blur' }
-                    ],
-                    goodsType:[
-                        { required: true, message: '请选择物品类型', trigger: 'change' }
-                    ]
-                },
-                ssData:{
-                    shopId:[
-                        { required: true, message: '请输入门店编码', trigger: 'blur' }
-                    ],
-                    appKey:[
-                        { required: true, message: '请输入app_key', trigger: 'blur' }
-                    ],
-                    appSecret:[
-                        { required: true, message: '请输入app_secret', trigger: 'blur' }
-                    ],
-                    storeId:[
-                        { required: true, message: '请输入商户ID', trigger: 'blur' }
-                    ]
-                },
-                uuData:{
-                    appId:[
-                        { required: true, message: '请输入appId', trigger: 'blur' }
-                    ],
-                    appKey:[
-                        { required: true, message: '请输入appKey', trigger: 'blur' }
-                    ],
-                    openId:[
-                        { required: true, message: '请输入openId', trigger: 'blur' }
-                    ],
-                },
-                // weekList:[
-                //     { type: 'array', required: true, message: '请至少选择一个星期', trigger: 'change' }
-                // ],
-                shopAddress: [
-                    { required: true, message: '地址获取失败', trigger: 'blur' },
-                ],
-
+  name: 'localDelivery',
+  data() {
+    return {
+      ChineseDistricts: {},
+      active: 0,
+      weekListConfig: weekListConfig,
+      distributionOpction: distributionOpction,
+      checkList: checkList,
+      distributionList: distributionList,
+      goodsTypeData: goodsTypeData,
+      mapMinPriceTypeOpciotn: mapMinPriceTypeOpciotn,
+      freightReliefTypeOpction: freightReliefTypeOpction,
+      periodOpction: periodOpction,
+      shopInfoData: {},
+      goodsTypeList: [],
+      rules: {
+        distributionType: [
+          {
+            type: 'array',
+            required: true,
+            message: '请至少选择一种配送方式',
+            trigger: 'change',
+          },
+        ],
+        no3DistributionType: [
+          {
+            type: 'array',
+            required: true,
+            message: '请至少选择一个平台配送服务',
+            trigger: 'change',
+          },
+        ],
+        dadaData: {
+          appKey: [
+            { required: true, message: '请输入app_key', trigger: 'blur' },
+          ],
+          appSecret: [
+            { required: true, message: '请输入app_secret', trigger: 'blur' },
+          ],
+          storeId: [
+            { required: true, message: '请输入商户ID', trigger: 'blur' },
+          ],
+          shopCode: [
+            { required: true, message: '请输入门店编码', trigger: 'blur' },
+          ],
+        },
+        meituanData: {
+          distributionOpction: [
+            { required: true, message: '请选择配送服务', trigger: 'change' },
+          ],
+          appKey: [
+            { required: true, message: '请输入AppKey', trigger: 'blur' },
+          ],
+          appSecret: [
+            { required: true, message: '请输入AppSecret', trigger: 'blur' },
+          ],
+          storeId: [
+            { required: true, message: '请输入商户ID', trigger: 'blur' },
+          ],
+        },
+        sfData: {
+          developerAccount: [
+            {
+              required: true,
+              message: '请输入开发者账号（dev_id）',
+              trigger: 'blur',
             },
-            mapRules:{
-                minPriceType:[
-                    { required: true, message: '', trigger: 'change' }
-                ],
-                minPrice:[
-                    { required: true, message: '', trigger: 'blur' }
-                ],
-                deliveryCostAmount:[
-                    { required: true, message: '', trigger: 'blur' }
-                ],
-                freightReliefType:[
-                    { required: true, message: '', trigger: 'change' }
-                ],
-                freightReliefAmout:[
-                    { required: true, message: '', trigger: 'blur' }
-                ],
-                derateAmout:[
-                    { required: true, message: '', trigger: 'blur' }
-                ],
-                radiusNum:[
-                    { required: true, message: '', trigger: 'blur' }
-                ],
+          ],
+          devKey: [
+            {
+              required: true,
+              message: '请输入开发者秘钥（dev_key）',
+              trigger: 'blur',
             },
-            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": "其他"
+          ],
+          storeId: [
+            { required: true, message: '请输入店铺id', trigger: 'blur' },
+          ],
+          goodsType: [
+            { required: true, message: '请选择物品类型', trigger: 'change' },
+          ],
+        },
+        ssData: {
+          shopId: [
+            { required: true, message: '请输入门店编码', trigger: 'blur' },
+          ],
+          appKey: [
+            { required: true, message: '请输入app_key', trigger: 'blur' },
+          ],
+          appSecret: [
+            { required: true, message: '请输入app_secret', trigger: 'blur' },
+          ],
+          storeId: [
+            { required: true, message: '请输入商户ID', trigger: 'blur' },
+          ],
+        },
+        uuData: {
+          appId: [{ required: true, message: '请输入appId', trigger: 'blur' }],
+          appKey: [
+            { required: true, message: '请输入appKey', trigger: 'blur' },
+          ],
+          openId: [
+            { required: true, message: '请输入openId', trigger: 'blur' },
+          ],
+        },
+        // weekList:[
+        //     { type: 'array', required: true, message: '请至少选择一个星期', trigger: 'change' }
+        // ],
+        shopAddress: [
+          { required: true, message: '地址获取失败', trigger: 'blur' },
+        ],
+      },
+      mapRules: {
+        minPriceType: [{ required: true, message: '', trigger: 'change' }],
+        minPrice: [{ required: true, message: '', trigger: 'blur' }],
+        deliveryCostAmount: [{ required: true, message: '', trigger: 'blur' }],
+        freightReliefType: [{ required: true, message: '', trigger: 'change' }],
+        freightReliefAmout: [{ required: true, message: '', trigger: 'blur' }],
+        derateAmout: [{ required: true, message: '', trigger: 'blur' }],
+        radiusNum: [{ required: true, message: '', trigger: 'blur' }],
+      },
+      form: {
+        distributionType: [1],
+        no3DistributionType: [],
+        dadaData: {
+          appKey: 'dada8e0c052d94e8a09',
+          appSecret: 'a5350665c9200871e5671440437b7f1b',
+          storeId: '928007283',
+          shopCode: '76c8cbd2e5464d5c',
+        },
+        meituanData: {
+          distributionOpction: 0,
+          appKey: '',
+          appSecret: '',
+          storeId: '',
+          payType: 0,
+        },
+        sfData: {
+          developerAccount: '',
+          devKey: '',
+          appSecret: '',
+          storeId: '',
+          goodsType: null,
+        },
+        ssData: {
+          storeId: '',
+          appKey: '',
+          appSecret: '',
+          shopId: '',
+        },
+        uuData: {
+          appId: '',
+          appKey: '',
+          openId: '',
+        },
+        isDistribution: 0,
+        isAutomaticDelivery: 0,
+        weekConfig: [
+          {
+            weekListConfig: JSON.parse(JSON.stringify(weekListConfig)),
+            weekList: [7, 1, 2, 3, 4, 5, 6],
+            pickerOptions: {
+              start: '00:00',
+              step: '00:30',
+              end: '23:30',
             },
-            goodsTypeList:[],
-            form:{
-                distributionType:[1],
-                no3DistributionType:[],
-                dadaData:{
-                    appKey:'dada8e0c052d94e8a09',
-                    appSecret:'a5350665c9200871e5671440437b7f1b',
-                    storeId:'928007283',
-                    shopCode:'76c8cbd2e5464d5c'
-                },
-                meituanData:{
-                    distributionOpction:0,
-                    appKey:'',
-                    appSecret:'',
-                    storeId:'',
-                    payType:0
-                },
-                sfData:{
-                    developerAccount:'',
-                    devKey:'',
-                    appSecret:'',
-                    storeId:'',
-                    goodsType:null
-                },
-                ssData:{
-                    storeId:'',
-                    appKey:'',
-                    appSecret:'',
-                    shopId:''
-                },
-                uuData:{
-                    appId:'',
-                    appKey:'',
-                    openId:''
-                },
-                isDistribution:0,
-                isAutomaticDelivery:0,
-                weekConfig:[
-                    {
-                        weekListConfig:JSON.parse(JSON.stringify(weekListConfig)),
-                        weekList:[7,1,2,3,4,5,6],
-                        pickerOptions:{
-                            start:'00:00',
-                            step: '00:30',
-                            end:'23:30'
-                        },
-                        timeList:[
-                            {
-                                startTime:null,
-                                endTime:null
-                            }
-                        ],
-                        isError:false,
-                        errorMsg:''
-                    },
-                ],
-                inAdvanceTime:0,
-                shopAddress:'',
-                dispensingArea:0,
-                divideType:0,
-            },
-            mapMinPriceTypeOpciotn:[
-                {
-                    value:0,
-                    label:'商品原价'
-                },
-                {
-                    value:1,
-                    label:'商品折后价'
-                },
-                {
-                    value:2,
-                    label:'订单实付价'
-                }
+            timeList: [
+              {
+                startTime: null,
+                endTime: null,
+              },
             ],
-            freightReliefTypeOpction:[
-                {
-                    value:0,
-                    label:'商品原价'
-                },
-                {
-                    value:1,
-                    label:'商品折后价'
-                },
-            ],
-            shopInfoData:{},
-            mapForm:{
-                radiusActive:0,
-                customActive:0,
-                showRadiusCenter:false,
-                showRadiusMarker:false,
-                showCircleEditing:false,
-                radiusList:[],
-                customList:[]
+            isError: false,
+            errorMsg: '',
+          },
+        ],
+        inAdvanceTime: 0,
+        shopAddress: '',
+        dispensingArea: 0,
+        divideType: 0,
+        distance: {
+          distanceNum: null,
+          weightNum: null,
+          distributionFreightNum: null,
+        },
+        distanceAdd: {
+          distanceNum: null,
+          FreightAddNum: null,
+        },
+        weightAdd: {
+          weightAddNum: null,
+          FreightAddNum: null,
+        },
+        cityList: [],
+        isNoLimit: 0,
+        deliveryPeriod: 0,
+        subdivisionPeriod: 1,
+        orderAppointment: {
+          inAdvance: 0,
+          orderAppointmentTimeTime: 2,
+          orderAppointmentTimeType: 0,
+        },
+        maxAppointment: {
+          maxAppointmentType: 0,
+          maxAppointmentSky: 2,
+        },
+        orderDefault: 0,
+      },
+      mapForm: {
+        radiusActive: 0,
+        showRadiusCenter: false,
+        showRadiusDragging: false,
+        showCircleEditing: false,
+        customActive: 0,
+        showCustomEditing: false,
+        showCustomDragging: false,
+        radiusList: [
+          {
+            id: 0,
+            areaNum: 1,
+            minPriceType: 0,
+            minPrice: null,
+            deliveryCostAmount: null,
+            freightReliefType: 0,
+            freightReliefAmout: null,
+            derateAmout: null,
+            circlePath: {
+              center: {
+                lng: 0,
+                lat: 0,
+              },
+              // center:[],
+              radius: 300,
             },
-            BMap:null,
-            center: {lng: 0, lat: 0},
-            zoom:16,
-            map:null,
-            mapReady:false
-        }
-    },
-    created(){
-        this.goodsTypeList = Object.keys(this.goodsTypeData).map(key => ({ label:this.goodsTypeData[key], value: Number(key) }))
-    },
-    beforeDestroy(){
-
-    },
-    methods:{
-        initMap(){
-            var map = new BMapGL.Map("idContainer");
-            map.centerAndZoom(new BMapGL.Point(this.circleCenter.lng, this.circleCenter.lat), 15);
-
-             // 初始化圆形覆盖物
-            const circle = new BMapGL.Circle(new BMapGL.Point(this.circleCenter.lng, this.circleCenter.lat), this.circleRadius, {
-                strokeColor: "blue",
-                strokeWeight: 2,
-                strokeOpacity: 0.5,
-                fillColor: "red",
-                fillOpacity: 0.3,
-            });
-
-
-            var point = new BMapGL.Point(116.404, 39.915); 
-            // var marker = new BMapGL.Marker(point, {icon: myIcon});   
-            // map.addOverlay(marker)
-
-            var nodeT =  new BMapGL.Icon('http://maponline0.bdimg.com/sty/map_icons2x/MapRes/ditie_beijing_2.png', new BMapGL.Size(11, 11), {
-                offset: new BMapGL.Size(5, 5)
-            });
-            var node =  new BMapGL.Icon('http://maponline0.bdimg.com/sty/map_icons2x/MapRes/zhongheyiyuan.png', new BMapGL.Size(11, 11), {
-            offset: new BMapGL.Size(5, 5)
-            });
-
-            this.circle = circle;
-
-            map.addOverlay(circle);
-
-            // 开启圆形的拖拽功能
-            // circle.enableDragging();
-
-            // 监听圆形的拖拽事件
-            circle.addEventListener("dragend", this.handleDragEnd);
-
-            // 由于没有直接的编辑半径的API，我们可以通过其他方式实现，比如添加一个输入框让用户输入半径
-            // 这里为了简化，我们假设有一个按钮或者其他方式触发半径的更新
-            // this.updateCircleRadius(newRadius);
-
-        
-        },
-        handleDragEnd(e) {
-            // 当圆形拖拽结束时触发
-            this.circleCenter = { lng: e.target.getCenter().lng, lat: e.target.getCenter().lat };
-        },
-        updateCircleRadius(radius) {
-            // 更新圆形的半径
-            this.circle.setRadius(radius);
-            this.circleRadius = radius;
-        },
-        async getCompanyInfo(){
-            const { data } = await get()
-            if(data){
-                let str = data.store_area + data.store_address;
-                this.form.shopAddress =  str.replace(/\//g, '');
-                this.shopInfoData = data;
-                this.center.lng = this.shopInfoData.store_longitude;
-                this.center.lat = this.shopInfoData.store_latitude;             
-                // Vue.set(this.mapForm.radiusList[0].circlePath,'radius',1000);
-                // console.log(this.mapForm.radiusList[0].circlePath.radius)
-            }
-        },
-        btnClickImg(e,index){
-            e.stopPropagation();
-            this.active = index;
-        },
-        stopEvenPropagation(e){
-            e.stopPropagation();
-        },
-        getCity(){
-
-        },
-        handleAddTime(index){
-            this.checkTimeAll();
-            this.form.weekConfig[index].timeList.push({startTime:null,endTime:null})
-        },
-        handleDelectTime(groupIndex,index){
-            this.form.weekConfig[groupIndex].timeList.splice(index,1);
-            this.checkTimeAll();
-        },
-        showAdd(num,index2){
-
-            if(num == 1 && index2 == 0){
-                return true
-            }
-
-            if(num == 2 && index2 == 1){
-                return true
-            }
-
-            if(num == 3 && index2 == 2){
-                return false
-            }
-
-            return false
-        },
-        showDelect(num,index2){
-            
-            if(num == 2 && index2 == 1){
-                return true
-            }
-            
-            if(num == 3 && index2 == 1){
-                return true
-            }
-
-            if(num == 3 && index2 == 2){
-                return true
-            }
-
-            return false
-        },
-        handleWeekList(){
-
-        },
-        addWeekItem(){
-            this.checkTimeAll();
-            let obj = {
-                weekListConfig:JSON.parse(JSON.stringify(weekListConfig)),
-                weekList:[7,1,2,3,4,5,6],
-                pickerOptions:{
-                    start:'00:00',
-                    step: '00:30',
-                    end:'23:30'
-                },
-                timeList:[
-                    {
-                        startTime:null,
-                        endTime:null
-                    }
-                ],
-                isError:false,
-                errorMsg:''
-            }
-            
-            this.form.weekConfig.push(obj);
-
-        },
-        delectWeek(index){
-   
-            this.form.weekConfig.splice(index,1);
-        },
-        timeToMinutes(timeStr){
-            if(!timeStr) return;
-            const [hours, minutes] = timeStr.split(':').map(Number);
-            return hours * 60 + minutes;
-        },
-        checkTimeSelect(item){
-            
-            if(item == null) return;
-
-            let {isInvalid,isRepetition}  = this.checkTime();
-
-            if(isInvalid){
-                this.$baseMessage('结束时间要大于开始时间', 'error')
-            }
-        
-            if(isRepetition){
-                this.$baseMessage('不能有重复时间段', 'error')
-                return;
-            }     
-        },
-        checkTimeOverlap(periods) {
-            // 对时间段进行排序，以确保我们可以简单地比较相邻的时间段
-            periods.sort((a, b) => {
-                if (a.startTime !== b.startTime) {
-                    return a.startTime - b.startTime;
-                }
-                return a.endTime - b.endTime;
-            });
-
-            // 遍历排序后的时间段数组，检查相邻的时间段是否有重叠
-            for (let i = 1; i < periods.length; i++) {
-                // 如果前一个时间段的结束时间大于或等于当前时间段的开始时间，则存在重叠
-
-                if (periods[i - 1].endTime > periods[i].startTime) {
-                    
-                    return true; // 找到重叠，返回true
-                }
-            }
-
-            return false; // 没有找到重叠，返回false
-        },
-        checkInvalidTimes(periods){
-            for (let period of periods) {
-                if (period.startTime >= period.endTime) {
-                    return true; // 找到无效的时间段，返回true
-                }
-            }
-            return false; // 没有找到无效的时间段，返回false
-        },
-        checkTime(){
-            var periods = this.form.weekConfig;
-            var isInvalid,isRepetition;
-
-
-            periods.forEach((item,index)=>{
-            
-                let list = [];
-                list = item.timeList.map(item=>{
-                    return {startTime:this.timeToMinutes(item.startTime),endTime:this.timeToMinutes(item.endTime)}
-                }).filter(item=> item.startTime!=null || item.endTime != null)
-
-                isInvalid = this.checkInvalidTimes(list);
-                isRepetition = this.checkTimeOverlap(list);    
-            })
-
-            return {isInvalid:isInvalid,isRepetition:isRepetition};
-        },
-        checkTimeAll(){
-            
-            var periods = this.form.weekConfig;
-            
-            periods.forEach((item,index)=>{
-            
-                let list = [];
-
-                list = item.timeList.map(item=>{
-                    return {startTime:this.timeToMinutes(item.startTime),endTime:this.timeToMinutes(item.endTime)}
-                }).filter(item=> item.startTime!=null || item.endTime != null)
-
-                var isInvalid = this.checkInvalidTimes(list);
-                var isRepetition = this.checkTimeOverlap(list);
-
-                if(isInvalid){
-                    this.form.weekConfig[index].isError = true;
-                    this.form.weekConfig[index].errorMsg = "结束时间要大于开始时间";
-                    return
-
-                }else{
-                    this.form.weekConfig[index].isError = false;
-                    this.form.weekConfig[index].errorMsg = "";
-                }  
-             
-                if(isRepetition){
-                    this.form.weekConfig[index].isError = true;
-                    this.form.weekConfig[index].errorMsg = "不能有重复时间段" ;
-                }else{
-                    this.form.weekConfig[index].isError = false;
-                    this.form.weekConfig[index].errorMsg = "";
-                }       
-            })
-        },
-        addRadiusItem(){
-
-            if(this.mapForm.radiusList.length >= 10) return;
-
-            let areaNum = this.mapForm.radiusList.length + 1;
-
-            let obj = {
-                areaNum:areaNum,
-                minPriceType:0,
-                minPrice:null,
-                deliveryCostAmount:null,
-                freightReliefType:0,
-                freightReliefAmout:null,
-                derateAmout:null,
-                circlePath:{
-                    center: {
-                        lng: this.center.lng || 0,
-                        lat: this.center.lat || 0
-                    },
-                    radius: 1000
-                }
-            }
-
-            this.mapForm.radiusList.push(obj);
-        },
-        delectRadiusItem(index){
-
-            if(this.mapForm.radiusList.length == 0 ) return;
-
-            this.mapForm.radiusList.splice(index,1);
-            if(this.mapForm.radiusList.length == 0){
-                this.mapForm.radiusActive = 0;
-                this.mapForm.showRadiusCenter = false;
-                this.mapForm.showRadiusMarker = false;
-                this.mapForm.showCircleEditing = false;
-            }
-        },
-        async handlerBaiduMap({BMap, map}){
-            this.mapReady = true;
-            await this.getCompanyInfo()
-
-            let obj = {
-                    areaNum:1,
-                    minPriceType:0,
-                    minPrice:null,
-                    deliveryCostAmount:null,
-                    freightReliefType:0,
-                    freightReliefAmout:null,
-                    derateAmout:null,
-                    circlePath:{
-                        center:{
-                            lng:0,
-                            lat:0
-                        },
-                        radius: 1000
-                    }
-                }
-
-            obj.circlePath.center.lng = this.center.lng;
-            obj.circlePath.center.lat = this.center.lat;
-            
-             this.$nextTick(()=>{
-                this.mapForm.radiusList.push(obj);
-             })
-            this.map = BMap;
-        },
-        updateCirclePath(e,index){
-            this.mapForm.radiusList[index].circlePath.center = e.target.getCenter();
-            this.mapForm.radiusList[index].circlePath.radius = e.target.getRadius();
-            
-        },
-        onMapClick({type, target, point, pixel, overlay}){
-            console.log({type, target, point, pixel, overlay})
-        },
-        handleRadiusActive(e,index){
-            this.mapForm.radiusActive = index;
-
-            if(this.mapForm.showRadiusCenter) return;
-            this.mapForm.showRadiusCenter = true;
-            this.mapForm.showCircleEditing = true;
-        },
-        onClickMarker(){
-            this.mapForm.showRadiusMarker = true;
-        },
-        handleDragging(e,index){           
-            this.mapForm.radiusList[index].circlePath.center = e.point;
-        },
-        handleMarkerMouseovert(){
-            this.mapForm.showRadiusMarker = true       
-        }
+          },
+        ],
+        customList: [
+          {
+            areaNum: 0,
+            oldCenter: {},
+            polygonPath: [],
+            areaNum: 1,
+            minPriceType: 0,
+            minPrice: null,
+            deliveryCostAmount: null,
+            freightReliefType: 0,
+            freightReliefAmout: null,
+            derateAmout: null,
+          },
+        ],
+      },
+      BMap: null,
+      center: { lng: 0, lat: 0 },
+      zoom: 16,
+      mapInstance: null,
+      BMapInstance: null,
+      mapReady: false,
+      // center: [0, 0],
+      map: null,
+      distributionForm: {
+        priceType: 0,
+        deliveryAmount: 0,
+        distributionAmout: 0,
+        freightType: 0,
+        freightFullAmout: 0,
+        freightAmout: 0,
+        isStairSwitch: 0,
+        radiusNum: null,
+        radiusWeithNum: null,
+        radiusDistributionAmout: null,
+        freightDistanceNum: null,
+        freightDistanceAmout: null,
+        freightWeigthNum: null,
+        freightWeigthAmount: null,
+      },
+      distributionRules: {
+        deliveryAmount: [{ required: true, message: '', trigger: 'blur' }],
+        distributionAmout: [{ required: true, message: '', trigger: 'blur' }],
+        freightFullAmout: [{ required: true, message: '', trigger: 'blur' }],
+      },
+      switchText: '关闭',
+      cityListOpction: [],
     }
+  },
+  created() {
+    this.ChineseDistricts = ChineseDistricts
+    this.getCompanyInfo()
+    this.goodsTypeList = Object.keys(this.goodsTypeData).map((key) => ({
+      label: this.goodsTypeData[key],
+      value: Number(key),
+    }))
+  },
+  beforeDestroy() {},
+  methods: {
+    handleSkip() {
+      this.$router.push({ path: '/setupshop' })
+    },
+    // 点击第三方图片
+    handleClickImg(e, index) {
+      e.stopPropagation()
+      this.active = index
+    },
+    stopEvenPropagation(e) {
+      e.stopPropagation()
+    },
+    // 增加时段
+    handleAddTime(index) {
+      this.checkTimeAll()
+      this.form.weekConfig[index].timeList.push({
+        startTime: null,
+        endTime: null,
+      })
+    },
+    // 删除时段
+    handleDelectTime(groupIndex, index) {
+      this.form.weekConfig[groupIndex].timeList.splice(index, 1)
+      this.checkTimeAll()
+    },
+    // 显示添加
+    showAdd(num, index2) {
+      if (num == 1 && index2 == 0) {
+        return true
+      }
+
+      if (num == 2 && index2 == 1) {
+        return true
+      }
+
+      if (num == 3 && index2 == 2) {
+        return false
+      }
+
+      return false
+    },
+    // 显示删除
+    showDelect(num, index2) {
+      if (num == 2 && index2 == 1) {
+        return true
+      }
+
+      if (num == 3 && index2 == 1) {
+        return true
+      }
+
+      if (num == 3 && index2 == 2) {
+        return true
+      }
+
+      return false
+    },
+    // 保留
+    handleWeekList() {},
+    // 添加星期
+    addWeekItem() {
+      this.checkTimeAll()
+      let obj = {
+        weekListConfig: JSON.parse(JSON.stringify(weekListConfig)),
+        weekList: [7, 1, 2, 3, 4, 5, 6],
+        pickerOptions: {
+          start: '00:00',
+          step: '00:30',
+          end: '23:30',
+        },
+        timeList: [
+          {
+            startTime: null,
+            endTime: null,
+          },
+        ],
+        isError: false,
+        errorMsg: '',
+      }
+
+      this.form.weekConfig.push(obj)
+    },
+    // 删除星期
+    delectWeek(index) {
+      this.form.weekConfig.splice(index, 1)
+    },
+    timeToMinutes(timeStr) {
+      if (!timeStr) return
+      const [hours, minutes] = timeStr.split(':').map(Number)
+      return hours * 60 + minutes
+    },
+    checkTimeSelect(item) {
+      if (item == null) return
+
+      let { isInvalid, isRepetition } = this.checkTime()
+
+      if (isInvalid) {
+        this.$baseMessage('结束时间要大于开始时间', 'error')
+      }
+
+      if (isRepetition) {
+        this.$baseMessage('不能有重复时间段', 'error')
+        return
+      }
+    },
+    checkTimeOverlap(periods) {
+      // 对时间段进行排序，以确保我们可以简单地比较相邻的时间段
+      periods.sort((a, b) => {
+        if (a.startTime !== b.startTime) {
+          return a.startTime - b.startTime
+        }
+        return a.endTime - b.endTime
+      })
+
+      // 遍历排序后的时间段数组，检查相邻的时间段是否有重叠
+      for (let i = 1; i < periods.length; i++) {
+        // 如果前一个时间段的结束时间大于或等于当前时间段的开始时间，则存在重叠
+
+        if (periods[i - 1].endTime > periods[i].startTime) {
+          return true // 找到重叠，返回true
+        }
+      }
+
+      return false // 没有找到重叠，返回false
+    },
+    checkInvalidTimes(periods) {
+      for (let period of periods) {
+        if (period.startTime >= period.endTime) {
+          return true // 找到无效的时间段，返回true
+        }
+      }
+      return false // 没有找到无效的时间段，返回false
+    },
+    checkTime() {
+      var periods = this.form.weekConfig
+      var isInvalid, isRepetition
+
+      periods.forEach((item, index) => {
+        let list = []
+        list = item.timeList
+          .map((item) => {
+            return {
+              startTime: this.timeToMinutes(item.startTime),
+              endTime: this.timeToMinutes(item.endTime),
+            }
+          })
+          .filter((item) => item.startTime != null || item.endTime != null)
+
+        isInvalid = this.checkInvalidTimes(list)
+        isRepetition = this.checkTimeOverlap(list)
+      })
+
+      return { isInvalid: isInvalid, isRepetition: isRepetition }
+    },
+    checkTimeAll() {
+      var periods = this.form.weekConfig
+
+      periods.forEach((item, index) => {
+        let list = []
+
+        list = item.timeList
+          .map((item) => {
+            return {
+              startTime: this.timeToMinutes(item.startTime),
+              endTime: this.timeToMinutes(item.endTime),
+            }
+          })
+          .filter((item) => item.startTime != null || item.endTime != null)
+
+        var isInvalid = this.checkInvalidTimes(list)
+        var isRepetition = this.checkTimeOverlap(list)
+
+        if (isInvalid) {
+          this.form.weekConfig[index].isError = true
+          this.form.weekConfig[index].errorMsg = '结束时间要大于开始时间'
+          return
+        } else {
+          this.form.weekConfig[index].isError = false
+          this.form.weekConfig[index].errorMsg = ''
+        }
+
+        if (isRepetition) {
+          this.form.weekConfig[index].isError = true
+          this.form.weekConfig[index].errorMsg = '不能有重复时间段'
+        } else {
+          this.form.weekConfig[index].isError = false
+          this.form.weekConfig[index].errorMsg = ''
+        }
+      })
+    },
+    addRadiusItem() {
+      if (this.form.divideType == 0) {
+        if (this.mapForm.radiusList.length >= 10) return
+
+        let areaNum = this.mapForm.radiusList.length + 1
+        // let arrLength = this.mapForm.radiusList.length;
+
+        let obj = {
+          // id:arrLength == 0 ? 0 : arrLength,
+          areaNum: areaNum,
+          minPriceType: 0,
+          minPrice: null,
+          deliveryCostAmount: null,
+          freightReliefType: 0,
+          freightReliefAmout: null,
+          derateAmout: null,
+          circlePath: {
+            center: this.center,
+            radius: 300,
+          },
+        }
+
+        this.mapForm.radiusList.push(obj)
+      } else {
+        if (this.mapForm.customList.length >= 10) return
+
+        let areaNum = this.mapForm.radiusList.length + 1
+
+        let { lng, lat } = this.center
+        // 正方形的边长（米）
+        var side_length = 300
+
+        // 每度纬度的距离（米）
+        var lat_distance_per_degree = 111000
+
+        var deltaLat = side_length / lat_distance_per_degree
+
+        var deltaLng = deltaLat
+
+        let polygonPath = [
+          { lng: lng + deltaLng, lat: lat + deltaLat },
+          { lng: lng + deltaLng, lat: lat - deltaLat },
+          { lng: lng - deltaLng, lat: lat - deltaLat },
+          { lng: lng - deltaLng, lat: lat + deltaLat },
+        ]
+
+        let obj = {
+          areaNum: areaNum,
+          polygonPath: polygonPath,
+          areaNum: areaNum,
+          minPriceType: 0,
+          minPrice: null,
+          deliveryCostAmount: null,
+          freightReliefType: 0,
+          freightReliefAmout: null,
+          derateAmout: null,
+          oldCenter: this.center,
+        }
+
+        this.mapForm.customList.push(obj)
+      }
+
+      // this.creatCircle(obj)
+    },
+    delectRadiusItem(index) {
+      if (this.form.divideType == 0) {
+        if (this.mapForm.radiusList.length == 0) return
+
+        this.mapForm.radiusList.splice(index, 1)
+        // this.map.remove(this.mapForm.circleList[index].circle)
+        // this.mapForm.circleList[index].editor.close();
+        // this.mapForm.circleList.splice(index,1);
+
+        if (this.mapForm.radiusList.length == 0) {
+          this.mapForm.radiusActive = 0
+          this.mapForm.showRadiusCenter = false
+          this.mapForm.showRadiusDragging = false
+          this.mapForm.showCircleEditing = false
+        }
+      } else {
+        this.mapForm.customList.splice(index, 1)
+        if (this.mapForm.customList.length == 0) {
+          this.mapForm.customActive = 0
+          this.mapForm.showCustomEditing = false
+          this.mapForm.showCustomDragging = false
+        }
+      }
+    },
+    async getCompanyInfo() {
+      const { data } = await get()
+      if (data) {
+        let str = data.store_area + data.store_address
+        this.form.shopAddress = str.replace(/\//g, '')
+
+        let cityListCode = data.store_district_id.split('/')
+
+        let cityList = this.ChineseDistricts
+
+        if (cityList[cityListCode[1]]) {
+          let obj = cityList[cityListCode[1]]
+
+          this.cityListOpction = Object.keys(obj).map((key) => ({
+            value: parseInt(key, 10),
+            label: obj[key],
+          }))
+        }
+
+        this.shopInfoData = data
+        // this.center[0] = Number(this.shopInfoData.store_longitude);
+        // this.center[1] = Number(this.shopInfoData.store_latitude);
+        // this.mapForm.radiusList[0].circlePath.center[0] = Number(this.shopInfoData.store_longitude);
+        // this.mapForm.radiusList[0].circlePath.center[1] = Number(this.shopInfoData.store_latitude);
+
+        this.center.lng = Number(this.shopInfoData.store_longitude)
+        this.center.lat = Number(this.shopInfoData.store_latitude)
+        this.mapForm.radiusList[0].circlePath.center.lng = Number(
+          this.shopInfoData.store_longitude
+        )
+        this.mapForm.radiusList[0].circlePath.center.lat = Number(
+          this.shopInfoData.store_latitude
+        )
+        this.mapForm.customList[0].oldCenter = this.center
+        let { lng, lat } = this.center
+        // 正方形的边长（米）
+        var side_length = 300
+
+        // 每度纬度的距离（米）
+        var lat_distance_per_degree = 111000
+
+        var deltaLat = side_length / lat_distance_per_degree
+
+        var deltaLng = deltaLat
+
+        this.mapForm.customList[0].polygonPath = [
+          { lng: lng + deltaLng, lat: lat + deltaLat },
+          { lng: lng + deltaLng, lat: lat - deltaLat },
+          { lng: lng - deltaLng, lat: lat - deltaLat },
+          { lng: lng - deltaLng, lat: lat + deltaLat },
+        ]
+        this.mapReady = true
+      }
+    },
+    async handlerBaiduMap({ BMap, map }) {
+      this.mapInstance = map
+      this.BMapInstance = BMap
+    },
+    handleRaduiInput(number, index) {
+      if (number == null || number == 0 || number == '') {
+        this.mapForm.showRadiusCenter = false
+        return
+      }
+
+      this.mapForm.radiusList[index].circlePath.radius = Number(number)
+
+      if (this.mapForm.radiusList[index].radiusInfo != undefined) {
+        this.mapForm.showRadiusCenter = true
+        let item = this.mapForm.radiusList[index].radiusInfo
+
+        setTimeout(() => {
+          this.$nextTick(() => {
+            var divs = document.querySelectorAll('.BMap_vectex_node')
+            let left = parseInt(divs[1].style.left) + 20 + 'px'
+            let top = parseInt(divs[1].style.top) + 'px'
+            item.el.style.left = left
+            item.el.style.top = top
+            console.log('div', left, top)
+
+            console.log(item.el.style.left, (item.el.style.top = top))
+          })
+        }, 0)
+      }
+    },
+    updateCirclePath(e, index, type, number) {
+      this.mapForm.radiusList[index].circlePath.center = e.target.getCenter()
+      this.mapForm.radiusList[index].circlePath.radius = Math.round(
+        e.target.getRadius()
+      )
+      var divs = document.querySelectorAll('.BMap_vectex_node')
+      if (divs && divs.length >= 2) {
+        if (this.mapForm.radiusList[index].radiusInfo != undefined) {
+          let item = this.mapForm.radiusList[index].radiusInfo
+          let left = parseInt(divs[1].style.left) + 20 + 'px'
+          let top = parseInt(divs[1].style.top) + 'px'
+          item.el.style.left = left
+          item.el.style.top = top
+        }
+      }
+    },
+    handleRadiusActive(e, index) {
+      this.mapForm.radiusActive = index
+      this.center = this.mapForm.radiusList[index].circlePath.center
+      let radius = this.mapForm.radiusList[index].circlePath.radius
+      if (radius == 0 || radius == '') {
+        this.mapForm.showRadiusCenter = false
+        return
+      }
+      this.mapForm.showRadiusCenter = true
+      this.mapForm.showCircleEditing = false
+      this.mapForm.showCircleEditing = true
+    },
+    onClickMarker() {
+      if (this.form.divideType == 0) {
+        this.mapForm.showRadiusDragging = true
+      } else {
+        this.mapForm.showCustomDragging = true
+      }
+    },
+    handleDragging(e, index) {
+      if (this.form.divideType == 0) {
+        this.mapForm.radiusList[index].circlePath.center = e.point
+
+        let divs = document.querySelectorAll('.BMap_vectex_node')
+        if (divs && divs.length >= 2) {
+          let item = this.mapForm.radiusList[index].radiusInfo
+          let left = parseInt(divs[1].style.left) + 20 + 'px'
+          let top = parseInt(divs[1].style.top) + 'px'
+          item.el.style.left = left
+          item.el.style.top = top
+        }
+      } else {
+        const oldCenter = JSON.parse(
+          JSON.stringify(
+            this.mapForm.customList[this.mapForm.customActive].oldCenter
+          )
+        )
+
+        const newCenter = e.point
+
+        const deltaLng = newCenter.lng - oldCenter.lng
+        const deltaLat = newCenter.lat - oldCenter.lat
+
+        const newVertices = this.mapForm.customList[
+          this.mapForm.customActive
+        ].polygonPath.map((vertex) => ({
+          lng: vertex.lng + deltaLng,
+          lat: vertex.lat + deltaLat,
+        }))
+
+        this.mapForm.customList[this.mapForm.customActive].oldCenter = e.point
+
+        this.mapForm.customList[this.mapForm.customActive].polygonPath =
+          newVertices
+      }
+    },
+    handleMarkerMouseovert() {
+      if (this.form.divideType == 0) {
+        this.mapForm.showRadiusDragging = true
+      } else {
+        this.mapForm.showCustomDragging = true
+      }
+    },
+    initialize({ el, BMap, map, overlay }) {
+      var index = this.mapForm.radiusActive
+      var item = this.mapForm.radiusList[index]
+
+      setTimeout(() => {
+        let divs = document.querySelectorAll('.BMap_vectex_node')
+
+        if (divs && divs.length >= 2) {
+          let left = parseInt(divs[1].style.left) + 20 + 'px'
+          let top = parseInt(divs[1].style.top) + 'px'
+          el.style.left = left
+          el.style.top = top
+          item.radiusInfo = { el, BMap, map }
+        }
+      }, 1)
+    },
+    handleOverlayDraw({ el, BMap, map, overlay }) {
+      let divs = document.querySelectorAll('.BMap_vectex_node')
+
+      if (divs && divs.length >= 2) {
+        let left = parseInt(divs[1].style.left) + 20 + 'px'
+        let top = parseInt(divs[1].style.top) + 'px'
+        el.style.left = left
+        el.style.top = top
+      }
+    },
+    updatePolygonPath(e) {
+      if (this.mapForm.customList.length <= 0) return
+      this.mapForm.customList[this.mapForm.customActive].polygonPath =
+        e.target.getPath()
+    },
+    handlePolygonAcitve({ type, target, point, pixel }, index) {
+      this.mapForm.customActive = index
+      this.mapForm.showCustomDragging = true
+      this.mapForm.showCustomEditing = true
+    },
+    handleSwitchText(isSwitch) {
+      if (isSwitch) {
+        this.switchText = '开启'
+      } else {
+        this.switchText = '关闭'
+      }
+    },
+    // 高德地图
+    // init(map) {
+    //     this.map = map;
+    //     this.initCircle();
+    // },
+    // initCircle(){
+
+    //     this.mapForm.radiusList.forEach((item,index)=>{
+    //         this.creatCircle(item);
+    //     })
+    // },
+    // editCircle(selectedCircle, selectedEditor){
+
+    //     this.mapForm.circleList.forEach(({circle, editor})=>{
+    //         if(circle != selectedCircle){
+    //             editor.close();
+    //         }else{
+    //             selectedEditor.open();
+    //         }
+    //     })
+    // },
+    // creatCircle(item){
+
+    //     var circle = new AMap.Circle({
+    //         center: item.circlePath.center,
+    //         radius: item.circlePath.radius, //半径
+    //         borderWeight: 3,
+    //         strokeColor: "#6fee0c",
+    //         strokeOpacity: 1,
+    //         strokeWeight: 3,
+    //         fillOpacity: 0.4,
+    //         strokeDasharray: [10, 10],
+    //         // 线样式还支持 'dashed'
+    //         fillColor: '#d1f5ad',
+    //         zIndex: 50,
+    //     })
+
+    //     this.map.add(circle)
+
+    //     this.map.setFitView([ circle ])
+
+    //     var circleEditor = new AMap.CircleEditor(this.map, circle,{
+    //         editOptions:{
+    //             strokeColor: "#6fee0c",
+    //             fillColor: '#d1f5ad'
+    //         }
+    //     })
+
+    //     this.mapForm.circleList.push({circle:circle,editor: circleEditor})
+
+    //     let _this = this;
+
+    //     circle.on('click', function() {
+    //         _this.editCircle(this, circleEditor); // 当圆形被点击时调用editCircle函数
+    //         _this.mapForm.radiusActive = item.id;
+    //     });
+
+    //     circleEditor.on('adjust', function(e) {
+    //         var adjustedCircle = e.target;
+    //         var adjustedRadius = adjustedCircle.getRadius();
+    //         console.log('调整后的半径:', adjustedRadius);
+
+    //         let {lat,lng} = e.lnglat;
+    //         item.circlePath.center = Object.values({lat,lng});
+    //         _this.mapForm.radiusList[_this.mapForm.radiusActive].circlePath.radius = e.radius;
+
+    //     })
+
+    // },
+    handerSubmit() {},
+  },
 }
 </script>
 
 <style lang="scss">
-.localDelivery-container{
-    background: #f6f8f9 !important;
-    padding: 6px !important;
+.localDelivery-container {
+  background: #f6f8f9 !important;
+  padding: 6px !important;
 
-    .BMap_vectex_node{
-        background-image: url(  ./../../../../assets/dd-via.png);
+  .BMap_vectex_node,
+  .BMap_vectex_nodeT {
+    background-image: url(./../../../../assets/dd-via.png);
+  }
+
+  .item-block {
+    background: #fff;
+    margin-bottom: 24px;
+
+    .title {
+      height: 46px;
+      padding: 0 20px;
+      border-bottom: 1px solid #f2f2f2;
+      line-height: 46px;
+      color: #333;
+      font-weight: 700;
     }
 
-    .item-block{
-        background: #fff;
-        margin-bottom: 24px;
+    .block {
+      padding: 20px;
 
-        .title{
-            height: 46px;
-            padding: 0 20px;
-            border-bottom: 1px solid #f2f2f2;
-            line-height: 46px;
-            color: #333;
-            font-weight: 700;
+      .distribution-group {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+
+        .distribution-box {
+          margin-right: 20px !important;
+          margin-bottom: 20px;
+          margin-left: 0;
+          padding: 0 15px !important;
+          width: 154px;
+          height: 50px;
+          line-height: 50px;
+          border: 1px solid #dcdfe6;
+          cursor: pointer;
+
+          &:hover {
+            border-color: #1890ff;
+          }
+
+          &:focus {
+            outline: none;
+          }
         }
 
-        
-        .block{
-            padding: 20px;
+        .img {
+          margin-bottom: 10px;
+        }
 
-            .distribution-group{
-                display: flex;
-                flex-wrap: wrap;
-                justify-content: flex-start;
+        .active {
+          border-color: #1890ff;
+          cursor: default;
+        }
+      }
 
-                .distribution-box{
+      .orderAppointment-time-input {
+        margin-left: 10px;
+        width: 100px !important;
 
-                    margin-right: 20px !important;
-                    margin-bottom: 20px ;
-                    margin-left: 0;
-                    padding: 0 15px !important;
-                    width: 154px;
-                    height: 50px;
-                    line-height: 50px;
-                    border: 1px solid #dcdfe6;
-                    cursor: pointer;
+        .el-input__inner {
+          border-right: none;
+        }
+      }
 
-                    &:hover{
-                        border-color: #1890ff;
-                    }
+      .orderAppointment-time-select {
+        .el-input {
+          width: 60px;
 
-                    &:focus{
-                        outline: none;
-                    }
+          .el-input__inner {
+            background: #f5f6fa;
+            border-left: none;
+          }
+        }
+      }
 
-                }
+      .maxAppointment-input {
+        width: 80px !important;
+        margin: 0 6px;
+      }
 
-                .img{
-                    margin-bottom: 10px;
-                }
+      .automatic-delivery-radio {
+        display: flex;
+        flex-flow: column;
 
-                .active{
-                    border-color: #1890ff;
-                    cursor: default;
-                }
-            }
-            
-            .automatic-delivery-radio{
-                display: flex;
-                flex-flow: column;
+        .el-radio {
+          margin: 10px 0;
+        }
+      }
 
-                .el-radio{
-                    margin: 10px 0;
-                }
+      .division {
+        padding: 0 10px;
+      }
+
+      .error {
+        .el-input__inner {
+          border: 1px solid #f1495c !important;
+        }
+      }
+
+      .error-msg {
+        color: #f1495c;
+      }
+
+      .delect-week {
+        color: #f1495c;
+      }
+
+      .time-list {
+        margin-bottom: 6px;
+
+        .el-date-editor {
+          width: 138px !important;
+        }
+
+        .add {
+          margin: 0 0 0 20px;
+          color: #1890ff;
+          cursor: pointer;
+        }
+      }
+
+      .btn-week {
+        color: #1890ff;
+        cursor: pointer;
+      }
+
+      .btn-amend {
+        color: #f1495c;
+        margin-left: 16px;
+        cursor: pointer;
+      }
+
+      .map-box {
+        display: flex;
+
+        .areas-conetn {
+          height: 494px;
+          overflow-y: auto;
+        }
+
+        .areas-block {
+          position: relative;
+          flex: 0 0 300px;
+          height: 540px;
+          border: 1px solid #ededed;
+          margin-right: 20px;
+          border-radius: 4px;
+          overflow-y: hidden;
+          padding-bottom: 45px;
+
+          .areas-item {
+            &:hover {
+              background: #fff7f5;
             }
 
-            .division{
-                padding: 0 10px;
-            }
+            background: #fff;
 
-            .error{
-                
-                .el-input__inner{
-                    border:  1px solid #f1495c !important;
-                }
-            }
+            .el-form-item {
+              margin-bottom: 10px !important;
 
-            .error-msg{
-                color: #f1495c;
-            }
-            
-            .delect-week{
-                color: #f1495c;
-            }
-
-            .time-list{
-                margin-bottom: 6px;
-
-                .el-date-editor{
-                    width: 138px !important;
-                }
-
-                .add{
-                    margin: 0 0 0 20px;
-                    color: #1890ff;
-                    cursor: pointer;
-                }
-            }
-
-            .btn-week{
-                color: #1890ff;
-                cursor: pointer;
-            }
-
-            .btn-amend{
-                color: #f1495c;
-                margin-left: 16px;
-                cursor: pointer;
-            }
-
-            .map-box{
-                display: flex;
-
-                .areas-conetn{
-                    height: 494px;
-                    overflow-y: auto;
-                }
-
-                .areas-block{
-                    position: relative;
-                    flex: 0 0 300px;
-                    height: 540px;
-                    border: 1px solid #ededed;
-                    margin-right: 20px;
-                    border-radius: 4px;
-                    overflow-y: hidden;
-                    padding-bottom: 45px;
-                    
-
-                    .areas-item{
-
-                        &:hover{
-                            background: #fff7f5;
-                        }
-
-                        background: #fff;
-                        
-                        .el-form-item{
-                            margin-bottom: 10px !important;
-                            
-                            .el-form-item__content{
-                                line-height: 38px !important;
-                            }
-                        }
-
-                        .areas-head-block{
-                            display: flex;
-                            justify-content: space-between;
-                            padding: 0 20px;
-                            height: 45px;
-                            line-height: 45px;
-                            background-color: #fafafa;
-                            color: #666;
-
-                            .title-circle{
-                                display: inline-block;
-                                width: 12px;
-                                height: 12px;
-                                border: 1px solid;
-                                border-radius: 50%;
-                                margin-right: 10px;
-                                transform: translateY(1px);
-                                overflow: hidden;
-                                line-height: 12px;
-                                border-color: rgb(111, 238, 12);
-
-                                .content{
-                                    opacity: .3;
-                                    display: inline-block;
-                                    width: 12px;
-                                    height: 12px;
-                                }
-                            }
-
-                            .btn-delect{
-                                color: #fb6638;
-                                cursor: pointer;
-                            }
-                        }
-
-                        .areas-item-block{
-                            padding: 20px 18px;
-
-                            .el-form-item__label{
-                                text-align: left;
-                            }
-
-                            .min-price-type-opction{
-                                margin-left: 6px;
-
-                                .el-input{
-                                    width: 135px;
-                                    height: 38px;
-                                }
-                            }
-
-                            .min-price-input{
-                                margin: 0 6px;
-                                width: 109px;
-                                height: 38px;
-
-                                .el-input__inner{
-                                    width: 70px;
-                                }
-
-                            }
-
-                            .el-input-group__append{
-                                padding: 4px 12px !important;
-                            }
-
-                            .delivery-cost-amout-input{
-                                width: 135px;
-                                height: 38px;
-                            }
-                        }
-                    }
-
-                    .acitve{
-                        background: #fff7f5;
-                    }
-                }
-
-                .map-block{
-                    flex: 1 1 auto;
-                    border: 1px solid #ededed;
-                    border-radius: 4px;
-
-                    .map{
-                        width: 100%;
-                        height: 540px;
-                    }
-                }
-
-                .footer{
-
-                    position: absolute;
-                    bottom: 0;
-                    left: 0;
-                    width: 100%;
-                    height: 45px;
-                    line-height: 45px;
-                    text-align: center;
-                    border-top: 1px solid #ededed;
-                    color: #fb6638;
-                    cursor: pointer;
-                    z-index: 1;
-                }
-            }
-
-
-            .week-checkbox-group{
-
-                .el-checkbox__label{
-                    color: #666 !important;
-                }
-            }
-
-            .el-form-item{
-                margin-bottom: 30px !important;
-            }
-
-            .el-input{
-                width: 270px;
-                font-size: 14px;
-                
-                .el-input__inner{
-                    //color: #333 !important;
-                }
-            }
-
-            .in-advance-block{
-                display: flex;
-                align-items: center;
-
-                .title-block{
-                    margin:  0 10px;
-                }
-
-                .time-input-block{               
-                    width: 135px;
-                    height: 38px;                  
-                }
-            }
-
-            .shop-address{
-                width: 270px;
-            }
-
-            .el-form-item__label{
-                padding-right: 20px !important;
-            }
-
-            .el-input__inner{
-                height: 38px !important;
+              .el-form-item__content {
                 line-height: 38px !important;
+              }
             }
 
-            .el-input .el-input__count{
-                font-size: 14px !important;
-            }
+            .areas-head-block {
+              display: flex;
+              justify-content: space-between;
+              padding: 0 20px;
+              height: 45px;
+              line-height: 45px;
+              background-color: #fafafa;
+              color: #666;
 
-            .el-radio__input{
-                transform : scale(130%)               
-            }
+              .title-circle {
+                display: inline-block;
+                width: 12px;
+                height: 12px;
+                border: 1px solid;
+                border-radius: 50%;
+                margin-right: 10px;
+                transform: translateY(1px);
+                overflow: hidden;
+                line-height: 12px;
+                border-color: rgb(111, 238, 12);
 
-            .el-radio__input.is-checked .el-radio__inner::after{
-                transform: translate(-50%, -50%) scale(1.2) !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;
+                .content {
+                  opacity: 0.3;
+                  display: inline-block;
+                  width: 12px;
+                  height: 12px;
                 }
+              }
+
+              .btn-delect {
+                color: #fb6638;
+                cursor: pointer;
+              }
             }
+
+            .areas-item-block {
+              padding: 20px 18px;
+
+              .el-form-item__label {
+                text-align: left;
+              }
+
+              .min-price-type-opction {
+                margin-left: 6px;
+
+                .el-input {
+                  width: 135px;
+                  height: 38px;
+                }
+              }
+
+              .min-price-input {
+                margin: 0 6px;
+                width: 109px;
+                height: 38px;
+
+                .el-input__inner {
+                  width: 70px;
+                }
+              }
+
+              .el-input-group__append {
+                padding: 4px 12px !important;
+              }
+
+              .delivery-cost-amout-input {
+                width: 135px;
+                height: 38px;
+              }
+            }
+          }
+
+          .acitve {
+            background: #fff7f5;
+          }
+
+          .areas-conetn-footer {
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            width: 100%;
+            height: 45px;
+            text-align: center;
+            border-top: 1px solid #ededed;
+            color: #fb6638;
+            line-height: 45px;
+            cursor: pointer;
+            z-index: 1;
+          }
         }
+
+        .map-block {
+          flex: 1 1 auto;
+          border: 1px solid #ededed;
+          border-radius: 4px;
+
+          .map {
+            width: 100%;
+            height: 540px;
+          }
+
+          .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;
+          }
+        }
+      }
+
+      .week-checkbox-group {
+        .el-checkbox__label {
+          color: #666 !important;
+        }
+      }
+
+      .in-advance-block {
+        display: flex;
+        align-items: center;
+
+        .title-block {
+          margin: 0 10px;
+        }
+
+        .time-input-block {
+          width: 135px;
+          height: 38px;
+        }
+      }
+
+      .distance-input {
+        width: 135px;
+
+        .el-input-group__append {
+          padding: 4px 12px !important;
+        }
+      }
+
+      .distance-lable {
+        margin: 0 10px;
+      }
+
+      .shop-address {
+        width: 270px;
+      }
+
+      .distribution-area {
+        .el-input__inner {
+          line-height: initial !important;
+        }
+      }
+
+      .el-form-item {
+        margin-bottom: 30px !important;
+      }
+
+      .el-input {
+        width: 270px;
+        font-size: 14px;
+      }
+
+      .el-form-item__label {
+        padding-right: 20px !important;
+      }
+
+      .el-input__inner {
+        min-height: 38px !important;
+        line-height: 38px !important;
+      }
+
+      .el-input .el-input__count {
+        font-size: 14px !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;
+        }
+      }
     }
+  }
+
+  .tips {
+    position: relative;
+
+    .example {
+      color: #fb6638;
+      cursor: pointer;
+
+      &:hover {
+        .example-img-box {
+          opacity: 1;
+          visibility: visible;
+        }
+      }
+
+      .example-img-box {
+        padding: 8px 16px;
+        background-color: #fff;
+        background-clip: padding-box;
+        border-radius: 4px;
+        box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
+        position: absolute;
+        will-change: top, left;
+        top: -174px;
+        left: 29%;
+        // opacity: 0;
+        // visibility: hidden;
+        transition: opacity 0.5s ease-out;
+        z-index: 1;
+
+        &::after {
+          content: '';
+          width: 0px;
+          height: 0px;
+          display: block;
+          border: 5px solid transparent;
+          border-right: 5px solid white;
+          position: relative;
+          top: -222px;
+          left: -26px;
+        }
+
+        .example-img {
+          width: 200px;
+          height: 400px;
+        }
+      }
+    }
+  }
+
+  .distribution-amount {
+    .distribution-select {
+      .el-input {
+        width: 135px;
+      }
+    }
+
+    .distribution-input {
+      width: 135px !important;
+
+      .el-input__inner {
+        width: 96px !important;
+      }
+
+      .el-input-group__append {
+        padding: 4px 12px !important;
+      }
+    }
+
+    .distribution-block-lable {
+      margin: 0 10px;
+    }
+
+    .distribution-tips {
+      margin: 10px;
+    }
+  }
+
+  .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;
+    }
+  }
+
+  .BMap_vectex_node:first-child {
+    display: none;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/store/base/distributionSetup/logisticsInterface.vue b/src/views/store/base/distributionSetup/logisticsInterface.vue
index ebab6fa..bad364b 100644
--- a/src/views/store/base/distributionSetup/logisticsInterface.vue
+++ b/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>
\ No newline at end of file
diff --git a/src/views/store/base/distributionSetup/selfPickUpSite.vue b/src/views/store/base/distributionSetup/selfPickUpSite.vue
new file mode 100644
index 0000000..1cb7961
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/views/store/sellerconfig/index.vue b/src/views/store/sellerconfig/index.vue
index cc5e804..5418866 100644
--- a/src/views/store/sellerconfig/index.vue
+++ b/src/views/store/sellerconfig/index.vue
@@ -193,125 +193,125 @@
 </template>
 
 <script>
-  import { translateTitle as __ } from '@/utils/i18n'
-  import { getConfig, edit } from '@/api/store/config'
+import { translateTitle as __ } from '@/utils/i18n'
+import { getConfig, edit } from '@/api/store/config'
 
-  export default {
-    name: 'StoreConfig',
-    components: {},
-    data() {
-      return {
-        sc_order_process: [],
-        sc_order_return_process: [],
+export default {
+  name: 'StoreConfig',
+  components: {},
+  data() {
+    return {
+      sc_order_process: [],
+      sc_order_return_process: [],
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    __,
+    async fetchData() {
+      const { data } = await getConfig()
+      if (data && data.sc_order_process) {
+        this.sc_order_process = data.sc_order_process
+        this.initProcess()
+      }
+      if (data && data.sc_order_return_process) {
+        this.initReturnProcess()
+        this.sc_order_return_process = data.sc_order_return_process
       }
     },
-    created() {
+    isProcessHighlight(code) {
+      let index = this.sc_order_process.indexOf(code)
+      return this.isHighlight(index)
+    },
+    isReturnProcessHighlight(code) {
+      let index = this.sc_order_return_process.indexOf(code)
+      return this.isHighlight(index)
+    },
+    isHighlight(index) {
+      if (index === -1) {
+        return 'circle'
+      }
+      return 'primary'
+    },
+    isProcessEnable(code) {
+      let index = this.sc_order_process.indexOf(code)
+      if (index === -1) {
+        this.sc_order_process.push(code)
+      } else {
+        this.sc_order_process.splice(index, 1)
+      }
+      this.saveConfig()
+    },
+    isReturnProcessEnable(code) {
+      let index = this.sc_order_return_process.indexOf(code)
+      if (index === -1) {
+        this.sc_order_return_process.push(code)
+      } else {
+        this.sc_order_return_process.splice(index, 1)
+      }
+      this.saveConfig()
+    },
+    async saveConfig() {
+      this.sc_order_process.sort((a, b) => a - b)
+      this.sc_order_return_process.sort((a, b) => a - b)
+      const { msg, status } = await edit({
+        sc_order_process: this.sc_order_process.toString(),
+        sc_order_return_process: this.sc_order_return_process.toString(),
+      })
+      if (200 == status) {
+        this.$baseMessage(msg, 'success')
+      } else {
+        this.$baseMessage(msg, 'error')
+      }
       this.fetchData()
     },
-    methods: {
-      __,
-      async fetchData() {
-        const { data } = await getConfig()
-        if (data && data.sc_order_process) {
-          this.sc_order_process = data.sc_order_process
-          this.initProcess()
-        }
-        if (data && data.sc_order_return_process) {
-          this.initReturnProcess()
-          this.sc_order_return_process = data.sc_order_return_process
-        }
-      },
-      isProcessHighlight(code) {
-        let index = this.sc_order_process.indexOf(code)
-        return this.isHighlight(index)
-      },
-      isReturnProcessHighlight(code) {
-        let index = this.sc_order_return_process.indexOf(code)
-        return this.isHighlight(index)
-      },
-      isHighlight(index) {
-        if (index === -1) {
-          return 'circle'
-        }
-        return 'primary'
-      },
-      isProcessEnable(code) {
-        let index = this.sc_order_process.indexOf(code)
-        if (index === -1) {
-          this.sc_order_process.push(code)
-        } else {
-          this.sc_order_process.splice(index, 1)
-        }
-        this.saveConfig()
-      },
-      isReturnProcessEnable(code) {
-        let index = this.sc_order_return_process.indexOf(code)
-        if (index === -1) {
-          this.sc_order_return_process.push(code)
-        } else {
-          this.sc_order_return_process.splice(index, 1)
-        }
-        this.saveConfig()
-      },
-      async saveConfig() {
-        this.sc_order_process.sort((a, b) => a - b)
-        this.sc_order_return_process.sort((a, b) => a - b)
-        const { msg, status } = await edit({
-          sc_order_process: this.sc_order_process.toString(),
-          sc_order_return_process: this.sc_order_return_process.toString(),
-        })
-        if (200 == status) {
-          this.$baseMessage(msg, 'success')
-        } else {
-          this.$baseMessage(msg, 'error')
-        }
-        this.fetchData()
-      },
-      initProcess() {
-        let index = this.sc_order_process.indexOf(2020)
-        if (index === -1) {
-          this.sc_order_process.push(2020)
-        }
+    initProcess() {
+      let index = this.sc_order_process.indexOf(2020)
+      if (index === -1) {
+        this.sc_order_process.push(2020)
+      }
 
-
-        index = this.sc_order_process.indexOf(2030)
-        if (index === -1) {
-          this.sc_order_process.push(2030)
-        }
-      },
-      initReturnProcess() {
-        let index = this.sc_order_return_process.indexOf(3100)
-        if (index === -1) {
-          this.sc_order_return_process.push(3100)
-        }
-        index = this.sc_order_process.indexOf(3105)
-        if (index === -1) {
-          this.sc_order_return_process.push(3105)
-        }
-        index = this.sc_order_process.indexOf(3125)
-        if (index === -1) {
-          this.sc_order_return_process.push(3125)
-        }
-      },
+      index = this.sc_order_process.indexOf(2030)
+      if (index === -1) {
+        this.sc_order_process.push(2030)
+      }
     },
-  }
+    initReturnProcess() {
+      let index = this.sc_order_return_process.indexOf(3100)
+      if (index === -1) {
+        this.sc_order_return_process.push(3100)
+      }
+      index = this.sc_order_process.indexOf(3105)
+      if (index === -1) {
+        this.sc_order_return_process.push(3105)
+      }
+      index = this.sc_order_process.indexOf(3125)
+      if (index === -1) {
+        this.sc_order_return_process.push(3125)
+      }
+    },
+  },
+}
 </script>
 <style>
-  .button-config {
-    display: block;
-    margin: auto;
-  }
+.button-config {
+  display: block;
+  margin: auto;
+}
 
-  .font-config {
-    text-align: center;
-    display: block;
-  }
+.font-config {
+  text-align: center;
+  display: block;
+  margin-top: 8px;
+}
 
-  .button-config .el-icon-setting:before {
-    font-size: x-large;
-  }
+.button-config .el-icon-setting:before {
+  font-size: x-large;
+}
 
-  .divider-config {
-    margin: 24px 0 !important;
-  }
+.divider-config {
+  margin: 24px 0 !important;
+}
 </style>
diff --git a/src/views/store/setupshop/index.vue b/src/views/store/setupshop/index.vue
index b24bb97..96ca3c7 100644
--- a/src/views/store/setupshop/index.vue
+++ b/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())"
             />
@@ -407,74 +412,258 @@
 </template>
 
 <script>
-  import { translateTitle as __ } from '@/utils/i18n'
-  import VabQuill from '@/extra/VabQuill'
-  import Area from '@/components/VabArea/area'
-  import upload from '@/components/upload'
-  import tree from '@/components/universalTreeSelect.vue'
-  import keyword from '@/components/baiduMap/keyword'
-  import { get, storeSetUp } from '@/api/store/base'
-  import { getTree } from '@/api/base/market/category'
+import { translateTitle as __ } from '@/utils/i18n'
+import VabQuill from '@/extra/VabQuill'
+import Area from '@/components/VabArea/area'
+import upload from '@/components/upload'
+import tree from '@/components/universalTreeSelect.vue'
+import keyword from '@/components/baiduMap/keyword'
+import { get, storeSetUp } from '@/api/store/base'
+import { getTree } from '@/api/base/market/category'
 
-  export default {
-    name: 'SetUpShop',
-    components: { VabQuill, Area, upload, keyword, tree },
-    data() {
-      return {
-        tableConfig: {
-          height: window.innerHeight - 220 - 90,
+export default {
+  name: 'SetUpShop',
+  components: { VabQuill, Area, upload, keyword, tree },
+  data() {
+    return {
+      tableConfig: {
+        height: window.innerHeight - 220 - 90,
+      },
+      test: 666,
+      treeData: [],
+      activeName: 'first',
+      optionslist: [
+        {
+          value: '1001',
+          label: this.__('免费停车'),
         },
-        test: 666,
-        treeData: [],
-        activeName: 'first',
-        optionslist: [
-          {
-            value: '1001',
-            label: this.__('免费停车'),
-          },
-          {
-            value: '1002',
-            label: this.__('免费WiFi'),
-          },
-          {
-            value: '1003',
-            label: this.__('免费送货'),
+        {
+          value: '1002',
+          label: this.__('免费WiFi'),
+        },
+        {
+          value: '1003',
+          label: this.__('免费送货'),
+        },
+      ],
+      value: '',
+      options: {
+        theme: 'snow',
+        bounds: document.body,
+        debug: 'warn',
+        modules: {
+          toolbar: {
+            container: [
+              ['bold', 'italic', 'underline', 'strike'],
+              [{ header: [1, 2, 3, 4, 5, 6, false] }],
+              [{ size: ['small', false, 'large', 'huge'] }],
+              [{ color: [] }, { background: [] }],
+              ['blockquote', 'code-block'],
+              [{ list: 'ordered' }, { list: 'bullet' }],
+              [{ script: 'sub' }, { script: 'super' }],
+              [{ indent: '-1' }, { indent: '+1' }],
+              [{ align: [] }],
+              [{ direction: 'rtl' }],
+              [{ font: [] }],
+              ['clean'],
+              ['link', 'image', 'vab-upload-image'],
+            ],
           },
+        },
+        placeholder: '',
+        readOnly: false,
+      },
+      defaultProps: {
+        label: 'category_name',
+        children: 'children',
+        disabled: 'disabled',
+      },
+      storeForm: {},
+      slideShowForm: {
+        store_slide: [
+          { img: '', check: true, name: '' },
+          { img: '', check: true, name: '' },
+          { img: '', check: true, name: '' },
+          { img: '', check: true, name: '' },
+          { img: '', check: true, name: '' },
         ],
-        value: '',
-        options: {
-          theme: 'snow',
-          bounds: document.body,
-          debug: 'warn',
-          modules: {
-            toolbar: {
-              container: [
-                ['bold', 'italic', 'underline', 'strike'],
-                [{ header: [1, 2, 3, 4, 5, 6, false] }],
-                [{ size: ['small', false, 'large', 'huge'] }],
-                [{ color: [] }, { background: [] }],
-                ['blockquote', 'code-block'],
-                [{ list: 'ordered' }, { list: 'bullet' }],
-                [{ script: 'sub' }, { script: 'super' }],
-                [{ indent: '-1' }, { indent: '+1' }],
-                [{ align: [] }],
-                [{ direction: 'rtl' }],
-                [{ font: [] }],
-                ['clean'],
-                ['link', 'image', 'vab-upload-image'],
-              ],
-            },
-          },
-          placeholder: '',
-          readOnly: false,
-        },
-        defaultProps: {
-          label: 'category_name',
-          children: 'children',
-          disabled: 'disabled',
-        },
-        storeForm: {},
-        slideShowForm: {
+      },
+      physicalStoreForm: {
+        store_notice: undefined,
+        store_o2o_tags: [],
+        store_opening_hours: undefined,
+        store_close_hours: undefined,
+        store_discount: undefined,
+        store_circle: undefined,
+      },
+      storeConfigForm: {
+        sc_is_enabled_invoice: undefined,
+      },
+      form: {
+        store_name: undefined,
+        store_logo: undefined,
+        store_slogan: undefined,
+        store_address: undefined,
+        store_longitude: '',
+        store_latitude: '',
+        str_store_area: undefined,
+        store_tel: undefined,
+        store_opening_hours: undefined,
+        store_circle: undefined,
+        store_discount: undefined,
+        store_close_hours: undefined,
+        store_qq: undefined,
+        company_description: undefined,
+        store_banner: undefined,
+        store_ww: undefined,
+        store_notice: undefined,
+        store_o2o_tags: [],
+        store_district_id: '',
+      },
+      queryArea: {
+        province: { code: '', name: '' },
+        city: { code: '', name: '' },
+        district: { code: '', name: '' },
+      },
+    }
+  },
+  created() {
+    this.fetchData()
+    this.getTree()
+  },
+  methods: {
+    getPhysicalStoreParams() {
+      const form = this.physicalStoreForm
+      let params = {
+        store_notice: form.store_notice,
+        store_o2o_tags: form.store_o2o_tags.toString(),
+        store_opening_hours: form.store_opening_hours,
+        store_close_hours: form.store_close_hours,
+        store_discount: form.store_discount,
+        store_circle: form.store_circle,
+      }
+      return params
+    },
+    getStoreParams() {
+      const form = this.storeForm
+      let params = {
+        store_name: form.store_name,
+        store_slogan: form.store_slogan,
+        store_logo: form.store_logo,
+        store_banner: form.store_banner,
+        store_address: form.store_address,
+        store_longitude: form.store_longitude,
+        store_latitude: form.store_latitude,
+        store_tel: form.store_tel,
+        store_qq: form.store_qq,
+        store_ww: form.store_ww,
+        company_description: form.company_description,
+      }
+
+      if (this.queryArea.province.name) {
+        params.store_area = this.queryArea.province.name
+      }
+      if (this.queryArea.city.name) {
+        params.store_area += '/' + this.queryArea.city.name
+      }
+      if (this.queryArea.district.name) {
+        params.store_area += '/' + this.queryArea.district.name
+      }
+
+      if (this.queryArea.province.code) {
+        params.store_district_id = this.queryArea.province.code
+      }
+      if (this.queryArea.city.code) {
+        params.store_district_id += '/' + this.queryArea.city.code
+      }
+      if (this.queryArea.district.code) {
+        params.store_district_id += '/' + this.queryArea.district.code
+      }
+
+      return params
+    },
+    getSlideShowForm() {
+      const form = this.slideShowForm
+      let params = {
+        store_slide: JSON.stringify(form.store_slide),
+      }
+      return params
+    },
+    getStoreConfigForm() {
+      const form = this.storeConfigForm
+      let params = {
+        sc_is_enabled_invoice: JSON.stringify(form.sc_is_enabled_invoice),
+      }
+      return params
+    },
+    __,
+    upImage(image, index) {
+      this.form.store_slide[index].img = image
+    },
+
+    async handleEdit(params) {
+      this.$baseConfirm(this.__('修改立马生效,是否继续？'), null, async () => {
+        const { msg, status } = await storeSetUp(params)
+        if (200 == status) {
+          this.$baseMessage(msg, 'success')
+        } else {
+          this.$baseMessage(msg, 'error')
+        }
+        await this.fetchData()
+      })
+    },
+    handleParams() {
+      let params = Object.assign({}, this.form)
+      params.store_o2o_tags = this.form.store_o2o_tags.toString()
+      params.store_slide = JSON.stringify(params.store_slide)
+      return params
+    },
+    async fetchData(params) {
+      const { data } = await get({ params })
+      this.initData(data)
+    },
+    async getTree() {
+      const { data } = await getTree()
+      console.log(data)
+      if (data) {
+        this.treeData = data
+      } else {
+        this.treeData = []
+      }
+    },
+    initData(data) {
+      this.physicalStoreForm = {
+        store_notice: data.info.store_notice,
+        store_opening_hours: data.info.store_opening_hours,
+        store_close_hours: data.info.store_close_hours,
+        store_discount: data.info.store_discount,
+        store_circle: Number(data.store_circle),
+      }
+      this.storeConfigForm = {
+        sc_is_enabled_invoice: data.sc_is_enabled_invoice,
+      }
+      if (data.store_o2o_tags) {
+        this.physicalStoreForm.store_o2o_tags = data.store_o2o_tags.split(',')
+      }
+
+      this.storeForm = {
+        store_name: data.store_name,
+        store_slogan: data.store_slogan,
+        store_logo: data.store_logo,
+        store_banner: data.info.store_banner,
+        store_address: data.store_address,
+        store_longitude: data.store_longitude,
+        store_latitude: data.store_latitude,
+        store_tel: data.info.store_tel,
+        store_qq: data.info.store_qq,
+        store_ww: data.info.store_ww,
+        company_description: data.company.company_description,
+      }
+
+      if (data.info.store_slide && data.info.store_slide.length > 0) {
+        this.slideShowForm.store_slide = data.info.store_slide
+      } else {
+        this.slideShowForm = {
           store_slide: [
             { img: '', check: true, name: '' },
             { img: '', check: true, name: '' },
@@ -482,241 +671,53 @@
             { img: '', check: true, name: '' },
             { img: '', check: true, name: '' },
           ],
-        },
-        physicalStoreForm: {
-          store_notice: undefined,
-          store_o2o_tags: [],
-          store_opening_hours: undefined,
-          store_close_hours: undefined,
-          store_discount: undefined,
-          store_circle: undefined,
-        },
-        storeConfigForm: {
-          sc_is_enabled_invoice: undefined,
-        },
-        form: {
-          store_name: undefined,
-          store_logo: undefined,
-          store_slogan: undefined,
-          store_address: undefined,
-          store_longitude: '',
-          store_latitude: '',
-          str_store_area: undefined,
-          store_tel: undefined,
-          store_opening_hours: undefined,
-          store_circle: undefined,
-          store_discount: undefined,
-          store_close_hours: undefined,
-          store_qq: undefined,
-          company_description: undefined,
-          store_banner: undefined,
-          store_ww: undefined,
-          store_notice: undefined,
-          store_o2o_tags: [],
-          store_district_id: '',
-        },
-        queryArea: {
-          province: { code: '', name: '' },
-          city: { code: '', name: '' },
-          district: { code: '', name: '' },
-        },
+        }
+      }
+
+      const store_area = data.store_area.split('/')
+      const store_district_id = data.store_district_id.split(',')
+
+      this.initQueryArea(store_district_id, store_area)
+      this.form.store_o2o_flag = data.store_o2o_flag
+    },
+    initQueryArea(store_district_id, store_area) {
+      if (!store_district_id && store_area) return
+      if (store_district_id[0]) {
+        this.queryArea.province.code = store_district_id[0]
+      }
+      if (store_district_id[1]) {
+        this.queryArea.city.code = store_district_id[1]
+      }
+      if (store_district_id[2]) {
+        this.queryArea.district.code = store_district_id[2]
+      }
+      if (store_area[0]) {
+        this.queryArea.province.name = store_area[0]
+      }
+      if (store_area[1]) {
+        this.queryArea.city.name = store_area[1]
+      }
+      if (store_area[2]) {
+        this.queryArea.district.name = store_area[2]
       }
     },
-    created() {
-      this.fetchData()
-      this.getTree()
+    getAddress(address) {
+      this.storeForm.store_address = address.value
+      this.storeForm.store_longitude = address.lng
+      this.storeForm.store_latitude = address.lat
     },
-    methods: {
-      getPhysicalStoreParams() {
-        const form = this.physicalStoreForm
-        let params = {
-          store_notice: form.store_notice,
-          store_o2o_tags: form.store_o2o_tags.toString(),
-          store_opening_hours: form.store_opening_hours,
-          store_close_hours: form.store_close_hours,
-          store_discount: form.store_discount,
-          store_circle: form.store_circle,
-        }
-        return params
-      },
-      getStoreParams() {
-        const form = this.storeForm
-        let params = {
-          store_name: form.store_name,
-          store_slogan: form.store_slogan,
-          store_logo: form.store_logo,
-          store_banner: form.store_banner,
-          store_address: form.store_address,
-          store_longitude: form.store_longitude,
-          store_latitude: form.store_latitude,
-          store_tel: form.store_tel,
-          store_qq: form.store_qq,
-          store_ww: form.store_ww,
-          company_description: form.company_description,
-        }
-
-        if (this.queryArea.province.name) {
-          params.store_area = this.queryArea.province.name
-        }
-        if (this.queryArea.city.name) {
-          params.store_area += '/' + this.queryArea.city.name
-        }
-        if (this.queryArea.district.name) {
-          params.store_area += '/' + this.queryArea.district.name
-        }
-
-        if (this.queryArea.province.code) {
-          params.store_district_id = this.queryArea.province.code
-        }
-        if (this.queryArea.city.code) {
-          params.store_district_id += '/' + this.queryArea.city.code
-        }
-        if (this.queryArea.district.code) {
-          params.store_district_id += '/' + this.queryArea.district.code
-        }
-
-        return params
-      },
-      getSlideShowForm() {
-        const form = this.slideShowForm
-        let params = {
-          store_slide: JSON.stringify(form.store_slide),
-        }
-        return params
-      },
-      getStoreConfigForm() {
-        const form = this.storeConfigForm
-        let params = {
-          sc_is_enabled_invoice: JSON.stringify(form.sc_is_enabled_invoice),
-        }
-        return params
-      },
-      __,
-      upImage(image, index) {
-        this.form.store_slide[index].img = image
-      },
-
-      async handleEdit(params) {
-        this.$baseConfirm(
-          this.__('修改立马生效,是否继续？'),
-          null,
-          async () => {
-            const { msg, status } = await storeSetUp(params)
-            if (200 == status) {
-              this.$baseMessage(msg, 'success')
-            } else {
-              this.$baseMessage(msg, 'error')
-            }
-            await this.fetchData()
-          }
-        )
-      },
-      handleParams() {
-        let params = Object.assign({}, this.form)
-        params.store_o2o_tags = this.form.store_o2o_tags.toString()
-        params.store_slide = JSON.stringify(params.store_slide)
-        return params
-      },
-      async fetchData(params) {
-        const { data } = await get({ params })
-        this.initData(data)
-      },
-      async getTree() {
-        const { data } = await getTree()
-        console.log(data)
-        if (data) {
-          this.treeData = data
-        } else {
-          this.treeData = []
-        }
-      },
-      initData(data) {
-        this.physicalStoreForm = {
-          store_notice: data.info.store_notice,
-          store_opening_hours: data.info.store_opening_hours,
-          store_close_hours: data.info.store_close_hours,
-          store_discount: data.info.store_discount,
-          store_circle: Number(data.store_circle),
-        }
-        this.storeConfigForm = {
-          sc_is_enabled_invoice: data.sc_is_enabled_invoice,
-        }
-        if (data.store_o2o_tags) {
-          this.physicalStoreForm.store_o2o_tags = data.store_o2o_tags.split(',')
-        }
-
-        this.storeForm = {
-          store_name: data.store_name,
-          store_slogan: data.store_slogan,
-          store_logo: data.store_logo,
-          store_banner: data.info.store_banner,
-          store_address: data.store_address,
-          store_longitude: data.store_longitude,
-          store_latitude: data.store_latitude,
-          store_tel: data.info.store_tel,
-          store_qq: data.info.store_qq,
-          store_ww: data.info.store_ww,
-          company_description: data.company.company_description,
-        }
-
-        if (data.info.store_slide && data.info.store_slide.length > 0) {
-          this.slideShowForm.store_slide = data.info.store_slide
-        } else {
-          this.slideShowForm = {
-            store_slide: [
-              { img: '', check: true, name: '' },
-              { img: '', check: true, name: '' },
-              { img: '', check: true, name: '' },
-              { img: '', check: true, name: '' },
-              { img: '', check: true, name: '' },
-            ],
-          }
-        }
-
-        const store_area = data.store_area.split('/')
-        const store_district_id = data.store_district_id.split(',')
-
-        this.initQueryArea(store_district_id, store_area)
-        this.form.store_o2o_flag = data.store_o2o_flag
-      },
-      initQueryArea(store_district_id, store_area) {
-        if (!store_district_id && store_area) return
-        if (store_district_id[0]) {
-          this.queryArea.province.code = store_district_id[0]
-        }
-        if (store_district_id[1]) {
-          this.queryArea.city.code = store_district_id[1]
-        }
-        if (store_district_id[2]) {
-          this.queryArea.district.code = store_district_id[2]
-        }
-        if (store_area[0]) {
-          this.queryArea.province.name = store_area[0]
-        }
-        if (store_area[1]) {
-          this.queryArea.city.name = store_area[1]
-        }
-        if (store_area[2]) {
-          this.queryArea.district.name = store_area[2]
-        }
-      },
-      getAddress(address) {
-        this.storeForm.store_address = address.value
-        this.storeForm.store_longitude = address.lng
-        this.storeForm.store_latitude = address.lat
-      },
-    },
-  }
+  },
+}
 </script>
 <style>
-  .config-save {
-    color: white;
-    text-align: center;
-    background-color: #2c2e30;
-    padding: 12px;
-  }
+.config-save {
+  color: white;
+  text-align: center;
+  background-color: #2c2e30;
+  padding: 12px;
+}
 
-  .config-save:hover {
-    background-color: #3d3d3d;
-  }
+.config-save:hover {
+  background-color: #3d3d3d;
+}
 </style>
diff --git a/vab.config.js b/vab.config.js
index b0ebe3b..c9f8313 100644
--- a/vab.config.js
+++ b/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: ',
 }