Browse Source

修复代码

master
主管理员 2 months ago
parent
commit
e6bbf4df25
4 changed files with 63 additions and 19 deletions
  1. +14
    -5
      CatmDogd-Mall-Front-test/src/views/model/banner/index.vue
  2. +17
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAddressController.java
  3. +12
    -0
      ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java
  4. +20
    -14
      ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java

+ 14
- 5
CatmDogd-Mall-Front-test/src/views/model/banner/index.vue View File

@ -65,9 +65,17 @@
<el-table v-loading="loading" :data="bannerList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="轮播图图片
" align="center" prop="image" v-if="columns[0].visible"/>
<el-table-column label="标识" align="center" prop="id" />
<!-- <el-table-column label="轮播图图片" align="center" prop="image" v-if="columns[0].visible"/>-->
<el-table-column label="图片" align="center" prop="image">
<template slot-scope="{ row }">
<el-image v-if="row.image" :src="row.image" :preview-src-list="[row.image]" class="small-img circle-img"/>
</template>
</el-table-column>
<el-table-column label="跳转链接" align="center" prop="url" v-if="columns[1].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -88,7 +96,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -102,7 +110,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
<el-form-item label="轮播图图片
">
<imageUpload v-model="form.image"/>
<!-- <imageUpload v-model="form.image"/>-->
<oss-image-upload v-model="form.image" :limit="1"></oss-image-upload>
</el-form-item>
<el-form-item label="跳转链接" prop="url">
<el-input v-model="form.url" placeholder="请输入跳转链接" />


+ 17
- 0
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAddressController.java View File

@ -0,0 +1,17 @@
package com.ruoyi.applet.contoller;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(description = "小程序-地址相关接口")
@RestController
@RequestMapping("/applet/address")
public class ApiAppletAddressController {
}

+ 12
- 0
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java View File

@ -4,8 +4,10 @@ package com.ruoyi.applet.contoller;
import com.ruoyi.applet.pojo.dto.ApiQueryIIdDTO;
import com.ruoyi.applet.pojo.dto.ApiQueryIIdMyUserDTO;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.model.domain.AppBanner;
import com.ruoyi.model.service.IAApiAppletHhrWorkOutService;
import com.ruoyi.model.service.IAApiAppletLoginService;
import com.ruoyi.model.service.IAppBannerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -13,6 +15,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@Api(description = "伴宠师-合伙人工作台内部流程")
@RestController
@ -22,6 +25,8 @@ public class ApiAppletHhrWorkOutController {
//伴宠师-登录相关问题
@Resource
private IAApiAppletHhrWorkOutService apiAppletHhrWorkOutService;
@Resource
private IAppBannerService bannerService;
//合伙人工作台 - 绑定用户基础信息
@ -56,6 +61,13 @@ public class ApiAppletHhrWorkOutController {
return apiAppletHhrWorkOutService.HhrMyUserGetById(appUserId);
}
//获取bannerList
@ApiOperation("合伙人工作台 - 获取bannerList")
@GetMapping("/bannerList")
public AjaxResult bannerList(){
List<AppBanner> bannerList = bannerService.getBannerList();
return AjaxResult.success(bannerList);
}


+ 20
- 14
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletInfoController.java View File

@ -1,28 +1,34 @@
package com.ruoyi.applet.contoller;
import com.ruoyi.applet.pojo.dto.ApiQueryIIdMyUserDTO;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.model.domain.AppUsers;
import com.ruoyi.model.service.IAppUsersService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.*;
@Api(description = "伴宠师-我的流程")
@RestController
@RequestMapping("/applet/info")
public class ApiAppletInfoController {
@Autowired
private IAppUsersService appUsersService;
//修改用户信息接口
@ApiOperation("修改用户信息接口")
@PostMapping("/updateInfo")
public AjaxResult updateInfo(@RequestBody AppUsers appUsers){
if((appUsers.getUserId() == null)){
return AjaxResult.error("用户标识不能为空");
}
appUsersService.updateAppUsers(appUsers);
return AjaxResult.success("修改成功");
}
}

Loading…
Cancel
Save