From 61114ba89377a4da851ea99fdcbdd803ef4d4eba Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 9 Jun 2023 09:59:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E3=80=81=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=AD=89=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/modules/product.js | 16 + libs/util.js | 2 +- order/addCourse/addCourse.vue | 86 +-- order/orderDetail/orderDetail.vue | 15 +- order/productDetail/productDetail.vue | 343 ++++++++++++ order/products/products.vue | 264 +++++++++ pages.json | 87 +-- pages/index/index.vue | 519 +++++------------- {order => pages}/orders/orders.vue | 4 +- pages/products/products.vue | 18 +- pages/workbench/workbench.vue | 488 ++++++++++++++++ static/image/index/1.png | Bin 0 -> 1511 bytes static/image/index/2.png | Bin 0 -> 2192 bytes static/image/index/3.png | Bin 0 -> 2600 bytes static/image/index/4.png | Bin 0 -> 2354 bytes static/image/index/5.png | Bin 0 -> 1124 bytes static/image/index/6.png | Bin 0 -> 783 bytes static/image/index/7.png | Bin 0 -> 1974 bytes static/image/index/8.png | Bin 0 -> 1187 bytes static/image/index/9.png | Bin 0 -> 1166 bytes static/image/product.png | Bin 0 -> 6814 bytes static/image/product/1.png | Bin 0 -> 1069 bytes static/image/product/2.png | Bin 0 -> 988 bytes static/image/product/3.png | Bin 0 -> 513 bytes static/image/product/4.png | Bin 0 -> 581 bytes static/image/product/5.png | Bin 0 -> 1311 bytes static/image/product/6.png | Bin 0 -> 427 bytes static/image/product/excel.png | Bin 0 -> 1098 bytes static/image/product/pdf.png | Bin 0 -> 848 bytes static/image/product/ppt.png | Bin 0 -> 644 bytes static/image/product/shop.png | Bin 0 -> 2000 bytes static/image/product/word.png | Bin 0 -> 1191 bytes static/image/{index => workbench}/index1.png | Bin static/image/{index => workbench}/index10.png | Bin static/image/{index => workbench}/index2.png | Bin static/image/{index => workbench}/index3.png | Bin static/image/{index => workbench}/index4.png | Bin static/image/{index => workbench}/index5.png | Bin static/image/{index => workbench}/index6.png | Bin static/image/{index => workbench}/index7.png | Bin static/image/{index => workbench}/index8.png | Bin static/image/{index => workbench}/index9.png | Bin styles/common.scss | 3 + {pages => team}/info/info.vue | 0 {pages => team}/study/study.vue | 0 45 files changed, 1395 insertions(+), 450 deletions(-) create mode 100644 order/productDetail/productDetail.vue create mode 100644 order/products/products.vue rename {order => pages}/orders/orders.vue (98%) create mode 100644 pages/workbench/workbench.vue create mode 100644 static/image/index/1.png create mode 100644 static/image/index/2.png create mode 100644 static/image/index/3.png create mode 100644 static/image/index/4.png create mode 100644 static/image/index/5.png create mode 100644 static/image/index/6.png create mode 100644 static/image/index/7.png create mode 100644 static/image/index/8.png create mode 100644 static/image/index/9.png create mode 100644 static/image/product.png create mode 100644 static/image/product/1.png create mode 100644 static/image/product/2.png create mode 100644 static/image/product/3.png create mode 100644 static/image/product/4.png create mode 100644 static/image/product/5.png create mode 100644 static/image/product/6.png create mode 100644 static/image/product/excel.png create mode 100644 static/image/product/pdf.png create mode 100644 static/image/product/ppt.png create mode 100644 static/image/product/shop.png create mode 100644 static/image/product/word.png rename static/image/{index => workbench}/index1.png (100%) rename static/image/{index => workbench}/index10.png (100%) rename static/image/{index => workbench}/index2.png (100%) rename static/image/{index => workbench}/index3.png (100%) rename static/image/{index => workbench}/index4.png (100%) rename static/image/{index => workbench}/index5.png (100%) rename static/image/{index => workbench}/index6.png (100%) rename static/image/{index => workbench}/index7.png (100%) rename static/image/{index => workbench}/index8.png (100%) rename static/image/{index => workbench}/index9.png (100%) rename {pages => team}/info/info.vue (100%) rename {pages => team}/study/study.vue (100%) diff --git a/apis/modules/product.js b/apis/modules/product.js index 739f421..6af27bb 100644 --- a/apis/modules/product.js +++ b/apis/modules/product.js @@ -3,4 +3,20 @@ const { get, post } = request export const AppletsDataProductList = (data) => { return post('nakadai/nakadai/dataProduct/AppletsDataProductList', data) +} + +export const tagsList = () => { + return get('nakadai/tags/tagsList') +} + +export const listOfGoods = (data) => { + return post('nakadai/mall/listOfGoods', data) +} + +export const detailsOfGoods = (id) => { + return get('nakadai/mall/detailsOfGoods?mallId=' + id) +} + +export const productCategoryList = () => { + return get('nakadai/productClassification/productCategoryList') } \ No newline at end of file diff --git a/libs/util.js b/libs/util.js index 8431e21..491cfd5 100644 --- a/libs/util.js +++ b/libs/util.js @@ -70,7 +70,7 @@ export default { }, // 返回图标。如果有图标,则直接返回,否则判断是否是数据产品,即productType=2,如果是,则取数据图标,否则则显示通用图标,这两个图标都在config/product.js里有配置 getIcon(e) { - return e.miniProgramPictureAddress || (e.productType === 2 ? Product.dataIcon : Product.normalIcon) + return e.appletIcon || Product.normalIcon }, // 判断文件类型是否能够通过uni.openDocument打开(doc, xls, ppt, pdf, docx, xlsx, pptx) isDoc(ext) { diff --git a/order/addCourse/addCourse.vue b/order/addCourse/addCourse.vue index ddcac1d..2520aff 100644 --- a/order/addCourse/addCourse.vue +++ b/order/addCourse/addCourse.vue @@ -4,8 +4,10 @@ -