From e08cc9bb4e684aca2a56dc1b75ada46ef8d24844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
<153298343@qq.com>
Date: Mon, 17 Oct 2022 17:22:12 +0800
Subject: [PATCH] up
---
src/api/productService/commonService.js | 59 ++
.../productService/commonServiceProduct.js | 58 ++
src/components/XyTable/index.vue | 524 ++++++-----
src/layout/components/Sidebar/Item.vue | 2 +-
src/styles/iconfont.css | 812 +++++++++++++-----
src/views/business/merchantManage.vue | 7 +-
src/views/productService/commonService.vue | 168 ++++
.../productService/commonServiceProduct.vue | 8 +
.../components/common/addCommonService.vue | 676 +++++++++++++++
.../common/addCommonServiceProduct.vue | 8 +
src/views/productService/index.html | 14 +
11 files changed, 1886 insertions(+), 450 deletions(-)
create mode 100644 src/api/productService/commonService.js
create mode 100644 src/api/productService/commonServiceProduct.js
create mode 100644 src/views/productService/commonService.vue
create mode 100644 src/views/productService/commonServiceProduct.vue
create mode 100644 src/views/productService/components/common/addCommonService.vue
create mode 100644 src/views/productService/components/common/addCommonServiceProduct.vue
create mode 100644 src/views/productService/index.html
diff --git a/src/api/productService/commonService.js b/src/api/productService/commonService.js
new file mode 100644
index 0000000..5bbfac1
--- /dev/null
+++ b/src/api/productService/commonService.js
@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+
+export function index(params,isLoading=true){
+ return request({
+ isLoading,
+ method:'get',
+ url:'/api/admin/common-service/index',
+ params
+ })
+}
+
+export function show(params){
+ return request({
+ method:'get',
+ url:'/api/admin/common-service/show',
+ params
+ })
+}
+
+export function store(data){
+ return request({
+ method:'post',
+ url:'/api/admin/common-service/store',
+ data
+ })
+}
+
+export function save(data){
+ return request({
+ method:'post',
+ url:'/api/admin/common-service/save',
+ data
+ })
+}
+
+export function destroy(data){
+ return request({
+ method:'post',
+ url:'/api/admin/common-service/destroy',
+ data
+ })
+}
+
+
+export function getMerchantItems(params){
+ return request({
+ method:'get',
+ url:'/api/admin/common-service/get-merchant-items',
+ params
+ })
+}
+
+export function getPicture(params){
+ return request({
+ method:'get',
+ url:'/api/admin/common-service/get-picture',
+ params
+ })
+}
diff --git a/src/api/productService/commonServiceProduct.js b/src/api/productService/commonServiceProduct.js
new file mode 100644
index 0000000..8cdd860
--- /dev/null
+++ b/src/api/productService/commonServiceProduct.js
@@ -0,0 +1,58 @@
+import request from '@/utils/request'
+
+export function index(params){
+ return request({
+ method:'get',
+ url:'/api/admin/common-product/index',
+ params
+ })
+}
+
+export function show(params){
+ return request({
+ method:'get',
+ url:'/api/admin/common-product/show',
+ params
+ })
+}
+
+export function store(data){
+ return request({
+ method:'post',
+ url:'/api/admin/common-product/store',
+ data
+ })
+}
+
+export function save(data){
+ return request({
+ method:'post',
+ url:'/api/admin/common-product/save',
+ data
+ })
+}
+
+export function destroy(data){
+ return request({
+ method:'post',
+ url:'/api/admin/common-product/destroy',
+ data
+ })
+}
+
+export function getPicture(params){
+ return request({
+ method:'get',
+ url:'/api/admin/common-product/get-picture',
+ params
+ })
+}
+
+export function getCombo(params){
+ return request({
+ method:'get',
+ url:'/api/admin/common-product/get-combo',
+ params
+ })
+}
+
diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index 42a165d..08ace0f 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -1,90 +1,106 @@
-
diff --git a/src/views/productService/commonServiceProduct.vue b/src/views/productService/commonServiceProduct.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/src/views/productService/commonServiceProduct.vue
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/productService/components/common/addCommonService.vue b/src/views/productService/components/common/addCommonService.vue
new file mode 100644
index 0000000..3d7bbfa
--- /dev/null
+++ b/src/views/productService/components/common/addCommonService.vue
@@ -0,0 +1,676 @@
+
+
+
+