修改bug

src/views/contentManagement/activity/index.vue

@@ -134,7 +134,7 @@
           </el-table-column>
           <el-table-column align="center" prop="applicationFee" label="报名费用" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ numberFormatter(scope.row.applicationFee, 2) || '-' }}
+              {{ numberFormatter(scope.row.applicationFee, 2) || '0' }}
             </template>
           </el-table-column>
           <el-table-column align="center" prop="publishDate" label="发布日期" min-width="120" show-overflow-tooltip>

src/views/contentManagement/banner/index.vue

@@ -91,7 +91,7 @@
           </el-table-column>
           <el-table-column label="权重" prop="weight" :show-overflow-tooltip="true" min-width="55">
             <template slot-scope="scope">
-              {{ scope.row.weight || '-' }}
+              {{ scope.row.weight || '0' }}
             </template>
           </el-table-column>
           <el-table-column min-width="100" label="状态" prop="flag">

src/views/contentManagement/notice/index.vue

@@ -114,7 +114,7 @@
           </el-table-column>
           <el-table-column label="权重" prop="weight" :show-overflow-tooltip="true" min-width="55">
             <template slot-scope="scope">
-              {{ scope.row.weight || '-' }}
+              {{ scope.row.weight || '0' }}
             </template>
           </el-table-column>
           <el-table-column align="left" prop="releaseStatus" label="状态" min-width="120" show-overflow-tooltip>

src/views/operationsManagement/article/index.vue

@@ -228,8 +228,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;" />
@@ -249,8 +252,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="deleteReply(reply)">删除</el-button>
                     </div>
+                  </div>
                 </li>
               </ul>
             </li>
@@ -259,7 +265,7 @@
       </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>
@@ -587,7 +593,9 @@ export default {
         })
       }
       let remarksObj = ''
+      if (row === '2') {
         remarksObj = '[{ \"msg\": "' + this.form.remarks + '" }]'
+      }
       const form = {
         businessId: this.form.businessId,
         examStatus: row,

src/views/operationsManagement/memGoldCoinFlow/index.vue

@@ -53,6 +53,16 @@
           style="width: 150px"
         />
       </el-form-item>
+      <el-form-item label="目标用户" prop="targetNickName">
+        <el-input
+          v-model="queryParams.targetNickName"
+          placeholder="请输入目标用户"
+          clearable
+          :maxlength="50"
+          size="small"
+          style="width: 150px"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button
           :class="commonField.queryClass"
@@ -68,6 +78,14 @@
           @click="resetQuery"
         >重置</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-button
+          :class="commonField.exportClass"
+          :icon="commonField.exportIcon"
+          :size="commonField.smallSize"
+          @click="handleExport"
+        >导出</el-button>
+      </el-form-item>
     </el-form>
     <div style="padding:5px 10px">
       <div class="mb12 font-small-bold">金币流水表列表</div>
@@ -85,12 +103,12 @@
         </el-table-column>
         <el-table-column label="金币" prop="count" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.count || '-' }}
+            {{ scope.row.count || '0' }}
           </template>
         </el-table-column>
         <el-table-column label="余额" prop="endCount" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.endCount || '-' }}
+            {{ scope.row.endCount || '0' }}
           </template>
         </el-table-column>
         <el-table-column label="订单id" prop="orderId" :show-overflow-tooltip="true">
@@ -143,7 +161,8 @@
 <script>
 import {
   listMemGoldCoinFlow,
-  delMemGoldCoinFlow } from '@/api/contentManagement/memGoldCoinFlow'
+  delMemGoldCoinFlow, exportMemGoldCoinFlow
+} from '@/api/contentManagement/memGoldCoinFlow'
 import commonField from '@/utils/commonField'
 export default {
   name: 'MemGoldCoinFlow',
@@ -317,6 +336,27 @@ export default {
     getActionTypeLabel(value) {
       const option = this.actionTypeOptions.find(option => option.dictValue === value)
       return option ? option.dictLabel : '-'
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams
+      this.$confirm('是否确认操作?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return exportMemGoldCoinFlow(queryParams).then(response => {
+          const blob = new Blob([response])
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = '金币流水表信息' + '.xls' // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click()// 点击下载
+          document.body.removeChild(downloadElement)// 下载完成移除元素
+          window.URL.revokeObjectURL(href)// 释放掉blob对象
+        })
+      })
     }
   }
 }

src/views/operationsManagement/member/index.vue

@@ -777,7 +777,7 @@ export default {
         form.beginTime = this.dateRange[0]
         form.endTime = this.dateRange[1]
       }
-      listMemGoldCoinFlow(form).then(
+      queryMemGoldCoinFollowList(form).then(
         response => {
           this.memGoldCoinFlowList = response.data
           this.memGoldCoinFlowTotal = response.total
@@ -927,10 +927,8 @@ export default {
     },
     rechargeSubmitForm() {
       const form = {
-        memberId: this.rechargeForm.memberId,
-        balance: this.rechargeForm.balance,
-        actionType: this.rechargeForm.actionType,
-        type: this.rechargeForm.type
+        targetId: this.rechargeForm.targetId,
+        count: this.rechargeForm.count
       }
       addMemGoldCoinFlow(form).then(response => {
         if (response.code === 200) {