Merge branch 'master' of http://gitlab.frkj.cc/php/zhjwxt into yuhongzhe

# Conflicts:
#	admin/src/app/lang/zh-cn/customer_resources.customer_resources.json
#	admin/src/app/lang/zh-cn/physical_test.physical_test.json
#	admin/src/app/lang/zh-cn/physical_test.physical_test_edit.json
#	admin/src/app/views/customer_resources/customer_resources.vue
#	admin/src/app/views/physical_test/physical_test.vue
#	admin/src/app/views/physical_test/physical_test_edit.vue
#	niucloud/app/adminapi/controller/customer_resources/CustomerResources.php
#	niucloud/app/adminapi/controller/physical_test/PhysicalTest.php
#	niucloud/app/adminapi/route/physical_test.php
#	niucloud/app/model/physical_test/PhysicalTest.php
#	niucloud/app/service/admin/physical_test/PhysicalTestService.php

admin/components.d.ts

@@ -10,7 +10,6 @@ declare module '@vue/runtime-core' {
     Attachment: typeof import('./src/components/upload-attachment/attachment.vue')['default']
     DiyLink: typeof import('./src/components/diy-link/index.vue')['default']
     Editor: typeof import('./src/components/editor/index.vue')['default']
-    ElAlert: typeof import('element-plus/es')['ElAlert']
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']

admin/package-lock.json

@@ -9,6 +9,11 @@
             "version": "1.0.0",
             "dependencies": {
                 "@element-plus/icons-vue": "2.0.10",
+                "@fullcalendar/core": "^6.1.17",
+                "@fullcalendar/daygrid": "^6.1.17",
+                "@fullcalendar/interaction": "^6.1.17",
+                "@fullcalendar/timegrid": "^6.1.17",
+                "@fullcalendar/vue3": "^6.1.17",
                 "@highlightjs/vue-plugin": "2.1.0",
                 "@types/lodash-es": "4.17.6",
                 "@vueuse/core": "9.12.0",
@@ -962,6 +967,50 @@
             "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.1.6.tgz",
             "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A=="
         },
+        "node_modules/@fullcalendar/core": {
+            "version": "6.1.17",
+            "resolved": "https://registry.npmmirror.com/@fullcalendar/core/-/core-6.1.17.tgz",
+            "integrity": "sha512-0W7lnIrv18ruJ5zeWBeNZXO8qCWlzxDdp9COFEsZnyNjiEhUVnrW/dPbjRKYpL0edGG0/Lhs0ghp1z/5ekt8ZA==",
+            "dependencies": {
+                "preact": "~10.12.1"
+            }
+        },
+        "node_modules/@fullcalendar/daygrid": {
+            "version": "6.1.17",
+            "resolved": "https://registry.npmmirror.com/@fullcalendar/daygrid/-/daygrid-6.1.17.tgz",
+            "integrity": "sha512-K7m+pd7oVJ9fW4h7CLDdDGJbc9szJ1xDU1DZ2ag+7oOo1aCNLv44CehzkkknM6r8EYlOOhgaelxQpKAI4glj7A==",
+            "peerDependencies": {
+                "@fullcalendar/core": "~6.1.17"
+            }
+        },
+        "node_modules/@fullcalendar/interaction": {
+            "version": "6.1.17",
+            "resolved": "https://registry.npmmirror.com/@fullcalendar/interaction/-/interaction-6.1.17.tgz",
+            "integrity": "sha512-AudvQvgmJP2FU89wpSulUUjeWv24SuyCx8FzH2WIPVaYg+vDGGYarI7K6PcM3TH7B/CyaBjm5Rqw9lXgnwt5YA==",
+            "peerDependencies": {
+                "@fullcalendar/core": "~6.1.17"
+            }
+        },
+        "node_modules/@fullcalendar/timegrid": {
+            "version": "6.1.17",
+            "resolved": "https://registry.npmmirror.com/@fullcalendar/timegrid/-/timegrid-6.1.17.tgz",
+            "integrity": "sha512-K4PlA3L3lclLOs3IX8cvddeiJI9ZVMD7RA9IqaWwbvac771971foc9tFze9YY+Pqesf6S+vhS2dWtEVlERaGlQ==",
+            "dependencies": {
+                "@fullcalendar/daygrid": "~6.1.17"
+            },
+            "peerDependencies": {
+                "@fullcalendar/core": "~6.1.17"
+            }
+        },
+        "node_modules/@fullcalendar/vue3": {
+            "version": "6.1.17",
+            "resolved": "https://registry.npmmirror.com/@fullcalendar/vue3/-/vue3-6.1.17.tgz",
+            "integrity": "sha512-0+qi/PK/xCkTQXh2CaeN2AkP+SvQTznPhwBXuIyrtsR0Ua8UpmGEXI+my3qQ6o003r8gPUY2e785ywIyhX2zCA==",
+            "peerDependencies": {
+                "@fullcalendar/core": "~6.1.17",
+                "vue": "^3.0.11"
+            }
+        },
         "node_modules/@highlightjs/vue-plugin": {
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/@highlightjs/vue-plugin/-/vue-plugin-2.1.0.tgz",
@@ -4997,6 +5046,15 @@
             "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
             "dev": true
         },
+        "node_modules/preact": {
+            "version": "10.12.1",
+            "resolved": "https://registry.npmmirror.com/preact/-/preact-10.12.1.tgz",
+            "integrity": "sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==",
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/preact"
+            }
+        },
         "node_modules/prelude-ls": {
             "version": "1.2.1",
             "resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz",

admin/package.json

@@ -6,10 +6,18 @@
     "scripts": {
         "dev": "vite",
         "build": "vite build && node publish.cjs",
-        "preview": "vite preview"
+        "preview": "vite preview",
+        "lint": "eslint .",
+        "lint:fix": "eslint . --ext .ts --ext .vue --ext .js --fix",
+        "format": "prettier --write src/**/*.{ts,vue,js,json}"
     },
     "dependencies": {
         "@element-plus/icons-vue": "2.0.10",
+        "@fullcalendar/core": "^6.1.17",
+        "@fullcalendar/daygrid": "^6.1.17",
+        "@fullcalendar/interaction": "^6.1.17",
+        "@fullcalendar/timegrid": "^6.1.17",
+        "@fullcalendar/vue3": "^6.1.17",
         "@highlightjs/vue-plugin": "2.1.0",
         "@types/lodash-es": "4.17.6",
         "@vueuse/core": "9.12.0",

admin/src/App.vue

@@ -22,11 +22,15 @@ const locale = computed(() => (systemStore.lang === 'zh-cn' ? zhCn : en))
 
 const toggleDark = useToggle(useDark())
 
-watch(route, () => {
-    useAppStore().$patch(state => {
+watch(
+  route,
+  () => {
+    useAppStore().$patch((state) => {
       state.route = route
     })
-}, { immediate: true })
+  },
+  { immediate: true }
+)
 
 onMounted(() => {
   // 设置主题色

admin/src/addon/shop/api/delivery.ts

@@ -25,7 +25,7 @@ export function getCompanyList(params: Record<string, any>) {
  * @returns
  */
 export function getCompanyInfo(company_id: number) {
-    return request.get(`shop/delivery/company/${ company_id }`);
+  return request.get(`shop/delivery/company/${company_id}`)
 }
 
 /**
@@ -34,7 +34,10 @@ export function getCompanyInfo(company_id: number) {
  * @returns
  */
 export function addCompany(params: Record<string, any>) {
-    return request.post('shop/delivery/company', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/delivery/company', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -43,9 +46,9 @@ export function addCompany(params: Record<string, any>) {
  * @returns
  */
 export function editCompany(params: Record<string, any>) {
-    return request.put(`shop/delivery/company/${ params.company_id }`, params, {
+  return request.put(`shop/delivery/company/${params.company_id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -55,10 +58,12 @@ export function editCompany(params: Record<string, any>) {
  * @returns
  */
 export function deleteCompany(company_id: number) {
-    return request.delete(`shop/delivery/company/${ company_id }`, { showErrorMessage: true, showSuccessMessage: true })
+  return request.delete(`shop/delivery/company/${company_id}`, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
-
 /*********************************  运费模版  ***************************************/
 /**
  * 获取运费模版分页列表
@@ -84,7 +89,7 @@ export function getShippingTemplateList(params: Record<string, any>) {
  * @returns
  */
 export function getShippingTemplateInfo(template_id: number) {
-    return request.get(`shop/shipping/template/${ template_id }`);
+  return request.get(`shop/shipping/template/${template_id}`)
 }
 
 /**
@@ -93,7 +98,10 @@ export function getShippingTemplateInfo(template_id: number) {
  * @returns
  */
 export function addShippingTemplate(params: Record<string, any>) {
-    return request.post('shop/shipping/template', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/shipping/template', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -102,9 +110,9 @@ export function addShippingTemplate(params: Record<string, any>) {
  * @returns
  */
 export function editShippingTemplate(params: Record<string, any>) {
-    return request.put(`shop/shipping/template/${ params.template_id }`, params, {
+  return request.put(`shop/shipping/template/${params.template_id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -114,13 +122,12 @@ export function editShippingTemplate(params: Record<string, any>) {
  * @returns
  */
 export function deleteShippingTemplate(template_id: number) {
-    return request.delete(`shop/shipping/template/${ template_id }`, {
+  return request.delete(`shop/shipping/template/${template_id}`, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
-
 /*********************************  自提门店  ***************************************/
 /**
  * 获取自提门店列表
@@ -137,7 +144,7 @@ export function getStoreList(params: Record<string, any>) {
  * @returns
  */
 export function getStoreInfo(store_id: number) {
-    return request.get(`shop/delivery/store/${ store_id }`);
+  return request.get(`shop/delivery/store/${store_id}`)
 }
 
 /**
@@ -146,7 +153,10 @@ export function getStoreInfo(store_id: number) {
  * @returns
  */
 export function addStore(params: Record<string, any>) {
-    return request.post('shop/delivery/store', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/delivery/store', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -155,9 +165,9 @@ export function addStore(params: Record<string, any>) {
  * @returns
  */
 export function editStore(params: Record<string, any>) {
-    return request.put(`shop/delivery/store/${ params.store_id }`, params, {
+  return request.put(`shop/delivery/store/${params.store_id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -167,7 +177,10 @@ export function editStore(params: Record<string, any>) {
  * @returns
  */
 export function deleteStore(store_id: number) {
-    return request.delete(`shop/delivery/store/${ store_id }`, { showErrorMessage: true, showSuccessMessage: true })
+  return request.delete(`shop/delivery/store/${store_id}`, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /*********************************  物流查询  ***************************************/
@@ -177,7 +190,10 @@ export function deleteStore(store_id: number) {
  * @returns
  */
 export function setDeliverySearch(params: Record<string, any>) {
-    return request.post('shop/delivery/search', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/delivery/search', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -220,7 +236,7 @@ export function getShopDelivery(params: Record<string, any>) {
  * @returns
  */
 export function getShopDeliverInfo(staff_id: number) {
-    return request.get(`shop/delivery/staff/${ staff_id }`);
+  return request.get(`shop/delivery/staff/${staff_id}`)
 }
 
 /**
@@ -229,7 +245,9 @@ export function getShopDeliverInfo(staff_id: number) {
  * @returns
  */
 export function addShopDeliver(params: Record<string, any>) {
-    return request.post('shop/delivery/staff', params, { showSuccessMessage: true })
+  return request.post('shop/delivery/staff', params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -238,7 +256,9 @@ export function addShopDeliver(params: Record<string, any>) {
  * @returns
  */
 export function editShopDeliver(params: Record<string, any>) {
-    return request.put(`shop/delivery/staff/${ params.deliver_id }`, params, { showSuccessMessage: true })
+  return request.put(`shop/delivery/staff/${params.deliver_id}`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -247,7 +267,7 @@ export function editShopDeliver(params: Record<string, any>) {
  * @returns
  */
 export function deleteShopDeliver(staff_id: number) {
-    return request.delete(`shop/delivery/staff/${ staff_id }`)
+  return request.delete(`shop/delivery/staff/${staff_id}`)
 }
 
 /**
@@ -255,7 +275,7 @@ export function deleteShopDeliver(staff_id: number) {
  * @returns
  */
 export function getLocal() {
-    return request.get('shop/local');
+  return request.get('shop/local')
 }
 
 /**

admin/src/addon/shop/api/electronic_sheet.ts

@@ -24,7 +24,7 @@ export function getElectronicSheetList(params: Record<string, any>) {
  * @returns
  */
 export function getElectronicSheetInfo(id: number) {
-    return request.get(`shop/electronic_sheet/${ id }`);
+  return request.get(`shop/electronic_sheet/${id}`)
 }
 
 /**
@@ -35,7 +35,7 @@ export function getElectronicSheetInfo(id: number) {
 export function addElectronicSheet(params: Record<string, any>) {
   return request.post('shop/electronic_sheet', params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -45,9 +45,9 @@ export function addElectronicSheet(params: Record<string, any>) {
  * @returns
  */
 export function editElectronicSheet(params: Record<string, any>) {
-    return request.put(`shop/electronic_sheet/${ params.id }`, params, {
+  return request.put(`shop/electronic_sheet/${params.id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -57,9 +57,9 @@ export function editElectronicSheet(params: Record<string, any>) {
  * @returns
  */
 export function deleteElectronicSheet(id: number) {
-    return request.delete(`shop/electronic_sheet/${ id }`, {
+  return request.delete(`shop/electronic_sheet/${id}`, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -69,9 +69,9 @@ export function deleteElectronicSheet(id: number) {
  * @returns
  */
 export function setDefaultElectronicSheet(params: Record<string, any>) {
-    return request.put(`shop/electronic_sheet/setDefault/${ params.id }`, params, {
+  return request.put(`shop/electronic_sheet/setDefault/${params.id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -83,7 +83,7 @@ export function setDefaultElectronicSheet(params: Record<string, any>) {
 export function setElectronicSheetConfig(params: Record<string, any>) {
   return request.post('shop/electronic_sheet/config', params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -111,6 +111,6 @@ export function getElectronicSheetPayType() {
 export function printElectronicSheet(params: Record<string, any>) {
   return request.post('shop/electronic_sheet/print', params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }

admin/src/addon/shop/api/goods.ts

@@ -15,7 +15,7 @@ export function getGoodsPageList(params: Record<string, any>) {
  * @returns
  */
 export function getGoodsInfo(goods_id: number) {
-    return request.get(`shop/goods/${ goods_id }`);
+  return request.get(`shop/goods/${goods_id}`)
 }
 
 /**
@@ -24,7 +24,10 @@ export function getGoodsInfo(goods_id: number) {
  * @returns
  */
 export function addGoods(params: Record<string, any>) {
-    return request.post('shop/goods', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/goods', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -32,7 +35,10 @@ export function addGoods(params: Record<string, any>) {
  * @param params
  */
 export function editGoods(params: Record<string, any>) {
-    return request.put(`shop/goods/${ params.goods_id }`, params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.put(`shop/goods/${params.goods_id}`, params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -40,7 +46,7 @@ export function editGoods(params: Record<string, any>) {
  * @param params
  */
 export function getGoodsInit(params: Record<string, any>) {
-    return request.get(`shop/goods/init`, { params });
+  return request.get(`shop/goods/init`, { params })
 }
 
 /**
@@ -49,7 +55,10 @@ export function getGoodsInit(params: Record<string, any>) {
  * @returns
  */
 export function addVirtualGoods(params: Record<string, any>) {
-    return request.post('shop/goods/virtual', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/goods/virtual', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -57,9 +66,9 @@ export function addVirtualGoods(params: Record<string, any>) {
  * @param params
  */
 export function editVirtualGoods(params: Record<string, any>) {
-    return request.put(`shop/goods/virtual/${ params.goods_id }`, params, {
+  return request.put(`shop/goods/virtual/${params.goods_id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -68,7 +77,7 @@ export function editVirtualGoods(params: Record<string, any>) {
  * @param params
  */
 export function getVirtualGoodsInit(params: Record<string, any>) {
-    return request.get(`shop/goods/virtual/init`, { params });
+  return request.get(`shop/goods/virtual/init`, { params })
 }
 
 /**
@@ -77,7 +86,10 @@ export function getVirtualGoodsInit(params: Record<string, any>) {
  * @returns
  */
 export function deleteGoods(params: Record<string, any>) {
-    return request.put(`shop/goods/delete`, params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.put(`shop/goods/delete`, params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -95,7 +107,10 @@ export function getRecycleGoodsPageList(params: Record<string, any>) {
  * @returns
  */
 export function recycleGoods(params: Record<string, any>) {
-    return request.put(`shop/goods/recycle`, params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.put(`shop/goods/recycle`, params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -119,7 +134,9 @@ export function editGoodsStatus(params: Record<string, any>) {
  * @param params
  */
 export function copyGoods(params: Record<string, any>) {
-    return request.put(`shop/goods/copy/${ params.goods_id }`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/copy/${params.goods_id}`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -163,7 +180,9 @@ export function getActiveGoodsCount(params: Record<string, any>) {
  * @returns
  */
 export function editGoodsListStock(params: Record<string, any>) {
-    return request.put(`shop/goods/sku/stock`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/sku/stock`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -172,7 +191,9 @@ export function editGoodsListStock(params: Record<string, any>) {
  * @returns
  */
 export function editGoodsListPrice(params: Record<string, any>) {
-    return request.put(`shop/goods/sku/price`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/sku/price`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -181,7 +202,9 @@ export function editGoodsListPrice(params: Record<string, any>) {
  * @returns
  */
 export function editGoodsListMemberPrice(params: Record<string, any>) {
-    return request.put(`shop/goods/sku/member_price`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/sku/member_price`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -189,7 +212,7 @@ export function editGoodsListMemberPrice(params: Record<string, any>) {
  * @returns
  */
 export function getGoodsType() {
-    return request.get(`shop/goods/type`);
+  return request.get(`shop/goods/type`)
 }
 
 /**
@@ -216,7 +239,7 @@ export function getLabelList(params: Record<string, any>) {
  * @returns
  */
 export function getLabelInfo(label_id: number) {
-    return request.get(`shop/goods/label/${ label_id }`);
+  return request.get(`shop/goods/label/${label_id}`)
 }
 
 /**
@@ -225,7 +248,10 @@ export function getLabelInfo(label_id: number) {
  * @returns
  */
 export function addLabel(params: Record<string, any>) {
-    return request.post('shop/goods/label', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/goods/label', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -234,9 +260,9 @@ export function addLabel(params: Record<string, any>) {
  * @returns
  */
 export function editLabel(params: Record<string, any>) {
-    return request.put(`shop/goods/label/${ params.label_id }`, params, {
+  return request.put(`shop/goods/label/${params.label_id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -245,7 +271,9 @@ export function editLabel(params: Record<string, any>) {
  * @param params
  */
 export function modifyLabelStatus(params: Record<string, any>) {
-    return request.put(`shop/goods/label/status`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/label/status`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -254,7 +282,10 @@ export function modifyLabelStatus(params: Record<string, any>) {
  * @returns
  */
 export function deleteLabel(label_id: number) {
-    return request.delete(`shop/goods/label/${ label_id }`, { showErrorMessage: true, showSuccessMessage: true })
+  return request.delete(`shop/goods/label/${label_id}`, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -262,7 +293,9 @@ export function deleteLabel(label_id: number) {
  * @param params
  */
 export function modifyLabelSort(params: Record<string, any>) {
-    return request.put(`shop/goods/label/sort`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/label/sort`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -289,7 +322,7 @@ export function getLabelGroupList(params: Record<string, any>) {
  * @returns
  */
 export function getLabelGroupInfo(label_id: number) {
-    return request.get(`shop/goods/label/group/${ label_id }`);
+  return request.get(`shop/goods/label/group/${label_id}`)
 }
 
 /**
@@ -298,7 +331,10 @@ export function getLabelGroupInfo(label_id: number) {
  * @returns
  */
 export function addLabelGroup(params: Record<string, any>) {
-    return request.post('shop/goods/label/group', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/goods/label/group', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -307,9 +343,9 @@ export function addLabelGroup(params: Record<string, any>) {
  * @returns
  */
 export function editLabelGroup(params: Record<string, any>) {
-    return request.put(`shop/goods/label/group/${ params.group_id }`, params, {
+  return request.put(`shop/goods/label/group/${params.group_id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -319,7 +355,10 @@ export function editLabelGroup(params: Record<string, any>) {
  * @returns
  */
 export function deleteLabelGroup(group_id: number) {
-    return request.delete(`shop/goods/label/group/${ group_id }`, { showErrorMessage: true, showSuccessMessage: true })
+  return request.delete(`shop/goods/label/group/${group_id}`, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -327,7 +366,9 @@ export function deleteLabelGroup(group_id: number) {
  * @param params
  */
 export function modifyLabelGroupSort(params: Record<string, any>) {
-    return request.put(`shop/goods/label/group/sort`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/label/group/sort`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -354,7 +395,7 @@ export function getBrandList(params: Record<string, any>) {
  * @returns
  */
 export function getBrandInfo(brand_id: number) {
-    return request.get(`shop/goods/brand/${ brand_id }`);
+  return request.get(`shop/goods/brand/${brand_id}`)
 }
 
 /**
@@ -363,7 +404,10 @@ export function getBrandInfo(brand_id: number) {
  * @returns
  */
 export function addBrand(params: Record<string, any>) {
-    return request.post('shop/goods/brand', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/goods/brand', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -372,9 +416,9 @@ export function addBrand(params: Record<string, any>) {
  * @returns
  */
 export function editBrand(params: Record<string, any>) {
-    return request.put(`shop/goods/brand/${ params.brand_id }`, params, {
+  return request.put(`shop/goods/brand/${params.brand_id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -383,7 +427,9 @@ export function editBrand(params: Record<string, any>) {
  * @param params
  */
 export function modifyBrandSort(params: Record<string, any>) {
-    return request.put(`shop/goods/brand/sort`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/brand/sort`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -392,7 +438,10 @@ export function modifyBrandSort(params: Record<string, any>) {
  * @returns
  */
 export function deleteBrand(brand_id: number) {
-    return request.delete(`shop/goods/brand/${ brand_id }`, { showErrorMessage: true, showSuccessMessage: true })
+  return request.delete(`shop/goods/brand/${brand_id}`, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -419,7 +468,7 @@ export function getServeList(params: Record<string, any>) {
  * @returns
  */
 export function getServeInfo(service_id: number) {
-    return request.get(`shop/goods/service/${ service_id }`);
+  return request.get(`shop/goods/service/${service_id}`)
 }
 
 /**
@@ -428,7 +477,10 @@ export function getServeInfo(service_id: number) {
  * @returns
  */
 export function addServe(params: Record<string, any>) {
-    return request.post('shop/goods/service', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/goods/service', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -437,9 +489,9 @@ export function addServe(params: Record<string, any>) {
  * @returns
  */
 export function editServe(params: Record<string, any>) {
-    return request.put(`shop/goods/service/${ params.service_id }`, params, {
+  return request.put(`shop/goods/service/${params.service_id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -449,7 +501,10 @@ export function editServe(params: Record<string, any>) {
  * @returns
  */
 export function deleteServe(service_id: number) {
-    return request.delete(`shop/goods/service/${ service_id }`, { showErrorMessage: true, showSuccessMessage: true })
+  return request.delete(`shop/goods/service/${service_id}`, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -475,7 +530,7 @@ export function getCategoryList(params: Record<string, any>) {
  * @returns
  */
 export function getCategoryInfo(category_id: number) {
-    return request.get(`shop/goods/category/${ category_id }`);
+  return request.get(`shop/goods/category/${category_id}`)
 }
 
 /**
@@ -484,7 +539,10 @@ export function getCategoryInfo(category_id: number) {
  * @returns
  */
 export function addCategory(params: Record<string, any>) {
-    return request.post('shop/goods/category', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/goods/category', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -493,9 +551,9 @@ export function addCategory(params: Record<string, any>) {
  * @returns
  */
 export function editCategory(params: Record<string, any>) {
-    return request.put(`shop/goods/category/${ params.category_id }`, params, {
+  return request.put(`shop/goods/category/${params.category_id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -505,7 +563,10 @@ export function editCategory(params: Record<string, any>) {
  * @returns
  */
 export function deleteCategory(category_id: number) {
-    return request.delete(`shop/goods/category/${ category_id }`, { showErrorMessage: true, showSuccessMessage: true })
+  return request.delete(`shop/goods/category/${category_id}`, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -514,7 +575,10 @@ export function deleteCategory(category_id: number) {
  * @returns
  */
 export function updateCategory(params: Record<string, any>) {
-    return request.post(`shop/goods/category/update`, params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post(`shop/goods/category/update`, params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -523,7 +587,10 @@ export function updateCategory(params: Record<string, any>) {
  * @returns
  */
 export function setCategoryConfig(params: Record<string, any>) {
-    return request.post(`shop/goods/category/config`, params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post(`shop/goods/category/config`, params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -531,7 +598,7 @@ export function setCategoryConfig(params: Record<string, any>) {
  * @returns
  */
 export function getCategoryConfig() {
-    return request.get(`shop/goods/category/config`);
+  return request.get(`shop/goods/category/config`)
 }
 
 /**
@@ -566,7 +633,10 @@ export function getEvaluateList(params: Record<string, any>) {
  * @returns
  */
 export function addEvaluate(params: Record<string, any>) {
-    return request.post('shop/goods/evaluate', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/goods/evaluate', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -575,7 +645,10 @@ export function addEvaluate(params: Record<string, any>) {
  * @returns
  */
 export function deleteEvaluate(evaluate_id: number) {
-    return request.delete(`shop/goods/evaluate/${ evaluate_id }`, { showErrorMessage: true, showSuccessMessage: true })
+  return request.delete(`shop/goods/evaluate/${evaluate_id}`, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -584,9 +657,9 @@ export function deleteEvaluate(evaluate_id: number) {
  * @returns
  */
 export function adoptEvaluate(evaluate_id: number) {
-    return request.put(`shop/goods/evaluate/adopt/${ evaluate_id }`, {
+  return request.put(`shop/goods/evaluate/adopt/${evaluate_id}`, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -596,9 +669,9 @@ export function adoptEvaluate(evaluate_id: number) {
  * @returns
  */
 export function refuseEvaluate(evaluate_id: number) {
-    return request.put(`shop/goods/evaluate/refuse/${ evaluate_id }`, {
+  return request.put(`shop/goods/evaluate/refuse/${evaluate_id}`, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -608,10 +681,14 @@ export function refuseEvaluate(evaluate_id: number) {
  * @returns
  */
 export function replyEvaluate(params: Record<string, any>) {
-    return request.put(`shop/goods/evaluate/reply/${ params.evaluate_id }`, params, {
+  return request.put(
+    `shop/goods/evaluate/reply/${params.evaluate_id}`,
+    params,
+    {
       showErrorMessage: true,
-        showSuccessMessage: true
-    })
+      showSuccessMessage: true,
+    }
+  )
 }
 
 /**
@@ -620,9 +697,9 @@ export function replyEvaluate(params: Record<string, any>) {
  * @returns
  */
 export function toppingEvaluate(evaluate_id: number) {
-    return request.put(`shop/goods/evaluate/topping/${ evaluate_id }`, {
+  return request.put(`shop/goods/evaluate/topping/${evaluate_id}`, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -632,9 +709,9 @@ export function toppingEvaluate(evaluate_id: number) {
  * @returns
  */
 export function cancelToppingEvaluate(evaluate_id: number) {
-    return request.put(`shop/goods/evaluate/cancel_topping/${ evaluate_id }`, {
+  return request.put(`shop/goods/evaluate/cancel_topping/${evaluate_id}`, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -662,7 +739,7 @@ export function getAttrList(params: Record<string, any>) {
  * @returns
  */
 export function getAttrInfo(attr_id: number) {
-    return request.get(`shop/goods/attr/${ attr_id }`);
+  return request.get(`shop/goods/attr/${attr_id}`)
 }
 
 /**
@@ -671,7 +748,10 @@ export function getAttrInfo(attr_id: number) {
  * @returns
  */
 export function addAttr(params: Record<string, any>) {
-    return request.post('shop/goods/attr', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/goods/attr', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -680,9 +760,9 @@ export function addAttr(params: Record<string, any>) {
  * @returns
  */
 export function editAttr(params: Record<string, any>) {
-    return request.put(`shop/goods/attr/${ params.attr_id }`, params, {
+  return request.put(`shop/goods/attr/${params.attr_id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -692,7 +772,10 @@ export function editAttr(params: Record<string, any>) {
  * @returns
  */
 export function deleteAttr(attr_id: number) {
-    return request.delete(`shop/goods/attr/${ attr_id }`, { showErrorMessage: true, showSuccessMessage: true })
+  return request.delete(`shop/goods/attr/${attr_id}`, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -700,7 +783,9 @@ export function deleteAttr(attr_id: number) {
  * @param params
  */
 export function modifyAttrSort(params: Record<string, any>) {
-    return request.put(`shop/goods/attr/sort`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/attr/sort`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -708,7 +793,9 @@ export function modifyAttrSort(params: Record<string, any>) {
  * @param params
  */
 export function modifyAttrName(params: Record<string, any>) {
-    return request.put(`shop/goods/attr/attr_name`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/attr/attr_name`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -716,7 +803,9 @@ export function modifyAttrName(params: Record<string, any>) {
  * @param params
  */
 export function modifyAttrValue(params: Record<string, any>) {
-    return request.put(`shop/goods/attr/attr_value`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/attr/attr_value`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -732,5 +821,7 @@ export function getGoodsBatchSetDict() {
  * @param params
  */
 export function goodsBatchSet(params: Record<string, any>) {
-    return request.put(`shop/goods/batchSet`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/batchSet`, params, {
+    showSuccessMessage: true,
+  })
 }

admin/src/addon/shop/api/marketing.ts

@@ -24,7 +24,10 @@ export function getGoodsCategoryList(params: Record<string, any>) {
  * @returns
  */
 export function addCoupon(params: Record<string, any>) {
-    return request.post(`shop/goods/coupon`, params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post(`shop/goods/coupon`, params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -59,7 +62,7 @@ export function getCouponSelectList(params: Record<string, any>) {
  * @returns
  */
 export function getCouponRecords(params: Record<string, any>) {
-    return request.get(`shop/goods/coupon/records`, { params });
+  return request.get(`shop/goods/coupon/records`, { params })
 }
 
 /**
@@ -68,7 +71,7 @@ export function getCouponRecords(params: Record<string, any>) {
  * @returns
  */
 export function getCouponInfo(id: number) {
-    return request.get(`shop/goods/coupon/detail/${ id }`);
+  return request.get(`shop/goods/coupon/detail/${id}`)
 }
 
 /**
@@ -77,7 +80,9 @@ export function getCouponInfo(id: number) {
  * @returns
  */
 export function editCouponStatus(params: Record<string, any>) {
-    return request.put(`shop/goods/coupon/setstatus/${ params.status }`, params, { showSuccessMessage: true })
+  return request.put(`shop/goods/coupon/setstatus/${params.status}`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -86,9 +91,9 @@ export function editCouponStatus(params: Record<string, any>) {
  * @returns
  */
 export function editCoupon(params: Record<string, any>) {
-    return request.put(`shop/goods/coupon/edit/${ params.id }`, params, {
+  return request.put(`shop/goods/coupon/edit/${params.id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -98,7 +103,7 @@ export function editCoupon(params: Record<string, any>) {
  * @returns
  */
 export function deleteCoupon(id: number) {
-    return request.delete(`shop/goods/coupon/${ id }`, { showSuccessMessage: true })
+  return request.delete(`shop/goods/coupon/${id}`, { showSuccessMessage: true })
 }
 
 /**
@@ -107,7 +112,9 @@ export function deleteCoupon(id: number) {
  * @returns
  */
 export function closeCoupon(id: number) {
-    return request.put(`shop/goods/coupon/invalid/${ id }`, { showSuccessMessage: true })
+  return request.put(`shop/goods/coupon/invalid/${id}`, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -143,7 +150,7 @@ export function getActiveDiscountStatusList() {
  * @returns
  */
 export function getActiveDiscountInfo(active_id: number) {
-    return request.get(`shop/active/discount/${ active_id }`);
+  return request.get(`shop/active/discount/${active_id}`)
 }
 
 /**
@@ -152,7 +159,10 @@ export function getActiveDiscountInfo(active_id: number) {
  * @returns
  */
 export function addActiveDiscount(params: Record<string, any>) {
-    return request.post('shop/active/discount', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/active/discount', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -161,9 +171,9 @@ export function addActiveDiscount(params: Record<string, any>) {
  * @returns
  */
 export function editActiveDiscount(params: Record<string, any>) {
-    return request.put(`shop/active/discount/${ params.active_id }`, params, {
+  return request.put(`shop/active/discount/${params.active_id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -173,10 +183,14 @@ export function editActiveDiscount(params: Record<string, any>) {
  * @returns
  */
 export function closeActiveDiscount(active_id: number) {
-    return request.put(`shop/active/discount/close/${ active_id }`, {}, {
+  return request.put(
+    `shop/active/discount/close/${active_id}`,
+    {},
+    {
       showErrorMessage: true,
-        showSuccessMessage: true
-    })
+      showSuccessMessage: true,
+    }
+  )
 }
 
 /**
@@ -185,7 +199,9 @@ export function closeActiveDiscount(active_id: number) {
  * @returns
  */
 export function deleteActiveDiscount(active_id: number) {
-    return request.delete(`shop/active/discount/${ active_id }`, { showSuccessMessage: true })
+  return request.delete(`shop/active/discount/${active_id}`, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -194,7 +210,9 @@ export function deleteActiveDiscount(active_id: number) {
  * @returns
  */
 export function getActiveDiscountGoodsPageList(params: Record<string, any>) {
-    return request.get(`shop/active/discount/goods/${ params.active_id }`, { params })
+  return request.get(`shop/active/discount/goods/${params.active_id}`, {
+    params,
+  })
 }
 
 /**
@@ -203,7 +221,9 @@ export function getActiveDiscountGoodsPageList(params: Record<string, any>) {
  * @returns
  */
 export function getActiveDiscountOrderPageList(params: Record<string, any>) {
-    return request.get(`shop/active/discount/order/${ params.active_id }`, { params })
+  return request.get(`shop/active/discount/order/${params.active_id}`, {
+    params,
+  })
 }
 
 /**
@@ -212,7 +232,9 @@ export function getActiveDiscountOrderPageList(params: Record<string, any>) {
  * @returns
  */
 export function getActiveDiscountMemberPageList(params: Record<string, any>) {
-    return request.get(`shop/active/discount/member/${ params.active_id }`, { params })
+  return request.get(`shop/active/discount/member/${params.active_id}`, {
+    params,
+  })
 }
 
 /**
@@ -220,7 +242,7 @@ export function getActiveDiscountMemberPageList(params: Record<string, any>) {
  * @returns
  */
 export function getActiveDiscountConfig() {
-    return request.get(`shop/active/discount/config`);
+  return request.get(`shop/active/discount/config`)
 }
 
 /**
@@ -231,7 +253,7 @@ export function getActiveDiscountConfig() {
 export function editActiveDiscountConfig(params: Record<string, any>) {
   return request.put(`shop/active/discount/config`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -252,7 +274,7 @@ export function getActiveExchangePageList(params: Record<string, any>) {
  * @returns
  */
 export function getActiveExchangeInfo(id: number) {
-    return request.get(`shop/active/exchange/${ id }`);
+  return request.get(`shop/active/exchange/${id}`)
 }
 
 /**
@@ -261,7 +283,10 @@ export function getActiveExchangeInfo(id: number) {
  * @returns
  */
 export function addActiveExchange(params: Record<string, any>) {
-    return request.post('shop/active/exchange', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/active/exchange', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -270,9 +295,9 @@ export function addActiveExchange(params: Record<string, any>) {
  * @returns
  */
 export function editActiveExchange(params: Record<string, any>) {
-    return request.put(`shop/active/exchange/${ params.id }`, params, {
+  return request.put(`shop/active/exchange/${params.id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -282,9 +307,9 @@ export function editActiveExchange(params: Record<string, any>) {
  * @returns
  */
 export function editActiveExchangeStatus(params: Record<string, any>) {
-    return request.put(`shop/active/exchange/status/${ params.id }`, params, {
+  return request.put(`shop/active/exchange/status/${params.id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -294,7 +319,9 @@ export function editActiveExchangeStatus(params: Record<string, any>) {
  * @returns
  */
 export function deleteActiveExchange(id: number) {
-    return request.delete(`shop/active/exchange/${ id }`, { showSuccessMessage: true })
+  return request.delete(`shop/active/exchange/${id}`, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -312,7 +339,7 @@ export function getActiveExchangeStatus() {
  * @returns
  */
 export function getActiveNewcomerConfig() {
-    return request.get(`shop/active/newcomer/config`);
+  return request.get(`shop/active/newcomer/config`)
 }
 
 /**
@@ -323,7 +350,7 @@ export function getActiveNewcomerConfig() {
 export function editActiveNewcomerConfig(params: Record<string, any>) {
   return request.put(`shop/active/newcomer/config`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -353,7 +380,10 @@ export function getNewcomerSelectGoodsList(params: Record<string, any>) {
  * @returns
  */
 export function setRankConfig(params: Record<string, any>) {
-    return request.post('shop/good/rank/config', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/good/rank/config', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -387,7 +417,7 @@ export function optionData() {
  * @returns
  */
 export function getRankInfo(rank_id: number) {
-    return request.get(`shop/good/rank/${ rank_id }`);
+  return request.get(`shop/good/rank/${rank_id}`)
 }
 
 /**
@@ -396,7 +426,10 @@ export function getRankInfo(rank_id: number) {
  * @returns
  */
 export function addGoodRank(params: Record<string, any>) {
-    return request.post('shop/good/rank', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/good/rank', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -405,9 +438,9 @@ export function addGoodRank(params: Record<string, any>) {
  * @returns
  */
 export function editGoodRank(params: Record<string, any>) {
-    return request.put(`shop/good/rank/${ params.id }`, params, {
+  return request.put(`shop/good/rank/${params.id}`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -419,7 +452,7 @@ export function editGoodRank(params: Record<string, any>) {
 export function editRankStatus(params: Record<string, any>) {
   return request.put(`shop/goods/rank/status`, params, {
     showErrorMessage: true,
-        showSuccessMessage: true
+    showSuccessMessage: true,
   })
 }
 
@@ -429,7 +462,7 @@ export function editRankStatus(params: Record<string, any>) {
  * @returns
  */
 export function deleteGoodRank(id: number) {
-    return request.delete(`shop/good/rank/${ id }`, { showSuccessMessage: true })
+  return request.delete(`shop/good/rank/${id}`, { showSuccessMessage: true })
 }
 
 /**
@@ -438,7 +471,9 @@ export function deleteGoodRank(id: number) {
  * @returns
  */
 export function batchDelete(params: Record<string, any>) {
-    return request.put(`shop/good/rank/batchDelete`, params, { showSuccessMessage: true })
+  return request.put(`shop/good/rank/batchDelete`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -447,7 +482,9 @@ export function batchDelete(params: Record<string, any>) {
  * @returns
  */
 export function modifyGoodsRankSort(params: Record<string, any>) {
-    return request.put(`shop/good/rank/sort`, params, { showSuccessMessage: true })
+  return request.put(`shop/good/rank/sort`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -493,7 +530,7 @@ export function addManjian(params: Record<string, any>) {
  * @returns
  */
 export function editManjian(params: Record<string, any>) {
-    return request.put(`shop/manjian/${ params.id }`, params)
+  return request.put(`shop/manjian/${params.id}`, params)
 }
 
 /**
@@ -502,7 +539,7 @@ export function editManjian(params: Record<string, any>) {
  * @returns
  */
 export function getManjianInfo(params: Record<string, any>) {
-    return request.get(`shop/manjian/init`, { params });
+  return request.get(`shop/manjian/init`, { params })
 }
 
 /**
@@ -520,7 +557,7 @@ export function goodsCheck(params: Record<string, any>) {
  * @returns
  */
 export function getManjianMemberPageList(params: Record<string, any>) {
-    return request.get(`shop/manjian/member/${ params.id }`, { params })
+  return request.get(`shop/manjian/member/${params.id}`, { params })
 }
 
 /**
@@ -529,10 +566,14 @@ export function getManjianMemberPageList(params: Record<string, any>) {
  * @returns
  */
 export function closeManjian(manjian_id: number) {
-    return request.put(`shop/manjian/close/${ manjian_id }`, {}, {
+  return request.put(
+    `shop/manjian/close/${manjian_id}`,
+    {},
+    {
       showErrorMessage: true,
-        showSuccessMessage: true
-    })
+      showSuccessMessage: true,
+    }
+  )
 }
 
 /**
@@ -568,7 +609,9 @@ export function getGoodsSkuInfo(params: Record<string, any>) {
  * @returns
  */
 export function deleteManjian(manjian_id: number) {
-    return request.delete(`shop/manjian/${ manjian_id }`, { showSuccessMessage: true })
+  return request.delete(`shop/manjian/${manjian_id}`, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -577,7 +620,9 @@ export function deleteManjian(manjian_id: number) {
  * @returns
  */
 export function batchDeleteManjian(params: Record<string, any>) {
-    return request.put(`shop/manjian/goods/batchDelete`, params, { showSuccessMessage: true })
+  return request.put(`shop/manjian/goods/batchDelete`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -586,5 +631,7 @@ export function batchDeleteManjian(params: Record<string, any>) {
  * @returns
  */
 export function batchCloseMajian(params: Record<string, any>) {
-    return request.put(`shop/manjian/goods/batchClose`, params, { showSuccessMessage: true })
+  return request.put(`shop/manjian/goods/batchClose`, params, {
+    showSuccessMessage: true,
+  })
 }

admin/src/addon/shop/api/order.ts

@@ -29,7 +29,7 @@ export function getOrderList(params: Record<string, any>) {
  * @returns
  */
 export function getOrderDetail(order_id: number) {
-    return request.get(`shop/order/detail/${ order_id }`)
+  return request.get(`shop/order/detail/${order_id}`)
 }
 
 /**
@@ -53,7 +53,7 @@ export function getOrderType() {
  * @return
  */
 export function orderClose(order_id: number) {
-    return request.put(`shop/order/close/${ order_id }`)
+  return request.put(`shop/order/close/${order_id}`)
 }
 
 /**
@@ -85,7 +85,7 @@ export function setShopRemark(params: Record<string, any>) {
  * @return
  */
 export function orderFinish(order_id: number) {
-    return request.put(`shop/order/finish/${ order_id }`)
+  return request.put(`shop/order/finish/${order_id}`)
 }
 
 /**
@@ -117,7 +117,7 @@ export function orderRefund(params: Record<string, any>) {
  * 退款维权详情
  */
 export function orderRefundDetail(refund_id: number) {
-    return request.get(`shop/order/refund/${ refund_id }`)
+  return request.get(`shop/order/refund/${refund_id}`)
 }
 
 /**
@@ -125,7 +125,10 @@ export function orderRefundDetail(refund_id: number) {
  * @return
  */
 export function auditRefund(params: Record<string, any>) {
-    return request.put(`shop/order/refund/audit/${ params.order_refund_no }`, params)
+  return request.put(
+    `shop/order/refund/audit/${params.order_refund_no}`,
+    params
+  )
 }
 
 /**
@@ -133,7 +136,10 @@ export function auditRefund(params: Record<string, any>) {
  * @return
  */
 export function refundDelivery(params: Record<string, any>) {
-    return request.put(`shop/order/refund/delivery/${ params.order_refund_no }`, params)
+  return request.put(
+    `shop/order/refund/delivery/${params.order_refund_no}`,
+    params
+  )
 }
 
 /**
@@ -147,7 +153,9 @@ export function getRefundMoney(params: Record<string, any>) {
  * 商家主动退款
  */
 export function shopActiveRefund(params: Record<string, any>) {
-    return request.post(`shop/order/refund/active`, params, { showSuccessMessage: true })
+  return request.post(`shop/order/refund/active`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -161,14 +169,14 @@ export function getInvoiceList(params: Record<string, any>) {
  * 获取发票列表
  */
 export function getInvoiceDetail(id: number) {
-    return request.get(`shop/invoice/${ id }`)
+  return request.get(`shop/invoice/${id}`)
 }
 
 /**
  * 开具发票
  */
 export function setInvoice(id: number, params: Record<string, any>) {
-    return request.put(`shop/invoice/${ id }`, params, { showSuccessMessage: true })
+  return request.put(`shop/invoice/${id}`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -190,7 +198,9 @@ export function getOrderFrom() {
  * @return
  */
 export function orderEditPrice(params: Record<string, any>) {
-    return request.put(`shop/order/edit_price`, params, { showSuccessMessage: true })
+  return request.put(`shop/order/edit_price`, params, {
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -230,7 +240,10 @@ export function getOrderBatchDeliveryList(params: Record<string, any>) {
  * @return
  */
 export function addBatchOrderDelivery(params: Record<string, any>) {
-    return request.put(`shop/order_batch_delivery/add_batch_order_delivery`, params)
+  return request.put(
+    `shop/order_batch_delivery/add_batch_order_delivery`,
+    params
+  )
 }
 
 /**

admin/src/addon/shop/api/shop_address.ts

@@ -15,7 +15,7 @@ export function getShopAddressList(params: Record<string, any>) {
  * @returns
  */
 export function getShopAddressInfo(id: number) {
-    return request.get(`shop/shop_address/${ id }`);
+  return request.get(`shop/shop_address/${id}`)
 }
 
 /**
@@ -24,7 +24,10 @@ export function getShopAddressInfo(id: number) {
  * @returns
  */
 export function addShopAddress(params: Record<string, any>) {
-    return request.post('shop/shop_address', params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.post('shop/shop_address', params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -33,7 +36,10 @@ export function addShopAddress(params: Record<string, any>) {
  * @returns
  */
 export function editShopAddress(params: Record<string, any>) {
-    return request.put(`shop/shop_address/${ params.id }`, params, { showErrorMessage: true, showSuccessMessage: true })
+  return request.put(`shop/shop_address/${params.id}`, params, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -42,7 +48,10 @@ export function editShopAddress(params: Record<string, any>) {
  * @returns
  */
 export function deleteShopAddress(id: number) {
-    return request.delete(`shop/shop_address/${ id }`, { showErrorMessage: true, showSuccessMessage: true })
+  return request.delete(`shop/shop_address/${id}`, {
+    showErrorMessage: true,
+    showSuccessMessage: true,
+  })
 }
 
 /**
@@ -50,7 +59,7 @@ export function deleteShopAddress(id: number) {
  * @returns
  */
 export function getShopDefaultDeliveryAddressInfo() {
-    return request.get('shop/shop_address/default/delivery');
+  return request.get('shop/shop_address/default/delivery')
 }
 
 /**
@@ -58,5 +67,5 @@ export function getShopDefaultDeliveryAddressInfo() {
  * @returns
  */
 export function getOrderRefundAddress() {
-    return request.get('shop/order/refund/address');
+  return request.get('shop/order/refund/address')
 }

admin/src/addon/shop/lang/zh-cn/address.edit.json

@@ -1,31 +1,31 @@
 {
-	"contactName":"联系人",
-	"mobile":"联系方式",
-	"provinceId":"省",
-	"cityId":"市",
-	"districtId":"区",
-	"address":"详细地址",
-	"fullAddress":"地址",
-	"lat":"纬度",
-	"lng":"经度",
-	"isDeliveryAddress":"是否是发货地址",
-	"isRefundAddress":"是否是退货地址",
-	"isDefaultDelivery":"默认发货地址",
-	"isDefaultRefund":"默认收货地址",
-	"contactNamePlaceholder":"请输入联系人",
-	"mobilePlaceholder":"请输入联系方式",
-	"mobileTips":"请输入正确的手机号",
-	"addressPlaceholder":"请输入详细地址",
-	"fullAddressPlaceholder":"请输入地址",
-	"latPlaceholder":"请输入纬度",
-	"lngPlaceholder":"请输入经度",
-	"isDeliveryAddressPlaceholder":"请输入是否是发货地址",
-	"isRefundAddressPlaceholder":"请输入是否是退货地址",
-	"isDefaultDeliveryPlaceholder":"请输入默认发货地址",
-	"isDefaultRefundPlaceholder":"请输入默认收货地址",
-	"addShopAddress":"添加商家地址库",
-	"updateShopAddress":"编辑商家地址库",
-	"shopAddressDeleteTips":"确定要删除该商家地址库吗？",
+  "contactName": "联系人",
+  "mobile": "联系方式",
+  "provinceId": "省",
+  "cityId": "市",
+  "districtId": "区",
+  "address": "详细地址",
+  "fullAddress": "地址",
+  "lat": "纬度",
+  "lng": "经度",
+  "isDeliveryAddress": "是否是发货地址",
+  "isRefundAddress": "是否是退货地址",
+  "isDefaultDelivery": "默认发货地址",
+  "isDefaultRefund": "默认收货地址",
+  "contactNamePlaceholder": "请输入联系人",
+  "mobilePlaceholder": "请输入联系方式",
+  "mobileTips": "请输入正确的手机号",
+  "addressPlaceholder": "请输入详细地址",
+  "fullAddressPlaceholder": "请输入地址",
+  "latPlaceholder": "请输入纬度",
+  "lngPlaceholder": "请输入经度",
+  "isDeliveryAddressPlaceholder": "请输入是否是发货地址",
+  "isRefundAddressPlaceholder": "请输入是否是退货地址",
+  "isDefaultDeliveryPlaceholder": "请输入默认发货地址",
+  "isDefaultRefundPlaceholder": "请输入默认收货地址",
+  "addShopAddress": "添加商家地址库",
+  "updateShopAddress": "编辑商家地址库",
+  "shopAddressDeleteTips": "确定要删除该商家地址库吗？",
   "addressType": "地址类型",
   "deliveryAddress": "发货地址",
   "refundAddress": "收货地址",

admin/src/addon/shop/lang/zh-cn/common.json

@@ -88,37 +88,37 @@
   "goodsSearchSet": "搜索设置",
   "goodsSearchText": "搜索内容",
   "goodsSearchTextPlaceholder": "请输入搜索内容",
-  "shopMemberInfoComponentUidTextColor":"编号颜色",
-  "shopMemberInfoComponentAccount":"账号信息",
-  "shopGoodsRecommendComponentTag":"标签",
-  "shopGoodsRecommendComponentTagcolor":"标签颜色",
-  "shopGoodsRecommendComponentTagPlaceholder":"请输入标签内容",
-  "shopGoodsRecommendComponentButtonBorderColor":"按钮边框颜色",
-  "carouselStyle":"轮播样式",
-  "recommendIndicatorStyle":"指示器设置",
-  "recommendIndicatorColor":"常规颜色",
-  "recommendIndicatorActiveColor":"选中颜色",
-  "activeCubeBlockContent":"板块内容" ,
-  "bgImage":"背景图片",
-  "rankingTitleIcon":"图标" ,
-  "rankSelect":"榜单选择",
-  "rankName":"榜单名称",
-  "rankNamePlaceholder":"请输入榜单名称",
-  "showGoodsNum":"榜单商品数量",
-  "goodsSourceName":"商品来源",
-  "ruleTypeName":"排序规则",
-  "rankTypeName":"排行周期",
+  "shopMemberInfoComponentUidTextColor": "编号颜色",
+  "shopMemberInfoComponentAccount": "账号信息",
+  "shopGoodsRecommendComponentTag": "标签",
+  "shopGoodsRecommendComponentTagcolor": "标签颜色",
+  "shopGoodsRecommendComponentTagPlaceholder": "请输入标签内容",
+  "shopGoodsRecommendComponentButtonBorderColor": "按钮边框颜色",
+  "carouselStyle": "轮播样式",
+  "recommendIndicatorStyle": "指示器设置",
+  "recommendIndicatorColor": "常规颜色",
+  "recommendIndicatorActiveColor": "选中颜色",
+  "activeCubeBlockContent": "板块内容",
+  "bgImage": "背景图片",
+  "rankingTitleIcon": "图标",
+  "rankSelect": "榜单选择",
+  "rankName": "榜单名称",
+  "rankNamePlaceholder": "请输入榜单名称",
+  "showGoodsNum": "榜单商品数量",
+  "goodsSourceName": "商品来源",
+  "ruleTypeName": "排序规则",
+  "rankTypeName": "排行周期",
   "rankSelectPopupAfterTip": "个榜单",
   "rankSelectPopupGoodsMinTip": "所选榜单数量不能少于",
   "rankSelectPopupGoodsMaxTip": "所选榜单数量不能超过",
-  "rankingTitleImage":"头部图片" ,
-  "rankingSubTitle":"副标题",
-  "rankingSubTitleTextColor":"副标题颜色",
-  "rankTextColor":"名称颜色",
-  "rankingSubTitleLink":"副标题链接",
-  "listFrameColor":"背景颜色",
-  "topRounded":"上圆角",
-  "bottomRounded":"下圆角",
+  "rankingTitleImage": "头部图片",
+  "rankingSubTitle": "副标题",
+  "rankingSubTitleTextColor": "副标题颜色",
+  "rankTextColor": "名称颜色",
+  "rankingSubTitleLink": "副标题链接",
+  "listFrameColor": "背景颜色",
+  "topRounded": "上圆角",
+  "bottomRounded": "下圆角",
   "rankingStyle": "板块样式",
   "styleRecommend": "风格推荐",
   "countDownStyle": "倒计时样式",

admin/src/addon/shop/lang/zh-cn/delivery.company.json

@@ -1,20 +1,20 @@
 {
-      "companyId":"",
-      "companyIdPlaceholder":"请输入",
-      "companyName":"名称",
-      "companyNamePlaceholder":"请输入物流公司名称",
-      "logo":"LOGO",
-      "logoPlaceholder":"请输入物流公司logo",
-      "url":"网址",
-      "urlPlaceholder":"请输入物流公司网址",
-      "expressNoPlaceholder":"请输入物流公司编号",
+  "companyId": "",
+  "companyIdPlaceholder": "请输入",
+  "companyName": "名称",
+  "companyNamePlaceholder": "请输入物流公司名称",
+  "logo": "LOGO",
+  "logoPlaceholder": "请输入物流公司logo",
+  "url": "网址",
+  "urlPlaceholder": "请输入物流公司网址",
+  "expressNoPlaceholder": "请输入物流公司编号",
   "expressNoTips": "物流公司编号作用于物流查询，请根据物流跟踪对应配置设置编号",
-      "expressNoKd100":"快递100编码",
-      "expressNoKd100Placeholder":"请输入快递100编码",
-      "addCompany":"添加物流公司",
-      "updateCompany":"编辑物流公司",
+  "expressNoKd100": "快递100编码",
+  "expressNoKd100Placeholder": "请输入快递100编码",
+  "addCompany": "添加物流公司",
+  "updateCompany": "编辑物流公司",
   "electronicSheetSwitchName": "是否支持电子面单",
-      "expressNoElectronicSheet":"电子面单编号",
-      "expressNo":"物流跟踪编号",
-      "companyDeleteTips":"确定要删除该数据吗？"
+  "expressNoElectronicSheet": "电子面单编号",
+  "expressNo": "物流跟踪编号",
+  "companyDeleteTips": "确定要删除该数据吗？"
 }

admin/src/addon/shop/lang/zh-cn/delivery.company_edit.json

@@ -1,21 +1,21 @@
 {
-      "companyId":"",
-      "companyIdPlaceholder":"请输入",
-      "companyName":"名称",
-      "companyNamePlaceholder":"请输入物流公司名称",
-      "logo":"LOGO",
-      "logoPlaceholder":"请输入物流公司logo",
-      "url":"网址",
-      "urlPlaceholder":"请输入物流公司网址",
-      "expressNo":"物流跟踪编号",
-      "expressNoPlaceholder":"请输入物流公司编号",
+  "companyId": "",
+  "companyIdPlaceholder": "请输入",
+  "companyName": "名称",
+  "companyNamePlaceholder": "请输入物流公司名称",
+  "logo": "LOGO",
+  "logoPlaceholder": "请输入物流公司logo",
+  "url": "网址",
+  "urlPlaceholder": "请输入物流公司网址",
+  "expressNo": "物流跟踪编号",
+  "expressNoPlaceholder": "请输入物流公司编号",
   "expressNoTips": "物流公司编号作用于物流查询，请根据物流跟踪对应配置设置编号",
-      "expressNoKd100":"快递100编码",
-      "expressNoKd100Placeholder":"请输入快递100编码",
-      "addCompany":"添加物流公司",
-      "updateCompany":"编辑物流公司",
-      "expressNoElectronicSheet":"电子面单编号",
-      "expressNoElectronicSheetTips":"电子面单编号作用于电子面单查询，请根据电子面单对应配置设置编号",
+  "expressNoKd100": "快递100编码",
+  "expressNoKd100Placeholder": "请输入快递100编码",
+  "addCompany": "添加物流公司",
+  "updateCompany": "编辑物流公司",
+  "expressNoElectronicSheet": "电子面单编号",
+  "expressNoElectronicSheetTips": "电子面单编号作用于电子面单查询，请根据电子面单对应配置设置编号",
   "printStyle": "模板样式",
   "addPrintStyle": "添加模板样式",
   "expType": "业务类型",
@@ -28,17 +28,16 @@
   "expTypeValueNullTips": "业务值不可以为零",
   "expTypeValue": "业务值",
   "electronicSheetSwitch": "是否支持电子面单",
-      "printStyleName": "模板名称" ,
+  "printStyleName": "模板名称",
   "printStyleNameTips": "模板名称不能为空",
   "printStyleSizeTips": "模板尺寸不能为空",
   "printStyleNameRepeatTips": "模板名称不可以重复，请重新填写",
   "printStyleSizeRepeatTips": "模板尺寸不可以重复，请重新填写",
   "printStyleId": "模板尺寸",
-      "expTypeTips": "快递鸟业务类型" ,
-      "expTypeTips1": "不填默认为1" ,
+  "expTypeTips": "快递鸟业务类型",
+  "expTypeTips1": "不填默认为1",
   "printStyleTips": "快递鸟模版规格(常用)",
   "printStyleTips1": "主流快递单打印纸尺寸一般为：76*130，100*180（单位mm）",
   "printStyleTips2": "不填写则取物流公司的默认模板",
   "examine": "点击查看"
-      
 }

admin/src/addon/shop/lang/zh-cn/delivery.config.json

@@ -1,11 +1,11 @@
 {
-    "store":"启动门店自提后，买家可选择自提点提货。",
-    "express":"启用物流配送后，买家下单可以选择快递发货。",
-    "local_delivery":"启用同城配送后，在配送范围内的买家可以选择同城配送。",
-    "deliveryStaff":"配送员",
-    "deliveryCompany":"物流公司",
-    "deliveryTemplate":"运费模版",
-    "deliverySearch":"物流跟踪",
-    "deliveryStore":"自提点",
+  "store": "启动门店自提后，买家可选择自提点提货。",
+  "express": "启用物流配送后，买家下单可以选择快递发货。",
+  "local_delivery": "启用同城配送后，在配送范围内的买家可以选择同城配送。",
+  "deliveryStaff": "配送员",
+  "deliveryCompany": "物流公司",
+  "deliveryTemplate": "运费模版",
+  "deliverySearch": "物流跟踪",
+  "deliveryStore": "自提点",
   "localConfig": "同城配送设置"
 }

admin/src/addon/shop/lang/zh-cn/delivery.local.json

@@ -1,7 +1,7 @@
 {
-    "basicSettings":"同城配送基础设置",
-    "timeIsOpen":"配送时间设置",
-    "timeIsOpenTips":"开启后，买家下单选择同城配送时，可选择配送时间，提交订单后，将在买家备注中显示。",
+  "basicSettings": "同城配送基础设置",
+  "timeIsOpen": "配送时间设置",
+  "timeIsOpenTips": "开启后，买家下单选择同城配送时，可选择配送时间，提交订单后，将在买家备注中显示。",
   "close": "关闭",
   "open": "开启",
   "everyDay": "每天",

admin/src/addon/shop/lang/zh-cn/delivery.staff.json

@@ -1,9 +1,9 @@
 {
-    "addDeliveryPersonnel":"添加配送员",
-    "updateDeliver":"编辑配送员",
-    "deliverName":"配送员名称",
-    "deliverMobile":"配送员手机号",
-    "deliverNamePlaceholder":"请输入配送员名称",
-    "deliverMobilePlaceholder":"请输入配送员手机号",
-    "deliverDeleteTips":"确定要删除该数据吗？"
+  "addDeliveryPersonnel": "添加配送员",
+  "updateDeliver": "编辑配送员",
+  "deliverName": "配送员名称",
+  "deliverMobile": "配送员手机号",
+  "deliverNamePlaceholder": "请输入配送员名称",
+  "deliverMobilePlaceholder": "请输入配送员手机号",
+  "deliverDeleteTips": "确定要删除该数据吗？"
 }

admin/src/addon/shop/lang/zh-cn/delivery.store.json

@@ -1,18 +1,18 @@
 {
-      "storeId":"",
-      "storeName":"自提点信息",
-      "storeNamePlaceholder":"请输入自提点名称",
-      "storeLogo":"自提点logo",
-      "storeMobile":"联系电话",
-      "address":"详细地址",
-      "fullAddress":"联系地址",
-      "longitude":"经度",
-      "latitude":"纬度",
-      "tradeTime":"营业时间",
-      "createTime":"添加时间",
-      "createTimePlaceholder":"请输入添加时间",
-      "addStore":"添加自提点",
-      "updateStore":"编辑自提点",
-      "storeDeleteTips":"确定要删除该数据吗？",
+  "storeId": "",
+  "storeName": "自提点信息",
+  "storeNamePlaceholder": "请输入自提点名称",
+  "storeLogo": "自提点logo",
+  "storeMobile": "联系电话",
+  "address": "详细地址",
+  "fullAddress": "联系地址",
+  "longitude": "经度",
+  "latitude": "纬度",
+  "tradeTime": "营业时间",
+  "createTime": "添加时间",
+  "createTimePlaceholder": "请输入添加时间",
+  "addStore": "添加自提点",
+  "updateStore": "编辑自提点",
+  "storeDeleteTips": "确定要删除该数据吗？",
   "storeInfo": "自提点信息"
 }

admin/src/addon/shop/lang/zh-cn/delivery.store_edit.json

@@ -1,36 +1,36 @@
 {
-      "storeName":"自提点名称",
-      "storeDesc":"简介",
-      "storeLogo":"自提点logo",
-      "storeMobile":"手机号",
-      "provinceId":"省id",
-      "cityId":"市",
-      "districtId":"县（区）",
-      "address":"详细地址",
-      "fullAddress":"完整地址",
-      "longitude":"经度",
-      "latitude":"纬度",
-      "tradeTime":"营业时间",
-      "createTime":"下单时间",
-      "updateTime":"更新时间",
-      "storeNamePlaceholder":"请输入自提点名称",
-      "storeDescPlaceholder":"请输入简介",
-      "storeLogoPlaceholder":"请上传自提点logo",
-      "storeMobilePlaceholder":"请输入手机号",
-      "provinceIdPlaceholder":"请选择省id",
-      "cityIdPlaceholder":"请选择市",
-      "districtIdPlaceholder":"请选择县（区）",
-      "addressPlaceholder":"请输入详细地址",
-      "fullAddressPlaceholder":"请输入完整地址",
-      "longitudePlaceholder":"请输入经度",
-      "latitudePlaceholder":"请输入纬度",
-      "tradeTimePlaceholder":"请输入营业时间",
+  "storeName": "自提点名称",
+  "storeDesc": "简介",
+  "storeLogo": "自提点logo",
+  "storeMobile": "手机号",
+  "provinceId": "省id",
+  "cityId": "市",
+  "districtId": "县（区）",
+  "address": "详细地址",
+  "fullAddress": "完整地址",
+  "longitude": "经度",
+  "latitude": "纬度",
+  "tradeTime": "营业时间",
+  "createTime": "下单时间",
+  "updateTime": "更新时间",
+  "storeNamePlaceholder": "请输入自提点名称",
+  "storeDescPlaceholder": "请输入简介",
+  "storeLogoPlaceholder": "请上传自提点logo",
+  "storeMobilePlaceholder": "请输入手机号",
+  "provinceIdPlaceholder": "请选择省id",
+  "cityIdPlaceholder": "请选择市",
+  "districtIdPlaceholder": "请选择县（区）",
+  "addressPlaceholder": "请输入详细地址",
+  "fullAddressPlaceholder": "请输入完整地址",
+  "longitudePlaceholder": "请输入经度",
+  "latitudePlaceholder": "请输入纬度",
+  "tradeTimePlaceholder": "请输入营业时间",
   "tradeTimeTips": "例：上午9:00-12:00，下午2:00-6:00",
-      "createTimePlaceholder":"请选择添加时间",
-      "updateTimePlaceholder":"请输入更新时间",
-      "addStore":"添加自提点",
-      "updateStore":"编辑自提点",
-      "storeDeleteTips":"确定要删除该自提点吗？",
+  "createTimePlaceholder": "请选择添加时间",
+  "updateTimePlaceholder": "请输入更新时间",
+  "addStore": "添加自提点",
+  "updateStore": "编辑自提点",
+  "storeDeleteTips": "确定要删除该自提点吗？",
   "storeAddress": "自提点地址",
   "storeAddressPlaceholder": "请选择自提点地址",
   "storeAddressDetail": "自提点详细地址",

admin/src/addon/shop/lang/zh-cn/delivery.template.json

@@ -1,10 +1,10 @@
 {
-	"templateName":"运费模板名称",
-	"templateNamePlaceholder":"请输入运费模板名称",
-	"createTime":"创建时间",
-	"addTemplate":"添加运费模板",
-	"updateTemplate":"编辑运费模板",
-	"templateDeleteTips":"确定要删除该模板吗？",
+  "templateName": "运费模板名称",
+  "templateNamePlaceholder": "请输入运费模板名称",
+  "createTime": "创建时间",
+  "addTemplate": "添加运费模板",
+  "updateTemplate": "编辑运费模板",
+  "templateDeleteTips": "确定要删除该模板吗？",
   "feeTypeName": "计费类型",
   "freeShipping": "指定区域包邮",
   "open": "启用",

admin/src/addon/shop/lang/zh-cn/delivery.template_edit.json

@@ -1,10 +1,10 @@
 {
-	"templateName":"运费模板名称",
-	"templateNamePlaceholder":"请输入运费模板名称",
-	"createTime":"创建时间",
-	"addTemplate":"添加运费模板",
-	"updateTemplate":"编辑运费模板",
-	"templateDeleteTips":"确定要删除该模板吗？",
+  "templateName": "运费模板名称",
+  "templateNamePlaceholder": "请输入运费模板名称",
+  "createTime": "创建时间",
+  "addTemplate": "添加运费模板",
+  "updateTemplate": "编辑运费模板",
+  "templateDeleteTips": "确定要删除该模板吗？",
   "feeTypeName": "计费类型",
   "isDefault": "默认模板",
   "num": "按件",
@@ -32,7 +32,7 @@
   "freeShippingWeight": "包邮重量（kg）",
   "freeShippingVolume": "包邮体积（m³）",
   "freeShippingPrice": "包邮金额",
-	"areaPlaceholder":"请选择地区",
+  "areaPlaceholder": "请选择地区",
   "noDeliveryPlaceholder": "请选择不配送的地区",
   "freeShippingPlaceholder": "请选择包邮的地区",
   "notUnderZero": "不能小于等于0"

admin/src/addon/shop/lang/zh-cn/goods.attr.json

@@ -5,6 +5,6 @@
   "addShopGoodsAttr": "添加参数模板",
   "updateShopGoodsAttr": "编辑参数模板",
   "goodsAttrDeleteTips": "确定要删除该数据吗？",
-  "sortTips":"排序号格式输入错误",
+  "sortTips": "排序号格式输入错误",
   "manage": "管理"
 }

admin/src/addon/shop/lang/zh-cn/goods.brand_list.json

@@ -1,15 +1,15 @@
 {
-      "brandId":"品牌ID",
-      "brandIdPlaceholder":"请输入品牌ID",
-      "brandName":"品牌名称",
-      "brandNamePlaceholder":"请输入品牌名称",
-      "logo":"品牌logo",
-      "logoPlaceholder":"请输入品牌logo",
-      "desc":"品牌介绍",
-      "descPlaceholder":"请输入品牌介绍",
-      "sort":"排序",
-      "sortPlaceholder":"请输入排序",
-      "addBrand":"添加商品品牌",
-      "updateBrand":"编辑商品品牌",
-      "brandDeleteTips":"确定要删除该数据吗？"
+  "brandId": "品牌ID",
+  "brandIdPlaceholder": "请输入品牌ID",
+  "brandName": "品牌名称",
+  "brandNamePlaceholder": "请输入品牌名称",
+  "logo": "品牌logo",
+  "logoPlaceholder": "请输入品牌logo",
+  "desc": "品牌介绍",
+  "descPlaceholder": "请输入品牌介绍",
+  "sort": "排序",
+  "sortPlaceholder": "请输入排序",
+  "addBrand": "添加商品品牌",
+  "updateBrand": "编辑商品品牌",
+  "brandDeleteTips": "确定要删除该数据吗？"
 }

admin/src/addon/shop/lang/zh-cn/goods.category.json

@@ -1,21 +1,21 @@
 {
-      "categoryId":"商品分类id",
-      "categoryIdPlaceholder":"请输入商品分类id",
-      "categoryName":"分类名称",
-      "categoryNamePlaceholder":"请输入分类名称",
-      "image":"分类图片",
-      "imagePlaceholder":"请输入分类图片",
-      "pid":"上级分类",
-      "pidPlaceholder":"请选择上级分类",
-      "categoryFullName":"组装分类名称",
-      "categoryFullNamePlaceholder":"请输入组装分类名称",
-      "isShow":"是否显示",
-      "sort":"排序号",
-      "sortPlaceholder":"请输入排序号",
-      "addCategory":"添加商品分类",
-      "updateCategory":"编辑商品分类",
-      "categoryDeleteTips":"确定要删除该数据吗？",
-      "categoryDeleteTips1":"子级分类也会删除，确定要删除该数据吗？",
+  "categoryId": "商品分类id",
+  "categoryIdPlaceholder": "请输入商品分类id",
+  "categoryName": "分类名称",
+  "categoryNamePlaceholder": "请输入分类名称",
+  "image": "分类图片",
+  "imagePlaceholder": "请输入分类图片",
+  "pid": "上级分类",
+  "pidPlaceholder": "请选择上级分类",
+  "categoryFullName": "组装分类名称",
+  "categoryFullNamePlaceholder": "请输入组装分类名称",
+  "isShow": "是否显示",
+  "sort": "排序号",
+  "sortPlaceholder": "请输入排序号",
+  "addCategory": "添加商品分类",
+  "updateCategory": "编辑商品分类",
+  "categoryDeleteTips": "确定要删除该数据吗？",
+  "categoryDeleteTips1": "子级分类也会删除，确定要删除该数据吗？",
   "spreadGoodsCategory": "推广",
   "goodsCategorySpreadTitle": "商品分类推广",
   "spreadLink": "推广链接",

admin/src/addon/shop/lang/zh-cn/goods.category_config.json

@@ -1,25 +1,25 @@
 {
-    "categoryTemplate":"分类模板",
-    "categoryType":"分类类型",
-    "categorystyleOne":"一级分类",
-    "categorystyleTwo":"二级分类",
-    "pageSettings":"页面设置",
-    "pageTitle":"页面名称",
-    "pageTitlePlaceholder":"请输入页面名称",
-    "searchControl":"搜索栏",
-    "searchTitle":"搜索栏文字",
-    "searchTitlePlaceholder":"请输入搜索栏文字",
-    "open":"开启",
-    "close":"关闭",
-    "goodsStyle":"商品排列",
+  "categoryTemplate": "分类模板",
+  "categoryType": "分类类型",
+  "categorystyleOne": "一级分类",
+  "categorystyleTwo": "二级分类",
+  "pageSettings": "页面设置",
+  "pageTitle": "页面名称",
+  "pageTitlePlaceholder": "请输入页面名称",
+  "searchControl": "搜索栏",
+  "searchTitle": "搜索栏文字",
+  "searchTitlePlaceholder": "请输入搜索栏文字",
+  "open": "开启",
+  "close": "关闭",
+  "goodsStyle": "商品排列",
   "singleCols": "单列",
   "doubleCols": "双列",
-    "sort":"商品排序",
-    "sortPlaceholder":"请选择商品排序",
-    "cartControl":"购物车显示",
-    "cartStyle":"购物车样式",
-    "cartTextPlaceholder":"请输入购物车按钮文字",
-    "cartEvent":"点击按钮",
+  "sort": "商品排序",
+  "sortPlaceholder": "请选择商品排序",
+  "cartControl": "购物车显示",
+  "cartStyle": "购物车样式",
+  "cartTextPlaceholder": "请输入购物车按钮文字",
+  "cartEvent": "点击按钮",
   "detail": "跳转商品详情",
   "cart": "加入购物车",
   "tabGoodsCategory": "商品分类",

admin/src/addon/shop/lang/zh-cn/goods.evaluate.json

@@ -1,38 +1,38 @@
 {
-      "evaluateId":"",
-      "evaluateIdPlaceholder":"请输入",
-      "orderId":"订单id",
-      "orderIdPlaceholder":"请输入订单id",
-      "orderGoodsId":"订单项ID",
-      "orderGoodsIdPlaceholder":"请输入订单项ID",
-      "goodsId":"商品ID",
-      "goodsIdPlaceholder":"请选择商品",
-      "memberId":"会员ID",
-      "memberIdPlaceholder":"请输入会员ID",
-      "content":"评价内容",
-      "contentPlaceholder":"请输入评价内容",
-      "images":"评价图片",
-      "imagesPlaceholder":"请输入评价图片",
-      "isAnonymous":"是否匿名",
+  "evaluateId": "",
+  "evaluateIdPlaceholder": "请输入",
+  "orderId": "订单id",
+  "orderIdPlaceholder": "请输入订单id",
+  "orderGoodsId": "订单项ID",
+  "orderGoodsIdPlaceholder": "请输入订单项ID",
+  "goodsId": "商品ID",
+  "goodsIdPlaceholder": "请选择商品",
+  "memberId": "会员ID",
+  "memberIdPlaceholder": "请输入会员ID",
+  "content": "评价内容",
+  "contentPlaceholder": "请输入评价内容",
+  "images": "评价图片",
+  "imagesPlaceholder": "请输入评价图片",
+  "isAnonymous": "是否匿名",
   "anonymous": "匿名",
   "notAnonymous": "不匿名",
-      "scores":"评价等级",
-      "scoresPlaceholder":"请输入评价分数 1-5",
-      "auditName":"审核状态",
-      "explainFirst":"商家回复",
+  "scores": "评价等级",
+  "scoresPlaceholder": "请输入评价分数 1-5",
+  "auditName": "审核状态",
+  "explainFirst": "商家回复",
   "explainFirstPlaceholder": "请输入商家回复",
-      "createTime":"评价时间",
-      "createTimePlaceholder":"请输入评价时间",
+  "createTime": "评价时间",
+  "createTimePlaceholder": "请输入评价时间",
   "again": "追评",
-      "againTime":"追评时间",
-      "againTimePlaceholder":"请输入追评时间",
-      "isShow":"是否显示",
+  "againTime": "追评时间",
+  "againTimePlaceholder": "请输入追评时间",
+  "isShow": "是否显示",
   "show": "显示",
   "notShow": "不显示",
-      "isShowPlaceholder":"请输入是否显示 1显示 2不显示",
-      "addEvaluate":"添加自评",
-      "updateEvaluate":"编辑商品评价",
-      "evaluateDeleteTips":"确定要删除该数据吗？",
+  "isShowPlaceholder": "请输入是否显示 1显示 2不显示",
+  "addEvaluate": "添加自评",
+  "updateEvaluate": "编辑商品评价",
+  "evaluateDeleteTips": "确定要删除该数据吗？",
   "goodsInfo": "商品信息",
   "memberHead": "会员头像",
   "memberName": "会员名称",

admin/src/addon/shop/lang/zh-cn/goods.evaluate_edit.json

@@ -1,37 +1,37 @@
 {
-      "orderId":"订单id",
-      "orderGoodsId":"订单项ID",
-      "goodsId":"商品ID",
-      "memberId":"会员ID",
-      "content":"评价内容",
-      "images":"评价图片",
-      "isAnonymous":"0 匿名  1不匿名",
-      "scores":"评价分数 1-5",
-      "isAudit":"审核状态 1待审 2通过 3拒绝",
-      "explainFirst":"解释内容",
-      "againContent":"追评内容",
-      "againImages":"追评图片",
-      "againExplain":"追评解释",
-      "againTime":"追评时间",
-      "againIsAudit":"审核状态 1待审 2通过 3拒绝",
-      "isShow":"是否显示 1显示 2不显示",
-      "orderIdPlaceholder":"请输入订单id",
-      "orderGoodsIdPlaceholder":"请输入订单项ID",
-      "goodsIdPlaceholder":"请输入商品ID",
-      "memberIdPlaceholder":"请输入会员ID",
-      "contentPlaceholder":"请输入评价内容",
-      "imagesPlaceholder":"请上传评价图片",
-      "isAnonymousPlaceholder":"请输入0 匿名  1不匿名",
-      "scoresPlaceholder":"请输入评价分数 1-5",
-      "isAuditPlaceholder":"请输入审核状态 1待审 2通过 3拒绝",
-      "explainFirstPlaceholder":"请输入解释内容",
-      "againContentPlaceholder":"请输入追评内容",
-      "againImagesPlaceholder":"请上传追评图片",
-      "againExplainPlaceholder":"请输入追评解释",
-      "againTimePlaceholder":"请输入追评时间",
-      "againIsAuditPlaceholder":"请输入审核状态 1待审 2通过 3拒绝",
-      "isShowPlaceholder":"请输入是否显示 1显示 2不显示",
-      "addEvaluate":"添加商品评价",
-      "updateEvaluate":"编辑商品评价",
-      "evaluateDeleteTips":"确定要删除该商品评价吗？"
+  "orderId": "订单id",
+  "orderGoodsId": "订单项ID",
+  "goodsId": "商品ID",
+  "memberId": "会员ID",
+  "content": "评价内容",
+  "images": "评价图片",
+  "isAnonymous": "0 匿名  1不匿名",
+  "scores": "评价分数 1-5",
+  "isAudit": "审核状态 1待审 2通过 3拒绝",
+  "explainFirst": "解释内容",
+  "againContent": "追评内容",
+  "againImages": "追评图片",
+  "againExplain": "追评解释",
+  "againTime": "追评时间",
+  "againIsAudit": "审核状态 1待审 2通过 3拒绝",
+  "isShow": "是否显示 1显示 2不显示",
+  "orderIdPlaceholder": "请输入订单id",
+  "orderGoodsIdPlaceholder": "请输入订单项ID",
+  "goodsIdPlaceholder": "请输入商品ID",
+  "memberIdPlaceholder": "请输入会员ID",
+  "contentPlaceholder": "请输入评价内容",
+  "imagesPlaceholder": "请上传评价图片",
+  "isAnonymousPlaceholder": "请输入0 匿名  1不匿名",
+  "scoresPlaceholder": "请输入评价分数 1-5",
+  "isAuditPlaceholder": "请输入审核状态 1待审 2通过 3拒绝",
+  "explainFirstPlaceholder": "请输入解释内容",
+  "againContentPlaceholder": "请输入追评内容",
+  "againImagesPlaceholder": "请上传追评图片",
+  "againExplainPlaceholder": "请输入追评解释",
+  "againTimePlaceholder": "请输入追评时间",
+  "againIsAuditPlaceholder": "请输入审核状态 1待审 2通过 3拒绝",
+  "isShowPlaceholder": "请输入是否显示 1显示 2不显示",
+  "addEvaluate": "添加商品评价",
+  "updateEvaluate": "编辑商品评价",
+  "evaluateDeleteTips": "确定要删除该商品评价吗？"
 }

admin/src/addon/shop/lang/zh-cn/goods.list.json

@@ -14,13 +14,13 @@
   "startSaleNumTips": "最低销量输入错误",
   "endSaleNumPlaceholder": "最高销量",
   "endSaleNumTips": "最高销量输入错误",
-  "shopSaleNumTips":"最低销量不能大于最高销量",
+  "shopSaleNumTips": "最低销量不能大于最高销量",
   "skuPrice": "价格",
   "startPricePlaceholder": "最低价格",
   "startPriceTips": "最低价格输入错误",
   "endPricePlaceholder": "最高价格",
   "endPriceTips": "最高价格输入错误",
-  "shopPriceTips":"最低价格不能大于最高价格",
+  "shopPriceTips": "最低价格不能大于最高价格",
   "statusOn": "销售中",
   "statusOff": "仓库中",
   "statusAll": "全部商品",
@@ -40,7 +40,7 @@
   "addGoods": "添加商品",
   "statusActionOn": "上架",
   "statusActionOff": "下架",
-  "statusChangeTips":"确定要下架该商品吗？",
+  "statusChangeTips": "确定要下架该商品吗？",
   "spreadGoods": "推广",
   "copyGoods": "复制",
 
@@ -105,7 +105,6 @@
   "discountHint": "会员折扣说明：按照默认会员等级折扣优惠",
   "fixedPriceHint": "会员价说明：指定优惠价格，商品未参与活动时，按照会员价优惠，若商品参与活动，则以活动价为准",
 
-
   "addGoodsLabel": "添加商品标签",
   "addGoodsService": "添加商品服务",
   "addGoodsCategory": "添加分类",
@@ -133,9 +132,9 @@
   "addDeliveryTemplateId": "添加运费模板",
   "deliveryType": "配送方式",
   "deliveryTypePlaceholder": "请选择配送方式",
-  "yuan":"元",
-  "label":"商品标签",
-  "service":"商品服务",
+  "yuan": "元",
+  "label": "商品标签",
+  "service": "商品服务",
   "virtualSaleNum": "虚拟销量",
   "goodsBrand": "商品品牌",
   "goodsPoster": "商品海报",

admin/src/addon/shop/lang/zh-cn/goods.real_edit.json

@@ -11,9 +11,9 @@
   "subTitlePlaceholder": "请输入副标题",
   "subTitleMaxLengthTips": "副标题不能超过80个字符",
   "goodsImage": "商品图片",
-  "goodsImagePlaceholder":"请上传商品图片",
+  "goodsImagePlaceholder": "请上传商品图片",
   "goodsVideo": "商品视频",
-  "goodsVideoPlaceholder":"请上传商品视频",
+  "goodsVideoPlaceholder": "请上传商品视频",
   "goodsCategory": "商品分类",
   "refresh": "刷新",
   "addGoodsCategory": "添加分类",
@@ -87,21 +87,21 @@
   "deliveryTab": "配送设置",
   "deliveryType": "配送方式",
   "deliveryTypePlaceholder": "请选择配送方式",
-  "pleaseSelectSku":"请先选择商品规格",
-  "isLimit":"是否限购",
-  "isLimitTips":"启用限购后，购买商品时，会对该商品购买量做限制判断。",
-  "limitType":"限购类型",
-  "limitTypeTips":"单次限购是针对于每次下单不能超过限购数量，单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。",
-  "singleTime":"单次限购",
-  "singlePerson":"单人限购",
-  "maxBuy":"限购数量",
-  "maxBuyPlaceholder":"请输入限购数量",
+  "pleaseSelectSku": "请先选择商品规格",
+  "isLimit": "是否限购",
+  "isLimitTips": "启用限购后，购买商品时，会对该商品购买量做限制判断。",
+  "limitType": "限购类型",
+  "limitTypeTips": "单次限购是针对于每次下单不能超过限购数量，单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。",
+  "singleTime": "单次限购",
+  "singlePerson": "单人限购",
+  "maxBuy": "限购数量",
+  "maxBuyPlaceholder": "请输入限购数量",
   "maxBuyTips": "[限购数量]格式输入错误",
-  "maxBuyWarnTips":"限购数量超出商品库存时，买家将无法购买该商品",
+  "maxBuyWarnTips": "限购数量超出商品库存时，买家将无法购买该商品",
   "maxBuyNotZeroTips": "限购数量不能小于1",
-  "minBuy":"起购数量",
-  "minBuyTips":"起购数量超出商品库存时，买家将无法购买该商品",
-  "minBuyFormatErrorTips":"[起购数量]格式输入错误",
+  "minBuy": "起购数量",
+  "minBuyTips": "起购数量超出商品库存时，买家将无法购买该商品",
+  "minBuyFormatErrorTips": "[起购数量]格式输入错误",
   "minBuyNotZeroTips": "起购数量不能小于0",
   "minBuyGreaterThanMaxBuyTips": "起购数量不能大于限购数量",
 

admin/src/addon/shop/lang/zh-cn/goods.service.json

@@ -1,10 +1,10 @@
 {
-      "serviceName":"服务名称",
-      "serviceNamePlaceholder":"请输入服务名称",
-      "desc":"描述",
-      "descPlaceholder":"请输入描述",
-      "addServe":"添加商品服务",
-      "updateServe":"编辑商品服务",
-      "serveDeleteTips":"确定要删除该数据吗？",
+  "serviceName": "服务名称",
+  "serviceNamePlaceholder": "请输入服务名称",
+  "desc": "描述",
+  "descPlaceholder": "请输入描述",
+  "addServe": "添加商品服务",
+  "updateServe": "编辑商品服务",
+  "serveDeleteTips": "确定要删除该数据吗？",
   "imagePlaceholder": "请上传服务图片"
 }

admin/src/addon/shop/lang/zh-cn/goods.virtual_edit.json

@@ -11,9 +11,9 @@
   "subTitlePlaceholder": "请输入副标题",
   "subTitleMaxLengthTips": "副标题不能超过80个字符",
   "goodsImage": "商品图片",
-  "goodsImagePlaceholder":"请上传商品图片",
+  "goodsImagePlaceholder": "请上传商品图片",
   "goodsVideo": "商品视频",
-  "goodsVideoPlaceholder":"请上传商品视频",
+  "goodsVideoPlaceholder": "请上传商品视频",
   "goodsCategory": "商品分类",
   "refresh": "刷新",
   "addGoodsCategory": "添加分类",
@@ -81,20 +81,20 @@
   "maxAddSpecTips": "最多添加5个规格项",
   "pleaseEditSpecPlaceholder": "请编辑规格信息",
   "refreshSuccess": "刷新成功",
-  "isLimit":"是否限购",
-  "isLimitTips":"启用限购后，购买商品时，会对该商品购买量做限制判断。",
-  "limitType":"限购类型",
-  "limitTypeTips":"单次限购是针对于每次下单不能超过限购数量，单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。",
-  "singleTime":"单次限购",
-  "singlePerson":"单人限购",
-  "maxBuy":"限购数量",
-  "maxBuyPlaceholder":"请输入限购数量",
+  "isLimit": "是否限购",
+  "isLimitTips": "启用限购后，购买商品时，会对该商品购买量做限制判断。",
+  "limitType": "限购类型",
+  "limitTypeTips": "单次限购是针对于每次下单不能超过限购数量，单人限购是针对于会员账号购买这个商品的总数不能超过限购数量。",
+  "singleTime": "单次限购",
+  "singlePerson": "单人限购",
+  "maxBuy": "限购数量",
+  "maxBuyPlaceholder": "请输入限购数量",
   "maxBuyTips": "[限购数量]格式输入错误",
-  "maxBuyWarnTips":"限购数量超出商品库存时，买家将无法购买该商品",
+  "maxBuyWarnTips": "限购数量超出商品库存时，买家将无法购买该商品",
   "maxBuyNotZeroTips": "限购数量不能小于1",
-  "minBuy":"起购数量",
-  "minBuyTips":"起购数量超出商品库存时，买家将无法购买该商品",
-  "minBuyFormatErrorTips":"[起购数量]格式输入错误",
+  "minBuy": "起购数量",
+  "minBuyTips": "起购数量超出商品库存时，买家将无法购买该商品",
+  "minBuyFormatErrorTips": "[起购数量]格式输入错误",
   "minBuyNotZeroTips": "起购数量不能小于0",
   "minBuyGreaterThanMaxBuyTips": "起购数量不能大于限购数量",
 
@@ -124,7 +124,6 @@
   "specValueNameRepeat": "规格值不能重复",
   "lackDefaultSpec": "商品缺少默认规格",
 
-
   "setDeliverGoods": "发货设置",
   "autoDeliverGoods": "自动发货",
   "handDeliverGoods": "手动发货",
@@ -163,5 +162,4 @@
   "fixedPriceHint": "会员价说明：指定优惠价格，商品未参与活动时，按照会员价优惠，若商品参与活动，则以活动价为准",
 
   "participateInActiveDisableTips": "商品正在参与营销活动，禁止操作"
-
 }

admin/src/addon/shop/lang/zh-cn/index.index.json

@@ -1,20 +1,20 @@
 {
-	"realtimeOverview":"实时概况",
-	"updateTime":"更新时间:",
-	"todayOrderCount":"今日订单数",
-	"todayOrderSale":"今日销售额",
-	"todayAddMemberCount":"今日退款金额",
-	"todayBrowseCount":"今日浏览量",
-	"yesterday":"昨日:",
-	"orderCount":"订单总数",
-	"salesTotal":"销售总额(元)",
-	"memberTotal":"退款金额",
-	"browseTotal":"总浏览量",
-	"agentMatters":"待办事项",
-	"waitPayOrder":"待付款订单",
-	"waitDeliveryOrder":"待发货订单",
-	"waitTakeOrder":"待收货订单",
-	"refundOrder":"退款订单",
-	"saleGoodsNum":"出售商品数量",
-	"warehouseGoodsNum":"仓库商品数量"
+  "realtimeOverview": "实时概况",
+  "updateTime": "更新时间:",
+  "todayOrderCount": "今日订单数",
+  "todayOrderSale": "今日销售额",
+  "todayAddMemberCount": "今日退款金额",
+  "todayBrowseCount": "今日浏览量",
+  "yesterday": "昨日:",
+  "orderCount": "订单总数",
+  "salesTotal": "销售总额(元)",
+  "memberTotal": "退款金额",
+  "browseTotal": "总浏览量",
+  "agentMatters": "待办事项",
+  "waitPayOrder": "待付款订单",
+  "waitDeliveryOrder": "待发货订单",
+  "waitTakeOrder": "待收货订单",
+  "refundOrder": "退款订单",
+  "saleGoodsNum": "出售商品数量",
+  "warehouseGoodsNum": "仓库商品数量"
 }

admin/src/addon/shop/lang/zh-cn/marketing.coupon.add.json

@@ -26,7 +26,7 @@
   "receiveTime": "领取时间",
   "limitedTime": "限时",
   "unlimitedTime": "不限时",
-    "days":"天数",
+  "days": "天数",
   "times": "固定时间",
   "validType": "有效期",
   "lengthPlaceholder": "请输入使用时间",

admin/src/addon/shop/lang/zh-cn/marketing.coupon.edit.json

@@ -26,7 +26,7 @@
   "receiveTime": "领取时间",
   "limitedTime": "限时",
   "unlimitedTime": "不限时",
-    "days":"天数",
+  "days": "天数",
   "times": "固定时间",
   "validType": "使用时间",
   "lengthPlaceholder": "请输入使用时间",

admin/src/addon/shop/lang/zh-cn/marketing.coupon.list.json

@@ -18,30 +18,30 @@
   "couponDeleteTips": "确定要删除该优惠券吗？",
   "couponColseTips": "确定要关闭该优惠券吗？关闭后将不可领取，若会员已领取将变为失效",
   "validType": "有效期",
-    "statusName":"状态",
+  "statusName": "状态",
   "receiveTypeTime": "领取有效期",
-    "spreadGoods":"推广",
-    "close":"关闭",
-    "couponSpreadTitle":"优惠券推广",
+  "spreadGoods": "推广",
+  "close": "关闭",
+  "couponSpreadTitle": "优惠券推广",
   "downloadQrcode": "下载二维码",
   "spreadLink": "推广链接",
   "receiveUseCount": "已使用",
 
-    "collectionCoupon":"领取记录",
+  "collectionCoupon": "领取记录",
   "collectionTtitle": "优惠券名称",
   "userName": "领用会员",
   "collectionReceiveType": "领用方式",
   "createTime": "领取时间",
   "expireTime": "到期时间",
-    "status":"当前状态",
+  "status": "当前状态",
   "useTime": "使用时间",
-    "validity":"使用有效期",
+  "validity": "使用有效期",
   "mobile": "手机号",
   "memberInfo": "会员信息",
-    "memberInfoPlaceholder":"请输入会员昵称/手机号",
+  "memberInfoPlaceholder": "请输入会员昵称/手机号",
   "collectionSumCount": "发放数量",
   "couponInfo": "优惠券基本信息",
-    "receiveCount":"已领取",
-    "receiveExpireCount":"已过期",
+  "receiveCount": "已领取",
+  "receiveExpireCount": "已过期",
   "showOrder": "查看订单"
 }

admin/src/addon/shop/lang/zh-cn/marketing.discount.add.json

@@ -1,38 +1,38 @@
 {
-    "editDiscount":"添加限时折扣",
+  "editDiscount": "添加限时折扣",
   "name": "活动名称",
-    "namePlaceholder":"请输入活动名称",
-    "nameTip":"活动标题用于在手机或者电脑前端，建议输入长度不要大于5",
-    "title":"标题",
-    "titlePlaceholder":"请输入活动标题",
-    "titleTip":"活动标题用户展示在手机或者电脑前端展示使用，建议输入长度不要大于5",
+  "namePlaceholder": "请输入活动名称",
+  "nameTip": "活动标题用于在手机或者电脑前端，建议输入长度不要大于5",
+  "title": "标题",
+  "titlePlaceholder": "请输入活动标题",
+  "titleTip": "活动标题用户展示在手机或者电脑前端展示使用，建议输入长度不要大于5",
   "activityTime": "活动时间",
-    "discountTimePlaceholder":"请选择活动时间",
+  "discountTimePlaceholder": "请选择活动时间",
   "selectProduct": "选择商品",
   "selectProductPlaceholder": "请选择商品",
   "noSpaceAllowed": "内容不能为空",
   "batchOperation": "批量设置",
   "batchEmptySelectedGoodsTips": "请选择要操作的商品",
-    "discountType":"折扣类型",
-    "price":"原价",
-    "discounts":"打折",
-    "discountsTips":"[打折]格式错误",
-    "discountsTipsTwo":"打折折扣不可小于0",
-    "discountsTipsThree":"打折折扣不可大于9.9",
-    "discountsPlaceholder":"请输入打折折扣",
-    "reduceMoney":"减钱",
-    "reduceMoneyTips":"[减钱]格式错误",
-    "reduceMoneyTipsTwo":"减钱金额不可小于等于0",
-    "reduceMoneyTipsThree":"减钱金额不可大于等于原价金额",
-    "reduceMoneyPlaceholder":"请输入减钱金额",
-    "promotional":"促销价",
-    "promotionalTips":"[促销价]格式错误",
-    "promotionalTipsTwo":"促销价金额不可小于等于0",
-    "promotionalTipsThree":"促销价金额不可大于等于原价金额",
-    "promotionalPlaceholder":"请输入促销价",
-    "delete":"删除",
-    "enabled":"设为参与",
-    "noEnabled":"设为不参与",
-    "skuDiscountSettings":"规格折扣设置",
-    "skuDiscountSettingsPlaceholder":"请输入规格折扣设置"
+  "discountType": "折扣类型",
+  "price": "原价",
+  "discounts": "打折",
+  "discountsTips": "[打折]格式错误",
+  "discountsTipsTwo": "打折折扣不可小于0",
+  "discountsTipsThree": "打折折扣不可大于9.9",
+  "discountsPlaceholder": "请输入打折折扣",
+  "reduceMoney": "减钱",
+  "reduceMoneyTips": "[减钱]格式错误",
+  "reduceMoneyTipsTwo": "减钱金额不可小于等于0",
+  "reduceMoneyTipsThree": "减钱金额不可大于等于原价金额",
+  "reduceMoneyPlaceholder": "请输入减钱金额",
+  "promotional": "促销价",
+  "promotionalTips": "[促销价]格式错误",
+  "promotionalTipsTwo": "促销价金额不可小于等于0",
+  "promotionalTipsThree": "促销价金额不可大于等于原价金额",
+  "promotionalPlaceholder": "请输入促销价",
+  "delete": "删除",
+  "enabled": "设为参与",
+  "noEnabled": "设为不参与",
+  "skuDiscountSettings": "规格折扣设置",
+  "skuDiscountSettingsPlaceholder": "请输入规格折扣设置"
 }

admin/src/addon/shop/lang/zh-cn/marketing.discount.config.json

@@ -1,8 +1,8 @@
 {
-    "headTitle":"顶部广告图",
-    "image":"图片上传",
-    "imagePlaceholder":"请上传图片",
-    "toLink":"跳转链接",
-    "toLinkPlaceholder":"请输入跳转链接",
-    "addConfigList":"添加广告图"
+  "headTitle": "顶部广告图",
+  "image": "图片上传",
+  "imagePlaceholder": "请上传图片",
+  "toLink": "跳转链接",
+  "toLinkPlaceholder": "请输入跳转链接",
+  "addConfigList": "添加广告图"
 }

admin/src/addon/shop/lang/zh-cn/marketing.discount.edit.json

@@ -1,38 +1,38 @@
 {
-    "editDiscount":"编辑限时折扣",
+  "editDiscount": "编辑限时折扣",
   "name": "活动名称",
-    "namePlaceholder":"请输入活动名称",
-    "nameTip":"活动名称用于展示在商家后台管理",
-    "title":"标题",
-    "titlePlaceholder":"请输入活动标题",
-    "titleTip":"活动标题用于在手机或者电脑前端，建议输入长度不要大于5",
+  "namePlaceholder": "请输入活动名称",
+  "nameTip": "活动名称用于展示在商家后台管理",
+  "title": "标题",
+  "titlePlaceholder": "请输入活动标题",
+  "titleTip": "活动标题用于在手机或者电脑前端，建议输入长度不要大于5",
   "activityTime": "活动时间",
-    "discountTimePlaceholder":"请选择活动时间",
-    "noSpaceAllowed":"内容不能为空",
+  "discountTimePlaceholder": "请选择活动时间",
+  "noSpaceAllowed": "内容不能为空",
   "selectProduct": "选择商品",
   "selectProductPlaceholder": "请选择商品",
   "batchOperation": "批量设置",
   "batchEmptySelectedGoodsTips": "请选择要操作的商品",
-    "discountType":"折扣类型",
-    "price":"原价",
-    "discounts":"打折",
-    "discountsTips":"[打折]格式错误",
-    "discountsTipsTwo":"打折折扣不可小于0",
-    "discountsTipsThree":"打折折扣不可大于9.9",
-    "discountsPlaceholder":"请输入打折折扣",
-    "reduceMoney":"减钱",
-    "reduceMoneyTips":"[减钱]格式错误",
-    "reduceMoneyTipsTwo":"减钱金额不可小于等于0",
-    "reduceMoneyTipsThree":"减钱金额不可大于等于原价金额",
-    "reduceMoneyPlaceholder":"请输入减钱金额",
-    "promotional":"促销价",
-    "promotionalTips":"[促销价]格式错误",
-    "promotionalTipsTwo":"促销价金额不可小于等于0",
-    "promotionalTipsThree":"促销价金额不可大于等于原价金额",
-    "promotionalPlaceholder":"请输入促销价",
-    "delete":"删除",
-    "enabled":"设为参与",
-    "noEnabled":"设为不参与",
-    "skuDiscountSettings":"规格折扣设置",
-    "skuDiscountSettingsPlaceholder":"请输入规格折扣设置"
+  "discountType": "折扣类型",
+  "price": "原价",
+  "discounts": "打折",
+  "discountsTips": "[打折]格式错误",
+  "discountsTipsTwo": "打折折扣不可小于0",
+  "discountsTipsThree": "打折折扣不可大于9.9",
+  "discountsPlaceholder": "请输入打折折扣",
+  "reduceMoney": "减钱",
+  "reduceMoneyTips": "[减钱]格式错误",
+  "reduceMoneyTipsTwo": "减钱金额不可小于等于0",
+  "reduceMoneyTipsThree": "减钱金额不可大于等于原价金额",
+  "reduceMoneyPlaceholder": "请输入减钱金额",
+  "promotional": "促销价",
+  "promotionalTips": "[促销价]格式错误",
+  "promotionalTipsTwo": "促销价金额不可小于等于0",
+  "promotionalTipsThree": "促销价金额不可大于等于原价金额",
+  "promotionalPlaceholder": "请输入促销价",
+  "delete": "删除",
+  "enabled": "设为参与",
+  "noEnabled": "设为不参与",
+  "skuDiscountSettings": "规格折扣设置",
+  "skuDiscountSettingsPlaceholder": "请输入规格折扣设置"
 }

admin/src/addon/shop/lang/zh-cn/marketing.discount.list.json

@@ -1,18 +1,18 @@
 {
-    "addDiscount":"添加限时折扣",
-    "name":"名称",
-    "namePlaceholder":"请输入活动名称",
-    "title":"标题",
-    "status":"状态",
-    "statusPlaceholder":"请选择状态",
-    "paymentAmount":"支付金额",
-    "memberCount":"会员数",
-    "orderCount":"订单数",
-    "discountTime":"活动时间",
-    "detail":"详情",
-    "close":"关闭",
-    "closeTips":"活动正在进行中，是否确认关闭当前活动？",
-    "deleteTips":"是否确认删除当前活动",
+  "addDiscount": "添加限时折扣",
+  "name": "名称",
+  "namePlaceholder": "请输入活动名称",
+  "title": "标题",
+  "status": "状态",
+  "statusPlaceholder": "请选择状态",
+  "paymentAmount": "支付金额",
+  "memberCount": "会员数",
+  "orderCount": "订单数",
+  "discountTime": "活动时间",
+  "detail": "详情",
+  "close": "关闭",
+  "closeTips": "活动正在进行中，是否确认关闭当前活动？",
+  "deleteTips": "是否确认删除当前活动",
   "baseInfo": "基础信息",
   "createTime": "创建时间",
   "startTime": "活动开始时间",

admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_add.json

@@ -1,66 +1,66 @@
 {
-    "addGoods":"添加商品",
-    "baseInfo":"基础设置",
-    "goodsType":"商品类型",
-    "goodsName":"商品名称",
-    "goodsNamePlaceholder":"请输入商品名称",
-    "goodsTitle":"副标题",
-    "goodsTitlePlaceholder":"请输入副标题",
-    "image":"商品图片",
-    "imagePlaceholder":"请选择商品图片",
+  "addGoods": "添加商品",
+  "baseInfo": "基础设置",
+  "goodsType": "商品类型",
+  "goodsName": "商品名称",
+  "goodsNamePlaceholder": "请输入商品名称",
+  "goodsTitle": "副标题",
+  "goodsTitlePlaceholder": "请输入副标题",
+  "image": "商品图片",
+  "imagePlaceholder": "请选择商品图片",
   "selectProduct": "选择商品",
   "selectGoodsPlaceholder": "请选择商品",
-    "goodsStatus":"商品状态",
-    "goodsSelect":"选择商品",
-    "redemptionSettings":"积分设置",
+  "goodsStatus": "商品状态",
+  "goodsSelect": "选择商品",
+  "redemptionSettings": "积分设置",
 
   "batchOperation": "批量设置",
   "batchEmptySelectedGoodsTips": "请选择要操作的商品",
-    "goodsSelectPopupGoodsInfo":"商品信息",
-    "price":"销售价",
-    "stock":"兑换库存",
-    "stockPlaceholder":"请输入兑换库存",
-    "stockTips":"[兑换库存]格式错误",
-    "stockTipsTwo":"兑换库存不可小于等于0",
-    "stockTipsThree":"兑换限制数量不可大于商品库存",
-    "limit":"兑换限制",
-    "limitPlaceholder":"请输入兑换限制",
-    "limitTips":"[兑换限制]格式错误",
-    "limitTipsTwo":"兑换限制数量不可小于等于0",
-    "limitTipsThree":"兑换限制数量不能大于兑换库存",
-    "limitUnit":"件/人",
-    "integralUnit":"积分",
-    "prickUnit":"元",
-    "pointPlaceholder":"请输入积分积分",
-    "pointTips":"[积分]格式错误",
-    "pointTipsTwo":"积分不可小于等于0",
-    "money":"兑换价",
-    "newPrice":"价格",
-    "moneyTips":"[价格]格式错误",
-    "moneyTipsTwo":"价格不可小于0",
-    "limitRules":"每人每单可兑换件数",
+  "goodsSelectPopupGoodsInfo": "商品信息",
+  "price": "销售价",
+  "stock": "兑换库存",
+  "stockPlaceholder": "请输入兑换库存",
+  "stockTips": "[兑换库存]格式错误",
+  "stockTipsTwo": "兑换库存不可小于等于0",
+  "stockTipsThree": "兑换限制数量不可大于商品库存",
+  "limit": "兑换限制",
+  "limitPlaceholder": "请输入兑换限制",
+  "limitTips": "[兑换限制]格式错误",
+  "limitTipsTwo": "兑换限制数量不可小于等于0",
+  "limitTipsThree": "兑换限制数量不能大于兑换库存",
+  "limitUnit": "件/人",
+  "integralUnit": "积分",
+  "prickUnit": "元",
+  "pointPlaceholder": "请输入积分积分",
+  "pointTips": "[积分]格式错误",
+  "pointTipsTwo": "积分不可小于等于0",
+  "money": "兑换价",
+  "newPrice": "价格",
+  "moneyTips": "[价格]格式错误",
+  "moneyTipsTwo": "价格不可小于0",
+  "limitRules": "每人每单可兑换件数",
 
-    "couponSelect":"选择优惠券",
-    "couponSelectPlaceholder":"请选择优惠券",
-    "couponName":"优惠券名称",
-    "couponType":"类型",
-    "couponPrice":"面值",
-    "sumCount":"总库存",
+  "couponSelect": "选择优惠券",
+  "couponSelectPlaceholder": "请选择优惠券",
+  "couponName": "优惠券名称",
+  "couponType": "类型",
+  "couponPrice": "面值",
+  "sumCount": "总库存",
   "threshold": "使用门槛",
   "validType": "有效期",
   "receiveTypeTime": "领取有效期",
 
-    "balance":"兑换余额",
-    "balancePlaceholder":"请输入兑换余额",
-    "balanceTips":"[兑换余额]格式错误",
-    "balanceTipsTwo":"兑换余额不可小于等于0",
-    "balanceType":"余额类型",
+  "balance": "兑换余额",
+  "balancePlaceholder": "请输入兑换余额",
+  "balanceTips": "[兑换余额]格式错误",
+  "balanceTipsTwo": "兑换余额不可小于等于0",
+  "balanceType": "余额类型",
 
-    "goodsSkuTitle":"选择商品规格",
-    "goodsSkuPlaceholder":"请选择商品规格",
-    "goodsStock":"库存",
-    "enabled":"设为参与",
-    "noEnabled":"设为不参与",
-    "noEnabledTip":"请至少设置一个规格参与",
-    "goodsDetail":"商品详情"
+  "goodsSkuTitle": "选择商品规格",
+  "goodsSkuPlaceholder": "请选择商品规格",
+  "goodsStock": "库存",
+  "enabled": "设为参与",
+  "noEnabled": "设为不参与",
+  "noEnabledTip": "请至少设置一个规格参与",
+  "goodsDetail": "商品详情"
 }

admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_edit.json

@@ -1,67 +1,66 @@
 {
-    "editGoods":"编辑商品",
-    "baseInfo":"基础设置",
-    "goodsType":"商品类型",
-    "goodsName":"商品名称",
-    "goodsNamePlaceholder":"请输入商品名称",
-    "goodsTitle":"副标题",
-    "goodsTitlePlaceholder":"请输入副标题",
-    "image":"商品图片",
-    "imagePlaceholder":"请选择商品图片",
+  "editGoods": "编辑商品",
+  "baseInfo": "基础设置",
+  "goodsType": "商品类型",
+  "goodsName": "商品名称",
+  "goodsNamePlaceholder": "请输入商品名称",
+  "goodsTitle": "副标题",
+  "goodsTitlePlaceholder": "请输入副标题",
+  "image": "商品图片",
+  "imagePlaceholder": "请选择商品图片",
   "selectProduct": "选择商品",
   "selectGoodsPlaceholder": "请选择商品",
-    "goodsStatus":"商品状态",
-    "goodsSelect":"选择商品",
-    "redemptionSettings":"积分设置",
+  "goodsStatus": "商品状态",
+  "goodsSelect": "选择商品",
+  "redemptionSettings": "积分设置",
 
   "batchOperation": "批量设置",
   "batchEmptySelectedGoodsTips": "请选择要操作的商品",
-    "goodsSelectPopupGoodsInfo":"商品信息",
-    "price":"销售价",
-    "stock":"兑换库存",
-    "stockPlaceholder":"请输入兑换库存",
-    "stockTips":"[兑换库存]格式错误",
-    "stockTipsTwo":"兑换库存不可小于等于0",
-    "stockTipsThree":"兑换限制数量不可大于商品库存",
-    "limit":"兑换限制",
-    "limitPlaceholder":"请输入兑换限制",
-    "limitTips":"[兑换限制]格式错误",
-    "limitTipsTwo":"兑换限制数量不可小于等于0",
-    "limitTipsThree":"兑换限制数量不能大于兑换库存",
-    "limitUnit":"件/人",
-    "integralUnit":"积分",
-    "prickUnit":"元",
-    "pointPlaceholder":"请输入积分积分",
-    "pointTips":"[积分]格式错误",
-    "pointTipsTwo":"积分不可小于等于0",
-    "money":"兑换价",
-    "newPrice":"价格",
-    "moneyTips":"[价格]格式错误",
-    "moneyTipsTwo":"价格不可小于0",
-    "limitRules":"每人每单可兑换件数",
+  "goodsSelectPopupGoodsInfo": "商品信息",
+  "price": "销售价",
+  "stock": "兑换库存",
+  "stockPlaceholder": "请输入兑换库存",
+  "stockTips": "[兑换库存]格式错误",
+  "stockTipsTwo": "兑换库存不可小于等于0",
+  "stockTipsThree": "兑换限制数量不可大于商品库存",
+  "limit": "兑换限制",
+  "limitPlaceholder": "请输入兑换限制",
+  "limitTips": "[兑换限制]格式错误",
+  "limitTipsTwo": "兑换限制数量不可小于等于0",
+  "limitTipsThree": "兑换限制数量不能大于兑换库存",
+  "limitUnit": "件/人",
+  "integralUnit": "积分",
+  "prickUnit": "元",
+  "pointPlaceholder": "请输入积分积分",
+  "pointTips": "[积分]格式错误",
+  "pointTipsTwo": "积分不可小于等于0",
+  "money": "兑换价",
+  "newPrice": "价格",
+  "moneyTips": "[价格]格式错误",
+  "moneyTipsTwo": "价格不可小于0",
+  "limitRules": "每人每单可兑换件数",
 
-    
-    "couponSelect":"选择优惠券",
-    "couponSelectPlaceholder":"请选择优惠券",
-    "couponName":"优惠券名称",
-    "couponType":"类型",
-    "couponPrice":"面值",
-    "sumCount":"总库存",
+  "couponSelect": "选择优惠券",
+  "couponSelectPlaceholder": "请选择优惠券",
+  "couponName": "优惠券名称",
+  "couponType": "类型",
+  "couponPrice": "面值",
+  "sumCount": "总库存",
   "threshold": "使用门槛",
   "validType": "有效期",
   "receiveTypeTime": "领取有效期",
 
-    "balance":"兑换余额",
-    "balancePlaceholder":"请输入兑换余额",
-    "balanceTips":"[兑换余额]格式错误",
-    "balanceTipsTwo":"兑换余额不可小于等于0",
-    "balanceType":"余额类型",
+  "balance": "兑换余额",
+  "balancePlaceholder": "请输入兑换余额",
+  "balanceTips": "[兑换余额]格式错误",
+  "balanceTipsTwo": "兑换余额不可小于等于0",
+  "balanceType": "余额类型",
 
-    "goodsSkuTitle":"选择商品规格",
-    "goodsSkuPlaceholder":"请选择商品规格",
-    "goodsStock":"库存",
-    "enabled":"设为参与",
-    "noEnabled":"设为不参与",
-    "noEnabledTip":"请至少设置一个规格参与",
-    "goodsDetail":"商品详情"
+  "goodsSkuTitle": "选择商品规格",
+  "goodsSkuPlaceholder": "请选择商品规格",
+  "goodsStock": "库存",
+  "enabled": "设为参与",
+  "noEnabled": "设为不参与",
+  "noEnabledTip": "请至少设置一个规格参与",
+  "goodsDetail": "商品详情"
 }

admin/src/addon/shop/lang/zh-cn/marketing.exchange.goods_list.json

@@ -1,27 +1,27 @@
 {
-    "addGoods":"添加商品",
-    "goods":"商品",
-    "goodsName":"商品名称",
-    "goodsNamePlaceholder":"请输入商品名称",
-    "status":"状态",
-    "statusPlaceholder":"请选择状态",
-    "goodsType":"商品类型",
-    "exchangePrice":"兑换价格",
-    "pointUnit":"积分",
-    "priceUnit":"元",
-    "redeemedAndSurplus":"已兑/剩余",
-    "deleteTips":"是否确认删除当前商品",
-    "createTime":"创建时间",
+  "addGoods": "添加商品",
+  "goods": "商品",
+  "goodsName": "商品名称",
+  "goodsNamePlaceholder": "请输入商品名称",
+  "status": "状态",
+  "statusPlaceholder": "请选择状态",
+  "goodsType": "商品类型",
+  "exchangePrice": "兑换价格",
+  "pointUnit": "积分",
+  "priceUnit": "元",
+  "redeemedAndSurplus": "已兑/剩余",
+  "deleteTips": "是否确认删除当前商品",
+  "createTime": "创建时间",
   "spreadGoods": "推广",
   "copyGoods": "复制",
   "spreadLink": "推广链接",
   "copy": "复制",
   "downloadQrcode": "下载二维码",
   "goodsSpreadTitle": "积分商品推广",
-    "up":"上架",
-    "upTips":"是否确认上架当前商品",
-    "down":"下架",
-    "downTips":"是否确认下架当前商品",
-    "startDate":"开始时间",
-    "endDate":"结束时间"
+  "up": "上架",
+  "upTips": "是否确认上架当前商品",
+  "down": "下架",
+  "downTips": "是否确认下架当前商品",
+  "startDate": "开始时间",
+  "endDate": "结束时间"
 }

admin/src/addon/shop/lang/zh-cn/marketing.exchange.order_list.json

@@ -1,5 +1,5 @@
 {
-    "orderNo":"订单编号",
+  "orderNo": "订单编号",
   "orderNoPlaceholder": "请输入订单编号",
   "orderStatus": "订单状态",
   "orderStatusPlaceholder": "请选择订单状态",
@@ -51,5 +51,5 @@
   "exportOrderType": "导出订单类型",
   "shopOrder": "订单数据表",
   "shopOrderGoods": "订单商品表",
-    "point":"积分"
+  "point": "积分"
 }

admin/src/addon/shop/lang/zh-cn/marketing.manjian.edit.json

@@ -84,5 +84,5 @@
   "limitTipsThree": "必须大于上一层级的优惠门槛",
   "ruleTypeTips": "阶梯优惠根据设定的门槛逐级增加优惠，达到特定层级门槛即可享受对应优惠，最高可设5个层级。",
   "ruleTypeTipsTwo": "循环优惠指每次达到门槛即获赠一次优惠，无次数上限，需合理设置门槛。",
-  "goodsOffTips":"该商品已下架"
+  "goodsOffTips": "该商品已下架"
 }

admin/src/addon/shop/lang/zh-cn/marketing.newcomer.config.json

@@ -1,45 +1,45 @@
 {
-    "basicInfoTab":"基础设置",
-    "bannerList":"顶部广告图",
-    "activeStatus":"是否启用",
-    "validityType":"有效期",
-    "validityDay":"天数",
-    "validityDayPlaceholder":"请输入有效天数",
-    "validityDayTips":"有效天数不可小于等于0",
-    "validityDayTipsLeft":"达成门槛立即生效，",
-    "validityDayTipsRight":"天有效期",
-    "validityTime":"固定时间",
-    "validityTimePlaceholder":"请选择有效期截止时间",
-    "validityTimePlaceholderTwo":"请先选择参与门槛时间",
-    "validityTimePlaceholderThree":"有效期截止时间不可小于参与门槛时间",
-    "validityTimeTips":"达成门槛立即生效，有效期截止为",
-    "validityTimeTipsTwo":"修改有效期将同步更新所有未参与活动用户的结束时间",
-    "participationWay":"参与门槛",
-    "neverOrder":"从未下过单的会员",
-    "assignTimeOrder":"指定时间内未下过单的会员",
-    "assignTimeRegister":"指定时间内注册的会员",
-    "appointTimePlaceholder":"请选择指定时间",
-    "activityGoods":"活动商品",
-    "selectGoods":"选择商品",
-    "goodsSkuIdsPlaceholder":"请选择商品",
-    "limitNum":"限购数量",
-    "limitNumPlaceholder":"请输入限购数量",
-    "limitNumTips":"限购数量不可小于等于0",
-    "limitNumTipsThree":"限购数量不可超过已选商品数量",
-    "oldPrice":"原价",
-    "newcomerPrice":"新人价",
-    "newcomerPricePlaceholder":"请输入新人价",
-    "newcomerPriceTips":"[新人价]格式错误",
-    "newcomerPriceTipsOne":"新人价不可小于0",
-    "newcomerPriceTipsTwo":"新人价不可大于原价",
-    "batchOperation":"批量操作",
+  "basicInfoTab": "基础设置",
+  "bannerList": "顶部广告图",
+  "activeStatus": "是否启用",
+  "validityType": "有效期",
+  "validityDay": "天数",
+  "validityDayPlaceholder": "请输入有效天数",
+  "validityDayTips": "有效天数不可小于等于0",
+  "validityDayTipsLeft": "达成门槛立即生效，",
+  "validityDayTipsRight": "天有效期",
+  "validityTime": "固定时间",
+  "validityTimePlaceholder": "请选择有效期截止时间",
+  "validityTimePlaceholderTwo": "请先选择参与门槛时间",
+  "validityTimePlaceholderThree": "有效期截止时间不可小于参与门槛时间",
+  "validityTimeTips": "达成门槛立即生效，有效期截止为",
+  "validityTimeTipsTwo": "修改有效期将同步更新所有未参与活动用户的结束时间",
+  "participationWay": "参与门槛",
+  "neverOrder": "从未下过单的会员",
+  "assignTimeOrder": "指定时间内未下过单的会员",
+  "assignTimeRegister": "指定时间内注册的会员",
+  "appointTimePlaceholder": "请选择指定时间",
+  "activityGoods": "活动商品",
+  "selectGoods": "选择商品",
+  "goodsSkuIdsPlaceholder": "请选择商品",
+  "limitNum": "限购数量",
+  "limitNumPlaceholder": "请输入限购数量",
+  "limitNumTips": "限购数量不可小于等于0",
+  "limitNumTipsThree": "限购数量不可超过已选商品数量",
+  "oldPrice": "原价",
+  "newcomerPrice": "新人价",
+  "newcomerPricePlaceholder": "请输入新人价",
+  "newcomerPriceTips": "[新人价]格式错误",
+  "newcomerPriceTipsOne": "新人价不可小于0",
+  "newcomerPriceTipsTwo": "新人价不可大于原价",
+  "batchOperation": "批量操作",
   "batchEmptySelectedGoodsTips": "请选择要操作的商品",
-    "activeDesc":"规则说明",
-    "activeDescPlaceholder":"请输入规则说明",
+  "activeDesc": "规则说明",
+  "activeDescPlaceholder": "请输入规则说明",
   "useDefaultActiveDesc": "使用默认说明",
-    "image":"图片上传",
-    "imagePlaceholder":"请上传图片",
-    "toLink":"跳转链接",
-    "toLinkPlaceholder":"请输入跳转链接",
-    "addConfigList":"添加广告图"
+  "image": "图片上传",
+  "imagePlaceholder": "请上传图片",
+  "toLink": "跳转链接",
+  "toLinkPlaceholder": "请输入跳转链接",
+  "addConfigList": "添加广告图"
 }

admin/src/addon/shop/lang/zh-cn/marketing.newcomer.order_list.json

@@ -1,5 +1,5 @@
 {
-    "orderNo":"订单编号",
+  "orderNo": "订单编号",
   "orderNoPlaceholder": "请输入订单编号",
   "orderStatus": "订单状态",
   "orderStatusPlaceholder": "请选择订单状态",
@@ -53,5 +53,5 @@
   "exportOrderType": "导出订单类型",
   "shopOrder": "订单数据表",
   "shopOrderGoods": "订单商品表",
-    "point":"积分"
+  "point": "积分"
 }

admin/src/addon/shop/lang/zh-cn/order.batch_delivery.json

@@ -1,23 +1,23 @@
 {
-    "failuresNum":"发货失败单数",
-    "succeedNum":"发货成功单数",
-    "totalNum":"总发货单数",
-    "operationTime":"操作时间",
-    "operationType":"操作类型",
-    "state":"状态",
-    "operator":"操作人",
-    "importData":"批量发货",
-    "templateType":"模板类型",
-    "fullOrderDelivery":"整单发货模板",
-    "openOrderDelivery":"拆单发货模板",
-    "uploadFile":"上传文件",
-    "createTime":"时间",
-    "uploadFilePlaceholder":"请上传文件",
-    "operatorPlaceholder":"请选择操作人",
-    "causeFailure":"下载失败记录",
-    "downloadRecord":"下载记录",
-    "orderTemplate":"下载整单发货模板.xls",
-    "orderGoodsTemplate":"下载拆单发货模板.xls",
+  "failuresNum": "发货失败单数",
+  "succeedNum": "发货成功单数",
+  "totalNum": "总发货单数",
+  "operationTime": "操作时间",
+  "operationType": "操作类型",
+  "state": "状态",
+  "operator": "操作人",
+  "importData": "批量发货",
+  "templateType": "模板类型",
+  "fullOrderDelivery": "整单发货模板",
+  "openOrderDelivery": "拆单发货模板",
+  "uploadFile": "上传文件",
+  "createTime": "时间",
+  "uploadFilePlaceholder": "请上传文件",
+  "operatorPlaceholder": "请选择操作人",
+  "causeFailure": "下载失败记录",
+  "downloadRecord": "下载记录",
+  "orderTemplate": "下载整单发货模板.xls",
+  "orderGoodsTemplate": "下载拆单发货模板.xls",
   "checkCause": "查看失败原因",
   "startTime": "开始时间",
   "endTime": "结束时间",

admin/src/addon/shop/lang/zh-cn/order.config.json

@@ -1,33 +1,33 @@
 {
-    "closeOrderInfo":"自动取消订单",
-    "closeOrderInfoLeft":"提交订单",
-    "closeOrderInfoRight":"分钟未付款，自动取消订单",
-    "closeOrderInfoBottom":"订单取消时间必须在10-1440分钟之间",
-    "CloseLengthPlaceholder":"请输入订单取消时间",
-    "isClose":"自动取消订单",
-    "confirm":"自动确认收货",
-    "confirmLeft":"发货后",
-    "confirmRight":"天，自动确认收货",
-    "confirmBottom":"自动确认收货时间必须在1-30天之间",
-    "finishLengthPlaceholder":"请输入自动确认收货时间",
-    "isFinish":"自动确认收货",
-    "refund":"确认收货后售后",
-    "refundLeft":"确认收货",
-    "refundRight":"天内，可申请售后",
-    "refundBottom":"确认收货后售后时间必须在1-30天之间",
-    "noAllowRefund":"确认收货后不支持售后",
-    "validRefundLengthPlaceholder":"请输入确认收货后售后时间",
-    "invoice":"发票设置",
-    "isInvoice":"发票开关",
-    "isInvoiceClose":"关闭",
-    "isInvoiceOpen":"开启",
-    "invoiceContent":"发票内容",
-    "insert":"添加",
-    "paperInvoice":"纸质发票",
-    "electronicInvoice":"电子发票",
-    "invoicePlaceholder":"所有发票内容不能为空",
-    "invoiceType":"发票类型",
-    "invoiceTypePlaceholder":"请至少选择一个发票类型",
+  "closeOrderInfo": "自动取消订单",
+  "closeOrderInfoLeft": "提交订单",
+  "closeOrderInfoRight": "分钟未付款，自动取消订单",
+  "closeOrderInfoBottom": "订单取消时间必须在10-1440分钟之间",
+  "CloseLengthPlaceholder": "请输入订单取消时间",
+  "isClose": "自动取消订单",
+  "confirm": "自动确认收货",
+  "confirmLeft": "发货后",
+  "confirmRight": "天，自动确认收货",
+  "confirmBottom": "自动确认收货时间必须在1-30天之间",
+  "finishLengthPlaceholder": "请输入自动确认收货时间",
+  "isFinish": "自动确认收货",
+  "refund": "确认收货后售后",
+  "refundLeft": "确认收货",
+  "refundRight": "天内，可申请售后",
+  "refundBottom": "确认收货后售后时间必须在1-30天之间",
+  "noAllowRefund": "确认收货后不支持售后",
+  "validRefundLengthPlaceholder": "请输入确认收货后售后时间",
+  "invoice": "发票设置",
+  "isInvoice": "发票开关",
+  "isInvoiceClose": "关闭",
+  "isInvoiceOpen": "开启",
+  "invoiceContent": "发票内容",
+  "insert": "添加",
+  "paperInvoice": "纸质发票",
+  "electronicInvoice": "电子发票",
+  "invoicePlaceholder": "所有发票内容不能为空",
+  "invoiceType": "发票类型",
+  "invoiceTypePlaceholder": "请至少选择一个发票类型",
   "evaluate": "评价设置",
   "isEvaluate": "评价开关",
   "evaluateIsToExamine": "评价审核",

admin/src/addon/shop/lang/zh-cn/order.invoice.json

@@ -1,40 +1,40 @@
 {
-    "isInvoice":"是否开票",
-    "isInvoicePlaceholder":"请输入开票类型",
-    "startDate":"开始时间",
-    "endDate":"结束时间",
-    "headType":"抬头类型",
-    "headerTypeName":"抬头类型",
-    "person":"个人",
-    "firm":"企业",
-    "headTypePlaceholder":"请输入抬头类型",
-    "headerName":"发票抬头",
-    "headerNamePlaceholder":"请输入发票抬头",
-    "name":"发票内容",
-    "tradeType":"发票类型",
-    "typeName":"发票名称",
-    "headTypeName":"抬头类型",
-    "taxNumber":"纳税人识别号",
-    "mobile":"手机号",
-    "email":"邮件",
-    "telephone":"电话号",
-    "address":"地址",
-    "bankTame":"开户银行",
-    "bankCardNumber":"开户行账号",
-    "money":"开票金额",
-    "invoiceNumber":"发票号码",
-    "invoiceVoucher":"发票凭证",
-    "remark":"备注",
-    "createTime":"创建时间",
-    "invoiceTime":"开票时间",
-    "status":"状态",
-    "operation":"操作",
-    "detail":"详情",
-    "hasInvoice":"已开票",
-    "noInvoice":"未开票",
-    "all":"全部",
-    "invoice":"开票",
-    "viewOrder":"查看订单",
-    "invoiceNumberPlaceholder":"请输入发票号码",
-    "invoiceVoucherPlaceholder":"请输入发票凭证"
+  "isInvoice": "是否开票",
+  "isInvoicePlaceholder": "请输入开票类型",
+  "startDate": "开始时间",
+  "endDate": "结束时间",
+  "headType": "抬头类型",
+  "headerTypeName": "抬头类型",
+  "person": "个人",
+  "firm": "企业",
+  "headTypePlaceholder": "请输入抬头类型",
+  "headerName": "发票抬头",
+  "headerNamePlaceholder": "请输入发票抬头",
+  "name": "发票内容",
+  "tradeType": "发票类型",
+  "typeName": "发票名称",
+  "headTypeName": "抬头类型",
+  "taxNumber": "纳税人识别号",
+  "mobile": "手机号",
+  "email": "邮件",
+  "telephone": "电话号",
+  "address": "地址",
+  "bankTame": "开户银行",
+  "bankCardNumber": "开户行账号",
+  "money": "开票金额",
+  "invoiceNumber": "发票号码",
+  "invoiceVoucher": "发票凭证",
+  "remark": "备注",
+  "createTime": "创建时间",
+  "invoiceTime": "开票时间",
+  "status": "状态",
+  "operation": "操作",
+  "detail": "详情",
+  "hasInvoice": "已开票",
+  "noInvoice": "未开票",
+  "all": "全部",
+  "invoice": "开票",
+  "viewOrder": "查看订单",
+  "invoiceNumberPlaceholder": "请输入发票号码",
+  "invoiceVoucherPlaceholder": "请输入发票凭证"
 }

admin/src/addon/shop/lang/zh-cn/order.refund.json

@@ -10,7 +10,7 @@
   "orderRefundNoPlaceholder": "请输入退款编号",
   "goodsInfo": "商品信息",
   "orderMoney": "订单金额",
-	"realityMoney":"实付金额",
+  "realityMoney": "实付金额",
   "goodsMoney": "商品金额",
   "buyMember": "买家",
   "refundMoney": "退款金额",

admin/src/addon/shop/lang/zh-cn/stat.goods.json

@@ -7,31 +7,31 @@
   "goodsAccessNum": "商品浏览量",
   "goodsAccessNumTip": "统计时间内，所有商品详情页被访问的次数，一个人在统计时间内访问多次记为多次",
   "goodsVisitCount": "商品访客数",
-    "goodsVisitCountTips":"统计时间内，访问任何商品详情页的人数，一个人在统计时间范围内访问多次只记为一个",
-    "cartNum":"加购件数",
-    "cartNumTips":"统计时间内，添加商品进入购物车的商品件数",
+  "goodsVisitCountTips": "统计时间内，访问任何商品详情页的人数，一个人在统计时间范围内访问多次只记为一个",
+  "cartNum": "加购件数",
+  "cartNumTips": "统计时间内，添加商品进入购物车的商品件数",
   "saleNum": "下单件数",
   "saleNumTips": "统计时间内，成功下单的商品件数之和（不剔除退款订单）",
   "payNum": "支付件数",
   "payNumTips": "统计时间内， 成功付款订单的商品件数之和（不剔除退款订单）",
-    "payMoney":"支付金额",
-    "payMoneyTips":"统计时间内，成功付款订单的商品金额之和（不剔除退款订单）",
-    "refundMoney":"退款金额",
-    "refundMoneyTips":"统计时间内，成功退款的商品金额之和",
-    "refundNum":"退款件数",
-    "refundNumTips":"统计时间内，成功退款的商品件数之和",
+  "payMoney": "支付金额",
+  "payMoneyTips": "统计时间内，成功付款订单的商品金额之和（不剔除退款订单）",
+  "refundMoney": "退款金额",
+  "refundMoneyTips": "统计时间内，成功退款的商品金额之和",
+  "refundNum": "退款件数",
+  "refundNumTips": "统计时间内，成功退款的商品件数之和",
   "goodsRank": "商品排行",
-    "goodsName":"商品名称",
-    "goodsNamePlaceholder":"请输入商品名称",
+  "goodsName": "商品名称",
+  "goodsNamePlaceholder": "请输入商品名称",
   "goodsCategory": "商品分类",
-    "all":"全部",
-    "totalType":"统计类型",
-    "totalTypePlaceholder":"请选择统计类型",
-    "goodsInfo":"商品信息",
-    "accessNum":"访问次数",
-    "visitCount":"访客数",
-    "cartNumber":"加入购物车数量",
-    "saleNumber":"商品销量",
-    "payTotal":"支付总金额",
-    "collectNum":"收藏数量"
+  "all": "全部",
+  "totalType": "统计类型",
+  "totalTypePlaceholder": "请选择统计类型",
+  "goodsInfo": "商品信息",
+  "accessNum": "访问次数",
+  "visitCount": "访客数",
+  "cartNumber": "加入购物车数量",
+  "saleNumber": "商品销量",
+  "payTotal": "支付总金额",
+  "collectNum": "收藏数量"
 }

admin/src/addon/shop/views/address/edit.vue

@@ -4,55 +4,140 @@
       <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
     </el-card>
     <el-card class="box-card !border-none" shadow="never" v-loading="loading">
-			<el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form">
+      <el-form
+        :model="formData"
+        label-width="90px"
+        ref="formRef"
+        :rules="formRules"
+        class="page-form"
+      >
         <el-form-item :label="t('addressType')" prop="address_type">
           <div class="flex flex-col">
             <div>
-							<el-checkbox v-model="formData.is_delivery_address" :label="t('deliveryAddress')" :true-label="1" :false-label="0"/>
-							<el-checkbox v-model="formData.is_default_delivery" :label="t('defaultDeliveryAddress')" :true-label="1" :false-label="0" v-show="formData.is_delivery_address"/>
+              <el-checkbox
+                v-model="formData.is_delivery_address"
+                :label="t('deliveryAddress')"
+                :true-label="1"
+                :false-label="0"
+              />
+              <el-checkbox
+                v-model="formData.is_default_delivery"
+                :label="t('defaultDeliveryAddress')"
+                :true-label="1"
+                :false-label="0"
+                v-show="formData.is_delivery_address"
+              />
             </div>
             <div>
-							<el-checkbox v-model="formData.is_refund_address" :label="t('refundAddress')" :true-label="1" :false-label="0"/>
-							<el-checkbox v-model="formData.is_default_refund" :label="t('defaultRefundAddress')" :true-label="1" :false-label="0" v-show="formData.is_refund_address"/>
+              <el-checkbox
+                v-model="formData.is_refund_address"
+                :label="t('refundAddress')"
+                :true-label="1"
+                :false-label="0"
+              />
+              <el-checkbox
+                v-model="formData.is_default_refund"
+                :label="t('defaultRefundAddress')"
+                :true-label="1"
+                :false-label="0"
+                v-show="formData.is_refund_address"
+              />
             </div>
           </div>
         </el-form-item>
 
         <el-form-item :label="t('contactName')" prop="contact_name">
-					<el-input v-model.trim="formData.contact_name" clearable :placeholder="t('contactNamePlaceholder')" class="input-width" maxlength="10" />
+          <el-input
+            v-model.trim="formData.contact_name"
+            clearable
+            :placeholder="t('contactNamePlaceholder')"
+            class="input-width"
+            maxlength="10"
+          />
         </el-form-item>
 
         <el-form-item :label="t('mobile')" prop="mobile">
-					<el-input v-model.trim="formData.mobile" clearable :placeholder="t('mobilePlaceholder')" class="input-width"  @keyup="filterNumber($event)" @blur="formData.mobile = $event.target.value"/>
+          <el-input
+            v-model.trim="formData.mobile"
+            clearable
+            :placeholder="t('mobilePlaceholder')"
+            class="input-width"
+            @keyup="filterNumber($event)"
+            @blur="formData.mobile = $event.target.value"
+          />
         </el-form-item>
 
         <el-form-item :label="t('fullAddress')" prop="address_area">
-					<el-select v-model="formData.province_id" value-key="id" clearable class="w-[200px]"  ref="provinceRef">
-						<el-option :label="t('provincePlaceholder')" :value="0"/>
-						<el-option v-for="(item, index) in areaList.province" :key="index" :label="item.name"  :value="item.id"/>
+          <el-select
+            v-model="formData.province_id"
+            value-key="id"
+            clearable
+            class="w-[200px]"
+            ref="provinceRef"
+          >
+            <el-option :label="t('provincePlaceholder')" :value="0" />
+            <el-option
+              v-for="(item, index) in areaList.province"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            />
           </el-select>
-					<el-select v-model="formData.city_id" value-key="id" clearable class="w-[200px] ml-3" ref="cityRef">
-						<el-option :label="t('cityPlaceholder')" :value="0"/>
-						<el-option v-for="(item, index) in areaList.city " :key="index" :label="item.name"  :value="item.id"/>
+          <el-select
+            v-model="formData.city_id"
+            value-key="id"
+            clearable
+            class="w-[200px] ml-3"
+            ref="cityRef"
+          >
+            <el-option :label="t('cityPlaceholder')" :value="0" />
+            <el-option
+              v-for="(item, index) in areaList.city"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            />
           </el-select>
-					<el-select v-model="formData.district_id" value-key="id" clearable class="w-[200px] ml-3"  ref="districtRef">
-						<el-option :label="t('districtPlaceholder')" :value="0"/>
-						<el-option v-for="(item, index) in areaList.district " :key="index" :label="item.name"  :value="item.id"/>
+          <el-select
+            v-model="formData.district_id"
+            value-key="id"
+            clearable
+            class="w-[200px] ml-3"
+            ref="districtRef"
+          >
+            <el-option :label="t('districtPlaceholder')" :value="0" />
+            <el-option
+              v-for="(item, index) in areaList.district"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            />
           </el-select>
         </el-form-item>
 
         <el-form-item prop="address">
-					<el-input v-model.trim="formData.address" clearable :placeholder="t('addressPlaceholder')"  class="input-width"/>
+          <el-input
+            v-model.trim="formData.address"
+            clearable
+            :placeholder="t('addressPlaceholder')"
+            class="input-width"
+          />
         </el-form-item>
 
         <el-form-item>
-					<div id="container" class="w-[800px] h-[520px] relative" v-loading="mapLoading"></div>
+          <div
+            id="container"
+            class="w-[800px] h-[520px] relative"
+            v-loading="mapLoading"
+          ></div>
         </el-form-item>
       </el-form>
     </el-card>
     <div class="fixed-footer-wrap">
       <div class="fixed-footer !z-[9999]">
-				<el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+        <el-button type="primary" @click="onSave(formRef)">{{
+          t('save')
+        }}</el-button>
         <el-button @click="back()">{{ t('cancel') }}</el-button>
       </div>
     </div>
@@ -63,7 +148,11 @@
 import { ref, reactive, computed, onMounted, watch } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import { getShopAddressInfo, addShopAddress, editShopAddress } from '@/addon/shop/api/shop_address'
+import {
+  getShopAddressInfo,
+  addShopAddress,
+  editShopAddress,
+} from '@/addon/shop/api/shop_address'
 import { getMap, getAreaListByPid, getAreaByCode } from '@/app/api/sys'
 import { useRoute } from 'vue-router'
 import { createMarker, latLngToAddress, addressToLatLng } from '@/utils/qqmap'
@@ -73,15 +162,15 @@ const route = useRoute()
 const id: number = parseInt(route.query.id as string)
 const loading = ref(false)
 const pageName = route.meta.title
-interface areaType{
-    province: any[],
-    city: any[],
+interface areaType {
+  province: any[]
+  city: any[]
   district: any[]
 }
 const areaList = reactive<areaType>({
   province: [],
   city: [],
-    district: []
+  district: [],
 })
 const provinceRef = ref()
 const cityRef = ref()
@@ -90,17 +179,19 @@ const districtRef = ref()
 /**
  * 获取省
  */
-getAreaListByPid(0).then(res => {
+getAreaListByPid(0).then((res) => {
   areaList.province = res.data
 })
 
 let mapKey: string = ''
 onMounted(() => {
   const mapScript = document.createElement('script')
-    getMap().then(res => {
+  getMap().then((res) => {
     mapKey = res.data.key
     mapScript.type = 'text/javascript'
-        mapScript.src = 'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' + res.data.key
+    mapScript.src =
+      'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' +
+      res.data.key
     document.body.appendChild(mapScript)
   })
   mapScript.onload = () => {
@@ -111,7 +202,7 @@ onMounted(() => {
 })
 
 /**
-* 初始化地图
+ * 初始化地图
  */
 let map: any
 let marker: any
@@ -123,7 +214,7 @@ const initMap = () => {
 
   map = new TMap.Map('container', {
     center,
-        zoom: 14
+    zoom: 14,
   })
 
   map.on('tilesloaded', () => {
@@ -136,7 +227,7 @@ const initMap = () => {
     map.setCenter(evt.latLng)
     marker.updateGeometries({
       id: 'center',
-            position: evt.latLng
+      position: evt.latLng,
     })
     latLngChange(evt.latLng.lat, evt.latLng.lng)
   })
@@ -147,11 +238,12 @@ const initMap = () => {
 const storeArea = reactive({
   province_id: 0,
   city_id: 0,
-    district_id: 0
+  district_id: 0,
 })
 
 const latLngChange = (lat: number, lng: number) => {
-    latLngToAddress({ mapKey, lat, lng }).then(({ message, result }) => {
+  latLngToAddress({ mapKey, lat, lng })
+    .then(({ message, result }) => {
       if (message == 'query ok' || message == 'Success') {
         formData.lat = result.location.lat
         formData.lng = result.location.lng
@@ -165,14 +257,15 @@ const latLngChange = (lat: number, lng: number) => {
       } else {
         console.error(message, result)
       }
-    }).catch(err => {
+    })
+    .catch((err) => {
       console.log(err)
     })
 }
 
 /**
-* 表单数据
-*/
+ * 表单数据
+ */
 const initialFormData = {
   id: 0,
   contact_name: '',
@@ -183,11 +276,11 @@ const initialFormData = {
   address: '',
   full_address: '',
   lat: 39.908626,
-    lng: 116.397190,
+  lng: 116.39719,
   is_delivery_address: 0,
   is_refund_address: 0,
   is_default_delivery: 0,
-    is_default_refund: 0
+  is_default_refund: 0,
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -215,11 +308,11 @@ const formRules = computed(() => {
             callback(new Error(t('addressTypeRequire')))
           }
           callback()
-                }
-            }
+        },
+      },
     ],
     contact_name: [
-            { required: true, message: t('contactNamePlaceholder'), trigger: 'blur' }
+      { required: true, message: t('contactNamePlaceholder'), trigger: 'blur' },
     ],
     mobile: [
       { required: true, message: t('mobilePlaceholder'), trigger: 'blur' },
@@ -230,8 +323,8 @@ const formRules = computed(() => {
             callback(new Error(t('mobileTips')))
           }
           callback()
-                }
-            }
+        },
+      },
     ],
     address_area: [
       {
@@ -246,21 +339,23 @@ const formRules = computed(() => {
             callback(new Error(t('districtPlaceholder')))
           }
           callback()
-                }
-            }
+        },
+      },
     ],
     address: [
-            { required: true, message: t('addressPlaceholder'), trigger: 'blur' }
-        ]
+      { required: true, message: t('addressPlaceholder'), trigger: 'blur' },
+    ],
   }
 })
 
 /**
  * 获取市
  */
-watch(() => formData.province_id, (nval) => {
+watch(
+  () => formData.province_id,
+  (nval) => {
     if (nval) {
-        getAreaListByPid(formData.province_id).then(res => {
+      getAreaListByPid(formData.province_id).then((res) => {
         areaList.city = res.data
 
         const cityId = formData.city_id
@@ -283,14 +378,17 @@ watch(() => formData.province_id, (nval) => {
     } else {
       formData.city_id = 0
     }
-})
+  }
+)
 
 /**
-* 获取区
+ * 获取区
  */
-watch(() => formData.city_id, (nval) => {
+watch(
+  () => formData.city_id,
+  (nval) => {
     if (nval) {
-        getAreaListByPid(formData.city_id).then(res => {
+      getAreaListByPid(formData.city_id).then((res) => {
         areaList.district = res.data
 
         const districtId = formData.district_id
@@ -313,73 +411,91 @@ watch(() => formData.city_id, (nval) => {
     } else {
       formData.district_id = 0
     }
-})
+  }
+)
 
-watch(() => formData.district_id, (nval) => {
+watch(
+  () => formData.district_id,
+  (nval) => {
     if (nval) {
       areaChange()
     }
-})
+  }
+)
 
 const areaChange = debounce(() => {
   setTimeout(() => {
     const address = [
       formData.province_id ? provinceRef.value.selectedLabel : '',
       formData.city_id ? cityRef.value.selectedLabel : '',
-            formData.district_id ? districtRef.value.selectedLabel : ''
+      formData.district_id ? districtRef.value.selectedLabel : '',
     ]
 
-        addressToLatLng({ mapKey, address: address.join('') }).then(({ message, result }) => {
+    addressToLatLng({ mapKey, address: address.join('') }).then(
+      ({ message, result }) => {
         if (message == 'Success' || message == 'query ok') {
-                const latLng = new (window as any).TMap.LatLng(result.location.lat, result.location.lng)
+          const latLng = new (window as any).TMap.LatLng(
+            result.location.lat,
+            result.location.lng
+          )
           map.setCenter(latLng)
           marker.updateGeometries({
             id: 'center',
-                    position: latLng
+            position: latLng,
           })
           formData.lat = result.location.lat
           formData.lng = result.location.lng
         } else {
           console.error(message, result)
         }
-        })
+      }
+    )
   }, 500)
 }, 500)
 
 /**
  * 地图点选获取市
  */
-watch(() => storeArea.province_id, (nval) => {
+watch(
+  () => storeArea.province_id,
+  (nval) => {
     if (nval) {
-        getAreaListByPid(storeArea.province_id).then(res => {
+      getAreaListByPid(storeArea.province_id).then((res) => {
         areaList.city = res.data
         formData.province_id = storeArea.province_id
         formData.city_id = storeArea.city_id
       })
     }
-})
+  }
+)
 
 /**
-* 地图点选获取区
+ * 地图点选获取区
  */
-watch(() => storeArea.city_id, (nval) => {
+watch(
+  () => storeArea.city_id,
+  (nval) => {
     if (nval) {
-        getAreaListByPid(storeArea.city_id).then(res => {
+      getAreaListByPid(storeArea.city_id).then((res) => {
         areaList.district = res.data
         formData.city_id = storeArea.city_id
         formData.district_id = storeArea.district_id
       })
     }
-})
+  }
+)
 
 /**
  * 地图点选获取区
  */
-watch(() => storeArea.district_id, (nval) => {
+watch(
+  () => storeArea.district_id,
+  (nval) => {
     if (nval) {
       formData.district_id = storeArea.district_id
     }
-})
+  }
+)
 
 const onSave = async (formEl: FormInstance | undefined) => {
   if (loading.value || !formEl) return
@@ -392,15 +508,17 @@ const onSave = async (formEl: FormInstance | undefined) => {
         data.province_id ? provinceRef.value.selectedLabel : '',
         data.city_id ? cityRef.value.selectedLabel : '',
         data.district_id ? districtRef.value.selectedLabel : '',
-                data.address
+        data.address,
       ]
       data.full_address = address.join('')
 
       const save = id ? editShopAddress : addShopAddress
-            save(data).then(res => {
+      save(data)
+        .then((res) => {
           loading.value = false
           history.back()
-            }).catch(() => {
+        })
+        .catch(() => {
           loading.value = false
         })
     }

admin/src/addon/shop/views/address/list.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="main-container">
     <el-card class="box-card !border-none" shadow="never">
-
       <div class="flex justify-between items-center">
         <span class="text-page-title">{{ pageName }}</span>
         <el-button type="primary" @click="addEvent">
@@ -9,56 +8,109 @@
         </el-button>
       </div>
 
-			<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-				<el-form :inline="true" :model="shopAddressTable.searchParam" ref="searchFormRef">
+      <el-card
+        class="box-card !border-none my-[10px] table-search-wrap"
+        shadow="never"
+      >
+        <el-form
+          :inline="true"
+          :model="shopAddressTable.searchParam"
+          ref="searchFormRef"
+        >
           <el-form-item :label="t('mobile')" prop="mobile">
-						<el-input v-model.trim="shopAddressTable.searchParam.mobile" :placeholder="t('mobilePlaceholder')"/>
+            <el-input
+              v-model.trim="shopAddressTable.searchParam.mobile"
+              :placeholder="t('mobilePlaceholder')"
+            />
           </el-form-item>
           <el-form-item :label="t('fullAddress')" prop="full_address">
-						<el-input v-model.trim="shopAddressTable.searchParam.full_address"  :placeholder="t('fullAddressPlaceholder')"/>
+            <el-input
+              v-model.trim="shopAddressTable.searchParam.full_address"
+              :placeholder="t('fullAddressPlaceholder')"
+            />
           </el-form-item>
 
           <el-form-item>
-						<el-button type="primary" @click="loadShopAddressList()">{{ t('search') }}</el-button>
-						<el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+            <el-button type="primary" @click="loadShopAddressList()">{{
+              t('search')
+            }}</el-button>
+            <el-button @click="resetForm(searchFormRef)">{{
+              t('reset')
+            }}</el-button>
           </el-form-item>
         </el-form>
       </el-card>
 
       <div class="mt-[10px]">
-				<el-table :data="shopAddressTable.data" size="large" v-loading="shopAddressTable.loading">
+        <el-table
+          :data="shopAddressTable.data"
+          size="large"
+          v-loading="shopAddressTable.loading"
+        >
           <template #empty>
             <span>{{ !shopAddressTable.loading ? t('emptyData') : '' }}</span>
           </template>
-					<el-table-column prop="contact_name" :label="t('contactName')" min-width="120"/>
-					<el-table-column prop="mobile" :label="t('mobile')" min-width="120"/>
-					<el-table-column prop="full_address" :label="t('fullAddress')" min-width="120" :show-overflow-tooltip="true"/>
-					<el-table-column prop="is_delivery_address" :label="t('addressType')" min-width="120" align="left">
+          <el-table-column
+            prop="contact_name"
+            :label="t('contactName')"
+            min-width="120"
+          />
+          <el-table-column prop="mobile" :label="t('mobile')" min-width="120" />
+          <el-table-column
+            prop="full_address"
+            :label="t('fullAddress')"
+            min-width="120"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="is_delivery_address"
+            :label="t('addressType')"
+            min-width="120"
+            align="left"
+          >
             <template #default="{ row }">
               <div v-if="row.is_delivery_address">
                 {{ t('deliveryAddress') }}
-								<el-tag size="small" v-if="row.is_default_delivery">{{ t('default') }}</el-tag>
+                <el-tag size="small" v-if="row.is_default_delivery">{{
+                  t('default')
+                }}</el-tag>
               </div>
               <div v-if="row.is_refund_address">
                 {{ t('refundAddress') }}
-								<el-tag size="small" v-if="row.is_default_refund">{{ t('default') }}</el-tag>
+                <el-tag size="small" v-if="row.is_default_refund">{{
+                  t('default')
+                }}</el-tag>
               </div>
             </template>
           </el-table-column>
 
-					<el-table-column :label="t('operation')" fixed="right" min-width="120" align="right">
+          <el-table-column
+            :label="t('operation')"
+            fixed="right"
+            min-width="120"
+            align="right"
+          >
             <template #default="{ row }">
-							<el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-							<el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+              <el-button type="primary" link @click="editEvent(row)">{{
+                t('edit')
+              }}</el-button>
+              <el-button type="primary" link @click="deleteEvent(row.id)">{{
+                t('delete')
+              }}</el-button>
             </template>
           </el-table-column>
-
         </el-table>
         <div class="mt-[16px] flex justify-end">
-					<el-pagination v-model:current-page="shopAddressTable.page" v-model:page-size="shopAddressTable.limit" layout="total, sizes, prev, pager, next, jumper" :total="shopAddressTable.total"  @size-change="loadShopAddressList()" @current-change="loadShopAddressList"/>
+          <el-pagination
+            v-model:current-page="shopAddressTable.page"
+            v-model:page-size="shopAddressTable.limit"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="shopAddressTable.total"
+            @size-change="loadShopAddressList()"
+            @current-change="loadShopAddressList"
+          />
         </div>
       </div>
-
     </el-card>
   </div>
 </template>
@@ -66,10 +118,13 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import { getShopAddressList, deleteShopAddress } from '@/addon/shop/api/shop_address'
+import {
+  getShopAddressList,
+  deleteShopAddress,
+} from '@/addon/shop/api/shop_address'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
-import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
+import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
 
 const route = useRoute()
 const pageName = route.meta.title
@@ -82,8 +137,8 @@ const shopAddressTable = reactive({
   data: [],
   searchParam: {
     mobile: '',
-        full_address: ''
-    }
+    full_address: '',
+  },
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -98,17 +153,23 @@ const loadShopAddressList = (page: number = 1) => {
   getShopAddressList({
     page: shopAddressTable.page,
     limit: shopAddressTable.limit,
-        ...shopAddressTable.searchParam
-    }).then(res => {
+    ...shopAddressTable.searchParam,
+  })
+    .then((res) => {
       shopAddressTable.loading = false
       shopAddressTable.data = res.data.data
       shopAddressTable.total = res.data.total
-	    setTablePageStorage(shopAddressTable.page, shopAddressTable.limit, shopAddressTable.searchParam);
-    }).catch(() => {
+      setTablePageStorage(
+        shopAddressTable.page,
+        shopAddressTable.limit,
+        shopAddressTable.searchParam
+      )
+    })
+    .catch(() => {
       shopAddressTable.loading = false
     })
 }
-loadShopAddressList(getTablePageStorage(shopAddressTable.searchParam).page);
+loadShopAddressList(getTablePageStorage(shopAddressTable.searchParam).page)
 
 const router = useRouter()
 
@@ -120,7 +181,7 @@ const addEvent = () => {
 }
 
 /**
-* 编辑商家地址库
+ * 编辑商家地址库
  * @param data
  */
 const editEvent = (data: any) => {
@@ -131,17 +192,16 @@ const editEvent = (data: any) => {
  * 删除商家地址库
  */
 const deleteEvent = (id: number) => {
-    ElMessageBox.confirm(t('shopAddressDeleteTips'), t('warning'),
-        {
+  ElMessageBox.confirm(t('shopAddressDeleteTips'), t('warning'), {
     confirmButtonText: t('confirm'),
     cancelButtonText: t('cancel'),
-            type: 'warning'
-        }
-    ).then(() => {
-        deleteShopAddress(id).then(() => {
+    type: 'warning',
+  }).then(() => {
+    deleteShopAddress(id)
+      .then(() => {
         loadShopAddressList()
-        }).catch(() => {
       })
+      .catch(() => {})
   })
 }
 
@@ -152,5 +212,4 @@ const resetForm = (formEl: FormInstance | undefined) => {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

admin/src/addon/shop/views/delivery/company.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="main-container">
     <el-card class="box-card !border-none" shadow="never">
-
       <div class="flex justify-between items-center">
         <div class="detail-head !m-0">
           <div class="left" @click="router.push('/shop/order/delivery')">
@@ -11,53 +10,111 @@
           <span class="adorn">|</span>
           <span class="right">{{ pageName }}</span>
         </div>
-				<el-button type="primary" @click="addEvent">{{ t('addCompany') }}</el-button>
+        <el-button type="primary" @click="addEvent">{{
+          t('addCompany')
+        }}</el-button>
       </div>
 
-			<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-				<el-form :inline="true" :model="companyTable.searchParam" ref="searchFormRef">
+      <el-card
+        class="box-card !border-none my-[10px] table-search-wrap"
+        shadow="never"
+      >
+        <el-form
+          :inline="true"
+          :model="companyTable.searchParam"
+          ref="searchFormRef"
+        >
           <el-form-item :label="t('companyName')" prop="company_name">
-						<el-input v-model.trim="companyTable.searchParam.company_name"  :placeholder="t('companyNamePlaceholder')"/>
+            <el-input
+              v-model.trim="companyTable.searchParam.company_name"
+              :placeholder="t('companyNamePlaceholder')"
+            />
           </el-form-item>
           <el-form-item>
-						<el-button type="primary" @click="loadCompanyList()">{{ t('search') }}</el-button>
-						<el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+            <el-button type="primary" @click="loadCompanyList()">{{
+              t('search')
+            }}</el-button>
+            <el-button @click="resetForm(searchFormRef)">{{
+              t('reset')
+            }}</el-button>
           </el-form-item>
         </el-form>
       </el-card>
 
       <div class="mt-[10px]">
-				<el-table :data="companyTable.data" size="large" v-loading="companyTable.loading">
+        <el-table
+          :data="companyTable.data"
+          size="large"
+          v-loading="companyTable.loading"
+        >
           <template #empty>
             <span>{{ !companyTable.loading ? t('emptyData') : '' }}</span>
           </template>
-					<el-table-column prop="company_name" :label="t('companyName')" min-width="120"/>
+          <el-table-column
+            prop="company_name"
+            :label="t('companyName')"
+            min-width="120"
+          />
           <el-table-column prop="logo" :label="t('logo')" min-width="120">
             <template #default="{ row }">
               <div class="w-[50px] h-[50px] flex items-center justify-center">
-                                <img v-if="row.logo" class="max-w-[100%] max-h-[100%]" :src="img(row.logo)"/>
+                <img
+                  v-if="row.logo"
+                  class="max-w-[100%] max-h-[100%]"
+                  :src="img(row.logo)"
+                />
               </div>
             </template>
           </el-table-column>
-					<el-table-column prop="url" :label="t('url')" min-width="120"/>
-					<el-table-column prop="express_no" :label="t('expressNo')" min-width="120"/>
-					<el-table-column prop="express_no_electronic_sheet" :label="t('expressNoElectronicSheet')" min-width="120"/>
-					<el-table-column :label="t('electronicSheetSwitchName')" min-width="120">
+          <el-table-column prop="url" :label="t('url')" min-width="120" />
+          <el-table-column
+            prop="express_no"
+            :label="t('expressNo')"
+            min-width="120"
+          />
+          <el-table-column
+            prop="express_no_electronic_sheet"
+            :label="t('expressNoElectronicSheet')"
+            min-width="120"
+          />
+          <el-table-column
+            :label="t('electronicSheetSwitchName')"
+            min-width="120"
+          >
             <template #default="{ row }">
-                            <span>{{row.electronic_sheet_switch == 1 ? '支持' : '不支持'}}</span>
+              <span>{{
+                row.electronic_sheet_switch == 1 ? '支持' : '不支持'
+              }}</span>
             </template>
           </el-table-column>
-					<el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+          <el-table-column
+            :label="t('operation')"
+            fixed="right"
+            align="right"
+            min-width="120"
+          >
             <template #default="{ row }">
-							<el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-							<el-button type="primary" link @click="deleteEvent(row.company_id)">{{ t('delete') }}
+              <el-button type="primary" link @click="editEvent(row)">{{
+                t('edit')
+              }}</el-button>
+              <el-button
+                type="primary"
+                link
+                @click="deleteEvent(row.company_id)"
+                >{{ t('delete') }}
               </el-button>
             </template>
           </el-table-column>
-
         </el-table>
         <div class="mt-[16px] flex justify-end">
-					<el-pagination v-model:current-page="companyTable.page" v-model:page-size="companyTable.limit"   layout="total, sizes, prev, pager, next, jumper" :total="companyTable.total"   @size-change="loadCompanyList()" @current-change="loadCompanyList"/>
+          <el-pagination
+            v-model:current-page="companyTable.page"
+            v-model:page-size="companyTable.limit"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="companyTable.total"
+            @size-change="loadCompanyList()"
+            @current-change="loadCompanyList"
+          />
         </div>
       </div>
     </el-card>
@@ -71,7 +128,7 @@ import { getCompanyPageList, deleteCompany } from '@/addon/shop/api/delivery'
 import { img } from '@/utils/common'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
+import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
 
 const route = useRoute()
 const router = useRouter()
@@ -88,8 +145,8 @@ const companyTable = reactive({
     logo: '',
     url: '',
     create_time: '',
-        modify_time: ''
-    }
+    modify_time: '',
+  },
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -104,18 +161,24 @@ const loadCompanyList = (page: number = 1) => {
   getCompanyPageList({
     page: companyTable.page,
     limit: companyTable.limit,
-        ...companyTable.searchParam
-    }).then(res => {
+    ...companyTable.searchParam,
+  })
+    .then((res) => {
       companyTable.loading = false
       companyTable.data = res.data.data
       companyTable.total = res.data.total
-	    setTablePageStorage(companyTable.page, companyTable.limit, companyTable.searchParam);
-    }).catch(() => {
+      setTablePageStorage(
+        companyTable.page,
+        companyTable.limit,
+        companyTable.searchParam
+      )
+    })
+    .catch(() => {
       companyTable.loading = false
     })
 }
 
-loadCompanyList(getTablePageStorage(companyTable.searchParam).page);
+loadCompanyList(getTablePageStorage(companyTable.searchParam).page)
 
 /**
  * 添加物流公司
@@ -136,17 +199,16 @@ const editEvent = (data: any) => {
  * 删除物流公司
  */
 const deleteEvent = (id: number) => {
-    ElMessageBox.confirm(t('companyDeleteTips'), t('warning'),
-        {
+  ElMessageBox.confirm(t('companyDeleteTips'), t('warning'), {
     confirmButtonText: t('confirm'),
     cancelButtonText: t('cancel'),
-            type: 'warning'
-        }
-    ).then(() => {
-        deleteCompany(id).then(() => {
+    type: 'warning',
+  }).then(() => {
+    deleteCompany(id)
+      .then(() => {
         loadCompanyList()
-        }).catch(() => {
       })
+      .catch(() => {})
   })
 }
 
@@ -157,5 +219,4 @@ const resetForm = (formEl: FormInstance | undefined) => {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

admin/src/addon/shop/views/delivery/company_edit.vue

@@ -1,112 +1,267 @@
 <template>
   <div class="main-container">
     <el-card class="box-card !border-none" shadow="never">
-            <el-page-header :content="formData.company_id ? t('updateCompany') : t('addCompany')" :icon="ArrowLeft" @back="back()" />
+      <el-page-header
+        :content="formData.company_id ? t('updateCompany') : t('addCompany')"
+        :icon="ArrowLeft"
+        @back="back()"
+      />
     </el-card>
     <el-card class="box-card mt-[15px] !border-none" shadow="never">
-            <el-form :model="formData" label-width="130px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+      <el-form
+        :model="formData"
+        label-width="130px"
+        ref="formRef"
+        :rules="formRules"
+        class="page-form"
+        v-loading="loading"
+      >
         <el-form-item :label="t('companyName')" prop="company_name">
-                    <el-input v-model.trim="formData.company_name" maxlength="20" clearable :placeholder="t('companyNamePlaceholder')"  class="input-width"/>
+          <el-input
+            v-model.trim="formData.company_name"
+            maxlength="20"
+            clearable
+            :placeholder="t('companyNamePlaceholder')"
+            class="input-width"
+          />
         </el-form-item>
         <el-form-item :label="t('logo')">
-                    <upload-image v-model="formData.logo"/>
+          <upload-image v-model="formData.logo" />
         </el-form-item>
         <el-form-item :label="t('url')">
-                    <el-input v-model.trim="formData.url" clearable :placeholder="t('urlPlaceholder')" class="input-width"/>
+          <el-input
+            v-model.trim="formData.url"
+            clearable
+            :placeholder="t('urlPlaceholder')"
+            class="input-width"
+          />
         </el-form-item>
         <el-form-item :label="t('expressNo')">
           <div>
-                        <el-input v-model.trim="formData.express_no" clearable :placeholder="t('expressNoPlaceholder')"  class="input-width"/>
-                        <p class="w-[380px] text-[12px] text-[#999] mt-[5px] leading-[20px]">{{ t('expressNoTips') }}</p>
+            <el-input
+              v-model.trim="formData.express_no"
+              clearable
+              :placeholder="t('expressNoPlaceholder')"
+              class="input-width"
+            />
+            <p
+              class="w-[380px] text-[12px] text-[#999] mt-[5px] leading-[20px]"
+            >
+              {{ t('expressNoTips') }}
+            </p>
           </div>
         </el-form-item>
         <el-form-item :label="t('expressNoElectronicSheet')">
           <div>
-                        <el-input v-model.trim="formData.express_no_electronic_sheet" clearable :placeholder="t('expressNoPlaceholder')"  class="input-width"/>
-                        <p class="w-[380px] text-[12px] text-[#999] mt-[5px] leading-[20px]">{{ t('expressNoElectronicSheetTips') }}</p>
+            <el-input
+              v-model.trim="formData.express_no_electronic_sheet"
+              clearable
+              :placeholder="t('expressNoPlaceholder')"
+              class="input-width"
+            />
+            <p
+              class="w-[380px] text-[12px] text-[#999] mt-[5px] leading-[20px]"
+            >
+              {{ t('expressNoElectronicSheetTips') }}
+            </p>
           </div>
         </el-form-item>
         <el-form-item :label="t('electronicSheetSwitch')">
-                    <el-switch v-model="formData.electronic_sheet_switch" :active-value="1" :inactive-value="0" />
+          <el-switch
+            v-model="formData.electronic_sheet_switch"
+            :active-value="1"
+            :inactive-value="0"
+          />
         </el-form-item>
 
-                 <el-form-item :label="t('expType')" prop="exp_type" v-show="formData.electronic_sheet_switch">
+        <el-form-item
+          :label="t('expType')"
+          prop="exp_type"
+          v-show="formData.electronic_sheet_switch"
+        >
           <div class="w-[600px]">
-                        <el-table :data="formData.exp_type" size="large" v-show="formData.exp_type.length">
+            <el-table
+              :data="formData.exp_type"
+              size="large"
+              v-show="formData.exp_type.length"
+            >
               <template #empty>
-                                <span>{{ formData.exp_type.length == 0 ? t('emptyData') : '' }}</span>
+                <span>{{
+                  formData.exp_type.length == 0 ? t('emptyData') : ''
+                }}</span>
               </template>
 
-                            <el-table-column prop="name" :label="t('expTypeName')" min-width="200">
+              <el-table-column
+                prop="name"
+                :label="t('expTypeName')"
+                min-width="200"
+              >
                 <template #default="{ row }">
-                                    <el-input v-model.trim="row.text" class="input-width" maxlength="20" clearable show-word-limit />
+                  <el-input
+                    v-model.trim="row.text"
+                    class="input-width"
+                    maxlength="20"
+                    clearable
+                    show-word-limit
+                  />
                 </template>
               </el-table-column>
 
-                            <el-table-column prop="name" :label="t('expTypeValue')" min-width="120">
+              <el-table-column
+                prop="name"
+                :label="t('expTypeValue')"
+                min-width="120"
+              >
                 <template #default="{ row }">
-                                    <el-input v-model.trim="row.value" class="!w-[150px]" maxlength="6" clearable show-word-limit @keyup="filterNumber($event)" />
+                  <el-input
+                    v-model.trim="row.value"
+                    class="!w-[150px]"
+                    maxlength="6"
+                    clearable
+                    show-word-limit
+                    @keyup="filterNumber($event)"
+                  />
                 </template>
               </el-table-column>
 
-                            <el-table-column :label="t('operation')" fixed="right" align="right" min-width="60">
-                                <template #default="{ row,$index }">
-                                    <el-button type="primary" link @click="deleteExpTypeValueEvent($index)">{{ t('delete') }}</el-button>
+              <el-table-column
+                :label="t('operation')"
+                fixed="right"
+                align="right"
+                min-width="60"
+              >
+                <template #default="{ row, $index }">
+                  <el-button
+                    type="primary"
+                    link
+                    @click="deleteExpTypeValueEvent($index)"
+                    >{{ t('delete') }}</el-button
+                  >
                 </template>
               </el-table-column>
             </el-table>
 
-                        <el-button type="primary" plain @click="addExpTypeValueEvent" :class="{'mt-[10px]': formData.exp_type.length}" v-show="formData.exp_type.length < expTypeMaxLength">{{ t('addExpType') }}</el-button>
+            <el-button
+              type="primary"
+              plain
+              @click="addExpTypeValueEvent"
+              :class="{ 'mt-[10px]': formData.exp_type.length }"
+              v-show="formData.exp_type.length < expTypeMaxLength"
+              >{{ t('addExpType') }}</el-button
+            >
             <div class="text-[12px] text-[#999] mt-[5px] leading-[20px]">
               <span>{{ t('expTypeTips') }}</span>
-                            <a class="ml-[3px] text-[var(--el-color-primary)]" target="_blank" href="https://www.yuque.com/kdnjishuzhichi/dfcrg1/hgx758hom5p6wz0l">{{t('examine')}}</a>
+              <a
+                class="ml-[3px] text-[var(--el-color-primary)]"
+                target="_blank"
+                href="https://www.yuque.com/kdnjishuzhichi/dfcrg1/hgx758hom5p6wz0l"
+                >{{ t('examine') }}</a
+              >
             </div>
-                        <p class="text-[12px] text-[#999] mt-[3px] leading-[20px]">{{ t('expTypeTips1') }}</p>
+            <p class="text-[12px] text-[#999] mt-[3px] leading-[20px]">
+              {{ t('expTypeTips1') }}
+            </p>
           </div>
         </el-form-item>
 
-                <el-form-item :label="t('printStyle')" prop="print_style" v-show="formData.electronic_sheet_switch">
+        <el-form-item
+          :label="t('printStyle')"
+          prop="print_style"
+          v-show="formData.electronic_sheet_switch"
+        >
           <div class="w-[600px]">
-                        <el-table :data="formData.print_style" size="large" v-show="formData.print_style.length">
+            <el-table
+              :data="formData.print_style"
+              size="large"
+              v-show="formData.print_style.length"
+            >
               <template #empty>
-                                <span>{{ formData.print_style.length == 0 ? t('emptyData') : '' }}</span>
+                <span>{{
+                  formData.print_style.length == 0 ? t('emptyData') : ''
+                }}</span>
               </template>
 
-                            <el-table-column prop="name" :label="t('printStyleName')" min-width="200">
+              <el-table-column
+                prop="name"
+                :label="t('printStyleName')"
+                min-width="200"
+              >
                 <template #default="{ row }">
-                                    <el-input v-model.trim="row.template_name" class="input-width" maxlength="20" clearable show-word-limit />
+                  <el-input
+                    v-model.trim="row.template_name"
+                    class="input-width"
+                    maxlength="20"
+                    clearable
+                    show-word-limit
+                  />
                 </template>
               </el-table-column>
 
-                            <el-table-column prop="name" :label="t('printStyleId')" min-width="120">
+              <el-table-column
+                prop="name"
+                :label="t('printStyleId')"
+                min-width="120"
+              >
                 <template #default="{ row }">
-                                    <el-input v-model.trim="row.template_size" class="!w-[150px]" maxlength="6" clearable show-word-limit />
+                  <el-input
+                    v-model.trim="row.template_size"
+                    class="!w-[150px]"
+                    maxlength="6"
+                    clearable
+                    show-word-limit
+                  />
                 </template>
               </el-table-column>
 
-                            <el-table-column :label="t('operation')" fixed="right" align="right" min-width="60">
-                                <template #default="{ row,$index }">
-                                    <el-button type="primary" link @click="deletePrintStyleValueEvent($index)">{{ t('delete') }}</el-button>
+              <el-table-column
+                :label="t('operation')"
+                fixed="right"
+                align="right"
+                min-width="60"
+              >
+                <template #default="{ row, $index }">
+                  <el-button
+                    type="primary"
+                    link
+                    @click="deletePrintStyleValueEvent($index)"
+                    >{{ t('delete') }}</el-button
+                  >
                 </template>
               </el-table-column>
-
             </el-table>
 
-                        <el-button type="primary" plain @click="addPrintStyleValueEvent" :class="{'mt-[10px]': formData.print_style.length}" v-show="formData.print_style.length < printStyleMaxLength">{{ t('addPrintStyle') }}</el-button>
+            <el-button
+              type="primary"
+              plain
+              @click="addPrintStyleValueEvent"
+              :class="{ 'mt-[10px]': formData.print_style.length }"
+              v-show="formData.print_style.length < printStyleMaxLength"
+              >{{ t('addPrintStyle') }}</el-button
+            >
             <div class="text-[12px] text-[#999] mt-[5px] leading-[20px]">
               <span>{{ t('printStyleTips') }}</span>
-                            <a class="ml-[3px] text-[var(--el-color-primary)]" target="_blank" href="https://www.yuque.com/kdnjishuzhichi/dfcrg1/vpptucr1q5ahcxa7">{{t('examine')}}</a>
+              <a
+                class="ml-[3px] text-[var(--el-color-primary)]"
+                target="_blank"
+                href="https://www.yuque.com/kdnjishuzhichi/dfcrg1/vpptucr1q5ahcxa7"
+                >{{ t('examine') }}</a
+              >
             </div>
-                        <p class="text-[12px] text-[#999] mt-[3px] leading-[20px]">{{ t('printStyleTips1') }}</p>
-                        <p class="text-[12px] text-[#999] mt-[3px] leading-[20px]">{{ t('printStyleTips2') }}</p>
+            <p class="text-[12px] text-[#999] mt-[3px] leading-[20px]">
+              {{ t('printStyleTips1') }}
+            </p>
+            <p class="text-[12px] text-[#999] mt-[3px] leading-[20px]">
+              {{ t('printStyleTips2') }}
+            </p>
           </div>
         </el-form-item>
-
       </el-form>
     </el-card>
     <div class="fixed-footer-wrap">
       <div class="fixed-footer">
-                <el-button type="primary" @click="save(formRef)">{{ t('save') }}</el-button>
+        <el-button type="primary" @click="save(formRef)">{{
+          t('save')
+        }}</el-button>
         <el-button @click="back()">{{ t('back') }}</el-button>
       </div>
     </div>
@@ -116,7 +271,11 @@
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import { addCompany, editCompany, getCompanyInfo } from '@/addon/shop/api/delivery'
+import {
+  addCompany,
+  editCompany,
+  getCompanyInfo,
+} from '@/addon/shop/api/delivery'
 import { FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import { filterNumber } from '@/utils/common'
@@ -139,10 +298,10 @@ const initialFormData = {
   logo: '',
   url: '',
   express_no: '',
-    express_no_electronic_sheet: "",
+  express_no_electronic_sheet: '',
   print_style: [],
   exp_type: [],
-    electronic_sheet_switch: 1
+  electronic_sheet_switch: 1,
 }
 
 const printStyleMaxLength = ref(10)
@@ -151,10 +310,10 @@ const expTypeMaxLength = ref(10)
 const formData: Record<string, any> = reactive({ ...initialFormData })
 formData.company_id = ref(route.query.company_id)
 
-const getCompanyInfoFn = ()=>{
-    getCompanyInfo(formData.company_id).then(res => {
-        loading.value = false;
-        let data = res.data;       
+const getCompanyInfoFn = () => {
+  getCompanyInfo(formData.company_id).then((res) => {
+    loading.value = false
+    let data = res.data
     if (data) {
       Object.keys(formData).forEach((key: string) => {
         if (data[key] != undefined) formData[key] = data[key]
@@ -162,10 +321,10 @@ const getCompanyInfoFn = ()=>{
     }
   })
 }
-if(formData.company_id){
-    getCompanyInfoFn();
-}else{
-    loading.value = false;
+if (formData.company_id) {
+  getCompanyInfoFn()
+} else {
+  loading.value = false
 }
 
 const formRef = ref<FormInstance>()
@@ -174,134 +333,133 @@ const formRef = ref<FormInstance>()
 const formRules = computed(() => {
   return {
     company_name: [
-            { required: true, message: t('companyNamePlaceholder'), trigger: 'blur' }
+      { required: true, message: t('companyNamePlaceholder'), trigger: 'blur' },
     ],
     exp_type: [
       {
         trigger: 'blur',
         validator: (rule: any, value: any, callback: any) => {
-                    if(!value.length){
+          if (!value.length) {
             callback()
-                        return false;
+            return false
           }
-                    let textArr = []; //业务名称集合
-                    let valArr = []; //业务值集合
-                    for(let i = 0; i < value.length; i++){
-                        if(!value[i].text){
+          let textArr = [] //业务名称集合
+          let valArr = [] //业务值集合
+          for (let i = 0; i < value.length; i++) {
+            if (!value[i].text) {
               callback(new Error(t('expTypeTextTips')))
-                            break;
-                        }else if(value[i].text){
-                            textArr.push(value[i].text);
+              break
+            } else if (value[i].text) {
+              textArr.push(value[i].text)
             }
-                        if(!value[i].value){
+            if (!value[i].value) {
               callback(new Error(t('expTypeValueTips')))
-                            break;
-                        }else if(parseFloat(value[i].value) == 0 ){
+              break
+            } else if (parseFloat(value[i].value) == 0) {
               callback(new Error(t('expTypeValueNullTips')))
-                            break;
-                        }else if(value[i].value){
-                            valArr.push(value[i].value);
+              break
+            } else if (value[i].value) {
+              valArr.push(value[i].value)
             }
           }
-                    if(new Set(textArr).size !== textArr.length){
+          if (new Set(textArr).size !== textArr.length) {
             callback(new Error(t('expTypeTextRepeatTips')))
           }
-                    if(new Set(valArr).size !== valArr.length){
+          if (new Set(valArr).size !== valArr.length) {
             callback(new Error(t('expTypeValueRepeatTips')))
           }
           callback()
-                }
-            }
+        },
+      },
     ],
     print_style: [
       {
         trigger: 'blur',
         validator: (rule: any, value: any, callback: any) => {
-                    if(!value.length){
+          if (!value.length) {
             callback()
-                        return false;
+            return false
           }
-                    let nameArr = []; //业务名称集合
-                    let sizeArr = []; //业务值集合
-                    for(let i = 0; i < value.length; i++){
-                        if(!value[i].template_name){
+          let nameArr = [] //业务名称集合
+          let sizeArr = [] //业务值集合
+          for (let i = 0; i < value.length; i++) {
+            if (!value[i].template_name) {
               callback(new Error(t('printStyleNameTips')))
-                            break;
-                        }else if(value[i].template_name){
-                            nameArr.push(value[i].template_name);
+              break
+            } else if (value[i].template_name) {
+              nameArr.push(value[i].template_name)
             }
-                        if(!value[i].template_size){
+            if (!value[i].template_size) {
               callback(new Error(t('printStyleSizeTips')))
-                            break;
-                        }else if(value[i].template_size){
-                            sizeArr.push(value[i].template_size);
+              break
+            } else if (value[i].template_size) {
+              sizeArr.push(value[i].template_size)
             }
           }
-                    if(new Set(nameArr).size !== nameArr.length){
+          if (new Set(nameArr).size !== nameArr.length) {
             callback(new Error(t('printStyleNameRepeatTips')))
           }
-                    if(new Set(sizeArr).size !== sizeArr.length){
+          if (new Set(sizeArr).size !== sizeArr.length) {
             callback(new Error(t('printStyleSizeRepeatTips')))
           }
           callback()
-                }
-            }
-        ]
+        },
+      },
+    ],
   }
 })
 
 // 添加模版样式
-const addPrintStyleValueEvent = ()=>{
+const addPrintStyleValueEvent = () => {
   formData.print_style.push({
     template_name: '',
-        template_size: ''
+    template_size: '',
   })
 }
 
 // 添加业务类型
-const addExpTypeValueEvent = ()=>{
+const addExpTypeValueEvent = () => {
   formData.exp_type.push({
     text: '',
-        value: ''
+    value: '',
   })
 }
 
 // 删除模版样式
-const deletePrintStyleValueEvent = (index:any)=>{
-    formData.print_style.splice(index,1)
+const deletePrintStyleValueEvent = (index: any) => {
+  formData.print_style.splice(index, 1)
 }
 
 // 删除业务类型
-const deleteExpTypeValueEvent = (index:any)=>{
-    formData.exp_type.splice(index,1)
+const deleteExpTypeValueEvent = (index: any) => {
+  formData.exp_type.splice(index, 1)
 }
 
 /**
  * 确认
  * @param formEl
-*/
+ */
 const repeat = ref(false)
 const save = async (formEl: FormInstance | undefined) => {
   if (repeat.value || !formEl) return
   const api = formData.company_id ? editCompany : addCompany
 
   await formEl.validate(async (valid) => {
-        
     if (valid) {
       repeat.value = true
 
       const data = formData
-            api(data).then(res => {
+      api(data)
+        .then((res) => {
           router.push('/shop/order/delivery/company')
           repeat.value = false
-            }).catch(() => {
+        })
+        .catch(() => {
           repeat.value = false
         })
     }
   })
 }
-
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

admin/src/addon/shop/views/delivery/components/delivery-personnel-edit.vue

@@ -1,17 +1,50 @@
 <template>
-	<el-dialog v-model="showDialog" :title="formData.deliver_id ? t('updateDeliver') : t('addDeliveryPersonnel')"   width="480" class="diy-dialog-wrap" :destroy-on-close="true">
-		<el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+  <el-dialog
+    v-model="showDialog"
+    :title="
+      formData.deliver_id ? t('updateDeliver') : t('addDeliveryPersonnel')
+    "
+    width="480"
+    class="diy-dialog-wrap"
+    :destroy-on-close="true"
+  >
+    <el-form
+      :model="formData"
+      label-width="120px"
+      ref="formRef"
+      :rules="formRules"
+      class="page-form"
+      v-loading="loading"
+    >
       <el-form-item :label="t('deliverName')" prop="deliver_name">
-				<el-input v-model.trim="formData.deliver_name" clearable :placeholder="t('deliverNamePlaceholder')"  class="input-width" maxlength="10"/>
+        <el-input
+          v-model.trim="formData.deliver_name"
+          clearable
+          :placeholder="t('deliverNamePlaceholder')"
+          class="input-width"
+          maxlength="10"
+        />
       </el-form-item>
       <el-form-item :label="t('deliverMobile')" prop="deliver_mobile">
-				<el-input v-model.trim="formData.deliver_mobile" clearable :placeholder="t('deliverMobilePlaceholder')"  class="input-width" @keyup="filterNumber($event)" @blur="formData.deliver_mobile = $event.target.value" />
+        <el-input
+          v-model.trim="formData.deliver_mobile"
+          clearable
+          :placeholder="t('deliverMobilePlaceholder')"
+          class="input-width"
+          @keyup="filterNumber($event)"
+          @blur="formData.deliver_mobile = $event.target.value"
+        />
       </el-form-item>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+        <el-button
+          type="primary"
+          :loading="loading"
+          @click="confirm(formRef)"
+          >{{ t('confirm') }}</el-button
+        >
       </span>
     </template>
   </el-dialog>
@@ -21,7 +54,11 @@
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import { addShopDeliver, editShopDeliver, getShopDeliverInfo } from '@/addon/shop/api/delivery'
+import {
+  addShopDeliver,
+  editShopDeliver,
+  getShopDeliverInfo,
+} from '@/addon/shop/api/delivery'
 import { filterNumber } from '@/utils/common'
 
 const showDialog = ref(false)
@@ -33,7 +70,7 @@ const loading = ref(false)
 const initialFormData = {
   deliver_id: '',
   deliver_name: '',
-    deliver_mobile: ''
+  deliver_mobile: '',
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -43,17 +80,21 @@ const formRef = ref<FormInstance>()
 const formRules = computed(() => {
   return {
     deliver_name: [
-            { required: true, message: t('deliverNamePlaceholder'), trigger: 'blur' }
+      { required: true, message: t('deliverNamePlaceholder'), trigger: 'blur' },
     ],
     deliver_mobile: [
-            { required: true, message: t('deliverMobilePlaceholder'), trigger: 'blur' },
+      {
+        required: true,
+        message: t('deliverMobilePlaceholder'),
+        trigger: 'blur',
+      },
       { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
       {
-                pattern :/^1[23456789]\d{9}$/,
+        pattern: /^1[23456789]\d{9}$/,
         message: '请输入正确的手机号码',
-                trigger: 'blur'
-            }
-        ]
+        trigger: 'blur',
+      },
+    ],
   }
 })
 
@@ -73,11 +114,13 @@ const confirm = async (formEl: FormInstance | undefined) => {
 
       const data = formData
 
-            save(data).then(res => {
+      save(data)
+        .then((res) => {
           loading.value = false
           showDialog.value = false
           emit('complete')
-            }).catch(() => {
+        })
+        .catch(() => {
           loading.value = false
         })
     }
@@ -100,13 +143,13 @@ const setFormData = async (row: any = null) => {
 
 defineExpose({
   showDialog,
-    setFormData
+  setFormData,
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-	.diy-dialog-wrap .el-form-item__label {
+.diy-dialog-wrap .el-form-item__label {
   height: auto !important;
-	}
+}
 </style>

admin/src/addon/shop/views/delivery/config.vue

@@ -3,7 +3,12 @@
     <div class="flex ml-[18px] justify-between items-center mt-[20px]">
       <span class="text-page-title">{{ pageName }}</span>
     </div>
-		<div class="p-[18px] logistics-body" ref="tableRef" :key="toggleIndex" v-if="!loading">
+    <div
+      class="p-[18px] logistics-body"
+      ref="tableRef"
+      :key="toggleIndex"
+      v-if="!loading"
+    >
       <template v-for="(item, index) in tableData" :key="item.key">
         <div class="mb-[20px] bg-[#fff]">
           <el-card shadow="never">
@@ -11,29 +16,76 @@
               <div class="flex items-center justify-between">
                 <div class="flex items-center">
                   <i class="iconfont icontuodong vues-rank mr-[5px]"></i>
-									<el-input v-focus v-if="index === activeIndex" v-model.trim="inputValue"  class="w-[120px]"  maxlength="10"  @blur="inputBlur"/>
-									<span v-else class="font-600 text-[14px]">{{ item.name }}</span>
-									<el-icon class="text-color ml-[10px] cursor-pointer" @click="edit(index)">
-										<EditPen/>
+                  <el-input
+                    v-focus
+                    v-if="index === activeIndex"
+                    v-model.trim="inputValue"
+                    class="w-[120px]"
+                    maxlength="10"
+                    @blur="inputBlur"
+                  />
+                  <span v-else class="font-600 text-[14px]">{{
+                    item.name
+                  }}</span>
+                  <el-icon
+                    class="text-color ml-[10px] cursor-pointer"
+                    @click="edit(index)"
+                  >
+                    <EditPen />
                   </el-icon>
                 </div>
-								<el-switch v-model="item.status" active-value="1" inactive-value="2" @change="update(item)"/>
+                <el-switch
+                  v-model="item.status"
+                  active-value="1"
+                  inactive-value="2"
+                  @change="update(item)"
+                />
               </div>
             </template>
             <div class="flex items-center justify-between">
               <span class="text-[#666666] text-[14px]">{{ t(item.key) }}</span>
               <div>
                 <template v-if="item.key === 'local_delivery'">
-									<el-button type="primary" link @click="goRouter('/shop/order/delivery/staff')">{{ t('deliveryStaff') }}</el-button>
-									<el-button type="primary" link @click="goRouter('/shop/order/delivery/local')">{{ t('localConfig') }}</el-button>
+                  <el-button
+                    type="primary"
+                    link
+                    @click="goRouter('/shop/order/delivery/staff')"
+                    >{{ t('deliveryStaff') }}</el-button
+                  >
+                  <el-button
+                    type="primary"
+                    link
+                    @click="goRouter('/shop/order/delivery/local')"
+                    >{{ t('localConfig') }}</el-button
+                  >
                 </template>
                 <template v-if="item.key === 'express'">
-									<el-button type="primary" link @click="goRouter('/shop/order/delivery/company')">{{ t('deliveryCompany') }}</el-button>
-									<el-button type="primary" link @click="goRouter('/shop/order/shipping/template')">{{ t('deliveryTemplate') }}</el-button>
-									<el-button type="primary" link @click="goRouter('/shop/order/delivery/search')">{{ t('deliverySearch') }}</el-button>
+                  <el-button
+                    type="primary"
+                    link
+                    @click="goRouter('/shop/order/delivery/company')"
+                    >{{ t('deliveryCompany') }}</el-button
+                  >
+                  <el-button
+                    type="primary"
+                    link
+                    @click="goRouter('/shop/order/shipping/template')"
+                    >{{ t('deliveryTemplate') }}</el-button
+                  >
+                  <el-button
+                    type="primary"
+                    link
+                    @click="goRouter('/shop/order/delivery/search')"
+                    >{{ t('deliverySearch') }}</el-button
+                  >
                 </template>
                 <template v-if="item.key === 'store'">
-									<el-button type="primary" link @click="goRouter('/shop/order/delivery/store')">{{ t('deliveryStore') }}</el-button>
+                  <el-button
+                    type="primary"
+                    link
+                    @click="goRouter('/shop/order/delivery/store')"
+                    >{{ t('deliveryStore') }}</el-button
+                  >
                 </template>
               </div>
             </div>
@@ -47,7 +99,10 @@
 import { onMounted, nextTick, ref, toRaw } from 'vue'
 import { t } from '@/lang'
 import Sortable from 'sortablejs'
-import { getShopDeliveryList, setShopDeliveryConfig } from '@/addon/shop/api/delivery'
+import {
+  getShopDeliveryList,
+  setShopDeliveryConfig,
+} from '@/addon/shop/api/delivery'
 import { useRoute, useRouter } from 'vue-router'
 
 const route = useRoute()
@@ -62,13 +117,15 @@ interface TableDataType {
 const tableData = ref<TableDataType[]>([])
 const getShopDeliveryListFn = () => {
   loading.value = true
-    getShopDeliveryList().then(res => {
+  getShopDeliveryList()
+    .then((res) => {
       tableData.value = res.data
       loading.value = false
       nextTick(() => {
-            if(rowDrop) rowDrop()
+        if (rowDrop) rowDrop()
       })
-    }).catch(() => {
+    })
+    .catch(() => {
       loading.value = false
     })
 }
@@ -82,7 +139,7 @@ const rowDrop = () => {
   Sortable.create(tableRef.value, {
     handle: '.vues-rank',
     animation: 300,
-        onEnd ({ newIndex, oldIndex }) {
+    onEnd({ newIndex, oldIndex }) {
       const currRow = tableData.value.splice(oldIndex, 1)[0]
       tableData.value.splice(newIndex, 0, currRow)
       toggleIndex.value += 1
@@ -90,19 +147,22 @@ const rowDrop = () => {
         rowDrop()
       })
       update()
-        }
+    },
   })
 }
 
 // 编辑名称
-const activeIndex = ref<number|null>(null)
+const activeIndex = ref<number | null>(null)
 const inputValue = ref('')
 const edit = (index: number) => {
   activeIndex.value = index
   inputValue.value = toRaw(tableData.value[index].name)
 }
 const inputBlur = () => {
-    if (inputValue.value == '' || tableData.value[activeIndex.value].name === inputValue.value) {
+  if (
+    inputValue.value == '' ||
+    tableData.value[activeIndex.value].name === inputValue.value
+  ) {
     activeIndex.value = null
     inputValue.value = ''
     return false
@@ -113,7 +173,7 @@ const inputBlur = () => {
 }
 const update = () => {
   setShopDeliveryConfig({
-        value: tableData.value
+    value: tableData.value,
   })
 }
 const goRouter = (path: string) => {
@@ -121,16 +181,16 @@ const goRouter = (path: string) => {
 }
 </script>
 <style lang="scss" scoped>
-	.main-container {
+.main-container {
   min-height: calc(100vh - 64px);
-	}
+}
 
-	.text-color {
+.text-color {
   color: var(--el-color-primary);
-	}
+}
 
-	:deep(.el-card__header) {
+:deep(.el-card__header) {
   padding-top: 5px !important;
   padding-bottom: 5px !important;
-	}
+}
 </style>

admin/src/addon/shop/views/delivery/electronic_sheet.vue

@@ -1,80 +1,159 @@
 <template>
   <div class="main-container">
     <el-card class="box-card !border-none" shadow="never">
-
       <div class="flex justify-between items-center mb-[5px]">
-                <span class="text-lg">{{pageName}}</span>
+        <span class="text-lg">{{ pageName }}</span>
         <el-button type="primary" @click="addEvent">
           {{ t('addElectronicSheet') }}
         </el-button>
       </div>
 
-            <el-tabs model-value="/shop/delivery/electronic_sheet" @tab-change="handleClick">
-                <el-tab-pane :label="t('tabESTemplate')" name="/shop/delivery/electronic_sheet" />
-                <el-tab-pane :label="t('tabESConfig')" name="/shop/delivery/electronic_sheet/config" />
+      <el-tabs
+        model-value="/shop/delivery/electronic_sheet"
+        @tab-change="handleClick"
+      >
+        <el-tab-pane
+          :label="t('tabESTemplate')"
+          name="/shop/delivery/electronic_sheet"
+        />
+        <el-tab-pane
+          :label="t('tabESConfig')"
+          name="/shop/delivery/electronic_sheet/config"
+        />
       </el-tabs>
 
-            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-                <el-form :inline="true" :model="tableData.searchParam" ref="searchFormRef">
+      <el-card
+        class="box-card !border-none my-[10px] table-search-wrap"
+        shadow="never"
+      >
+        <el-form
+          :inline="true"
+          :model="tableData.searchParam"
+          ref="searchFormRef"
+        >
           <el-form-item :label="t('templateName')" prop="template_name">
-                        <el-input v-model.trim="tableData.searchParam.template_name" :placeholder="t('templateNamePlaceholder')" maxlength="30" />
+            <el-input
+              v-model.trim="tableData.searchParam.template_name"
+              :placeholder="t('templateNamePlaceholder')"
+              maxlength="30"
+            />
           </el-form-item>
 
           <el-form-item :label="t('expressCompany')" prop="express_company_id">
-                        <el-select v-model="tableData.searchParam.express_company_id" :placeholder="t('expressCompanyPlaceholder')" clearable>
-                            <el-option v-for="item in companyList" :key="item.company_id" :label="item.company_name" :value="item.company_id" />
+            <el-select
+              v-model="tableData.searchParam.express_company_id"
+              :placeholder="t('expressCompanyPlaceholder')"
+              clearable
+            >
+              <el-option
+                v-for="item in companyList"
+                :key="item.company_id"
+                :label="item.company_name"
+                :value="item.company_id"
+              />
             </el-select>
           </el-form-item>
 
           <el-form-item>
-                        <el-button type="primary" @click="loadList()">{{ t('search') }}</el-button>
-                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+            <el-button type="primary" @click="loadList()">{{
+              t('search')
+            }}</el-button>
+            <el-button @click="resetForm(searchFormRef)">{{
+              t('reset')
+            }}</el-button>
           </el-form-item>
         </el-form>
       </el-card>
 
       <div class="mt-[10px]">
-                <el-table :data="tableData.data" size="large" v-loading="tableData.loading">
+        <el-table
+          :data="tableData.data"
+          size="large"
+          v-loading="tableData.loading"
+        >
           <template #empty>
             <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
           </template>
-                    <el-table-column :label="t('templateName')" min-width="200" :show-overflow-tooltip="true">
+          <el-table-column
+            :label="t('templateName')"
+            min-width="200"
+            :show-overflow-tooltip="true"
+          >
             <template #default="{ row }">
-                            <el-tag size="small" v-if="row.is_default">{{ t('isDefault') }}</el-tag>
-                            <span class="ml-[8px]">{{row.template_name}}</span>
+              <el-tag size="small" v-if="row.is_default">{{
+                t('isDefault')
+              }}</el-tag>
+              <span class="ml-[8px]">{{ row.template_name }}</span>
             </template>
           </el-table-column>
 
-                    <el-table-column prop="express_company_id" :label="t('expressCompany')" min-width="120" :show-overflow-tooltip="true">
+          <el-table-column
+            prop="express_company_id"
+            :label="t('expressCompany')"
+            min-width="120"
+            :show-overflow-tooltip="true"
+          >
             <template #default="{ row }">
               <div>{{ row.company.company_name }}</div>
             </template>
           </el-table-column>
-                    <el-table-column prop="pay_type_name" :label="t('payType')" min-width="80" :show-overflow-tooltip="true"/>
+          <el-table-column
+            prop="pay_type_name"
+            :label="t('payType')"
+            min-width="80"
+            :show-overflow-tooltip="true"
+          />
 
-                    <el-table-column prop="status" :label="t('status')" min-width="80" :show-overflow-tooltip="true" >
+          <el-table-column
+            prop="status"
+            :label="t('status')"
+            min-width="80"
+            :show-overflow-tooltip="true"
+          >
             <template #default="{ row }">
               <div v-if="row.status == 1">{{ t('statusOn') }}</div>
               <div v-if="row.status == 0">{{ t('statusOff') }}</div>
             </template>
           </el-table-column>
 
-                    <el-table-column :label="t('operation')" fixed="right" min-width="80" align="right">
+          <el-table-column
+            :label="t('operation')"
+            fixed="right"
+            min-width="80"
+            align="right"
+          >
             <template #default="{ row }">
-                           <el-button type="primary" link v-if="!row.is_default" @click="setDefaultEvent(row.id)">{{ t('setDefault') }}</el-button>
-                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-                           <el-button type="primary" link v-if="!row.is_default" @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+              <el-button
+                type="primary"
+                link
+                v-if="!row.is_default"
+                @click="setDefaultEvent(row.id)"
+                >{{ t('setDefault') }}</el-button
+              >
+              <el-button type="primary" link @click="editEvent(row)">{{
+                t('edit')
+              }}</el-button>
+              <el-button
+                type="primary"
+                link
+                v-if="!row.is_default"
+                @click="deleteEvent(row.id)"
+                >{{ t('delete') }}</el-button
+              >
             </template>
           </el-table-column>
-
         </el-table>
         <div class="mt-[16px] flex justify-end">
-                    <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit"
-                        layout="total, sizes, prev, pager, next, jumper" :total="tableData.total"
-                        @size-change="loadList()" @current-change="loadList" />
+          <el-pagination
+            v-model:current-page="tableData.page"
+            v-model:page-size="tableData.limit"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="tableData.total"
+            @size-change="loadList()"
+            @current-change="loadList"
+          />
         </div>
       </div>
-
     </el-card>
   </div>
 </template>
@@ -82,14 +161,18 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import { getElectronicSheetPageList, deleteElectronicSheet, setDefaultElectronicSheet } from '@/addon/shop/api/electronic_sheet'
-import { ElMessageBox,FormInstance } from 'element-plus'
-import { useRoute,useRouter } from 'vue-router'
+import {
+  getElectronicSheetPageList,
+  deleteElectronicSheet,
+  setDefaultElectronicSheet,
+} from '@/addon/shop/api/electronic_sheet'
+import { ElMessageBox, FormInstance } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
 import { getCompanyList } from '@/addon/shop/api/delivery'
 
 const route = useRoute()
 const router = useRouter()
-const pageName = route.meta.title;
+const pageName = route.meta.title
 
 const tableData = reactive({
   page: 1,
@@ -98,9 +181,9 @@ const tableData = reactive({
   loading: true,
   data: [],
   searchParam: {
-        template_name: "",
-        express_company_id: "",
-    }
+    template_name: '',
+    express_company_id: '',
+  },
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -119,12 +202,14 @@ const loadList = (page: number = 1) => {
   getElectronicSheetPageList({
     page: tableData.page,
     limit: tableData.limit,
-         ...tableData.searchParam
-    }).then(res => {
+    ...tableData.searchParam,
+  })
+    .then((res) => {
       tableData.loading = false
       tableData.data = res.data.data
       tableData.total = res.data.total
-    }).catch(() => {
+    })
+    .catch(() => {
       tableData.loading = false
     })
 }
@@ -134,9 +219,9 @@ loadList()
 const companyList = ref([])
 
 getCompanyList({
-    electronic_sheet_switch: 1
-}).then((res:any)=>{
-    companyList.value = res.data;
+  electronic_sheet_switch: 1,
+}).then((res: any) => {
+  companyList.value = res.data
 })
 
 /**
@@ -158,13 +243,11 @@ const editEvent = (data: any) => {
  * 删除电子面单
  */
 const deleteEvent = (id: number) => {
-    ElMessageBox.confirm(t('electronicSheetDeleteTips'), t('warning'),
-        {
+  ElMessageBox.confirm(t('electronicSheetDeleteTips'), t('warning'), {
     confirmButtonText: t('confirm'),
     cancelButtonText: t('cancel'),
     type: 'warning',
-        }
-    ).then(() => {
+  }).then(() => {
     deleteElectronicSheet(id).then(() => {
       loadList()
     })
@@ -174,14 +257,12 @@ const deleteEvent = (id: number) => {
  * 设置默认电子面单模版
  */
 const setDefaultEvent = (id: number) => {
-    ElMessageBox.confirm(t('electronicSheetSetDefaultTips'), t('warning'),
-        {
+  ElMessageBox.confirm(t('electronicSheetSetDefaultTips'), t('warning'), {
     confirmButtonText: t('confirm'),
     cancelButtonText: t('cancel'),
     type: 'warning',
-        }
-    ).then(() => {
-        setDefaultElectronicSheet({id}).then(() => {
+  }).then(() => {
+    setDefaultElectronicSheet({ id }).then(() => {
       loadList()
     })
   })
@@ -194,5 +275,4 @@ const resetForm = (formEl: FormInstance | undefined) => {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

admin/src/addon/shop/views/delivery/electronic_sheet_config.vue

@@ -1,17 +1,32 @@
 <template>
   <div class="main-container">
     <el-card class="box-card !border-none" shadow="never">
-
       <div class="flex justify-between items-center mb-[5px] h-[32px]">
-				<span class="text-lg">{{pageName}}</span>
+        <span class="text-lg">{{ pageName }}</span>
       </div>
 
-			<el-tabs model-value="/shop/delivery/electronic_sheet/config" @tab-change="handleClick">
-				<el-tab-pane :label="t('tabESTemplate')" name="/shop/delivery/electronic_sheet" />
-				<el-tab-pane :label="t('tabESConfig')" name="/shop/delivery/electronic_sheet/config" />
+      <el-tabs
+        model-value="/shop/delivery/electronic_sheet/config"
+        @tab-change="handleClick"
+      >
+        <el-tab-pane
+          :label="t('tabESTemplate')"
+          name="/shop/delivery/electronic_sheet"
+        />
+        <el-tab-pane
+          :label="t('tabESConfig')"
+          name="/shop/delivery/electronic_sheet/config"
+        />
       </el-tabs>
 
-			<el-form class="page-form" :model="formData" :rules="formRules" label-width="150px" ref="formRef" v-loading="loading">
+      <el-form
+        class="page-form"
+        :model="formData"
+        :rules="formRules"
+        label-width="150px"
+        ref="formRef"
+        v-loading="loading"
+      >
         <el-card class="box-card !border-none" shadow="never">
           <h3 class="panel-title !text-sm">{{ t('apiSet') }}</h3>
 
@@ -22,29 +37,47 @@
               </el-radio-group>
               <template v-if="formData.interface_type == 'kdbird'">
                 <p class="text-[12px] text-[#b2b2b2]">
-									{{ t('promptTips1-1') }}<el-button class="button-size" type="primary" link @click="kdnEvent('https://www.kdniao.com')">https://www.kdniao.com</el-button>
+                  {{ t('promptTips1-1')
+                  }}<el-button
+                    class="button-size"
+                    type="primary"
+                    link
+                    @click="kdnEvent('https://www.kdniao.com')"
+                    >https://www.kdniao.com</el-button
+                  >
                 </p>
               </template>
             </div>
           </el-form-item>
           <div v-if="formData.interface_type == 'kdbird'">
-
             <el-form-item :label="t('kdnEBusinessIDLabel')" class="input-item">
               <div>
-								<el-input v-model.trim="formData.kdniao_id" :placeholder="t('kdnEBusinessIDPlaceholder')" class="input-width" clearable />
-								<p class="text-[12px] text-[#b2b2b2]">{{ t('kdnEBusinessIDTips') }}</p>
+                <el-input
+                  v-model.trim="formData.kdniao_id"
+                  :placeholder="t('kdnEBusinessIDPlaceholder')"
+                  class="input-width"
+                  clearable
+                />
+                <p class="text-[12px] text-[#b2b2b2]">
+                  {{ t('kdnEBusinessIDTips') }}
+                </p>
               </div>
             </el-form-item>
 
             <el-form-item label="API key" class="input-item">
               <div>
-								<el-input v-model.trim="formData.kdniao_api_key" clearable :placeholder="t('kdnAppKeyPlaceholder')" class="input-width" />
-								<p class="text-[12px] text-[#b2b2b2]">{{ t('kdnAppKeyTips') }}</p>
+                <el-input
+                  v-model.trim="formData.kdniao_api_key"
+                  clearable
+                  :placeholder="t('kdnAppKeyPlaceholder')"
+                  class="input-width"
+                />
+                <p class="text-[12px] text-[#b2b2b2]">
+                  {{ t('kdnAppKeyTips') }}
+                </p>
               </div>
             </el-form-item>
-
           </div>
-
         </el-card>
 
         <el-card class="box-card !border-none" shadow="never">
@@ -52,42 +85,78 @@
 
           <el-alert type="warning" :closable="false" class="!mb-[10px]">
             <template #default>
-							<p>用双端口加载主JS文件Lodop.js（或CLodopfuncs.js兼容老版本）以防其中某端口被占</p>
+              <p>
+                用双端口加载主JS文件Lodop.js（或CLodopfuncs.js兼容老版本）以防其中某端口被占
+              </p>
               <p>HTTP推荐端口：8000/18000，HTTPS推荐端口：8443</p>
-							<p>1. 请将打印机连接至本机。 </p>
-							<p>2. 在本机上安装打印控件。下载链接：<a href="http://www.lodop.net/download.html" target="_blank" class="text-primary">http://www.lodop.net/download.html</a></p>
+              <p>1. 请将打印机连接至本机。</p>
+              <p>
+                2. 在本机上安装打印控件。下载链接：<a
+                  href="http://www.lodop.net/download.html"
+                  target="_blank"
+                  class="text-primary"
+                  >http://www.lodop.net/download.html</a
+                >
+              </p>
               <p>3. 将打印控件中的打印端口下面的打印端口设为相同。</p>
             </template>
           </el-alert>
 
-					<el-form-item :label="t('serverPort1')" class="input-item-required" prop="server_port1">
+          <el-form-item
+            :label="t('serverPort1')"
+            class="input-item-required"
+            prop="server_port1"
+          >
             <div>
-							<el-input v-model.trim="formData.server_port1" :placeholder="t('serverPort1Placeholder')" class="input-width" clearable />
+              <el-input
+                v-model.trim="formData.server_port1"
+                :placeholder="t('serverPort1Placeholder')"
+                class="input-width"
+                clearable
+              />
             </div>
           </el-form-item>
 
-					<el-form-item :label="t('serverPort2')" class="input-item-required" prop="server_port2">
+          <el-form-item
+            :label="t('serverPort2')"
+            class="input-item-required"
+            prop="server_port2"
+          >
             <div>
-							<el-input v-model.trim="formData.server_port2" :placeholder="t('serverPort2Placeholder')" class="input-width" clearable />
+              <el-input
+                v-model.trim="formData.server_port2"
+                :placeholder="t('serverPort2Placeholder')"
+                class="input-width"
+                clearable
+              />
             </div>
           </el-form-item>
 
-					<el-form-item :label="t('httpsPort')" class="input-item-required" prop="https_port">
+          <el-form-item
+            :label="t('httpsPort')"
+            class="input-item-required"
+            prop="https_port"
+          >
             <div>
-							<el-input v-model.trim="formData.https_port" :placeholder="t('httpsPortPlaceholder')" class="input-width" clearable />
+              <el-input
+                v-model.trim="formData.https_port"
+                :placeholder="t('httpsPortPlaceholder')"
+                class="input-width"
+                clearable
+              />
             </div>
           </el-form-item>
-
         </el-card>
       </el-form>
 
       <div class="fixed-footer-wrap">
         <div class="fixed-footer">
-					<el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+          <el-button type="primary" :loading="loading" @click="save(formRef)">{{
+            t('save')
+          }}</el-button>
         </div>
       </div>
     </el-card>
-
   </div>
 </template>
 
@@ -95,25 +164,28 @@
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
 import { FormInstance, FormRules } from 'element-plus'
-import { useRoute,useRouter } from 'vue-router'
-import { setElectronicSheetConfig, getElectronicSheetConfig } from '@/addon/shop/api/electronic_sheet'
+import { useRoute, useRouter } from 'vue-router'
+import {
+  setElectronicSheetConfig,
+  getElectronicSheetConfig,
+} from '@/addon/shop/api/electronic_sheet'
 
 const route = useRoute()
 const router = useRouter()
-const pageName = route.meta.title;
+const pageName = route.meta.title
 const loading = ref(true)
 
 const handleClick = (path: string) => {
   router.push({ path })
 }
 
-const formData:any = reactive({
+const formData: any = reactive({
   interface_type: 'kdbird',
   kdniao_id: '',
   kdniao_api_key: '',
   server_port1: '8000',
   server_port2: '18000',
-    https_port: '8443'
+  https_port: '8443',
 })
 
 const setFormData = async () => {
@@ -126,7 +198,7 @@ const setFormData = async () => {
 }
 setFormData()
 
-const kdnEvent = (url:any) => {
+const kdnEvent = (url: any) => {
   window.open(url, '_blank')
 }
 
@@ -154,24 +226,25 @@ const save = async (formEl: FormInstance | undefined) => {
   await formEl.validate(async (valid) => {
     if (valid) {
       loading.value = true
-            setElectronicSheetConfig(formData).then(() => {
+      setElectronicSheetConfig(formData)
+        .then(() => {
           loading.value = false
-            }).catch(() => {
+        })
+        .catch(() => {
           loading.value = false
         })
     }
   })
 }
-
 </script>
 
 <style lang="scss" scoped>
 .input-item {
-	margin-bottom: 10px !important
+  margin-bottom: 10px !important;
 }
 
 .input-item-required {
-	margin-bottom: 20px !important
+  margin-bottom: 20px !important;
 }
 
 .button-size {
@@ -179,6 +252,6 @@ const save = async (formEl: FormInstance | undefined) => {
 }
 
 .el-radio.el-radio--large {
-	height: auto !important
+  height: auto !important;
 }
 </style>

admin/src/addon/shop/views/delivery/electronic_sheet_edit.vue

@@ -4,85 +4,179 @@
       <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
     </el-card>
 
-		<el-form class="page-form" :model="formData" :rules="formRules" label-width="150px" ref="formRef" v-loading="loading">
+    <el-form
+      class="page-form"
+      :model="formData"
+      :rules="formRules"
+      label-width="150px"
+      ref="formRef"
+      v-loading="loading"
+    >
       <el-card class="box-card !border-none" shadow="never">
-
         <h3 class="panel-title !text-sm">{{ t('basicSettings') }}</h3>
         <el-form-item :label="t('templateName')" prop="template_name">
-					<el-input v-model.trim="formData.template_name" clearable :placeholder="t('templateNamePlaceholder')" class="input-width" maxlength="30" />
+          <el-input
+            v-model.trim="formData.template_name"
+            clearable
+            :placeholder="t('templateNamePlaceholder')"
+            class="input-width"
+            maxlength="30"
+          />
         </el-form-item>
 
         <el-form-item :label="t('expressCompany')" prop="express_company_id">
-					<el-select v-model="formData.express_company_id" :placeholder="t('expressCompanyPlaceholder')" clearable @change="handleSelectCompanyChange">
-						<el-option v-for="item in companyList" :key="item.company_id" :label="item.company_name" :value="item.company_id" />
+          <el-select
+            v-model="formData.express_company_id"
+            :placeholder="t('expressCompanyPlaceholder')"
+            clearable
+            @change="handleSelectCompanyChange"
+          >
+            <el-option
+              v-for="item in companyList"
+              :key="item.company_id"
+              :label="item.company_name"
+              :value="item.company_id"
+            />
           </el-select>
         </el-form-item>
 
-				<el-form-item :label="t('expType')" prop="exp_type" v-show="expTypeList.length">
+        <el-form-item
+          :label="t('expType')"
+          prop="exp_type"
+          v-show="expTypeList.length"
+        >
           <el-radio-group v-model="formData.exp_type">
-						<el-radio v-for="(item,index) in expTypeList" :key="index" :value="item.value">{{ item.text }}</el-radio>
+            <el-radio
+              v-for="(item, index) in expTypeList"
+              :key="index"
+              :value="item.value"
+              >{{ item.text }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
 
         <el-form-item :label="t('printStyle')" v-show="printStyleList.length">
           <div>
-						<el-select v-model="formData.print_style" :placeholder="t('printStylePlaceholder')" clearable>
-							<el-option v-for="(item,index) in printStyleList" :key="index" :label="item.template_name" :value="item.template_size" />
+            <el-select
+              v-model="formData.print_style"
+              :placeholder="t('printStylePlaceholder')"
+              clearable
+            >
+              <el-option
+                v-for="(item, index) in printStyleList"
+                :key="index"
+                :label="item.template_name"
+                :value="item.template_size"
+              />
             </el-select>
-						<div class="text-[12px] text-[#999] mt-[3px] leading-[20px]">{{ t('printStyleTips1') }}</div>
-						<div class="text-[12px] text-[#999] mt-[3px] leading-[20px]">{{ t('printStyleTips2') }}</div>
+            <div class="text-[12px] text-[#999] mt-[3px] leading-[20px]">
+              {{ t('printStyleTips1') }}
+            </div>
+            <div class="text-[12px] text-[#999] mt-[3px] leading-[20px]">
+              {{ t('printStyleTips2') }}
+            </div>
           </div>
         </el-form-item>
-
       </el-card>
       <el-card class="box-card !border-none" shadow="never">
         <h3 class="panel-title !text-sm">{{ t('otherSettings') }}</h3>
 
         <el-form-item :label="t('customerName')">
           <div>
-                        <el-input v-model.trim="formData.customer_name" clearable class="input-width" maxlength="20" />
-                        <div class="flex items-center mt-[5px] text-[12px] text-[#999] leading-[20px]">
+            <el-input
+              v-model.trim="formData.customer_name"
+              clearable
+              class="input-width"
+              maxlength="20"
+            />
+            <div
+              class="flex items-center mt-[5px] text-[12px] text-[#999] leading-[20px]"
+            >
               <span>{{ t('customerNameTips') }}</span>
-                            <a class="ml-[3px] text-[var(--el-color-primary)]" target="_blank" href="https://www.yuque.com/kdnjishuzhichi/rg4owd">{{t('examine')}}</a>
+              <a
+                class="ml-[3px] text-[var(--el-color-primary)]"
+                target="_blank"
+                href="https://www.yuque.com/kdnjishuzhichi/rg4owd"
+                >{{ t('examine') }}</a
+              >
             </div>
-                        <div class="flex items-center mt-[3px] text-[12px] text-[#999] leading-[20px]">
+            <div
+              class="flex items-center mt-[3px] text-[12px] text-[#999] leading-[20px]"
+            >
               <span>{{ t('customerNameTips1') }}</span>
-                            <a class="ml-[3px] text-[var(--el-color-primary)]" target="_blank" href="https://www.yuque.com/kdnjishuzhichi/dfcrg1/hrfw43">{{t('examine')}}</a>
+              <a
+                class="ml-[3px] text-[var(--el-color-primary)]"
+                target="_blank"
+                href="https://www.yuque.com/kdnjishuzhichi/dfcrg1/hrfw43"
+                >{{ t('examine') }}</a
+              >
             </div>
           </div>
         </el-form-item>
 
         <el-form-item :label="t('customerPwd')">
           <div>
-						<el-input v-model.trim="formData.customer_pwd" clearable class="input-width" maxlength="20" />
-						<div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">{{ t('customerPwdTips') }}</div>
+            <el-input
+              v-model.trim="formData.customer_pwd"
+              clearable
+              class="input-width"
+              maxlength="20"
+            />
+            <div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">
+              {{ t('customerPwdTips') }}
+            </div>
           </div>
         </el-form-item>
 
         <el-form-item :label="t('sendSite')">
           <div>
-						<el-input v-model.trim="formData.send_site" clearable class="input-width" maxlength="20" />
-						<div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">{{ t('sendSiteTips') }}</div>
+            <el-input
+              v-model.trim="formData.send_site"
+              clearable
+              class="input-width"
+              maxlength="20"
+            />
+            <div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">
+              {{ t('sendSiteTips') }}
+            </div>
           </div>
         </el-form-item>
 
         <el-form-item :label="t('sendStaff')">
           <div>
-						<el-input v-model.trim="formData.send_staff" clearable class="input-width" maxlength="20" />
-						<div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">{{ t('sendStaffTips') }}</div>
+            <el-input
+              v-model.trim="formData.send_staff"
+              clearable
+              class="input-width"
+              maxlength="20"
+            />
+            <div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">
+              {{ t('sendStaffTips') }}
+            </div>
           </div>
         </el-form-item>
 
         <el-form-item :label="t('monthCode')">
           <div>
-						<el-input v-model.trim="formData.month_code" clearable class="input-width" maxlength="20" />
-						<div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">{{ t('monthCodeTips') }}</div>
+            <el-input
+              v-model.trim="formData.month_code"
+              clearable
+              class="input-width"
+              maxlength="20"
+            />
+            <div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">
+              {{ t('monthCodeTips') }}
+            </div>
           </div>
         </el-form-item>
 
         <el-form-item :label="t('payType')">
           <el-radio-group v-model="formData.pay_type">
-						<el-radio v-for="(item,index) in payType" :value="parseInt(index)">{{ item }}</el-radio>
+            <el-radio
+              v-for="(item, index) in payType"
+              :value="parseInt(index)"
+              >{{ item }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
 
@@ -92,24 +186,35 @@
               <el-radio :value="1">{{ t('yes') }}</el-radio>
               <el-radio :value="0">{{ t('no') }}</el-radio>
             </el-radio-group>
-                        <div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">{{ t('isNoticeTips') }}</div>
+            <div class="mt-[5px] text-[12px] text-[#999] leading-[20px]">
+              {{ t('isNoticeTips') }}
+            </div>
           </div>
         </el-form-item>
 
         <el-form-item :label="t('status')">
-					<el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
+          <el-switch
+            v-model="formData.status"
+            :active-value="1"
+            :inactive-value="0"
+          />
         </el-form-item>
 
         <el-form-item :label="t('isDefault')">
-					<el-switch v-model="formData.is_default" :active-value="1" :inactive-value="0" />
+          <el-switch
+            v-model="formData.is_default"
+            :active-value="1"
+            :inactive-value="0"
+          />
         </el-form-item>
-
       </el-card>
     </el-form>
 
     <div class="fixed-footer-wrap">
       <div class="fixed-footer">
-				<el-button type="primary" :loading="repeat" @click="confirm(formRef)">{{ t('save') }}</el-button>
+        <el-button type="primary" :loading="repeat" @click="confirm(formRef)">{{
+          t('save')
+        }}</el-button>
         <el-button @click="back()">{{ t('cancel') }}</el-button>
       </div>
     </div>
@@ -117,29 +222,29 @@
 </template>
 
 <script lang="ts" setup>
-    import { ref, reactive, computed } from 'vue'
-    import { t } from '@/lang'
-    import type { FormInstance } from 'element-plus'
-    import { useRoute, useRouter } from 'vue-router'
-    import {
+import { ref, reactive, computed } from 'vue'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import {
   addElectronicSheet,
   editElectronicSheet,
   getElectronicSheetInfo,
-        getElectronicSheetPayType
-    } from '@/addon/shop/api/electronic_sheet'
-    import { getCompanyList } from '@/addon/shop/api/delivery'
+  getElectronicSheetPayType,
+} from '@/addon/shop/api/electronic_sheet'
+import { getCompanyList } from '@/addon/shop/api/delivery'
 
-    const loading = ref(false)
-    const route = useRoute()
-    const router = useRouter()
-    const repeat = ref(false)
+const loading = ref(false)
+const route = useRoute()
+const router = useRouter()
+const repeat = ref(false)
 
-    const pageName = route.meta.title
+const pageName = route.meta.title
 
-    /**
+/**
  * 表单数据
  */
-    const initialFormData:any = {
+const initialFormData: any = {
   id: route.query.id || 0,
   template_name: '',
   express_company_id: '',
@@ -154,117 +259,126 @@
   exp_type: 1,
   print_style: '',
   is_default: '',
-    }
+}
 
-    const formData: Record<string, any> = reactive({ ...initialFormData })
+const formData: Record<string, any> = reactive({ ...initialFormData })
 
-    const formRef = ref<FormInstance>()
+const formRef = ref<FormInstance>()
 
-    // 表单验证规则
-    const formRules = computed(() => {
+// 表单验证规则
+const formRules = computed(() => {
   return {
     template_name: [
-                { required: true, message: t('templateNamePlaceholder'), trigger: 'blur' },
+      {
+        required: true,
+        message: t('templateNamePlaceholder'),
+        trigger: 'blur',
+      },
     ],
     express_company_id: [
-                { required: true, message: t('expressCompanyPlaceholder'), trigger: 'blur' },
-            ]
+      {
+        required: true,
+        message: t('expressCompanyPlaceholder'),
+        trigger: 'blur',
+      },
+    ],
   }
-    })
+})
 
-    const companyList: any = ref([]) // 物流公司列表
-    const expTypeList: any = ref([]) // 业务类型
-    const printStyleList: any = ref([]) // 模版样式
-    const payType = ref([])
+const companyList: any = ref([]) // 物流公司列表
+const expTypeList: any = ref([]) // 业务类型
+const printStyleList: any = ref([]) // 模版样式
+const payType = ref([])
 
-    const init = async ()=> {
+const init = async () => {
   getElectronicSheetPayType().then((res: any) => {
-		    payType.value = res.data;
+    payType.value = res.data
   })
 
   await getCompanyList({ electronic_sheet_switch: 1 }).then((res: any) => {
-		    companyList.value = res.data;
+    companyList.value = res.data
   })
 
   if (formData.id) {
     loading.value = true
     getElectronicSheetInfo(formData.id).then((res: any) => {
-			    let data = res.data;
-			    if (data) Object.keys(formData).forEach((key: string) => {
+      let data = res.data
+      if (data)
+        Object.keys(formData).forEach((key: string) => {
           if (data[key] != undefined) formData[key] = data[key]
         })
       loading.value = false
       handleSelectCompanyChange(formData.express_company_id, true)
     })
   }
-    }
+}
 
-    init();
+init()
 
-    const handleSelectCompanyChange = (value: any,load: any = false) => {
+const handleSelectCompanyChange = (value: any, load: any = false) => {
   if (!value) {
-            expTypeList.value = [];
-            printStyleList.value = [];
-            return;
+    expTypeList.value = []
+    printStyleList.value = []
+    return
   }
 
   for (let i = 0; i < companyList.value.length; i++) {
     if (companyList.value[i].company_id == value) {
-                expTypeList.value = companyList.value[i].exp_type;
+      expTypeList.value = companyList.value[i].exp_type
       expTypeList.value.forEach((item: any) => {
-                    if (item.value) item.value = parseInt(item.value);
+        if (item.value) item.value = parseInt(item.value)
       })
-                printStyleList.value = companyList.value[i].print_style;
+      printStyleList.value = companyList.value[i].print_style
 
       if (!load) {
         if (expTypeList.value.length) {
           formData.exp_type = expTypeList.value[0].value
         } else {
-                        formData.exp_type = 1; // 默认为1
+          formData.exp_type = 1 // 默认为1
         }
         if (printStyleList.value.length) {
           formData.print_style = printStyleList.value[0].value
         } else {
-                        formData.print_style = ''; // 默认为空
-                    }
+          formData.print_style = '' // 默认为空
         }
-                break;
       }
+      break
     }
-
   }
+}
 
-    /**
+/**
  * 确认
  * @param formEl
  */
-    const confirm = async(formEl: FormInstance | undefined) => {
+const confirm = async (formEl: FormInstance | undefined) => {
   if (loading.value || !formEl) return
   let save = formData.id ? editElectronicSheet : addElectronicSheet
 
-        await formEl.validate(async(valid) => {
+  await formEl.validate(async (valid) => {
     if (valid) {
-
       if (repeat.value) return
       repeat.value = true
 
       let data = formData
 
-                save(data).then(res => {
+      save(data)
+        .then((res) => {
           repeat.value = false
           if (!formData.id) {
             router.push('/shop/delivery/electronic_sheet')
           }
-                }).catch(err => {
+        })
+        .catch((err) => {
           repeat.value = false
         })
     }
   })
-    }
+}
 
-    const back = () => {
+const back = () => {
   router.push('/shop/delivery/electronic_sheet')
-    }
+}
 </script>
 
 <style lang="scss" scoped></style>

admin/src/addon/shop/views/delivery/local.vue

@@ -5,7 +5,14 @@
     </el-card>
 
     <el-card class="box-card !border-none" shadow="never">
-            <el-form label-width="120px" ref="formRef" :rules="formRules" :model="formData" class="page-form" v-loading="loading">
+      <el-form
+        label-width="120px"
+        ref="formRef"
+        :rules="formRules"
+        :model="formData"
+        class="page-form"
+        v-loading="loading"
+      >
         <!-- <h3 class="panel-title">{{t('basicSettings')}}</h3> -->
         <el-form-item :label="t('deliveryType')" prop="delivery_type">
           <el-checkbox-group v-model="formData.delivery_type">
@@ -43,11 +50,32 @@
         <el-form-item :label="t('deliveryAddress')" prop="delivery_address">
           <div class="flex flex-col">
             <div class="flex">
-                            {{ defaultDeliveryAddress ? defaultDeliveryAddress.full_address : t('defaultDeliveryAddressEmpty') }}
-                            <el-button type="primary" @click="router.push('/shop/order/address')" link class="ml-[10px]">{{ defaultDeliveryAddress ? t('update') : t('toSetting') }}</el-button>
+              {{
+                defaultDeliveryAddress
+                  ? defaultDeliveryAddress.full_address
+                  : t('defaultDeliveryAddressEmpty')
+              }}
+              <el-button
+                type="primary"
+                @click="router.push('/shop/order/address')"
+                link
+                class="ml-[10px]"
+                >{{
+                  defaultDeliveryAddress ? t('update') : t('toSetting')
+                }}</el-button
+              >
+            </div>
+            <div
+              class="text-error leading-none"
+              v-if="
+                formData.center.lat &&
+                defaultDeliveryAddress &&
+                (formData.center.lat != defaultDeliveryAddress.lat ||
+                  formData.center.lng != defaultDeliveryAddress.lng)
+              "
+            >
+              {{ t('deliveryAddressChange') }}
             </div>
-                        <div class="text-error leading-none" v-if="formData.center.lat && defaultDeliveryAddress && (formData.center.lat != defaultDeliveryAddress.lat || formData.center.lng != defaultDeliveryAddress.lng)">
-                            {{ t('deliveryAddressChange') }}</div>
           </div>
         </el-form-item>
         <el-form-item :label="t('feeType')">
@@ -56,22 +84,42 @@
             <el-radio label="distance">{{ t('distance') }}</el-radio>
           </el-radio-group>
         </el-form-item>
-                <el-form-item :label="t('feeSetting')" prop="distance" v-show="formData.fee_type == 'distance'">
+        <el-form-item
+          :label="t('feeSetting')"
+          prop="distance"
+          v-show="formData.fee_type == 'distance'"
+        >
           <div class="flex">
             <div class="w-[60px] mx-[5px]">
-                            <el-input v-model.number="formData.base_dist" type="text" @keyup="filterDigit($event)" />
+              <el-input
+                v-model.number="formData.base_dist"
+                type="text"
+                @keyup="filterDigit($event)"
+              />
             </div>
             {{ t('feeSettingTextOne') }}
             <div class="w-[60px] mx-[5px]">
-                            <el-input v-model.trim="formData.base_price" type="text" @keyup="filterDigit($event)"/>
+              <el-input
+                v-model.trim="formData.base_price"
+                type="text"
+                @keyup="filterDigit($event)"
+              />
             </div>
             {{ t('feeSettingTextTwo') }}
             <div class="w-[60px] mx-[5px]">
-                            <el-input v-model.number="formData.grad_dist" type="text" @keyup="filterDigit($event)"/>
+              <el-input
+                v-model.number="formData.grad_dist"
+                type="text"
+                @keyup="filterDigit($event)"
+              />
             </div>
             {{ t('feeSettingTextThree') }}
             <div class="w-[60px] mx-[5px]">
-                            <el-input v-model.trim="formData.grad_price" type="text" @keyup="filterDigit($event)"/>
+              <el-input
+                v-model.trim="formData.grad_price"
+                type="text"
+                @keyup="filterDigit($event)"
+              />
             </div>
             {{ t('priceUnit') }}
           </div>
@@ -80,15 +128,27 @@
           <div class="flex">
             {{ t('weightFeeTextOne') }}
             <div class="w-[60px] mx-[5px]">
-                            <el-input v-model.trim="formData.weight_start" type="text"  @keyup="filterDigit($event)"/>
+              <el-input
+                v-model.trim="formData.weight_start"
+                type="text"
+                @keyup="filterDigit($event)"
+              />
             </div>
             {{ t('weightFeeTextTwo') }}
             <div class="w-[60px] mx-[5px]">
-                            <el-input v-model.trim="formData.weight_unit" type="text"  @keyup="filterDigit($event)"/>
+              <el-input
+                v-model.trim="formData.weight_unit"
+                type="text"
+                @keyup="filterDigit($event)"
+              />
             </div>
             {{ t('weightFeeTextThree') }}
             <div class="w-[60px] mx-[5px]">
-                            <el-input v-model.trim="formData.weight_price" type="text"  @keyup="filterDigit($event)" />
+              <el-input
+                v-model.trim="formData.weight_price"
+                type="text"
+                @keyup="filterDigit($event)"
+              />
             </div>
             {{ t('priceUnit') }}
           </div>
@@ -97,36 +157,89 @@
         <el-form-item prop="area" v-loading="mapLoading">
           <div class="relative w-full">
             <div id="container" class="w-full h-[520px]"></div>
-                        <div class="absolute bg-white w-[270px] h-[500px] top-[10px] left-[10px] region-list">
+            <div
+              class="absolute bg-white w-[270px] h-[500px] top-[10px] left-[10px] region-list"
+            >
               <el-scrollbar>
-                                <div class="p-[10px] region-item pr-[50px] relative" v-for="(item, index) in formData.area" :key="index" :class="{ '!border-primary': index == currArea }" @click="selectArea(index)">
-                                    <el-form label-width="80px" :model="item" :rules="formRules" class="page-form" ref="areaFromRef">
+                <div
+                  class="p-[10px] region-item pr-[50px] relative"
+                  v-for="(item, index) in formData.area"
+                  :key="index"
+                  :class="{ '!border-primary': index == currArea }"
+                  @click="selectArea(index)"
+                >
+                  <el-form
+                    label-width="80px"
+                    :model="item"
+                    :rules="formRules"
+                    class="page-form"
+                    ref="areaFromRef"
+                  >
                     <div class="pb-[18px]">
                       <el-form-item :label="t('areaName')" prop="area_name">
-                                                <el-input v-model.trim="formData.area[index].area_name" type="text" />
+                        <el-input
+                          v-model.trim="formData.area[index].area_name"
+                          type="text"
+                        />
                       </el-form-item>
                     </div>
                     <div class="pb-[18px]">
                       <el-form-item :label="t('startPrice')" prop="start_price">
-                                                <el-input v-model.trim="formData.area[index].start_price" type="text"  @keyup="filterDigit($event)" />
+                        <el-input
+                          v-model.trim="formData.area[index].start_price"
+                          type="text"
+                          @keyup="filterDigit($event)"
+                        />
                       </el-form-item>
                     </div>
-                                        <div class="pb-[10px]" v-show="formData.fee_type == 'region'">
-                                            <el-form-item :label="t('deliveryPrice')" prop="delivery_price">
-                                                <el-input v-model.trim="formData.area[index].delivery_price" type="text"   @keyup="filterDigit($event)"/>
+                    <div
+                      class="pb-[10px]"
+                      v-show="formData.fee_type == 'region'"
+                    >
+                      <el-form-item
+                        :label="t('deliveryPrice')"
+                        prop="delivery_price"
+                      >
+                        <el-input
+                          v-model.trim="formData.area[index].delivery_price"
+                          type="text"
+                          @keyup="filterDigit($event)"
+                        />
                       </el-form-item>
                     </div>
                     <el-form-item :label="t('areaType')">
-                                            <el-radio-group v-model="formData.area[index].area_type" @click.stop="" @change="areaTypeChange(index)">
-                                                <el-radio label="radius" size="large" class="!mr-[10px]">{{ t('radius') }}</el-radio>
-                                                <el-radio label="custom" size="large" class="!mr-[0px]">{{ t('custom') }}</el-radio>
+                      <el-radio-group
+                        v-model="formData.area[index].area_type"
+                        @click.stop=""
+                        @change="areaTypeChange(index)"
+                      >
+                        <el-radio
+                          label="radius"
+                          size="large"
+                          class="!mr-[10px]"
+                          >{{ t('radius') }}</el-radio
+                        >
+                        <el-radio
+                          label="custom"
+                          size="large"
+                          class="!mr-[0px]"
+                          >{{ t('custom') }}</el-radio
+                        >
                       </el-radio-group>
                     </el-form-item>
                   </el-form>
-                                    <el-button type="primary" link class="absolute z-1 top-[10px] right-[10px]" @click.stop="deleteArea(index)">{{ t('delete') }}</el-button>
+                  <el-button
+                    type="primary"
+                    link
+                    class="absolute z-1 top-[10px] right-[10px]"
+                    @click.stop="deleteArea(index)"
+                    >{{ t('delete') }}</el-button
+                  >
                 </div>
                 <div class="p-[10px] text-center">
-                                    <el-button type="default" plain @click="addArea">{{ t('addDeliveryArea') }}</el-button>
+                  <el-button type="default" plain @click="addArea">{{
+                    t('addDeliveryArea')
+                  }}</el-button>
                 </div>
               </el-scrollbar>
             </div>
@@ -136,7 +249,12 @@
     </el-card>
     <div class="fixed-footer-wrap">
       <div class="fixed-footer">
-                <el-button type="primary" @click="onSave(formRef)" :disabled="loading">{{ t('save') }}</el-button>
+        <el-button
+          type="primary"
+          @click="onSave(formRef)"
+          :disabled="loading"
+          >{{ t('save') }}</el-button
+        >
         <el-button @click="back()">{{ t('cancel') }}</el-button>
       </div>
     </div>
@@ -144,12 +262,18 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, onMounted, onBeforeUnmount,toRaw } from 'vue'
+import { ref, computed, onMounted, onBeforeUnmount, toRaw } from 'vue'
 import { t } from '@/lang'
 import { useRoute, useRouter } from 'vue-router'
 import { getMap } from '@/app/api/sys'
 import { guid, filterDigit, deepClone } from '@/utils/common'
-import { createCircle, deleteGeometry, createPolygon, selectGeometry, createMarker } from '@/utils/qqmap'
+import {
+  createCircle,
+  deleteGeometry,
+  createPolygon,
+  selectGeometry,
+  createMarker,
+} from '@/utils/qqmap'
 import { setLocal, getLocal } from '@/addon/shop/api/delivery'
 import { FormInstance } from 'element-plus'
 import Test from '@/utils/test'
@@ -161,34 +285,36 @@ const loading = ref(true)
 const pageName = route.meta.title
 const formRef = ref<FormInstance>()
 const areaFromRef: any = ref<FormInstance[]>()
-interface addressType{
-    full_address:string
-    lat:string
-    lng:string
+interface addressType {
+  full_address: string
+  lat: string
+  lng: string
 }
-const defaultDeliveryAddress:any = ref<addressType|null>(null)
+const defaultDeliveryAddress: any = ref<addressType | null>(null)
 const getDefaultDeliveryAddress = async () => {
-    await getShopDefaultDeliveryAddressInfo().then(({ data }) => {
+  await getShopDefaultDeliveryAddressInfo()
+    .then(({ data }) => {
       defaultDeliveryAddress.value = data
-    }).catch()
+    })
+    .catch()
 }
 getDefaultDeliveryAddress()
 
 const formData = ref({
   center: {
     lat: '',
-        lng: ''
+    lng: '',
   },
   delivery_type: ['business'],
   fee_type: 'region',
-    time_is_open:1,
-    time_type:0,
+  time_is_open: 1,
+  time_type: 0,
   time_week: <any>[],
   base_dist: '',
   base_price: '',
   grad_dist: '',
   grad_price: '',
-    weight_start: 0.000,
+  weight_start: 0.0,
   weight_unit: 0,
   weight_price: 0,
   area: [
@@ -198,16 +324,18 @@ const formData = ref({
       start_price: 0,
       delivery_price: 0,
       area_json: {
-                key: guid()
-            }
-        }
-    ]
+        key: guid(),
+      },
+    },
+  ],
 })
 
 // 表单验证规则
 const formRules = computed(() => {
   return {
-        time_week: [{ required: true, message: t('timeWeekRequire'), trigger: 'change' }],
+    time_week: [
+      { required: true, message: t('timeWeekRequire'), trigger: 'change' },
+    ],
     delivery_address: [
       {
         validator: (rule: any, value: any, callback: any) => {
@@ -215,8 +343,8 @@ const formRules = computed(() => {
             callback(new Error(t('defaultDeliveryAddressEmpty')))
           }
           callback()
-                }
-            }
+        },
+      },
     ],
     delivery_type: [
       {
@@ -225,8 +353,8 @@ const formRules = computed(() => {
             callback(new Error(t('deliveryTypeRequire')))
           }
           callback()
-                }
-            }
+        },
+      },
     ],
     distance: [
       {
@@ -247,10 +375,12 @@ const formRules = computed(() => {
           }
           callback()
         },
-                trigger: 'blur'
-            }
+        trigger: 'blur',
+      },
+    ],
+    area_name: [
+      { required: true, message: t('areaNameRequire'), trigger: 'blur' },
     ],
-        area_name: [{ required: true, message: t('areaNameRequire'), trigger: 'blur' }],
     start_price: [
       { required: true, message: t('startPriceRequire'), trigger: 'blur' },
       {
@@ -260,11 +390,15 @@ const formRules = computed(() => {
           }
           callback()
         },
-                trigger: 'blur'
-            }
+        trigger: 'blur',
+      },
     ],
     delivery_price: [
-            { required: formData.value.fee_type == 'region', message: t('deliveryPriceRequire'), trigger: 'blur' },
+      {
+        required: formData.value.fee_type == 'region',
+        message: t('deliveryPriceRequire'),
+        trigger: 'blur',
+      },
       {
         validator: (rule: any, value: any, callback: any) => {
           if (parseInt(value) < 0) {
@@ -272,8 +406,8 @@ const formRules = computed(() => {
           }
           callback()
         },
-                trigger: 'blur'
-            }
+        trigger: 'blur',
+      },
     ],
     area: [
       {
@@ -283,25 +417,31 @@ const formRules = computed(() => {
           }
           callback()
         },
-                trigger: 'blur'
-            }
-        ]
+        trigger: 'blur',
+      },
+    ],
   }
 })
 
-getLocal().then(({ data }) => {
+getLocal()
+  .then(({ data }) => {
     loading.value = false
     if (data) Object.assign(formData.value, data)
-    formData.value.time_week = formData.value.time_week?formData.value.time_week.split(','):[]
-}).catch(()=>{
+    formData.value.time_week = formData.value.time_week
+      ? formData.value.time_week.split(',')
+      : []
+  })
+  .catch(() => {
     loading.value = false
-})
+  })
 
 onMounted(() => {
   const mapScript = document.createElement('script')
-    getMap().then(res => {
+  getMap().then((res) => {
     mapScript.type = 'text/javascript'
-        mapScript.src = 'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' + res.data.key
+    mapScript.src =
+      'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' +
+      res.data.key
     document.body.appendChild(mapScript)
   })
   mapScript.onload = () => {
@@ -319,11 +459,14 @@ const mapLoading = ref(true)
 const initMap = () => {
   const TMap = (window as any).TMap
   const LatLng = TMap.LatLng
-    const center = new LatLng(defaultDeliveryAddress.value ? defaultDeliveryAddress.value.lat : 39.980619, defaultDeliveryAddress.value ? defaultDeliveryAddress.value.lng : 116.321277)
+  const center = new LatLng(
+    defaultDeliveryAddress.value ? defaultDeliveryAddress.value.lat : 39.980619,
+    defaultDeliveryAddress.value ? defaultDeliveryAddress.value.lng : 116.321277
+  )
 
   map = new TMap.Map('container', {
     center,
-        zoom: 14
+    zoom: 14,
   })
   createMarker(map)
 
@@ -331,8 +474,10 @@ const initMap = () => {
     mapLoading.value = false
   })
 
-    formData.value.area.forEach(item => {
-        item.area_type == 'radius' ? createCircle(map, item.area_json) : createPolygon(map, item.area_json)
+  formData.value.area.forEach((item) => {
+    item.area_type == 'radius'
+      ? createCircle(map, item.area_json)
+      : createPolygon(map, item.area_json)
   })
 }
 
@@ -348,8 +493,8 @@ const addArea = () => {
     start_price: 0,
     delivery_price: 0,
     area_json: {
-            key: guid()
-        }
+      key: guid(),
+    },
   })
   const index = formData.value.area.length - 1
   createCircle(map, formData.value.area[index].area_json)
@@ -373,7 +518,9 @@ const selectArea = (index: number) => {
 const areaTypeChange = (index: number) => {
   const data = formData.value.area[index]
   deleteGeometry(data.area_json.key)
-    data.area_type == 'radius' ? createCircle(map, data.area_json) : createPolygon(map, data.area_json)
+  data.area_type == 'radius'
+    ? createCircle(map, data.area_json)
+    : createPolygon(map, data.area_json)
 }
 
 onBeforeUnmount(() => {
@@ -400,15 +547,17 @@ const onSave = async (formEl: FormInstance | undefined) => {
 
       formData.value.center = {
         lat: defaultDeliveryAddress.value.lat,
-                lng: defaultDeliveryAddress.value.lng
+        lng: defaultDeliveryAddress.value.lng,
       }
 
       await formEl.validate(async (valid) => {
         const param = deepClone(toRaw(formData.value))
         param.time_week = param.time_week.toString()
-                setLocal(param).then(() => {
+        setLocal(param)
+          .then(() => {
             loading.value = false
-                }).catch(() => {
+          })
+          .catch(() => {
             loading.value = false
           })
       })
@@ -431,7 +580,7 @@ const back = () => {
     border-bottom-color: var(--el-border-color-lighter);
   }
 }
-#container :deep(div){
+#container :deep(div) {
   z-index: 2 !important;
 }
 </style>

admin/src/addon/shop/views/delivery/search.vue

@@ -1,29 +1,57 @@
 <template>
   <div class="main-container">
     <el-card class="card !border-none mb-[15px]" shadow="never">
-            <el-page-header :content="pageName" :icon="ArrowLeft" @back="router.push({ path: '/shop/order/delivery' })" />
+      <el-page-header
+        :content="pageName"
+        :icon="ArrowLeft"
+        @back="router.push({ path: '/shop/order/delivery' })"
+      />
     </el-card>
-		<el-form :model="formData" label-width="150px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+    <el-form
+      :model="formData"
+      label-width="150px"
+      ref="formRef"
+      :rules="formRules"
+      class="page-form"
+      v-loading="loading"
+    >
       <el-card class="box-card !border-none" shadow="never">
         <el-form-item :label="t('interfaceType')" prop="interface_type">
           <div>
             <el-radio-group v-model="formData.interface_type">
               <el-radio :label="1" size="large">{{ t('kdn') }}</el-radio>
-<!--							<el-radio :label="2" size="large">{{ t('kd100') }}</el-radio>-->
+              <!--							<el-radio :label="2" size="large">{{ t('kd100') }}</el-radio>-->
             </el-radio-group>
-						<p class="text-[12px] text-[#b2b2b2]" v-if="formData.interface_type == 1">
-							{{ t('promptTips1-1') }}<el-button class="button-size" type="primary" link @click="openEvent('https://www.kdniao.com')">https://www.kdniao.com</el-button>
+            <p
+              class="text-[12px] text-[#b2b2b2]"
+              v-if="formData.interface_type == 1"
+            >
+              {{ t('promptTips1-1')
+              }}<el-button
+                class="button-size"
+                type="primary"
+                link
+                @click="openEvent('https://www.kdniao.com')"
+                >https://www.kdniao.com</el-button
+              >
             </p>
-						<p class="text-[12px] text-[#b2b2b2]" v-if="formData.interface_type == 1">
+            <p
+              class="text-[12px] text-[#b2b2b2]"
+              v-if="formData.interface_type == 1"
+            >
               {{ t('promptTips1-2') }}
             </p>
-<!--						<p class="text-[12px] text-[#b2b2b2]" v-if="formData.interface_type == 2">-->
-<!--							{{ t('promptTips2') }}<el-button class="button-size" type="primary" link @click="openEvent('https://www.kuaidi100.com')">https://www.kuaidi100.com</el-button>-->
-<!--						</p>-->
+            <!--						<p class="text-[12px] text-[#b2b2b2]" v-if="formData.interface_type == 2">-->
+            <!--							{{ t('promptTips2') }}<el-button class="button-size" type="primary" link @click="openEvent('https://www.kuaidi100.com')">https://www.kuaidi100.com</el-button>-->
+            <!--						</p>-->
           </div>
         </el-form-item>
         <div v-if="formData.interface_type == 1">
-					<el-form-item :label="t('isPayEdition')" prop="kdn_is_pay" class="items-center">
+          <el-form-item
+            :label="t('isPayEdition')"
+            prop="kdn_is_pay"
+            class="items-center"
+          >
             <el-radio-group v-model="formData.kdniao_is_pay">
               <el-radio :label="1" size="large">{{ t('free') }}</el-radio>
               <el-radio :label="2" size="large">{{ t('pay') }}</el-radio>
@@ -32,42 +60,54 @@
 
           <el-form-item label="EBusinessID" class="input-item">
             <div>
-							<el-input v-model.trim="formData.kdniao_id" :placeholder="t('kdnEBusinessIDPlaceholder')" class="input-width" clearable />
-							<p class="text-[12px] text-[#b2b2b2]">{{ t('kdnEBusinessIDTips') }}</p>
+              <el-input
+                v-model.trim="formData.kdniao_id"
+                :placeholder="t('kdnEBusinessIDPlaceholder')"
+                class="input-width"
+                clearable
+              />
+              <p class="text-[12px] text-[#b2b2b2]">
+                {{ t('kdnEBusinessIDTips') }}
+              </p>
             </div>
           </el-form-item>
 
           <el-form-item label="APPKEY" class="input-item">
             <div>
-							<el-input v-model.trim="formData.kdniao_app_key" clearable :placeholder="t('kdnAppKeyPlaceholder')" class="input-width" />
+              <el-input
+                v-model.trim="formData.kdniao_app_key"
+                clearable
+                :placeholder="t('kdnAppKeyPlaceholder')"
+                class="input-width"
+              />
               <p class="text-[12px] text-[#b2b2b2]">{{ t('kdnAppKeyTips') }}</p>
             </div>
           </el-form-item>
-
         </div>
 
-<!--				<div v-if="formData.interface_type == 2">-->
-<!--					<el-form-item label="APPKEY" class="input-item">-->
-<!--						<div>-->
-<!--							<el-input v-model.trim="formData.kd100_app_key" clearable :placeholder="t('kd100AppKeyPlaceholder')" class="input-width" />-->
-<!--							<p class="text-[12px] text-[#b2b2b2]">{{ t('kd100AppKeyTips') }}</p>-->
-<!--						</div>-->
-<!--					</el-form-item>-->
-
-<!--					<el-form-item label="CUSTOMER" class="input-item">-->
-<!--						<div>-->
-<!--							<el-input v-model.trim="formData.kd100_customer" :placeholder="t('kd100CustomerPlaceholder')" class="input-width" clearable />-->
-<!--							<p class="text-[12px] text-[#b2b2b2]">{{ t('kd100CustomerTips') }}</p>-->
-<!--						</div>-->
-<!--					</el-form-item>-->
-<!--				</div>-->
-
+        <!--				<div v-if="formData.interface_type == 2">-->
+        <!--					<el-form-item label="APPKEY" class="input-item">-->
+        <!--						<div>-->
+        <!--							<el-input v-model.trim="formData.kd100_app_key" clearable :placeholder="t('kd100AppKeyPlaceholder')" class="input-width" />-->
+        <!--							<p class="text-[12px] text-[#b2b2b2]">{{ t('kd100AppKeyTips') }}</p>-->
+        <!--						</div>-->
+        <!--					</el-form-item>-->
+
+        <!--					<el-form-item label="CUSTOMER" class="input-item">-->
+        <!--						<div>-->
+        <!--							<el-input v-model.trim="formData.kd100_customer" :placeholder="t('kd100CustomerPlaceholder')" class="input-width" clearable />-->
+        <!--							<p class="text-[12px] text-[#b2b2b2]">{{ t('kd100CustomerTips') }}</p>-->
+        <!--						</div>-->
+        <!--					</el-form-item>-->
+        <!--				</div>-->
       </el-card>
     </el-form>
 
     <div class="fixed-footer-wrap">
       <div class="fixed-footer">
-				<el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+        <el-button type="primary" :loading="loading" @click="save(formRef)">{{
+          t('save')
+        }}</el-button>
       </div>
     </div>
   </div>
@@ -94,13 +134,13 @@ interface formDataType {
   kd100_app_key: string
   kd100_customer: string
 }
-const formData = reactive<formDataType|any>({
+const formData = reactive<formDataType | any>({
   interface_type: 1,
   kdniao_id: '',
   kdniao_app_key: '',
   kdniao_is_pay: 1,
   kd100_app_key: '',
-    kd100_customer: ''
+  kd100_customer: '',
 })
 
 const setFormData = async () => {
@@ -113,15 +153,14 @@ const setFormData = async () => {
 }
 setFormData()
 
-const openEvent = (url:any) => {
+const openEvent = (url: any) => {
   window.open(url, '_blank')
 }
 
 const formRef = ref<FormInstance>()
 
 // 表单验证规则
-const formRules = reactive<FormRules>({
-})
+const formRules = reactive<FormRules>({})
 
 /**
  * 保存
@@ -132,20 +171,21 @@ const save = async (formEl: FormInstance | undefined) => {
   await formEl.validate(async (valid) => {
     if (valid) {
       loading.value = true
-            setDeliverySearch(formData).then(() => {
+      setDeliverySearch(formData)
+        .then(() => {
           loading.value = false
-            }).catch(() => {
+        })
+        .catch(() => {
           loading.value = false
         })
     }
   })
 }
-
 </script>
 
 <style lang="scss" scoped>
 .input-item {
-	margin-bottom: 10px !important
+  margin-bottom: 10px !important;
 }
 
 .button-size {
@@ -153,6 +193,6 @@ const save = async (formEl: FormInstance | undefined) => {
 }
 
 .el-radio.el-radio--large {
-	height: auto !important
+  height: auto !important;
 }
 </style>

admin/src/addon/shop/views/delivery/staff.vue

@@ -14,43 +14,84 @@
           {{ t('addDeliveryPersonnel') }}
         </el-button>
       </div>
-            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-                <el-form :inline="true" :model="tableData.searchParam" ref="searchFormRef">
+      <el-card
+        class="box-card !border-none my-[10px] table-search-wrap"
+        shadow="never"
+      >
+        <el-form
+          :inline="true"
+          :model="tableData.searchParam"
+          ref="searchFormRef"
+        >
           <el-form-item :label="t('deliverName')" prop="deliver_name">
-                        <el-input v-model.trim="tableData.searchParam.deliver_name" :placeholder="t('deliverNamePlaceholder')"  />
+            <el-input
+              v-model.trim="tableData.searchParam.deliver_name"
+              :placeholder="t('deliverNamePlaceholder')"
+            />
           </el-form-item>
           <el-form-item :label="t('deliverMobile')" prop="deliver_mobile">
-                        <el-input v-model.trim="tableData.searchParam.deliver_mobile" :placeholder="t('deliverMobilePlaceholder')" />
+            <el-input
+              v-model.trim="tableData.searchParam.deliver_mobile"
+              :placeholder="t('deliverMobilePlaceholder')"
+            />
           </el-form-item>
           <el-form-item>
-                        <el-button type="primary" @click="getShopDeliveryFn()">{{ t('search') }}</el-button>
-                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+            <el-button type="primary" @click="getShopDeliveryFn()">{{
+              t('search')
+            }}</el-button>
+            <el-button @click="resetForm(searchFormRef)">{{
+              t('reset')
+            }}</el-button>
           </el-form-item>
         </el-form>
       </el-card>
       <div class="mt-[10px]">
-                <el-table :data="tableData.data" ref="tableRef" size="large" v-loading="tableData.loading">
+        <el-table
+          :data="tableData.data"
+          ref="tableRef"
+          size="large"
+          v-loading="tableData.loading"
+        >
           <template #empty>
             <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
           </template>
           <el-table-column prop="deliver_name" :label="t('deliverName')" />
           <el-table-column prop="deliver_mobile" :label="t('deliverMobile')" />
-                    <el-table-column :label="t('operation')" fixed="right" align="right" width="120">
+          <el-table-column
+            :label="t('operation')"
+            fixed="right"
+            align="right"
+            width="120"
+          >
             <template #default="{ row }">
-                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-                            <el-button type="primary" link @click="deleteEvent(row.deliver_id)">{{ t('delete') }}</el-button>
+              <el-button type="primary" link @click="editEvent(row)">{{
+                t('edit')
+              }}</el-button>
+              <el-button
+                type="primary"
+                link
+                @click="deleteEvent(row.deliver_id)"
+                >{{ t('delete') }}</el-button
+              >
             </template>
           </el-table-column>
-
         </el-table>
         <div class="mt-[16px] flex justify-end">
-                    <el-pagination v-model:current-page="tableData.page" v-model:page-size="tableData.limit"
-                        layout="total, sizes, prev, pager, next, jumper" :total="tableData.total"
-                        @size-change="getShopDeliveryFn()" @current-change="getShopDeliveryFn" />
+          <el-pagination
+            v-model:current-page="tableData.page"
+            v-model:page-size="tableData.limit"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="tableData.total"
+            @size-change="getShopDeliveryFn()"
+            @current-change="getShopDeliveryFn"
+          />
         </div>
       </div>
     </el-card>
-        <delivery-personnel-edit ref="editCategoryDialog" @complete="getShopDeliveryFn" />
+    <delivery-personnel-edit
+      ref="editCategoryDialog"
+      @complete="getShopDeliveryFn"
+    />
   </div>
 </template>
 <script lang="ts" setup>
@@ -72,8 +113,8 @@ const tableData = reactive({
   data: [],
   searchParam: {
     deliver_name: '',
-        deliver_mobile: ''
-    }
+    deliver_mobile: '',
+  },
 })
 const searchFormRef = ref<FormInstance>()
 /**
@@ -86,12 +127,14 @@ const getShopDeliveryFn = (page: number = 1) => {
   getShopDelivery({
     page: tableData.page,
     limit: tableData.limit,
-        ...tableData.searchParam
-    }).then(res => {
+    ...tableData.searchParam,
+  })
+    .then((res) => {
       tableData.loading = false
       tableData.data = res.data.data
       tableData.total = res.data.total
-    }).catch(() => {
+    })
+    .catch(() => {
       tableData.loading = false
     })
 }
@@ -118,17 +161,16 @@ const editEvent = (data: any) => {
  * 删除配送员
  */
 const deleteEvent = (id: number) => {
-    ElMessageBox.confirm(t('deliverDeleteTips'), t('warning'),
-        {
+  ElMessageBox.confirm(t('deliverDeleteTips'), t('warning'), {
     confirmButtonText: t('confirm'),
     cancelButtonText: t('cancel'),
-            type: 'warning'
-        }
-    ).then(() => {
-        deleteShopDeliver(id).then(() => {
+    type: 'warning',
+  }).then(() => {
+    deleteShopDeliver(id)
+      .then(() => {
         getShopDeliveryFn()
-        }).catch(() => {
       })
+      .catch(() => {})
   })
 }
 const resetForm = (formEl: FormInstance | undefined) => {

admin/src/addon/shop/views/delivery/store.vue

@@ -15,30 +15,55 @@
         </el-button>
       </div>
 
-            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-                <el-form :inline="true" :model="storeTable.searchParam" ref="searchFormRef">
+      <el-card
+        class="box-card !border-none my-[10px] table-search-wrap"
+        shadow="never"
+      >
+        <el-form
+          :inline="true"
+          :model="storeTable.searchParam"
+          ref="searchFormRef"
+        >
           <el-form-item :label="t('storeName')" prop="store_name">
-                        <el-input v-model.trim="storeTable.searchParam.store_name" :placeholder="t('storeNamePlaceholder')" />
+            <el-input
+              v-model.trim="storeTable.searchParam.store_name"
+              :placeholder="t('storeNamePlaceholder')"
+            />
           </el-form-item>
           <el-form-item>
-                        <el-button type="primary" @click="loadStoreList()">{{ t('search') }}</el-button>
-                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+            <el-button type="primary" @click="loadStoreList()">{{
+              t('search')
+            }}</el-button>
+            <el-button @click="resetForm(searchFormRef)">{{
+              t('reset')
+            }}</el-button>
           </el-form-item>
         </el-form>
       </el-card>
 
       <div class="mt-[10px]">
-                <el-table :data="storeTable.data" size="large" v-loading="storeTable.loading">
+        <el-table
+          :data="storeTable.data"
+          size="large"
+          v-loading="storeTable.loading"
+        >
           <template #empty>
             <span>{{ !storeTable.loading ? t('emptyData') : '' }}</span>
           </template>
           <el-table-column :label="t('storeInfo')" min-width="170" align="left">
             <template #default="{ row }">
               <div class="h-[50px] flex items-center">
-                                <el-image class="w-[50px] h-[50px] " :src="img(row.store_logo)" fit="contain">
+                <el-image
+                  class="w-[50px] h-[50px]"
+                  :src="img(row.store_logo)"
+                  fit="contain"
+                >
                   <template #error>
                     <div class="image-slot">
-                                            <img class="w-[50px] h-[50px]" src="@/addon/shop/assets/store_default.png" />
+                      <img
+                        class="w-[50px] h-[50px]"
+                        src="@/addon/shop/assets/store_default.png"
+                      />
                     </div>
                   </template>
                 </el-image>
@@ -46,30 +71,57 @@
               </div>
             </template>
           </el-table-column>
-                    <el-table-column prop="store_mobile" :label="t('storeMobile')" min-width="120" />
-                    <el-table-column prop="full_address" :label="t('fullAddress')" min-width="180" />
-                    <el-table-column prop="trade_time" :label="t('tradeTime')" min-width="120" />
+          <el-table-column
+            prop="store_mobile"
+            :label="t('storeMobile')"
+            min-width="120"
+          />
+          <el-table-column
+            prop="full_address"
+            :label="t('fullAddress')"
+            min-width="180"
+          />
+          <el-table-column
+            prop="trade_time"
+            :label="t('tradeTime')"
+            min-width="120"
+          />
           <el-table-column :label="t('createTime')" min-width="120">
             <template #default="{ row }">
               {{ row.create_time || '' }}
             </template>
           </el-table-column>
 
-                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+          <el-table-column
+            :label="t('operation')"
+            fixed="right"
+            align="right"
+            min-width="120"
+          >
             <template #default="{ row }">
-                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-                            <el-button type="primary" link @click="deleteEvent(row.store_id)">{{ t('delete') }}</el-button>
+              <el-button type="primary" link @click="editEvent(row)">{{
+                t('edit')
+              }}</el-button>
+              <el-button
+                type="primary"
+                link
+                @click="deleteEvent(row.store_id)"
+                >{{ t('delete') }}</el-button
+              >
             </template>
           </el-table-column>
-
         </el-table>
         <div class="mt-[16px] flex justify-end">
-                    <el-pagination v-model:current-page="storeTable.page" v-model:page-size="storeTable.limit"
-                        layout="total, sizes, prev, pager, next, jumper" :total="storeTable.total"
-                        @size-change="loadStoreList()" @current-change="loadStoreList" />
+          <el-pagination
+            v-model:current-page="storeTable.page"
+            v-model:page-size="storeTable.limit"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="storeTable.total"
+            @size-change="loadStoreList()"
+            @current-change="loadStoreList"
+          />
         </div>
       </div>
-
     </el-card>
   </div>
 </template>
@@ -81,7 +133,7 @@ import { getStoreList, deleteStore } from '@/addon/shop/api/delivery'
 import { img } from '@/utils/common'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRouter, useRoute } from 'vue-router'
-import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
+import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
 
 const route = useRoute()
 const pageName = route.meta.title
@@ -94,8 +146,8 @@ const storeTable = reactive({
   data: [],
   searchParam: {
     store_name: '',
-        create_time: ''
-    }
+    create_time: '',
+  },
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -110,17 +162,23 @@ const loadStoreList = (page: number = 1) => {
   getStoreList({
     page: storeTable.page,
     limit: storeTable.limit,
-        ...storeTable.searchParam
-    }).then(res => {
+    ...storeTable.searchParam,
+  })
+    .then((res) => {
       storeTable.loading = false
       storeTable.data = res.data.data
       storeTable.total = res.data.total
-        setTablePageStorage(storeTable.page, storeTable.limit, storeTable.searchParam);
-    }).catch(() => {
+      setTablePageStorage(
+        storeTable.page,
+        storeTable.limit,
+        storeTable.searchParam
+      )
+    })
+    .catch(() => {
       storeTable.loading = false
     })
 }
-loadStoreList(getTablePageStorage(storeTable.searchParam).page);
+loadStoreList(getTablePageStorage(storeTable.searchParam).page)
 
 const router = useRouter()
 
@@ -143,17 +201,16 @@ const editEvent = (data: any) => {
  * 删除自提门店
  */
 const deleteEvent = (id: number) => {
-    ElMessageBox.confirm(t('storeDeleteTips'), t('warning'),
-        {
+  ElMessageBox.confirm(t('storeDeleteTips'), t('warning'), {
     confirmButtonText: t('confirm'),
     cancelButtonText: t('cancel'),
-            type: 'warning'
-        }
-    ).then(() => {
-        deleteStore(id).then(() => {
+    type: 'warning',
+  }).then(() => {
+    deleteStore(id)
+      .then(() => {
         loadStoreList()
-        }).catch(() => {
       })
+      .catch(() => {})
   })
 }
 
@@ -164,5 +221,4 @@ const resetForm = (formEl: FormInstance | undefined) => {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

admin/src/addon/shop/views/delivery/store_edit.vue

@@ -1,59 +1,132 @@
 <template>
   <div class="main-container">
     <el-card class="card !border-none mb-[15px]" shadow="never">
-            <el-page-header :content="id ? t('updateStore') : t('addStore')" :icon="ArrowLeft" @back="back" />
+      <el-page-header
+        :content="id ? t('updateStore') : t('addStore')"
+        :icon="ArrowLeft"
+        @back="back"
+      />
     </el-card>
     <el-card class="box-card !border-none" shadow="never" v-loading="loading">
-            <el-form :model="formData" label-width="140px" ref="formRef" :rules="formRules" class="page-form">
+      <el-form
+        :model="formData"
+        label-width="140px"
+        ref="formRef"
+        :rules="formRules"
+        class="page-form"
+      >
         <el-form-item :label="t('storeName')" prop="store_name">
-                    <el-input v-model.trim="formData.store_name" clearable :placeholder="t('storeNamePlaceholder')"
-                              class="input-width" />
+          <el-input
+            v-model.trim="formData.store_name"
+            clearable
+            :placeholder="t('storeNamePlaceholder')"
+            class="input-width"
+          />
         </el-form-item>
         <el-form-item :label="t('storeDesc')">
-                    <el-input v-model.trim="formData.store_desc" type="textarea" rows="4" clearable
-                              :placeholder="t('storeDescPlaceholder')" class="input-width" />
+          <el-input
+            v-model.trim="formData.store_desc"
+            type="textarea"
+            rows="4"
+            clearable
+            :placeholder="t('storeDescPlaceholder')"
+            class="input-width"
+          />
         </el-form-item>
         <el-form-item :label="t('storeLogo')">
           <upload-image v-model="formData.store_logo" />
         </el-form-item>
         <el-form-item :label="t('storeMobile')" prop="store_mobile">
-                    <el-input v-model.trim="formData.store_mobile" clearable :placeholder="t('storeMobilePlaceholder')"
-                              class="input-width" @keyup="filterNumber($event)"
-                              @blur="formData.store_mobile = $event.target.value" />
+          <el-input
+            v-model.trim="formData.store_mobile"
+            clearable
+            :placeholder="t('storeMobilePlaceholder')"
+            class="input-width"
+            @keyup="filterNumber($event)"
+            @blur="formData.store_mobile = $event.target.value"
+          />
         </el-form-item>
         <el-form-item :label="t('tradeTime')" prop="trade_time">
           <div>
-                        <el-input v-model.trim="formData.trade_time" clearable :placeholder="t('tradeTimePlaceholder')"
-                                  class="input-width" />
+            <el-input
+              v-model.trim="formData.trade_time"
+              clearable
+              :placeholder="t('tradeTimePlaceholder')"
+              class="input-width"
+            />
             <p class="text-[12px] text-[#999]">{{ t('tradeTimeTips') }}</p>
           </div>
         </el-form-item>
         <el-form-item :label="t('storeAddress')" prop="address_area">
-                    <el-select v-model="formData.province_id" value-key="id" clearable class="w-[200px]"  ref="provinceRef">
-                        <el-option :label="t('provincePlaceholder')" :value="0"/>
-                        <el-option v-for="(item, index) in areaList.province" :key="index" :label="item.name"  :value="item.id"/>
+          <el-select
+            v-model="formData.province_id"
+            value-key="id"
+            clearable
+            class="w-[200px]"
+            ref="provinceRef"
+          >
+            <el-option :label="t('provincePlaceholder')" :value="0" />
+            <el-option
+              v-for="(item, index) in areaList.province"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            />
           </el-select>
-                    <el-select v-model="formData.city_id" value-key="id" clearable class="w-[200px] ml-3" ref="cityRef">
-                        <el-option :label="t('cityPlaceholder')" :value="0"/>
-                        <el-option v-for="(item, index) in areaList.city " :key="index" :label="item.name"  :value="item.id"/>
+          <el-select
+            v-model="formData.city_id"
+            value-key="id"
+            clearable
+            class="w-[200px] ml-3"
+            ref="cityRef"
+          >
+            <el-option :label="t('cityPlaceholder')" :value="0" />
+            <el-option
+              v-for="(item, index) in areaList.city"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            />
           </el-select>
-                    <el-select v-model="formData.district_id" value-key="id" clearable class="w-[200px] ml-3"  ref="districtRef">
-                        <el-option :label="t('districtPlaceholder')" :value="0"/>
-                        <el-option v-for="(item, index) in areaList.district " :key="index" :label="item.name"  :value="item.id"/>
+          <el-select
+            v-model="formData.district_id"
+            value-key="id"
+            clearable
+            class="w-[200px] ml-3"
+            ref="districtRef"
+          >
+            <el-option :label="t('districtPlaceholder')" :value="0" />
+            <el-option
+              v-for="(item, index) in areaList.district"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            />
           </el-select>
         </el-form-item>
         <el-form-item prop="address">
-                    <el-input v-model.trim="formData.address" clearable :placeholder="t('addressPlaceholder')"  class="input-width"/>
+          <el-input
+            v-model.trim="formData.address"
+            clearable
+            :placeholder="t('addressPlaceholder')"
+            class="input-width"
+          />
         </el-form-item>
 
         <el-form-item>
-                    <div id="container" class="w-[800px] h-[520px] relative" v-loading="mapLoading"></div>
+          <div
+            id="container"
+            class="w-[800px] h-[520px] relative"
+            v-loading="mapLoading"
+          ></div>
         </el-form-item>
       </el-form>
     </el-card>
     <div class="fixed-footer-wrap">
       <div class="fixed-footer !z-[9999]">
-                <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+        <el-button type="primary" @click="onSave(formRef)">{{
+          t('save')
+        }}</el-button>
         <el-button @click="back()">{{ t('cancel') }}</el-button>
       </div>
     </div>
@@ -74,15 +147,15 @@ const route = useRoute()
 const id: number = parseInt(route.query.id as string)
 const loading = ref(false)
 const pageName = route.meta.title
-interface areaType{
-    province: any[],
-    city: any[],
+interface areaType {
+  province: any[]
+  city: any[]
   district: any[]
 }
 const areaList = reactive<areaType>({
   province: [],
   city: [],
-    district: []
+  district: [],
 })
 const provinceRef = ref()
 const cityRef = ref()
@@ -91,17 +164,19 @@ const districtRef = ref()
 /**
  * 获取省
  */
-getAreaListByPid(0).then(res => {
+getAreaListByPid(0).then((res) => {
   areaList.province = res.data
 })
 
 let mapKey: string = ''
 onMounted(() => {
   const mapScript = document.createElement('script')
-    getMap().then(res => {
+  getMap().then((res) => {
     mapKey = res.data.key
     mapScript.type = 'text/javascript'
-        mapScript.src = 'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' + res.data.key
+    mapScript.src =
+      'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' +
+      res.data.key
     document.body.appendChild(mapScript)
   })
   mapScript.onload = () => {
@@ -124,7 +199,7 @@ const initMap = () => {
 
   map = new TMap.Map('container', {
     center,
-        zoom: 14
+    zoom: 14,
   })
 
   map.on('tilesloaded', () => {
@@ -137,7 +212,7 @@ const initMap = () => {
     map.setCenter(evt.latLng)
     marker.updateGeometries({
       id: 'center',
-            position: evt.latLng
+      position: evt.latLng,
     })
     latLngChange(evt.latLng.lat, evt.latLng.lng)
   })
@@ -148,11 +223,12 @@ const initMap = () => {
 const storeArea = reactive({
   province_id: 0,
   city_id: 0,
-    district_id: 0
+  district_id: 0,
 })
 
 const latLngChange = (lat: number, lng: number) => {
-    latLngToAddress({ mapKey, lat, lng }).then(({ message, result }) => {
+  latLngToAddress({ mapKey, lat, lng })
+    .then(({ message, result }) => {
       if (message == 'query ok' || message == 'Success') {
         formData.latitude = result.location.lat
         formData.longitude = result.location.lng
@@ -166,7 +242,8 @@ const latLngChange = (lat: number, lng: number) => {
       } else {
         console.error(message, result)
       }
-    }).catch(err => {
+    })
+    .catch((err) => {
       console.log(err)
     })
 }
@@ -188,9 +265,9 @@ const initialFormData = {
   district_name: '',
   address: '',
   full_address: '',
-    longitude: 116.397190,
+  longitude: 116.39719,
   latitude: 39.908626,
-    trade_time: ''
+  trade_time: '',
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -212,16 +289,16 @@ const formRef = ref<FormInstance>()
 const formRules = computed(() => {
   return {
     store_name: [
-            { required: true, message: t('storeNamePlaceholder'), trigger: 'blur' }
+      { required: true, message: t('storeNamePlaceholder'), trigger: 'blur' },
     ],
     store_logo: [
-            { required: true, message: t('storeLogoPlaceholder'), trigger: 'blur' }
+      { required: true, message: t('storeLogoPlaceholder'), trigger: 'blur' },
     ],
     store_mobile: [
-            { required: true, message: t('storeMobilePlaceholder'), trigger: 'blur' }
+      { required: true, message: t('storeMobilePlaceholder'), trigger: 'blur' },
     ],
     trade_time: [
-            { required: true, message: t('tradeTimePlaceholder'), trigger: 'blur' }
+      { required: true, message: t('tradeTimePlaceholder'), trigger: 'blur' },
     ],
     address_area: [
       {
@@ -236,21 +313,23 @@ const formRules = computed(() => {
             callback(new Error(t('districtPlaceholder')))
           }
           callback()
-                }
-            }
+        },
+      },
     ],
     address: [
-            { required: true, message: t('addressPlaceholder'), trigger: 'blur' }
-        ]
+      { required: true, message: t('addressPlaceholder'), trigger: 'blur' },
+    ],
   }
 })
 
 /**
  * 获取市
  */
-watch(() => formData.province_id, (nval) => {
+watch(
+  () => formData.province_id,
+  (nval) => {
     if (nval) {
-        getAreaListByPid(formData.province_id).then(res => {
+      getAreaListByPid(formData.province_id).then((res) => {
         areaList.city = res.data
 
         const cityId = formData.city_id
@@ -273,14 +352,17 @@ watch(() => formData.province_id, (nval) => {
     } else {
       formData.city_id = 0
     }
-})
+  }
+)
 
 /**
  * 获取区
  */
-watch(() => formData.city_id, (nval) => {
+watch(
+  () => formData.city_id,
+  (nval) => {
     if (nval) {
-        getAreaListByPid(formData.city_id).then(res => {
+      getAreaListByPid(formData.city_id).then((res) => {
         areaList.district = res.data
 
         const districtId = formData.district_id
@@ -303,73 +385,91 @@ watch(() => formData.city_id, (nval) => {
     } else {
       formData.district_id = 0
     }
-})
+  }
+)
 
-watch(() => formData.district_id, (nval) => {
+watch(
+  () => formData.district_id,
+  (nval) => {
     if (nval) {
       areaChange()
     }
-})
+  }
+)
 
 const areaChange = debounce(() => {
   setTimeout(() => {
     const address = [
       formData.province_id ? provinceRef.value.states.selectedLabel : '',
       formData.city_id ? cityRef.value.states.selectedLabel : '',
-            formData.district_id ? districtRef.value.states.selectedLabel : ''
+      formData.district_id ? districtRef.value.states.selectedLabel : '',
     ]
 
-        addressToLatLng({ mapKey, address: address.join('') }).then(({ message, result }) => {
+    addressToLatLng({ mapKey, address: address.join('') }).then(
+      ({ message, result }) => {
         if (message == 'Success' || message == 'query ok') {
-                const latLng = new (window as any).TMap.LatLng(result.location.lat, result.location.lng)
+          const latLng = new (window as any).TMap.LatLng(
+            result.location.lat,
+            result.location.lng
+          )
           map.setCenter(latLng)
           marker.updateGeometries({
             id: 'center',
-                    position: latLng
+            position: latLng,
           })
           formData.latitude = result.location.lat
           formData.longitude = result.location.lng
         } else {
           console.error(message, result)
         }
-        })
+      }
+    )
   }, 500)
 }, 500)
 
 /**
  * 地图点选获取市
  */
-watch(() => storeArea.province_id, (nval) => {
+watch(
+  () => storeArea.province_id,
+  (nval) => {
     if (nval) {
-        getAreaListByPid(storeArea.province_id).then(res => {
+      getAreaListByPid(storeArea.province_id).then((res) => {
         areaList.city = res.data
         formData.province_id = storeArea.province_id
         formData.city_id = storeArea.city_id
       })
     }
-})
+  }
+)
 
 /**
  * 地图点选获取区
  */
-watch(() => storeArea.city_id, (nval) => {
+watch(
+  () => storeArea.city_id,
+  (nval) => {
     if (nval) {
-        getAreaListByPid(storeArea.city_id).then(res => {
+      getAreaListByPid(storeArea.city_id).then((res) => {
         areaList.district = res.data
         formData.city_id = storeArea.city_id
         formData.district_id = storeArea.district_id
       })
     }
-})
+  }
+)
 
 /**
  * 地图点选获取区
  */
-watch(() => storeArea.district_id, (nval) => {
+watch(
+  () => storeArea.district_id,
+  (nval) => {
     if (nval) {
       formData.district_id = storeArea.district_id
     }
-})
+  }
+)
 
 const onSave = async (formEl: FormInstance | undefined) => {
   if (loading.value || !formEl) return
@@ -378,22 +478,30 @@ const onSave = async (formEl: FormInstance | undefined) => {
       loading.value = true
 
       const data = formData
-            formData.province_name = formData.province_id ? provinceRef.value.states.selectedLabel : '',
-                formData.city_name = formData.city_id ? cityRef.value.states.selectedLabel : '',
-                formData.district_name = formData.district_id ? districtRef.value.states.selectedLabel : ''
+      ;(formData.province_name = formData.province_id
+        ? provinceRef.value.states.selectedLabel
+        : ''),
+        (formData.city_name = formData.city_id
+          ? cityRef.value.states.selectedLabel
+          : ''),
+        (formData.district_name = formData.district_id
+          ? districtRef.value.states.selectedLabel
+          : '')
       const address = [
         data.province_id ? provinceRef.value.states.selectedLabel : '',
         data.city_id ? cityRef.value.states.selectedLabel : '',
         data.district_id ? districtRef.value.states.selectedLabel : '',
-                data.address
+        data.address,
       ]
       data.full_address = address.join('')
 
       const save = id ? editStore : addStore
-            save(data).then(res => {
+      save(data)
+        .then((res) => {
           loading.value = false
           history.back()
-            }).catch(() => {
+        })
+        .catch(() => {
           loading.value = false
         })
     }

admin/src/addon/shop/views/delivery/template.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="main-container">
     <el-card class="box-card !border-none" shadow="never">
-
       <div class="flex justify-between items-center">
         <div class="detail-head !m-0">
           <div class="left" @click="router.push('/shop/order/delivery')">
@@ -16,42 +15,93 @@
         </el-button>
       </div>
 
-            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-                <el-form :inline="true" :model="templateTable.searchParam" ref="searchFormRef">
+      <el-card
+        class="box-card !border-none my-[10px] table-search-wrap"
+        shadow="never"
+      >
+        <el-form
+          :inline="true"
+          :model="templateTable.searchParam"
+          ref="searchFormRef"
+        >
           <el-form-item :label="t('templateName')" prop="template_name">
-                        <el-input v-model.trim="templateTable.searchParam.template_name" :placeholder="t('templateNamePlaceholder')" />
+            <el-input
+              v-model.trim="templateTable.searchParam.template_name"
+              :placeholder="t('templateNamePlaceholder')"
+            />
           </el-form-item>
           <el-form-item>
-                        <el-button type="primary" @click="loadTemplateList()">{{ t('search') }}</el-button>
-                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+            <el-button type="primary" @click="loadTemplateList()">{{
+              t('search')
+            }}</el-button>
+            <el-button @click="resetForm(searchFormRef)">{{
+              t('reset')
+            }}</el-button>
           </el-form-item>
         </el-form>
       </el-card>
 
       <div class="mt-[10px]">
-                <el-table :data="templateTable.data" size="large" v-loading="templateTable.loading">
+        <el-table
+          :data="templateTable.data"
+          size="large"
+          v-loading="templateTable.loading"
+        >
           <template #empty>
             <span>{{ !templateTable.loading ? t('emptyData') : '' }}</span>
           </template>
-                    <el-table-column prop="template_name" :label="t('templateName')" min-width="120" />
-                    <el-table-column prop="fee_type_name" :label="t('feeTypeName')" min-width="120" />
-                    <el-table-column :label="t('freeShipping')" min-width="120" align="center">
+          <el-table-column
+            prop="template_name"
+            :label="t('templateName')"
+            min-width="120"
+          />
+          <el-table-column
+            prop="fee_type_name"
+            :label="t('feeTypeName')"
+            min-width="120"
+          />
+          <el-table-column
+            :label="t('freeShipping')"
+            min-width="120"
+            align="center"
+          >
             <template #default="{ row }">
               {{ row.is_free_shipping ? t('open') : t('close') }}
             </template>
           </el-table-column>
-                    <el-table-column prop="create_time" :label="t('createTime')" min-width="120" />
-                    <el-table-column :label="t('operation')" fixed="right" min-width="120" align="right">
+          <el-table-column
+            prop="create_time"
+            :label="t('createTime')"
+            min-width="120"
+          />
+          <el-table-column
+            :label="t('operation')"
+            fixed="right"
+            min-width="120"
+            align="right"
+          >
             <template #default="{ row }">
-                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-                            <el-button type="primary" link @click="deleteEvent(row.template_id)">{{ t('delete') }}</el-button>
+              <el-button type="primary" link @click="editEvent(row)">{{
+                t('edit')
+              }}</el-button>
+              <el-button
+                type="primary"
+                link
+                @click="deleteEvent(row.template_id)"
+                >{{ t('delete') }}</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
         <div class="mt-[16px] flex justify-end">
-                    <el-pagination v-model:current-page="templateTable.page" v-model:page-size="templateTable.limit"
-                        layout="total, sizes, prev, pager, next, jumper" :total="templateTable.total"
-                        @size-change="loadTemplateList()" @current-change="loadTemplateList" />
+          <el-pagination
+            v-model:current-page="templateTable.page"
+            v-model:page-size="templateTable.limit"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="templateTable.total"
+            @size-change="loadTemplateList()"
+            @current-change="loadTemplateList"
+          />
         </div>
       </div>
     </el-card>
@@ -61,10 +111,13 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import { getShippingTemplatePageList, deleteShippingTemplate } from '@/addon/shop/api/delivery'
+import {
+  getShippingTemplatePageList,
+  deleteShippingTemplate,
+} from '@/addon/shop/api/delivery'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { setTablePageStorage,getTablePageStorage } from "@/utils/common";
+import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
 
 const route = useRoute()
 const router = useRouter()
@@ -77,8 +130,8 @@ const templateTable = reactive({
   loading: true,
   data: [],
   searchParam: {
-        template_name: ''
-    }
+    template_name: '',
+  },
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -93,17 +146,23 @@ const loadTemplateList = (page: number = 1) => {
   getShippingTemplatePageList({
     page: templateTable.page,
     limit: templateTable.limit,
-        ...templateTable.searchParam
-    }).then(res => {
+    ...templateTable.searchParam,
+  })
+    .then((res) => {
       templateTable.loading = false
       templateTable.data = res.data.data
       templateTable.total = res.data.total
-        setTablePageStorage(templateTable.page, templateTable.limit, templateTable.searchParam);
-    }).catch(() => {
+      setTablePageStorage(
+        templateTable.page,
+        templateTable.limit,
+        templateTable.searchParam
+      )
+    })
+    .catch(() => {
       templateTable.loading = false
     })
 }
-loadTemplateList(getTablePageStorage(templateTable.searchParam).page);
+loadTemplateList(getTablePageStorage(templateTable.searchParam).page)
 
 /**
  * 添加运费模板
@@ -117,24 +176,26 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-    router.push({ path: '/shop/order/shipping/template_edit', query: { id: data.template_id } })
+  router.push({
+    path: '/shop/order/shipping/template_edit',
+    query: { id: data.template_id },
+  })
 }
 
 /**
  * 删除运费模板
  */
 const deleteEvent = (id: number) => {
-    ElMessageBox.confirm(t('templateDeleteTips'), t('warning'),
-        {
+  ElMessageBox.confirm(t('templateDeleteTips'), t('warning'), {
     confirmButtonText: t('confirm'),
     cancelButtonText: t('cancel'),
-            type: 'warning'
-        }
-    ).then(() => {
-        deleteShippingTemplate(id).then(() => {
+    type: 'warning',
+  }).then(() => {
+    deleteShippingTemplate(id)
+      .then(() => {
         loadTemplateList()
-        }).catch(() => {
       })
+      .catch(() => {})
   })
 }
 
@@ -145,5 +206,4 @@ const resetForm = (formEl: FormInstance | undefined) => {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

admin/src/addon/shop/views/delivery/template_edit.vue

@@ -5,9 +5,22 @@
     </el-card>
 
     <el-card class="box-card !border-none" shadow="never">
-            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+      <el-form
+        :model="formData"
+        label-width="120px"
+        ref="formRef"
+        :rules="formRules"
+        class="page-form"
+        v-loading="loading"
+      >
         <el-form-item :label="t('templateName')" prop="template_name">
-                    <el-input v-model.trim="formData.template_name" clearable :placeholder="t('templateNamePlaceholder')" class="input-width" maxlength="60" />
+          <el-input
+            v-model.trim="formData.template_name"
+            clearable
+            :placeholder="t('templateNamePlaceholder')"
+            class="input-width"
+            maxlength="60"
+          />
         </el-form-item>
         <el-form-item :label="t('feeTypeName')" prop="fee_type">
           <el-radio-group v-model="formData.fee_type">
@@ -21,119 +34,239 @@
             <el-table-column :label="t('deliveryArea')">
               <template #default="{ row, $index }">
                 <div class="area-input">
-                                    <span v-if="$index" @click="selectArea('fee', $index)" class="cursor-pointer">{{ row.fee_area_names ? row.fee_area_names : t('areaPlaceholder') }}</span>
-                                    <span v-else>{{ row.fee_area_names ? row.fee_area_names : t('areaPlaceholder') }}</span>
+                  <span
+                    v-if="$index"
+                    @click="selectArea('fee', $index)"
+                    class="cursor-pointer"
+                    >{{
+                      row.fee_area_names
+                        ? row.fee_area_names
+                        : t('areaPlaceholder')
+                    }}</span
+                  >
+                  <span v-else>{{
+                    row.fee_area_names
+                      ? row.fee_area_names
+                      : t('areaPlaceholder')
+                  }}</span>
                 </div>
               </template>
             </el-table-column>
             <el-table-column :label="feeLabel.first">
               <template #default="{ $index }">
-                                <el-input v-model.trim="feeData[$index].snum"  maxlength="8"  @keyup="filterDigit($event)" @blur="feeData[$index].snum = $event.target.value"/>
+                <el-input
+                  v-model.trim="feeData[$index].snum"
+                  maxlength="8"
+                  @keyup="filterDigit($event)"
+                  @blur="feeData[$index].snum = $event.target.value"
+                />
               </template>
             </el-table-column>
             <el-table-column :label="t('fee')">
               <template #default="{ $index }">
-                                <el-input v-model.trim="feeData[$index].sprice"  maxlength="8" @keyup="filterDigit($event)" @blur="feeData[$index].sprice = $event.target.value"/>
+                <el-input
+                  v-model.trim="feeData[$index].sprice"
+                  maxlength="8"
+                  @keyup="filterDigit($event)"
+                  @blur="feeData[$index].sprice = $event.target.value"
+                />
               </template>
             </el-table-column>
             <el-table-column :label="feeLabel.continue">
               <template #default="{ $index }">
-                                <el-input v-model.trim="feeData[$index].xnum" maxlength="8" @keyup="filterDigit($event)" @blur="feeData[$index].xnum = $event.target.value"/>
+                <el-input
+                  v-model.trim="feeData[$index].xnum"
+                  maxlength="8"
+                  @keyup="filterDigit($event)"
+                  @blur="feeData[$index].xnum = $event.target.value"
+                />
               </template>
             </el-table-column>
             <el-table-column :label="t('continueFee')">
               <template #default="{ $index }">
-                                <el-input v-model.trim="feeData[$index].xprice" @keyup="filterDigit($event)"  maxlength="8"  @blur="feeData[$index].xprice = $event.target.value"/>
+                <el-input
+                  v-model.trim="feeData[$index].xprice"
+                  @keyup="filterDigit($event)"
+                  maxlength="8"
+                  @blur="feeData[$index].xprice = $event.target.value"
+                />
               </template>
             </el-table-column>
             <el-table-column :label="t('operation')" align="right" width="150">
               <template #default="{ $index }">
-                                <el-button type="primary" @click="delArea('fee', $index)" link v-if="$index">{{ t('delete') }}</el-button>
+                <el-button
+                  type="primary"
+                  @click="delArea('fee', $index)"
+                  link
+                  v-if="$index"
+                  >{{ t('delete') }}</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
           <div class="mt-[10px]">
-                        <el-button type="primary" @click="addArea('fee')">{{ t('addDeliveryArea') }}</el-button>
+            <el-button type="primary" @click="addArea('fee')">{{
+              t('addDeliveryArea')
+            }}</el-button>
           </div>
         </el-form-item>
         <!-- 指定区域包邮 -->
         <el-form-item :label="t('freeShipping')" prop="is_free_shipping">
-                    <el-switch v-model="formData.is_free_shipping" size="small" :inactive-value="0" :active-value="1" />
+          <el-switch
+            v-model="formData.is_free_shipping"
+            size="small"
+            :inactive-value="0"
+            :active-value="1"
+          />
         </el-form-item>
-                <el-form-item v-show="formData.is_free_shipping" prop="free_shipping_data">
+        <el-form-item
+          v-show="formData.is_free_shipping"
+          prop="free_shipping_data"
+        >
           <el-table :data="freeShippingData" style="width: 100%" size="default">
             <el-table-column :label="t('freeShippingArea')">
               <template #default="{ row, $index }">
                 <div class="area-input">
-                                    <el-input v-model.trim="row.free_shipping_area_names" :placeholder="t('areaPlaceholder')" readonly @click="selectArea('free_shipping', $index)" />
+                  <el-input
+                    v-model.trim="row.free_shipping_area_names"
+                    :placeholder="t('areaPlaceholder')"
+                    readonly
+                    @click="selectArea('free_shipping', $index)"
+                  />
                 </div>
               </template>
             </el-table-column>
             <el-table-column :label="freeShippingLabel">
               <template #default="{ $index }">
-                                <el-input v-model.trim="freeShippingData[$index].free_shipping_num" @keyup="filterDigit($event)"  maxlength="8" @blur="freeShippingData[$index].free_shipping_num = $event.target.value"/>
+                <el-input
+                  v-model.trim="freeShippingData[$index].free_shipping_num"
+                  @keyup="filterDigit($event)"
+                  maxlength="8"
+                  @blur="
+                    freeShippingData[$index].free_shipping_num =
+                      $event.target.value
+                  "
+                />
               </template>
             </el-table-column>
             <el-table-column :label="t('freeShippingPrice')">
               <template #default="{ $index }">
-                                <el-input v-model.trim="freeShippingData[$index].free_shipping_price"  @keyup="filterDigit($event)"  maxlength="8"  @blur="freeShippingData[$index].free_shipping_price = $event.target.value"/>
+                <el-input
+                  v-model.trim="freeShippingData[$index].free_shipping_price"
+                  @keyup="filterDigit($event)"
+                  maxlength="8"
+                  @blur="
+                    freeShippingData[$index].free_shipping_price =
+                      $event.target.value
+                  "
+                />
               </template>
             </el-table-column>
             <el-table-column :label="t('operation')" align="right" width="150">
               <template #default="{ $index }">
-                                <el-button type="primary" @click="delArea('free_shipping', $index)" link>{{ t('delete') }}</el-button>
+                <el-button
+                  type="primary"
+                  @click="delArea('free_shipping', $index)"
+                  link
+                  >{{ t('delete') }}</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
           <div class="form-tip">{{ t('freeShippingAreaTips') }}</div>
           <div class="mt-[10px]">
-                        <el-button type="primary" @click="addArea('free_shipping')">{{ t('addFreeShippingArea') }}</el-button>
+            <el-button type="primary" @click="addArea('free_shipping')">{{
+              t('addFreeShippingArea')
+            }}</el-button>
           </div>
         </el-form-item>
         <!-- 指定区域不配送 -->
         <el-form-item :label="t('noDelivery')" prop="no_delivery">
-                    <el-switch v-model="formData.no_delivery" size="small" :inactive-value="0" :active-value="1" />
+          <el-switch
+            v-model="formData.no_delivery"
+            size="small"
+            :inactive-value="0"
+            :active-value="1"
+          />
         </el-form-item>
         <el-form-item v-show="formData.no_delivery" prop="no_delivery_data">
           <el-table :data="noDeliveryData" style="width: 100%" size="default">
             <el-table-column :label="t('noDelivery')">
               <template #default="{ row, $index }">
                 <div class="area-input">
-                                    <el-input v-model.trim="row.no_delivery_area_names" readonly @click="selectArea('no_delivery', $index)" :placeholder="t('areaPlaceholder')" />
+                  <el-input
+                    v-model.trim="row.no_delivery_area_names"
+                    readonly
+                    @click="selectArea('no_delivery', $index)"
+                    :placeholder="t('areaPlaceholder')"
+                  />
                 </div>
               </template>
             </el-table-column>
             <el-table-column :label="t('operation')" align="right" width="150">
               <template #default="{ $index }">
-                                <el-button type="primary" @click="delArea('no_delivery', $index)" link>{{ t('delete') }}</el-button>
+                <el-button
+                  type="primary"
+                  @click="delArea('no_delivery', $index)"
+                  link
+                  >{{ t('delete') }}</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
           <div class="mt-[10px]">
-                        <el-button type="primary" @click="addArea('no_delivery')">{{ t('addNoDelivery') }}</el-button>
+            <el-button type="primary" @click="addArea('no_delivery')">{{
+              t('addNoDelivery')
+            }}</el-button>
           </div>
         </el-form-item>
       </el-form>
     </el-card>
     <div class="fixed-footer-wrap">
       <div class="fixed-footer">
-                <el-button type="primary" @click="onSave(formRef)" :disabled="loading">{{ t('save') }}</el-button>
+        <el-button
+          type="primary"
+          @click="onSave(formRef)"
+          :disabled="loading"
+          >{{ t('save') }}</el-button
+        >
         <el-button @click="back()">{{ t('cancel') }}</el-button>
       </div>
     </div>
   </div>
 
   <!-- 选择地区弹窗 -->
-    <el-dialog v-model="showSelectAreaDialog" :title="t('selectArea')" width="80%" class="diy-dialog-wrap" :destroy-on-close="true" @opened="showSelectOpened">
-
+  <el-dialog
+    v-model="showSelectAreaDialog"
+    :title="t('selectArea')"
+    width="80%"
+    class="diy-dialog-wrap"
+    :destroy-on-close="true"
+    @opened="showSelectOpened"
+  >
     <el-scrollbar height="50vh">
-            <el-tree :data="areaTreeData" :props="{ children: 'child', label: 'name' }" default-expand-all show-checkbox ref="areaTreeRef" :default-checked-keys="selectedArea" node-key="id" />
+      <el-tree
+        :data="areaTreeData"
+        :props="{ children: 'child', label: 'name' }"
+        default-expand-all
+        show-checkbox
+        ref="areaTreeRef"
+        :default-checked-keys="selectedArea"
+        node-key="id"
+      />
     </el-scrollbar>
 
     <template #footer>
       <span class="dialog-footer">
-                <el-button @click="showSelectAreaDialog = false">{{ t('cancel') }}</el-button>
-                <el-button type="primary" :loading="loading" @click="confirmSelectArea">{{ t('confirm') }}</el-button>
+        <el-button @click="showSelectAreaDialog = false">{{
+          t('cancel')
+        }}</el-button>
+        <el-button
+          type="primary"
+          :loading="loading"
+          @click="confirmSelectArea"
+          >{{ t('confirm') }}</el-button
+        >
       </span>
     </template>
   </el-dialog>
@@ -143,7 +276,11 @@
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import { ElTree, FormInstance, ElMessage } from 'element-plus'
-import { addShippingTemplate, editShippingTemplate, getShippingTemplateInfo } from '@/addon/shop/api/delivery'
+import {
+  addShippingTemplate,
+  editShippingTemplate,
+  getShippingTemplateInfo,
+} from '@/addon/shop/api/delivery'
 import { AnyObject } from '@/types/global'
 import { useRoute, useRouter } from 'vue-router'
 import { getAreatree } from '@/app/api/sys'
@@ -166,7 +303,7 @@ const initialFormData = {
   is_free_shipping: 0,
   fee_data: [],
   free_shipping_data: [],
-    no_delivery_data: []
+  no_delivery_data: [],
 }
 const pageName = route.meta.title
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -175,7 +312,8 @@ const areaTree = ref<AnyObject[]>([])
 
 if (route.query.id) {
   loading.value = true
-    getShippingTemplateInfo(route.query.id).then(({ data }) => {
+  getShippingTemplateInfo(route.query.id)
+    .then(({ data }) => {
       if (data) {
         Object.keys(formData).forEach((key: string) => {
           if (data[key] != undefined) formData[key] = data[key]
@@ -185,24 +323,31 @@ if (route.query.id) {
         freeShippingData.value = data.free_shipping_data
       }
       loading.value = false
-    }).catch(() => {
+    })
+    .catch(() => {
       loading.value = false
     })
 }
 
-getAreatree(2).then(res => {
+getAreatree(2)
+  .then((res) => {
     areaTree.value = res.data
-}).catch()
+  })
+  .catch()
 
 // 表单验证规则
 const formRules = computed(() => {
   return {
     template_name: [
-            { required: true, message: t('templateNamePlaceholder'), trigger: 'blur' }
+      {
+        required: true,
+        message: t('templateNamePlaceholder'),
+        trigger: 'blur',
+      },
     ],
     fee_data: [{ validator: feeDataValidate }],
     free_shipping_data: [{ validator: freeShippingDataValidate }],
-        no_delivery_data: [{ validator: noDeliveryDataValidate }]
+    no_delivery_data: [{ validator: noDeliveryDataValidate }],
   }
 })
 
@@ -272,16 +417,16 @@ const feeLabel = computed(() => {
   const label: AnyObject = {
     num: {
       first: t('firstNum'),
-            continue: t('continueNum')
+      continue: t('continueNum'),
     },
     weight: {
       first: t('firstWeight'),
-            continue: t('continueWeight')
+      continue: t('continueWeight'),
     },
     volume: {
       first: t('firstVolume'),
-            continue: t('continueVolume')
-        }
+      continue: t('continueVolume'),
+    },
   }
   return label[formData.fee_type]
 })
@@ -290,14 +435,21 @@ const freeShippingLabel = computed(() => {
   const label: AnyObject = {
     num: t('freeShippingNum'),
     weight: t('freeShippingWeight'),
-        volume: t('freeShippingVolume')
+    volume: t('freeShippingVolume'),
   }
   return label[formData.fee_type]
 })
 
 // 运费数据
 const feeData = ref<AnyObject[]>([
-    { area_ids: [0], fee_area_names: '全国', snum: 1, sprice: 0, xnum: 1, xprice: 0 }
+  {
+    area_ids: [0],
+    fee_area_names: '全国',
+    snum: 1,
+    sprice: 0,
+    xnum: 1,
+    xprice: 0,
+  },
 ])
 // 包邮区域数据
 const freeShippingData = ref<AnyObject[]>([])
@@ -311,10 +463,22 @@ const noDeliveryData = ref<AnyObject[]>([])
 const addArea = (type: string) => {
   switch (type) {
     case 'fee':
-            feeData.value.push({ area_ids: [], fee_area_names: '', snum: 1, sprice: 0, xnum: 1, xprice: 0 })
+      feeData.value.push({
+        area_ids: [],
+        fee_area_names: '',
+        snum: 1,
+        sprice: 0,
+        xnum: 1,
+        xprice: 0,
+      })
       break
     case 'free_shipping':
-            freeShippingData.value.push({ area_ids: [], free_shipping_area_names: '', free_shipping_num: 0, free_shipping_price: 0 })
+      freeShippingData.value.push({
+        area_ids: [],
+        free_shipping_area_names: '',
+        free_shipping_num: 0,
+        free_shipping_price: 0,
+      })
       break
     case 'no_delivery':
       noDeliveryData.value.push({ area_ids: [], no_delivery_area_names: '' })
@@ -344,7 +508,7 @@ const delArea = (type: string, index: number) => {
 // 选中的区域
 let selectedArea: number[] = []
 // 禁止选择的区域
-const disabledArea = ref <Array<string|number>>([])
+const disabledArea = ref<Array<string | number>>([])
 
 let currSelect = { type: '', index: 0 }
 
@@ -372,8 +536,8 @@ const selectArea = (type: string, index: number) => {
 }
 
 const areaTreeData = computed(() => {
-    areaTree.value.forEach(province => {
-        province.child.forEach((city:any) => {
+  areaTree.value.forEach((province) => {
+    province.child.forEach((city: any) => {
       city.disabled = disabledArea.value.includes(city.id)
     })
   })
@@ -386,7 +550,7 @@ const confirmSelectArea = () => {
   const areaIds: number[] = []
   const areaNames: string[] = []
 
-    nodes.forEach(item => {
+  nodes.forEach((item) => {
     if (item.level == 2) {
       areaIds.push(item.id)
       areaNames.push(item.name)
@@ -400,11 +564,13 @@ const confirmSelectArea = () => {
       break
     case 'free_shipping':
       freeShippingData.value[currSelect.index].area_ids = areaIds
-            freeShippingData.value[currSelect.index].free_shipping_area_names = areaNames.toString()
+      freeShippingData.value[currSelect.index].free_shipping_area_names =
+        areaNames.toString()
       break
     case 'no_delivery':
       noDeliveryData.value[currSelect.index].area_ids = areaIds
-            noDeliveryData.value[currSelect.index].no_delivery_area_names = areaNames.toString()
+      noDeliveryData.value[currSelect.index].no_delivery_area_names =
+        areaNames.toString()
       break
   }
   showSelectAreaDialog.value = false
@@ -434,44 +600,71 @@ const onSave = async (formEl: FormInstance | undefined) => {
       }
       loading.value = true
 
-
-            const data:AnyObject = {
+      const data: AnyObject = {
         template_id: formData.template_id,
         template_name: formData.template_name,
         fee_type: formData.fee_type,
         no_delivery: formData.no_delivery,
-                is_free_shipping: formData.is_free_shipping
+        is_free_shipping: formData.is_free_shipping,
       }
       const area: AnyObject = {}
 
-            feeData.value.forEach(item => {
+      feeData.value.forEach((item) => {
         item.area_ids.forEach((city: number) => {
-                    area['city_' + city] = { city_id: city, fee_area_ids: item.area_ids.toString(), fee_area_names: item.fee_area_names, snum: item.snum, sprice: item.sprice, xnum: item.xnum, xprice: item.xprice }
+          area['city_' + city] = {
+            city_id: city,
+            fee_area_ids: item.area_ids.toString(),
+            fee_area_names: item.fee_area_names,
+            snum: item.snum,
+            sprice: item.sprice,
+            xnum: item.xnum,
+            xprice: item.xprice,
+          }
         })
       })
-            freeShippingData.value.forEach(item => {
+      freeShippingData.value.forEach((item) => {
         item.area_ids.forEach((city: number) => {
           if (area['city_' + city]) {
-                        Object.assign(area['city_' + city], { free_shipping_area_ids: item.area_ids.toString(), free_shipping_area_names: item.free_shipping_area_names, free_shipping_num: item.free_shipping_num, free_shipping_price: item.free_shipping_price })
+            Object.assign(area['city_' + city], {
+              free_shipping_area_ids: item.area_ids.toString(),
+              free_shipping_area_names: item.free_shipping_area_names,
+              free_shipping_num: item.free_shipping_num,
+              free_shipping_price: item.free_shipping_price,
+            })
           } else {
-                        area['city_' + city] = { city_id: city, free_shipping_area_ids: item.area_ids.toString(), free_shipping_area_names: item.free_shipping_area_names, free_shipping_num: item.free_shipping_num, free_shipping_price: item.free_shipping_price }
+            area['city_' + city] = {
+              city_id: city,
+              free_shipping_area_ids: item.area_ids.toString(),
+              free_shipping_area_names: item.free_shipping_area_names,
+              free_shipping_num: item.free_shipping_num,
+              free_shipping_price: item.free_shipping_price,
+            }
           }
         })
       })
-            noDeliveryData.value.forEach(item => {
+      noDeliveryData.value.forEach((item) => {
         item.area_ids.forEach((city: number) => {
           if (area['city_' + city]) {
-                        Object.assign(area['city_' + city], { no_delivery_area_ids: item.area_ids.toString(), no_delivery_area_names: item.no_delivery_area_names })
+            Object.assign(area['city_' + city], {
+              no_delivery_area_ids: item.area_ids.toString(),
+              no_delivery_area_names: item.no_delivery_area_names,
+            })
           } else {
-                        area['city_' + city] = { city_id: city, no_delivery_area_ids: item.area_ids.toString(), no_delivery_area_names: item.no_delivery_area_names }
+            area['city_' + city] = {
+              city_id: city,
+              no_delivery_area_ids: item.area_ids.toString(),
+              no_delivery_area_names: item.no_delivery_area_names,
+            }
           }
         })
       })
       data.area = Object.values(area)
-            save(data).then(() => {
+      save(data)
+        .then(() => {
           loading.value = false
           router.push({ path: '/shop/order/shipping/template' })
-            }).catch(() => {
+        })
+        .catch(() => {
           loading.value = false
         })
     }
@@ -484,7 +677,7 @@ const back = () => {
 </script>
 
 <style lang="scss" scoped>
-:deep(.el-tree-node.is-expanded>.el-tree-node__children) {
+:deep(.el-tree-node.is-expanded > .el-tree-node__children) {
   display: flex !important;
   flex-wrap: wrap;
 }

admin/src/addon/shop/views/diy/components/edit-goods-coupon.vue

@@ -1,22 +1,35 @@
 <template>
   <!-- 内容 -->
   <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-
     <div class="edit-attr-item-wrap">
       <h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('selectStyle')" class="flex">
-					<span class="text-primary flex-1 cursor-pointer" @click="showCouponStyle">{{ diyStore.editComponent.styleName }}</span>
+          <span
+            class="text-primary flex-1 cursor-pointer"
+            @click="showCouponStyle"
+            >{{ diyStore.editComponent.styleName }}</span
+          >
           <el-icon>
             <ArrowRight />
           </el-icon>
         </el-form-item>
       </el-form>
 
-			<el-dialog v-model="showCouponDialog" :title="t('selectStyle')" width="500px">
+      <el-dialog
+        v-model="showCouponDialog"
+        :title="t('selectStyle')"
+        width="500px"
+      >
         <div class="flex flex-wrap">
-					<template v-for="(item,index) in couponStyleList" :key="index">
-						<div :class="{ 'border-primary': selectCouponStyle.value == item.value }" @click="changeCouponStyle(item)" class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] m-[6px] cursor-pointer border bg-gray-50">
+          <template v-for="(item, index) in couponStyleList" :key="index">
+            <div
+              :class="{
+                'border-primary': selectCouponStyle.value == item.value,
+              }"
+              @click="changeCouponStyle(item)"
+              class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] m-[6px] cursor-pointer border bg-gray-50"
+            >
               <img :src="img(item.url)" />
             </div>
           </template>
@@ -24,88 +37,160 @@
 
         <template #footer>
           <span class="dialog-footer">
-						<el-button @click="showCouponDialog = false">{{ t('cancel') }}</el-button>
-						<el-button type="primary" @click="confirmCouponStyle">{{ t('confirm') }}</el-button>
+            <el-button @click="showCouponDialog = false">{{
+              t('cancel')
+            }}</el-button>
+            <el-button type="primary" @click="confirmCouponStyle">{{
+              t('confirm')
+            }}</el-button>
           </span>
         </template>
-
       </el-dialog>
     </div>
 
     <div class="edit-attr-item-wrap">
       <h3 class="mb-[10px]">{{ t('couponContent') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
-
         <el-form-item :label="t('couponTitle')">
-					<el-input v-model.trim="diyStore.editComponent.couponTitle" clearable :maxlength="diyStore.editComponent.style == 'style-3' ? 4 : 8" show-word-limit/>
+          <el-input
+            v-model.trim="diyStore.editComponent.couponTitle"
+            clearable
+            :maxlength="diyStore.editComponent.style == 'style-3' ? 4 : 8"
+            show-word-limit
+          />
         </el-form-item>
 
         <el-form-item :label="t('couponSubTitle')">
-					<el-input v-model.trim="diyStore.editComponent.couponSubTitle" clearable :maxlength="diyStore.editComponent.style == 'style-3' ? 7 : 10" show-word-limit/>
+          <el-input
+            v-model.trim="diyStore.editComponent.couponSubTitle"
+            clearable
+            :maxlength="diyStore.editComponent.style == 'style-3' ? 7 : 10"
+            show-word-limit
+          />
         </el-form-item>
-
       </el-form>
-
     </div>
 
     <div class="edit-attr-item-wrap">
       <h3 class="mb-[10px]">{{ t('couponData') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
-
         <el-form-item :label="t('selectCoupon')">
-					<el-radio-group v-model="diyStore.editComponent.source" :title="t('goodsSelectPopupSelectGoodsButton')">
+          <el-radio-group
+            v-model="diyStore.editComponent.source"
+            :title="t('goodsSelectPopupSelectGoodsButton')"
+          >
             <el-radio label="all">{{ t('allSources') }}</el-radio>
-						<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+            <el-radio label="custom">{{
+              t('manualSelectionSources')
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
-				<el-form-item :label="t('manualSelectionSources')" v-if="diyStore.editComponent.source == 'custom'">
-					<coupon-select-popup ref="couponSelectPopupRef" v-model="diyStore.editComponent.couponIds" :min="1" :max="20" />
+        <el-form-item
+          :label="t('manualSelectionSources')"
+          v-if="diyStore.editComponent.source == 'custom'"
+        >
+          <coupon-select-popup
+            ref="couponSelectPopupRef"
+            v-model="diyStore.editComponent.couponIds"
+            :min="1"
+            :max="20"
+          />
         </el-form-item>
-				<el-form-item :label="t('couponNum')" v-if="diyStore.editComponent.source == 'all'">
-					<el-slider show-input v-model="diyStore.editComponent.num" :min="1" max="20" size="small" class="goods-coupon-slider" />
+        <el-form-item
+          :label="t('couponNum')"
+          v-if="diyStore.editComponent.source == 'all'"
+        >
+          <el-slider
+            show-input
+            v-model="diyStore.editComponent.num"
+            :min="1"
+            max="20"
+            size="small"
+            class="goods-coupon-slider"
+          />
         </el-form-item>
-				<el-form-item :label="t('couponBtnText')" v-if="diyStore.editComponent.style != 'style-4'">
-					<el-input v-model.trim="diyStore.editComponent.btnText" clearable maxlength="5" show-word-limit/>
+        <el-form-item
+          :label="t('couponBtnText')"
+          v-if="diyStore.editComponent.style != 'style-4'"
+        >
+          <el-input
+            v-model.trim="diyStore.editComponent.btnText"
+            clearable
+            maxlength="5"
+            show-word-limit
+          />
         </el-form-item>
-
       </el-form>
-
     </div>
-
   </div>
 
   <!-- 样式 -->
   <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-
-        <div class="edit-attr-item-wrap" v-if="diyStore.editComponent.style == 'style-4'">
-			<h3 class="mb-[10px]">{{ t("couponTitleStyle") }}</h3>
+    <div
+      class="edit-attr-item-wrap"
+      v-if="diyStore.editComponent.style == 'style-4'"
+    >
+      <h3 class="mb-[10px]">{{ t('couponTitleStyle') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
         <el-form-item :label="t('couponTitleColor')">
-					<el-color-picker v-model="diyStore.editComponent.titleColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.titleColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('couponSubTitleColor')">
-					<el-color-picker v-model="diyStore.editComponent.subTitleColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.subTitleColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
       </el-form>
     </div>
 
-        <div class="edit-attr-item-wrap" v-if="diyStore.editComponent.style == 'style-4'">
-			<h3 class="mb-[10px]">{{ t("couponItemStyle") }}</h3>
+    <div
+      class="edit-attr-item-wrap"
+      v-if="diyStore.editComponent.style == 'style-4'"
+    >
+      <h3 class="mb-[10px]">{{ t('couponItemStyle') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
         <el-form-item :label="t('couponMoney')">
-					<el-color-picker v-model="diyStore.editComponent.couponItem.moneyColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.couponItem.moneyColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('textColor')">
-					<el-color-picker v-model="diyStore.editComponent.couponItem.textColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.couponItem.textColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('subTextColor')">
-					<el-color-picker v-model="diyStore.editComponent.couponItem.subTextColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.couponItem.subTextColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('listFrameColor')">
-					<el-color-picker v-model="diyStore.editComponent.couponItem.bgColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.couponItem.bgColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('goodsRounded')">
-					<el-slider v-model="diyStore.editComponent.couponItem.aroundRadius" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.couponItem.aroundRadius"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -113,7 +198,6 @@
     <!-- 组件样式 -->
     <slot name="style"></slot>
   </div>
-
 </template>
 
 <script lang="ts" setup>
@@ -127,36 +211,36 @@ import couponSelectPopup from '@/addon/shop/views/goods/components/coupon-select
 import { el } from 'element-plus/es/locale'
 
 const diyStore = useDiyStore()
-diyStore.editComponent.ignore = ['componentBgColor','componentBgUrl'] // 忽略公共属性
+diyStore.editComponent.ignore = ['componentBgColor', 'componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
   const res = { code: true, message: '' }
 
-    if(diyStore.value[index].source == 'custom'){
-        if(diyStore.value[index].couponIds.length == 0){
+  if (diyStore.value[index].source == 'custom') {
+    if (diyStore.value[index].couponIds.length == 0) {
       res.code = false
       res.message = t('couponPlaceholder')
-	        return res;
+      return res
     }
   }
 
-    if(diyStore.value[index].btnText == ''){
+  if (diyStore.value[index].btnText == '') {
     res.code = false
     res.message = t('couponBtnTextPlaceholder')
-        return res; 
+    return res
   }
 
-    if(diyStore.value[index].couponTitle == ''){
+  if (diyStore.value[index].couponTitle == '') {
     res.code = false
     res.message = t('couponTitlePlaceholder')
-        return res;
+    return res
   }
 
-    if(diyStore.value[index].couponSubTitle == ''){
+  if (diyStore.value[index].couponSubTitle == '') {
     res.code = false
     res.message = t('couponSubTitlePlaceholder')
-        return res;
+    return res
   }
 
   return res
@@ -164,7 +248,7 @@ diyStore.editComponent.verify = (index: number) => {
 
 const selectCouponStyle = reactive({
   title: diyStore.editComponent.styleName,
-    value: diyStore.editComponent.style
+  value: diyStore.editComponent.style,
 })
 
 // 风格样式
@@ -172,79 +256,87 @@ const showCouponDialog = ref(false)
 
 const showCouponStyle = () => {
   showCouponDialog.value = true
-    selectCouponStyle.title = diyStore.editComponent.styleName;
-    selectCouponStyle.value = diyStore.editComponent.style;
+  selectCouponStyle.title = diyStore.editComponent.styleName
+  selectCouponStyle.value = diyStore.editComponent.style
 }
 
 const couponStyleList = reactive([
   {
     url: 'addon/shop/diy/goods_coupon/style-1.png',
     title: '风格1',
-        value: 'style-1'
+    value: 'style-1',
   },
   {
     url: 'addon/shop/diy/goods_coupon/style-2.png',
     title: '风格2',
-        value: 'style-2'
+    value: 'style-2',
   },
   {
     url: 'addon/shop/diy/goods_coupon/style-3.png',
     title: '风格3',
-        value: 'style-3'
+    value: 'style-3',
   },
   {
     url: 'addon/shop/diy/goods_coupon/style-4.png',
     title: '风格4',
-        value: 'style-4'
-    }
+    value: 'style-4',
+  },
 ])
 
-const changeCouponStyle = (item:any) => {
-    selectCouponStyle.title = item.title;
-    selectCouponStyle.value = item.value;
+const changeCouponStyle = (item: any) => {
+  selectCouponStyle.title = item.title
+  selectCouponStyle.value = item.value
 }
 
 const confirmCouponStyle = () => {
-    diyStore.editComponent.styleName = selectCouponStyle.title;
-    diyStore.editComponent.style = selectCouponStyle.value;
-    if(diyStore.editComponent.style == 'style-3'){
-        if(diyStore.editComponent.couponTitle && diyStore.editComponent.couponTitle.length > 4){diyStore.editComponent.couponTitle = diyStore.editComponent.couponTitle.substring(0,4)}
-        if(diyStore.editComponent.couponSubTitle && diyStore.editComponent.couponSubTitle.length > 7){diyStore.editComponent.couponSubTitle = diyStore.editComponent.couponSubTitle.substring(0,7)}
+  diyStore.editComponent.styleName = selectCouponStyle.title
+  diyStore.editComponent.style = selectCouponStyle.value
+  if (diyStore.editComponent.style == 'style-3') {
+    if (
+      diyStore.editComponent.couponTitle &&
+      diyStore.editComponent.couponTitle.length > 4
+    ) {
+      diyStore.editComponent.couponTitle =
+        diyStore.editComponent.couponTitle.substring(0, 4)
     }
-    initStyleFn();
+    if (
+      diyStore.editComponent.couponSubTitle &&
+      diyStore.editComponent.couponSubTitle.length > 7
+    ) {
+      diyStore.editComponent.couponSubTitle =
+        diyStore.editComponent.couponSubTitle.substring(0, 7)
+    }
+  }
+  initStyleFn()
   showCouponDialog.value = false
 }
 
-const initStyleFn = ()=>{
-    let index = diyStore.editComponent.ignore.indexOf('componentBgColor');
-    if(diyStore.editComponent.style == 'style-4' && index != -1){
-        diyStore.editComponent.ignore.splice(index,1);
-        diyStore.editComponent.titleColor = "#ffffff";
-        diyStore.editComponent.subTitleColor = "#ffffff";
-        
-        diyStore.editComponent.couponItem.moneyColor = "#fa191d";
-        diyStore.editComponent.couponItem.textColor = "#333333";
-        diyStore.editComponent.couponItem.subTextColor = "#999999";
-        diyStore.editComponent.couponItem.bgColor = "#ffffff";
-        diyStore.editComponent.couponItem.aroundRadius = 10;
-        diyStore.editComponent.componentStartBgColor = "#fa191d";
-
-    }else if(diyStore.editComponent.style != 'style-4' && index == -1){
-        diyStore.editComponent.ignore.push('componentBgColor');
+const initStyleFn = () => {
+  let index = diyStore.editComponent.ignore.indexOf('componentBgColor')
+  if (diyStore.editComponent.style == 'style-4' && index != -1) {
+    diyStore.editComponent.ignore.splice(index, 1)
+    diyStore.editComponent.titleColor = '#ffffff'
+    diyStore.editComponent.subTitleColor = '#ffffff'
+
+    diyStore.editComponent.couponItem.moneyColor = '#fa191d'
+    diyStore.editComponent.couponItem.textColor = '#333333'
+    diyStore.editComponent.couponItem.subTextColor = '#999999'
+    diyStore.editComponent.couponItem.bgColor = '#ffffff'
+    diyStore.editComponent.couponItem.aroundRadius = 10
+    diyStore.editComponent.componentStartBgColor = '#fa191d'
+  } else if (diyStore.editComponent.style != 'style-4' && index == -1) {
+    diyStore.editComponent.ignore.push('componentBgColor')
   }
-	
 }
-initStyleFn();
+initStyleFn()
 
 defineExpose({})
-
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
 
 <style lang="scss">
-	.goods-coupon-slider {
+.goods-coupon-slider {
   .el-slider__input {
     width: 100px;
   }

admin/src/addon/shop/views/diy/components/edit-goods-list.vue

@@ -6,21 +6,33 @@
       <div class="flex items-center mb-[18px] rounded overflow-hidden">
         <span
           class="iconfont iconzuoyoutuwenpc border-[1px] border-solid border-[#eee] cursor-pointer flex-1 flex items-center justify-center py-[5px]"
-					:class="{ 'border-[var(--el-color-primary)] text-[var(--el-color-primary)]': diyStore.editComponent.style == 'style-1' }"
-					@click="styleChangeFn('style-1')"></span>
+          :class="{
+            'border-[var(--el-color-primary)] text-[var(--el-color-primary)]':
+              diyStore.editComponent.style == 'style-1',
+          }"
+          @click="styleChangeFn('style-1')"
+        ></span>
 
         <span
           class="iconfont iconshangxiatuwenpc border-[1px] border-solid border-[#eee] cursor-pointer flex-1 flex items-center justify-center py-[5px]"
-					:class="{ 'border-[var(--el-color-primary)] text-[var(--el-color-primary)]': diyStore.editComponent.style == 'style-2' }"
-					@click="styleChangeFn('style-2')"></span>
+          :class="{
+            'border-[var(--el-color-primary)] text-[var(--el-color-primary)]':
+              diyStore.editComponent.style == 'style-2',
+          }"
+          @click="styleChangeFn('style-2')"
+        ></span>
         <span
           class="iconfont iconliebiaopc border-[1px] border-solid border-[#eee] cursor-pointer flex-1 flex items-center justify-center py-[5px]"
-					:class="{ 'border-[var(--el-color-primary)] text-[var(--el-color-primary)]': diyStore.editComponent.style == 'style-3' }"
-					@click="styleChangeFn('style-3')"></span>
+          :class="{
+            'border-[var(--el-color-primary)] text-[var(--el-color-primary)]':
+              diyStore.editComponent.style == 'style-3',
+          }"
+          @click="styleChangeFn('style-3')"
+        ></span>
       </div>
     </div>
     <div class="edit-attr-item-wrap">
-			<h3 class="mb-[10px]">{{ t("selectSource") }}</h3>
+      <h3 class="mb-[10px]">{{ t('selectSource') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('sortWay')">
           <el-radio-group v-model="diyStore.editComponent.sortWay">
@@ -30,33 +42,78 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
-					<el-radio-group v-model="diyStore.editComponent.source" :title="t('goodsSelectPopupSelectGoodsButton')">
+          <el-radio-group
+            v-model="diyStore.editComponent.source"
+            :title="t('goodsSelectPopupSelectGoodsButton')"
+          >
             <el-radio label="all">{{ t('goodsSelectPopupAllGoods') }}</el-radio>
             <el-radio label="category">{{ t('selectCategory') }}</el-radio>
-						<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+            <el-radio label="custom">{{
+              t('manualSelectionSources')
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
-				<el-form-item :label="t('selectCategory')" v-if="diyStore.editComponent.source == 'category'">
+        <el-form-item
+          :label="t('selectCategory')"
+          v-if="diyStore.editComponent.source == 'category'"
+        >
           <div class="flex items-center w-full">
             <div class="cursor-pointer ml-auto" @click="categoryShowDialogOpen">
-							<span class="text-[var(--el-color-primary)]">{{ diyStore.editComponent.goods_category_name }}</span>
+              <span class="text-[var(--el-color-primary)]">{{
+                diyStore.editComponent.goods_category_name
+              }}</span>
               <span class="iconfont iconxiangyoujiantou"></span>
             </div>
           </div>
         </el-form-item>
-				<el-form-item :label="t('goodsNum')" v-if="diyStore.editComponent.source == 'all' || diyStore.editComponent.source == 'category'">
-					<el-slider class="goods-list-slider" show-input v-model="diyStore.editComponent.num" :min="1" max="20" size="small" />
+        <el-form-item
+          :label="t('goodsNum')"
+          v-if="
+            diyStore.editComponent.source == 'all' ||
+            diyStore.editComponent.source == 'category'
+          "
+        >
+          <el-slider
+            class="goods-list-slider"
+            show-input
+            v-model="diyStore.editComponent.num"
+            :min="1"
+            max="20"
+            size="small"
+          />
         </el-form-item>
-				<el-form-item :label="t('customGoods')" v-if="diyStore.editComponent.source == 'custom'">
-					<goods-select-popup ref="goodsSelectPopupRef" v-model="diyStore.editComponent.goods_ids" :min="1" :max="99" />
+        <el-form-item
+          :label="t('customGoods')"
+          v-if="diyStore.editComponent.source == 'custom'"
+        >
+          <goods-select-popup
+            ref="goodsSelectPopupRef"
+            v-model="diyStore.editComponent.goods_ids"
+            :min="1"
+            :max="99"
+          />
         </el-form-item>
       </el-form>
 
-			<el-dialog v-model="categoryShowDialog" :title="t('goodsCategoryTitle')" width="750px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
-				<el-table :data="categoryTable.data" ref="categoryTableRef" size="large" v-loading="categoryTable.loading"
-					height="450px" @selection-change="handleSelectionChange" row-key="category_id"
+      <el-dialog
+        v-model="categoryShowDialog"
+        :title="t('goodsCategoryTitle')"
+        width="750px"
+        :close-on-press-escape="false"
+        :destroy-on-close="true"
+        :close-on-click-modal="false"
+      >
+        <el-table
+          :data="categoryTable.data"
+          ref="categoryTableRef"
+          size="large"
+          v-loading="categoryTable.loading"
+          height="450px"
+          @selection-change="handleSelectionChange"
+          row-key="category_id"
           :expand-row-keys="expand_category_ids"
-					:tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }">
+          :tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }"
+        >
           <template #empty>
             <span>{{ !categoryTable.loading ? t('emptyData') : '' }}</span>
           </template>
@@ -69,10 +126,17 @@
           <el-table-column :label="t('categoryImage')" width="170" align="left">
             <template #default="{ row }">
               <div class="h-[30px]">
-								<el-image class="w-[30px] h-[30px] " :src="img(row.image)" fit="contain">
+                <el-image
+                  class="w-[30px] h-[30px]"
+                  :src="img(row.image)"
+                  fit="contain"
+                >
                   <template #error>
                     <div class="image-slot">
-											<img class="w-[30px] h-[30px]" src="@/addon/shop/assets/category_default.png" />
+                      <img
+                        class="w-[30px] h-[30px]"
+                        src="@/addon/shop/assets/category_default.png"
+                      />
                     </div>
                   </template>
                 </el-image>
@@ -81,56 +145,107 @@
           </el-table-column>
         </el-table>
         <div class="flex items-center justify-end mt-[15px]">
-					<el-button type="primary" @click="saveCategoryId">{{ t('confirm') }}</el-button>
-					<el-button @click="categoryShowDialog = false">{{ t('cancel') }}</el-button>
+          <el-button type="primary" @click="saveCategoryId">{{
+            t('confirm')
+          }}</el-button>
+          <el-button @click="categoryShowDialog = false">{{
+            t('cancel')
+          }}</el-button>
         </div>
       </el-dialog>
-
     </div>
 
     <div class="edit-attr-item-wrap">
-			<h3 class="mb-[10px]">{{ t("goodsBuyBtn") }}</h3>
+      <h3 class="mb-[10px]">{{ t('goodsBuyBtn') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
         <el-form-item :label="t('goodsBtnIsShow')">
           <el-switch v-model="diyStore.editComponent.btnStyle.control" />
         </el-form-item>
-                <el-form-item :label="t('goodsCartIncident')" v-if="diyStore.editComponent.btnStyle.control">
+        <el-form-item
+          :label="t('goodsCartIncident')"
+          v-if="diyStore.editComponent.btnStyle.control"
+        >
           <el-radio-group v-model="diyStore.editComponent.btnStyle.cartEvent">
             <el-radio label="detail">{{ t('goodsDetail') }}</el-radio>
           </el-radio-group>
         </el-form-item>
-                <el-form-item :label="t('goodsBtnStyle')" class="!items-center" v-if="diyStore.editComponent.btnStyle.control">
+        <el-form-item
+          :label="t('goodsBtnStyle')"
+          class="!items-center"
+          v-if="diyStore.editComponent.btnStyle.control"
+        >
           <div class="flex">
-                        <template v-for="(item,index) in btnStyleList">
-                            <div v-if=" item.isShow == true" class="cursor-pointer flex items-center justify-center border-[1px] border-solid border-transparent rounded-[6px] py-[5px] px-[8px] mr-[10px]" :class="{'!border-[var(--el-color-primary)]': diyStore.editComponent.btnStyle.style == item.value}">
-                                <div v-if="item.type == 'icon'" :class="['nc-iconfont !text-[25px] text-[var(--el-color-primary)]', item.title]" @click="changeBtnStyle(item)"></div>
-                                <div v-if="item.type == 'button'" class="leading-[1] text-[12px] px-[10px] py-[8px] text-[#fff] rounded-[20px] bg-[var(--el-color-primary)]" @click="changeBtnStyle(item)">
-                                    {{item.title}}
+            <template v-for="(item, index) in btnStyleList">
+              <div
+                v-if="item.isShow == true"
+                class="cursor-pointer flex items-center justify-center border-[1px] border-solid border-transparent rounded-[6px] py-[5px] px-[8px] mr-[10px]"
+                :class="{
+                  '!border-[var(--el-color-primary)]':
+                    diyStore.editComponent.btnStyle.style == item.value,
+                }"
+              >
+                <div
+                  v-if="item.type == 'icon'"
+                  :class="[
+                    'nc-iconfont !text-[25px] text-[var(--el-color-primary)]',
+                    item.title,
+                  ]"
+                  @click="changeBtnStyle(item)"
+                ></div>
+                <div
+                  v-if="item.type == 'button'"
+                  class="leading-[1] text-[12px] px-[10px] py-[8px] text-[#fff] rounded-[20px] bg-[var(--el-color-primary)]"
+                  @click="changeBtnStyle(item)"
+                >
+                  {{ item.title }}
                 </div>
               </div>
             </template>
           </div>
         </el-form-item>
-                <el-form-item :label="t('goodsBtnText')" v-if="diyStore.editComponent.btnStyle.control && diyStore.editComponent.btnStyle.style == 'button'">
-                    <el-input v-model.trim="diyStore.editComponent.btnStyle.text" :placeholder="t('goodsBtnTextPlaceholder')" clearable maxlength="4" show-word-limit/>
+        <el-form-item
+          :label="t('goodsBtnText')"
+          v-if="
+            diyStore.editComponent.btnStyle.control &&
+            diyStore.editComponent.btnStyle.style == 'button'
+          "
+        >
+          <el-input
+            v-model.trim="diyStore.editComponent.btnStyle.text"
+            :placeholder="t('goodsBtnTextPlaceholder')"
+            clearable
+            maxlength="4"
+            show-word-limit
+          />
         </el-form-item>
       </el-form>
     </div>
 
-
     <div class="edit-attr-item-wrap">
-			<h3 class="mb-[10px]">{{ t("goodsShowContent") }}</h3>
+      <h3 class="mb-[10px]">{{ t('goodsShowContent') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
-                <el-form-item :label="t('goodsSelectPopupGoodsName')" v-if="diyStore.editComponent.goodsNameStyle.isShow">
+        <el-form-item
+          :label="t('goodsSelectPopupGoodsName')"
+          v-if="diyStore.editComponent.goodsNameStyle.isShow"
+        >
           <el-switch v-model="diyStore.editComponent.goodsNameStyle.control" />
         </el-form-item>
-                <el-form-item :label="t('goodsPriceColor')" v-if="diyStore.editComponent.priceStyle.isShow">
+        <el-form-item
+          :label="t('goodsPriceColor')"
+          v-if="diyStore.editComponent.priceStyle.isShow"
+        >
           <el-switch v-model="diyStore.editComponent.priceStyle.control" />
         </el-form-item>
-                <el-form-item :label="t('goodsSaleNum')" v-if="diyStore.editComponent.saleStyle.isShow">
+        <el-form-item
+          :label="t('goodsSaleNum')"
+          v-if="diyStore.editComponent.saleStyle.isShow"
+        >
           <el-switch v-model="diyStore.editComponent.saleStyle.control" />
         </el-form-item>
-                <el-form-item :label="t('goodsLabel')" v-if="diyStore.editComponent.labelStyle.isShow">
+        <el-form-item
+          :label="t('goodsLabel')"
+          v-if="diyStore.editComponent.labelStyle.isShow"
+        >
           <el-switch v-model="diyStore.editComponent.labelStyle.control" />
         </el-form-item>
       </el-form>
@@ -143,47 +258,108 @@
       <h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('goodsBgColor')">
-					<el-color-picker v-model="diyStore.editComponent.elementBgColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.elementBgColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('goodsNameColor')">
-					<el-color-picker v-model="diyStore.editComponent.goodsNameStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.goodsNameStyle.color"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
           <div class="mr-[20px]"></div>
-					<el-radio-group v-model="diyStore.editComponent.goodsNameStyle.fontWeight">
+          <el-radio-group
+            v-model="diyStore.editComponent.goodsNameStyle.fontWeight"
+          >
             <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
             <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="t('goodsPriceColor')">
-					<el-color-picker v-model="diyStore.editComponent.priceStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.priceStyle.color"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('goodsSaleColor')">
-					<el-color-picker v-model="diyStore.editComponent.saleStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.saleStyle.color"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('topRounded')">
-					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.topElementRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
         <el-form-item :label="t('bottomRounded')">
-					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.bottomElementRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
       </el-form>
     </div>
 
-        <div class="edit-attr-item-wrap"  v-if="diyStore.editComponent.btnStyle.control">
-			<h3 class="mb-[10px]">{{ t("goodsBuyBtn") }}</h3>
+    <div
+      class="edit-attr-item-wrap"
+      v-if="diyStore.editComponent.btnStyle.control"
+    >
+      <h3 class="mb-[10px]">{{ t('goodsBuyBtn') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
-				<el-form-item :label="t('goodsIsBold')" v-if="diyStore.editComponent.btnStyle.style == 'button'">
+        <el-form-item
+          :label="t('goodsIsBold')"
+          v-if="diyStore.editComponent.btnStyle.style == 'button'"
+        >
           <el-switch v-model="diyStore.editComponent.btnStyle.fontWeight" />
         </el-form-item>
         <el-form-item :label="t('goodsTextColor')">
-					<el-color-picker v-model="diyStore.editComponent.btnStyle.textColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.btnStyle.textColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('listFrameColor')">
-					<el-color-picker v-model="diyStore.editComponent.btnStyle.startBgColor" show-alpha :predefine="diyStore.predefineColors" />
-                    <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
-					<el-color-picker v-model="diyStore.editComponent.btnStyle.endBgColor" show-alpha :predefine="diyStore.predefineColors"/>
+          <el-color-picker
+            v-model="diyStore.editComponent.btnStyle.startBgColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
+          <icon
+            name="iconfont iconmap-connect"
+            size="20px"
+            class="block !text-gray-400 mx-[5px]"
+          />
+          <el-color-picker
+            v-model="diyStore.editComponent.btnStyle.endBgColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
-				<el-form-item :label="t('goodsRounded')" v-if="diyStore.editComponent.btnStyle.style == 'button'">
-					<el-slider v-model="diyStore.editComponent.btnStyle.aroundRadius" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+        <el-form-item
+          :label="t('goodsRounded')"
+          v-if="diyStore.editComponent.btnStyle.style == 'button'"
+        >
+          <el-slider
+            v-model="diyStore.editComponent.btnStyle.aroundRadius"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -198,24 +374,24 @@ import { getCategoryTree } from '@/addon/shop/api/goods'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
 import useDiyStore from '@/stores/modules/diy'
-import { ref, reactive, onMounted,nextTick } from 'vue'
+import { ref, reactive, onMounted, nextTick } from 'vue'
 import { ElTable } from 'element-plus'
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 
-const diyStore:any = useDiyStore()
+const diyStore: any = useDiyStore()
 diyStore.editComponent.ignore = [] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
   const res = { code: true, message: '' }
 
-    if(diyStore.value[index].source == 'category'){
-        if(diyStore.value[index].goods_category == ''){
+  if (diyStore.value[index].source == 'category') {
+    if (diyStore.value[index].goods_category == '') {
       res.code = false
       res.message = t('goodsCategoryPlaceholder')
     }
-    }else if(diyStore.value[index].source == 'custom'){
-        if(diyStore.value[index].goods_ids.length == 0){
+  } else if (diyStore.value[index].source == 'custom') {
+    if (diyStore.value[index].goods_ids.length == 0) {
       res.code = false
       res.message = t('goodsPlaceholder')
     }
@@ -233,33 +409,32 @@ onMounted(() => {
   loadCategoryList()
 })
 
-
-const styleChangeFn = (style)=>{
-    btnStyleList.forEach((item,index,arr)=>{
-        if(item.type == "button"){
-            if(style == "style-3"){
-                item.isShow = false;
-            }else{
-                item.isShow = true;
+const styleChangeFn = (style) => {
+  btnStyleList.forEach((item, index, arr) => {
+    if (item.type == 'button') {
+      if (style == 'style-3') {
+        item.isShow = false
+      } else {
+        item.isShow = true
       }
     }
   })
 
-    if(style == "style-3"){
+  if (style == 'style-3') {
     diyStore.editComponent.btnStyle.style = btnStyleList[1].value
-    }else{
+  } else {
     diyStore.editComponent.btnStyle.style = btnStyleList[0].value
   }
 
-    if(style == "style-3"){
-        diyStore.editComponent.saleStyle.isShow = false;
-        diyStore.editComponent.labelStyle.isShow = false;
-    }else{
-        diyStore.editComponent.saleStyle.isShow = true;
-        diyStore.editComponent.labelStyle.isShow = true;
+  if (style == 'style-3') {
+    diyStore.editComponent.saleStyle.isShow = false
+    diyStore.editComponent.labelStyle.isShow = false
+  } else {
+    diyStore.editComponent.saleStyle.isShow = true
+    diyStore.editComponent.labelStyle.isShow = true
   }
 
-    diyStore.editComponent.style = style;
+  diyStore.editComponent.style = style
 }
 
 const btnStyleList = reactive([
@@ -267,23 +442,23 @@ const btnStyleList = reactive([
     isShow: true,
     type: 'button',
     title: diyStore.editComponent.btnStyle.text,
-        value: 'button'
+    value: 'button',
   },
   {
     isShow: true,
     type: 'icon',
     title: 'nc-icon-jiahaoV6xx',
-        value: 'nc-icon-jiahaoV6xx'
+    value: 'nc-icon-jiahaoV6xx',
   },
   {
     isShow: true,
     type: 'icon',
     title: 'nc-icon-gouwuche1',
-        value: 'nc-icon-gouwuche1'
-    }
+    value: 'nc-icon-gouwuche1',
+  },
 ])
 
-const changeBtnStyle = (item:any) => {
+const changeBtnStyle = (item: any) => {
   diyStore.editComponent.btnStyle.style = item.value
 }
 
@@ -295,10 +470,12 @@ let currCategoryData: any = null
 const loadCategoryList = () => {
   categoryTable.loading = true
 
-    getCategoryTree().then(res => {
+  getCategoryTree()
+    .then((res) => {
       categoryTable.loading = false
       categoryTable.data = res.data
-    }).catch(() => {
+    })
+    .catch(() => {
       categoryTable.loading = false
     })
 }
@@ -314,27 +491,27 @@ const handleSelectionChange = (val: string | any[]) => {
 
 const saveCategoryId = () => {
   diyStore.editComponent.goods_category = currCategoryData.category_id
-    diyStore.editComponent.goods_category_name = currCategoryData.category_name;
+  diyStore.editComponent.goods_category_name = currCategoryData.category_name
   categoryShowDialog.value = false
 }
 
 const categoryShowDialogOpen = () => {
   categoryShowDialog.value = true
-	nextTick(()=>{
+  nextTick(() => {
     setRowSelection()
   })
 }
 
 //分类数据选中回填,设置展开行
 const expand_category_ids = ref<Array<any>>([])
-const setRowSelection = ()=>{
+const setRowSelection = () => {
   expand_category_ids.value = []
-	categoryTable.data.forEach((el:any)=>{
-		if(diyStore.editComponent.goods_category == el.category_id){
+  categoryTable.data.forEach((el: any) => {
+    if (diyStore.editComponent.goods_category == el.category_id) {
       categoryTableRef.value!.toggleRowSelection(el, true)
-		}else if(el.child_list&&el.child_list.length){
-			el.child_list.forEach((v:any)=>{
-				if(diyStore.editComponent.goods_category == v.category_id){
+    } else if (el.child_list && el.child_list.length) {
+      el.child_list.forEach((v: any) => {
+        if (diyStore.editComponent.goods_category == v.category_id) {
           expand_category_ids.value.push(el.category_id.toString())
           categoryTableRef.value!.toggleRowSelection(v, true)
         }
@@ -344,14 +521,13 @@ const setRowSelection = ()=>{
 }
 
 defineExpose({})
-
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-	.goods-list-slider {
+.goods-list-slider {
   .el-slider__input {
     width: 100px;
   }
-	}
+}
 </style>

admin/src/addon/shop/views/diy/components/edit-many-goods-list.vue

@@ -12,8 +12,17 @@
             <el-radio label="style-4">{{ t('headStyle4') }}</el-radio>
           </el-radio-group>
         </el-form-item>
-				<el-form-item :label="t('manyGoodsListAroundRadius')" v-show="diyStore.editComponent.headStyle == 'style-3'">
-					<el-slider v-model="diyStore.editComponent.aroundRadius" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+        <el-form-item
+          :label="t('manyGoodsListAroundRadius')"
+          v-show="diyStore.editComponent.headStyle == 'style-3'"
+        >
+          <el-slider
+            v-model="diyStore.editComponent.aroundRadius"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -28,21 +37,41 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="t('goodsNum')">
-					<el-slider show-input class="diy-nav-slider" v-model="diyStore.editComponent.num" :min="1" max="20" size="small" />
+          <el-slider
+            show-input
+            class="diy-nav-slider"
+            v-model="diyStore.editComponent.num"
+            :min="1"
+            max="20"
+            size="small"
+          />
         </el-form-item>
       </el-form>
     </div>
     <div class="edit-attr-item-wrap">
-			<h3 class="mb-[10px]">{{ t("manyGoodsListCategorySet") }}</h3>
+      <h3 class="mb-[10px]">{{ t('manyGoodsListCategorySet') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('dataSources')">
           <el-radio-group v-model="diyStore.editComponent.source">
-						<el-radio label="custom">{{ t('manyGoodsListSourceDiy') }}</el-radio>
-						<el-radio label="goods_category">{{ t('manyGoodsListSourceCategory') }}</el-radio>
+            <el-radio label="custom">{{
+              t('manyGoodsListSourceDiy')
+            }}</el-radio>
+            <el-radio label="goods_category">{{
+              t('manyGoodsListSourceCategory')
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
-				<el-form-item :label="t('goodsCategoryTitle')" v-show="diyStore.editComponent.source == 'goods_category'">
-					<el-input v-model.trim="diyStore.editComponent.goods_category_name" :placeholder="t('selectCategory')" readonly class="select-diy-page-input" @click="firstCategoryShowDialogOpen()">
+        <el-form-item
+          :label="t('goodsCategoryTitle')"
+          v-show="diyStore.editComponent.source == 'goods_category'"
+        >
+          <el-input
+            v-model.trim="diyStore.editComponent.goods_category_name"
+            :placeholder="t('selectCategory')"
+            readonly
+            class="select-diy-page-input"
+            @click="firstCategoryShowDialogOpen()"
+          >
             <template #suffix>
               <div @click.stop="clearCategory">
                 <el-icon v-if="diyStore.editComponent.goods_category_name">
@@ -56,55 +85,121 @@
           </el-input>
         </el-form-item>
         <div v-show="diyStore.editComponent.source == 'custom'">
-
-					<p class="text-sm text-gray-400 mb-[10px]">{{ t('dragMouseAdjustOrder') }}</p>
+          <p class="text-sm text-gray-400 mb-[10px]">
+            {{ t('dragMouseAdjustOrder') }}
+          </p>
 
           <div ref="goodsBoxRef">
-						<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
-
+            <div
+              v-for="(item, index) in diyStore.editComponent.list"
+              :key="item.id"
+              class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
+            >
               <el-form-item :label="t('manyGoodsListCategoryName')">
-								<el-input v-model.trim="item.title" clearable maxlength="4" show-word-limit/>
+                <el-input
+                  v-model.trim="item.title"
+                  clearable
+                  maxlength="4"
+                  show-word-limit
+                />
               </el-form-item>
-							<el-form-item :label="t('manyGoodsListSubTitle')" v-show="diyStore.editComponent.headStyle == 'style-1'">
-								<el-input v-model.trim="item.desc" clearable maxlength="5" show-word-limit/>
+              <el-form-item
+                :label="t('manyGoodsListSubTitle')"
+                v-show="diyStore.editComponent.headStyle == 'style-1'"
+              >
+                <el-input
+                  v-model.trim="item.desc"
+                  clearable
+                  maxlength="5"
+                  show-word-limit
+                />
               </el-form-item>
               <el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
                 <el-radio-group v-model="item.source">
-									<el-radio label="all">{{ t('goodsSelectPopupAllGoods') }}</el-radio>
-									<el-radio label="category">{{ t('selectCategory') }}</el-radio>
-									<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+                  <el-radio label="all">{{
+                    t('goodsSelectPopupAllGoods')
+                  }}</el-radio>
+                  <el-radio label="category">{{
+                    t('selectCategory')
+                  }}</el-radio>
+                  <el-radio label="custom">{{
+                    t('manualSelectionSources')
+                  }}</el-radio>
                 </el-radio-group>
               </el-form-item>
-							<el-form-item :label="t('selectCategory')" v-if="item.source == 'category'">
+              <el-form-item
+                :label="t('selectCategory')"
+                v-if="item.source == 'category'"
+              >
                 <div class="flex items-center w-full">
-									<div class="cursor-pointer ml-auto" @click="categoryShowDialogOpen(index)">
-										<span class="text-[var(--el-color-primary)]">{{ item.goods_category_name }}</span>
+                  <div
+                    class="cursor-pointer ml-auto"
+                    @click="categoryShowDialogOpen(index)"
+                  >
+                    <span class="text-[var(--el-color-primary)]">{{
+                      item.goods_category_name
+                    }}</span>
                     <span class="iconfont iconxiangyoujiantou"></span>
                   </div>
                 </div>
               </el-form-item>
-							<el-form-item :label="t('customGoods')" v-if="item.source == 'custom'">
-								<goods-select-popup ref="goodsSelectPopupRef" v-model="item.goods_ids" :min="1" :max="99" />
+              <el-form-item
+                :label="t('customGoods')"
+                v-if="item.source == 'custom'"
+              >
+                <goods-select-popup
+                  ref="goodsSelectPopupRef"
+                  v-model="item.goods_ids"
+                  :min="1"
+                  :max="99"
+                />
               </el-form-item>
-							<el-form-item :label="t('image')" v-show="diyStore.editComponent.headStyle == 'style-3'">
+              <el-form-item
+                :label="t('image')"
+                v-show="diyStore.editComponent.headStyle == 'style-3'"
+              >
                 <upload-image v-model="item.imageUrl" :limit="1" />
               </el-form-item>
 
-							<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
-								<icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+              <div
+                class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
+                v-show="diyStore.editComponent.list.length > 1"
+                @click="diyStore.editComponent.list.splice(index, 1)"
+              >
+                <icon
+                  name="element CircleCloseFilled"
+                  color="#bbb"
+                  size="20px"
+                />
               </div>
-
             </div>
           </div>
 
-					<el-button class="w-full" @click="addItem">{{ t('manyGoodsLisAddItem') }}</el-button>
+          <el-button class="w-full" @click="addItem">{{
+            t('manyGoodsLisAddItem')
+          }}</el-button>
         </div>
-
       </el-form>
 
       <!-- 选择一级商品分类弹出框 -->
-			<el-dialog v-model="firstCategoryShowDialog" :title="t('goodsCategoryTitle')" width="750px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
-				<el-table :data="firstCategoryTable.data" ref="firstCategoryTableRef" size="large" v-loading="firstCategoryTable.loading" height="450px" @current-change="handleCurrentCategoryChange" row-key="category_id" highlight-current-row>
+      <el-dialog
+        v-model="firstCategoryShowDialog"
+        :title="t('goodsCategoryTitle')"
+        width="750px"
+        :close-on-press-escape="false"
+        :destroy-on-close="true"
+        :close-on-click-modal="false"
+      >
+        <el-table
+          :data="firstCategoryTable.data"
+          ref="firstCategoryTableRef"
+          size="large"
+          v-loading="firstCategoryTable.loading"
+          height="450px"
+          @current-change="handleCurrentCategoryChange"
+          row-key="category_id"
+          highlight-current-row
+        >
           <template #empty>
             <span>{{ !firstCategoryTable.loading ? t('emptyData') : '' }}</span>
           </template>
@@ -116,10 +211,17 @@
           <el-table-column :label="t('categoryImage')" width="170" align="left">
             <template #default="{ row }">
               <div class="h-[30px]">
-								<el-image class="w-[30px] h-[30px] " :src="img(row.image)" fit="contain">
+                <el-image
+                  class="w-[30px] h-[30px]"
+                  :src="img(row.image)"
+                  fit="contain"
+                >
                   <template #error>
                     <div class="image-slot">
-											<img class="w-[30px] h-[30px]" src="@/addon/shop/assets/category_default.png" />
+                      <img
+                        class="w-[30px] h-[30px]"
+                        src="@/addon/shop/assets/category_default.png"
+                      />
                     </div>
                   </template>
                 </el-image>
@@ -128,16 +230,34 @@
           </el-table-column>
         </el-table>
         <div class="flex items-center justify-end mt-[15px]">
-					<el-button type="primary" @click="saveFirstCategoryId">{{ t('confirm') }}</el-button>
-					<el-button @click="firstCategoryShowDialog = false">{{ t('cancel') }}</el-button>
+          <el-button type="primary" @click="saveFirstCategoryId">{{
+            t('confirm')
+          }}</el-button>
+          <el-button @click="firstCategoryShowDialog = false">{{
+            t('cancel')
+          }}</el-button>
         </div>
       </el-dialog>
 
-			<el-dialog v-model="categoryShowDialog" :title="t('goodsCategoryTitle')" width="750px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
-				<el-table :data="categoryTable.data" ref="categoryTableRef" size="large" v-loading="categoryTable.loading"
-					height="490px" @selection-change="handleSelectionChange" row-key="category_id"
+      <el-dialog
+        v-model="categoryShowDialog"
+        :title="t('goodsCategoryTitle')"
+        width="750px"
+        :close-on-press-escape="false"
+        :destroy-on-close="true"
+        :close-on-click-modal="false"
+      >
+        <el-table
+          :data="categoryTable.data"
+          ref="categoryTableRef"
+          size="large"
+          v-loading="categoryTable.loading"
+          height="490px"
+          @selection-change="handleSelectionChange"
+          row-key="category_id"
           :expand-row-keys="expand_category_ids"
-					:tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }">
+          :tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }"
+        >
           <template #empty>
             <span>{{ !categoryTable.loading ? t('emptyData') : '' }}</span>
           </template>
@@ -150,10 +270,17 @@
           <el-table-column :label="t('categoryImage')" width="170" align="left">
             <template #default="{ row }">
               <div class="h-[30px]">
-								<el-image class="w-[30px] h-[30px] " :src="img(row.image)" fit="contain">
+                <el-image
+                  class="w-[30px] h-[30px]"
+                  :src="img(row.image)"
+                  fit="contain"
+                >
                   <template #error>
                     <div class="image-slot">
-											<img class="w-[30px] h-[30px]" src="@/addon/shop/assets/category_default.png" />
+                      <img
+                        class="w-[30px] h-[30px]"
+                        src="@/addon/shop/assets/category_default.png"
+                      />
                     </div>
                   </template>
                 </el-image>
@@ -162,56 +289,107 @@
           </el-table-column>
         </el-table>
         <div class="flex items-center justify-end mt-[15px]">
-					<el-button type="primary" @click="saveCategoryId">{{ t('confirm') }}</el-button>
-					<el-button @click="categoryShowDialog = false">{{ t('cancel') }}</el-button>
+          <el-button type="primary" @click="saveCategoryId">{{
+            t('confirm')
+          }}</el-button>
+          <el-button @click="categoryShowDialog = false">{{
+            t('cancel')
+          }}</el-button>
         </div>
       </el-dialog>
-
     </div>
 
     <div class="edit-attr-item-wrap mt-[20px]">
-			<h3 class="mb-[10px]">{{ t("goodsBuyBtn") }}</h3>
+      <h3 class="mb-[10px]">{{ t('goodsBuyBtn') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
         <el-form-item :label="t('goodsBtnIsShow')">
           <el-switch v-model="diyStore.editComponent.btnStyle.control" />
         </el-form-item>
-                <el-form-item :label="t('goodsCartIncident')" v-if="diyStore.editComponent.btnStyle.control">
+        <el-form-item
+          :label="t('goodsCartIncident')"
+          v-if="diyStore.editComponent.btnStyle.control"
+        >
           <el-radio-group v-model="diyStore.editComponent.btnStyle.cartEvent">
             <el-radio label="detail">{{ t('goodsDetail') }}</el-radio>
           </el-radio-group>
         </el-form-item>
-                <el-form-item :label="t('goodsBtnStyle')" class="!items-center" v-if="diyStore.editComponent.btnStyle.control">
+        <el-form-item
+          :label="t('goodsBtnStyle')"
+          class="!items-center"
+          v-if="diyStore.editComponent.btnStyle.control"
+        >
           <div class="flex">
-                        <template v-for="(item,index) in btnStyleList">
-                            <div v-if=" item.isShow == true" class="cursor-pointer flex items-center justify-center border-[1px] border-solid border-transparent rounded-[6px] py-[5px] px-[8px] mr-[10px]" :class="{'!border-[var(--el-color-primary)]': diyStore.editComponent.btnStyle.style == item.value}">
-                                <div v-if="item.type == 'icon'" :class="['nc-iconfont !text-[25px] text-[var(--el-color-primary)]', item.title]" @click="changeBtnStyle(item)"></div>
-                                <div v-if="item.type == 'button'" class="leading-[1] text-[12px] px-[10px] py-[8px] text-[#fff] rounded-[20px] bg-[var(--el-color-primary)]" @click="changeBtnStyle(item)">
-                                    {{item.title}}
+            <template v-for="(item, index) in btnStyleList">
+              <div
+                v-if="item.isShow == true"
+                class="cursor-pointer flex items-center justify-center border-[1px] border-solid border-transparent rounded-[6px] py-[5px] px-[8px] mr-[10px]"
+                :class="{
+                  '!border-[var(--el-color-primary)]':
+                    diyStore.editComponent.btnStyle.style == item.value,
+                }"
+              >
+                <div
+                  v-if="item.type == 'icon'"
+                  :class="[
+                    'nc-iconfont !text-[25px] text-[var(--el-color-primary)]',
+                    item.title,
+                  ]"
+                  @click="changeBtnStyle(item)"
+                ></div>
+                <div
+                  v-if="item.type == 'button'"
+                  class="leading-[1] text-[12px] px-[10px] py-[8px] text-[#fff] rounded-[20px] bg-[var(--el-color-primary)]"
+                  @click="changeBtnStyle(item)"
+                >
+                  {{ item.title }}
                 </div>
               </div>
             </template>
           </div>
         </el-form-item>
-                <el-form-item :label="t('goodsBtnText')" v-if="diyStore.editComponent.btnStyle.control && diyStore.editComponent.btnStyle.style == 'button'">
-                    <el-input v-model.trim="diyStore.editComponent.btnStyle.text" :placeholder="t('goodsBtnTextPlaceholder')" clearable maxlength="4" show-word-limit/>
+        <el-form-item
+          :label="t('goodsBtnText')"
+          v-if="
+            diyStore.editComponent.btnStyle.control &&
+            diyStore.editComponent.btnStyle.style == 'button'
+          "
+        >
+          <el-input
+            v-model.trim="diyStore.editComponent.btnStyle.text"
+            :placeholder="t('goodsBtnTextPlaceholder')"
+            clearable
+            maxlength="4"
+            show-word-limit
+          />
         </el-form-item>
       </el-form>
     </div>
 
-
     <div class="edit-attr-item-wrap">
-			<h3 class="mb-[10px]">{{ t("goodsShowContent") }}</h3>
+      <h3 class="mb-[10px]">{{ t('goodsShowContent') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
-                <el-form-item :label="t('goodsSelectPopupGoodsName')" v-if="diyStore.editComponent.goodsNameStyle.isShow">
+        <el-form-item
+          :label="t('goodsSelectPopupGoodsName')"
+          v-if="diyStore.editComponent.goodsNameStyle.isShow"
+        >
           <el-switch v-model="diyStore.editComponent.goodsNameStyle.control" />
         </el-form-item>
-                <el-form-item :label="t('goodsPriceColor')" v-if="diyStore.editComponent.priceStyle.isShow">
+        <el-form-item
+          :label="t('goodsPriceColor')"
+          v-if="diyStore.editComponent.priceStyle.isShow"
+        >
           <el-switch v-model="diyStore.editComponent.priceStyle.control" />
         </el-form-item>
-                <el-form-item :label="t('goodsSaleNum')" v-if="diyStore.editComponent.saleStyle.isShow">
+        <el-form-item
+          :label="t('goodsSaleNum')"
+          v-if="diyStore.editComponent.saleStyle.isShow"
+        >
           <el-switch v-model="diyStore.editComponent.saleStyle.control" />
         </el-form-item>
-                <el-form-item :label="t('goodsLabel')" v-if="diyStore.editComponent.labelStyle.isShow">
+        <el-form-item
+          :label="t('goodsLabel')"
+          v-if="diyStore.editComponent.labelStyle.isShow"
+        >
           <el-switch v-model="diyStore.editComponent.labelStyle.control" />
         </el-form-item>
       </el-form>
@@ -220,46 +398,94 @@
 
   <!-- 样式 -->
   <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-
     <div class="edit-attr-item-wrap">
       <h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('goodsBgColor')">
-					<el-color-picker v-model="diyStore.editComponent.elementBgColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.elementBgColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('goodsNameColor')">
-					<el-color-picker v-model="diyStore.editComponent.goodsNameStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.goodsNameStyle.color"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
           <div class="mr-[20px]"></div>
-					<el-radio-group v-model="diyStore.editComponent.goodsNameStyle.fontWeight">
+          <el-radio-group
+            v-model="diyStore.editComponent.goodsNameStyle.fontWeight"
+          >
             <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
             <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="t('goodsPriceColor')">
-					<el-color-picker v-model="diyStore.editComponent.priceStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.priceStyle.color"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('goodsSaleColor')">
-					<el-color-picker v-model="diyStore.editComponent.saleStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.saleStyle.color"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('topRounded')">
-					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.topElementRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
         <el-form-item :label="t('bottomRounded')">
-					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.bottomElementRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
       </el-form>
     </div>
 
-        <div class="edit-attr-item-wrap"  v-if="diyStore.editComponent.btnStyle.control">
-			<h3 class="mb-[10px]">{{ t("goodsBuyBtn") }}</h3>
+    <div
+      class="edit-attr-item-wrap"
+      v-if="diyStore.editComponent.btnStyle.control"
+    >
+      <h3 class="mb-[10px]">{{ t('goodsBuyBtn') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('goodsTextColor')">
-					<el-color-picker v-model="diyStore.editComponent.btnStyle.textColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.btnStyle.textColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('listFrameColor')">
-					<el-color-picker v-model="diyStore.editComponent.btnStyle.startBgColor" show-alpha :predefine="diyStore.predefineColors" />
-                    <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
-					<el-color-picker v-model="diyStore.editComponent.btnStyle.endBgColor" show-alpha :predefine="diyStore.predefineColors"/>
+          <el-color-picker
+            v-model="diyStore.editComponent.btnStyle.startBgColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
+          <icon
+            name="iconfont iconmap-connect"
+            size="20px"
+            class="block !text-gray-400 mx-[5px]"
+          />
+          <el-color-picker
+            v-model="diyStore.editComponent.btnStyle.endBgColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -277,18 +503,17 @@ import { ref, reactive, onMounted, nextTick } from 'vue'
 import { ElTable } from 'element-plus'
 import { range } from 'lodash-es'
 import Sortable from 'sortablejs'
-import { getCategoryTree,getCategoryList } from '@/addon/shop/api/goods'
+import { getCategoryTree, getCategoryList } from '@/addon/shop/api/goods'
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 
-const diyStore:any = useDiyStore()
+const diyStore: any = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
   const res = { code: true, message: '' }
 
-    if(diyStore.value[index].source == 'custom') {
-
+  if (diyStore.value[index].source == 'custom') {
     diyStore.value[index].list.forEach((item: any) => {
       if (item.source === 'category') {
         if (item.goods_category == '') {
@@ -302,8 +527,8 @@ diyStore.editComponent.verify = (index: number) => {
           res.message = t('goodsPlaceholder')
         }
       }
-        });
-    }else if(diyStore.value[index].source == 'goods_category') {
+    })
+  } else if (diyStore.value[index].source == 'goods_category') {
     if (diyStore.value[index].goods_category == '') {
       res.code = false
       res.message = t('goodsCategoryPlaceholder')
@@ -325,8 +550,8 @@ const firstCategoryTable = reactive({
   loading: true,
   data: [],
   searchParam: {
-        level: 1
-    }
+    level: 1,
+  },
 })
 
 const firstCategoryTableRef = ref<InstanceType<typeof ElTable>>()
@@ -338,18 +563,20 @@ const loadCategoryList = () => {
   firstCategoryTable.loading = true
 
   getCategoryList({
-        ...firstCategoryTable.searchParam
-    }).then(res => {
+    ...firstCategoryTable.searchParam,
+  })
+    .then((res) => {
       firstCategoryTable.loading = false
       firstCategoryTable.data = res.data
-    }).catch(() => {
+    })
+    .catch(() => {
       firstCategoryTable.loading = false
     })
 }
 
 const saveFirstCategoryId = () => {
   diyStore.editComponent.goods_category = currFirstCategory.category_id
-    diyStore.editComponent.goods_category_name = currFirstCategory.category_name;
+  diyStore.editComponent.goods_category_name = currFirstCategory.category_name
   firstCategoryShowDialog.value = false
 }
 
@@ -362,40 +589,39 @@ const firstCategoryShowDialogOpen = () => {
   }
 }
 
-
 const btnStyleList = reactive([
   {
     isShow: true,
     type: 'button',
     title: diyStore.editComponent.btnStyle.text,
-        value: 'button'
+    value: 'button',
   },
   {
     isShow: true,
     type: 'icon',
     title: 'nc-icon-jiahaoV6xx',
-        value: 'nc-icon-jiahaoV6xx'
+    value: 'nc-icon-jiahaoV6xx',
   },
   {
     isShow: true,
     type: 'icon',
     title: 'nc-icon-gouwuche1',
-        value: 'nc-icon-gouwuche1'
-    }
+    value: 'nc-icon-gouwuche1',
+  },
 ])
-diyStore.editComponent.btnStyle.style = 'nc-icon-jiahaoV6xx';
+diyStore.editComponent.btnStyle.style = 'nc-icon-jiahaoV6xx'
 
-const changeBtnStyle = (item:any) => {
+const changeBtnStyle = (item: any) => {
   diyStore.editComponent.btnStyle.style = item.value
 }
 
-const clearCategory = ()=> {
+const clearCategory = () => {
   diyStore.editComponent.goods_category = ''
-    diyStore.editComponent.goods_category_name = '';
+  diyStore.editComponent.goods_category_name = ''
 }
 
 // 选择商品分类
-let currFirstCategory:any = {}
+let currFirstCategory: any = {}
 const handleCurrentCategoryChange = (val: string | any[]) => {
   currFirstCategory = val
 }
@@ -407,7 +633,7 @@ const goodsBoxRef = ref()
 
 const categoryTable = reactive({
   loading: true,
-    data: []
+  data: [],
 })
 
 onMounted(() => {
@@ -419,16 +645,16 @@ onMounted(() => {
     const sortable = Sortable.create(goodsBoxRef.value, {
       group: 'item-wrap',
       animation: 200,
-            onEnd: event => {
+      onEnd: (event) => {
         const temp = diyStore.editComponent.list[event.oldIndex!]
         diyStore.editComponent.list.splice(event.oldIndex!, 1)
         diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
         sortable.sort(
-                    range(diyStore.editComponent.list.length).map(value => {
+          range(diyStore.editComponent.list.length).map((value) => {
             return value.toString()
           })
         )
-            }
+      },
     })
   })
 })
@@ -442,16 +668,18 @@ let currCategoryData: any = null
 const loadCategoryTree = () => {
   categoryTable.loading = true
 
-    getCategoryTree().then(res => {
+  getCategoryTree()
+    .then((res) => {
       categoryTable.loading = false
       categoryTable.data = res.data
-    }).catch(() => {
+    })
+    .catch(() => {
       categoryTable.loading = false
     })
 }
 
 // 选择商品分类
-let selectIndex = 0; // 当前选择的下标
+let selectIndex = 0 // 当前选择的下标
 const handleSelectionChange = (val: string | any[]) => {
   let data = ''
   if (val) data = val[val.length - 1]
@@ -461,30 +689,37 @@ const handleSelectionChange = (val: string | any[]) => {
 }
 
 const saveCategoryId = () => {
-    diyStore.editComponent.list[selectIndex].goods_category = currCategoryData.category_id
-    diyStore.editComponent.list[selectIndex].goods_category_name = currCategoryData.category_name;
+  diyStore.editComponent.list[selectIndex].goods_category =
+    currCategoryData.category_id
+  diyStore.editComponent.list[selectIndex].goods_category_name =
+    currCategoryData.category_name
   categoryShowDialog.value = false
 }
 
 const categoryShowDialogOpen = (index: any) => {
-    selectIndex = index;
+  selectIndex = index
   categoryShowDialog.value = true
 
-	nextTick(()=>{
+  nextTick(() => {
     setRowSelection()
   })
 }
 
 //分类数据选中回填,设置展开行
 const expand_category_ids = ref<Array<any>>([])
-const setRowSelection = ()=>{
+const setRowSelection = () => {
   expand_category_ids.value = []
-	categoryTable.data.forEach((el:any)=>{
-		if(diyStore.editComponent.list[selectIndex].goods_category == el.category_id){
+  categoryTable.data.forEach((el: any) => {
+    if (
+      diyStore.editComponent.list[selectIndex].goods_category == el.category_id
+    ) {
       categoryTableRef.value!.toggleRowSelection(el, true)
-		}else if(el.child_list&&el.child_list.length){
-			el.child_list.forEach((v:any)=>{
-				if(diyStore.editComponent.list[selectIndex].goods_category == v.category_id){
+    } else if (el.child_list && el.child_list.length) {
+      el.child_list.forEach((v: any) => {
+        if (
+          diyStore.editComponent.list[selectIndex].goods_category ==
+          v.category_id
+        ) {
           expand_category_ids.value.push(el.category_id.toString())
           categoryTableRef.value!.toggleRowSelection(v, true)
         }
@@ -496,18 +731,17 @@ const setRowSelection = ()=>{
 const addItem = () => {
   diyStore.editComponent.list.push({
     id: diyStore.generateRandom(),
-        title : "分类",
-        desc : "分类描述",
-        source : "all",
-        goods_category : '',
-        goods_category_name : '请选择',
-        goods_ids : [],
-        imageUrl:''
+    title: '分类',
+    desc: '分类描述',
+    source: 'all',
+    goods_category: '',
+    goods_category_name: '请选择',
+    goods_ids: [],
+    imageUrl: '',
   })
 }
 
 defineExpose({})
-
 </script>
 
 <style lang="scss" scoped></style>

admin/src/addon/shop/views/diy/components/edit-shop-exchange-goods.vue

@@ -20,7 +20,7 @@
 				</div>
 			</div> -->
       <div class="edit-attr-item-wrap">
-				<h3 class="mb-[10px]">{{ t("selectSource") }}</h3>
+        <h3 class="mb-[10px]">{{ t('selectSource') }}</h3>
         <el-form label-width="80px" class="px-[10px]">
           <el-form-item :label="t('sortWay')">
             <el-radio-group v-model="diyStore.editComponent.sortWay">
@@ -30,9 +30,16 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
-						<el-radio-group v-model="diyStore.editComponent.source" :title="t('goodsSelectPopupSelectGoodsButton')">
-							<el-radio label="all">{{ t('goodsSelectPopupAllGoods') }}</el-radio>
-							<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+            <el-radio-group
+              v-model="diyStore.editComponent.source"
+              :title="t('goodsSelectPopupSelectGoodsButton')"
+            >
+              <el-radio label="all">{{
+                t('goodsSelectPopupAllGoods')
+              }}</el-radio>
+              <el-radio label="custom">{{
+                t('manualSelectionSources')
+              }}</el-radio>
             </el-radio-group>
           </el-form-item>
           <!-- <el-form-item :label="t('selectCategory')" v-if="diyStore.editComponent.source == 'category'">
@@ -49,17 +56,34 @@
 							<span class="ml-[15px]">{{ diyStore.editComponent.num }}</span>
 						</div>
 					</el-form-item> -->
-					<el-form-item :label="t('customGoods')" v-if="diyStore.editComponent.source == 'custom'">
-						<el-button type="primary" @click="goodsSelectPopupRef.show(diyStore.editComponent.goods_ids)">{{ t('goodsSelectPopupSelectGoodsButton') }}</el-button>
-						<div class="inline-block ml-[10px] text-[14px]" v-show="diyStore.editComponent.goods_ids.length">
+          <el-form-item
+            :label="t('customGoods')"
+            v-if="diyStore.editComponent.source == 'custom'"
+          >
+            <el-button
+              type="primary"
+              @click="
+                goodsSelectPopupRef.show(diyStore.editComponent.goods_ids)
+              "
+              >{{ t('goodsSelectPopupSelectGoodsButton') }}</el-button
+            >
+            <div
+              class="inline-block ml-[10px] text-[14px]"
+              v-show="diyStore.editComponent.goods_ids.length"
+            >
               <span>{{ t('goodsSelectPopupSelect') }}</span>
-						<span class="text-primary mx-[2px]">{{ diyStore.editComponent.goods_ids.length }}</span>
+              <span class="text-primary mx-[2px]">{{
+                diyStore.editComponent.goods_ids.length
+              }}</span>
               <span>{{ t('goodsSelectPopupPiece') }}</span>
             </div>
-						<goods-select-popup ref="goodsSelectPopupRef" :min="1" @select="goodsSelect"/>
+            <goods-select-popup
+              ref="goodsSelectPopupRef"
+              :min="1"
+              @select="goodsSelect"
+            />
           </el-form-item>
         </el-form>
-
       </div>
     </div>
 
@@ -69,24 +93,50 @@
         <h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
         <el-form label-width="80px" class="px-[10px]">
           <el-form-item :label="t('goodsNameColor')">
-						<el-color-picker v-model="diyStore.editComponent.goodsNameStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+            <el-color-picker
+              v-model="diyStore.editComponent.goodsNameStyle.color"
+              show-alpha
+              :predefine="diyStore.predefineColors"
+            />
             <div class="mr-[20px]"></div>
-						<el-radio-group v-model="diyStore.editComponent.goodsNameStyle.fontWeight">
+            <el-radio-group
+              v-model="diyStore.editComponent.goodsNameStyle.fontWeight"
+            >
               <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
               <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item :label="t('goodsNumColor')">
-						<el-color-picker v-model="diyStore.editComponent.saleStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+            <el-color-picker
+              v-model="diyStore.editComponent.saleStyle.color"
+              show-alpha
+              :predefine="diyStore.predefineColors"
+            />
           </el-form-item>
           <el-form-item :label="t('goodsPriceColor')">
-						<el-color-picker v-model="diyStore.editComponent.priceStyle.mainColor" show-alpha :predefine="diyStore.predefineColors" />
+            <el-color-picker
+              v-model="diyStore.editComponent.priceStyle.mainColor"
+              show-alpha
+              :predefine="diyStore.predefineColors"
+            />
           </el-form-item>
           <el-form-item :label="t('topRounded')">
-						<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+            <el-slider
+              v-model="diyStore.editComponent.topElementRounded"
+              show-input
+              size="small"
+              class="ml-[10px] diy-nav-slider"
+              :max="50"
+            />
           </el-form-item>
           <el-form-item :label="t('bottomRounded')">
-						<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+            <el-slider
+              v-model="diyStore.editComponent.bottomElementRounded"
+              show-input
+              size="small"
+              class="ml-[10px] diy-nav-slider"
+              :max="50"
+            />
           </el-form-item>
         </el-form>
       </div>
@@ -104,20 +154,20 @@ import useDiyStore from '@/stores/modules/diy'
 import { ref, reactive, onMounted } from 'vue'
 import goodsSelectPopup from '@/addon/shop/views/marketing/exchange/components/goods-select-popup.vue'
 
-const diyStore:any = useDiyStore()
+const diyStore: any = useDiyStore()
 diyStore.editComponent.ignore = [] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
   const res = { code: true, message: '' }
 
-    if(diyStore.value[index].source == 'category'){
-        if(diyStore.value[index].goods_category == ''){
+  if (diyStore.value[index].source == 'category') {
+    if (diyStore.value[index].goods_category == '') {
       res.code = false
       res.message = t('goodsCategoryPlaceholder')
     }
-    }else if(diyStore.value[index].source == 'custom'){
-        if(diyStore.value[index].goods_ids.length == 0){
+  } else if (diyStore.value[index].source == 'custom') {
+    if (diyStore.value[index].goods_ids.length == 0) {
       res.code = false
       res.message = t('goodsPlaceholder')
     }
@@ -127,11 +177,10 @@ diyStore.editComponent.verify = (index: number) => {
 }
 
 const goodsSelectPopupRef = ref()
-const goodsSelect = (val:any)=>{
-	diyStore.editComponent.goods_ids = val.map((el:any)=>el.id)
+const goodsSelect = (val: any) => {
+  diyStore.editComponent.goods_ids = val.map((el: any) => el.id)
 }
 defineExpose({})
-
 </script>
 
 <style lang="scss" scoped></style>

admin/src/addon/shop/views/diy/components/edit-shop-exchange-info.vue

@@ -5,7 +5,7 @@
       <h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('bgUrl')">
-					<upload-image v-model="diyStore.editComponent.bgUrl" :limit="1"/>
+          <upload-image v-model="diyStore.editComponent.bgUrl" :limit="1" />
         </el-form-item>
       </el-form>
     </div>
@@ -22,8 +22,8 @@
 import { t } from '@/lang'
 import useDiyStore from '@/stores/modules/diy'
 
-const diyStore:any = useDiyStore()
-diyStore.editComponent.ignore = ['componentBgColor','componentBgUrl'] // 忽略公共属性
+const diyStore: any = useDiyStore()
+diyStore.editComponent.ignore = ['componentBgColor', 'componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
@@ -32,7 +32,6 @@ diyStore.editComponent.verify = (index: number) => {
 }
 
 defineExpose({})
-
 </script>
 
 <style lang="scss" scoped></style>

admin/src/addon/shop/views/diy/components/edit-shop-goods-ranking.vue

@@ -4,17 +4,32 @@
     <div class="edit-attr-item-wrap">
       <h3 class="mb-[10px]">{{ t('activeCubeBlockContent') }}</h3>
       <el-form label-width="85px" class="px-[10px]">
-
         <div ref="blockBoxRef">
-                    <div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+          <div
+            v-for="(item, index) in diyStore.editComponent.list"
+            :key="item.id"
+            class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
+          >
             <el-form-item :label="t('bgImage')">
               <upload-image v-model="item.bgUrl" :limit="1" />
             </el-form-item>
 
             <el-form-item :label="t('listFrameColor')">
-                            <el-color-picker v-model="item.listFrame.startColor" show-alpha :predefine="diyStore.predefineColors" />
-                            <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]" />
-                            <el-color-picker v-model="item.listFrame.endColor" show-alpha :predefine="diyStore.predefineColors" />
+              <el-color-picker
+                v-model="item.listFrame.startColor"
+                show-alpha
+                :predefine="diyStore.predefineColors"
+              />
+              <icon
+                name="iconfont iconmap-connect"
+                size="20px"
+                class="block !text-gray-400 mx-[5px]"
+              />
+              <el-color-picker
+                v-model="item.listFrame.endColor"
+                show-alpha
+                :predefine="diyStore.predefineColors"
+              />
             </el-form-item>
 
             <el-form-item :label="t('rankingTitleIcon')">
@@ -22,18 +37,38 @@
             </el-form-item>
 
             <el-form-item :label="t('rankName')">
-                            <el-input v-model="item.text" clearable :placeholder="t('rankNamePlaceholder')" maxlength="8" show-word-limit />
+              <el-input
+                v-model="item.text"
+                clearable
+                :placeholder="t('rankNamePlaceholder')"
+                maxlength="8"
+                show-word-limit
+              />
             </el-form-item>
             <el-form-item :label="t('rankTextColor')">
-                            <el-color-picker v-model="item.textColor" show-alpha :predefine="diyStore.predefineColors" />
+              <el-color-picker
+                v-model="item.textColor"
+                show-alpha
+                :predefine="diyStore.predefineColors"
+              />
             </el-form-item>
 
             <el-form-item :label="t('rankingSubTitle')">
-                            <el-input v-model.trim="item.subTitle.text" :placeholder="t('activeCubeSubTitlePlaceholder')" clearable maxlength="6" show-word-limit />
+              <el-input
+                v-model.trim="item.subTitle.text"
+                :placeholder="t('activeCubeSubTitlePlaceholder')"
+                clearable
+                maxlength="6"
+                show-word-limit
+              />
             </el-form-item>
 
             <el-form-item :label="t('rankingSubTitleTextColor')">
-                            <el-color-picker v-model="item.subTitle.textColor" show-alpha :predefine="diyStore.predefineColors" />
+              <el-color-picker
+                v-model="item.subTitle.textColor"
+                show-alpha
+                :predefine="diyStore.predefineColors"
+              />
             </el-form-item>
 
             <el-form-item :label="t('rankingSubTitleLink')">
@@ -41,22 +76,42 @@
             </el-form-item>
 
             <el-form-item :label="t('rankSelectPopupSelectRankButton')">
-                            <el-radio-group v-model="item.source" :title="t('rankSelectPopupSelectRankButton')">
+              <el-radio-group
+                v-model="item.source"
+                :title="t('rankSelectPopupSelectRankButton')"
+              >
                 <el-radio label="default">{{ t('defaultSources') }}</el-radio>
-                                <el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+                <el-radio label="custom">{{
+                  t('manualSelectionSources')
+                }}</el-radio>
               </el-radio-group>
             </el-form-item>
-                        <el-form-item :label="t('customGoods')" v-if="item.source == 'custom'">
-                            <rank-select-popup ref="goodsSelectPopupRef" v-model="diyStore.editComponent.list[index].rankIds" :max="1" />
+            <el-form-item
+              :label="t('customGoods')"
+              v-if="item.source == 'custom'"
+            >
+              <rank-select-popup
+                ref="goodsSelectPopupRef"
+                v-model="diyStore.editComponent.list[index].rankIds"
+                :max="1"
+              />
             </el-form-item>
-                        <div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
+            <div
+              class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
+              v-show="diyStore.editComponent.list.length > 1"
+              @click="diyStore.editComponent.list.splice(index, 1)"
+            >
               <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
             </div>
           </div>
         </div>
 
-                <el-button v-show="diyStore.editComponent.list.length < 10" class="w-full" @click="addItem">{{ t('activeCubeAddItem') }}</el-button>
-
+        <el-button
+          v-show="diyStore.editComponent.list.length < 10"
+          class="w-full"
+          @click="addItem"
+          >{{ t('activeCubeAddItem') }}</el-button
+        >
       </el-form>
     </div>
   </div>
@@ -67,10 +122,22 @@
       <h3 class="mb-[10px]">{{ t('rankingStyle') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
         <el-form-item :label="t('topRounded')">
-                    <el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.topElementRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
         <el-form-item :label="t('bottomRounded')">
-                    <el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.bottomElementRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -87,7 +154,7 @@ import useDiyStore from '@/stores/modules/diy'
 import { ref, reactive } from 'vue'
 import rankSelectPopup from '@/addon/shop/views/marketing/goods_rank/components/rank-select-popup.vue'
 
-const diyStore:any = useDiyStore()
+const diyStore: any = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
@@ -100,7 +167,7 @@ diyStore.editComponent.verify = (index: number) => {
         res.message = t('请选择榜单')
       }
     }
-        });
+  })
   return res
 }
 
@@ -109,21 +176,21 @@ const addItem = () => {
     id: diyStore.generateRandom(),
     bgUrl: '',
     text: '榜单名称',
-        textColor: "#FFFFFF",
-        imgUrl: "",
+    textColor: '#FFFFFF',
+    imgUrl: '',
     subTitle: {
       text: '查看更多',
       textColor: '#FFFFFF',
       link: {
-                name: ''
-            }
+        name: '',
+      },
     },
     listFrame: {
       startColor: '#FEA715',
       endColor: '#FE1E00',
     },
     source: 'default',
-        rankIds: []
+    rankIds: [],
   })
 }
 

admin/src/addon/shop/views/diy/components/edit-shop-goods-recommend.vue

@@ -2,16 +2,29 @@
   <!-- 内容 -->
   <div class="content-wrap" v-show="diyStore.editTab == 'content'">
     <div class="edit-attr-item-wrap">
-			<h3 class="mb-[10px]">{{ t("selectSource") }}</h3>
+      <h3 class="mb-[10px]">{{ t('selectSource') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
-					<el-radio-group v-model="diyStore.editComponent.source" :title="t('goodsSelectPopupSelectGoodsButton')">
+          <el-radio-group
+            v-model="diyStore.editComponent.source"
+            :title="t('goodsSelectPopupSelectGoodsButton')"
+          >
             <el-radio label="all">{{ t('defaultGoodsSelect') }}</el-radio>
-						<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+            <el-radio label="custom">{{
+              t('manualSelectionSources')
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
-				<el-form-item :label="t('customGoods')" v-if="diyStore.editComponent.source == 'custom'">
-					<goods-select-popup ref="goodsSelectPopupRef" v-model="diyStore.editComponent.goods_ids" :min="diyStore.editComponent.list.length" :max="diyStore.editComponent.list.length" />
+        <el-form-item
+          :label="t('customGoods')"
+          v-if="diyStore.editComponent.source == 'custom'"
+        >
+          <goods-select-popup
+            ref="goodsSelectPopupRef"
+            v-model="diyStore.editComponent.goods_ids"
+            :min="diyStore.editComponent.list.length"
+            :max="diyStore.editComponent.list.length"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -19,40 +32,105 @@
     <div class="edit-attr-item-wrap">
       <el-form label-width="120px" class="px-[10px]">
         <h3 class="mb-[10px]">{{ t('activeCubeBlockContent') }}</h3>
-				<p class="text-sm text-gray-400 mb-[10px]">{{ t('dragMouseAdjustOrder') }}</p>
+        <p class="text-sm text-gray-400 mb-[10px]">
+          {{ t('dragMouseAdjustOrder') }}
+        </p>
         <div ref="blockBoxRef">
-					<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+          <div
+            v-for="(item, index) in diyStore.editComponent.list"
+            :key="item.id"
+            class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
+          >
             <el-form-item :label="t('activeCubeTitle')">
-							<el-input v-model.trim="item.title.text" :placeholder="t('activeCubeTitlePlaceholder')" clearable maxlength="4" show-word-limit/>
+              <el-input
+                v-model.trim="item.title.text"
+                :placeholder="t('activeCubeTitlePlaceholder')"
+                clearable
+                maxlength="4"
+                show-word-limit
+              />
             </el-form-item>
             <el-form-item :label="t('shopGoodsRecommendComponentTag')">
-							<el-input v-model.trim="item.moreTitle.text" :placeholder="t('shopGoodsRecommendComponentTagPlaceholder')" clearable maxlength="2" show-word-limit/>
+              <el-input
+                v-model.trim="item.moreTitle.text"
+                :placeholder="t('shopGoodsRecommendComponentTagPlaceholder')"
+                clearable
+                maxlength="2"
+                show-word-limit
+              />
             </el-form-item>
             <el-form-item :label="t('activeCubeButton')">
-							<el-input v-model.trim="item.button.text" :placeholder="t('activeCubeButtonPlaceholder')" clearable maxlength="2" show-word-limit/>
+              <el-input
+                v-model.trim="item.button.text"
+                :placeholder="t('activeCubeButtonPlaceholder')"
+                clearable
+                maxlength="2"
+                show-word-limit
+              />
             </el-form-item>
             <el-form-item :label="t('activeCubeSubTitleTextColor')">
-                            <el-color-picker v-model="item.title.textColor" show-alpha :predefine="diyStore.predefineColors" />
+              <el-color-picker
+                v-model="item.title.textColor"
+                show-alpha
+                :predefine="diyStore.predefineColors"
+              />
             </el-form-item>
             <el-form-item :label="t('shopGoodsRecommendComponentTagcolor')">
-							<el-color-picker v-model="item.moreTitle.startColor" show-alpha :predefine="diyStore.predefineColors" />
-							<icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
-							<el-color-picker v-model="item.moreTitle.endColor" show-alpha :predefine="diyStore.predefineColors"/>
+              <el-color-picker
+                v-model="item.moreTitle.startColor"
+                show-alpha
+                :predefine="diyStore.predefineColors"
+              />
+              <icon
+                name="iconfont iconmap-connect"
+                size="20px"
+                class="block !text-gray-400 mx-[5px]"
+              />
+              <el-color-picker
+                v-model="item.moreTitle.endColor"
+                show-alpha
+                :predefine="diyStore.predefineColors"
+              />
             </el-form-item>
             <el-form-item :label="t('activeCubeButtonColor')">
-							<el-color-picker v-model="item.button.color" show-alpha :predefine="diyStore.predefineColors" />
+              <el-color-picker
+                v-model="item.button.color"
+                show-alpha
+                :predefine="diyStore.predefineColors"
+              />
             </el-form-item>
             <el-form-item :label="t('activeListFrameColor')">
-							<el-color-picker v-model="item.listFrame.startColor" show-alpha :predefine="diyStore.predefineColors" />
-							<icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
-							<el-color-picker v-model="item.listFrame.endColor" show-alpha :predefine="diyStore.predefineColors"/>
+              <el-color-picker
+                v-model="item.listFrame.startColor"
+                show-alpha
+                :predefine="diyStore.predefineColors"
+              />
+              <icon
+                name="iconfont iconmap-connect"
+                size="20px"
+                class="block !text-gray-400 mx-[5px]"
+              />
+              <el-color-picker
+                v-model="item.listFrame.endColor"
+                show-alpha
+                :predefine="diyStore.predefineColors"
+              />
             </el-form-item>
-						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="deleteTempFn(index)">
-							<icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+            <div
+              class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
+              v-show="diyStore.editComponent.list.length > 1"
+              @click="deleteTempFn(index)"
+            >
+              <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
             </div>
           </div>
         </div>
-				<el-button v-show="diyStore.editComponent.list.length < 10" class="w-full" @click="addItem">{{ t('activeCubeAddItem') }}</el-button>
+        <el-button
+          v-show="diyStore.editComponent.list.length < 10"
+          class="w-full"
+          @click="addItem"
+          >{{ t('activeCubeAddItem') }}</el-button
+        >
       </el-form>
     </div>
   </div>
@@ -63,13 +141,29 @@
       <h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('goodsPriceColor')">
-					<el-color-picker v-model="diyStore.editComponent.priceStyle.mainColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.priceStyle.mainColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('topRounded')">
-					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.topElementRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
         <el-form-item :label="t('bottomRounded')">
-					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.bottomElementRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -82,12 +176,12 @@
 import { t } from '@/lang'
 import { img } from '@/utils/common'
 import useDiyStore from '@/stores/modules/diy'
-import { ref, reactive, onMounted,nextTick } from 'vue'
+import { ref, reactive, onMounted, nextTick } from 'vue'
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 import Sortable from 'sortablejs'
 import { range } from 'lodash-es'
 
-const diyStore:any = useDiyStore()
+const diyStore: any = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
@@ -111,7 +205,10 @@ diyStore.editComponent.verify = (index: number) => {
     }
   })
 
-    if (diyStore.value[index].source == 'custom' && diyStore.value[index].goods_ids.length < diyStore.value[index].list.length) {
+  if (
+    diyStore.value[index].source == 'custom' &&
+    diyStore.value[index].goods_ids.length < diyStore.value[index].list.length
+  ) {
     res.code = false
     res.message = t('goodsPlaceholder')
     return res
@@ -130,21 +227,21 @@ onMounted(() => {
     const sortable = Sortable.create(blockBoxRef.value, {
       group: 'item-wrap',
       animation: 200,
-            onEnd: event => {
+      onEnd: (event) => {
         const temp = diyStore.editComponent.list[event.oldIndex!]
         diyStore.editComponent.list.splice(event.oldIndex!, 1)
         diyStore.editComponent.list.splice(event.newIndex!, 0, temp)
         sortable.sort(
-                    range(diyStore.editComponent.list.length).map(value => {
+          range(diyStore.editComponent.list.length).map((value) => {
             return value.toString()
           })
         )
-            }
+      },
     })
 
-        let listNum = diyStore.editComponent.list.length;
-        let goodsIdNum = diyStore.editComponent.goods_ids.length;
-        diyStore.editComponent.goods_ids.splice(listNum, goodsIdNum);
+    let listNum = diyStore.editComponent.list.length
+    let goodsIdNum = diyStore.editComponent.goods_ids.length
+    diyStore.editComponent.goods_ids.splice(listNum, goodsIdNum)
   })
 })
 
@@ -153,33 +250,32 @@ const addItem = () => {
     id: diyStore.generateRandom(),
     title: {
       text: '标题',
-			textColor: '#303133'
+      textColor: '#303133',
     },
     moreTitle: {
       text: '精选',
       startColor: '#FF7234',
-			endColor: '#FF213F'
+      endColor: '#FF213F',
     },
     listFrame: {
       startColor: '#FFE5E5',
-			endColor: '#FFF5F0'
+      endColor: '#FFF5F0',
     },
-		button : {
-			text: "首单",
-			textColor: "#FFFFFF",
-			color: "#FF1128",
+    button: {
+      text: '首单',
+      textColor: '#FFFFFF',
+      color: '#FF1128',
     },
     goodsId: [],
   })
 }
 
-const deleteTempFn = (index) =>{
-    diyStore.editComponent.list.splice(index,1);
-    diyStore.editComponent.goods_ids.splice(index,1);
+const deleteTempFn = (index) => {
+  diyStore.editComponent.list.splice(index, 1)
+  diyStore.editComponent.goods_ids.splice(index, 1)
 }
 
 defineExpose({})
-
 </script>
 
 <style lang="scss" scoped></style>

admin/src/addon/shop/views/diy/components/edit-shop-member-info.vue

@@ -5,7 +5,7 @@
       <h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('bgUrl')">
-					<upload-image v-model="diyStore.editComponent.bgUrl" :limit="1"/>
+          <upload-image v-model="diyStore.editComponent.bgUrl" :limit="1" />
         </el-form-item>
       </el-form>
       <el-form label-width="80px" class="px-[10px]">
@@ -22,13 +22,13 @@
       <h3 class="mb-[10px]">{{ t('memberStyle') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('textColor')">
-					<el-color-picker v-model="diyStore.editComponent.textColor"/>
+          <el-color-picker v-model="diyStore.editComponent.textColor" />
         </el-form-item>
       </el-form>
 
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('shopMemberInfoComponentUidTextColor')">
-					<el-color-picker v-model="diyStore.editComponent.uidTextColor"/>
+          <el-color-picker v-model="diyStore.editComponent.uidTextColor" />
         </el-form-item>
       </el-form>
     </div>
@@ -46,7 +46,6 @@ const diyStore = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 defineExpose({})
-
 </script>
 
 <style lang="scss" scoped></style>

admin/src/addon/shop/views/diy/components/edit-shop-newcomer.vue

@@ -5,28 +5,43 @@
       <h3 class="mb-[10px]">{{ t('styleRecommend') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('selectStyle')" class="flex">
-					<span class="text-primary flex-1 cursor-pointer" @click="showTitleStyle">{{ diyStore.editComponent.style.title }}</span>
+          <span
+            class="text-primary flex-1 cursor-pointer"
+            @click="showTitleStyle"
+            >{{ diyStore.editComponent.style.title }}</span
+          >
           <el-icon>
             <ArrowRight />
           </el-icon>
         </el-form-item>
       </el-form>
 
-			<el-dialog v-model="showTitleDialog" :title="t('selectStyle')" width="460px">
+      <el-dialog
+        v-model="showTitleDialog"
+        :title="t('selectStyle')"
+        width="460px"
+      >
         <div class="flex flex-wrap">
-					<template v-for="(item,index) in styleList" :key="index">
-						<div :class="{ 'border-primary': selectStyle.value == item.value }" @click="changeTitleStyle(item)" class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] mb-[12px] cursor-pointer border bg-[#eee]">
+          <template v-for="(item, index) in styleList" :key="index">
+            <div
+              :class="{ 'border-primary': selectStyle.value == item.value }"
+              @click="changeTitleStyle(item)"
+              class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] mb-[12px] cursor-pointer border bg-[#eee]"
+            >
               <img :src="img(item.url)" />
             </div>
           </template>
         </div>
         <template #footer>
           <span class="dialog-footer">
-						<el-button @click="showTitleDialog = false">{{ t('cancel') }}</el-button>
-						<el-button type="primary" @click="confirmTitleStyle">{{ t('confirm') }}</el-button>
+            <el-button @click="showTitleDialog = false">{{
+              t('cancel')
+            }}</el-button>
+            <el-button type="primary" @click="confirmTitleStyle">{{
+              t('confirm')
+            }}</el-button>
           </span>
         </template>
-
       </el-dialog>
     </div>
 
@@ -34,34 +49,80 @@
       <h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('image')">
-                    <upload-image v-model="diyStore.editComponent.textImg" :limit="1"/>
+          <upload-image v-model="diyStore.editComponent.textImg" :limit="1" />
         </el-form-item>
-                <el-form-item :label="t('subTitle')" v-show="diyStore.editComponent && diyStore.editComponent.style && diyStore.editComponent.style.value == 'style-3'">
-                    <el-input v-model.trim="diyStore.editComponent.subTitle.text" :placeholder="t('subTitlePlaceholder')" clearable maxlength="8" show-word-limit />
+        <el-form-item
+          :label="t('subTitle')"
+          v-show="
+            diyStore.editComponent &&
+            diyStore.editComponent.style &&
+            diyStore.editComponent.style.value == 'style-3'
+          "
+        >
+          <el-input
+            v-model.trim="diyStore.editComponent.subTitle.text"
+            :placeholder="t('subTitlePlaceholder')"
+            clearable
+            maxlength="8"
+            show-word-limit
+          />
         </el-form-item>
-                <el-form-item :label="t('link')" v-show="diyStore.editComponent && diyStore.editComponent.style && diyStore.editComponent.style.value == 'style-3'">
-                    <diy-link v-model="diyStore.editComponent.subTitle.link"/>
+        <el-form-item
+          :label="t('link')"
+          v-show="
+            diyStore.editComponent &&
+            diyStore.editComponent.style &&
+            diyStore.editComponent.style.value == 'style-3'
+          "
+        >
+          <diy-link v-model="diyStore.editComponent.subTitle.link" />
         </el-form-item>
       </el-form>
     </div>
 
     <div class="edit-attr-item-wrap">
-			<h3 class="mb-[10px]">{{ t("selectSource") }}</h3>
+      <h3 class="mb-[10px]">{{ t('selectSource') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
-					<el-radio-group v-model="diyStore.editComponent.source" :title="t('goodsSelectPopupSelectGoodsButton')">
+          <el-radio-group
+            v-model="diyStore.editComponent.source"
+            :title="t('goodsSelectPopupSelectGoodsButton')"
+          >
             <el-radio label="all">{{ t('goodsSelectPopupAllGoods') }}</el-radio>
-						<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+            <el-radio label="custom">{{
+              t('manualSelectionSources')
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
-				<el-form-item :label="t('goodsNum')" v-if="diyStore.editComponent.source == 'all' || diyStore.editComponent.source == 'category'">
-					<el-slider class="goods-list-slider" show-input v-model="diyStore.editComponent.num" :min="1" max="20" size="small" />
+        <el-form-item
+          :label="t('goodsNum')"
+          v-if="
+            diyStore.editComponent.source == 'all' ||
+            diyStore.editComponent.source == 'category'
+          "
+        >
+          <el-slider
+            class="goods-list-slider"
+            show-input
+            v-model="diyStore.editComponent.num"
+            :min="1"
+            max="20"
+            size="small"
+          />
         </el-form-item>
-				<el-form-item :label="t('customGoods')" v-if="diyStore.editComponent.source == 'custom'">
-					<newcomer-goods-select-popup ref="goodsSelectPopupRef" v-model="diyStore.editComponent.goods_ids" :min="1" :max="99" mode="sku" />
+        <el-form-item
+          :label="t('customGoods')"
+          v-if="diyStore.editComponent.source == 'custom'"
+        >
+          <newcomer-goods-select-popup
+            ref="goodsSelectPopupRef"
+            v-model="diyStore.editComponent.goods_ids"
+            :min="1"
+            :max="99"
+            mode="sku"
+          />
         </el-form-item>
       </el-form>
-
     </div>
   </div>
 
@@ -71,23 +132,58 @@
       <h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('topRounded')">
-					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.topElementRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
         <el-form-item :label="t('bottomRounded')">
-					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.bottomElementRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
       </el-form>
     </div>
-		<div class="edit-attr-item-wrap"  v-if="diyStore.editComponent && diyStore.editComponent.style && diyStore.editComponent.style.value == 'style-3'">
+    <div
+      class="edit-attr-item-wrap"
+      v-if="
+        diyStore.editComponent &&
+        diyStore.editComponent.style &&
+        diyStore.editComponent.style.value == 'style-3'
+      "
+    >
       <h3 class="mb-[10px]">{{ t('subTitleStyle') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
         <el-form-item :label="t('textColor')">
-						<el-color-picker v-model="diyStore.editComponent.subTitle.textColor" show-alpha :predefine="diyStore.predefineColors"/>
+          <el-color-picker
+            v-model="diyStore.editComponent.subTitle.textColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('subTextBgColor')">
-					<el-color-picker v-model="diyStore.editComponent.subTitle.startColor" show-alpha :predefine="diyStore.predefineColors"/>
-					<icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
-					<el-color-picker v-model="diyStore.editComponent.subTitle.endColor" show-alpha :predefine="diyStore.predefineColors"/>
+          <el-color-picker
+            v-model="diyStore.editComponent.subTitle.startColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
+          <icon
+            name="iconfont iconmap-connect"
+            size="20px"
+            class="block !text-gray-400 mx-[5px]"
+          />
+          <el-color-picker
+            v-model="diyStore.editComponent.subTitle.endColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -95,15 +191,35 @@
       <h3 class="mb-[10px]">{{ t('countDownStyle') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
         <el-form-item :label="t('newcomerNumberColor')">
-                    <el-color-picker v-model="diyStore.editComponent.countDown.numberColor" show-alpha :predefine="diyStore.predefineColors"/>
+          <el-color-picker
+            v-model="diyStore.editComponent.countDown.numberColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('newcomerNumberBg')">
-					<el-color-picker v-model="diyStore.editComponent.countDown.numberBg.startColor" show-alpha :predefine="diyStore.predefineColors"/>
-					<icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]"/>
-					<el-color-picker v-model="diyStore.editComponent.countDown.numberBg.endColor" show-alpha :predefine="diyStore.predefineColors"/>
+          <el-color-picker
+            v-model="diyStore.editComponent.countDown.numberBg.startColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
+          <icon
+            name="iconfont iconmap-connect"
+            size="20px"
+            class="block !text-gray-400 mx-[5px]"
+          />
+          <el-color-picker
+            v-model="diyStore.editComponent.countDown.numberBg.endColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('newcomerOtherColor')">
-                    <el-color-picker v-model="diyStore.editComponent.countDown.otherColor" show-alpha :predefine="diyStore.predefineColors"/>
+          <el-color-picker
+            v-model="diyStore.editComponent.countDown.otherColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -120,15 +236,15 @@ import useDiyStore from '@/stores/modules/diy'
 import { ref, reactive } from 'vue'
 import newcomerGoodsSelectPopup from '@/addon/shop/views/goods/components/newcomer-goods-select-popup.vue'
 
-const diyStore:any = useDiyStore()
+const diyStore: any = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
   const res = { code: true, message: '' }
 
-    if(diyStore.value[index].source == 'custom'){
-        if(diyStore.value[index].goods_ids.length == 0){
+  if (diyStore.value[index].source == 'custom') {
+    if (diyStore.value[index].goods_ids.length == 0) {
       res.code = false
       res.message = t('goodsPlaceholder')
     }
@@ -141,153 +257,162 @@ diyStore.editComponent.verify = (index: number) => {
 const showTitleDialog = ref(false)
 
 const showTitleStyle = () => {
-	selectStyle.title = diyStore.editComponent.style.title;
-	selectStyle.value = diyStore.editComponent.style.value;
+  selectStyle.title = diyStore.editComponent.style.title
+  selectStyle.value = diyStore.editComponent.style.value
   showTitleDialog.value = true
 }
 
-const changeTitleStyle = (item:any) => {
-    selectStyle.title = item.title;
-    selectStyle.value = item.value;
+const changeTitleStyle = (item: any) => {
+  selectStyle.title = item.title
+  selectStyle.value = item.value
 }
 
 const confirmTitleStyle = () => {
-    diyStore.editComponent.style.title = selectStyle.title;
-    diyStore.editComponent.style.value = selectStyle.value;
-    initStyle(diyStore.editComponent.style.value);
+  diyStore.editComponent.style.title = selectStyle.title
+  diyStore.editComponent.style.value = selectStyle.value
+  initStyle(diyStore.editComponent.style.value)
   showTitleDialog.value = false
 }
 
 const styleList = reactive([
   {
-        url : 'addon/shop/diy/newcomer/style_01.png',
-        title:'风格1',
-	    value:'style-1'
-	},{
-        url : 'addon/shop/diy/newcomer/style_02.png',
-        title:'风格2',
-	    value:'style-2'
-	},{
-        url : 'addon/shop/diy/newcomer/style_03.png',
-        title:'风格3',
-	    value:'style-3'
-	},{
-        url : 'addon/shop/diy/newcomer/style_04.png',
-        title:'风格4',
-	    value:'style-4'
-	}
+    url: 'addon/shop/diy/newcomer/style_01.png',
+    title: '风格1',
+    value: 'style-1',
+  },
+  {
+    url: 'addon/shop/diy/newcomer/style_02.png',
+    title: '风格2',
+    value: 'style-2',
+  },
+  {
+    url: 'addon/shop/diy/newcomer/style_03.png',
+    title: '风格3',
+    value: 'style-3',
+  },
+  {
+    url: 'addon/shop/diy/newcomer/style_04.png',
+    title: '风格4',
+    value: 'style-4',
+  },
 ])
 
 const initStyle = (style: any) => {
   if (style == 'style-1') {
-		diyStore.editComponent.textImg = "addon/shop/diy/newcomer/style_title_01.png";
-		diyStore.editComponent.countDown.numberColor = "rgba(255, 0, 0, 1)";
-		diyStore.editComponent.countDown.numberBg.startColor = "rgba(255, 255, 255, 1)";
-		diyStore.editComponent.countDown.numberBg.endColor = "";
-		diyStore.editComponent.countDown.otherColor = "rgba(255, 255, 255, 1)";
-		diyStore.editComponent.textColor = "#303133";
-		diyStore.editComponent.pageStartBgColor = "";
-		diyStore.editComponent.pageEndBgColor = "";
-		diyStore.editComponent.pageGradientAngle = "to bottom";
-		diyStore.editComponent.componentStartBgColor = "#ff6D1A";
-		diyStore.editComponent.componentEndBgColor = "rgba(255, 70, 56, 1)";
-		diyStore.editComponent.componentGradientAngle = "to right";
-		diyStore.editComponent.bottomRounded = 12;
-		diyStore.editComponent.topRounded = 12;
-		diyStore.editComponent.elementBgColor = "";
-		diyStore.editComponent.bottomElementRounded = 10;
-		diyStore.editComponent.topElementRounded = 10;
-		diyStore.editComponent.margin.top = 10;
-		diyStore.editComponent.margin.bottom = 0;
-		diyStore.editComponent.margin.both = 10;
+    diyStore.editComponent.textImg =
+      'addon/shop/diy/newcomer/style_title_01.png'
+    diyStore.editComponent.countDown.numberColor = 'rgba(255, 0, 0, 1)'
+    diyStore.editComponent.countDown.numberBg.startColor =
+      'rgba(255, 255, 255, 1)'
+    diyStore.editComponent.countDown.numberBg.endColor = ''
+    diyStore.editComponent.countDown.otherColor = 'rgba(255, 255, 255, 1)'
+    diyStore.editComponent.textColor = '#303133'
+    diyStore.editComponent.pageStartBgColor = ''
+    diyStore.editComponent.pageEndBgColor = ''
+    diyStore.editComponent.pageGradientAngle = 'to bottom'
+    diyStore.editComponent.componentStartBgColor = '#ff6D1A'
+    diyStore.editComponent.componentEndBgColor = 'rgba(255, 70, 56, 1)'
+    diyStore.editComponent.componentGradientAngle = 'to right'
+    diyStore.editComponent.bottomRounded = 12
+    diyStore.editComponent.topRounded = 12
+    diyStore.editComponent.elementBgColor = ''
+    diyStore.editComponent.bottomElementRounded = 10
+    diyStore.editComponent.topElementRounded = 10
+    diyStore.editComponent.margin.top = 10
+    diyStore.editComponent.margin.bottom = 0
+    diyStore.editComponent.margin.both = 10
   } else if (style == 'style-2') {
-		diyStore.editComponent.textImg = "addon/shop/diy/newcomer/style_title_02.png";
-		diyStore.editComponent.countDown.numberColor = "rgba(255, 255, 255, 1)";
-		diyStore.editComponent.countDown.numberBg.startColor = "rgba(255, 44, 54, 1)";
-		diyStore.editComponent.countDown.numberBg.endColor = "";
-		diyStore.editComponent.countDown.otherColor = "rgba(102, 102, 102, 1)";
-		diyStore.editComponent.textColor = "#303133";
-		diyStore.editComponent.pageStartBgColor = "";
-		diyStore.editComponent.pageEndBgColor = "";
-		diyStore.editComponent.pageGradientAngle = "to bottom";
-		diyStore.editComponent.componentStartBgColor = "rgba(255, 255, 255, 1)";
-		diyStore.editComponent.componentEndBgColor = "";
-		diyStore.editComponent.componentGradientAngle = "to bottom";
-		diyStore.editComponent.bottomRounded = 12;
-		diyStore.editComponent.topRounded = 12;
-		diyStore.editComponent.elementBgColor = "";
-		diyStore.editComponent.bottomElementRounded = 5;
-		diyStore.editComponent.topElementRounded = 5;
-		diyStore.editComponent.margin.top = 10;
-		diyStore.editComponent.margin.bottom = 0;
-		diyStore.editComponent.margin.both = 10;
+    diyStore.editComponent.textImg =
+      'addon/shop/diy/newcomer/style_title_02.png'
+    diyStore.editComponent.countDown.numberColor = 'rgba(255, 255, 255, 1)'
+    diyStore.editComponent.countDown.numberBg.startColor =
+      'rgba(255, 44, 54, 1)'
+    diyStore.editComponent.countDown.numberBg.endColor = ''
+    diyStore.editComponent.countDown.otherColor = 'rgba(102, 102, 102, 1)'
+    diyStore.editComponent.textColor = '#303133'
+    diyStore.editComponent.pageStartBgColor = ''
+    diyStore.editComponent.pageEndBgColor = ''
+    diyStore.editComponent.pageGradientAngle = 'to bottom'
+    diyStore.editComponent.componentStartBgColor = 'rgba(255, 255, 255, 1)'
+    diyStore.editComponent.componentEndBgColor = ''
+    diyStore.editComponent.componentGradientAngle = 'to bottom'
+    diyStore.editComponent.bottomRounded = 12
+    diyStore.editComponent.topRounded = 12
+    diyStore.editComponent.elementBgColor = ''
+    diyStore.editComponent.bottomElementRounded = 5
+    diyStore.editComponent.topElementRounded = 5
+    diyStore.editComponent.margin.top = 10
+    diyStore.editComponent.margin.bottom = 0
+    diyStore.editComponent.margin.both = 10
   } else if (style == 'style-3') {
-		diyStore.editComponent.textImg = "addon/shop/diy/newcomer/style_title_03.png";
-		diyStore.editComponent.subTitle.text = "查看更多";
-		diyStore.editComponent.subTitle.textColor = "rgba(239, 0, 12, 1)";
-		diyStore.editComponent.subTitle.startColor = "rgba(255, 248, 217, 1)";
-		diyStore.editComponent.subTitle.endColor = "rgba(255, 254, 251, 1)";
-		diyStore.editComponent.subTitle.link.name = "";
-		diyStore.editComponent.countDown.numberColor = "rgba(239, 0, 12, 1)";
-		diyStore.editComponent.countDown.numberBg.startColor = "rgba(255, 248, 217, 1)";
-		diyStore.editComponent.countDown.numberBg.endColor = "rgba(255, 253, 246, 1)";
-		diyStore.editComponent.countDown.otherColor = "rgba(255, 253, 246, 1)";
-		diyStore.editComponent.textColor = "#303133";
-		diyStore.editComponent.pageStartBgColor = "";
-		diyStore.editComponent.pageEndBgColor = "";
-		diyStore.editComponent.pageGradientAngle = "to bottom";
-		diyStore.editComponent.componentStartBgColor = "rgba(255, 12, 16, 1)";
-		diyStore.editComponent.componentEndBgColor = "rgba(255, 101, 18, 1)";
-		diyStore.editComponent.componentGradientAngle = "to right";
-		diyStore.editComponent.bottomRounded = 12;
-		diyStore.editComponent.topRounded = 12;
-		diyStore.editComponent.elementBgColor = "";
-		diyStore.editComponent.bottomElementRounded = 0;
-		diyStore.editComponent.topElementRounded = 0;
-		diyStore.editComponent.margin.top = 10;
-		diyStore.editComponent.margin.bottom = 0;
-		diyStore.editComponent.margin.both = 10;
+    diyStore.editComponent.textImg =
+      'addon/shop/diy/newcomer/style_title_03.png'
+    diyStore.editComponent.subTitle.text = '查看更多'
+    diyStore.editComponent.subTitle.textColor = 'rgba(239, 0, 12, 1)'
+    diyStore.editComponent.subTitle.startColor = 'rgba(255, 248, 217, 1)'
+    diyStore.editComponent.subTitle.endColor = 'rgba(255, 254, 251, 1)'
+    diyStore.editComponent.subTitle.link.name = ''
+    diyStore.editComponent.countDown.numberColor = 'rgba(239, 0, 12, 1)'
+    diyStore.editComponent.countDown.numberBg.startColor =
+      'rgba(255, 248, 217, 1)'
+    diyStore.editComponent.countDown.numberBg.endColor =
+      'rgba(255, 253, 246, 1)'
+    diyStore.editComponent.countDown.otherColor = 'rgba(255, 253, 246, 1)'
+    diyStore.editComponent.textColor = '#303133'
+    diyStore.editComponent.pageStartBgColor = ''
+    diyStore.editComponent.pageEndBgColor = ''
+    diyStore.editComponent.pageGradientAngle = 'to bottom'
+    diyStore.editComponent.componentStartBgColor = 'rgba(255, 12, 16, 1)'
+    diyStore.editComponent.componentEndBgColor = 'rgba(255, 101, 18, 1)'
+    diyStore.editComponent.componentGradientAngle = 'to right'
+    diyStore.editComponent.bottomRounded = 12
+    diyStore.editComponent.topRounded = 12
+    diyStore.editComponent.elementBgColor = ''
+    diyStore.editComponent.bottomElementRounded = 0
+    diyStore.editComponent.topElementRounded = 0
+    diyStore.editComponent.margin.top = 10
+    diyStore.editComponent.margin.bottom = 0
+    diyStore.editComponent.margin.both = 10
   } else if (style == 'style-4') {
-		diyStore.editComponent.textImg = "addon/shop/diy/newcomer/style_title_02.png";
-		diyStore.editComponent.countDown.numberColor = "rgba(255, 255, 255, 1)";
-		diyStore.editComponent.countDown.numberBg.startColor = "";
-		diyStore.editComponent.countDown.numberBg.endColor = "";
-		diyStore.editComponent.countDown.otherColor = "rgba(255, 253, 253, 1)";
-		diyStore.editComponent.textColor = "#303133";
-		diyStore.editComponent.pageStartBgColor = "";
-		diyStore.editComponent.pageEndBgColor = "";
-		diyStore.editComponent.pageGradientAngle = "to bottom";
-		diyStore.editComponent.componentStartBgColor = "rgba(255, 255, 255, 1)";
-		diyStore.editComponent.componentEndBgColor = "rgba(255, 255, 255, 1)";
-		diyStore.editComponent.componentGradientAngle = "to bottom";
-		diyStore.editComponent.bottomRounded = 12;
-		diyStore.editComponent.topRounded = 12;
-		diyStore.editComponent.elementBgColor = "";
-		diyStore.editComponent.bottomElementRounded = 10;
-		diyStore.editComponent.topElementRounded = 10;
-		diyStore.editComponent.margin.top = 10;
-		diyStore.editComponent.margin.bottom = 0;
-		diyStore.editComponent.margin.both = 10;
+    diyStore.editComponent.textImg =
+      'addon/shop/diy/newcomer/style_title_02.png'
+    diyStore.editComponent.countDown.numberColor = 'rgba(255, 255, 255, 1)'
+    diyStore.editComponent.countDown.numberBg.startColor = ''
+    diyStore.editComponent.countDown.numberBg.endColor = ''
+    diyStore.editComponent.countDown.otherColor = 'rgba(255, 253, 253, 1)'
+    diyStore.editComponent.textColor = '#303133'
+    diyStore.editComponent.pageStartBgColor = ''
+    diyStore.editComponent.pageEndBgColor = ''
+    diyStore.editComponent.pageGradientAngle = 'to bottom'
+    diyStore.editComponent.componentStartBgColor = 'rgba(255, 255, 255, 1)'
+    diyStore.editComponent.componentEndBgColor = 'rgba(255, 255, 255, 1)'
+    diyStore.editComponent.componentGradientAngle = 'to bottom'
+    diyStore.editComponent.bottomRounded = 12
+    diyStore.editComponent.topRounded = 12
+    diyStore.editComponent.elementBgColor = ''
+    diyStore.editComponent.bottomElementRounded = 10
+    diyStore.editComponent.topElementRounded = 10
+    diyStore.editComponent.margin.top = 10
+    diyStore.editComponent.margin.bottom = 0
+    diyStore.editComponent.margin.both = 10
   }
-
 }
 
 const selectStyle = reactive({
   title: diyStore.editComponent.style.title,
-    value: diyStore.editComponent.style.value
+  value: diyStore.editComponent.style.value,
 })
 
-initStyle(diyStore.editComponent.style.value);
+initStyle(diyStore.editComponent.style.value)
 
 defineExpose({})
-
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-	.goods-list-slider {
+.goods-list-slider {
   .el-slider__input {
     width: 100px;
   }
-	}
+}
 </style>

admin/src/addon/shop/views/diy/components/edit-shop-order-info.vue

@@ -5,7 +5,13 @@
       <h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('title')">
-					<el-input v-model.trim="diyStore.editComponent.text" :placeholder="t('titlePlaceholder')" clearable maxlength="6" show-word-limit />
+          <el-input
+            v-model.trim="diyStore.editComponent.text"
+            :placeholder="t('titlePlaceholder')"
+            clearable
+            maxlength="6"
+            show-word-limit
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -14,21 +20,32 @@
       <h3 class="mb-[10px]">{{ t('subTitle') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('more')">
-					<el-input v-model.trim="diyStore.editComponent.more.text" :placeholder="t('morePlaceholder')" clearable maxlength="8" show-word-limit />
+          <el-input
+            v-model.trim="diyStore.editComponent.more.text"
+            :placeholder="t('morePlaceholder')"
+            clearable
+            maxlength="8"
+            show-word-limit
+          />
         </el-form-item>
       </el-form>
     </div>
-
   </div>
 
   <!-- 样式 -->
   <div class="style-wrap" v-show="diyStore.editTab == 'style'">
-
     <div class="edit-attr-item-wrap">
       <h3 class="mb-[10px]">{{ t('titleStyle') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('textFontSize')">
-					<el-slider v-model="diyStore.editComponent.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="30" />
+          <el-slider
+            v-model="diyStore.editComponent.fontSize"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :min="12"
+            :max="30"
+          />
         </el-form-item>
         <el-form-item :label="t('textFontWeight')">
           <el-radio-group v-model="diyStore.editComponent.fontWeight">
@@ -55,23 +72,32 @@
       <h3 class="mb-[10px]">{{ t('textSet') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
         <el-form-item :label="t('textFontSize')">
-					<el-slider v-model="diyStore.editComponent.item.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="16"/>
+          <el-slider
+            v-model="diyStore.editComponent.item.fontSize"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :min="12"
+            :max="16"
+          />
         </el-form-item>
         <el-form-item :label="t('textFontWeight')">
           <el-radio-group v-model="diyStore.editComponent.item.fontWeight">
-						<el-radio :label="'normal'">{{t('fontWeightNormal')}}</el-radio>
-						<el-radio :label="'bold'">{{t('fontWeightBold')}}</el-radio>
+            <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
+            <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="t('textColor')">
-					<el-color-picker v-model="diyStore.editComponent.item.color" show-alpha :predefine="diyStore.predefineColors"/>
+          <el-color-picker
+            v-model="diyStore.editComponent.item.color"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
-
       </el-form>
     </div>
     <!-- 组件样式 -->
     <slot name="style"></slot>
-
   </div>
 </template>
 
@@ -109,7 +135,6 @@ const changeStyle = () => {
 }
 
 defineExpose({})
-
 </script>
 
 <style lang="scss" scoped></style>

admin/src/addon/shop/views/diy/components/edit-shop-search.vue

@@ -1,16 +1,20 @@
 <template>
   <!-- 内容 -->
   <div class="content-wrap" v-show="diyStore.editTab == 'content'">
-
     <div class="edit-attr-item-wrap">
       <h3 class="mb-[10px]">{{ t('goodsSearchSet') }}</h3>
       <el-form label-width="100px" class="px-[10px]">
         <el-form-item :label="t('goodsSearchText')">
-					<el-input v-model.trim="diyStore.editComponent.text" :placeholder="t('goodsSearchTextPlaceholder')" clearable maxlength="20" show-word-limit />
+          <el-input
+            v-model.trim="diyStore.editComponent.text"
+            :placeholder="t('goodsSearchTextPlaceholder')"
+            clearable
+            maxlength="20"
+            show-word-limit
+          />
         </el-form-item>
       </el-form>
     </div>
-
   </div>
 
   <!-- 样式 -->
@@ -18,7 +22,6 @@
     <!-- 组件样式 -->
     <slot name="style"></slot>
   </div>
-
 </template>
 
 <script lang="ts" setup>

admin/src/addon/shop/views/diy/components/edit-single-recommend.vue

@@ -5,30 +5,49 @@
       <h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('selectStyle')" class="flex">
-					<span class="text-primary flex-1 cursor-pointer" @click="showTitleStyle">{{ diyStore.editComponent.titleStyle.title }}</span>
+          <span
+            class="text-primary flex-1 cursor-pointer"
+            @click="showTitleStyle"
+            >{{ diyStore.editComponent.titleStyle.title }}</span
+          >
           <el-icon>
             <ArrowRight />
           </el-icon>
         </el-form-item>
         <el-form-item :label="t('image')">
-                    <upload-image v-model="diyStore.editComponent.textImg" :limit="1"/>
+          <upload-image v-model="diyStore.editComponent.textImg" :limit="1" />
         </el-form-item>
         <el-form-item :label="t('link')">
-                    <diy-link v-model="diyStore.editComponent.textLink"/>
+          <diy-link v-model="diyStore.editComponent.textLink" />
         </el-form-item>
         <el-form-item :label="t('subTitle')">
-                    <el-input v-model.trim="diyStore.editComponent.subTitle.text" :placeholder="t('subTitlePlaceholder')" clearable maxlength="8" show-word-limit />
+          <el-input
+            v-model.trim="diyStore.editComponent.subTitle.text"
+            :placeholder="t('subTitlePlaceholder')"
+            clearable
+            maxlength="8"
+            show-word-limit
+          />
         </el-form-item>
         <el-form-item :label="t('link')">
-                    <diy-link v-model="diyStore.editComponent.subTitle.link"/>
+          <diy-link v-model="diyStore.editComponent.subTitle.link" />
         </el-form-item>
       </el-form>
 
-			<el-dialog v-model="showTitleDialog" :title="t('selectStyle')" width="460px">
-
+      <el-dialog
+        v-model="showTitleDialog"
+        :title="t('selectStyle')"
+        width="460px"
+      >
         <div class="flex flex-wrap">
-					<template v-for="(item,index) in titleStyleList" :key="index">
-						<div :class="{ 'border-primary': selectTitleStyle.value == item.value }" @click="changeTitleStyle(item)" class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] mb-[12px] cursor-pointer border bg-[#eee]">
+          <template v-for="(item, index) in titleStyleList" :key="index">
+            <div
+              :class="{
+                'border-primary': selectTitleStyle.value == item.value,
+              }"
+              @click="changeTitleStyle(item)"
+              class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] mb-[12px] cursor-pointer border bg-[#eee]"
+            >
               <img :src="img(item.url)" />
             </div>
           </template>
@@ -36,25 +55,41 @@
 
         <template #footer>
           <span class="dialog-footer">
-						<el-button @click="showTitleDialog = false">{{ t('cancel') }}</el-button>
-						<el-button type="primary" @click="confirmTitleStyle">{{ t('confirm') }}</el-button>
+            <el-button @click="showTitleDialog = false">{{
+              t('cancel')
+            }}</el-button>
+            <el-button type="primary" @click="confirmTitleStyle">{{
+              t('confirm')
+            }}</el-button>
           </span>
         </template>
-
       </el-dialog>
     </div>
 
     <div class="edit-attr-item-wrap">
-			<h3 class="mb-[10px]">{{ t("selectSource") }}</h3>
+      <h3 class="mb-[10px]">{{ t('selectSource') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('goodsSelectPopupSelectGoodsButton')">
-					<el-radio-group v-model="diyStore.editComponent.source" :title="t('goodsSelectPopupSelectGoodsButton')">
+          <el-radio-group
+            v-model="diyStore.editComponent.source"
+            :title="t('goodsSelectPopupSelectGoodsButton')"
+          >
             <el-radio label="all">{{ t('defaultGoodsSelect') }}</el-radio>
-						<el-radio label="custom">{{ t('manualSelectionSources') }}</el-radio>
+            <el-radio label="custom">{{
+              t('manualSelectionSources')
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
-				<el-form-item :label="t('customGoods')" v-if="diyStore.editComponent.source == 'custom'">
-					<goods-select-popup ref="goodsSelectPopupRef" v-model="diyStore.editComponent.goods_ids" :min="1" :max="1" />
+        <el-form-item
+          :label="t('customGoods')"
+          v-if="diyStore.editComponent.source == 'custom'"
+        >
+          <goods-select-popup
+            ref="goodsSelectPopupRef"
+            v-model="diyStore.editComponent.goods_ids"
+            :min="1"
+            :max="1"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -62,33 +97,58 @@
     <div class="edit-attr-item-wrap">
       <h3 class="mb-[10px]">{{ t('imageSet') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
-
         <div ref="imageBoxRef">
-					<div v-for="(item,index) in diyStore.editComponent.list" :key="item.id" class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]">
+          <div
+            v-for="(item, index) in diyStore.editComponent.list"
+            :key="item.id"
+            class="item-wrap p-[10px] pb-0 relative border border-dashed border-gray-300 mb-[16px]"
+          >
             <el-form-item :label="t('image')">
               <upload-image v-model="item.imageUrl" :limit="1" />
             </el-form-item>
 
-						<div class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]" v-show="diyStore.editComponent.list.length > 1" @click="diyStore.editComponent.list.splice(index,1)">
-							<icon name="element CircleCloseFilled" color="#bbb" size="20px"/>
+            <div
+              class="del absolute cursor-pointer z-[2] top-[-8px] right-[-8px]"
+              v-show="diyStore.editComponent.list.length > 1"
+              @click="diyStore.editComponent.list.splice(index, 1)"
+            >
+              <icon name="element CircleCloseFilled" color="#bbb" size="20px" />
             </div>
 
             <el-form-item :label="t('link')">
-							<diy-link v-model="item.link"/>
+              <diy-link v-model="item.link" />
             </el-form-item>
           </div>
         </div>
 
-				<el-button v-show="diyStore.editComponent.list.length < 10" class="w-full" @click="addImageAd">{{ t('addImageAd') }}</el-button>
-
+        <el-button
+          v-show="diyStore.editComponent.list.length < 10"
+          class="w-full"
+          @click="addImageAd"
+          >{{ t('addImageAd') }}</el-button
+        >
       </el-form>
     </div>
 
-        <el-dialog v-model="categoryShowDialog" :title="t('goodsCategoryTitle')" width="750px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
-            <el-table :data="categoryTable.data" ref="categoryTableRef" size="large" v-loading="categoryTable.loading"
-                height="450px" @selection-change="handleSelectionChange" row-key="category_id"
+    <el-dialog
+      v-model="categoryShowDialog"
+      :title="t('goodsCategoryTitle')"
+      width="750px"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <el-table
+        :data="categoryTable.data"
+        ref="categoryTableRef"
+        size="large"
+        v-loading="categoryTable.loading"
+        height="450px"
+        @selection-change="handleSelectionChange"
+        row-key="category_id"
         :expand-row-keys="expand_category_ids"
-                :tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }">
+        :tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }"
+      >
         <template #empty>
           <span>{{ !categoryTable.loading ? t('emptyData') : '' }}</span>
         </template>
@@ -101,10 +161,17 @@
         <el-table-column :label="t('categoryImage')" width="170" align="left">
           <template #default="{ row }">
             <div class="h-[30px]">
-                            <el-image class="w-[30px] h-[30px] " :src="img(row.image)" fit="contain">
+              <el-image
+                class="w-[30px] h-[30px]"
+                :src="img(row.image)"
+                fit="contain"
+              >
                 <template #error>
                   <div class="image-slot">
-                                        <img class="w-[30px] h-[30px]" src="@/addon/shop/assets/category_default.png" />
+                    <img
+                      class="w-[30px] h-[30px]"
+                      src="@/addon/shop/assets/category_default.png"
+                    />
                   </div>
                 </template>
               </el-image>
@@ -113,8 +180,12 @@
         </el-table-column>
       </el-table>
       <div class="flex items-center justify-end mt-[15px]">
-                <el-button type="primary" @click="saveCategoryId">{{ t('confirm') }}</el-button>
-                <el-button @click="categoryShowDialog = false">{{ t('cancel') }}</el-button>
+        <el-button type="primary" @click="saveCategoryId">{{
+          t('confirm')
+        }}</el-button>
+        <el-button @click="categoryShowDialog = false">{{
+          t('cancel')
+        }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -125,7 +196,11 @@
       <h3 class="mb-[10px]">{{ t('titleStyle') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
         <el-form-item :label="t('textColor')">
-					<el-color-picker v-model="diyStore.editComponent.subTitle.textColor" show-alpha :predefine="diyStore.predefineColors"/>
+          <el-color-picker
+            v-model="diyStore.editComponent.subTitle.textColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -133,10 +208,22 @@
       <h3 class="mb-[10px]">{{ t('carouselStyle') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
         <el-form-item :label="t('topRounded')">
-					<el-slider v-model="diyStore.editComponent.topCarouselRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.topCarouselRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
         <el-form-item :label="t('bottomRounded')">
-					<el-slider v-model="diyStore.editComponent.bottomCarouselRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.bottomCarouselRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -144,10 +231,18 @@
       <h3 class="mb-[10px]">{{ t('recommendIndicatorStyle') }}</h3>
       <el-form label-width="90px" class="px-[10px]">
         <el-form-item :label="t('recommendIndicatorColor')">
-					<el-color-picker v-model="diyStore.editComponent.indicatorColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.indicatorColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('recommendIndicatorActiveColor')">
-					<el-color-picker v-model="diyStore.editComponent.indicatorActiveColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.indicatorActiveColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -155,27 +250,57 @@
       <h3 class="mb-[10px]">{{ t('goodsStyle') }}</h3>
       <el-form label-width="80px" class="px-[10px]">
         <el-form-item :label="t('goodsBgColor')">
-					<el-color-picker v-model="diyStore.editComponent.elementBgColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.elementBgColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('goodsNameColor')">
-					<el-color-picker v-model="diyStore.editComponent.goodsNameStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.goodsNameStyle.color"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
           <div class="mr-[20px]"></div>
-					<el-radio-group v-model="diyStore.editComponent.goodsNameStyle.fontWeight">
+          <el-radio-group
+            v-model="diyStore.editComponent.goodsNameStyle.fontWeight"
+          >
             <el-radio :label="'normal'">{{ t('fontWeightNormal') }}</el-radio>
             <el-radio :label="'bold'">{{ t('fontWeightBold') }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="t('goodsPriceColor')">
-					<el-color-picker v-model="diyStore.editComponent.priceStyle.mainColor" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.priceStyle.mainColor"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('goodsBtnColor')">
-					<el-color-picker v-model="diyStore.editComponent.saleStyle.color" show-alpha :predefine="diyStore.predefineColors" />
+          <el-color-picker
+            v-model="diyStore.editComponent.saleStyle.color"
+            show-alpha
+            :predefine="diyStore.predefineColors"
+          />
         </el-form-item>
         <el-form-item :label="t('topRounded')">
-					<el-slider v-model="diyStore.editComponent.topElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.topElementRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
         <el-form-item :label="t('bottomRounded')">
-					<el-slider v-model="diyStore.editComponent.bottomElementRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+          <el-slider
+            v-model="diyStore.editComponent.bottomElementRounded"
+            show-input
+            size="small"
+            class="ml-[10px] diy-nav-slider"
+            :max="50"
+          />
         </el-form-item>
       </el-form>
     </div>
@@ -190,44 +315,44 @@ import { getCategoryTree } from '@/addon/shop/api/goods'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
 import useDiyStore from '@/stores/modules/diy'
-import { ref, reactive, onMounted,nextTick } from 'vue'
+import { ref, reactive, onMounted, nextTick } from 'vue'
 import { ElTable } from 'element-plus'
 import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
 
-const diyStore:any = useDiyStore()
+const diyStore: any = useDiyStore()
 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
 
 const selectTitleStyle = reactive({
   title: diyStore.editComponent.titleStyle.title,
-    value: diyStore.editComponent.titleStyle.value
+  value: diyStore.editComponent.titleStyle.value,
 })
 
 // 标题风格样式
 const showTitleDialog = ref(false)
 
 const showTitleStyle = () => {
-	selectTitleStyle.title = diyStore.editComponent.titleStyle.title;
-	selectTitleStyle.value = diyStore.editComponent.titleStyle.value;
+  selectTitleStyle.title = diyStore.editComponent.titleStyle.title
+  selectTitleStyle.value = diyStore.editComponent.titleStyle.value
   showTitleDialog.value = true
 }
 
-const changeTitleStyle = (item:any) => {
-    selectTitleStyle.title = item.title;
-    selectTitleStyle.value = item.value;
+const changeTitleStyle = (item: any) => {
+  selectTitleStyle.title = item.title
+  selectTitleStyle.value = item.value
 }
 
 const confirmTitleStyle = () => {
-    diyStore.editComponent.titleStyle.title = selectTitleStyle.title;
-    diyStore.editComponent.titleStyle.value = selectTitleStyle.value;
+  diyStore.editComponent.titleStyle.title = selectTitleStyle.title
+  diyStore.editComponent.titleStyle.value = selectTitleStyle.value
   showTitleDialog.value = false
 }
 
 const titleStyleList = reactive([
   {
-        url : 'addon/shop/diy/single_recommend/title_style_01.png',
-        title:'风格1',
-	    value:'style-1'
-	}
+    url: 'addon/shop/diy/single_recommend/title_style_01.png',
+    title: '风格1',
+    value: 'style-1',
+  },
 ])
 
 const addImageAd = () => {
@@ -236,27 +361,27 @@ const addImageAd = () => {
     imageUrl: '',
     imgWidth: 0,
     imgHeight: 0,
-        link: { name: '' }
+    link: { name: '' },
   })
 }
 
 // 组件验证
 diyStore.editComponent.verify = (index: number) => {
   const res = { code: true, message: '' }
-    if(diyStore.value[index].source == 'custom'){
-        if(diyStore.value[index].goods_ids.length == 0){
+  if (diyStore.value[index].source == 'custom') {
+    if (diyStore.value[index].goods_ids.length == 0) {
       res.code = false
       res.message = t('goodsPlaceholder')
     }
   }
 
-    diyStore.value[index].list.forEach((item,index) => {
+  diyStore.value[index].list.forEach((item, index) => {
     if (item.imageUrl === '') {
       res.code = false
       res.message = t('imageUrlTip')
       return res
     }
-    });
+  })
 
   return res
 }
@@ -279,10 +404,12 @@ let currCategoryData: any = null
 const loadCategoryList = () => {
   categoryTable.loading = true
 
-    getCategoryTree().then(res => {
+  getCategoryTree()
+    .then((res) => {
       categoryTable.loading = false
       categoryTable.data = res.data
-    }).catch(() => {
+    })
+    .catch(() => {
       categoryTable.loading = false
     })
 }
@@ -298,27 +425,27 @@ const handleSelectionChange = (val: string | any[]) => {
 
 const saveCategoryId = () => {
   diyStore.editComponent.goods_category = currCategoryData.category_id
-    diyStore.editComponent.goods_category_name = currCategoryData.category_name;
+  diyStore.editComponent.goods_category_name = currCategoryData.category_name
   categoryShowDialog.value = false
 }
 
 const categoryShowDialogOpen = () => {
   categoryShowDialog.value = true
-	nextTick(()=>{
+  nextTick(() => {
     setRowSelection()
   })
 }
 
 //分类数据选中回填,设置展开行
 const expand_category_ids = ref<Array<any>>([])
-const setRowSelection = ()=>{
+const setRowSelection = () => {
   expand_category_ids.value = []
-	categoryTable.data.forEach((el:any)=>{
-		if(diyStore.editComponent.goods_category == el.category_id){
+  categoryTable.data.forEach((el: any) => {
+    if (diyStore.editComponent.goods_category == el.category_id) {
       categoryTableRef.value!.toggleRowSelection(el, true)
-		}else if(el.child_list&&el.child_list.length){
-			el.child_list.forEach((v:any)=>{
-				if(diyStore.editComponent.goods_category == v.category_id){
+    } else if (el.child_list && el.child_list.length) {
+      el.child_list.forEach((v: any) => {
+        if (diyStore.editComponent.goods_category == v.category_id) {
           expand_category_ids.value.push(el.category_id.toString())
           categoryTableRef.value!.toggleRowSelection(v, true)
         }

admin/src/addon/shop/views/goods/attr.vue

@@ -1,92 +1,177 @@
 <template>
   <div class="main-container">
     <el-card class="box-card !border-none" shadow="never">
-
       <div class="flex justify-between items-center">
-                <span class="text-lg">{{pageName}}</span>
+        <span class="text-lg">{{ pageName }}</span>
         <el-button type="primary" @click="addEvent">
           {{ t('addShopGoodsAttr') }}
         </el-button>
       </div>
 
-            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-                <el-form :inline="true" :model="goodsAttrTable.searchParam" ref="searchFormRef">
+      <el-card
+        class="box-card !border-none my-[10px] table-search-wrap"
+        shadow="never"
+      >
+        <el-form
+          :inline="true"
+          :model="goodsAttrTable.searchParam"
+          ref="searchFormRef"
+        >
           <el-form-item :label="t('attrName')" prop="attr_name">
-                        <el-input v-model.trim="goodsAttrTable.searchParam.attr_name" :placeholder="t('attrNamePlaceholder')" />
+            <el-input
+              v-model.trim="goodsAttrTable.searchParam.attr_name"
+              :placeholder="t('attrNamePlaceholder')"
+            />
           </el-form-item>
           <el-form-item>
-                        <el-button type="primary" @click="loadShopGoodsAttrList()">{{ t('search') }}</el-button>
-                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+            <el-button type="primary" @click="loadShopGoodsAttrList()">{{
+              t('search')
+            }}</el-button>
+            <el-button @click="resetForm(searchFormRef)">{{
+              t('reset')
+            }}</el-button>
           </el-form-item>
         </el-form>
       </el-card>
 
       <div class="mt-[10px]">
-                <el-table :data="goodsAttrTable.data" size="large" v-loading="goodsAttrTable.loading" @sort-change="sortChange">
+        <el-table
+          :data="goodsAttrTable.data"
+          size="large"
+          v-loading="goodsAttrTable.loading"
+          @sort-change="sortChange"
+        >
           <template #empty>
             <span>{{ !goodsAttrTable.loading ? t('emptyData') : '' }}</span>
           </template>
 
-                    <el-table-column prop="attr_name" :label="t('attrName')" min-width="320" :show-overflow-tooltip="true"/>
-
-                    <el-table-column prop="sort" :label="t('sort')" min-width="120" sortable="custom">
+          <el-table-column
+            prop="attr_name"
+            :label="t('attrName')"
+            min-width="320"
+            :show-overflow-tooltip="true"
+          />
+
+          <el-table-column
+            prop="sort"
+            :label="t('sort')"
+            min-width="120"
+            sortable="custom"
+          >
             <template #default="{ row }">
-                            <el-input v-model.trim="row.sort" class="!w-[100px]" maxlength="8" @blur="sortInputListener(row.sort, row)" />
+              <el-input
+                v-model.trim="row.sort"
+                class="!w-[100px]"
+                maxlength="8"
+                @blur="sortInputListener(row.sort, row)"
+              />
             </template>
           </el-table-column>
 
-                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+          <el-table-column
+            :label="t('operation')"
+            fixed="right"
+            align="right"
+            min-width="120"
+          >
             <template #default="{ row }">
-                           <el-button type="primary" link @click="manageEvent(row)">{{ t('manage') }}</el-button>
-                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-                           <el-button type="primary" link @click="deleteEvent(row.attr_id)">{{ t('delete') }}</el-button>
+              <el-button type="primary" link @click="manageEvent(row)">{{
+                t('manage')
+              }}</el-button>
+              <el-button type="primary" link @click="editEvent(row)">{{
+                t('edit')
+              }}</el-button>
+              <el-button
+                type="primary"
+                link
+                @click="deleteEvent(row.attr_id)"
+                >{{ t('delete') }}</el-button
+              >
             </template>
           </el-table-column>
-
         </el-table>
         <div class="mt-[16px] flex justify-end">
-                    <el-pagination v-model:current-page="goodsAttrTable.page" v-model:page-size="goodsAttrTable.limit"
-                        layout="total, sizes, prev, pager, next, jumper" :total="goodsAttrTable.total"
-                        @size-change="loadShopGoodsAttrList()" @current-change="loadShopGoodsAttrList" />
+          <el-pagination
+            v-model:current-page="goodsAttrTable.page"
+            v-model:page-size="goodsAttrTable.limit"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="goodsAttrTable.total"
+            @size-change="loadShopGoodsAttrList()"
+            @current-change="loadShopGoodsAttrList"
+          />
         </div>
       </div>
-
     </el-card>
 
-        <el-dialog v-model="showDialog" :title="titleDialog" width="500px" :destroy-on-close="true">
-            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+    <el-dialog
+      v-model="showDialog"
+      :title="titleDialog"
+      width="500px"
+      :destroy-on-close="true"
+    >
+      <el-form
+        :model="formData"
+        label-width="120px"
+        ref="formRef"
+        :rules="formRules"
+        class="page-form"
+        v-loading="loading"
+      >
         <el-form-item :label="t('attrName')" prop="attr_name">
-                    <el-input v-model.trim="formData.attr_name" clearable :placeholder="t('attrNamePlaceholder')" class="input-width"  maxlength="20" />
+          <el-input
+            v-model.trim="formData.attr_name"
+            clearable
+            :placeholder="t('attrNamePlaceholder')"
+            class="input-width"
+            maxlength="20"
+          />
         </el-form-item>
 
-                <el-form-item :label="t('sort')" >
-                    <el-input v-model.trim="formData.sort"  maxlength="8" show-word-limit clearable :placeholder="t('sortPlaceholder')" class="input-width" @keyup="filterNumber($event)"/>
+        <el-form-item :label="t('sort')">
+          <el-input
+            v-model.trim="formData.sort"
+            maxlength="8"
+            show-word-limit
+            clearable
+            :placeholder="t('sortPlaceholder')"
+            class="input-width"
+            @keyup="filterNumber($event)"
+          />
         </el-form-item>
-
       </el-form>
 
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+          <el-button
+            type="primary"
+            :loading="loading"
+            @click="confirm(formRef)"
+            >{{ t('confirm') }}</el-button
+          >
         </span>
       </template>
     </el-dialog>
-
   </div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref,computed } from 'vue'
+import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import { ElMessage,ElMessageBox,FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { debounce,filterNumber } from '@/utils/common'
-import { getAttrPageList, addAttr, deleteAttr,modifyAttrSort,editAttr} from '@/addon/shop/api/goods'
+import { debounce, filterNumber } from '@/utils/common'
+import {
+  getAttrPageList,
+  addAttr,
+  deleteAttr,
+  modifyAttrSort,
+  editAttr,
+} from '@/addon/shop/api/goods'
 
 const route = useRoute()
 const router = useRouter()
-const pageName = route.meta.title;
+const pageName = route.meta.title
 
 const goodsAttrTable = reactive({
   page: 1,
@@ -97,8 +182,8 @@ const goodsAttrTable = reactive({
   searchParam: {
     attr_name: '',
     order: '',
-        sort: ''
-    }
+    sort: '',
+  },
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -110,7 +195,7 @@ const titleDialog = ref('')
 const formData = reactive({
   attr_id: 0,
   attr_name: '',
-    sort: 0
+  sort: 0,
 })
 
 const formRef = ref<FormInstance>()
@@ -119,8 +204,8 @@ const formRef = ref<FormInstance>()
 const formRules = computed(() => {
   return {
     attr_name: [
-            { required: true, message: t('attrNamePlaceholder'), trigger: 'blur' }
-        ]
+      { required: true, message: t('attrNamePlaceholder'), trigger: 'blur' },
+    ],
   }
 })
 
@@ -149,12 +234,14 @@ const loadShopGoodsAttrList = (page: number = 1) => {
   getAttrPageList({
     page: goodsAttrTable.page,
     limit: goodsAttrTable.limit,
-         ...goodsAttrTable.searchParam
-    }).then(res => {
+    ...goodsAttrTable.searchParam,
+  })
+    .then((res) => {
       goodsAttrTable.loading = false
       goodsAttrTable.data = res.data.data
       goodsAttrTable.total = res.data.total
-    }).catch(() => {
+    })
+    .catch(() => {
       goodsAttrTable.loading = false
     })
 }
@@ -165,19 +252,19 @@ loadShopGoodsAttrList()
  * 添加商品参数
  */
 const addEvent = () => {
-    formData.attr_id = 0;
-    formData.attr_name = '';
-    formData.sort = 0;
-    titleDialog.value = t('addShopGoodsAttr');
+  formData.attr_id = 0
+  formData.attr_name = ''
+  formData.sort = 0
+  titleDialog.value = t('addShopGoodsAttr')
   showDialog.value = true
 }
 
 // 编辑商品参数
-const editEvent = (data:any)=>{
-    formData.attr_id = data.attr_id;
-    formData.attr_name = data.attr_name;
-    formData.sort = data.sort;
-    titleDialog.value = t('updateShopGoodsAttr');
+const editEvent = (data: any) => {
+  formData.attr_id = data.attr_id
+  formData.attr_name = data.attr_name
+  formData.sort = data.sort
+  titleDialog.value = t('updateShopGoodsAttr')
   showDialog.value = true
 }
 
@@ -192,11 +279,13 @@ const confirm = async (formEl: FormInstance | undefined) => {
   await formEl.validate(async (valid) => {
     if (valid) {
       loading.value = true
-            save(formData).then(res => {
+      save(formData)
+        .then((res) => {
           loading.value = false
           showDialog.value = false
           loadShopGoodsAttrList()
-            }).catch(err => {
+        })
+        .catch((err) => {
           loading.value = false
         })
     }
@@ -215,17 +304,16 @@ const manageEvent = (data: any) => {
  * 删除商品参数
  */
 const deleteEvent = (id: number) => {
-    ElMessageBox.confirm(t('goodsAttrDeleteTips'), t('warning'),
-        {
+  ElMessageBox.confirm(t('goodsAttrDeleteTips'), t('warning'), {
     confirmButtonText: t('confirm'),
     cancelButtonText: t('cancel'),
     type: 'warning',
-        }
-    ).then(() => {
-        deleteAttr(id).then(() => {
+  }).then(() => {
+    deleteAttr(id)
+      .then(() => {
         loadShopGoodsAttrList()
-        }).catch(() => {
       })
+      .catch(() => {})
   })
 }
 
@@ -234,7 +322,7 @@ const sortInputListener = debounce((sort, row) => {
   if (isNaN(sort) || !/^\d{0,8}$/.test(sort)) {
     ElMessage({
       type: 'warning',
-            message: `${ t('sortTips') }`
+      message: `${t('sortTips')}`,
     })
     return
   }
@@ -243,9 +331,8 @@ const sortInputListener = debounce((sort, row) => {
   }
   modifyAttrSort({
     attr_id: row.attr_id,
-        sort
-    }).then((res) => {
-    })
+    sort,
+  }).then((res) => {})
 })
 
 const resetForm = (formEl: FormInstance | undefined) => {
@@ -255,5 +342,4 @@ const resetForm = (formEl: FormInstance | undefined) => {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

admin/src/addon/shop/views/goods/attr_edit.vue

@@ -1,13 +1,20 @@
 <template>
   <div class="main-container">
     <el-card class="card !border-none mb-[15px]" shadow="never">
-            <el-page-header :content="pageName" :icon="ArrowLeft" @back="router.push(`/shop/goods/attr`)" />
+      <el-page-header
+        :content="pageName"
+        :icon="ArrowLeft"
+        @back="router.push(`/shop/goods/attr`)"
+      />
     </el-card>
 
     <el-card class="box-card !border-none" shadow="never">
-
       <!-- 商品参数基础信息 -->
-            <el-row :gutter="20" class="text-[14px]" v-if="Object.keys(attrInfo).length">
+      <el-row
+        :gutter="20"
+        class="text-[14px]"
+        v-if="Object.keys(attrInfo).length"
+      >
         <el-col :span="8">
           <label>{{ t('attrName') }}：</label>
           <span class="ml-[10px]">{{ attrInfo.attr_name }}</span>
@@ -17,20 +24,38 @@
           <span class="ml-[10px]">{{ attrInfo.sort }}</span>
         </el-col>
         <el-col :span="6">
-                    <el-button type="primary" link @click="editEvent">{{ t('edit') }}</el-button>
+          <el-button type="primary" link @click="editEvent">{{
+            t('edit')
+          }}</el-button>
         </el-col>
       </el-row>
 
-            <el-button type="primary" @click="openAttrValueEvent" class="my-[15px]">{{ t('addShopGoodsAttr') }}</el-button>
+      <el-button type="primary" @click="openAttrValueEvent" class="my-[15px]">{{
+        t('addShopGoodsAttr')
+      }}</el-button>
 
-            <el-table :data="goodsAttrTable.data" size="large" v-loading="goodsAttrTable.loading">
+      <el-table
+        :data="goodsAttrTable.data"
+        size="large"
+        v-loading="goodsAttrTable.loading"
+      >
         <template #empty>
           <span>{{ !goodsAttrTable.loading ? t('emptyData') : '' }}</span>
         </template>
 
-                <el-table-column prop="attr_value_name" :label="t('attrValueName')" min-width="200" :show-overflow-tooltip="true"/>
-
-                <el-table-column prop="type" :label="t('attrValueType')" min-width="100" :show-overflow-tooltip="true">
+        <el-table-column
+          prop="attr_value_name"
+          :label="t('attrValueName')"
+          min-width="200"
+          :show-overflow-tooltip="true"
+        />
+
+        <el-table-column
+          prop="type"
+          :label="t('attrValueType')"
+          min-width="100"
+          :show-overflow-tooltip="true"
+        >
           <template #default="{ row }">
             <template v-if="row.type == 'radio'">
               <span>{{ t('attrValueTypeRadio') }}</span>
@@ -44,11 +69,18 @@
           </template>
         </el-table-column>
 
-                <el-table-column prop="child" :label="t('attrValueChild')" min-width="320" :show-overflow-tooltip="true">
+        <el-table-column
+          prop="child"
+          :label="t('attrValueChild')"
+          min-width="320"
+          :show-overflow-tooltip="true"
+        >
           <template #default="{ row }">
             <template v-if="row.type != 'text'">
-                            <template v-for="(item,index) in row.child">
-                                <span :class="{ 'mr-[5px]' : (index+1) != row.child.length }">{{ item.name }}</span>
+              <template v-for="(item, index) in row.child">
+                <span :class="{ 'mr-[5px]': index + 1 != row.child.length }">{{
+                  item.name
+                }}</span>
               </template>
             </template>
             <template v-else>
@@ -57,135 +89,264 @@
           </template>
         </el-table-column>
 
-                <el-table-column prop="sort" :label="t('sort')" min-width="120" sortable="custom">
-                    <template #default="{ row,$index }">
-                        <el-input v-model.trim="row.sort" class="w-[70px]" maxlength="8" @input="sortInputListener($event, row)" />
+        <el-table-column
+          prop="sort"
+          :label="t('sort')"
+          min-width="120"
+          sortable="custom"
+        >
+          <template #default="{ row, $index }">
+            <el-input
+              v-model.trim="row.sort"
+              class="w-[70px]"
+              maxlength="8"
+              @input="sortInputListener($event, row)"
+            />
           </template>
         </el-table-column>
 
-                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
-                   <template #default="{ row,$index }">
-                       <el-button type="primary" link @click="editAttrValueEvent(row,$index)">{{ t('edit') }}</el-button>
-                       <el-button type="primary" link @click="deleteEvent($index)">{{ t('delete') }}</el-button>
+        <el-table-column
+          :label="t('operation')"
+          fixed="right"
+          align="right"
+          min-width="120"
+        >
+          <template #default="{ row, $index }">
+            <el-button
+              type="primary"
+              link
+              @click="editAttrValueEvent(row, $index)"
+              >{{ t('edit') }}</el-button
+            >
+            <el-button type="primary" link @click="deleteEvent($index)">{{
+              t('delete')
+            }}</el-button>
           </template>
         </el-table-column>
-
       </el-table>
-
     </el-card>
 
     <!-- 编辑商品参数信息 -->
-        <el-dialog v-model="showDialogByAttr" :title="t('updateAttr')" width="500px" :destroy-on-close="true">
-            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRulesByAttr" class="page-form" v-loading="loadingByAttr">
+    <el-dialog
+      v-model="showDialogByAttr"
+      :title="t('updateAttr')"
+      width="500px"
+      :destroy-on-close="true"
+    >
+      <el-form
+        :model="formData"
+        label-width="120px"
+        ref="formRef"
+        :rules="formRulesByAttr"
+        class="page-form"
+        v-loading="loadingByAttr"
+      >
         <el-form-item :label="t('attrName')" prop="attr_name">
-                    <el-input v-model.trim="formData.attr_name" clearable :placeholder="t('attrNamePlaceholder')" class="input-width"  maxlength="20" />
+          <el-input
+            v-model.trim="formData.attr_name"
+            clearable
+            :placeholder="t('attrNamePlaceholder')"
+            class="input-width"
+            maxlength="20"
+          />
         </el-form-item>
 
-                <el-form-item :label="t('sort')" >
-                    <el-input v-model.trim="formData.sort"  maxlength="8" show-word-limit clearable :placeholder="t('sortPlaceholder')" class="input-width" @keyup="filterNumber($event)"/>
+        <el-form-item :label="t('sort')">
+          <el-input
+            v-model.trim="formData.sort"
+            maxlength="8"
+            show-word-limit
+            clearable
+            :placeholder="t('sortPlaceholder')"
+            class="input-width"
+            @keyup="filterNumber($event)"
+          />
         </el-form-item>
-
       </el-form>
 
       <template #footer>
         <span class="dialog-footer">
-                <el-button @click="showDialogByAttr = false">{{ t('cancel') }}</el-button>
-                <el-button type="primary" :loading="loadingByAttr" @click="confirmAttr(formRef)">{{ t('confirm') }}</el-button>
+          <el-button @click="showDialogByAttr = false">{{
+            t('cancel')
+          }}</el-button>
+          <el-button
+            type="primary"
+            :loading="loadingByAttr"
+            @click="confirmAttr(formRef)"
+            >{{ t('confirm') }}</el-button
+          >
         </span>
       </template>
     </el-dialog>
 
     <!-- 编辑商品参数值信息 -->
-        <el-dialog v-model="showDialogByAttrValue" :title="attrValueTitleDialog" width="700px" :destroy-on-close="true">
-            <el-form :model="formAttrValueData" label-width="120px" ref="formAttrValueRef" :rules="formRulesByAttrValue" class="page-form" v-loading="loadingByAttrValue">
+    <el-dialog
+      v-model="showDialogByAttrValue"
+      :title="attrValueTitleDialog"
+      width="700px"
+      :destroy-on-close="true"
+    >
+      <el-form
+        :model="formAttrValueData"
+        label-width="120px"
+        ref="formAttrValueRef"
+        :rules="formRulesByAttrValue"
+        class="page-form"
+        v-loading="loadingByAttrValue"
+      >
         <el-form-item :label="t('attrValueName')" prop="attr_value_name">
-                    <el-input v-model.trim="formAttrValueData.attr_value_name" clearable :placeholder="t('attrValueNamePlaceholder')" class="input-width" maxlength="20" show-word-limit />
+          <el-input
+            v-model.trim="formAttrValueData.attr_value_name"
+            clearable
+            :placeholder="t('attrValueNamePlaceholder')"
+            class="input-width"
+            maxlength="20"
+            show-word-limit
+          />
         </el-form-item>
 
         <el-form-item :label="t('attrValueType')">
-                    <el-select v-model="formAttrValueData.type" class="!w-[150px]" :disabled="actionAttrValueIndex > -1">
-                        <el-option v-for="item in attrValueTypeOptions" :label="item.label" :value="item.value" />
+          <el-select
+            v-model="formAttrValueData.type"
+            class="!w-[150px]"
+            :disabled="actionAttrValueIndex > -1"
+          >
+            <el-option
+              v-for="item in attrValueTypeOptions"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
 
-                <el-form-item :label="t('sort')" >
-                    <el-input v-model.trim="formAttrValueData.sort" maxlength="8" show-word-limit clearable :placeholder="t('sortPlaceholder')" class="!w-[150px]" @keyup="filterNumber($event)"/>
+        <el-form-item :label="t('sort')">
+          <el-input
+            v-model.trim="formAttrValueData.sort"
+            maxlength="8"
+            show-word-limit
+            clearable
+            :placeholder="t('sortPlaceholder')"
+            class="!w-[150px]"
+            @keyup="filterNumber($event)"
+          />
         </el-form-item>
 
         <template v-if="formAttrValueData.type != 'text'">
           <el-table :data="formAttrValueData.child" size="large">
             <template #empty>
-                            <span>{{ formAttrValueData.child.length == 0 ? t('emptyData') : '' }}</span>
+              <span>{{
+                formAttrValueData.child.length == 0 ? t('emptyData') : ''
+              }}</span>
             </template>
 
-                        <el-table-column prop="name" :label="t('attrValueName')" min-width="200">
+            <el-table-column
+              prop="name"
+              :label="t('attrValueName')"
+              min-width="200"
+            >
               <template #default="{ row }">
-                                <el-input v-model.trim="row.name" class="input-width" maxlength="20" :placeholder="t('attrValueNamePlaceholder')" clearable show-word-limit />
+                <el-input
+                  v-model.trim="row.name"
+                  class="input-width"
+                  maxlength="20"
+                  :placeholder="t('attrValueNamePlaceholder')"
+                  clearable
+                  show-word-limit
+                />
               </template>
             </el-table-column>
 
             <el-table-column prop="name" :label="t('sort')" min-width="120">
               <template #default="{ row }">
-                                <el-input v-model.trim="row.sort" class="!w-[150px]" maxlength="8" :placeholder="t('sortPlaceholder')" clearable show-word-limit @keyup="filterNumber($event)" />
+                <el-input
+                  v-model.trim="row.sort"
+                  class="!w-[150px]"
+                  maxlength="8"
+                  :placeholder="t('sortPlaceholder')"
+                  clearable
+                  show-word-limit
+                  @keyup="filterNumber($event)"
+                />
               </template>
             </el-table-column>
 
-                        <el-table-column :label="t('operation')" fixed="right" align="right" min-width="60">
-                            <template #default="{ row,$index }">
-                                <el-button type="primary" link @click="deleteAttrValueEvent(row,$index)">{{ t('delete') }}</el-button>
+            <el-table-column
+              :label="t('operation')"
+              fixed="right"
+              align="right"
+              min-width="60"
+            >
+              <template #default="{ row, $index }">
+                <el-button
+                  type="primary"
+                  link
+                  @click="deleteAttrValueEvent(row, $index)"
+                  >{{ t('delete') }}</el-button
+                >
               </template>
             </el-table-column>
-
           </el-table>
 
-                    <el-button type="primary" plain @click="addAttrValueEvent" class="my-[10px]" v-show="formAttrValueData.child.length < maxLength">{{ t('addAttrValue') }}</el-button>
+          <el-button
+            type="primary"
+            plain
+            @click="addAttrValueEvent"
+            class="my-[10px]"
+            v-show="formAttrValueData.child.length < maxLength"
+            >{{ t('addAttrValue') }}</el-button
+          >
         </template>
-
       </el-form>
 
       <template #footer>
         <span class="dialog-footer">
-                    <el-button @click="showDialogByAttrValue = false">{{ t('cancel') }}</el-button>
-                    <el-button type="primary" :loading="loadingByAttrValue" @click="confirmAttrValue(formAttrValueRef)">{{ t('confirm') }}</el-button>
+          <el-button @click="showDialogByAttrValue = false">{{
+            t('cancel')
+          }}</el-button>
+          <el-button
+            type="primary"
+            :loading="loadingByAttrValue"
+            @click="confirmAttrValue(formAttrValueRef)"
+            >{{ t('confirm') }}</el-button
+          >
         </span>
       </template>
     </el-dialog>
-
   </div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref,computed } from 'vue'
+import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import { ElMessage,ElMessageBox,FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox, FormInstance } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
-import { debounce,filterNumber } from '@/utils/common'
-import { getAttrInfo,editAttr, modifyAttrValue } from '@/addon/shop/api/goods'
+import { debounce, filterNumber } from '@/utils/common'
+import { getAttrInfo, editAttr, modifyAttrValue } from '@/addon/shop/api/goods'
 import { cloneDeep } from 'lodash-es'
 
 const route = useRoute()
 const router = useRouter()
 
-const pageName = route.meta.title;
+const pageName = route.meta.title
 
 route.query.attr_id = route.query.attr_id || 0
 
-const attrId:any = ref(route.query.attr_id)
-const attrInfo:any = reactive({})
+const attrId: any = ref(route.query.attr_id)
+const attrInfo: any = reactive({})
 
 const maxLength = ref(30) // 参数值最大数量控制
 
 const goodsAttrTable = reactive({
   loading: true,
-    data: []
+  data: [],
 })
 
-const loadAttrInfo = ()=> {
+const loadAttrInfo = () => {
   // 查询商品参数信息
   getAttrInfo(attrId.value).then((res: any) => {
     Object.assign(attrInfo, res.data)
     if (attrInfo.attr_value_format) {
-            attrInfo.attr_value_format = JSON.parse(attrInfo.attr_value_format);
+      attrInfo.attr_value_format = JSON.parse(attrInfo.attr_value_format)
     } else {
       attrInfo.attr_value_format = []
     }
@@ -193,7 +354,7 @@ const loadAttrInfo = ()=> {
     goodsAttrTable.data = cloneDeep(attrInfo.attr_value_format)
     goodsAttrTable.data.sort((a: any, b: any) => {
       return b.sort - a.sort
-        });
+    })
 
     goodsAttrTable.loading = false
   })
@@ -207,23 +368,23 @@ const formRef = ref<FormInstance>()
 const formData = reactive({
   attr_id: 0,
   attr_name: '',
-    sort: 0
+  sort: 0,
 })
 
 // 表单验证规则
 const formRulesByAttr = computed(() => {
   return {
     attr_name: [
-            { required: true, message: t('attrNamePlaceholder'), trigger: 'blur' }
-        ]
+      { required: true, message: t('attrNamePlaceholder'), trigger: 'blur' },
+    ],
   }
 })
 
 // 编辑商品参数
-const editEvent = (data:any)=>{
-    formData.attr_id = attrInfo.attr_id;
-    formData.attr_name = attrInfo.attr_name;
-    formData.sort = attrInfo.sort;
+const editEvent = (data: any) => {
+  formData.attr_id = attrInfo.attr_id
+  formData.attr_name = attrInfo.attr_name
+  formData.sort = attrInfo.sort
   showDialogByAttr.value = true
 }
 
@@ -237,11 +398,13 @@ const confirmAttr = async (formEl: FormInstance | undefined) => {
   await formEl.validate(async (valid) => {
     if (valid) {
       loadingByAttr.value = true
-            editAttr(formData).then(res => {
+      editAttr(formData)
+        .then((res) => {
           loadingByAttr.value = false
           showDialogByAttr.value = false
           loadAttrInfo()
-            }).catch(err => {
+        })
+        .catch((err) => {
           loadingByAttr.value = false
         })
     }
@@ -258,15 +421,17 @@ const deleteEvent = (index: any) => {
     if (repeatAttrValue.value) return
     repeatAttrValue.value = true
 
-        attrInfo.attr_value_format.splice(index, 1);
+    attrInfo.attr_value_format.splice(index, 1)
     let data = {
       attr_id: attrId.value,
-            attr_value_format: JSON.stringify(attrInfo.attr_value_format)
-        };
-        modifyAttrValue(data).then(res => {
+      attr_value_format: JSON.stringify(attrInfo.attr_value_format),
+    }
+    modifyAttrValue(data)
+      .then((res) => {
         repeatAttrValue.value = false
         loadAttrInfo()
-        }).catch(err => {
+      })
+      .catch((err) => {
         repeatAttrValue.value = false
       })
   })
@@ -276,98 +441,107 @@ const showDialogByAttrValue = ref(false)
 const loadingByAttrValue = ref(false)
 const formAttrValueRef = ref<FormInstance>()
 const attrValueTitleDialog = ref('')
-const formAttrValueData:any = reactive({
+const formAttrValueData: any = reactive({
   attr_value_id: 0,
   attr_value_name: '',
   type: 'radio',
   sort: 0,
-    child: <any>[]
+  child: <any>[],
 })
 
 // 参数类型下拉框
 const attrValueTypeOptions = reactive([
   {
-        label:'单选',
-        value:'radio'
+    label: '单选',
+    value: 'radio',
   },
   {
-        label:'多选',
-        value:'checkbox'
+    label: '多选',
+    value: 'checkbox',
   },
   {
-        label:'输入',
-        value:'text'
-    }
+    label: '输入',
+    value: 'text',
+  },
 ])
 
 // 生成随机数，商品参数中添加的为正数，商品中为负数，方便区分
 const generateRandom = () => {
-    return (Math.floor(new Date().getSeconds()) + Math.floor(new Date().getMilliseconds()));
+  return (
+    Math.floor(new Date().getSeconds()) +
+    Math.floor(new Date().getMilliseconds())
+  )
 }
 
 // 打开商品参数弹出框
-const openAttrValueEvent = ()=> {
-    formAttrValueData.attr_value_id = attrInfo.attr_value_format.length + generateRandom();
-    formAttrValueData.attr_value_name = '';
-    formAttrValueData.type = 'radio';
-    formAttrValueData.sort = 0;
-    formAttrValueData.child = [];
-
-    showDialogByAttrValue.value = true;
-    attrValueTitleDialog.value = t('addShopGoodsAttr');
+const openAttrValueEvent = () => {
+  formAttrValueData.attr_value_id =
+    attrInfo.attr_value_format.length + generateRandom()
+  formAttrValueData.attr_value_name = ''
+  formAttrValueData.type = 'radio'
+  formAttrValueData.sort = 0
+  formAttrValueData.child = []
+
+  showDialogByAttrValue.value = true
+  attrValueTitleDialog.value = t('addShopGoodsAttr')
   actionAttrValueId.value = -1
 }
 
 // 修改参数的排序号
-const sortInputListener = debounce((sort:any, row:any) => {
+const sortInputListener = debounce((sort: any, row: any) => {
   if (isNaN(sort) || !/^\d{0,10}$/.test(sort)) {
     ElMessage({
       type: 'warning',
-            message: `${t('sortTips')}`
+      message: `${t('sortTips')}`,
     })
     return
   }
 
   for (let i = 0; i < attrInfo.attr_value_format.length; i++) {
     if (attrInfo.attr_value_format[i].attr_value_id == row.attr_value_id) {
-            attrInfo.attr_value_format[i].sort = sort;
-            break;
+      attrInfo.attr_value_format[i].sort = sort
+      break
     }
   }
 
   let data = {
     attr_id: attrId.value,
-        attr_value_format: JSON.stringify(attrInfo.attr_value_format)
-    };
-    modifyAttrValue(data).then(res => {
+    attr_value_format: JSON.stringify(attrInfo.attr_value_format),
+  }
+  modifyAttrValue(data)
+    .then((res) => {
       loadAttrInfo()
-    }).catch(err => {
     })
+    .catch((err) => {})
 })
 
 // 添加参数值
-const addAttrValueEvent = ()=>{
+const addAttrValueEvent = () => {
   formAttrValueData.child.push({
     id: formAttrValueData.child.length + generateRandom(),
     name: '',
-        sort: 0
-    });
+    sort: 0,
+  })
 }
 
 // 编辑商品参数值
-const editAttrValueEvent = (data:any,index:any)=> {
-    attrValueTitleDialog.value = t('updateShopGoodsAttr');
+const editAttrValueEvent = (data: any, index: any) => {
+  attrValueTitleDialog.value = t('updateShopGoodsAttr')
   actionAttrValueId.value = data.attr_value_id
-    Object.assign(formAttrValueData,cloneDeep(data))
-    showDialogByAttrValue.value = true;
+  Object.assign(formAttrValueData, cloneDeep(data))
+  showDialogByAttrValue.value = true
 }
 
 // 表单验证规则
 const formRulesByAttrValue = computed(() => {
   return {
     attr_value_name: [
-            { required: true, message: t('attrValueNamePlaceholder'), trigger: 'blur' }
-        ]
+      {
+        required: true,
+        message: t('attrValueNamePlaceholder'),
+        trigger: 'blur',
+      },
+    ],
   }
 })
 
@@ -378,15 +552,21 @@ const confirmAttrValue = async (formEl: FormInstance | undefined) => {
 
   await formEl.validate(async (valid) => {
     if (valid) {
-            if(formAttrValueData.type != 'text'){
-                if(formAttrValueData.child.length == 0){
-                    ElMessage({type: 'warning', message: `${t('attrValueNamePlaceholder')}`})
-                    return;
+      if (formAttrValueData.type != 'text') {
+        if (formAttrValueData.child.length == 0) {
+          ElMessage({
+            type: 'warning',
+            message: `${t('attrValueNamePlaceholder')}`,
+          })
+          return
         }
-                for(let i=0;i<formAttrValueData.child.length;i++){
-                    if(formAttrValueData.child[i].name == ''){
-                        ElMessage({type: 'warning', message: `${t('attrValueNamePlaceholder')}`})
-                        break;
+        for (let i = 0; i < formAttrValueData.child.length; i++) {
+          if (formAttrValueData.child[i].name == '') {
+            ElMessage({
+              type: 'warning',
+              message: `${t('attrValueNamePlaceholder')}`,
+            })
+            break
           }
         }
       }
@@ -396,29 +576,34 @@ const confirmAttrValue = async (formEl: FormInstance | undefined) => {
 
       formAttrValueData.child.sort((a: any, b: any) => {
         return b.sort - a.sort
-            });
+      })
 
       loadingByAttrValue.value = true
-            if(actionAttrValueId.value == -1) {
+      if (actionAttrValueId.value == -1) {
         attrInfo.attr_value_format.push(formAttrValueData)
-            }else{
+      } else {
         for (let i = 0; i < attrInfo.attr_value_format.length; i++) {
-                    if (attrInfo.attr_value_format[i].attr_value_id == actionAttrValueId.value) {
+          if (
+            attrInfo.attr_value_format[i].attr_value_id ==
+            actionAttrValueId.value
+          ) {
             attrInfo.attr_value_format[i] = cloneDeep(formAttrValueData)
-                        break;
+            break
           }
         }
       }
       let data = {
-                attr_id : attrId.value,
-                attr_value_format : JSON.stringify(attrInfo.attr_value_format)
-            };
-            modifyAttrValue(data).then(res => {
+        attr_id: attrId.value,
+        attr_value_format: JSON.stringify(attrInfo.attr_value_format),
+      }
+      modifyAttrValue(data)
+        .then((res) => {
           loadingByAttrValue.value = false
           showDialogByAttrValue.value = false
           repeatAttrValue.value = false
           loadAttrInfo()
-            }).catch(err => {
+        })
+        .catch((err) => {
           loadingByAttrValue.value = false
           repeatAttrValue.value = false
         })
@@ -427,10 +612,9 @@ const confirmAttrValue = async (formEl: FormInstance | undefined) => {
 }
 
 // 删除参数值
-const deleteAttrValueEvent = (item:any,index:any)=> {
-    formAttrValueData.child.splice(index,1);
+const deleteAttrValueEvent = (item: any, index: any) => {
+  formAttrValueData.child.splice(index, 1)
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

admin/src/addon/shop/views/goods/brand_list.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="main-container">
     <el-card class="box-card !border-none" shadow="never">
-
       <div class="flex justify-between items-center">
         <span class="text-page-title">{{ pageName }}</span>
         <el-button type="primary" @click="addEvent">
@@ -9,57 +8,109 @@
         </el-button>
       </div>
 
-            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-                <el-form :inline="true" :model="brandTable.searchParam" ref="searchFormRef">
+      <el-card
+        class="box-card !border-none my-[10px] table-search-wrap"
+        shadow="never"
+      >
+        <el-form
+          :inline="true"
+          :model="brandTable.searchParam"
+          ref="searchFormRef"
+        >
           <el-form-item :label="t('brandName')" prop="brand_name">
-                        <el-input v-model.trim="brandTable.searchParam.brand_name" :placeholder="t('brandNamePlaceholder')" />
+            <el-input
+              v-model.trim="brandTable.searchParam.brand_name"
+              :placeholder="t('brandNamePlaceholder')"
+            />
           </el-form-item>
 
           <el-form-item>
-                        <el-button type="primary" @click="loadBrandList()">{{ t('search') }}</el-button>
-                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+            <el-button type="primary" @click="loadBrandList()">{{
+              t('search')
+            }}</el-button>
+            <el-button @click="resetForm(searchFormRef)">{{
+              t('reset')
+            }}</el-button>
           </el-form-item>
         </el-form>
       </el-card>
 
       <div class="mt-[10px]">
-                <el-table :data="brandTable.data" size="large" v-loading="brandTable.loading" @sort-change="sortChange">
+        <el-table
+          :data="brandTable.data"
+          size="large"
+          v-loading="brandTable.loading"
+          @sort-change="sortChange"
+        >
           <template #empty>
             <span>{{ !brandTable.loading ? t('emptyData') : '' }}</span>
           </template>
-                    <el-table-column prop="brand_name" :label="t('brandName')" min-width="120" />
+          <el-table-column
+            prop="brand_name"
+            :label="t('brandName')"
+            min-width="120"
+          />
           <el-table-column :label="t('logo')" min-width="120">
             <template #default="{ row }">
               <div class="h-[30px]">
-                                <el-image class="w-[30px] h-[30px] " :src="img(row.logo)" fit="contain">
+                <el-image
+                  class="w-[30px] h-[30px]"
+                  :src="img(row.logo)"
+                  fit="contain"
+                >
                   <template #error>
                     <div class="image-slot">
-                                            <img class="w-[30px] h-[30px]" src="@/addon/shop/assets/brand_default.png" />
+                      <img
+                        class="w-[30px] h-[30px]"
+                        src="@/addon/shop/assets/brand_default.png"
+                      />
                     </div>
                   </template>
                 </el-image>
               </div>
             </template>
           </el-table-column>
-                    <el-table-column prop="sort" :label="t('sort')" min-width="120" sortable="custom">
+          <el-table-column
+            prop="sort"
+            :label="t('sort')"
+            min-width="120"
+            sortable="custom"
+          >
             <template #default="{ row }">
-                            <el-input v-model.trim="row.sort" class="!w-[100px]" maxlength="8" @blur="sortInputListener(row.sort, row)" />
+              <el-input
+                v-model.trim="row.sort"
+                class="!w-[100px]"
+                maxlength="8"
+                @blur="sortInputListener(row.sort, row)"
+              />
             </template>
           </el-table-column>
 
-                    <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+          <el-table-column
+            :label="t('operation')"
+            fixed="right"
+            align="right"
+            min-width="120"
+          >
             <template #default="{ row }">
-                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-                            <el-button type="primary" link @click="deleteEvent(row.brand_id)">{{ t('delete') }}
+              <el-button type="primary" link @click="editEvent(row)">{{
+                t('edit')
+              }}</el-button>
+              <el-button type="primary" link @click="deleteEvent(row.brand_id)"
+                >{{ t('delete') }}
               </el-button>
             </template>
           </el-table-column>
-
         </el-table>
         <div class="mt-[16px] flex justify-end">
-                    <el-pagination v-model:current-page="brandTable.page" v-model:page-size="brandTable.limit"
-                        layout="total, sizes, prev, pager, next, jumper" :total="brandTable.total"
-                        @size-change="loadBrandList()" @current-change="loadBrandList" />
+          <el-pagination
+            v-model:current-page="brandTable.page"
+            v-model:page-size="brandTable.limit"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="brandTable.total"
+            @size-change="loadBrandList()"
+            @current-change="loadBrandList"
+          />
         </div>
       </div>
 
@@ -71,7 +122,11 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { t } from '@/lang'
-import { getBrandPageList, deleteBrand, modifyBrandSort } from '@/addon/shop/api/goods'
+import {
+  getBrandPageList,
+  deleteBrand,
+  modifyBrandSort,
+} from '@/addon/shop/api/goods'
 import { img, debounce } from '@/utils/common'
 import { ElMessageBox, FormInstance, ElMessage } from 'element-plus'
 import BrandEdit from '@/addon/shop/views/goods/components/brand-edit.vue'
@@ -89,8 +144,8 @@ const brandTable = reactive({
   searchParam: {
     brand_name: '',
     order: '',
-        sort: ''
-    }
+    sort: '',
+  },
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -120,12 +175,14 @@ const loadBrandList = (page: number = 1) => {
   getBrandPageList({
     page: brandTable.page,
     limit: brandTable.limit,
-        ...brandTable.searchParam
-    }).then(res => {
+    ...brandTable.searchParam,
+  })
+    .then((res) => {
       brandTable.loading = false
       brandTable.data = res.data.data
       brandTable.total = res.data.total
-    }).catch(() => {
+    })
+    .catch(() => {
       brandTable.loading = false
     })
 }
@@ -154,17 +211,16 @@ const editEvent = (data: any) => {
  * 删除商品品牌
  */
 const deleteEvent = (id: number) => {
-    ElMessageBox.confirm(t('brandDeleteTips'), t('warning'),
-        {
+  ElMessageBox.confirm(t('brandDeleteTips'), t('warning'), {
     confirmButtonText: t('confirm'),
     cancelButtonText: t('cancel'),
-            type: 'warning'
-        }
-    ).then(() => {
-        deleteBrand(id).then(() => {
+    type: 'warning',
+  }).then(() => {
+    deleteBrand(id)
+      .then(() => {
         loadBrandList()
-        }).catch(() => {
       })
+      .catch(() => {})
   })
 }
 // 修改排序号
@@ -172,7 +228,7 @@ const sortInputListener = debounce((sort, row) => {
   if (isNaN(sort) || !/^\d{0,8}$/.test(sort)) {
     ElMessage({
       type: 'warning',
-            message: `${ t('sortTips') }`
+      message: `${t('sortTips')}`,
     })
     return
   }
@@ -181,9 +237,8 @@ const sortInputListener = debounce((sort, row) => {
   }
   modifyBrandSort({
     brand_id: row.brand_id,
-        sort
-    }).then((res) => {
-    })
+    sort,
+  }).then((res) => {})
 })
 
 const resetForm = (formEl: FormInstance | undefined) => {
@@ -193,5 +248,4 @@ const resetForm = (formEl: FormInstance | undefined) => {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

admin/src/addon/shop/views/goods/category.vue

@@ -7,12 +7,29 @@
           {{ t('addCategory') }}
         </el-button>
       </div>
-            <el-tabs class="demo-tabs" model-value="/shop/goods/category" @tab-change="handleClick">
-                <el-tab-pane :label="t('tabGoodsCategory')" name="/shop/goods/category" />
-                <el-tab-pane :label="t('tabGoodsCategoryConfig')" name="/shop/goods/category/config" />
+      <el-tabs
+        class="demo-tabs"
+        model-value="/shop/goods/category"
+        @tab-change="handleClick"
+      >
+        <el-tab-pane
+          :label="t('tabGoodsCategory')"
+          name="/shop/goods/category"
+        />
+        <el-tab-pane
+          :label="t('tabGoodsCategoryConfig')"
+          name="/shop/goods/category/config"
+        />
       </el-tabs>
       <div class="mt-[10px]">
-                <el-table :data="categoryTable.data" ref="tableRef" size="large" v-loading="categoryTable.loading" row-key="category_id" :tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }">
+        <el-table
+          :data="categoryTable.data"
+          ref="tableRef"
+          size="large"
+          v-loading="categoryTable.loading"
+          row-key="category_id"
+          :tree-props="{ hasChildren: 'hasChildren', children: 'child_list' }"
+        >
           <template #empty>
             <span>{{ !categoryTable.loading ? t('emptyData') : '' }}</span>
           </template>
@@ -25,10 +42,17 @@
           <el-table-column :label="t('image')" width="170" align="left">
             <template #default="{ row }">
               <div class="h-[30px]">
-                                <el-image class="w-[30px] h-[30px] " :src="img(row.image)" fit="contain">
+                <el-image
+                  class="w-[30px] h-[30px]"
+                  :src="img(row.image)"
+                  fit="contain"
+                >
                   <template #error>
                     <div class="image-slot">
-                                            <img class="w-[30px] h-[30px]" src="@/addon/shop/assets/category_default.png" />
+                      <img
+                        class="w-[30px] h-[30px]"
+                        src="@/addon/shop/assets/category_default.png"
+                      />
                     </div>
                   </template>
                 </el-image>
@@ -37,18 +61,33 @@
           </el-table-column>
           <el-table-column prop="is_show" :label="t('isShow')" width="400">
             <template #default="{ row }">
-                            <el-tag class="cursor-pointer" :type="row.is_show != 2 ? 'success' : 'danger'" @click="showClick(row)">{{ row.is_show != 2 ? '是' : '否' }}</el-tag>
+              <el-tag
+                class="cursor-pointer"
+                :type="row.is_show != 2 ? 'success' : 'danger'"
+                @click="showClick(row)"
+                >{{ row.is_show != 2 ? '是' : '否' }}</el-tag
+              >
             </template>
           </el-table-column>
           <el-table-column prop="sort" :label="t('sort')" width="120" />
-                    <el-table-column :label="t('operation')" fixed="right" align="right" width="200">
+          <el-table-column
+            :label="t('operation')"
+            fixed="right"
+            align="right"
+            width="200"
+          >
             <template #default="{ row }">
-                            <el-button type="primary" link @click="spreadEvent(row)">{{ t('spreadGoodsCategory') }}</el-button>
-                            <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
-                            <el-button type="primary" link @click="deleteEvent(row)">{{ t('delete') }}</el-button>
+              <el-button type="primary" link @click="spreadEvent(row)">{{
+                t('spreadGoodsCategory')
+              }}</el-button>
+              <el-button type="primary" link @click="editEvent(row)">{{
+                t('edit')
+              }}</el-button>
+              <el-button type="primary" link @click="deleteEvent(row)">{{
+                t('delete')
+              }}</el-button>
             </template>
           </el-table-column>
-
         </el-table>
       </div>
 
@@ -57,19 +96,23 @@
 
     <!-- 商品分类推广弹出框 -->
     <goods-category-spread-popup ref="goodsCategorySpreadPopupRef" />
-
   </div>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, onMounted, nextTick } from 'vue'
 import { t } from '@/lang'
-import { getCategoryTree, deleteCategory, updateCategory, editCategory } from '@/addon/shop/api/goods'
+import {
+  getCategoryTree,
+  deleteCategory,
+  updateCategory,
+  editCategory,
+} from '@/addon/shop/api/goods'
 import { img } from '@/utils/common'
 import { ElMessageBox } from 'element-plus'
 import categoryEdit from '@/addon/shop/views/goods/components/category-edit.vue'
 import goodsCategorySpreadPopup from '@/addon/shop/views/goods/components/goods-category-spread-popup.vue'
-import { useRoute,useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import Sortable from 'sortablejs'
 import { useTemplateRefsList } from '@vueuse/core'
 import { cloneDeep } from 'lodash-es'
@@ -79,7 +122,7 @@ const pageName = route.meta.title
 const tableRef = useTemplateRefsList<HTMLElement>()
 const categoryTable = reactive({
   loading: true,
-    data: []
+  data: [],
 })
 
 onMounted(() => {
@@ -93,21 +136,25 @@ onMounted(() => {
 const activeRows = ref<any[]>([])
 // 拖拽排序
 const rowDrop = () => {
-    const tbody = tableRef.value.$el.querySelector('.el-table__body-wrapper tbody')
+  const tbody = tableRef.value.$el.querySelector(
+    '.el-table__body-wrapper tbody'
+  )
   Sortable.create(tbody, {
     handle: '.vues-rank',
     animation: 300,
     onMove: ({ dragged, related }) => {
       const oldRow = activeRows.value[dragged.rowIndex] // 移动的那个元素
       const newRow = activeRows.value[related.rowIndex] // 新的元素
-            if (oldRow.pid !== newRow.pid) { // 移动的元素与新元素父级id不相同
+      if (oldRow.pid !== newRow.pid) {
+        // 移动的元素与新元素父级id不相同
         return false // 不允许跨级拖动
       }
     },
-        onStart: () => { // 开始拖拽前把树形结构数据扁平化
+    onStart: () => {
+      // 开始拖拽前把树形结构数据扁平化
       activeRows.value = treeToTile(cloneDeep(categoryTable.data)) // 把树形的结构转为列表再进行拖拽
     },
-        onEnd: e => {
+    onEnd: (e) => {
       const oldRow = activeRows.value[e.oldIndex] // 移动的那个元素
       const newRow = activeRows.value[e.newIndex] // 新的元素
 
@@ -120,25 +167,35 @@ const rowDrop = () => {
       const currRow = activeRows.value.splice(e.oldIndex, 1)[0]
       activeRows.value.splice(e.newIndex, 0, currRow)
       const pid = newRow.pid
-            const currentRows = activeRows.value.filter(c => c.pid === pid)?.map((item, index) => {
+      const currentRows = activeRows.value
+        .filter((c) => c.pid === pid)
+        ?.map((item, index) => {
           if (item.level === 1 && item.category_id === currRow.category_id) {
-                    categoryTable.data = categoryTable.data.filter(c => c.category_id !== currRow.category_id)
+            categoryTable.data = categoryTable.data.filter(
+              (c) => c.category_id !== currRow.category_id
+            )
             categoryTable.data.splice(index, 0, currRow)
           }
           if (item.level === 2 && item.category_id === currRow.category_id) {
-                    const treeIndex = categoryTable.data.findIndex(el => el.category_id === item.pid)
-                    const obj = cloneDeep(categoryTable.data[treeIndex].child_list.filter(c => c.category_id !== currRow.category_id))
+            const treeIndex = categoryTable.data.findIndex(
+              (el) => el.category_id === item.pid
+            )
+            const obj = cloneDeep(
+              categoryTable.data[treeIndex].child_list.filter(
+                (c) => c.category_id !== currRow.category_id
+              )
+            )
             categoryTable.data[treeIndex].child_list = []
             categoryTable.data[treeIndex].child_list.push(...obj)
             categoryTable.data[treeIndex].child_list.splice(index, 0, currRow)
           }
           return {
             category_id: item.category_id, // 当前行的唯一标识
-                    sort: 9999 - index
+            sort: 9999 - index,
           }
         })
       updateCategoryFn({ category_sort_array: currentRows })
-        }
+    },
   })
 }
 
@@ -148,11 +205,13 @@ const rowDrop = () => {
  * @param <String> childKey 子级字段
  * @return <Array> 返回数据
  */
-const treeToTile = (treeData:any, childKey = 'child_list') => {
-    const arr:Array<any> = []
-    const expanded = (data:any) => {
+const treeToTile = (treeData: any, childKey = 'child_list') => {
+  const arr: Array<any> = []
+  const expanded = (data: any) => {
     if (data && data.length > 0) {
-            data.filter((d:any) => d).forEach((e:any) => {
+      data
+        .filter((d: any) => d)
+        .forEach((e: any) => {
           arr.push(e)
           expanded(e[childKey] || [])
         })
@@ -168,15 +227,17 @@ const treeToTile = (treeData:any, childKey = 'child_list') => {
 const loadCategoryList = () => {
   categoryTable.loading = true
 
-    getCategoryTree().then(res => {
+  getCategoryTree()
+    .then((res) => {
       categoryTable.loading = false
       categoryTable.data = res.data
-    }).catch(() => {
+    })
+    .catch(() => {
       categoryTable.loading = false
     })
 }
 const updateCategoryFn = (params: any) => {
-    updateCategory(params).then(res => {
+  updateCategory(params).then((res) => {
     loadCategoryList()
   })
 }
@@ -210,17 +271,22 @@ const editEvent = (data: any) => {
  * 删除商品分类
  */
 const deleteEvent = (row: any) => {
-    ElMessageBox.confirm(!row.child_list || !row.child_list.length ? t('categoryDeleteTips') : t('categoryDeleteTips1'), t('warning'),
+  ElMessageBox.confirm(
+    !row.child_list || !row.child_list.length
+      ? t('categoryDeleteTips')
+      : t('categoryDeleteTips1'),
+    t('warning'),
     {
       confirmButtonText: t('confirm'),
       cancelButtonText: t('cancel'),
-            type: 'warning'
+      type: 'warning',
     }
   ).then(() => {
-        deleteCategory(row.category_id).then(() => {
+    deleteCategory(row.category_id)
+      .then(() => {
         loadCategoryList()
-        }).catch(() => {
       })
+      .catch(() => {})
   })
 }
 
@@ -236,7 +302,6 @@ const router = useRouter()
 const handleClick = (path: string) => {
   router.push({ path })
 }
-
 </script>
 
 <style lang="scss" scoped>
@@ -250,9 +315,7 @@ const handleClick = (path: string) => {
       .el-table__placeholder {
         order: 1;
       }
-
     }
-
   }
 }
 </style>

admin/src/addon/shop/views/goods/category_config.vue

@@ -1,34 +1,81 @@
 <template>
-    <div class="main-container pt-[20px] bg-[#fff]" >
+  <div class="main-container pt-[20px] bg-[#fff]">
     <div class="flex ml-[18px] justify-between items-center mb-[5px]">
       <span class="text-page-title">{{ pageName }}</span>
     </div>
-        <el-tabs class="demo-tabs mx-[18px]" model-value="/shop/goods/category/config" @tab-change="handleClick">
+    <el-tabs
+      class="demo-tabs mx-[18px]"
+      model-value="/shop/goods/category/config"
+      @tab-change="handleClick"
+    >
       <el-tab-pane :label="t('tabGoodsCategory')" name="/shop/goods/category" />
-            <el-tab-pane :label="t('tabGoodsCategoryConfig')" name="/shop/goods/category/config" />
+      <el-tab-pane
+        :label="t('tabGoodsCategoryConfig')"
+        name="/shop/goods/category/config"
+      />
     </el-tabs>
-        <el-form v-if="Object.keys(formData).length" :model="formData" label-width="170" ref="formRef" :rules="rules" class="page-form" v-loading="loading">
+    <el-form
+      v-if="Object.keys(formData).length"
+      :model="formData"
+      label-width="170"
+      ref="formRef"
+      :rules="rules"
+      class="page-form"
+      v-loading="loading"
+    >
       <el-card class="box-card !border-none" shadow="never">
-                <h3 class="panel-title !text-[16px] pl-[15px]">{{ t('categoryTemplate') }}</h3>
+        <h3 class="panel-title !text-[16px] pl-[15px]">
+          {{ t('categoryTemplate') }}
+        </h3>
         <el-form-item :label="t('categoryType')">
-                    <el-radio-group class="mx-[10px]" v-model="formData.level" @change="formData.template='style-1'">
+          <el-radio-group
+            class="mx-[10px]"
+            v-model="formData.level"
+            @change="formData.template = 'style-1'"
+          >
             <el-radio :label="1">{{ t('categorystyleOne') }}</el-radio>
             <el-radio :label="2">{{ t('categorystyleTwo') }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="t('categoryTemplate')">
-                    <template v-for="(item,index) in config['level_'+formData.level]" :key="index">
-                        <div :class="['w-[150px] border-[1px] border-[#ededed] border-solid overflow-hidden text-[#ededed] rounded-[4px] mr-[20px] relative', formData.template ===item.template ? 'border-color text-color' : '']" @click="levelChange(item.template)">
-                            <img class="w-[100%]" :src="img(item.preview)" fit-object="contain" />
-                            <span class="iconfont iconicon-selected absolute right-0 bottom-[-8px]"></span>
+          <template
+            v-for="(item, index) in config['level_' + formData.level]"
+            :key="index"
+          >
+            <div
+              :class="[
+                'w-[150px] border-[1px] border-[#ededed] border-solid overflow-hidden text-[#ededed] rounded-[4px] mr-[20px] relative',
+                formData.template === item.template
+                  ? 'border-color text-color'
+                  : '',
+              ]"
+              @click="levelChange(item.template)"
+            >
+              <img
+                class="w-[100%]"
+                :src="img(item.preview)"
+                fit-object="contain"
+              />
+              <span
+                class="iconfont iconicon-selected absolute right-0 bottom-[-8px]"
+              ></span>
             </div>
           </template>
         </el-form-item>
       </el-card>
       <el-card class="box-card !border-none" shadow="never">
-                <h3 class="panel-title !text-[16px] pl-[15px]">{{ t('pageSettings') }}</h3>
+        <h3 class="panel-title !text-[16px] pl-[15px]">
+          {{ t('pageSettings') }}
+        </h3>
         <el-form-item :label="t('pageTitle')" prop="page_title">
-                    <el-input v-model.trim="formData.page_title" clearable :placeholder="t('pageTitlePlaceholder')" class="input-width" maxlength="10" show-word-limit />
+          <el-input
+            v-model.trim="formData.page_title"
+            clearable
+            :placeholder="t('pageTitlePlaceholder')"
+            class="input-width"
+            maxlength="10"
+            show-word-limit
+          />
         </el-form-item>
         <el-form-item :label="t('searchControl')">
           <el-radio-group class="mx-[10px]" v-model="formData.search.control">
@@ -36,10 +83,26 @@
             <el-radio :label="0">{{ t('close') }}</el-radio>
           </el-radio-group>
         </el-form-item>
-                <el-form-item v-if="formData.search.control" :label="t('searchTitle')" prop="search.title">
-                    <el-input v-model.trim="formData.search.title" clearable :placeholder="t('searchTitlePlaceholder')" class="input-width" maxlength="12" show-word-limit />
+        <el-form-item
+          v-if="formData.search.control"
+          :label="t('searchTitle')"
+          prop="search.title"
+        >
+          <el-input
+            v-model.trim="formData.search.title"
+            clearable
+            :placeholder="t('searchTitlePlaceholder')"
+            class="input-width"
+            maxlength="12"
+            show-word-limit
+          />
         </el-form-item>
-                <template v-if="formData.level!=2||(formData.level===2&&formData.template != 'style-1')">
+        <template
+          v-if="
+            formData.level != 2 ||
+            (formData.level === 2 && formData.template != 'style-1')
+          "
+        >
           <!-- <el-form-item :label="t('sort')" prop="sort">
                         <el-select v-model="formData.sort" clearable :placeholder="t('sortPlaceholder')"
                             class="input-width">
@@ -63,8 +126,16 @@
           <template v-if="formData.cart.control">
             <el-form-item :label="t('cartStyle')" class="carStyle">
               <div class="flex items-center">
-                                <div :class="['flex items-center justify-center w-[65px] h-[65px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]', formData.cart.style === 'style-1' ? '!border-[1px]' : '']" @click="carStyleClick(1)">
-                                    <div class="text-[#fff] bg-color h-[20px] text-[12px] px-[10px] leading-[20px] rounded-[10px]">
+                <div
+                  :class="[
+                    'flex items-center justify-center w-[65px] h-[65px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]',
+                    formData.cart.style === 'style-1' ? '!border-[1px]' : '',
+                  ]"
+                  @click="carStyleClick(1)"
+                >
+                  <div
+                    class="text-[#fff] bg-color h-[20px] text-[12px] px-[10px] leading-[20px] rounded-[10px]"
+                  >
                     {{ formData.cart.text }}
                   </div>
                 </div>
@@ -74,18 +145,46 @@
                                         <CirclePlusFilled />
                                     </el-icon>
                                 </div> -->
-                                <div :class="['flex items-center justify-center w-[65px] h-[65px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]', formData.cart.style === 'style-3' ? '!border-[1px]' : '']" @click="carStyleClick(3)">
-                                    <span class="text-color nc-iconfont nc-icon-gouwucheV6xx6 !text-[24px]"></span>
+                <div
+                  :class="[
+                    'flex items-center justify-center w-[65px] h-[65px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]',
+                    formData.cart.style === 'style-3' ? '!border-[1px]' : '',
+                  ]"
+                  @click="carStyleClick(3)"
+                >
+                  <span
+                    class="text-color nc-iconfont nc-icon-gouwucheV6xx6 !text-[24px]"
+                  ></span>
                 </div>
-                                <div :class="['flex items-center justify-center w-[65px] h-[65px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]', formData.cart.style === 'style-4' ? '!border-[1px]' : '']" @click="carStyleClick(4)">
-                                    <div class="text-[#fff] bg-color h-[30px] w-[30px] leading-[30px] rounded-[30px] text-center">
-                                        <span class="nc-iconfont nc-icon-gouwucheV6xx6 !text-[20px]"></span>
+                <div
+                  :class="[
+                    'flex items-center justify-center w-[65px] h-[65px] border-0 border-color rounded-[4px] border-solid box-border cursor-pointer mr-[15px]',
+                    formData.cart.style === 'style-4' ? '!border-[1px]' : '',
+                  ]"
+                  @click="carStyleClick(4)"
+                >
+                  <div
+                    class="text-[#fff] bg-color h-[30px] w-[30px] leading-[30px] rounded-[30px] text-center"
+                  >
+                    <span
+                      class="nc-iconfont nc-icon-gouwucheV6xx6 !text-[20px]"
+                    ></span>
                   </div>
                 </div>
               </div>
             </el-form-item>
-                        <el-form-item v-if="formData.cart.style === 'style-1'" prop="cart.text">
-                            <el-input v-model.trim="formData.cart.text" clearable :placeholder="t('cartTextPlaceholder')" class="input-width" maxlength="3" show-word-limit />
+            <el-form-item
+              v-if="formData.cart.style === 'style-1'"
+              prop="cart.text"
+            >
+              <el-input
+                v-model.trim="formData.cart.text"
+                clearable
+                :placeholder="t('cartTextPlaceholder')"
+                class="input-width"
+                maxlength="3"
+                show-word-limit
+              />
             </el-form-item>
             <el-form-item :label="t('cartEvent')">
               <el-radio-group class="mx-[10px]" v-model="formData.cart.event">
@@ -99,7 +198,9 @@
     </el-form>
     <div class="fixed-footer-wrap">
       <div class="fixed-footer">
-                <el-button type="primary" @click="onSave(formRef)">{{ t('save') }}</el-button>
+        <el-button type="primary" @click="onSave(formRef)">{{
+          t('save')
+        }}</el-button>
       </div>
     </div>
   </div>
@@ -110,17 +211,17 @@ import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
 import { getCategoryConfig, setCategoryConfig } from '@/addon/shop/api/goods'
 import { img } from '@/utils/common'
-import { useRoute,useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 
 const route = useRoute()
 const pageName = route.meta.title
 interface formDataType {
-    level: string|number
+  level: string | number
   template: string
   page_title: string
   search: {
     title: string
-        control: number|string
+    control: number | string
   }
   sort: string
   cart: {
@@ -130,22 +231,22 @@ interface formDataType {
     event: string
   }
 }
-const formData = ref<formDataType|any>({})
+const formData = ref<formDataType | any>({})
 const loading = ref(false)
 const rules = computed(() => {
   return {
     page_title: [
-            { required: true, message: t('pageTitlePlaceholder'), trigger: 'blur' }
+      { required: true, message: t('pageTitlePlaceholder'), trigger: 'blur' },
     ],
     'search.title': [
-            { required: true, message: t('searchTitlePlaceholder'), trigger: 'blur' }
+      { required: true, message: t('searchTitlePlaceholder'), trigger: 'blur' },
     ],
     sort: [
-            { required: true, message: t('sortPlaceholder'), trigger: 'change' }
+      { required: true, message: t('sortPlaceholder'), trigger: 'change' },
     ],
     'cart.text': [
-            { required: true, message: t('cartTextPlaceholder'), trigger: 'blur' }
-        ]
+      { required: true, message: t('cartTextPlaceholder'), trigger: 'blur' },
+    ],
   }
 })
 
@@ -159,30 +260,32 @@ interface configType {
     preview: string
   }[]
 }
-const config = reactive<configType|any>({
+const config = reactive<configType | any>({
   level_1: [
     {
       template: 'style-1',
-            preview: 'addon/shop/category_style1_1.png'
-        }
+      preview: 'addon/shop/category_style1_1.png',
+    },
   ],
   level_2: [
     {
       template: 'style-1',
-            preview: 'addon/shop/category_style2_1.png'
+      preview: 'addon/shop/category_style2_1.png',
     },
     {
       template: 'style-2',
-            preview: 'addon/shop/category_style2_2.png'
-        }
-    ]
+      preview: 'addon/shop/category_style2_2.png',
+    },
+  ],
 })
 const getCategoryConfigFn = () => {
   loading.value = true
-    getCategoryConfig().then(res => {
+  getCategoryConfig()
+    .then((res) => {
       formData.value = res.data
       loading.value = false
-    }).catch(() => {
+    })
+    .catch(() => {
       loading.value = false
     })
 }
@@ -195,12 +298,14 @@ const carStyleClick = (value: any) => {
 }
 const formRef = ref()
 const onSave = async (formEl: any) => {
-    await formEl.validate(async (valid:any) => {
+  await formEl.validate(async (valid: any) => {
     if (valid) {
       loading.value = true
-            setCategoryConfig(formData.value).then(res => {
+      setCategoryConfig(formData.value)
+        .then((res) => {
           getCategoryConfigFn()
-            }).catch(() => {
+        })
+        .catch(() => {
           loading.value = false
         })
     }

admin/src/addon/shop/views/goods/components/brand-edit.vue

@@ -1,27 +1,68 @@
 <template>
-    <el-dialog v-model="showDialog" :title="title" width="500px" class="diy-dialog-wrap" :destroy-on-close="true">
-        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+  <el-dialog
+    v-model="showDialog"
+    :title="title"
+    width="500px"
+    class="diy-dialog-wrap"
+    :destroy-on-close="true"
+  >
+    <el-form
+      :model="formData"
+      label-width="120px"
+      ref="formRef"
+      :rules="formRules"
+      class="page-form"
+      v-loading="loading"
+    >
       <el-form-item :label="t('brandName')" prop="brand_name">
-                <el-input v-model.trim="formData.brand_name" clearable :placeholder="t('brandNamePlaceholder')" class="input-width" maxlength="10" @blur="formData.brand_name = $event.target.value"/>
+        <el-input
+          v-model.trim="formData.brand_name"
+          clearable
+          :placeholder="t('brandNamePlaceholder')"
+          class="input-width"
+          maxlength="10"
+          @blur="formData.brand_name = $event.target.value"
+        />
       </el-form-item>
 
       <el-form-item :label="t('logo')">
         <upload-image v-model="formData.logo" />
       </el-form-item>
 
-            <el-form-item :label="t('desc')" >
-                <el-input v-model.trim="formData.desc" type="textarea" clearable :placeholder="t('descPlaceholder')" class="input-width" maxlength="200"/>
+      <el-form-item :label="t('desc')">
+        <el-input
+          v-model.trim="formData.desc"
+          type="textarea"
+          clearable
+          :placeholder="t('descPlaceholder')"
+          class="input-width"
+          maxlength="200"
+        />
       </el-form-item>
 
-            <el-form-item :label="t('sort')" >
-                <el-input v-model.trim="formData.sort" maxlength="8" show-word-limit clearable :placeholder="t('sortPlaceholder')" class="input-width" @keyup="filterNumber($event)" @blur="formData.sort = $event.target.value"/>
+      <el-form-item :label="t('sort')">
+        <el-input
+          v-model.trim="formData.sort"
+          maxlength="8"
+          show-word-limit
+          clearable
+          :placeholder="t('sortPlaceholder')"
+          class="input-width"
+          @keyup="filterNumber($event)"
+          @blur="formData.sort = $event.target.value"
+        />
       </el-form-item>
     </el-form>
 
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+        <el-button
+          type="primary"
+          :loading="loading"
+          @click="confirm(formRef)"
+          >{{ t('confirm') }}</el-button
+        >
       </span>
     </template>
   </el-dialog>
@@ -47,7 +88,7 @@ const initialFormData = {
   brand_name: '',
   logo: '',
   desc: '',
-    sort: ''
+  sort: '',
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -57,8 +98,8 @@ const formRef = ref<FormInstance>()
 const formRules = computed(() => {
   return {
     brand_name: [
-            { required: true, message: t('brandNamePlaceholder'), trigger: 'blur' }
-        ]
+      { required: true, message: t('brandNamePlaceholder'), trigger: 'blur' },
+    ],
   }
 })
 
@@ -78,11 +119,13 @@ const confirm = async (formEl: FormInstance | undefined) => {
 
       const data = formData
 
-            save(data).then(res => {
+      save(data)
+        .then((res) => {
           loading.value = false
           showDialog.value = false
           emit('complete')
-            }).catch(err => {
+        })
+        .catch((err) => {
           loading.value = false
         })
     }
@@ -108,20 +151,26 @@ const setFormData = async (row: any = null) => {
   loading.value = false
 }
 
-const filterSpecial = (event:any) => {
-    event.target.value = event.target.value.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '')
-    event.target.value = event.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g, '')
+const filterSpecial = (event: any) => {
+  event.target.value = event.target.value.replace(
+    /[^\u4e00-\u9fa5a-zA-Z0-9]/g,
+    ''
+  )
+  event.target.value = event.target.value.replace(
+    /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g,
+    ''
+  )
 }
 
 defineExpose({
   showDialog,
-    setFormData
+  setFormData,
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label{
+.diy-dialog-wrap .el-form-item__label {
   height: auto !important;
 }
 </style>

admin/src/addon/shop/views/goods/components/category-edit.vue

@@ -1,13 +1,44 @@
 <template>
-    <el-dialog v-model="showDialog" :title="title" width="480" class="diy-dialog-wrap" :destroy-on-close="true">
-        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+  <el-dialog
+    v-model="showDialog"
+    :title="title"
+    width="480"
+    class="diy-dialog-wrap"
+    :destroy-on-close="true"
+  >
+    <el-form
+      :model="formData"
+      label-width="120px"
+      ref="formRef"
+      :rules="formRules"
+      class="page-form"
+      v-loading="loading"
+    >
       <el-form-item :label="t('categoryName')" prop="category_name">
-                <el-input v-model.trim="formData.category_name" clearable :placeholder="t('categoryNamePlaceholder')" class="input-width" maxlength="10" show-word-limit />
+        <el-input
+          v-model.trim="formData.category_name"
+          clearable
+          :placeholder="t('categoryNamePlaceholder')"
+          class="input-width"
+          maxlength="10"
+          show-word-limit
+        />
       </el-form-item>
       <el-form-item :label="t('pid')" prop="pid">
-                <el-select v-model="formData.pid" clearable :disabled="formData.child_count" :placeholder="t('pidPlaceholder')" class="input-width">
+        <el-select
+          v-model="formData.pid"
+          clearable
+          :disabled="formData.child_count"
+          :placeholder="t('pidPlaceholder')"
+          class="input-width"
+        >
           <el-option label="顶级分类" :value="0" />
-                    <el-option v-for="(item) in optionList" :key="item.category_id" :label="item.category_name" :value="item.category_id" />
+          <el-option
+            v-for="item in optionList"
+            :key="item.category_id"
+            :label="item.category_name"
+            :value="item.category_id"
+          />
         </el-select>
       </el-form-item>
       <el-form-item :label="t('image')">
@@ -15,14 +46,24 @@
       </el-form-item>
 
       <el-form-item :label="t('isShow')" prop="is_show">
-                <el-switch v-model="formData.is_show" class="input-width" :active-value="1" :inactive-value="2" />
+        <el-switch
+          v-model="formData.is_show"
+          class="input-width"
+          :active-value="1"
+          :inactive-value="2"
+        />
       </el-form-item>
     </el-form>
 
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+        <el-button
+          type="primary"
+          :loading="loading"
+          @click="confirm(formRef)"
+          >{{ t('confirm') }}</el-button
+        >
       </span>
     </template>
   </el-dialog>
@@ -32,7 +73,12 @@
 import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import { addCategory, editCategory, getCategoryInfo, getCategoryList } from '@/addon/shop/api/goods'
+import {
+  addCategory,
+  editCategory,
+  getCategoryInfo,
+  getCategoryList,
+} from '@/addon/shop/api/goods'
 
 const showDialog = ref(false)
 const loading = ref(false)
@@ -49,7 +95,7 @@ const initialFormData = {
   is_show: 1,
   child_count: 0,
   // sort: 9999,
-    level: 1
+  level: 1,
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -59,14 +105,16 @@ const formRef = ref<FormInstance>()
 const formRules = computed(() => {
   return {
     category_id: [
-            { required: true, message: t('categoryIdPlaceholder'), trigger: 'blur' }
+      { required: true, message: t('categoryIdPlaceholder'), trigger: 'blur' },
     ],
     category_name: [
-            { required: true, message: t('categoryNamePlaceholder'), trigger: 'blur' }
+      {
+        required: true,
+        message: t('categoryNamePlaceholder'),
+        trigger: 'blur',
+      },
     ],
-        pid: [
-            { required: true, message: t('pidPlaceholder'), trigger: 'change' }
-        ]
+    pid: [{ required: true, message: t('pidPlaceholder'), trigger: 'change' }],
   }
 })
 
@@ -91,11 +139,13 @@ const confirm = async (formEl: FormInstance | undefined) => {
 
       const data = formData
 
-            save(data).then(res => {
+      save(data)
+        .then((res) => {
           loading.value = false
           showDialog.value = false
           emit('complete')
-            }).catch(err => {
+        })
+        .catch((err) => {
           loading.value = false
         })
     }
@@ -105,9 +155,11 @@ const confirm = async (formEl: FormInstance | undefined) => {
 // 获取全部分类
 const getCategoryAllFn = () => {
   getCategoryList({
-        level: 1
-    }).then(res => {
-        optionList.value = res.data.filter((el: any) => el.category_id != formData.category_id)
+    level: 1,
+  }).then((res) => {
+    optionList.value = res.data.filter(
+      (el: any) => el.category_id != formData.category_id
+    )
   })
 }
 
@@ -132,7 +184,7 @@ const setFormData = async (row: any = null) => {
 
 defineExpose({
   showDialog,
-    setFormData
+  setFormData,
 })
 </script>
 

admin/src/addon/shop/views/goods/components/coupon-select-popup.vue

@@ -3,26 +3,59 @@
     <div @click="show">
       <slot>
         <el-button>{{ t('选择优惠券') }}</el-button>
-                <div class="inline-block ml-[10px] text-[14px]" v-show="couponIds.length">
+        <div
+          class="inline-block ml-[10px] text-[14px]"
+          v-show="couponIds.length"
+        >
           <span>{{ t('已选') }}</span>
           <span class="text-primary mx-[2px]">{{ couponIds.length }}</span>
           <span>{{ t('张') }}</span>
         </div>
       </slot>
     </div>
-        <el-dialog v-model="showDialog" :title="t('优惠券选择')" width="1000px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
-
-            <el-form :inline="true" :model="couponTable.searchParam" ref="searchFormRef">
-                <el-form-item :label="t('优惠券名称')" prop="keyword" class="form-item-wrap">
-                    <el-input v-model.trim="couponTable.searchParam.title" :placeholder="t('请输入优惠券名称')" maxlength="60" />
+    <el-dialog
+      v-model="showDialog"
+      :title="t('优惠券选择')"
+      width="1000px"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        :inline="true"
+        :model="couponTable.searchParam"
+        ref="searchFormRef"
+      >
+        <el-form-item
+          :label="t('优惠券名称')"
+          prop="keyword"
+          class="form-item-wrap"
+        >
+          <el-input
+            v-model.trim="couponTable.searchParam.title"
+            :placeholder="t('请输入优惠券名称')"
+            maxlength="60"
+          />
         </el-form-item>
         <el-form-item class="form-item-wrap">
-                    <el-button type="primary" @click="loadCouponList()">{{ t('search') }}</el-button>
-                    <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+          <el-button type="primary" @click="loadCouponList()">{{
+            t('search')
+          }}</el-button>
+          <el-button @click="resetForm(searchFormRef)">{{
+            t('reset')
+          }}</el-button>
         </el-form-item>
       </el-form>
 
-            <el-table :data="couponTable.data" size="large" v-loading="couponTable.loading" ref="couponListTableRef" max-height="400" @select="handleSelectChange" @select-all="handleSelectAllChange">
+      <el-table
+        :data="couponTable.data"
+        size="large"
+        v-loading="couponTable.loading"
+        ref="couponListTableRef"
+        max-height="400"
+        @select="handleSelectChange"
+        @select-all="handleSelectAllChange"
+      >
         <template #empty>
           <span>{{ !couponTable.loading ? t('emptyData') : '' }}</span>
         </template>
@@ -30,37 +63,52 @@
 
         <el-table-column prop="title" :label="t('名称')" min-width="130" />
         <el-table-column prop="type_name" :label="t('类型')" min-width="130" />
-                <el-table-column prop="price" :label="t('面值')" min-width="130" >
+        <el-table-column prop="price" :label="t('面值')" min-width="130">
           <template #default="{ row }">
-                        <span >¥{{row.price}}</span>
+            <span>¥{{ row.price }}</span>
           </template>
         </el-table-column>
-                <el-table-column  :label="t('使用门槛')" min-width="130" >
+        <el-table-column :label="t('使用门槛')" min-width="130">
           <template #default="{ row }">
             <span v-if="row.min_condition_money == '0.00'">无门槛</span>
-                        <span v-else >满{{ row.min_condition_money }}元可用</span>
+            <span v-else>满{{ row.min_condition_money }}元可用</span>
           </template>
         </el-table-column>
         <el-table-column :label="t('有效期')" min-width="210">
           <template #default="{ row }">
-                        <span v-if="row.valid_type == 1">  领取之日起{{ row.length || '' }} 天内有效</span>
-                        <span v-else> 使用截止时间至{{ row.valid_end_time || ''}} </span>
+            <span v-if="row.valid_type == 1">
+              领取之日起{{ row.length || '' }} 天内有效</span
+            >
+            <span v-else> 使用截止时间至{{ row.valid_end_time || '' }} </span>
           </template>
         </el-table-column>
-
       </el-table>
       <div class="mt-[16px] flex">
         <div class="flex items-center flex-1">
-                    <div class="layui-table-bottom-left-container mr-[10px]" v-show="selectCouponNum">
+          <div
+            class="layui-table-bottom-left-container mr-[10px]"
+            v-show="selectCouponNum"
+          >
             <span>{{ t('已选择') }}</span>
             <span class="text-primary mx-[2px]">{{ selectCouponNum }}</span>
             <span>{{ t('张优惠券') }}</span>
           </div>
-                    <el-button type="primary" link @click="clear" v-show="selectCouponNum">{{ t('取消选择') }}</el-button>
+          <el-button
+            type="primary"
+            link
+            @click="clear"
+            v-show="selectCouponNum"
+            >{{ t('取消选择') }}</el-button
+          >
         </div>
-                <el-pagination v-model:current-page="couponTable.page" v-model:page-size="couponTable.limit"
-                    layout="total, sizes, prev, pager, next, jumper" :total="couponTable.total"
-                    @size-change="loadCouponList()" @current-change="loadCouponList" />
+        <el-pagination
+          v-model:current-page="couponTable.page"
+          v-model:page-size="couponTable.limit"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="couponTable.total"
+          @size-change="loadCouponList()"
+          @current-change="loadCouponList"
+        />
       </div>
 
       <template #footer>
@@ -83,27 +131,27 @@ import { getCouponSelectList } from '@/addon/shop/api/marketing'
 const prop = defineProps({
   modelValue: {
     type: String,
-        default: ''
+    default: '',
   },
   max: {
     type: Number,
-        default: 0
+    default: 0,
   },
   min: {
     type: Number,
-        default: 0
-    }
+    default: 0,
+  },
 })
 
-const emit = defineEmits(['update:modelValue','couponSelect'])
+const emit = defineEmits(['update:modelValue', 'couponSelect'])
 
 const couponIds: any = computed({
-    get () {
+  get() {
     return prop.modelValue
   },
-    set (value) {
+  set(value) {
     emit('update:modelValue', value)
-    }
+  },
 })
 
 const showDialog = ref(false)
@@ -125,15 +173,14 @@ const couponTable = reactive({
   searchParam: {
     title: '',
     status: 1,
-        verify_coupon_ids:'',
-    }
+    verify_coupon_ids: '',
+  },
 })
 
 const searchFormRef = ref()
 
 // 初始化数据
-const initData = () => {
-}
+const initData = () => {}
 
 initData()
 
@@ -181,36 +228,37 @@ const loadCouponList = (page: number = 1, callback: any = null) => {
   couponTable.loading = true
   couponTable.page = page
 
-    const searchData: any = cloneDeep(couponTable.searchParam);
+  const searchData: any = cloneDeep(couponTable.searchParam)
   getCouponSelectList({
     page: couponTable.page,
     limit: couponTable.limit,
-        ...searchData
-    }).then(res => {
+    ...searchData,
+  })
+    .then((res) => {
       couponTable.loading = false
       couponTable.data = res.data.data
       couponTable.total = res.data.total
 
       if (callback) callback(res.data.verify_coupon_ids)
 
-        setCouponSelected();
-    }).catch(() => {
+      setCouponSelected()
+    })
+    .catch(() => {
       couponTable.loading = false
     })
-
 }
 
 // 表格设置选中状态
 const setCouponSelected = () => {
   nextTick(() => {
-        if (!couponListTableRef.value) return;
+    if (!couponListTableRef.value) return
     for (let i = 0; i < couponTable.data.length; i++) {
-            couponListTableRef.value.toggleRowSelection(couponTable.data[i], false);
+      couponListTableRef.value.toggleRowSelection(couponTable.data[i], false)
       if (selectCoupon['coupon_' + couponTable.data[i].id]) {
-                couponListTableRef.value.toggleRowSelection(couponTable.data[i], true);
+        couponListTableRef.value.toggleRowSelection(couponTable.data[i], true)
       }
     }
-    });
+  })
 }
 
 const resetForm = (formEl: FormInstance | undefined) => {
@@ -222,28 +270,28 @@ const resetForm = (formEl: FormInstance | undefined) => {
 
 const show = () => {
   // 检测商品id集合是否存在，移除不存在的商品id，纠正数据准确性
-    couponTable.searchParam.verify_coupon_ids = couponIds.value;
-    loadCouponList(1, (verify_coupon_ids:any) => {
+  couponTable.searchParam.verify_coupon_ids = couponIds.value
+  loadCouponList(1, (verify_coupon_ids: any) => {
     // 第一次打开弹出框时，纠正数据，并且赋值已选优惠券
     if (couponIds.value) {
       couponIds.value.splice(0, couponIds.value.length, ...verify_coupon_ids)
       // 先删除 selectCoupon 中已经不再存在于 couponIds 中的优惠券
       for (let key in selectCoupon) {
-                const couponId = key.replace('coupon_', '');
+        const couponId = key.replace('coupon_', '')
         if (!couponIds.value.includes(Number(couponId))) {
-                    delete selectCoupon[key]; // 删除不存在的优惠券
+          delete selectCoupon[key] // 删除不存在的优惠券
         }
       }
       couponIds.value.forEach((item: any) => {
         if (!selectCoupon['coupon_' + item]) {
-                    selectCoupon['coupon_' + item] = {};
+          selectCoupon['coupon_' + item] = {}
         }
       })
 
       // 赋值已选择的优惠券
       for (let i = 0; i < couponTable.data.length; i++) {
         if (couponIds.value.indexOf(couponTable.data[i].id) != -1) {
-                    selectCoupon['coupon_' + couponTable.data[i].id] = couponTable.data[i];
+          selectCoupon['coupon_' + couponTable.data[i].id] = couponTable.data[i]
         }
       }
     }
@@ -254,9 +302,9 @@ const show = () => {
 // 清空已选优惠券
 const clear = () => {
   for (let k in selectCoupon) {
-        delete selectCoupon[k];
+    delete selectCoupon[k]
   }
-    setCouponSelected();
+  setCouponSelected()
 }
 
 const save = () => {
@@ -264,32 +312,37 @@ const save = () => {
     ElMessage({
       type: 'warning',
       message: `${t('所选优惠券数量不能少于')}${prop.min}${t('张')}`,
-        });
-        return;
+    })
+    return
   }
 
-    if (prop.max && prop.max > 0 && selectCouponNum.value && selectCouponNum.value > prop.max) {
+  if (
+    prop.max &&
+    prop.max > 0 &&
+    selectCouponNum.value &&
+    selectCouponNum.value > prop.max
+  ) {
     ElMessage({
       type: 'warning',
       message: `${t('所选优惠券数量不能超过')}${prop.max}${t('张')}`,
-        });
-        return;
+    })
+    return
   }
 
-    let ids: any = [];
+  let ids: any = []
   for (let k in selectCoupon) {
-        ids.push(parseInt(k.replace('coupon_', '')));
+    ids.push(parseInt(k.replace('coupon_', '')))
   }
 
   couponIds.value.splice(0, couponIds.value.length, ...ids)
-    emit('couponSelect',selectCoupon)
+  emit('couponSelect', selectCoupon)
   showDialog.value = false
 }
 
 defineExpose({
   showDialog,
   selectCoupon,
-    selectCouponNum
+  selectCouponNum,
 })
 </script>
 

admin/src/addon/shop/views/goods/components/evaluate-add.vue

@@ -1,23 +1,59 @@
 <template>
-    <el-dialog v-model="showDialog" :title="formData.evaluate_id ? t('updateEvaluate') : t('addEvaluate')" width="700px" class="diy-dialog-wrap" :destroy-on-close="true">
-        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+  <el-dialog
+    v-model="showDialog"
+    :title="formData.evaluate_id ? t('updateEvaluate') : t('addEvaluate')"
+    width="700px"
+    class="diy-dialog-wrap"
+    :destroy-on-close="true"
+  >
+    <el-form
+      :model="formData"
+      label-width="120px"
+      ref="formRef"
+      :rules="formRules"
+      class="page-form"
+      v-loading="loading"
+    >
       <el-form-item :label="t('goodsInfo')" prop="goods_id">
-                <goods-select-popup ref="goodsSelectPopupRef" v-model="formData.goods_id" :min="1" :max="1" />
+        <goods-select-popup
+          ref="goodsSelectPopupRef"
+          v-model="formData.goods_id"
+          :min="1"
+          :max="1"
+        />
       </el-form-item>
       <el-form-item :label="t('memberHead')" prop="member_head">
         <upload-image v-model="formData.member_head" />
       </el-form-item>
       <el-form-item :label="t('memberName')" prop="member_name">
-                <el-input v-model.trim="formData.member_name" clearable maxlength="20" show-word-limit :placeholder="t('memberNamePlaceholder')" class="input-width" />
+        <el-input
+          v-model.trim="formData.member_name"
+          clearable
+          maxlength="20"
+          show-word-limit
+          :placeholder="t('memberNamePlaceholder')"
+          class="input-width"
+        />
       </el-form-item>
       <el-form-item :label="t('createTime')" prop="create_time">
         <div class="input-width">
-                    <el-date-picker clearable :disabled-date="disabledDateFn" v-model="formData.create_time" type="datetime" :placeholder="t('createTimePlaceholder')" value-format="YYYY-MM-DD HH:mm:ss" />
+          <el-date-picker
+            clearable
+            :disabled-date="disabledDateFn"
+            v-model="formData.create_time"
+            type="datetime"
+            :placeholder="t('createTimePlaceholder')"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
         </div>
       </el-form-item>
 
       <el-form-item :label="t('isAnonymous')" clearable prop="is_anonymous">
-                <el-radio-group v-model="formData.is_anonymous" :placeholder="t('isAnonymousPlaceholder')" clearable>
+        <el-radio-group
+          v-model="formData.is_anonymous"
+          :placeholder="t('isAnonymousPlaceholder')"
+          clearable
+        >
           <el-radio :label="1">{{ t('anonymous') }}</el-radio>
           <el-radio :label="2">{{ t('notAnonymous') }}</el-radio>
         </el-radio-group>
@@ -26,21 +62,33 @@
         <el-rate v-model="formData.scores" />
       </el-form-item>
       <el-form-item :label="t('content')" prop="content">
-                <el-input v-model.trim="formData.content"  maxlength="200" show-word-limit type="textarea" rows="4" clearable :placeholder="t('contentPlaceholder')" class="input-width" />
+        <el-input
+          v-model.trim="formData.content"
+          maxlength="200"
+          show-word-limit
+          type="textarea"
+          rows="4"
+          clearable
+          :placeholder="t('contentPlaceholder')"
+          class="input-width"
+        />
       </el-form-item>
 
       <el-form-item :label="t('images')">
         <upload-image v-model="formData.image_arr" :limit="9" />
       </el-form-item>
-
     </el-form>
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+        <el-button
+          type="primary"
+          :loading="loading"
+          @click="confirm(formRef)"
+          >{{ t('confirm') }}</el-button
+        >
       </span>
     </template>
-
   </el-dialog>
 </template>
 
@@ -54,7 +102,7 @@ import { addEvaluate } from '@/addon/shop/api/goods'
 const showDialog = ref(false)
 const loading = ref(false)
 
-const disabledDateFn = (date)=>{
+const disabledDateFn = (date) => {
   return date.getTime() > Date.now()
 }
 
@@ -70,7 +118,7 @@ const initialFormData = {
   image_arr: '',
   is_anonymous: 1,
   scores: 5,
-    create_time: ''
+  create_time: '',
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -81,23 +129,23 @@ const formRef = ref<FormInstance>()
 const formRules = computed(() => {
   return {
     goods_id: [
-            { required: true, message: t('goodsIdPlaceholder'), trigger: 'blur' }
+      { required: true, message: t('goodsIdPlaceholder'), trigger: 'blur' },
     ],
     member_head: [
-            { required: true, message: t('memberHeadPlaceholder'), trigger: 'blur' }
+      { required: true, message: t('memberHeadPlaceholder'), trigger: 'blur' },
     ],
     member_name: [
-            { required: true, message: t('memberNamePlaceholder'), trigger: 'blur' }
+      { required: true, message: t('memberNamePlaceholder'), trigger: 'blur' },
     ],
     content: [
-            { required: true, message: t('contentPlaceholder'), trigger: 'blur' }
+      { required: true, message: t('contentPlaceholder'), trigger: 'blur' },
     ],
     images: [
-            { required: true, message: t('imagesPlaceholder'), trigger: 'blur' }
+      { required: true, message: t('imagesPlaceholder'), trigger: 'blur' },
     ],
     create_time: [
-            { required: true, message: t('createTimePlaceholder'), trigger: 'blur' }
-        ]
+      { required: true, message: t('createTimePlaceholder'), trigger: 'blur' },
+    ],
   }
 })
 
@@ -118,11 +166,13 @@ const confirm = async (formEl: FormInstance | undefined) => {
       const data = formData
       if (data.goods_id.length > 0) data.goods_id = data.goods_id[0]
 
-            addEvaluate(data).then(res => {
+      addEvaluate(data)
+        .then((res) => {
           loading.value = false
           showDialog.value = false
           emit('complete')
-            }).catch(err => {
+        })
+        .catch((err) => {
           loading.value = false
         })
     }
@@ -143,7 +193,7 @@ const setFormData = async (row: any = null) => {
 
 defineExpose({
   showDialog,
-    setFormData
+  setFormData,
 })
 </script>
 

admin/src/addon/shop/views/goods/components/goods-batch-settings-popup.vue

@@ -1,12 +1,30 @@
 <template>
-    <el-dialog v-model="showDialog" :title="t('batchSetting')" width="700px" class="diy-dialog-wrap" :destroy-on-close="true">
+  <el-dialog
+    v-model="showDialog"
+    :title="t('batchSetting')"
+    width="700px"
+    class="diy-dialog-wrap"
+    :destroy-on-close="true"
+  >
     <el-alert :title="t('batchSettingTip')" type="info" :closable="false" />
-        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="mt-[10px] page-form" v-loading="loading">
+    <el-form
+      :model="formData"
+      label-width="120px"
+      ref="formRef"
+      :rules="formRules"
+      class="mt-[10px] page-form"
+      v-loading="loading"
+    >
       <el-row>
         <!-- 左侧菜单栏 -->
         <el-col :span="4" class="menu-column">
           <el-menu :default-active="activeMenu" @select="handleMenuSelect">
-                        <el-menu-item v-for="([key, value]) in Object.entries(setTypeList)" :key="key" :index="key">{{ value }}</el-menu-item>
+            <el-menu-item
+              v-for="[key, value] in Object.entries(setTypeList)"
+              :key="key"
+              :index="key"
+              >{{ value }}</el-menu-item
+            >
           </el-menu>
         </el-col>
 
@@ -15,68 +33,169 @@
           <!-- 商品标签 -->
           <el-form-item v-if="activeMenu === 'label'" :label="t('label')">
             <el-checkbox-group v-model="formData.label_ids">
-                            <el-checkbox :label="item.label_id" v-for="(item, index) in labelOptions" :key="index" >{{ item.label_name }}</el-checkbox>
+              <el-checkbox
+                :label="item.label_id"
+                v-for="(item, index) in labelOptions"
+                :key="index"
+                >{{ item.label_name }}</el-checkbox
+              >
             </el-checkbox-group>
             <div class="ml-[10px]">
-                            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsLabel">{{ t('refresh') }}</span>
-                            <span class="cursor-pointer text-primary" @click="toGoodsLabelEvent">{{ t('addGoodsLabel') }}</span>
+              <span
+                class="cursor-pointer text-primary mr-[10px]"
+                @click="refreshGoodsLabel"
+                >{{ t('refresh') }}</span
+              >
+              <span
+                class="cursor-pointer text-primary"
+                @click="toGoodsLabelEvent"
+                >{{ t('addGoodsLabel') }}</span
+              >
             </div>
           </el-form-item>
           <!-- 商品服务 -->
           <el-form-item v-if="activeMenu === 'service'" :label="t('label')">
             <el-checkbox-group v-model="formData.service_ids">
-                            <el-checkbox :label="item.service_id" v-for="(item, index) in serviceOptions" :key="index" >{{ item.service_name }}</el-checkbox>
+              <el-checkbox
+                :label="item.service_id"
+                v-for="(item, index) in serviceOptions"
+                :key="index"
+                >{{ item.service_name }}</el-checkbox
+              >
             </el-checkbox-group>
             <div class="ml-[10px]">
-                            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsService">{{ t('refresh') }}</span>
-                            <span class="cursor-pointer text-primary" @click="toGoodsServiceEvent">{{ t('addGoodsService') }}</span>
+              <span
+                class="cursor-pointer text-primary mr-[10px]"
+                @click="refreshGoodsService"
+                >{{ t('refresh') }}</span
+              >
+              <span
+                class="cursor-pointer text-primary"
+                @click="toGoodsServiceEvent"
+                >{{ t('addGoodsService') }}</span
+              >
             </div>
           </el-form-item>
           <!-- 虚拟销量 -->
-                    <el-form-item v-if="activeMenu === 'virtual_sale_num'" :label="t('virtualSaleNum')" prop="virtual_sale_num">
+          <el-form-item
+            v-if="activeMenu === 'virtual_sale_num'"
+            :label="t('virtualSaleNum')"
+            prop="virtual_sale_num"
+          >
             <div>
-                            <el-input v-model.trim="formData.virtual_sale_num"  :placeholder="t('virtualSaleNumPlaceholder')" class="input-width" show-word-limit maxlength="8" clearable @keyup="filterNumber($event)" @blur="formData.virtual_sale_num = $event.target.value">
-                                <template #append>{{ formData.unit ? formData.unit : '件' }}</template>
+              <el-input
+                v-model.trim="formData.virtual_sale_num"
+                :placeholder="t('virtualSaleNumPlaceholder')"
+                class="input-width"
+                show-word-limit
+                maxlength="8"
+                clearable
+                @keyup="filterNumber($event)"
+                @blur="formData.virtual_sale_num = $event.target.value"
+              >
+                <template #append>{{
+                  formData.unit ? formData.unit : '件'
+                }}</template>
               </el-input>
-                            <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('virtualSaleNumDesc') }}</div>
+              <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
+                {{ t('virtualSaleNumDesc') }}
+              </div>
             </div>
           </el-form-item>
           <!-- 商品分类 -->
-                    <el-form-item v-if="activeMenu === 'category'" prop="goods_category" :label="t('goodsCategory')">
-                        <el-cascader v-model="formData.goods_category" :options="goodsCategoryOptions" :props="goodsCategoryProps" clearable filterable @change="categoryHandleChange" />
+          <el-form-item
+            v-if="activeMenu === 'category'"
+            prop="goods_category"
+            :label="t('goodsCategory')"
+          >
+            <el-cascader
+              v-model="formData.goods_category"
+              :options="goodsCategoryOptions"
+              :props="goodsCategoryProps"
+              clearable
+              filterable
+              @change="categoryHandleChange"
+            />
             <div class="ml-[10px]">
-                                <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsCategory(true)">{{ t('refresh') }}</span>
-                                <span class="cursor-pointer text-primary" @click="toGoodsCategoryEvent">{{ t('addGoodsCategory') }}</span>
+              <span
+                class="cursor-pointer text-primary mr-[10px]"
+                @click="refreshGoodsCategory(true)"
+                >{{ t('refresh') }}</span
+              >
+              <span
+                class="cursor-pointer text-primary"
+                @click="toGoodsCategoryEvent"
+                >{{ t('addGoodsCategory') }}</span
+              >
             </div>
           </el-form-item>
           <!-- 商品品牌 -->
           <el-form-item v-if="activeMenu === 'brand'" :label="t('goodsBrand')">
-                        <el-select v-model="formData.brand_id" :placeholder="t('brandPlaceholder')" clearable>
-                            <el-option v-for="item in brandOptions" :key="item.brand_id" :label="item.brand_name" :value="item.brand_id" />
+            <el-select
+              v-model="formData.brand_id"
+              :placeholder="t('brandPlaceholder')"
+              clearable
+            >
+              <el-option
+                v-for="item in brandOptions"
+                :key="item.brand_id"
+                :label="item.brand_name"
+                :value="item.brand_id"
+              />
             </el-select>
             <div class="ml-[10px]">
-                            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsBrand(true)">{{ t('refresh') }}</span>
-                            <span class="cursor-pointer text-primary" @click="toGoodsBrandEvent">{{ t('addGoodsBrand') }}</span>
+              <span
+                class="cursor-pointer text-primary mr-[10px]"
+                @click="refreshGoodsBrand(true)"
+                >{{ t('refresh') }}</span
+              >
+              <span
+                class="cursor-pointer text-primary"
+                @click="toGoodsBrandEvent"
+                >{{ t('addGoodsBrand') }}</span
+              >
             </div>
           </el-form-item>
           <!-- 商品海报 -->
-                    <el-form-item v-if="activeMenu === 'poster'" :label="t('goodsPoster')">
-                        <el-select v-model="formData.poster_id" :placeholder="t('posterPlaceholder')" clearable>
-                            <el-option v-for="item in posterOptions" :key="item.id" :label="item.name" :value="item.id" />
+          <el-form-item
+            v-if="activeMenu === 'poster'"
+            :label="t('goodsPoster')"
+          >
+            <el-select
+              v-model="formData.poster_id"
+              :placeholder="t('posterPlaceholder')"
+              clearable
+            >
+              <el-option
+                v-for="item in posterOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
             <div class="ml-[10px]">
-                            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshGoodsPoster(true)">{{ t('refresh') }}</span>
-                            <span class="cursor-pointer text-primary" @click="toPosterEvent">{{ t('addGoodsPoster') }}</span>
+              <span
+                class="cursor-pointer text-primary mr-[10px]"
+                @click="refreshGoodsPoster(true)"
+                >{{ t('refresh') }}</span
+              >
+              <span
+                class="cursor-pointer text-primary"
+                @click="toPosterEvent"
+                >{{ t('addGoodsPoster') }}</span
+              >
             </div>
           </el-form-item>
           <!-- 是否赠品 -->
           <el-form-item v-if="activeMenu === 'gift'" :label="t('isGift')">
             <div>
               <el-radio-group v-model="formData.is_gift">
-                                <el-radio :label= "1">{{ t('yes') }}</el-radio>
-                                <el-radio :label= "0">{{ t('no') }}</el-radio>
+                <el-radio :label="1">{{ t('yes') }}</el-radio>
+                <el-radio :label="0">{{ t('no') }}</el-radio>
               </el-radio-group>
-                            <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{ t('giftTips') }}</div>
+              <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">
+                {{ t('giftTips') }}
+              </div>
             </div>
           </el-form-item>
           <!-- 配送设置 -->
@@ -84,35 +203,105 @@
             <el-form-item :label="t('deliveryType')" prop="delivery_type">
               <div>
                 <el-checkbox-group v-model="formData.delivery_type">
-                                    <el-checkbox v-for="(item, index) in deliveryTypeCheckBox" :key="index" :label="item.key">{{ item.name }}</el-checkbox>
+                  <el-checkbox
+                    v-for="(item, index) in deliveryTypeCheckBox"
+                    :key="index"
+                    :label="item.key"
+                    >{{ item.name }}</el-checkbox
+                  >
                 </el-checkbox-group>
-                                <div v-if="deliveryTypeCheckBox && deliveryTypeCheckBox.length" class="text-[12px] text-[#999] leading-[20px]">只针对实物商品有效</div>
-                                <div v-if="deliveryTypeFlag" class="text-[12px] text-[#999] leading-[20px]">请先在配置设置中设置配送方式</div>
+                <div
+                  v-if="deliveryTypeCheckBox && deliveryTypeCheckBox.length"
+                  class="text-[12px] text-[#999] leading-[20px]"
+                >
+                  只针对实物商品有效
+                </div>
+                <div
+                  v-if="deliveryTypeFlag"
+                  class="text-[12px] text-[#999] leading-[20px]"
+                >
+                  请先在配置设置中设置配送方式
+                </div>
               </div>
             </el-form-item>
 
-                        <el-form-item :label="t('isFreeShipping')" v-show="formData.delivery_type.indexOf('express') != -1">
-                            <el-switch v-model="formData.is_free_shipping" :active-value="1" :inactive-value="0" />
+            <el-form-item
+              :label="t('isFreeShipping')"
+              v-show="formData.delivery_type.indexOf('express') != -1"
+            >
+              <el-switch
+                v-model="formData.is_free_shipping"
+                :active-value="1"
+                :inactive-value="0"
+              />
             </el-form-item>
 
-                        <el-form-item :label="t('feeType')" prop="fee_type" v-show="formData.delivery_type.indexOf('express') != -1 && formData.is_free_shipping == 0">
+            <el-form-item
+              :label="t('feeType')"
+              prop="fee_type"
+              v-show="
+                formData.delivery_type.indexOf('express') != -1 &&
+                formData.is_free_shipping == 0
+              "
+            >
               <el-radio-group v-model="formData.fee_type">
                 <el-radio label="template">{{ t('selectTemplate') }}</el-radio>
                 <el-radio label="fixed">{{ t('fixedShipping') }}</el-radio>
               </el-radio-group>
             </el-form-item>
-                        <el-form-item :label="t('deliveryMoney')" prop="delivery_money" v-show="formData.delivery_type.indexOf('express') != -1 && formData.is_free_shipping == 0 && formData.fee_type == 'fixed'">
-                            <el-input v-model.trim="formData.delivery_money" clearable placeholder="0.00" class="input-width-short" maxlength="8">
+            <el-form-item
+              :label="t('deliveryMoney')"
+              prop="delivery_money"
+              v-show="
+                formData.delivery_type.indexOf('express') != -1 &&
+                formData.is_free_shipping == 0 &&
+                formData.fee_type == 'fixed'
+              "
+            >
+              <el-input
+                v-model.trim="formData.delivery_money"
+                clearable
+                placeholder="0.00"
+                class="input-width-short"
+                maxlength="8"
+              >
                 <template #append>{{ t('yuan') }}</template>
               </el-input>
             </el-form-item>
-                        <el-form-item :label="t('deliveryTemplateId')" prop="delivery_template_id" v-show="formData.delivery_type.indexOf('express') != -1 && formData.is_free_shipping == 0 && formData.fee_type == 'template'">
-                            <el-select v-model="formData.delivery_template_id" :placeholder="t('deliveryTemplateIdPlaceholder')" filterable autocomplete="off" clearable>
-                                <el-option v-for="item in deliveryTemplateOptions" :key="item.template_id" :label="item.template_name" :value="item.template_id" />
+            <el-form-item
+              :label="t('deliveryTemplateId')"
+              prop="delivery_template_id"
+              v-show="
+                formData.delivery_type.indexOf('express') != -1 &&
+                formData.is_free_shipping == 0 &&
+                formData.fee_type == 'template'
+              "
+            >
+              <el-select
+                v-model="formData.delivery_template_id"
+                :placeholder="t('deliveryTemplateIdPlaceholder')"
+                filterable
+                autocomplete="off"
+                clearable
+              >
+                <el-option
+                  v-for="item in deliveryTemplateOptions"
+                  :key="item.template_id"
+                  :label="item.template_name"
+                  :value="item.template_id"
+                />
               </el-select>
               <div class="ml-[10px]">
-                                <span class="cursor-pointer text-primary mr-[10px]" @click="refreshDeliveryTemplate">{{ t('refresh') }}</span>
-                                <span class="cursor-pointer text-primary" @click="toDeliveryTemplateEvent">{{ t('addDeliveryTemplateId') }}</span>
+                <span
+                  class="cursor-pointer text-primary mr-[10px]"
+                  @click="refreshDeliveryTemplate"
+                  >{{ t('refresh') }}</span
+                >
+                <span
+                  class="cursor-pointer text-primary"
+                  @click="toDeliveryTemplateEvent"
+                  >{{ t('addDeliveryTemplateId') }}</span
+                >
               </div>
             </el-form-item>
           </div>
@@ -125,18 +314,48 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item :label="t('stockNum')" prop="">
-                            <el-input v-model.trim="formData.stock" clearable placeholder="0" class="input-width-short" show-word-limit maxlength="8" @keyup="filterNumber($event)" @blur="formData.stock = $event.target.value" />
+              <el-input
+                v-model.trim="formData.stock"
+                clearable
+                placeholder="0"
+                class="input-width-short"
+                show-word-limit
+                maxlength="8"
+                @keyup="filterNumber($event)"
+                @blur="formData.stock = $event.target.value"
+              />
             </el-form-item>
-                        <div class="mt-[10px] ml-[120px] text-[12px] text-[#999] leading-[20px]">{{ t('stockNumTips') }}</div>
+            <div
+              class="mt-[10px] ml-[120px] text-[12px] text-[#999] leading-[20px]"
+            >
+              {{ t('stockNumTips') }}
+            </div>
           </div>
           <!-- 万能表单 -->
           <el-form-item v-if="activeMenu === 'diy_form'" :label="t('diyForm')">
-                        <el-select v-model="formData.form_id" :placeholder="t('diyFormPlaceholder')" clearable>
-                            <el-option v-for="item in diyFormOptions" :key="item.form_id" :label="item.page_title" :value="item.form_id" />
+            <el-select
+              v-model="formData.form_id"
+              :placeholder="t('diyFormPlaceholder')"
+              clearable
+            >
+              <el-option
+                v-for="item in diyFormOptions"
+                :key="item.form_id"
+                :label="item.page_title"
+                :value="item.form_id"
+              />
             </el-select>
             <div class="ml-[10px]">
-                            <span class="cursor-pointer text-primary mr-[10px]" @click="refreshDiyForm(true)">{{ t('refresh') }}</span>
-                            <span class="cursor-pointer text-primary" @click="toDiyFormEvent">{{ t('addDiyForm') }}</span>
+              <span
+                class="cursor-pointer text-primary mr-[10px]"
+                @click="refreshDiyForm(true)"
+                >{{ t('refresh') }}</span
+              >
+              <span
+                class="cursor-pointer text-primary"
+                @click="toDiyFormEvent"
+                >{{ t('addDiyForm') }}</span
+              >
             </div>
           </el-form-item>
         </el-col>
@@ -146,7 +365,12 @@
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+        <el-button
+          type="primary"
+          :loading="loading"
+          @click="confirm(formRef)"
+          >{{ t('confirm') }}</el-button
+        >
       </span>
     </template>
   </el-dialog>
@@ -164,11 +388,14 @@ import {
   getServeList,
   getCategoryTree,
   getGoodsBatchSetDict,
-    goodsBatchSet
+  goodsBatchSet,
 } from '@/addon/shop/api/goods'
 import { getPosterList } from '@/app/api/poster'
 import { getDiyFormList } from '@/app/api/diy_form'
-import {getShopDeliveryList,getShippingTemplateList} from '@/addon/shop/api/delivery'
+import {
+  getShopDeliveryList,
+  getShippingTemplateList,
+} from '@/addon/shop/api/delivery'
 
 const emit = defineEmits(['load'])
 const showDialog = ref(false)
@@ -195,7 +422,7 @@ const initialFormData = {
   stock_type: 'inc',
   is_free_shipping: 1,
   is_gift: 0,
-    stock: ''
+  stock: '',
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -204,7 +431,7 @@ const regExp: any = {
   required: /[\S]+/,
   number: /^\d{0,10}$/,
   digit: /^\d{0,10}(.?\d{0,2})$/,
-    special: /^\d{0,10}(.?\d{0,3})$/
+  special: /^\d{0,10}(.?\d{0,3})$/,
 }
 const formRef = ref<FormInstance>()
 const formRules = reactive({
@@ -223,21 +450,29 @@ const formRules = reactive({
         } else {
           callback()
         }
-            }
-        }
+      },
+    },
   ],
   delivery_type: [
-        { required: true, message: t('deliveryTypePlaceholder'), trigger: 'blur' }
+    { required: true, message: t('deliveryTypePlaceholder'), trigger: 'blur' },
   ],
   goods_category: [
-        { required: true, message: t('goodsCategoryPlaceholderTwo'), trigger: 'blur' }
+    {
+      required: true,
+      message: t('goodsCategoryPlaceholderTwo'),
+      trigger: 'blur',
+    },
   ],
   delivery_money: [
     {
       trigger: 'blur',
       validator: (rule: any, value: any, callback: any) => {
         if (activeMenu.value == 'delivery') {
-                    if (formData.delivery_type.indexOf('express') != -1 && formData.is_free_shipping == 0 && formData.fee_type == 'fixed') {
+          if (
+            formData.delivery_type.indexOf('express') != -1 &&
+            formData.is_free_shipping == 0 &&
+            formData.fee_type == 'fixed'
+          ) {
             if (formData.delivery_template_id.length == 0 && value === '') {
               callback(new Error(t('deliveryMoneyPlaceholder')))
             } else if (isNaN(value) || !regExp.digit.test(value)) {
@@ -253,15 +488,19 @@ const formRules = reactive({
         } else {
           callback()
         }
-            }
-        }
+      },
+    },
   ],
   delivery_template_id: [
     {
       trigger: 'blur',
       validator: (rule: any, value: any, callback: any) => {
         if (activeMenu.value == 'delivery') {
-                    if (formData.delivery_type.indexOf('express') != -1 && formData.is_free_shipping == 0 && formData.fee_type == 'template') {
+          if (
+            formData.delivery_type.indexOf('express') != -1 &&
+            formData.is_free_shipping == 0 &&
+            formData.fee_type == 'template'
+          ) {
             if (formData.delivery_money.length == 0 && value === '') {
               callback(new Error(t('deliveryTemplateIdPlaceholder')))
             } else {
@@ -273,22 +512,22 @@ const formRules = reactive({
         } else {
           callback()
         }
-            }
-        }
-    ]
+      },
+    },
+  ],
 })
 
-const goods_ids: any = [];
+const goods_ids: any = []
 const show = (multipleSelection: any) => {
   multipleSelection.forEach((item: any) => {
-        goods_ids.push(item.goods_id);
-    });
+    goods_ids.push(item.goods_id)
+  })
   showDialog.value = true
 }
 
 const confirm = async (formEl: FormInstance | undefined) => {
   if (loading.value || !formEl) return
-    await formEl.validate(async(valid) => {
+  await formEl.validate(async (valid) => {
     if (valid) {
       loading.value = true
       const goodsCategory: any = []
@@ -310,13 +549,14 @@ const confirm = async (formEl: FormInstance | undefined) => {
       let data = {
         goods_ids: goods_ids,
         set_type: activeMenu.value,
-                set_value: formData
+        set_value: formData,
       }
-            goodsBatchSet(data).then((res) => {
+      goodsBatchSet(data)
+        .then((res) => {
           if (['stock'].indexOf(activeMenu.value) != -1) {
-                    activeMenu.value = 'label';
+            activeMenu.value = 'label'
             showDialog.value = false
-                    goods_ids.splice(0, goods_ids.length);
+            goods_ids.splice(0, goods_ids.length)
             Object.assign(formData, {
               label_ids: [],
               service_ids: [],
@@ -331,11 +571,12 @@ const confirm = async (formEl: FormInstance | undefined) => {
               delivery_type: [],
               is_free_shipping: 1,
               is_gift: 0,
-                    });
+            })
             emit('load')
           }
           loading.value = false
-            }).catch(err => {
+        })
+        .catch((err) => {
           loading.value = false
         })
     }
@@ -349,7 +590,7 @@ const handleMenuSelect = (index: string) => {
 const setTypeList = reactive([])
 const getGoodsTypeList = () => {
   getGoodsBatchSetDict().then((res) => {
-        Object.assign(setTypeList, res.data);
+    Object.assign(setTypeList, res.data)
   })
 }
 getGoodsTypeList()
@@ -360,7 +601,7 @@ const labelOptions = reactive([])
 // 跳转到商品标签，添加标签
 const toGoodsLabelEvent = () => {
   const url = router.resolve({
-        path: '/shop/goods/label'
+    path: '/shop/goods/label',
   })
   window.open(url.href)
 }
@@ -374,7 +615,7 @@ const refreshGoodsLabel = (bool = false) => {
       if (bool) {
         ElMessage({
           message: t('refreshSuccess'),
-                    type: 'success'
+          type: 'success',
         })
       }
     }
@@ -389,7 +630,7 @@ const serviceOptions = reactive([])
 // 跳转到商品服务，添加服务
 const toGoodsServiceEvent = () => {
   const url = router.resolve({
-        path: '/shop/goods/service'
+    path: '/shop/goods/service',
   })
   window.open(url.href)
 }
@@ -403,7 +644,7 @@ const refreshGoodsService = (bool = false) => {
       if (bool) {
         ElMessage({
           message: t('refreshSuccess'),
-                    type: 'success'
+          type: 'success',
         })
       }
     }
@@ -417,7 +658,7 @@ refreshGoodsService()
 // 商品分类
 const goodsCategoryOptions = reactive([])
 const goodsCategoryProps = {
-    multiple: true
+  multiple: true,
 }
 const categoryHandleChange = (value: any) => {
   // console.log(value, goodsEdit.formData.goods_category, goodsEdit.formData.goods_category.toString())
@@ -426,7 +667,7 @@ const categoryHandleChange = (value: any) => {
 // 跳转到商品分类，添加分类
 const toGoodsCategoryEvent = () => {
   const url = router.resolve({
-        path: '/shop/goods/category'
+    path: '/shop/goods/category',
   })
   window.open(url.href)
 }
@@ -443,21 +684,25 @@ const refreshGoodsCategory = (bool = false) => {
           item.child_list.forEach((childItem: any) => {
             children.push({
               value: childItem.category_id,
-                            label: childItem.category_name
+              label: childItem.category_name,
             })
           })
         }
         goodsCategoryTree.push({
           value: item.category_id,
           label: item.category_name,
-                    children
+          children,
         })
       })
-            goodsCategoryOptions.splice(0, goodsCategoryOptions.length, ...goodsCategoryTree)
+      goodsCategoryOptions.splice(
+        0,
+        goodsCategoryOptions.length,
+        ...goodsCategoryTree
+      )
       if (bool) {
         ElMessage({
           message: t('refreshSuccess'),
-                    type: 'success'
+          type: 'success',
         })
       }
     }
@@ -474,7 +719,7 @@ const brandOptions = reactive([])
 // 跳转到商品品牌，添加品牌
 const toGoodsBrandEvent = () => {
   const url = router.resolve({
-        path: '/shop/goods/brand'
+    path: '/shop/goods/brand',
   })
   window.open(url.href)
 }
@@ -488,7 +733,7 @@ const refreshGoodsBrand = (bool = false) => {
       if (bool) {
         ElMessage({
           message: t('refreshSuccess'),
-                    type: 'success'
+          type: 'success',
         })
       }
     }
@@ -504,7 +749,7 @@ const posterOptions = reactive([])
 // 跳转到海报列表，添加海报
 const toPosterEvent = () => {
   const url = router.resolve({
-        path: '/poster/list'
+    path: '/poster/list',
   })
   window.open(url.href)
 }
@@ -512,7 +757,7 @@ const toPosterEvent = () => {
 // 商品海报
 const refreshGoodsPoster = (bool = false) => {
   getPosterList({
-        type: 'shop_goods'
+    type: 'shop_goods',
   }).then((res) => {
     const data = res.data
     if (data) {
@@ -520,7 +765,7 @@ const refreshGoodsPoster = (bool = false) => {
       if (bool) {
         ElMessage({
           message: t('refreshSuccess'),
-                    type: 'success'
+          type: 'success',
         })
       }
     }
@@ -530,7 +775,6 @@ const refreshGoodsPoster = (bool = false) => {
 refreshGoodsPoster()
 /** *****************商品海报-end *************************/
 
-
 // 配送方式复选框
 const deliveryTypeCheckBox = reactive([])
 
@@ -552,7 +796,7 @@ getShopDeliveryList().then((res) => {
 // 跳转到运费模板
 const toDeliveryTemplateEvent = () => {
   const url = router.resolve({
-        path: '/shop/order/shipping/template'
+    path: '/shop/order/shipping/template',
   })
   window.open(url.href)
 }
@@ -566,7 +810,7 @@ const refreshDeliveryTemplate = (bool = false) => {
       if (bool) {
         ElMessage({
           message: t('refreshSuccess'),
-                    type: 'success'
+          type: 'success',
         })
       }
     }
@@ -581,7 +825,7 @@ const diyFormOptions = reactive([])
 // 跳转到万能表单列表，添加表单
 const toDiyFormEvent = () => {
   const url = router.resolve({
-        path: '/diy_form/list'
+    path: '/diy_form/list',
   })
   window.open(url.href)
 }
@@ -590,7 +834,7 @@ const toDiyFormEvent = () => {
 const refreshDiyForm = (bool = false) => {
   getDiyFormList({
     type: 'DIY_FORM_GOODS_DETAIL',
-        status: 1
+    status: 1,
   }).then((res) => {
     const data = res.data
     if (data) {
@@ -598,7 +842,7 @@ const refreshDiyForm = (bool = false) => {
       if (bool) {
         ElMessage({
           message: t('refreshSuccess'),
-                    type: 'success'
+          type: 'success',
         })
       }
     }
@@ -610,15 +854,15 @@ refreshDiyForm()
 
 defineExpose({
   showDialog,
-    show
+  show,
 })
 </script>
 
 <style lang="scss" scoped>
 .el-menu-item {
-    height:40px;
+  height: 40px;
 }
-.input-width-short{
+.input-width-short {
   width: 200px;
 }
 </style>

admin/src/addon/shop/views/goods/components/goods-category-spread-popup.vue

@@ -1,8 +1,14 @@
 <template>
-    <el-dialog v-model="showDialog" :title="t('goodsCategorySpreadTitle')" width="500px" :destroy-on-close="true">
-
+  <el-dialog
+    v-model="showDialog"
+    :title="t('goodsCategorySpreadTitle')"
+    width="500px"
+    :destroy-on-close="true"
+  >
     <div class="promote-flex flex">
-            <div class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]">
+      <div
+        class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]"
+      >
         <el-image :src="wapImage" />
       </div>
 
@@ -10,14 +16,16 @@
         <div class="mb-[10px]">{{ t('spreadLink') }}</div>
         <el-input class="mb-[10px]" readonly :value="wapPreview">
           <template #append>
-                        <el-button @click="copyEvent(wapPreview)">{{ t('copy') }}</el-button>
+            <el-button @click="copyEvent(wapPreview)">{{
+              t('copy')
+            }}</el-button>
           </template>
         </el-input>
-                <a class="text-primary" :href="wapImage" download>{{ t('downloadQrcode') }}</a>
+        <a class="text-primary" :href="wapImage" download>{{
+          t('downloadQrcode')
+        }}</a>
       </div>
-
     </div>
-
   </el-dialog>
 </template>
 
@@ -60,7 +68,11 @@ getUrl().then((res: any) => {
 const loadQrcode = () => {
   wapPreview.value = `${wapUrl.value}${page.value}`
   // errorCorrectionLevel：密度容错率L（低）H(高)
-    QRCode.toDataURL(wapPreview.value, { errorCorrectionLevel: 'L', margin: 0, width: 120 }).then(url => {
+  QRCode.toDataURL(wapPreview.value, {
+    errorCorrectionLevel: 'L',
+    margin: 0,
+    width: 120,
+  }).then((url) => {
     wapImage.value = url
   })
 }
@@ -78,7 +90,7 @@ const copyEvent = (text: string) => {
   if (!isSupported.value) {
     ElMessage({
       message: t('notSupportCopy'),
-            type: 'warning'
+      type: 'warning',
     })
   }
   copy(text)
@@ -88,14 +100,14 @@ watch(copied, () => {
   if (copied.value) {
     ElMessage({
       message: t('copySuccess'),
-            type: 'success'
+      type: 'success',
     })
   }
 })
 
 defineExpose({
   showDialog,
-    show
+  show,
 })
 </script>
 

admin/src/addon/shop/views/goods/components/goods-member-price-popup.vue

@@ -1,7 +1,13 @@
 <template>
   <div>
-        <el-dialog v-model="showDialog" :title="t('editMemberPricePopupTitle')" width="1100px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
-
+    <el-dialog
+      v-model="showDialog"
+      :title="t('editMemberPricePopupTitle')"
+      width="1100px"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
       <el-form :model="formData" label-width="120px" class="page-form">
         <el-form-item :label="t('memberDiscount')">
           <div>
@@ -10,45 +16,113 @@
               <el-radio label="discount">{{ t('discount') }}</el-radio>
               <el-radio label="fixed_price">{{ t('fixedPrice') }}</el-radio>
             </el-radio-group>
-                        <div class="text-[12px] text-[#999] leading-[20px]" v-if="formData.member_discount == 'discount'">{{t('discountHint')}}</div>
-                        <div class="text-[12px] text-[#999] leading-[20px]" v-if="formData.member_discount == 'fixed_price'">{{t('fixedPriceHint')}}</div>
+            <div
+              class="text-[12px] text-[#999] leading-[20px]"
+              v-if="formData.member_discount == 'discount'"
+            >
+              {{ t('discountHint') }}
+            </div>
+            <div
+              class="text-[12px] text-[#999] leading-[20px]"
+              v-if="formData.member_discount == 'fixed_price'"
+            >
+              {{ t('fixedPriceHint') }}
+            </div>
           </div>
         </el-form-item>
-                <el-form-item v-if="formData.member_discount == 'discount' && memberDiscountLevel.length">
-                    <el-table :data="[{}]" size="large" v-loading="tableData.loading" max-height="450" @selection-change="handleSelectionChange">
+        <el-form-item
+          v-if="
+            formData.member_discount == 'discount' && memberDiscountLevel.length
+          "
+        >
+          <el-table
+            :data="[{}]"
+            size="large"
+            v-loading="tableData.loading"
+            max-height="450"
+            @selection-change="handleSelectionChange"
+          >
             <template #empty>
               <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
             </template>
-                        <el-table-column fixed prop="sku_name" :label="t('memberLevel')" width="150" >
+            <el-table-column
+              fixed
+              prop="sku_name"
+              :label="t('memberLevel')"
+              width="150"
+            >
               <template #default>
-                                {{t('memberEnjoyDiscount')}}
+                {{ t('memberEnjoyDiscount') }}
               </template>
             </el-table-column>
-                        <el-table-column v-for="(item,index) in memberDiscountLevel" :key="index" :label="item.level_name">
+            <el-table-column
+              v-for="(item, index) in memberDiscountLevel"
+              :key="index"
+              :label="item.level_name"
+            >
               <template #default="{ row }">
-                                {{item.level_benefits.discount.discount}}
+                {{ item.level_benefits.discount.discount }}
               </template>
             </el-table-column>
           </el-table>
         </el-form-item>
         <el-form-item v-if="formData.member_discount == 'fixed_price'">
           <div class="mb-[10px] flex items-center">
-                        <el-checkbox v-model="toggleCheckbox"  @change="toggleChange" size="large" class="px-[14px]" :indeterminate="isIndeterminate" />
-                        <el-button v-for="(item,index) in tableData.member_level" :key="index" size="small" @click="batchGoodsBtn(item.level_id)">
-                            {{item.level_name}}
+            <el-checkbox
+              v-model="toggleCheckbox"
+              @change="toggleChange"
+              size="large"
+              class="px-[14px]"
+              :indeterminate="isIndeterminate"
+            />
+            <el-button
+              v-for="(item, index) in tableData.member_level"
+              :key="index"
+              size="small"
+              @click="batchGoodsBtn(item.level_id)"
+            >
+              {{ item.level_name }}
             </el-button>
           </div>
-                    <el-table :data="tableData.data" size="large" v-loading="tableData.loading" max-height="450" @selection-change="handleSelectionChange" ref="goodsListTableRef">
+          <el-table
+            :data="tableData.data"
+            size="large"
+            v-loading="tableData.loading"
+            max-height="450"
+            @selection-change="handleSelectionChange"
+            ref="goodsListTableRef"
+          >
             <template #empty>
               <span>{{ !tableData.loading ? t('emptyData') : '' }}</span>
             </template>
             <el-table-column type="selection" width="55" />
-                        <el-table-column fixed prop="sku_name" :label="t('goodsSku')" width="150" />
-                        <el-table-column fixed prop="price" :label="t('skuPrice')" width="120" />
-                        <el-table-column v-for="(item,index) in tableData.member_level" :key="index" :label="item.level_name" width="190">
+            <el-table-column
+              fixed
+              prop="sku_name"
+              :label="t('goodsSku')"
+              width="150"
+            />
+            <el-table-column
+              fixed
+              prop="price"
+              :label="t('skuPrice')"
+              width="120"
+            />
+            <el-table-column
+              v-for="(item, index) in tableData.member_level"
+              :key="index"
+              :label="item.level_name"
+              width="190"
+            >
               <template #default="{ row }">
-                                <el-input v-model.trim="row[`level_${item.level_id}`]" maxlength="8" clearable class="w-full"  @keyup="filterDigit($event)">
-                                    <template #append>{{t('yuanUnit')}}</template>
+                <el-input
+                  v-model.trim="row[`level_${item.level_id}`]"
+                  maxlength="8"
+                  clearable
+                  class="w-full"
+                  @keyup="filterDigit($event)"
+                >
+                  <template #append>{{ t('yuanUnit') }}</template>
                 </el-input>
               </template>
             </el-table-column>
@@ -56,17 +130,34 @@
         </el-form-item>
       </el-form>
 
-            <el-dialog v-model="memberPriceDialog" :title="t('editMemberPrice')" width="400px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
+      <el-dialog
+        v-model="memberPriceDialog"
+        :title="t('editMemberPrice')"
+        width="400px"
+        :close-on-press-escape="false"
+        :destroy-on-close="true"
+        :close-on-click-modal="false"
+      >
         <el-form :model="formData" label-width="80px" class="page-form">
           <el-form-item :label="t('memberPrice')" prop="member_price">
-                        <el-input v-model.trim="memberPrice" :placeholder="t('memberPricePlaceholder')" maxlength="8" clearable  @keyup="filterDigit($event)" />
+            <el-input
+              v-model.trim="memberPrice"
+              :placeholder="t('memberPricePlaceholder')"
+              maxlength="8"
+              clearable
+              @keyup="filterDigit($event)"
+            />
           </el-form-item>
         </el-form>
 
         <template #footer>
           <span class="dialog-footer">
-                        <el-button @click="memberPriceDialog = false">{{ t('cancel') }}</el-button>
-                        <el-button type="primary" @click="memberPriceSave">{{ t('confirm') }}</el-button>
+            <el-button @click="memberPriceDialog = false">{{
+              t('cancel')
+            }}</el-button>
+            <el-button type="primary" @click="memberPriceSave">{{
+              t('confirm')
+            }}</el-button>
           </span>
         </template>
       </el-dialog>
@@ -89,12 +180,12 @@ import { ElMessage } from 'element-plus'
 
 import {
   getGoodsSkuList,
-    editGoodsListMemberPrice
+  editGoodsListMemberPrice,
 } from '@/addon/shop/api/goods'
 
 const goodsListTableRef = ref()
 const formData: any = reactive({
-    member_discount: ''
+  member_discount: '',
 })
 const goods: any = reactive({})
 const showDialog = ref(false)
@@ -105,7 +196,7 @@ const emit = defineEmits(['load'])
 const tableData = reactive({
   loading: true,
   data: [],
-    member_level: []
+  member_level: [],
 })
 /**
  * 获取商品列表
@@ -114,8 +205,9 @@ const loadGoodsList = () => {
   tableData.loading = true
 
   getGoodsSkuList({
-        goods_id: goods.goods_id
-    }).then(res => {
+    goods_id: goods.goods_id,
+  })
+    .then((res) => {
       tableData.loading = false
       tableData.data = res.data
       tableData.data.forEach((item: any, index, Array: any) => {
@@ -126,24 +218,31 @@ const loadGoodsList = () => {
         // 处理商品的会员价
         tableData.member_level.forEach((levelItem: any, levelIndex) => {
           if (!item.member_price) {
-                    Array[index][`level_${levelItem.level_id}`] = parseFloat(item.price).toFixed(2)
+            Array[index][`level_${levelItem.level_id}`] = parseFloat(
+              item.price
+            ).toFixed(2)
           } else if (item.member_price) {
             const memberPrice = JSON.parse(item.member_price)
             if (memberPrice[`level_${levelItem.level_id}`]) {
-                        Array[index][`level_${levelItem.level_id}`] = parseFloat(memberPrice[`level_${levelItem.level_id}`]).toFixed(2)
+              Array[index][`level_${levelItem.level_id}`] = parseFloat(
+                memberPrice[`level_${levelItem.level_id}`]
+              ).toFixed(2)
             } else {
-                        Array[index][`level_${levelItem.level_id}`] = parseFloat(item.price).toFixed(2)
+              Array[index][`level_${levelItem.level_id}`] = parseFloat(
+                item.price
+              ).toFixed(2)
             }
           }
         })
       })
-    }).catch(() => {
+    })
+    .catch(() => {
       tableData.loading = false
     })
 }
 
 // 用于会员折扣展示
-const memberDiscountLevel:any = ref([])
+const memberDiscountLevel: any = ref([])
 const show = (data: any, levelData: any) => {
   Object.assign(goods, data)
   tableData.member_level = []
@@ -155,14 +254,23 @@ const show = (data: any, levelData: any) => {
     if (!item.level_benefits || item.level_benefits == null) {
       Array[index].level_benefits = {
         discount: {
-                    discount: '原价'
+          discount: '原价',
+        },
       }
-            }
-        } else if (item.level_benefits && item.level_benefits != null && !item.level_benefits.discount) {
+    } else if (
+      item.level_benefits &&
+      item.level_benefits != null &&
+      !item.level_benefits.discount
+    ) {
       Array[index].level_benefits.discount = {
-                discount: '原价'
+        discount: '原价',
       }
-        } else if (item.level_benefits && item.level_benefits != null && item.level_benefits.discount && !item.level_benefits.discount.discount) {
+    } else if (
+      item.level_benefits &&
+      item.level_benefits != null &&
+      item.level_benefits.discount &&
+      !item.level_benefits.discount.discount
+    ) {
       Array[index].level_benefits.discount.discount = '原价'
     } else {
       Array[index].level_benefits.discount.discount += '折'
@@ -190,7 +298,10 @@ const handleSelectionChange = (val: []) => {
   multipleSelection.value = deepClone(val)
 
   toggleCheckbox.value = false
-    if (multipleSelection.value.length > 0 && multipleSelection.value.length < tableData.data.length) {
+  if (
+    multipleSelection.value.length > 0 &&
+    multipleSelection.value.length < tableData.data.length
+  ) {
     isIndeterminate.value = true
   } else {
     isIndeterminate.value = false
@@ -203,11 +314,11 @@ const handleSelectionChange = (val: []) => {
 
 // 按钮
 const currLevelId = ref('')
-const batchGoodsBtn = (level_id:any) => {
+const batchGoodsBtn = (level_id: any) => {
   if (!multipleSelection.value.length) {
     ElMessage({
       message: '请选择要操作的商品',
-            type: 'warning'
+      type: 'warning',
     })
     return false
   }
@@ -225,7 +336,11 @@ const memberPriceSave = () => {
 
   const idArr = multipleSelection.value.map((obj: any) => obj.sku_id)
   tableData.data.forEach((item: any, index, Array: any) => {
-        if (idArr.indexOf(item.sku_id) > -1) { Array[index][`level_${currLevelId.value}`] = parseFloat(memberPrice.value).toFixed(2) }
+    if (idArr.indexOf(item.sku_id) > -1) {
+      Array[index][`level_${currLevelId.value}`] = parseFloat(
+        memberPrice.value
+      ).toFixed(2)
+    }
   })
 
   memberPrice.value = ''
@@ -243,14 +358,22 @@ const save = () => {
       obj.member_price = {}
       tableData.member_level.forEach((levelItem: any, levelIndex) => {
         if (verify) {
-                    obj.member_price[`level_${levelItem.level_id}`] = item[`level_${levelItem.level_id}`]
+          obj.member_price[`level_${levelItem.level_id}`] =
+            item[`level_${levelItem.level_id}`]
           if (parseFloat(item[`level_${levelItem.level_id}`]) <= 0) {
             verify = false
-                        ElMessage.error(`[${item.sku_name}][${levelItem.level_name}]的指定价格不能小于等于零`)
+            ElMessage.error(
+              `[${item.sku_name}][${levelItem.level_name}]的指定价格不能小于等于零`
+            )
           }
-                    if (parseFloat(item[`level_${levelItem.level_id}`]) > parseFloat(item.price)) {
+          if (
+            parseFloat(item[`level_${levelItem.level_id}`]) >
+            parseFloat(item.price)
+          ) {
             verify = false
-                        ElMessage.error(`[${item.sku_name}][${levelItem.level_name}]的指定价格不能大于商品原价`)
+            ElMessage.error(
+              `[${item.sku_name}][${levelItem.level_name}]的指定价格不能大于商品原价`
+            )
           }
         }
       })
@@ -266,8 +389,8 @@ const save = () => {
   editGoodsListMemberPrice({
     goods_id: goods.goods_id,
     member_discount: formData.member_discount,
-        sku_list
-    }).then(res => {
+    sku_list,
+  }).then((res) => {
     saveLoad = false
     emit('load')
     showDialog.value = false
@@ -276,7 +399,7 @@ const save = () => {
 
 defineExpose({
   showDialog,
-    show
+  show,
 })
 </script>
 

admin/src/addon/shop/views/goods/components/goods-price-edit-popup.vue

@@ -1,21 +1,44 @@
 <template>
   <div>
-        <el-dialog v-model="showDialog" :title="t('editPricePopupTitle')" width="800px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
-
+    <el-dialog
+      v-model="showDialog"
+      :title="t('editPricePopupTitle')"
+      width="800px"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
       <div class="flex items-center mb-[10px]">
         <div class="min-w-[70px] h-[70px] flex items-center justify-center">
-                    <el-image v-if="goods.goods_cover_thumb_small" class="w-[70px] h-[70px]" :src="img(goods.goods_cover_thumb_small)" fit="contain">
+          <el-image
+            v-if="goods.goods_cover_thumb_small"
+            class="w-[70px] h-[70px]"
+            :src="img(goods.goods_cover_thumb_small)"
+            fit="contain"
+          >
             <template #error>
               <div class="image-slot">
-                                <img class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" />
+                <img
+                  class="w-[70px] h-[70px]"
+                  src="@/addon/shop/assets/goods_default.png"
+                />
               </div>
             </template>
           </el-image>
-                    <img v-else class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+          <img
+            v-else
+            class="w-[70px] h-[70px]"
+            src="@/addon/shop/assets/goods_default.png"
+            fit="contain"
+          />
         </div>
         <div class="ml-2">
-                    <span :title="goods.goods_name" class="multi-hidden">{{ goods.goods_name }}</span>
-                    <span class="text-primary text-[12px]">{{ goods.goods_type_name }}</span>
+          <span :title="goods.goods_name" class="multi-hidden">{{
+            goods.goods_name
+          }}</span>
+          <span class="text-primary text-[12px]">{{
+            goods.goods_type_name
+          }}</span>
         </div>
       </div>
 
@@ -24,41 +47,96 @@
         <label>{{ t('batchOperationSku') }}</label>
 
         <div v-if="batchOperation.field">
-                    <el-input v-model.trim="batchOperation.value" clearable :placeholder="t(batchOperation.field)" class="set-input" maxlength="8" :autofocus="true" />
-                    <el-button type="primary" @click="saveBatch">{{ t('confirm') }}</el-button>
+          <el-input
+            v-model.trim="batchOperation.value"
+            clearable
+            :placeholder="t(batchOperation.field)"
+            class="set-input"
+            maxlength="8"
+            :autofocus="true"
+          />
+          <el-button type="primary" @click="saveBatch">{{
+            t('confirm')
+          }}</el-button>
           <el-button @click="clearBatch">{{ t('cancel') }}</el-button>
         </div>
         <div v-else>
-                    <el-button type="primary" link @click="setBatchField('price')" v-if="activeGoodsCount == 0">{{ t('price') }}</el-button>
-                    <el-button type="primary" link @click="setBatchField('market_price')">{{ t('marketPrice') }}</el-button>
-                    <el-button type="primary" link @click="setBatchField('cost_price')">{{ t('costPrice') }}</el-button>
+          <el-button
+            type="primary"
+            link
+            @click="setBatchField('price')"
+            v-if="activeGoodsCount == 0"
+            >{{ t('price') }}</el-button
+          >
+          <el-button
+            type="primary"
+            link
+            @click="setBatchField('market_price')"
+            >{{ t('marketPrice') }}</el-button
+          >
+          <el-button type="primary" link @click="setBatchField('cost_price')">{{
+            t('costPrice')
+          }}</el-button>
         </div>
       </div>
 
-            <el-table :data="goodsTable.data" size="large" v-loading="goodsTable.loading" max-height="400">
+      <el-table
+        :data="goodsTable.data"
+        size="large"
+        v-loading="goodsTable.loading"
+        max-height="400"
+      >
         <template #empty>
           <span>{{ !goodsTable.loading ? t('emptyData') : '' }}</span>
         </template>
 
-                <el-table-column prop="sku_name" :label="t('skuName')" min-width="120" v-if="goodsTable.data.length > 1" />
+        <el-table-column
+          prop="sku_name"
+          :label="t('skuName')"
+          min-width="120"
+          v-if="goodsTable.data.length > 1"
+        />
         <el-table-column prop="price" :label="t('price')" min-width="120">
           <template #default="{ row }">
-                        <el-input v-model.trim="row.price" clearable placeholder="0.00" maxlength="8" :disabled="activeGoodsCount > 0" />
+            <el-input
+              v-model.trim="row.price"
+              clearable
+              placeholder="0.00"
+              maxlength="8"
+              :disabled="activeGoodsCount > 0"
+            />
           </template>
         </el-table-column>
 
-                <el-table-column prop="market_price" :label="t('marketPrice')" min-width="120">
+        <el-table-column
+          prop="market_price"
+          :label="t('marketPrice')"
+          min-width="120"
+        >
           <template #default="{ row }">
-                        <el-input v-model.trim="row.market_price" clearable placeholder="0.00" maxlength="8" />
+            <el-input
+              v-model.trim="row.market_price"
+              clearable
+              placeholder="0.00"
+              maxlength="8"
+            />
           </template>
         </el-table-column>
 
-                <el-table-column prop="cost_price" :label="t('costPrice')" min-width="120">
+        <el-table-column
+          prop="cost_price"
+          :label="t('costPrice')"
+          min-width="120"
+        >
           <template #default="{ row }">
-                        <el-input v-model.trim="row.cost_price" clearable placeholder="0.00" maxlength="8" />
+            <el-input
+              v-model.trim="row.cost_price"
+              clearable
+              placeholder="0.00"
+              maxlength="8"
+            />
           </template>
         </el-table-column>
-
       </el-table>
 
       <template #footer>
@@ -80,7 +158,7 @@ import { ElMessage } from 'element-plus'
 import {
   getActiveGoodsCount,
   getGoodsSkuList,
-    editGoodsListPrice
+  editGoodsListPrice,
 } from '@/addon/shop/api/goods'
 
 const goods: any = reactive({})
@@ -92,12 +170,12 @@ const emit = defineEmits(['load'])
 
 const goodsTable = reactive({
   loading: true,
-    data: []
+  data: [],
 })
 
 const batchOperation: any = reactive({
   field: '', // 当前编辑的字段
-    value: '' // 输入值
+  value: '', // 输入值
 })
 
 const setBatchField = (value: string, regexp: string) => {
@@ -114,7 +192,7 @@ const saveBatch = () => {
   if (batchOperation.value.length == 0) {
     ElMessage({
       type: 'warning',
-            message: `${t(batchOperation.field + 'Placeholder')}`
+      message: `${t(batchOperation.field + 'Placeholder')}`,
     })
     return
   }
@@ -122,7 +200,7 @@ const saveBatch = () => {
   if (!regExp.digit.test(batchOperation.value)) {
     ElMessage({
       type: 'warning',
-            message: `${t(batchOperation.field + 'Tips')}`
+      message: `${t(batchOperation.field + 'Tips')}`,
     })
     return
   }
@@ -130,7 +208,7 @@ const saveBatch = () => {
   if (batchOperation.value < 0) {
     ElMessage({
       type: 'warning',
-            message: `${t(batchOperation.field + 'NotZeroTips')}`
+      message: `${t(batchOperation.field + 'NotZeroTips')}`,
     })
     return
   }
@@ -149,52 +227,54 @@ const loadGoodsList = () => {
   goodsTable.loading = true
 
   getGoodsSkuList({
-        goods_id: goods.goods_id
-    }).then(res => {
+    goods_id: goods.goods_id,
+  })
+    .then((res) => {
       goodsTable.loading = false
       goodsTable.data = res.data
-    }).catch(() => {
+    })
+    .catch(() => {
       goodsTable.loading = false
     })
 }
 
 const show = (data: any) => {
   Object.assign(goods, data)
-    getActiveGoodsCountFn();
+  getActiveGoodsCountFn()
   loadGoodsList()
   showDialog.value = true
 }
 
-const getActiveGoodsCountFn = ()=>{
+const getActiveGoodsCountFn = () => {
   getActiveGoodsCount({
-        goods_id: goods.goods_id
-    }).then((res)=>{
-        activeGoodsCount.value = res.data;
+    goods_id: goods.goods_id,
+  }).then((res) => {
+    activeGoodsCount.value = res.data
   })
 }
 
 // 正则表达式
 const regExp: any = {
-    digit: /^\d{0,10}(.?\d{0,2})$/
+  digit: /^\d{0,10}(.?\d{0,2})$/,
 }
 
 const verify = () => {
   let result = true
   for (let i = 0; i < goodsTable.data.length; i++) {
-        const item:any = goodsTable.data[i]
+    const item: any = goodsTable.data[i]
 
     if (isNaN(item.price) || !regExp.digit.test(item.price)) {
       result = false
       ElMessage({
         type: 'warning',
-                message: `${t('priceTips')}`
+        message: `${t('priceTips')}`,
       })
       break
     } else if (item.price < 0) {
       result = false
       ElMessage({
         type: 'warning',
-                message: `${t('priceNotZeroTips')}`
+        message: `${t('priceNotZeroTips')}`,
       })
       break
     }
@@ -203,14 +283,14 @@ const verify = () => {
       result = false
       ElMessage({
         type: 'warning',
-                message: `${t('marketPriceTips')}`
+        message: `${t('marketPriceTips')}`,
       })
       break
     } else if (item.market_price < 0) {
       result = false
       ElMessage({
         type: 'warning',
-                message: `${t('marketPriceNotZeroTips')}`
+        message: `${t('marketPriceNotZeroTips')}`,
       })
       break
     }
@@ -219,14 +299,14 @@ const verify = () => {
       result = false
       ElMessage({
         type: 'warning',
-                message: `${t('costPriceTips')}`
+        message: `${t('costPriceTips')}`,
       })
       break
     } else if (item.cost_price < 0) {
       result = false
       ElMessage({
         type: 'warning',
-                message: `${t('costPriceNotZeroTips')}`
+        message: `${t('costPriceNotZeroTips')}`,
       })
       break
     }
@@ -243,14 +323,14 @@ const save = () => {
         sku_id: item.sku_id,
         price: item.price,
         market_price: item.market_price,
-                cost_price: item.cost_price
+        cost_price: item.cost_price,
       })
     })
     editGoodsListPrice({
       goods_id: goods.goods_id,
-            sku_list
-        }).then(res => {
-            emit('load');
+      sku_list,
+    }).then((res) => {
+      emit('load')
       showDialog.value = false
     })
   }
@@ -258,7 +338,7 @@ const save = () => {
 
 defineExpose({
   showDialog,
-    show
+  show,
 })
 </script>
 

admin/src/addon/shop/views/goods/components/goods-spread-popup.vue

@@ -1,9 +1,15 @@
 <template>
   <div>
-        <el-dialog v-model="showDialog" :title="t('goodsSpreadTitle')" width="500px" :destroy-on-close="true">
-
+    <el-dialog
+      v-model="showDialog"
+      :title="t('goodsSpreadTitle')"
+      width="500px"
+      :destroy-on-close="true"
+    >
       <div class="promote-flex flex">
-                <div class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]">
+        <div
+          class="promote-img flex justify-center items-center bg-[#f8f8f8] w-[150px] h-[150px]"
+        >
           <el-image :src="wapImage" />
         </div>
 
@@ -11,14 +17,16 @@
           <div class="mb-[10px]">{{ t('spreadLink') }}</div>
           <el-input class="mb-[10px]" readonly :value="wapPreview">
             <template #append>
-                            <el-button @click="copyEvent(wapPreview)">{{ t('copy') }}</el-button>
+              <el-button @click="copyEvent(wapPreview)">{{
+                t('copy')
+              }}</el-button>
             </template>
           </el-input>
-                    <a class="text-primary" :href="wapImage" download>{{ t('downloadQrcode') }}</a>
+          <a class="text-primary" :href="wapImage" download>{{
+            t('downloadQrcode')
+          }}</a>
         </div>
-
       </div>
-
     </el-dialog>
   </div>
 </template>
@@ -65,16 +73,20 @@ getUrl().then((res: any) => {
 const loadQrcode = () => {
   wapPreview.value = `${wapUrl.value}${page.value}`
   // errorCorrectionLevel：密度容错率L（低）H(高)
-    QRCode.toDataURL(wapPreview.value, { errorCorrectionLevel: 'L', margin: 0, width: 120 }).then(url => {
+  QRCode.toDataURL(wapPreview.value, {
+    errorCorrectionLevel: 'L',
+    margin: 0,
+    width: 120,
+  }).then((url) => {
     wapImage.value = url
   })
 }
 
-const show = (data: any,type='goods') => {
+const show = (data: any, type = 'goods') => {
   Object.assign(goods, data)
-    if(type=='goods'){
+  if (type == 'goods') {
     page.value = `/addon/shop/pages/goods/detail?goods_id=${goods.goods_id}`
-    }else{
+  } else {
     page.value = `/addon/shop/pages/point/detail?id=${goods.id}`
   }
 
@@ -88,7 +100,7 @@ const copyEvent = (text: string) => {
   if (!isSupported.value) {
     ElMessage({
       message: t('notSupportCopy'),
-            type: 'warning'
+      type: 'warning',
     })
   }
   copy(text)
@@ -98,14 +110,14 @@ watch(copied, () => {
   if (copied.value) {
     ElMessage({
       message: t('copySuccess'),
-            type: 'success'
+      type: 'success',
     })
   }
 })
 
 defineExpose({
   showDialog,
-    show
+  show,
 })
 </script>
 

admin/src/addon/shop/views/goods/components/goods-stock-edit-popup.vue

@@ -1,44 +1,94 @@
 <template>
   <div>
-        <el-dialog v-model="showDialog" :title="t('editStockPopupTitle')" width="600px" :close-on-press-escape="false" :destroy-on-close="true" :close-on-click-modal="false">
-
+    <el-dialog
+      v-model="showDialog"
+      :title="t('editStockPopupTitle')"
+      width="600px"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+    >
       <div class="flex items-center mb-[10px]">
         <div class="min-w-[70px] h-[70px] flex items-center justify-center">
-                    <el-image v-if="goods.goods_cover_thumb_small" class="w-[70px] h-[70px]" :src="img(goods.goods_cover_thumb_small)" fit="contain">
+          <el-image
+            v-if="goods.goods_cover_thumb_small"
+            class="w-[70px] h-[70px]"
+            :src="img(goods.goods_cover_thumb_small)"
+            fit="contain"
+          >
             <template #error>
               <div class="image-slot">
-                                <img class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" />
+                <img
+                  class="w-[70px] h-[70px]"
+                  src="@/addon/shop/assets/goods_default.png"
+                />
               </div>
             </template>
           </el-image>
-                    <img v-else class="w-[70px] h-[70px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+          <img
+            v-else
+            class="w-[70px] h-[70px]"
+            src="@/addon/shop/assets/goods_default.png"
+            fit="contain"
+          />
         </div>
         <div class="ml-2">
-                    <span :title="goods.goods_name" class="multi-hidden">{{ goods.goods_name }}</span>
-                    <span class="text-primary text-[12px]">{{ goods.goods_type_name }}</span>
+          <span :title="goods.goods_name" class="multi-hidden">{{
+            goods.goods_name
+          }}</span>
+          <span class="text-primary text-[12px]">{{
+            goods.goods_type_name
+          }}</span>
         </div>
       </div>
 
       <!-- 批量设置 -->
-            <div class="batch-operation-sku" v-if="activeGoodsCount == 0 && goodsTable.data.length > 1">
+      <div
+        class="batch-operation-sku"
+        v-if="activeGoodsCount == 0 && goodsTable.data.length > 1"
+      >
         <label>{{ t('batchOperationSku') }}</label>
-                <el-input v-model.trim="batchOperation.value" clearable :placeholder="t('stock')" class="set-input" maxlength="8" :autofocus="true" />
-                <el-button type="primary" @click="saveBatch">{{ t('confirm') }}</el-button>
+        <el-input
+          v-model.trim="batchOperation.value"
+          clearable
+          :placeholder="t('stock')"
+          class="set-input"
+          maxlength="8"
+          :autofocus="true"
+        />
+        <el-button type="primary" @click="saveBatch">{{
+          t('confirm')
+        }}</el-button>
       </div>
 
-            <el-table :data="goodsTable.data" size="large" v-loading="goodsTable.loading" max-height="400">
+      <el-table
+        :data="goodsTable.data"
+        size="large"
+        v-loading="goodsTable.loading"
+        max-height="400"
+      >
         <template #empty>
           <span>{{ !goodsTable.loading ? t('emptyData') : '' }}</span>
         </template>
 
-                <el-table-column prop="sku_name" :label="t('skuName')" min-width="120" v-if="goodsTable.data.length > 1" />
+        <el-table-column
+          prop="sku_name"
+          :label="t('skuName')"
+          min-width="120"
+          v-if="goodsTable.data.length > 1"
+        />
         <el-table-column prop="price" :label="t('price')" min-width="120" />
         <el-table-column prop="stock" :label="t('stock')" min-width="120">
           <template #default="{ row }">
-                        <el-input v-model.trim="row.stock" clearable placeholder="0" maxlength="8" :disabled="activeGoodsCount > 0" />
+            <el-input
+              v-model.trim="row.stock"
+              clearable
+              placeholder="0"
+              maxlength="8"
+              :disabled="activeGoodsCount > 0"
+            />
           </template>
         </el-table-column>
-
       </el-table>
 
       <template #footer>
@@ -59,7 +109,7 @@ import { ElMessage } from 'element-plus'
 import {
   getActiveGoodsCount,
   getGoodsSkuList,
-    editGoodsListStock
+  editGoodsListStock,
 } from '@/addon/shop/api/goods'
 
 const goods: any = reactive({})
@@ -75,18 +125,18 @@ interface goodsTableType {
 }
 const goodsTable = reactive<goodsTableType>({
   loading: true,
-    data: []
+  data: [],
 })
 
 const batchOperation: any = reactive({
-    value: '' // 输入值
+  value: '', // 输入值
 })
 
 const saveBatch = () => {
   if (batchOperation.value.length == 0) {
     ElMessage({
       type: 'warning',
-            message: `${t('stockPlaceholder')}`
+      message: `${t('stockPlaceholder')}`,
     })
     return
   }
@@ -94,7 +144,7 @@ const saveBatch = () => {
   if (!regExp.number.test(batchOperation.value)) {
     ElMessage({
       type: 'warning',
-            message: `${t('stockTips')}`
+      message: `${t('stockTips')}`,
     })
     return
   }
@@ -102,7 +152,7 @@ const saveBatch = () => {
   if (batchOperation.value < 0) {
     ElMessage({
       type: 'warning',
-            message: `${t('stockNotZeroTips')}`
+      message: `${t('stockNotZeroTips')}`,
     })
     return
   }
@@ -119,11 +169,13 @@ const loadGoodsList = () => {
   goodsTable.loading = true
 
   getGoodsSkuList({
-        goods_id: goods.goods_id
-    }).then(res => {
+    goods_id: goods.goods_id,
+  })
+    .then((res) => {
       goodsTable.loading = false
       goodsTable.data = res.data
-    }).catch(() => {
+    })
+    .catch(() => {
       goodsTable.loading = false
     })
 }
@@ -135,17 +187,17 @@ const show = (data: any) => {
   showDialog.value = true
 }
 
-const getActiveGoodsCountFn = ()=>{
+const getActiveGoodsCountFn = () => {
   getActiveGoodsCount({
-        goods_id: goods.goods_id
-    }).then((res)=>{
-        activeGoodsCount.value = res.data;
+    goods_id: goods.goods_id,
+  }).then((res) => {
+    activeGoodsCount.value = res.data
   })
 }
 
 // 正则表达式
 const regExp: any = {
-    number: /^\d{0,10}$/
+  number: /^\d{0,10}$/,
 }
 
 const verify = () => {
@@ -157,14 +209,14 @@ const verify = () => {
       result = false
       ElMessage({
         type: 'warning',
-                message: `${t('stockPlaceholder')}`
+        message: `${t('stockPlaceholder')}`,
       })
       break
     } else if (isNaN(item.stock) || !regExp.number.test(item.stock)) {
       result = false
       ElMessage({
         type: 'warning',
-                message: `${t('stockTips')}`
+        message: `${t('stockTips')}`,
       })
       break
     } else if (item.stock < 0) {
@@ -186,13 +238,13 @@ const save = () => {
     goodsTable.data.forEach((item: any) => {
       sku_list.push({
         sku_id: item.sku_id,
-                stock: item.stock
+        stock: item.stock,
       })
     })
     editGoodsListStock({
       goods_id: goods.goods_id,
-            sku_list
-        }).then(res => {
+      sku_list,
+    }).then((res) => {
       emit('load')
       showDialog.value = false
     })
@@ -201,7 +253,7 @@ const save = () => {
 
 defineExpose({
   showDialog,
-    show
+  show,
 })
 </script>
 

admin/src/addon/shop/views/goods/components/label-edit.vue

@@ -1,12 +1,41 @@
 <template>
-    <el-dialog v-model="showDialog" :title="title" width="500px" class="diy-dialog-wrap" :destroy-on-close="true">
-        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+  <el-dialog
+    v-model="showDialog"
+    :title="title"
+    width="500px"
+    class="diy-dialog-wrap"
+    :destroy-on-close="true"
+  >
+    <el-form
+      :model="formData"
+      label-width="120px"
+      ref="formRef"
+      :rules="formRules"
+      class="page-form"
+      v-loading="loading"
+    >
       <el-form-item :label="t('labelName')" prop="label_name">
-                <el-input v-model.trim="formData.label_name" clearable :placeholder="t('labelNamePlaceholder')" class="input-width" maxlength="10" />
+        <el-input
+          v-model.trim="formData.label_name"
+          clearable
+          :placeholder="t('labelNamePlaceholder')"
+          class="input-width"
+          maxlength="10"
+        />
       </el-form-item>
       <el-form-item :label="t('groupName')" prop="group_id">
-                <el-select v-model="formData.group_id" :placeholder="t('groupNamePlaceholder')" clearable class="input-width">
-                    <el-option v-for="item in prop.groupList" :key="item.group_id" :label="item.group_name" :value="item.group_id" />
+        <el-select
+          v-model="formData.group_id"
+          :placeholder="t('groupNamePlaceholder')"
+          clearable
+          class="input-width"
+        >
+          <el-option
+            v-for="item in prop.groupList"
+            :key="item.group_id"
+            :label="item.group_name"
+            :value="item.group_id"
+          />
         </el-select>
       </el-form-item>
       <el-form-item :label="t('styleType')">
@@ -15,16 +44,34 @@
           <el-radio label="icon">{{ t('styleByIcon') }}</el-radio>
         </el-radio-group>
       </el-form-item>
-            <el-form-item :label="t('textColor')" v-show="formData.style_type == 'diy'">
-                <el-color-picker v-model="formData.color_json.text_color" show-alpha :predefine="predefineColors" />
+      <el-form-item
+        :label="t('textColor')"
+        v-show="formData.style_type == 'diy'"
+      >
+        <el-color-picker
+          v-model="formData.color_json.text_color"
+          show-alpha
+          :predefine="predefineColors"
+        />
         <div class="form-tip">{{ t('colorTips') }}</div>
       </el-form-item>
       <el-form-item :label="t('bgColor')" v-show="formData.style_type == 'diy'">
-                <el-color-picker v-model="formData.color_json.bg_color" show-alpha :predefine="predefineColors" />
+        <el-color-picker
+          v-model="formData.color_json.bg_color"
+          show-alpha
+          :predefine="predefineColors"
+        />
         <div class="form-tip">{{ t('colorTips') }}</div>
       </el-form-item>
-            <el-form-item :label="t('borderColor')" v-show="formData.style_type == 'diy'">
-                <el-color-picker v-model="formData.color_json.border_color" show-alpha :predefine="predefineColors" />
+      <el-form-item
+        :label="t('borderColor')"
+        v-show="formData.style_type == 'diy'"
+      >
+        <el-color-picker
+          v-model="formData.color_json.border_color"
+          show-alpha
+          :predefine="predefineColors"
+        />
         <div class="form-tip">{{ t('colorTips') }}</div>
       </el-form-item>
 
@@ -34,21 +81,46 @@
       </el-form-item>
 
       <el-form-item :label="t('status')">
-                <el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
+        <el-switch
+          v-model="formData.status"
+          :active-value="1"
+          :inactive-value="0"
+        />
       </el-form-item>
 
-            <el-form-item :label="t('memo')" >
-                <el-input v-model.trim="formData.memo" type="textarea" clearable :placeholder="t('memoPlaceholder')" class="input-width" maxlength="50"/>
+      <el-form-item :label="t('memo')">
+        <el-input
+          v-model.trim="formData.memo"
+          type="textarea"
+          clearable
+          :placeholder="t('memoPlaceholder')"
+          class="input-width"
+          maxlength="50"
+        />
       </el-form-item>
-            <el-form-item :label="t('sort')" >
-                <el-input v-model.trim="formData.sort" clearable :placeholder="t('sortPlaceholder')" class="input-width" @keyup="filterNumber($event)" maxlength="8" show-word-limit @blur="formData.sort = $event.target.value"/>
+      <el-form-item :label="t('sort')">
+        <el-input
+          v-model.trim="formData.sort"
+          clearable
+          :placeholder="t('sortPlaceholder')"
+          class="input-width"
+          @keyup="filterNumber($event)"
+          maxlength="8"
+          show-word-limit
+          @blur="formData.sort = $event.target.value"
+        />
       </el-form-item>
     </el-form>
 
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+        <el-button
+          type="primary"
+          :loading="loading"
+          @click="confirm(formRef)"
+          >{{ t('confirm') }}</el-button
+        >
       </span>
     </template>
   </el-dialog>
@@ -64,7 +136,7 @@ import { addLabel, editLabel, getLabelInfo } from '@/addon/shop/api/goods'
 const prop = defineProps({
   groupList: {
     type: Object,
-        default: []
+    default: [],
   },
 })
 
@@ -78,7 +150,7 @@ const title = ref('')
 const initialFormData = {
   label_id: '',
   label_name: '',
-    group_id:'',
+  group_id: '',
   style_type: 'diy',
   color_json: {
     text_color: 'rgba(255, 255, 255, 1)',
@@ -88,7 +160,7 @@ const initialFormData = {
   icon: '',
   memo: '',
   sort: '',
-    status: 1
+  status: 1,
 }
 
 const predefineColors = ref([
@@ -109,7 +181,7 @@ const predefineColors = ref([
   'rgb(255, 120, 0)',
   'hsl(181, 100%, 37%)',
   'hsla(209, 100%, 56%, 0.73)',
-    '#c7158577'
+  '#c7158577',
 ])
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
@@ -120,11 +192,11 @@ const formRef = ref<FormInstance>()
 const formRules = computed(() => {
   return {
     label_name: [
-            { required: true, message: t('labelNamePlaceholder'), trigger: 'blur' }
+      { required: true, message: t('labelNamePlaceholder'), trigger: 'blur' },
     ],
     group_id: [
-            { required: true, message: t('groupNamePlaceholder'), trigger: 'blur' }
-        ]
+      { required: true, message: t('groupNamePlaceholder'), trigger: 'blur' },
+    ],
   }
 })
 
@@ -144,11 +216,13 @@ const confirm = async (formEl: FormInstance | undefined) => {
 
       const data = formData
 
-            save(data).then(res => {
+      save(data)
+        .then((res) => {
           loading.value = false
           showDialog.value = false
           emit('complete')
-            }).catch(err => {
+        })
+        .catch((err) => {
           loading.value = false
         })
     }
@@ -175,13 +249,13 @@ const setFormData = async (row: any = null) => {
 
 defineExpose({
   showDialog,
-    setFormData
+  setFormData,
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label{
+.diy-dialog-wrap .el-form-item__label {
   height: auto !important;
 }
 </style>

admin/src/addon/shop/views/goods/components/label-group-edit.vue

@@ -1,18 +1,51 @@
 <template>
-    <el-dialog v-model="showDialog" :title="title" width="500px" class="diy-dialog-wrap" :destroy-on-close="true">
-        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+  <el-dialog
+    v-model="showDialog"
+    :title="title"
+    width="500px"
+    class="diy-dialog-wrap"
+    :destroy-on-close="true"
+  >
+    <el-form
+      :model="formData"
+      label-width="120px"
+      ref="formRef"
+      :rules="formRules"
+      class="page-form"
+      v-loading="loading"
+    >
       <el-form-item :label="t('groupName')" prop="group_name">
-                <el-input v-model.trim="formData.group_name" clearable :placeholder="t('groupNamePlaceholder')" class="input-width" maxlength="10" />
+        <el-input
+          v-model.trim="formData.group_name"
+          clearable
+          :placeholder="t('groupNamePlaceholder')"
+          class="input-width"
+          maxlength="10"
+        />
       </el-form-item>
-            <el-form-item :label="t('sort')" >
-                <el-input v-model.trim="formData.sort" clearable :placeholder="t('sortPlaceholder')" class="input-width" @keyup="filterNumber($event)" maxlength="8" show-word-limit @blur="formData.sort = $event.target.value"/>
+      <el-form-item :label="t('sort')">
+        <el-input
+          v-model.trim="formData.sort"
+          clearable
+          :placeholder="t('sortPlaceholder')"
+          class="input-width"
+          @keyup="filterNumber($event)"
+          maxlength="8"
+          show-word-limit
+          @blur="formData.sort = $event.target.value"
+        />
       </el-form-item>
     </el-form>
 
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+        <el-button
+          type="primary"
+          :loading="loading"
+          @click="confirm(formRef)"
+          >{{ t('confirm') }}</el-button
+        >
       </span>
     </template>
   </el-dialog>
@@ -23,7 +56,11 @@ import { ref, reactive, computed } from 'vue'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
 import { filterNumber } from '@/utils/common'
-import { addLabelGroup, editLabelGroup, getLabelGroupInfo } from '@/addon/shop/api/goods'
+import {
+  addLabelGroup,
+  editLabelGroup,
+  getLabelGroupInfo,
+} from '@/addon/shop/api/goods'
 
 const showDialog = ref(false)
 const loading = ref(false)
@@ -35,7 +72,7 @@ const title = ref('')
 const initialFormData = {
   group_id: '',
   group_name: '',
-    sort: ''
+  sort: '',
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -45,8 +82,8 @@ const formRef = ref<FormInstance>()
 const formRules = computed(() => {
   return {
     group_name: [
-            { required: true, message: t('groupNamePlaceholder'), trigger: 'blur' }
-        ]
+      { required: true, message: t('groupNamePlaceholder'), trigger: 'blur' },
+    ],
   }
 })
 
@@ -66,11 +103,13 @@ const confirm = async (formEl: FormInstance | undefined) => {
 
       const data = formData
 
-            save(data).then(res => {
+      save(data)
+        .then((res) => {
           loading.value = false
           showDialog.value = false
           emit('complete')
-            }).catch(err => {
+        })
+        .catch((err) => {
           loading.value = false
         })
     }
@@ -97,13 +136,13 @@ const setFormData = async (row: any = null) => {
 
 defineExpose({
   showDialog,
-    setFormData
+  setFormData,
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label{
+.diy-dialog-wrap .el-form-item__label {
   height: auto !important;
 }
 </style>

admin/src/addon/shop/views/goods/components/service-edit.vue

@@ -1,21 +1,55 @@
 <template>
-    <el-dialog v-model="showDialog" :title="title" width="500px" class="diy-dialog-wrap" :destroy-on-close="true">
-        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+  <el-dialog
+    v-model="showDialog"
+    :title="title"
+    width="500px"
+    class="diy-dialog-wrap"
+    :destroy-on-close="true"
+  >
+    <el-form
+      :model="formData"
+      label-width="120px"
+      ref="formRef"
+      :rules="formRules"
+      class="page-form"
+      v-loading="loading"
+    >
       <el-form-item :label="t('serviceName')" prop="service_name">
-                <el-input v-model.trim="formData.service_name" show-word-limit clearable :placeholder="t('serviceNamePlaceholder')" :maxlength="20" class="input-width" />
+        <el-input
+          v-model.trim="formData.service_name"
+          show-word-limit
+          clearable
+          :placeholder="t('serviceNamePlaceholder')"
+          :maxlength="20"
+          class="input-width"
+        />
       </el-form-item>
       <el-form-item :label="t('image')">
         <upload-image v-model="formData.image" />
       </el-form-item>
-            <el-form-item :label="t('desc')" >
-                <el-input v-model.trim="formData.desc" type="textarea" rows="5" show-word-limit clearable :placeholder="t('descPlaceholder')" :maxlength="200" class="input-width"/>
+      <el-form-item :label="t('desc')">
+        <el-input
+          v-model.trim="formData.desc"
+          type="textarea"
+          rows="5"
+          show-word-limit
+          clearable
+          :placeholder="t('descPlaceholder')"
+          :maxlength="200"
+          class="input-width"
+        />
       </el-form-item>
     </el-form>
 
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+        <el-button
+          type="primary"
+          :loading="loading"
+          @click="confirm(formRef)"
+          >{{ t('confirm') }}</el-button
+        >
       </span>
     </template>
   </el-dialog>
@@ -38,7 +72,7 @@ const initialFormData = {
   service_id: '',
   service_name: '',
   image: '',
-    desc: ''
+  desc: '',
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
@@ -48,8 +82,8 @@ const formRef = ref<FormInstance>()
 const formRules = computed(() => {
   return {
     service_name: [
-            { required: true, message: t('serviceNamePlaceholder'), trigger: 'blur' }
-        ]
+      { required: true, message: t('serviceNamePlaceholder'), trigger: 'blur' },
+    ],
   }
 })
 
@@ -69,11 +103,13 @@ const confirm = async (formEl: FormInstance | undefined) => {
 
       const data = formData
 
-            save(data).then(res => {
+      save(data)
+        .then((res) => {
           loading.value = false
           showDialog.value = false
           emit('complete')
-            }).catch(() => {
+        })
+        .catch(() => {
           loading.value = false
         })
     }
@@ -100,13 +136,13 @@ const setFormData = async (row: any = null) => {
 
 defineExpose({
   showDialog,
-    setFormData
+  setFormData,
 })
 </script>
 
 <style lang="scss" scoped></style>
 <style lang="scss">
-.diy-dialog-wrap .el-form-item__label{
+.diy-dialog-wrap .el-form-item__label {
   height: auto !important;
 }
 </style>

admin/src/addon/shop/views/goods/evaluate.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="main-container">
     <el-card class="box-card !border-none" shadow="never">
-
       <div class="flex justify-between items-center">
         <span class="text-page-title">{{ pageName }}</span>
         <el-button type="primary" @click="addEvent">
@@ -9,20 +8,40 @@
         </el-button>
       </div>
 
-            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-                <el-form :inline="true" :model="evaluateTable.searchParam" ref="searchFormRef">
+      <el-card
+        class="box-card !border-none my-[10px] table-search-wrap"
+        shadow="never"
+      >
+        <el-form
+          :inline="true"
+          :model="evaluateTable.searchParam"
+          ref="searchFormRef"
+        >
           <el-form-item :label="t('goodsName')" prop="goods_name">
-                        <el-input v-model.trim="evaluateTable.searchParam.goods_name" :placeholder="t('goodsNamePlaceholder')" class="input-width" maxlength="60" />
+            <el-input
+              v-model.trim="evaluateTable.searchParam.goods_name"
+              :placeholder="t('goodsNamePlaceholder')"
+              class="input-width"
+              maxlength="60"
+            />
           </el-form-item>
           <el-form-item>
-                        <el-button type="primary" @click="loadEvaluateList()">{{ t('search') }}</el-button>
-                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+            <el-button type="primary" @click="loadEvaluateList()">{{
+              t('search')
+            }}</el-button>
+            <el-button @click="resetForm(searchFormRef)">{{
+              t('reset')
+            }}</el-button>
           </el-form-item>
         </el-form>
       </el-card>
 
       <div class="mt-[10px]">
-                <el-table :data="evaluateTable.data" size="large" v-loading="evaluateTable.loading">
+        <el-table
+          :data="evaluateTable.data"
+          size="large"
+          v-loading="evaluateTable.loading"
+        >
           <template #empty>
             <span>{{ !evaluateTable.loading ? t('emptyData') : '' }}</span>
           </template>
@@ -30,15 +49,28 @@
             <template #default="{ row }">
               <div class="flex cursor-pointer">
                 <div class="flex items-center min-w-[50px] mr-[10px]">
-                                    <el-image v-if="row.goods.goods_cover_thumb_small" class="w-[50px] h-[50px]" :src="img(row.goods.goods_cover_thumb_small)" fit="contain">
+                  <el-image
+                    v-if="row.goods.goods_cover_thumb_small"
+                    class="w-[50px] h-[50px]"
+                    :src="img(row.goods.goods_cover_thumb_small)"
+                    fit="contain"
+                  >
                     <template #error>
                       <div class="image-slot">
-                                                <img class="w-[50px] h-[50px]" src="@/addon/shop/assets/goods_default.png" />
+                        <img
+                          class="w-[50px] h-[50px]"
+                          src="@/addon/shop/assets/goods_default.png"
+                        />
                       </div>
                     </template>
                   </el-image>
 
-                                    <img v-else class="w-[50px] h-[50px]" src="@/addon/shop/assets/goods_default.png" fit="contain" />
+                  <img
+                    v-else
+                    class="w-[50px] h-[50px]"
+                    src="@/addon/shop/assets/goods_default.png"
+                    fit="contain"
+                  />
                 </div>
                 <div class="flex">
                   <p class="multi-hidden">{{ row.goods.goods_name }}</p>
@@ -50,19 +82,45 @@
             <template #default="{ row }">
               <div>
                 <p class="text-[14px]">{{ row.content }}</p>
-                                <div class="flex flex-wrap mt-[10px]" v-if="row.images?.length > 0">
-                                    <div v-for="(imageItem, imageIndex) in row.images" :key="imageIndex" class="mr-4">
-                                        <el-image v-if="imageItem" class="w-[40px] h-[40px]" :src="img(imageItem)" fit="contain" :preview-src-list="[img(imageItem)]" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2">
+                <div
+                  class="flex flex-wrap mt-[10px]"
+                  v-if="row.images?.length > 0"
+                >
+                  <div
+                    v-for="(imageItem, imageIndex) in row.images"
+                    :key="imageIndex"
+                    class="mr-4"
+                  >
+                    <el-image
+                      v-if="imageItem"
+                      class="w-[40px] h-[40px]"
+                      :src="img(imageItem)"
+                      fit="contain"
+                      :preview-src-list="[img(imageItem)]"
+                      :zoom-rate="1.2"
+                      :max-scale="7"
+                      :min-scale="0.2"
+                    >
                       <template #error>
                         <div class="image-slot">
-                                                    <img class="w-[40px] h-[40px]" src="@/addon/shop/assets/goods_default.png" />
+                          <img
+                            class="w-[40px] h-[40px]"
+                            src="@/addon/shop/assets/goods_default.png"
+                          />
                         </div>
                       </template>
                     </el-image>
-                                        <img v-else class="w-[40px] h-[40px]" src="@/addon/shop/assets/goods_default.png" />
+                    <img
+                      v-else
+                      class="w-[40px] h-[40px]"
+                      src="@/addon/shop/assets/goods_default.png"
+                    />
                   </div>
                 </div>
-                                <p class="mt-[15px] text-[14px]" v-if="row.explain_first"><span class="text-[#ff7f5b]">{{ t('explainFirst') }}：</span>{{ row.explain_first }}</p>
+                <p class="mt-[15px] text-[14px]" v-if="row.explain_first">
+                  <span class="text-[#ff7f5b]">{{ t('explainFirst') }}：</span
+                  >{{ row.explain_first }}
+                </p>
               </div>
             </template>
           </el-table-column>
@@ -71,43 +129,119 @@
               <el-rate v-model="row.scores" disabled />
             </template>
           </el-table-column>
-                    <el-table-column prop="audit_name" :label="t('auditName')" min-width="80" />
-                    <el-table-column prop="create_time" :label="t('createTime')" min-width="120" />
-                    <el-table-column :label="t('operation')" fixed="right" min-width="100" align="right">
+          <el-table-column
+            prop="audit_name"
+            :label="t('auditName')"
+            min-width="80"
+          />
+          <el-table-column
+            prop="create_time"
+            :label="t('createTime')"
+            min-width="120"
+          />
+          <el-table-column
+            :label="t('operation')"
+            fixed="right"
+            min-width="100"
+            align="right"
+          >
             <template #default="{ row }">
               <div>
-                                <el-button type="primary" link @click="adoptEvent(row.evaluate_id)" v-if="row.is_audit == 1">{{ t('adopt') }}</el-button>
-                                <el-button type="primary" link @click="refuseEvent(row.evaluate_id)" v-if="row.is_audit == 1">{{ t('refuse') }}</el-button>
-                                <el-button type="primary" link @click="replyEvent(row.evaluate_id)" v-if="row.explain_first == ''">{{ t('reply') }}</el-button>
-                                <el-button type="primary" link @click="deleteEvent(row.evaluate_id)">{{ t('delete') }}</el-button>
-                                <el-button type="primary" link @click="toppingEvent(row.evaluate_id, 'topping')" v-if="row.is_audit == 2 && row.topping == 0">{{ t('topping') }}</el-button>
-                                <el-button type="primary" link @click="toppingEvent(row.evaluate_id, 'cancel_topping')" v-if="row.topping == 1">{{ t('cancelTopping') }}</el-button>
+                <el-button
+                  type="primary"
+                  link
+                  @click="adoptEvent(row.evaluate_id)"
+                  v-if="row.is_audit == 1"
+                  >{{ t('adopt') }}</el-button
+                >
+                <el-button
+                  type="primary"
+                  link
+                  @click="refuseEvent(row.evaluate_id)"
+                  v-if="row.is_audit == 1"
+                  >{{ t('refuse') }}</el-button
+                >
+                <el-button
+                  type="primary"
+                  link
+                  @click="replyEvent(row.evaluate_id)"
+                  v-if="row.explain_first == ''"
+                  >{{ t('reply') }}</el-button
+                >
+                <el-button
+                  type="primary"
+                  link
+                  @click="deleteEvent(row.evaluate_id)"
+                  >{{ t('delete') }}</el-button
+                >
+                <el-button
+                  type="primary"
+                  link
+                  @click="toppingEvent(row.evaluate_id, 'topping')"
+                  v-if="row.is_audit == 2 && row.topping == 0"
+                  >{{ t('topping') }}</el-button
+                >
+                <el-button
+                  type="primary"
+                  link
+                  @click="toppingEvent(row.evaluate_id, 'cancel_topping')"
+                  v-if="row.topping == 1"
+                  >{{ t('cancelTopping') }}</el-button
+                >
               </div>
             </template>
           </el-table-column>
-
         </el-table>
         <div class="mt-[16px] flex justify-end">
-                    <el-pagination v-model:current-page="evaluateTable.page" v-model:page-size="evaluateTable.limit"
-                        layout="total, sizes, prev, pager, next, jumper" :total="evaluateTable.total"
-                        @size-change="loadEvaluateList()" @current-change="loadEvaluateList" />
+          <el-pagination
+            v-model:current-page="evaluateTable.page"
+            v-model:page-size="evaluateTable.limit"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="evaluateTable.total"
+            @size-change="loadEvaluateList()"
+            @current-change="loadEvaluateList"
+          />
         </div>
       </div>
     </el-card>
 
     <evaluate-add ref="editEvaluateDialog" @complete="loadEvaluateList" />
 
-        <el-dialog v-model="replyShowDialog" :title="t('explainFirst')" width="460px" class="diy-dialog-wrap" :destroy-on-close="true">
-            <el-form :model="formData" label-width="90px" ref="formRef" :rules="formRules" class="page-form">
+    <el-dialog
+      v-model="replyShowDialog"
+      :title="t('explainFirst')"
+      width="460px"
+      class="diy-dialog-wrap"
+      :destroy-on-close="true"
+    >
+      <el-form
+        :model="formData"
+        label-width="90px"
+        ref="formRef"
+        :rules="formRules"
+        class="page-form"
+      >
         <el-form-item :label="t('explainFirst')" prop="explain_first">
-                    <el-input v-model.trim="formData.explain_first" type="textarea" rows="4" clearable
-                        :placeholder="t('explainFirstPlaceholder')" class="input-width" maxlength="200" show-word-limit />
+          <el-input
+            v-model.trim="formData.explain_first"
+            type="textarea"
+            rows="4"
+            clearable
+            :placeholder="t('explainFirstPlaceholder')"
+            class="input-width"
+            maxlength="200"
+            show-word-limit
+          />
         </el-form-item>
       </el-form>
       <template #footer>
         <span class="dialog-footer">
-                    <el-button @click="replyShowDialog = false">{{ t('cancel') }}</el-button>
-                    <el-button type="primary" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+          <el-button @click="replyShowDialog = false">{{
+            t('cancel')
+          }}</el-button>
+          <el-button type="primary" @click="confirm(formRef)">{{
+            t('confirm')
+          }}</el-button>
         </span>
       </template>
     </el-dialog>
@@ -117,7 +251,15 @@
 <script lang="ts" setup>
 import { reactive, ref, computed } from 'vue'
 import { t } from '@/lang'
-import { getEvaluateList, deleteEvaluate, adoptEvaluate, refuseEvaluate, replyEvaluate, toppingEvaluate, cancelToppingEvaluate } from '@/addon/shop/api/goods'
+import {
+  getEvaluateList,
+  deleteEvaluate,
+  adoptEvaluate,
+  refuseEvaluate,
+  replyEvaluate,
+  toppingEvaluate,
+  cancelToppingEvaluate,
+} from '@/addon/shop/api/goods'
 import EvaluateAdd from '@/addon/shop/views/goods/components/evaluate-add.vue'
 import { img } from '@/utils/common'
 import { ElMessageBox, FormInstance } from 'element-plus'
@@ -133,8 +275,8 @@ const evaluateTable = reactive({
   loading: true,
   data: [],
   searchParam: {
-        goods_name: ''
-    }
+    goods_name: '',
+  },
 })
 
 const searchFormRef = ref<FormInstance>()
@@ -149,18 +291,20 @@ const loadEvaluateList = (page: number = 1) => {
   getEvaluateList({
     page: evaluateTable.page,
     limit: evaluateTable.limit,
-        ...evaluateTable.searchParam
-    }).then(res => {
+    ...evaluateTable.searchParam,
+  })
+    .then((res) => {
       evaluateTable.loading = false
       evaluateTable.data = res.data.data
       evaluateTable.total = res.data.total
-        evaluateTable.data.map((item: any)=> {
-            item.previewList = item.images.map((el:any)=> {
+      evaluateTable.data.map((item: any) => {
+        item.previewList = item.images.map((el: any) => {
           return img(el)
         })
         return item
       })
-    }).catch(() => {
+    })
+    .catch(() => {
       evaluateTable.loading = false
     })
 }
@@ -179,33 +323,31 @@ const addEvent = () => {
  * 删除商品评价
  */
 const deleteEvent = (id: number) => {
-    ElMessageBox.confirm(t('evaluateDeleteTips'), t('warning'),
-        {
+  ElMessageBox.confirm(t('evaluateDeleteTips'), t('warning'), {
     confirmButtonText: t('confirm'),
     cancelButtonText: t('cancel'),
-            type: 'warning'
-        }
-    ).then(() => {
-        deleteEvaluate(id).then(() => {
+    type: 'warning',
+  }).then(() => {
+    deleteEvaluate(id)
+      .then(() => {
         loadEvaluateList()
-        }).catch(() => {
       })
+      .catch(() => {})
   })
 }
 
 // 审核通过
 const adoptEvent = (id: number) => {
-    ElMessageBox.confirm(t('auditAdoptTips'), t('warning'),
-        {
+  ElMessageBox.confirm(t('auditAdoptTips'), t('warning'), {
     confirmButtonText: t('confirm'),
     cancelButtonText: t('cancel'),
-            type: 'warning'
-        }
-    ).then(() => {
-        adoptEvaluate(id).then(() => {
+    type: 'warning',
+  }).then(() => {
+    adoptEvaluate(id)
+      .then(() => {
         loadEvaluateList()
-        }).catch(() => {
       })
+      .catch(() => {})
   })
 }
 
@@ -217,7 +359,7 @@ const refuseEvent = (id: number) => {
 }
 
 // 置顶、取消置顶
-const toppingEvent = (id: number, event:string) => {
+const toppingEvent = (id: number, event: string) => {
   if (event == 'topping') {
     toppingEvaluate(id).then(() => {
       loadEvaluateList()
@@ -233,7 +375,7 @@ const toppingEvent = (id: number, event:string) => {
 const replyShowDialog = ref(false)
 const initialFormData = {
   evaluate_id: 0,
-    explain_first: ''
+  explain_first: '',
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
 const formRef = ref<FormInstance>()
@@ -245,8 +387,12 @@ const replyEvent = (id: number) => {
 const formRules = computed(() => {
   return {
     explain_first: [
-            { required: true, message: t('explainFirstPlaceholder'), trigger: 'blur' }
-        ]
+      {
+        required: true,
+        message: t('explainFirstPlaceholder'),
+        trigger: 'blur',
+      },
+    ],
   }
 })
 const confirm = async (formEl: FormInstance | undefined) => {
@@ -254,10 +400,12 @@ const confirm = async (formEl: FormInstance | undefined) => {
   await formEl.validate(async (valid) => {
     if (valid) {
       const data = formData
-            replyEvaluate(data).then(res => {
+      replyEvaluate(data)
+        .then((res) => {
           loadEvaluateList()
           replyShowDialog.value = false
-            }).catch(err => {
+        })
+        .catch((err) => {
           replyShowDialog.value = false
         })
     }
@@ -280,4 +428,5 @@ const resetForm = (formEl: FormInstance | undefined) => {
   display: -webkit-box;
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
-}</style>
+}
+</style>