From 273e38494c9ffcc6b7859b1d3d874e0ea1cbde95 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 1 Feb 2024 10:03:16 +0800
Subject: [PATCH] bug

---
 fuintAdmin/src/components/map/imgUpload.vue         | 12 +++++++-----
 fuintAdmin/src/views/feedBack/index.vue             |  4 +++-
 fuintAdmin/src/views/member/userInfo.vue            | 13 +++++++++----
 fuintAdmin/src/views/staff/list.vue                 |  4 ++--
 fuintAdmin/src/views/staff/storeInfo/index.vue      |  2 +-
 .../userManager/controller/FeedbackController.java  |  5 +++--
 .../userManager/mapper/xml/FeedbackMapper.xml       |  2 +-
 .../fuint/business/userManager/vo/FeedbackVo.java   |  6 ++++--
 8 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/fuintAdmin/src/components/map/imgUpload.vue b/fuintAdmin/src/components/map/imgUpload.vue
index 53870c0e0..dcc7d30da 100644
--- a/fuintAdmin/src/components/map/imgUpload.vue
+++ b/fuintAdmin/src/components/map/imgUpload.vue
@@ -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;
         }
       }
diff --git a/fuintAdmin/src/views/feedBack/index.vue b/fuintAdmin/src/views/feedBack/index.vue
index 7d0188e21..18e665b13 100644
--- a/fuintAdmin/src/views/feedBack/index.vue
+++ b/fuintAdmin/src/views/feedBack/index.vue
@@ -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">
diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue
index 58ccda914..a9ed98e4d 100644
--- a/fuintAdmin/src/views/member/userInfo.vue
+++ b/fuintAdmin/src/views/member/userInfo.vue
@@ -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){
diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index 06376a3fc..bf211041b 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -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 {
diff --git a/fuintAdmin/src/views/staff/storeInfo/index.vue b/fuintAdmin/src/views/staff/storeInfo/index.vue
index 7cbce6594..1010042f4 100644
--- a/fuintAdmin/src/views/staff/storeInfo/index.vue
+++ b/fuintAdmin/src/views/staff/storeInfo/index.vue
@@ -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:'',
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/FeedbackController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/FeedbackController.java
index 368c45773..f2016d278 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/FeedbackController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/FeedbackController.java
@@ -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);
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FeedbackMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FeedbackMapper.xml
index 21094c581..27b572ce1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FeedbackMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FeedbackMapper.xml
@@ -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">
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/FeedbackVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/FeedbackVo.java
index 9a9cdfa84..9afb456c5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/FeedbackVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/FeedbackVo.java
@@ -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;
 }