From 52e1ccdaf3eee79ead8f494018f5eecf7a0acc19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AE=87?= <2020377497@qq.com> Date: Thu, 28 Dec 2023 18:08:17 +0800 Subject: [PATCH 1/3] upda --- App.vue | 4 +- api/store/goods.js | 31 + components/kevy-loading/kevy-loading.vue | 1390 ++++++++++++++++++++++ components/myList/index.vue | 90 ++ components/myTable/index.vue | 66 +- pages.json | 1 + pages/index/index.vue | 14 +- pages/login/index.vue | 13 +- store/goods/index copy.vue | 149 +++ store/goods/index.vue | 203 +++- store/index/index.vue | 4 +- store/order/index.vue | 4 +- 12 files changed, 1949 insertions(+), 20 deletions(-) create mode 100644 api/store/goods.js create mode 100644 components/kevy-loading/kevy-loading.vue create mode 100644 components/myList/index.vue create mode 100644 store/goods/index copy.vue diff --git a/App.vue b/App.vue index d714685..69e3c87 100644 --- a/App.vue +++ b/App.vue @@ -18,6 +18,8 @@ export default { @import "tailwindcss/utilities"; page { - min-height: 100vh; + // min-height: calc(100vh - 44px); + min-height: calc(100vh); + background-color: rgb(247 248 250); } diff --git a/api/store/goods.js b/api/store/goods.js new file mode 100644 index 0000000..68a85fe --- /dev/null +++ b/api/store/goods.js @@ -0,0 +1,31 @@ +import { + request +} from "@/utils/request"; + +export default { + list(data) { + return request({ + url: "/admin/goods/goodsList", + method: "POST", + data, + }); + }, + + goodsEditAttribute(data) { + return request({ + url: "/admin/goods/goodsEditAttribute", + method: "POST", + data, + }); + }, + + classify: { + list(data) { + return request({ + url: "/admin/classify/list", + method: "POST", + data, + }); + }, + } +}; \ No newline at end of file diff --git a/components/kevy-loading/kevy-loading.vue b/components/kevy-loading/kevy-loading.vue new file mode 100644 index 0000000..9b6d1b4 --- /dev/null +++ b/components/kevy-loading/kevy-loading.vue @@ -0,0 +1,1390 @@ + + + + + \ No newline at end of file diff --git a/components/myList/index.vue b/components/myList/index.vue new file mode 100644 index 0000000..4b105a0 --- /dev/null +++ b/components/myList/index.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/components/myTable/index.vue b/components/myTable/index.vue index e724777..1db9646 100644 --- a/components/myTable/index.vue +++ b/components/myTable/index.vue @@ -1,26 +1,82 @@ diff --git a/pages.json b/pages.json index 1204b32..6c72520 100644 --- a/pages.json +++ b/pages.json @@ -60,6 +60,7 @@ "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", "navigationBarBackgroundColor": "#F8F8F8", + "navigationStyle": "custom", "backgroundColor": "#F8F8F8" }, "uniIdRouter": {} diff --git a/pages/index/index.vue b/pages/index/index.vue index 510e7ce..5b9f442 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -10,10 +10,18 @@ diff --git a/store/goods/index.vue b/store/goods/index.vue index 8dcc06b..51a716a 100644 --- a/store/goods/index.vue +++ b/store/goods/index.vue @@ -1,11 +1,208 @@ - + diff --git a/store/index/index.vue b/store/index/index.vue index 7deed65..ae82ba3 100644 --- a/store/index/index.vue +++ b/store/index/index.vue @@ -1,11 +1,11 @@ @@ -66,6 +70,12 @@ const upData = async (upParams = {}) => { ...upParams }) + console.log({ + ...query.value, + ...props.params, + ...upParams + }); + query.value.pageSize = res.data.pageSize total.value = res.data.total list.value = res.data.rows diff --git a/pages.json b/pages.json index 6c72520..f1d409e 100644 --- a/pages.json +++ b/pages.json @@ -41,6 +41,18 @@ } } }, + { + "path": "goods/edit", + "style": { + "navigationBarTitleText": "修改商品", + "enablePullDownRefresh": false, + "mp-alipay": { + "transparentTitle": "always", + "titlePenetrate": "YES", + "gestureBack": "YES" + } + } + }, { "path": "order/index", "style": { diff --git a/store/goods/edit.vue b/store/goods/edit.vue new file mode 100644 index 0000000..bea6289 --- /dev/null +++ b/store/goods/edit.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/store/goods/index copy.vue b/store/goods/index copy.vue deleted file mode 100644 index 612aaed..0000000 --- a/store/goods/index copy.vue +++ /dev/null @@ -1,149 +0,0 @@ - - - - - diff --git a/store/goods/index.vue b/store/goods/index.vue index 51a716a..090f9d7 100644 --- a/store/goods/index.vue +++ b/store/goods/index.vue @@ -1,7 +1,7 @@