From eaf6c6affdbefb70da581ca056ea27b88480ed7f Mon Sep 17 00:00:00 2001 From: mactj Date: Fri, 15 Jan 2021 22:56:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9=E5=87=86?= =?UTF-8?q?=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/2021-01-15.sql | 0 .../controller/goods/GoodsMainController.java | 2 +- .../controller/goods/GoodsSpecController.java | 13 ++ .../ruoyi/winery/domain/goods/GoodsMain.java | 4 + mini-app/package.json | 4 +- mini-app/project.config.json | 8 + mini-app/src/apis/mailApis.js | 11 ++ mini-app/src/app.wpy | 6 +- .../src/components/mall/tab/mall-shopping.wpy | 58 +++--- mini-app/src/pages/mall/goods-detail.wpy | 185 ++++++++++-------- mini-app/src/pages/winery/winery-detail.wpy | 152 ++++++++++++++ mini-app/src/store/constant/wineryDefine.js | 44 +++++ mini-app/src/store/index.js | 6 +- 13 files changed, 380 insertions(+), 113 deletions(-) create mode 100644 doc/2021-01-15.sql create mode 100644 mini-app/src/pages/winery/winery-detail.wpy create mode 100644 mini-app/src/store/constant/wineryDefine.js diff --git a/doc/2021-01-15.sql b/doc/2021-01-15.sql new file mode 100644 index 000000000..e69de29bb diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java index 7f0d9f25f..8e0fe9e48 100644 --- a/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java +++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java @@ -49,7 +49,7 @@ public class GoodsMainController extends BaseController { */ @PreAuthorize("@ss.hasPermi('goods:goods_main:list')") @GetMapping("/list") - public TableDataInfo list(UsernamePasswordAuthenticationToken token, GoodsMain goodsMain) { + public TableDataInfo list(GoodsMain goodsMain) { startPage(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(goodsMain); diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsSpecController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsSpecController.java index 61015d95d..9936f92c2 100644 --- a/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsSpecController.java +++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsSpecController.java @@ -1,5 +1,6 @@ package com.ruoyi.winery.controller.goods; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -128,4 +129,16 @@ public class GoodsSpecController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(iWineryGoodsSpecService.removeByIds(Arrays.asList(ids)) ? 1 : 0); } + + + /** + * 查询商品规格列表 + */ + @PreAuthorize("@ss.hasPermi('goods:goods_spec:list')") + @GetMapping("/listByIds/{ids}") + public TableDataInfo listByIds(@PathVariable String[] ids) { + startPage(); + List list = iWineryGoodsSpecService.listByIds(Arrays.asList(ids)); + return getDataTable(list); + } } diff --git a/hope-winery/src/main/java/com/ruoyi/winery/domain/goods/GoodsMain.java b/hope-winery/src/main/java/com/ruoyi/winery/domain/goods/GoodsMain.java index 24363bf4c..baf1752c7 100644 --- a/hope-winery/src/main/java/com/ruoyi/winery/domain/goods/GoodsMain.java +++ b/hope-winery/src/main/java/com/ruoyi/winery/domain/goods/GoodsMain.java @@ -68,6 +68,10 @@ private static final long serialVersionUID=1L; @Excel(name = "商品图片") private String goodsImg; + /** 商品图片 */ + @Excel(name = "商品价格") + private BigDecimal goodsPrice; + /** 创建者 */ private String createBy; diff --git a/mini-app/package.json b/mini-app/package.json index a95a1a51a..59cade110 100644 --- a/mini-app/package.json +++ b/mini-app/package.json @@ -1,7 +1,7 @@ { "name": "hope_wine", - "version": "0.0.2", - "description": "A WePY project", + "version": "1.0.0", + "description": "希望软件小程序", "main": "weapp/app.js", "scripts": { "dev": "./node_modules/.bin/wepy build --watch", diff --git a/mini-app/project.config.json b/mini-app/project.config.json index bbb9ed82a..cb2b49b5a 100644 --- a/mini-app/project.config.json +++ b/mini-app/project.config.json @@ -104,6 +104,14 @@ "id": -1, "name": "商品详情", "pathName": "pages/mall/goods-detail", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "酒庄详情", + "pathName": "pages/winery/winery-detail", + "query": "", "scene": null } ] diff --git a/mini-app/src/apis/mailApis.js b/mini-app/src/apis/mailApis.js index e4140f3f6..11243ef85 100644 --- a/mini-app/src/apis/mailApis.js +++ b/mini-app/src/apis/mailApis.js @@ -13,6 +13,17 @@ class MallApis { data: data }) } + getGoodsById(id) { + return request.get({ + url: baseUrl + 'goods/goods_main/' + id, + }) + } + + getGoodsSpecByIds(ids) { + return request.get({ + url: baseUrl + 'goods/goods_spec/listByIds/' + ids, + }) + } } export default new MallApis() diff --git a/mini-app/src/app.wpy b/mini-app/src/app.wpy index d02d249d0..b1b5bbd2d 100644 --- a/mini-app/src/app.wpy +++ b/mini-app/src/app.wpy @@ -100,7 +100,8 @@ pages: [ 'pages/form5', 'pages/form6', 'pages/mall/index', -'pages/mall/goods-detail' +'pages/mall/goods-detail', +'pages/winery/winery-detail' ], navigateToMiniProgramAppIdList: [ 'wx88736d7d39e2eda6' @@ -141,7 +142,8 @@ usingComponents: { "van-grid": "./vant/grid/index", "van-grid-item": "./vant/grid-item/index", "van-dialog": "./vant/dialog/index", -"van-image": "./vant/image/index" +"van-image": "./vant/image/index", +"van-loading": "./vant/loading/index" } } diff --git a/mini-app/src/components/mall/tab/mall-shopping.wpy b/mini-app/src/components/mall/tab/mall-shopping.wpy index c241a7156..8e7731789 100644 --- a/mini-app/src/components/mall/tab/mall-shopping.wpy +++ b/mini-app/src/components/mall/tab/mall-shopping.wpy @@ -1,3 +1,11 @@ + +const parseImage = (imageKey) => { +return 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' + imageKey +} +module.exports.parseImage = parseImage; + + + diff --git a/mini-app/src/pages/winery/winery-detail.wpy b/mini-app/src/pages/winery/winery-detail.wpy new file mode 100644 index 000000000..d89324fb8 --- /dev/null +++ b/mini-app/src/pages/winery/winery-detail.wpy @@ -0,0 +1,152 @@ + + + +const parseImage = (imageKey) => { +return 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' + imageKey +} +module.exports.parseImage = parseImage; + + + + + +{ +navigationBarTitleText: '', +usingComponents: { + +} +} + diff --git a/mini-app/src/store/constant/wineryDefine.js b/mini-app/src/store/constant/wineryDefine.js new file mode 100644 index 000000000..af836ab22 --- /dev/null +++ b/mini-app/src/store/constant/wineryDefine.js @@ -0,0 +1,44 @@ +import { imgbaseUrl } from './imageDefine' + +export const wineryDefine = { + WINERY_LIST: [ + { + id: '1', + name: '贺兰神', + icon: 'https://img.yzcdn.cn/vant/cat.jpeg', + desc: 'since 1998' + }, { + id: '2', + name: '贺东庄园', + icon: 'https://img.yzcdn.cn/vant/cat.jpeg', + desc: 'since 1998' + }, { + id: '3', + name: '志辉源石', + icon: 'https://img.yzcdn.cn/vant/cat.jpeg', + desc: 'since 1998' + }, { + id: '4', + name: '银色高地', + icon: 'https://img.yzcdn.cn/vant/cat.jpeg', + desc: 'since 1998' + }, { + id: '5', + name: '贺兰晴雪', + icon: 'https://img.yzcdn.cn/vant/cat.jpeg', + desc: 'since 1998' + }, { + id: '6', + name: '贺兰神', + icon: 'https://img.yzcdn.cn/vant/cat.jpeg', + desc: 'since 1998' + }, { + id: '7', + name: '贺兰神', + icon: 'https://img.yzcdn.cn/vant/cat.jpeg', + desc: 'since 1998' + } + + ] + +} diff --git a/mini-app/src/store/index.js b/mini-app/src/store/index.js index 128996814..353b4378d 100644 --- a/mini-app/src/store/index.js +++ b/mini-app/src/store/index.js @@ -2,6 +2,7 @@ import Vuex from '@wepy/x' import { wineryForm } from './wineryForm' import { imageDefine } from './constant/imageDefine' import { navDefine } from './constant/navDefine' +import { wineryDefine } from './constant/wineryDefine' export default new Vuex.Store({ state: { @@ -13,11 +14,12 @@ export default new Vuex.Store({ avatar: 'https://img.yzcdn.cn/vant/cat.jpeg' }, token: '', - company: '企业名称', + company: '企业名称' }, wineryForm, imageDefine, - navDefine + navDefine, + wineryDefine }, mutations: {