修改消费记录

src/views/operationsManagement/memGoldCoinFlow/index.vue

@@ -83,12 +83,12 @@
             <span>{{ getActionTypeLabel(scope.row.actionType) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="金币数量" prop="count" :show-overflow-tooltip="true">
+        <el-table-column label="金币" prop="count" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.count || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="交易后的余额" prop="endCount" :show-overflow-tooltip="true">
+        <el-table-column label="余额" prop="endCount" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.endCount || '-' }}
           </template>

src/views/operationsManagement/member/index.vue

@@ -291,7 +291,7 @@
                 :class="commonField.resetPasClass"
                 :type="commonField.typeParent"
                 :size="commonField.size"
-                @click="removeCourse(scope.row)"
+                @click="course(scope.row)"
               >消费记录</el-button>
             </template>
           </el-table-column>
@@ -306,7 +306,82 @@
         :limit.sync="queryParams.rows"
         @pagination="loadData"
       />
-      <footer />
+
+      <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+        <el-form ref="queryForm" style="padding: 30px 0 0 10px" :model="memGoldCoinFlowQueryParams" :inline="true">
+          <el-form-item label="发布日期:" prop="publishDate">
+            <el-date-picker
+              v-model="dateRange"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            />
+          </el-form-item>
+          <el-form-item>
+            <!--          //查询按钮-->
+            <el-button
+              :class="commonField.queryClass"
+              :type="commonField.typePrimary"
+              :icon="commonField.queryIcon"
+              :size="commonField.smallSize"
+              @click="memGoldCoinFlowQuery"
+            >{{ commonField.queryName }}</el-button>
+            <!--          //重置按钮-->
+            <el-button
+              :class="commonField.resetClass"
+              :icon="commonField.resetIcon"
+              :size="commonField.smallSize"
+              @click="resetMemGoldCoinFlowQuery"
+            >{{ commonField.resetName }}</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table border :data="memGoldCoinFlowList">
+          <el-table-column type="index" label="序号" width="55" align="center" />
+          <el-table-column label="类型" prop="type" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ getTypeLabel(scope.row.type) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="方式" prop="actionType" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ getActionTypeLabel(scope.row.actionType) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" prop="count" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ scope.row.count || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="余额" prop="endCount" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ scope.row.endCount || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="订单id" prop="orderId" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ scope.row.orderId || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div slot="footer" class="dialog-footer">
+          <el-button class="cancelBtn" @click="cancel">关  闭</el-button>
+        </div>
+        <pagination
+          v-show="memGoldCoinFlowTotal>0"
+          :key="pageKey"
+          :total="memGoldCoinFlowTotal"
+          :page.sync="memGoldCoinFlowQueryParams.page"
+          :limit.sync="memGoldCoinFlowQueryParams.rows"
+          @pagination="loadData"
+        />
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -317,6 +392,7 @@ import { parseTime } from '@/utils'
 import { getDataCache, setDataCache } from '@/assets/js/filterData'
 import { getOptions } from '@/utils/options'
 import { delMemInfo, listMemInfo } from '@/api/contentManagement/memInfo'
+import { listMemGoldCoinFlow } from '@/api/contentManagement/memGoldCoinFlow'
 
 export default {
   name: 'Index',
@@ -451,6 +527,55 @@ export default {
           label: '停用',
           value: '0'
         }
+      ],
+      memGoldCoinFlowList: [],
+      memGoldCoinFlowTotal: 0,
+      open: false,
+      dateRange: [],
+      memGoldCoinFlowQueryParams: {
+        page: 1,
+        rows: 10,
+        flag: ''
+      },
+      typeOptions: [
+        {
+          dictLabel: '充值',
+          dictValue: '1'
+        },
+        {
+          dictLabel: '消费',
+          dictValue: '2'
+        }
+      ],
+      actionTypeOptions: [
+        {
+          dictLabel: '用户充值',
+          dictValue: '10'
+        },
+        {
+          dictLabel: '系统充值',
+          dictValue: '11'
+        },
+        {
+          dictLabel: '点赞',
+          dictValue: '20'
+        },
+        {
+          dictLabel: '发动态',
+          dictValue: '21'
+        },
+        {
+          dictLabel: '留言',
+          dictValue: '22'
+        },
+        {
+          dictLabel: '要微信联系方式',
+          dictValue: '23'
+        },
+        {
+          dictLabel: '接收微信请求',
+          dictValue: '24'
+        }
       ]
     }
   },
@@ -569,22 +694,45 @@ export default {
         }
       })
     },
-    /** 删除按钮操作 */
-    removeCourse(row) {
-      const id = row.businessId
-      this.$confirm('是否确认操作？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delMemInfo(id)
-      }).then(() => {
-        this.loadData()
-        this.$message({
-          message: '删除成功',
-          type: 'success'
-        })
-      })
+    course(row) {
+      this.memGoldCoinFlowQueryParams = {
+        page: 1,
+        rows: 10,
+        targetId: row.businessId
+      }
+      listMemGoldCoinFlow(this.memGoldCoinFlowQueryParams).then(
+        response => {
+          this.memGoldCoinFlowList = response.data
+          this.memGoldCoinFlowTotal = response.total
+          this.open = true
+          this.title = '消费记录'
+        }
+      )
+    },
+    memGoldCoinFlowQuery() {
+      this.getMemGoldCoinFlowList()
+    },
+    resetMemGoldCoinFlowQuery(){
+      this.dateRange = []
+      this.getMemGoldCoinFlowList()
+    },
+    getMemGoldCoinFlowList() {
+      const form = { ...this.memGoldCoinFlowQueryParams }
+      if (this.dateRange.length > 0){
+        form.beginTime = this.dateRange[0]
+        form.endTime = this.dateRange[1]
+      }
+      listMemGoldCoinFlow(form).then(
+        response => {
+          this.memGoldCoinFlowList = response.data
+          this.memGoldCoinFlowTotal = response.total
+        }
+      )
+    },
+    cancel() {
+      this.memGoldCoinFlowQueryParams = []
+      this.memGoldCoinFlowList = []
+      this.open = false
     },
     /**
      * @description: 查看
@@ -704,6 +852,14 @@ export default {
       this.queryParams.maxWeight = maxWeight
       console.log(this.queryParams.minWeight)
       console.log(this.queryParams.maxWeight)
+    },
+    getTypeLabel(value) {
+      const option = this.typeOptions.find(option => option.dictValue === value)
+      return option ? option.dictLabel : '-'
+    },
+    getActionTypeLabel(value) {
+      const option = this.actionTypeOptions.find(option => option.dictValue === value)
+      return option ? option.dictLabel : '-'
     }
   }
 }