From 97db9ec00310887f14c3416bcbed40fc8f72da17 Mon Sep 17 00:00:00 2001 From: mactj Date: Wed, 20 Jan 2021 19:08:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B4=BB=E5=8A=A8=E8=B5=84=E8=AE=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppActivityController.java | 29 +++++++- mini-app/src/apis/mallApis.js | 6 ++ mini-app/src/baseDefine.js | 3 +- .../src/components/mall/tab/mall-home.wpy | 66 +++++++++++++------ mini-app/src/store/constant/imageDefine.js | 3 +- mini-app/src/store/index.js | 4 +- .../framework/config/SecurityConfig.java | 1 + 7 files changed, 87 insertions(+), 25 deletions(-) diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppActivityController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppActivityController.java index a4218a5b1..056c3344f 100644 --- a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppActivityController.java +++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppActivityController.java @@ -83,7 +83,7 @@ public class AppActivityController extends BaseController { */ @PreAuthorize("@ss.hasPermi('winery:activity:query')" ) @GetMapping(value = "/{id}" ) - public AjaxResult getInfo(@PathVariable("id" ) Long id) { + public AjaxResult getInfo(@PathVariable("id" ) String id) { return AjaxResult.success(iAppActivityService.getById(id)); } @@ -113,7 +113,32 @@ public class AppActivityController extends BaseController { @PreAuthorize("@ss.hasPermi('winery:activity:remove')" ) @Log(title = "活动" , businessType = BusinessType.DELETE) @DeleteMapping("/{ids}" ) - public AjaxResult remove(@PathVariable Long[] ids) { + public AjaxResult remove(@PathVariable String[] ids) { return toAjax(iAppActivityService.removeByIds(Arrays.asList(ids)) ? 1 : 0); } + + + /** + * 查询活动列表(开放) + */ + @GetMapping("/open/list") + public TableDataInfo openList(AppActivity appActivity) + { + startPage(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(appActivity); + if (StringUtils.isNotBlank(appActivity.getUrl())){ + lqw.eq(AppActivity::getUrl ,appActivity.getUrl()); + } + if (appActivity.getType() != null){ + lqw.eq(AppActivity::getType ,appActivity.getType()); + } + if (StringUtils.isNotBlank(appActivity.getImage())){ + lqw.eq(AppActivity::getImage ,appActivity.getImage()); + } + if (appActivity.getImageHeight() != null){ + lqw.eq(AppActivity::getImageHeight ,appActivity.getImageHeight()); + } + List list = iAppActivityService.list(lqw); + return getDataTable(list); + } } diff --git a/mini-app/src/apis/mallApis.js b/mini-app/src/apis/mallApis.js index bb64b1655..0976c0ba5 100644 --- a/mini-app/src/apis/mallApis.js +++ b/mini-app/src/apis/mallApis.js @@ -23,6 +23,12 @@ class MallApis { url: baseUrl + 'goods/goods_spec/listByIds/' + ids }) } + + getActivityList() { + return request.get({ + url: baseUrl + 'winery/activity/open/list' + }) + } } export default new MallApis() diff --git a/mini-app/src/baseDefine.js b/mini-app/src/baseDefine.js index bd9e0a7a7..52864696c 100644 --- a/mini-app/src/baseDefine.js +++ b/mini-app/src/baseDefine.js @@ -4,7 +4,8 @@ * */ -export const baseUrl = 'http://127.0.0.1:18989/' +export const baseUrl = 'http://36.1.50.18:18989/' +// export const baseUrl = 'http://127.0.0.1:18989/' // export const baseUrl = 'https://mall.xiao4r.com/api/' diff --git a/mini-app/src/components/mall/tab/mall-home.wpy b/mini-app/src/components/mall/tab/mall-home.wpy index 9e9d336fe..d83e25e65 100644 --- a/mini-app/src/components/mall/tab/mall-home.wpy +++ b/mini-app/src/components/mall/tab/mall-home.wpy @@ -76,6 +76,13 @@ + +const parseImage = (imageKey) => { +return 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' + imageKey +} +module.exports.parseImage = parseImage; + +