From 611af1651456591d18dc646999e5d2a16a8c6710 Mon Sep 17 00:00:00 2001 From: xh-pan1 Date: Fri, 19 Apr 2024 13:14:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=92=E5=8A=A8=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 + canvas-container/components/canvasEditPage.vue | 6 +- .../components/canvasShow/config/api.js | 1 + canvas-container/components/leftBar/panel.vue | 1 + .../toolModule/interactiondiagram-select.vue | 160 ++++ .../toolBar/toolModule/tool-select-link.vue | 36 +- src/api/image.js | 49 ++ src/assets/images/point_enter.png | Bin 0 -> 6529 bytes src/assets/images/point_source.png | Bin 0 -> 8611 bytes src/components/Product/product-select.vue | 191 +++++ src/utils/request.js | 6 +- src/views/marketing/compose/add.vue | 1 - src/views/marketing/price/add.vue | 1 - .../resource/interactiondiagram/detail copy.vue | 271 ++++++ src/views/resource/interactiondiagram/detail.vue | 936 +++++++++++++++++++++ src/views/resource/interactiondiagram/index.vue | 190 +++++ 16 files changed, 1845 insertions(+), 6 deletions(-) create mode 100644 canvas-container/components/toolBar/toolModule/interactiondiagram-select.vue create mode 100644 src/api/image.js create mode 100644 src/assets/images/point_enter.png create mode 100644 src/assets/images/point_source.png create mode 100644 src/components/Product/product-select.vue create mode 100644 src/views/resource/interactiondiagram/detail copy.vue create mode 100644 src/views/resource/interactiondiagram/detail.vue create mode 100644 src/views/resource/interactiondiagram/index.vue diff --git a/.env.development b/.env.development index 906a8be..b7bf7dc 100644 --- a/.env.development +++ b/.env.development @@ -12,3 +12,5 @@ VUE_APP_BASE_API = '/dev-api' VUE_APP_DOMAIN_PREFIX = 'http://localhost:9004' +# VUE_APP_DOMAIN_PREFIX = 'http://122.9.152.120/ceres-business-api' + diff --git a/canvas-container/components/canvasEditPage.vue b/canvas-container/components/canvasEditPage.vue index 306e08f..2c56487 100644 --- a/canvas-container/components/canvasEditPage.vue +++ b/canvas-container/components/canvasEditPage.vue @@ -9,8 +9,10 @@ @change="pageChange" filter=".undraggable" > -
- +
+

暂无数据
请在右边窗口编辑内容

diff --git a/canvas-container/components/canvasShow/config/api.js b/canvas-container/components/canvasShow/config/api.js index e81409a..c97c2eb 100644 --- a/canvas-container/components/canvasShow/config/api.js +++ b/canvas-container/components/canvasShow/config/api.js @@ -10,6 +10,7 @@ export const api = { getClassify: BASEURL + '/canvas/getClassify', // 查询分类层级 getProductGroup: BASEURL + '/canvas/getProductGroup', // 查询分类层级 getProducts: BASEURL + '/canvas/getProducts', // 选择商品查询 + getInteractionDiagrams: BASEURL + '/canvas/getInteractionDiagrams', // 选择互动图查询 saveCanvas: BASEURL + '/canvas/saveCanvas', // 保存画布 getCanvas: BASEURL + '/canvas/getCanvas', // 读取画布 getShops: BASEURL + '/canvas/getShops', // 选择店铺查询 diff --git a/canvas-container/components/leftBar/panel.vue b/canvas-container/components/leftBar/panel.vue index 29c2a67..44b6eed 100644 --- a/canvas-container/components/leftBar/panel.vue +++ b/canvas-container/components/leftBar/panel.vue @@ -18,6 +18,7 @@ :list="item.classList" :clone="cloneItem" :group="{ name: 'pageEdit', pull: 'clone', put: false }" + :options="{sort:false}" >
diff --git a/canvas-container/components/toolBar/toolModule/interactiondiagram-select.vue b/canvas-container/components/toolBar/toolModule/interactiondiagram-select.vue new file mode 100644 index 0000000..6f256e9 --- /dev/null +++ b/canvas-container/components/toolBar/toolModule/interactiondiagram-select.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/canvas-container/components/toolBar/toolModule/tool-select-link.vue b/canvas-container/components/toolBar/toolModule/tool-select-link.vue index f3acdfc..2802969 100644 --- a/canvas-container/components/toolBar/toolModule/tool-select-link.vue +++ b/canvas-container/components/toolBar/toolModule/tool-select-link.vue @@ -38,6 +38,13 @@ {{ $t('common.sure') }} + + + + {{ $t('common.cancel') }} + {{ $t('common.sure') }} + + @@ -64,13 +71,14 @@ + + diff --git a/src/utils/request.js b/src/utils/request.js index 208fc9a..4f90929 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -30,6 +30,10 @@ export const QYuploadUrl = `${baseURL}/file/uploadQyMedia` // 微信客服上传 // request interceptor service.interceptors.request.use( config => { + // config.paramsSerializer = function(params) { + // let result = qs.stringify(params, { arrayFormat: 'repeat' }) + // return result + // } if (store.getters.token) { config.headers['Authorization-business'] = getToken() config.headers['businessId'] = getBusinessId() @@ -59,7 +63,7 @@ service.interceptors.response.use( if (response.config.responseType === 'blob') { return response.data } - if (res.code !== '') { + if (res.code !== '' && res.code !== '200') { Message({ message: res.message || 'Error', type: 'error', diff --git a/src/views/marketing/compose/add.vue b/src/views/marketing/compose/add.vue index 1af22a1..e3742d4 100644 --- a/src/views/marketing/compose/add.vue +++ b/src/views/marketing/compose/add.vue @@ -251,7 +251,6 @@ + + diff --git a/src/views/resource/interactiondiagram/detail.vue b/src/views/resource/interactiondiagram/detail.vue new file mode 100644 index 0000000..37f2eda --- /dev/null +++ b/src/views/resource/interactiondiagram/detail.vue @@ -0,0 +1,936 @@ + + + diff --git a/src/views/resource/interactiondiagram/index.vue b/src/views/resource/interactiondiagram/index.vue new file mode 100644 index 0000000..57f89e1 --- /dev/null +++ b/src/views/resource/interactiondiagram/index.vue @@ -0,0 +1,190 @@ + + + + +