From f89c824f95f2e0cbe5d452d60a2816a17303efbf Mon Sep 17 00:00:00 2001 From: "925116093-qq.com" <925116093@qq.com> Date: Fri, 30 May 2025 18:05:02 +0800 Subject: [PATCH] 202505301641444 --- .../controller/IntegralProductController.java | 15 +- .../controller/UserAddressController.java | 13 ++ .../ruoyi/system/service/IUsersService.java | 1 + ruoyi-ui/src/api/system/IntegralProduct.js | 12 ++ ruoyi-ui/src/api/system/UserAddress.js | 9 + .../views/system/IntegralProduct/index.vue | 59 +++++-- ruoyi-ui/src/views/system/Order/index.vue | 52 ++++-- .../src/views/system/QuoteCraft/index.vue | 162 ++++++++++++------ .../src/views/system/ServiceCate/index.vue | 17 +- .../src/views/system/ServiceGoods/index.vue | 39 +++-- 10 files changed, 277 insertions(+), 102 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/IntegralProductController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/IntegralProductController.java index cb76623..acf79d8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/IntegralProductController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/IntegralProductController.java @@ -71,8 +71,10 @@ public class IntegralProductController extends BaseController util.exportExcel(response, list, "积分商品数据"); } + + /** - * 获取积分商品详细信息 + * 获取商品下拉选择分类 */ @PreAuthorize("@ss.hasPermi('system:IntegralProduct:query')") @GetMapping(value = "/{id}") @@ -81,6 +83,17 @@ public class IntegralProductController extends BaseController return success(integralProductService.selectIntegralProductById(id)); } + + /** + * 获取积分商品详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:IntegralProduct:query')") + @GetMapping(value = "/getIntegralCateList") + public AjaxResult getIntegralCateList() + { + return success(integralCateService.selectIntegralCateList(new IntegralCate())); + } + /** * 新增积分商品 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java index 363f64b..83df816 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java @@ -70,6 +70,19 @@ public class UserAddressController extends BaseController util.exportExcel(response, list, "用户收货地址数据"); } + + + /** + * 获取用户收货地址详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:UserAddress:query')") + @GetMapping(value = "/getuserAddressList") + public AjaxResult getuserAddressList() + { + return success(userAddressService.selectUserAddressList(new UserAddress())); + } + + /** * 获取用户收货地址详细信息 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersService.java index 2b5c727..11c01d1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsersService.java @@ -41,6 +41,7 @@ public interface IUsersService * @param users 【请填写功能名称】 * @return 结果 */ + public int updateUsers(Users users); /** diff --git a/ruoyi-ui/src/api/system/IntegralProduct.js b/ruoyi-ui/src/api/system/IntegralProduct.js index 87e475c..1b9c1b7 100644 --- a/ruoyi-ui/src/api/system/IntegralProduct.js +++ b/ruoyi-ui/src/api/system/IntegralProduct.js @@ -16,6 +16,18 @@ export function getIntegralProduct(id) { method: 'get' }) } + +// 查询积分商品详细 +export function getIntegralCateList() { + return request({ + url: '/system/IntegralProduct/getIntegralCateList', + method: 'get' + }) +} + + + + // 任务状态修改 export function changetypeStatus(id, status) { const data = { diff --git a/ruoyi-ui/src/api/system/UserAddress.js b/ruoyi-ui/src/api/system/UserAddress.js index 0e2ae44..b6fbd93 100644 --- a/ruoyi-ui/src/api/system/UserAddress.js +++ b/ruoyi-ui/src/api/system/UserAddress.js @@ -16,6 +16,15 @@ export function getUserAddress(id) { method: 'get' }) } +// 查询用户收货地址详细 +export function getuserAddressList() { + return request({ + url: '/system/UserAddress/getuserAddressList', + method: 'get' + }) +} + + // 新增用户收货地址 export function addUserAddress(data) { diff --git a/ruoyi-ui/src/views/system/IntegralProduct/index.vue b/ruoyi-ui/src/views/system/IntegralProduct/index.vue index 9f7730d..1b24fbc 100644 --- a/ruoyi-ui/src/views/system/IntegralProduct/index.vue +++ b/ruoyi-ui/src/views/system/IntegralProduct/index.vue @@ -58,12 +58,14 @@ /> - + + + @@ -147,7 +149,7 @@ >删除 - + - + + + @@ -381,7 +390,7 @@ - + @@ -397,7 +406,7 @@ - + @@ -407,7 +416,7 @@
- + @@ -416,7 +425,7 @@
- +
@@ -479,6 +488,7 @@ import { addIntegralProduct, updateIntegralProduct, changetypeStatus, + getIntegralCateList } from "@/api/system/IntegralProduct"; import Editor from "@/components/Editor"; export default { @@ -502,6 +512,8 @@ export default { IntegralProductList: [], // 弹出层标题 title: "", + + integralCateList: [], // 是否显示弹出层 open: false, // 查询参数 @@ -561,6 +573,7 @@ export default { }, created() { this.getList(); + this.getintegralCateList() }, methods: { /** 查询积分商品列表 */ @@ -629,6 +642,13 @@ export default { this.resetForm("queryForm"); this.handleQuery(); }, + + getintegralCateList () { + getIntegralCateList().then((response) => { + this.integralCateList = response.data; + }); + }, + // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map((item) => item.id); @@ -668,11 +688,20 @@ export default { }, /** 提交按钮 */ submitForm() { - if( this.$refs.skuRef.submit()){ - this.form.sku=this.$refs.skuRef.submit(); + + + if(this.$refs.skuRef){ + + if(this.$refs.skuRef.submit()){ + this.form.sku=this.$refs.skuRef.submit(); + }else{ + return + } + }else{ - return + this.form.sku='{}'; } + this.$refs["form"].validate((valid) => { if (valid) { if (this.form.id != null) { diff --git a/ruoyi-ui/src/views/system/Order/index.vue b/ruoyi-ui/src/views/system/Order/index.vue index bb951b9..1995458 100644 --- a/ruoyi-ui/src/views/system/Order/index.vue +++ b/ruoyi-ui/src/views/system/Order/index.vue @@ -163,7 +163,7 @@ v-hasPermi="['system:Order:remove']" >删除 - + @@ -334,12 +334,26 @@ - + + + - + + + @@ -380,7 +394,14 @@ - + + + @@ -388,16 +409,7 @@ - - - - - - - - - - +