From 88fdda086a3c68c191bb602357105b93d90ead87 Mon Sep 17 00:00:00 2001 From: 15820893422 <1978476055@qq.com> Date: Wed, 29 May 2024 10:16:23 +0800 Subject: [PATCH] edit --- .env.development | 8 +-- src/api/product.js | 4 +- src/views/dashboard/components/baseInfo.vue | 69 ++++++++++++------- .../merchant/list/handle/merEditForm.vue | 27 +++++++- src/views/order/list/orderDetails.vue | 2 +- src/views/product/productClassify/index.vue | 40 +++++++++-- 6 files changed, 109 insertions(+), 41 deletions(-) diff --git a/.env.development b/.env.development index e7310fa..372f2bb 100644 --- a/.env.development +++ b/.env.development @@ -3,12 +3,12 @@ ENV = 'development' # http://192.168.1.43:8324/admin # http://mer.crmeb.net/admin # base api -VUE_APP_BASE_API = 'https://api.tropjoin.com/' -# VUE_APP_BASE_API = 'https://plus.hwms.shop' +VUE_APP_BASE_API = 'http://192.168.1.50:8080' +# VUE_APP_BASE_API = 'https://api.tropjoin.com/' # socket 连接地址 -VUE_APP_WS_URL = 'ws://https://api.tropjoin.com/' -# VUE_APP_WS_URL = 'ws://plus.hwms.shop' +VUE_APP_WS_URL = 'ws://http://192.168.1.50:8080' +# VUE_APP_WS_URL = 'ws://https://api.tropjoin.com/' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # to control whether the babel-plugin-dynamic-import-node plugin is enabled. diff --git a/src/api/product.js b/src/api/product.js index a50dced..db29665 100644 --- a/src/api/product.js +++ b/src/api/product.js @@ -10,8 +10,8 @@ export function uploadVideoOfLocal(data) { /** * @description 商品分类 -- 列表 */ -export function storeCategoryListApi() { - return request.get('store/category/lst') +export function storeCategoryListApi(id) { + return request.get(`store/category/lst?store_category_id=${id}`) } /** * @description 商品分类 -- 新增表单 diff --git a/src/views/dashboard/components/baseInfo.vue b/src/views/dashboard/components/baseInfo.vue index f6edce4..38f8c6d 100644 --- a/src/views/dashboard/components/baseInfo.vue +++ b/src/views/dashboard/components/baseInfo.vue @@ -27,31 +27,6 @@ - -
-
-
- 浏览量 - 今日 -
- -
- 周环比： - {{ statisticsData.lastWeekRate.visitNum ? (statisticsData.lastWeekRate.visitNum*100*1000/1000).toFixed(2) : 0.00 }}% - -
-
- 昨日数据 - {{ statisticsData.yesterday.visitNum }} -
-
-
-
@@ -104,6 +79,37 @@
+ +
+
+
+ {{ statisticsData.prize.title }} + 今日 +
+
+
+ + {{ item.u }} +
+
+ + +
+
+ @@ -261,6 +267,19 @@ export default { color: #8C8C8C; background: #fff; position: relative; + min-height: 182px; +} +.card-panel-box{ + display: flex; + align-items: center; + justify-content: space-around; + margin-top: 50px; + flex-wrap: wrap; +} +.card-panel-content{ + flex: 1; + flex-basis: 33%; + text-align: center; } .card-panel-description { padding: 0 20px; diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue index e6debd7..f9c0d21 100644 --- a/src/views/merchant/list/handle/merEditForm.vue +++ b/src/views/merchant/list/handle/merEditForm.vue @@ -189,11 +189,11 @@
银行卡信息
- + @@ -233,6 +233,29 @@ + + + + + + + + + + + + diff --git a/src/views/order/list/orderDetails.vue b/src/views/order/list/orderDetails.vue index fa1f88e..0ef2080 100644 --- a/src/views/order/list/orderDetails.vue +++ b/src/views/order/list/orderDetails.vue @@ -41,7 +41,7 @@
  • 支付时间
    -
    {{ orderDetailList.create_time }}
    +
    {{ orderDetailList.pay_time }}
    • diff --git a/src/views/product/productClassify/index.vue b/src/views/product/productClassify/index.vue index b36824c..bceef91 100644 --- a/src/views/product/productClassify/index.vue +++ b/src/views/product/productClassify/index.vue @@ -13,8 +13,9 @@ :data="tableData.data" size="small" row-key="store_category_id" - :default-expand-all="false" - :tree-props="{children: 'children', hasChildren: 'hasChildren'}" + lazy + :load="load" + :tree-props="{children: 'children'}" > @@ -101,13 +102,15 @@ export default { moren: require("@/assets/images/bjt.png"), isChecked: false, listLoading: true, + childrenData:[], tableData: { data: [], total: 0 }, tableFrom: { page: 1, - limit: 20 + limit: 20, + store_category_id:0 } } }, @@ -115,10 +118,26 @@ export default { this.getList() }, methods: { + getChildren(id){ + storeCategoryListApi(id) + .then((res) => { + this.childrenData = res.data + }) + .catch((res) => { + this.$message.error(res.message); + }); + }, + load(tree, treeNode, resolve) { + let that = this; + that.getChildren(tree.store_category_id) + setTimeout(() => { + resolve(that.childrenData) + }, 1000) + }, // 列表 getList() { this.listLoading = true - storeCategoryListApi(this.tableFrom).then(res => { + storeCategoryListApi('').then(res => { this.tableData.data = res.data this.tableData.total = res.data.count this.listLoading = false @@ -144,11 +163,18 @@ export default { this.$modalForm(storeCategoryUpdateApi(id)).then(() => this.getList()) }, // 删除 - handleDelete(id, idx) { + handleDelete(id, idx,row) { + console.log(row); this.$modalSure().then(() => { storeCategoryDeleteApi(id).then(({ message }) => { + if(row.parent){ + let index = this.childrenData.map(item => item).indexOf(row) + this.childrenData.splice(index,1); + }else{ + this.tableData.data.splice(idx,1); + } this.$message.success(message) - this.getList() + // this.getList() }).catch(({ message }) => { this.$message.error(message) })