dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-02-01 10:03:16 +08:00
parent 79d073b26c
commit 273e38494c
8 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fuintAdmin/src/components/map/imgUpload.vue
View File

@ -172,7 +172,9 @@ export default {
// 上传成功回调
handleUploadSuccess(res, file) {
if (res.code === 200) {
this.uploadList.push({ name: res.data.url, url: res.data.url });
let list = res.data.url.split("/static")
let url = this.baseUrl + "/static" + list[list.length-1]
this.uploadList.push({ name: url, url: url });
this.uploadedSuccessfully();
} else {
this.number--;
@ -207,14 +209,14 @@ export default {
},
// 预览
handlePictureCardPreview(file) {
if (this.imgUrl != "" && this.imgUrl != undefined){
if (this.imgUrl){
this.dialogImageUrl = this.baseUrl + this.imgUrl;
}else {
if (file!=undefined){
if (file){
this.dialogImageUrl = file.url;
}
}
if (this.doorUrl != "" && this.doorUrl != undefined && this.doorUrl != []){
if (this.doorUrl){
let list = JSON.parse(this.doorUrl)
list.forEach(item => {
let data = {name:"",url:""}
@ -225,7 +227,7 @@ export default {
// this.doorList.push(this.baseUrl + item);
})
}else {
if (file!=undefined){
if (file){
this.dialogImageUrl = file.url;
}
}

4
fuintAdmin/src/views/feedBack/index.vue
View File

@ -7,7 +7,9 @@
<el-table style="margin-top: 20px" v-loading="loading" :data="list">
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column align="center" prop="userId" label="用户id"/>
<el-table-column align="center" prop="userId" label="用户昵称"/>
<el-table-column align="center" prop="userName" label="用户昵称"/>
<el-table-column align="center" prop="userMobile" label="用户手机号"/>
<el-table-column align="center" prop="content" label="反馈内容"/>
<el-table-column align="center" prop="screenshot_url" label="截图信息">
<template slot-scope="scope">

13
fuintAdmin/src/views/member/userInfo.vue
View File

@ -576,7 +576,7 @@
</div>
<div>
<el-table ref="tables" v-loading="loading" :data="cardValueChildList">
<el-table-column label="子卡ID" prop="id" align="center" width="60"/>
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="子卡手机号" prop="cardChildPhones" align="center"/>
<el-table-column label="创建时间" align="center" width="160" prop="createTime">
<template slot-scope="scope">
@ -661,7 +661,7 @@
</el-form>
</template>
</el-table-column>
<el-table-column label="ID" prop="id" align="center" width="60"/>
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="子卡手机号" prop="cardChildPhones" align="center" />
<el-table-column label="订单号" prop="orderNo" align="center" />
<el-table-column label="订单金额" prop="amount" align="center" />
@ -775,8 +775,10 @@
<el-col :span="24">
<el-form-item label="子卡手机号" prop="cardChildPhones" style="width: 420px">
<el-input
v-model.number="cardChildPhones"
v-model="form1.cardChildPhones"
@input="setCardChildPhones"
placeholder="请输入子卡手机号"
oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
/>
</el-form-item>
</el-col>
@ -1024,6 +1026,9 @@ export default {
this.getAllAmount()
},
methods: {
setCardChildPhones(val){
this.form1.cardChildPhones = val
},
// 计算找零金额
changeSeekZero(){
this.seekZero = (this.authCode - this.cardValueForm.amount).toFixed(2)
@ -1070,7 +1075,7 @@ export default {
submitSubCard(){
this.$refs["form1"].validate(valid => {
if (valid) {
this.form1.cardChildPhones = this.cardChildPhones
// this.form1.cardChildPhones = this.cardChildPhones
if (this.form1.id) {
editCardValueChild(this.form1).then(res => {
if (res.data==1){

4
fuintAdmin/src/views/staff/list.vue
View File

@ -280,7 +280,7 @@
v-for="dict in shqxList"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
:value="dict.dictLabel"
>
</el-option>
</el-select>
@ -495,7 +495,7 @@ export default {
this.auditPrem = []
if (val) {
this.shqxList.forEach((item) => {
this.auditPrem.push(item.dictValue)
this.auditPrem.push(item.dictLabel)
this.form.auditPrem = this.auditPrem.toString();
})
} else {

2
fuintAdmin/src/views/staff/storeInfo/index.vue
View File

@ -83,7 +83,7 @@ export default {
// 上传文件列表
uploadFiles: [
{name:"nihao",
url:'http://192.168.1.4:8080/static/uploadImages/20231218/c4b1c4fc7cfc4dd4a4acf1e922cacc86.png'}
url:'http://localhost:8080/static/uploadImages/20231218/c4b1c4fc7cfc4dd4a4acf1e922cacc86.png'}
],
// 门店二维码
collectionImg:'',

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/FeedbackController.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.userManager.entity.Feedback;
import com.fuint.business.userManager.entity.FixingLevel;
import com.fuint.business.userManager.service.FeedbackService;
import com.fuint.business.userManager.vo.FeedbackVo;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
@ -24,11 +25,11 @@ public class FeedbackController extends BaseController {
* @return
*/
@GetMapping("/list")
public ResponseObject list(Feedback feedback,
public ResponseObject list(FeedbackVo feedback,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
IPage<Feedback> list = feedbackService.selectFeedbackList(page,feedback);
IPage<FeedbackVo> list = feedbackService.selectFeedbackList(page,feedback);
return getSuccessResult(list);
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FeedbackMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.userManager.mapper.FeedbackMapper">
<sql id="selectFeedback">
select fb.*,mu.name name,mu.mobile mobile from feedback fb left join mt_user mu on fb.user_id = mu.id
select fb.*,mu.name userName,mu.mobile userMobile from feedback fb left join mt_user mu on fb.user_id = mu.id
</sql>
<select id="selectFeedbackList" resultType="com.fuint.business.userManager.vo.FeedbackVo">

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/FeedbackVo.java
View File

@ -1,14 +1,16 @@
package com.fuint.business.userManager.vo;
import com.fuint.business.userManager.entity.Feedback;
import lombok.Data;
@Data
public class FeedbackVo extends Feedback {
/**
* 用户昵称
*/
private String name;
private String userName;
/**
* 用户电话
*/
private String mobile;
private String userMobile;
}