修改bug

src/views/controlPlatform/control.vue

@@ -159,7 +159,6 @@
 
     <!-- 详情弹窗 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="deviceFormRef" :model="form" label-position="right" label-width="auto">
       <div class="item">
         <div>
           <img v-if="form.avatarImg" class="avatarSize" :src="form.avatarImg" alt="" mode="aspectFill">
@@ -177,18 +176,18 @@
         <el-col :span="24">
           <div style="font-size: 15px;padding-left: 20px;padding-bottom: 20px;" class="content">{{ form.content }}</div>
         </el-col>
-          <div>
+        <div style="width: 500px">
           <!-- 当没有图片时 -->
           <div v-if="!form.url || form.url.length === 0" style="text-align: center; color: #999;" />
           <!-- 当图片数量为1时 -->
-            <div v-else-if="form.url.length === 1" style="margin-left: 150px">
+          <div v-else-if="form.url.length === 1" style="margin-left: 30px">
             <img :src="form.url[0]" alt="" class="avatar1">
           </div>
           <!-- 当图片数量为4或6时，上下两排展示 -->
           <div v-else-if=" form.url.length === 2" style="padding-left: 40px">
             <el-row v-for="(row, rowIndex) in Math.ceil(form.url.length / 2)" :key="rowIndex" :gutter="1">
               <el-col v-for="(imagePath, index) in form.url.slice(rowIndex * 2, rowIndex * 2 + 2)" :key="index" :span="12">
-                  <div style="margin-left: -15px">
+                <div style="margin-left: -10px">
                   <img :src="imagePath" alt="" class="avatar3">
                 </div>
               </el-col>
@@ -205,7 +204,7 @@
             </el-row>
           </div>
           <!-- 当图片数量为5, 7, 8或9时，按九宫格显示 -->
-            <el-row v-else :gutter="2" style="padding-left: 50px">
+          <el-row v-else :gutter="2" style="padding-left: 60px">
             <el-col v-for="(imagePath, index) in form.url" :key="index" :span="8">
               <div style="margin-left: -20px">
                 <img :src="imagePath" alt="" class="avatar2">
@@ -228,6 +227,7 @@
         </div>
       </el-row>
       <div class="commentsSection">
+        <el-alert v-if="!isEdit && queryParams.examStatus === '2'" :closable="false">驳回原因：{{ form.remarks }}</el-alert>
         <ul v-if="form.articleCommentVOList" class="commentTree">
           <li v-for="(comment, index) in form.articleCommentVOList" :key="index" class="commentItem">
             <div v-if="index !== null" style="border-top: 1px solid #dadada; margin: 5px 0 7px;" />
@@ -247,8 +247,11 @@
                   </div>
                 </div>
               </div>
+              <div style="display: flex;justify-content: flex-end">
+                <span v-if="comment.examStatus=='0'" style="color: red">*</span>
                 <el-button v-if="isEdit" type="text" @click="deleteComment(comment)">删除</el-button>
               </div>
+            </div>
             <ul v-if="comment.childrenCommentList && comment.childrenCommentList.length > 0" class="replies">
               <li v-for="(reply, replyIndex) in comment.childrenCommentList" :key="replyIndex" class="replyItem">
                 <div v-if="replyIndex !== null" style="border-top: 1px solid #dadada; margin: 5px 0 7px;" />
@@ -268,17 +271,19 @@
                       </div>
                     </div>
                   </div>
+                  <div style="display: flex;justify-content: flex-end">
+                    <span v-if="reply.examStatus=='0'" style="color: red">*</span>
                     <el-button v-if="isEdit" type="text" @click="deleteReply(reply)">删除</el-button>
                   </div>
+                </div>
               </li>
             </ul>
           </li>
         </ul>
       </div>
-      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button v-if="!isEdit" class="cancelBtn" @click="cancel">取 消</el-button>
-        <el-button v-if="isEdit" class="cancelBtn" @click="rejection">驳 回</el-button>
+        <el-button v-if="isEdit && form.examStatus =='0'" class="cancelBtn" @click="rejection">驳 回</el-button>
         <el-button v-if="isEdit" class="cancelBtn" type="primary" @click="handleChange('1')">通 过</el-button>
       </div>
     </el-dialog>
@@ -971,13 +976,13 @@ export default {
   display: block;
 }
 .avatar2 {
-  width: 170px;
-  height: 130px;
+  width: 145px;
+  height: 120px;
   display: block;
 }
 .avatar3 {
-  width: 263px;
-  height: 200px;
+  width: 230px;
+  height: 180px;
   display: block;
 }
 .avatar4 {
@@ -986,9 +991,9 @@ export default {
   display: block;
 }
 .avatar5 {
-  width: 255px;
-  height: 200px;
-  padding-top: 4px;
+  width: 230px;
+  height: 210px;
+  padding-top: 2px;
   display: block;
 }
 .commentTitle{

src/views/operationsManagement/memGoldCoinFlow/index.vue

@@ -43,7 +43,7 @@
           style="width: 150px"
         />
       </el-form-item>
-      <el-form-item label="用户" prop="userNickName">
+      <el-form-item label="发起用户" prop="userNickName">
         <el-input
           v-model="queryParams.userNickName"
           placeholder="请输入用户"
@@ -53,6 +53,16 @@
           style="width: 150px"
         />
       </el-form-item>
+      <el-form-item label="发起用户会员" prop="userCode">
+        <el-input
+          v-model="queryParams.userCode"
+          placeholder="请输入会员号"
+          clearable
+          :maxlength="50"
+          size="small"
+          style="width: 150px"
+        />
+      </el-form-item>
       <el-form-item label="目标用户" prop="targetNickName">
         <el-input
           v-model="queryParams.targetNickName"
@@ -63,6 +73,16 @@
           style="width: 150px"
         />
       </el-form-item>
+      <el-form-item label="目标用户会员号" prop="targetCode">
+        <el-input
+          v-model="queryParams.targetCode"
+          placeholder="请输入会员号"
+          clearable
+          :maxlength="50"
+          size="small"
+          style="width: 150px"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button
           :class="commonField.queryClass"
@@ -118,12 +138,12 @@
         </el-table-column>
         <el-table-column label="发起用户" prop="userNickName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.userNickName || '-' }}
+            {{ scope.row.userNickName || '' }}{{ scope.row.userCode ? '(' + scope.row.userCode + ')' : '' }}
           </template>
         </el-table-column>
         <el-table-column label="目标用户" prop="userNickName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.targetNickName || '-' }}
+            {{ scope.row.targetNickName || '' }}{{ scope.row.targetCode ? '(' + scope.row.targetCode + ')' : '' }}
           </template>
         </el-table-column>
         <el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">