。。。。

src/api/pointsdetail/pointsdetail.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/cyzh-pointsDetail/pointsdetail/list',
+    url: '/api/cyzh-pointsDetail/pointsdetail/page',
     method: 'get',
     params: {
       ...params,

src/api/usergoodsdonate/usergoodsdonate.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/cyzh-userGoodsDonate/usergoodsdonate/list',
+    url: '/api/cyzh-userGoodsDonate/usergoodsdonate/page',
     method: 'get',
     params: {
       ...params,

src/api/withdrawrecords/withdrawrecords.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/cyzh-withdrawRecords/withdrawrecords/list',
+    url: '/api/cyzh-withdrawRecords/withdrawrecords/page',
     method: 'get',
     params: {
       ...params,

src/views/activity/activity.vue

@@ -168,6 +168,7 @@
               }]
             },{
               label: "活动主题",
+              search:true,
               prop: "name",
               rules: [{
                 required: true,

src/views/activity/comps/activity-add.vue

@@ -262,6 +262,7 @@
     watch:{
       form2(){
         if (!this.$isEmpty(this.form2.ads)) {
+          this.fileList=[]
           let tmp = this.form2.ads.split(",")
           tmp.forEach((item, index) => {
             let obj = {
@@ -282,7 +283,7 @@
       return {
         dialogFormVisible: false,
         //步骤条
-        active: 2,
+        active: 0,
         //奖金比例
         marks: {
           0: '0%',

src/views/pointsdetail/pointsdetail.vue

@@ -18,6 +18,32 @@
                @size-change="sizeChange"
                @refresh-change="refreshChange"
                @on-load="onLoad">
+
+     <template slot="userInfo" slot-scope="scope">
+        <div style="display: flex;">
+          <div style="display: flex;justify-content: center;align-items: center;">
+            <el-avatar size="large" :src="scope.row.avatar"></el-avatar>
+          </div>
+           <div style="padding: 10px;">
+             <div >昵称：{{scope.row.nickName}}</div>
+             <div>手机：{{scope.row.phone}}</div>
+           </div>
+        </div>
+      </template>
+
+      <template slot="pointsValue" slot-scope="scope">
+        <el-tag effect="dark" v-if="scope.row.pointsValue>0">+{{scope.row.pointsValue}}</el-tag>
+        <el-tag effect="dark" v-else type="danger">{{scope.row.pointsValue}}</el-tag>
+      </template>
+
+      <template slot="pointsDesc" slot-scope="scope">
+        <div v-if="scope.row.type==1">作品打赏</div>
+        <div v-if="scope.row.type==2">作者打赏</div>
+        <div v-if="scope.row.type==3">兑换勋章</div>
+        <div v-if="scope.row.type==4">捐赠物品</div>
+        <div v-if="scope.row.type==5">兑换商品</div>
+      </template>
+
       <template slot="menuLeft">
         <el-button type="danger"
                    size="small"
@@ -62,14 +88,31 @@
             {
               label: "用户id",
               prop: "userId",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入用户id",
                 trigger: "blur"
               }]
             },
+            {
+              label:"用户信息",
+              slot:true,
+              prop:"userInfo"
+            },
+            {
+              label:"用户昵称",
+              prop:"nickName",
+              search:true
+            },
+            {
+              label:"手机号",
+              prop:"phone",
+              search:true
+            },
             {
               label: "积分值",
+              slot:true,
               prop: "pointsValue",
               rules: [{
                 required: true,
@@ -80,14 +123,21 @@
             {
               label: "1：作品打赏 2：作者打赏  3：兑换勋章 4：捐赠物品 5:兑换商品",
               prop: "type",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入1：作品打赏 2：作者打赏  3：兑换勋章 4：捐赠物品 5:兑换商品",
                 trigger: "blur"
               }]
             },
+            {
+              slot:true,
+              label:"积分详情",
+              prop:'pointsDesc'
+            },
             {
               label: "关联type的id",
+              hide:true,
               prop: "relationId",
               rules: [{
                 required: true,

src/views/pointsgoods/pointsgoods.vue

@@ -63,6 +63,7 @@
               label: "所属活动",
               prop: "activityId",
               type: "select",
+              search:true,
               dicUrl: "/api/cyzh-activity/activity/list?size=500",
               props: {
                 label: "name",
@@ -94,6 +95,7 @@
             },
             {
               label: "名称",
+              search:true,
               prop: "name",
               rules: [{
                 required: true,

src/views/present/present.vue

@@ -129,6 +129,7 @@
             {
               label: "名称",
               prop: "name",
+              search:true,
               rules: [{
                 required: true,
                 message: "请输入名称",

src/views/useractivitystatistical/useractivitystatistical.vue

@@ -88,6 +88,7 @@
             },
             {
               label: "选手信息",
+              serach:true,
               prop: "userInfo",
               slot:true
             },

src/views/usergoodsdonate/usergoodsdonate.vue

@@ -18,6 +18,47 @@
                @size-change="sizeChange"
                @refresh-change="refreshChange"
                @on-load="onLoad">
+      <template slot="userInfo" slot-scope="scope">
+        <div style="display: flex;">
+          <div style="display: flex;justify-content: center;align-items: center;">
+            <el-avatar size="large" :src="scope.row.avatar"></el-avatar>
+          </div>
+           <div style="padding: 10px;">
+             <div >昵称：{{scope.row.nickName}}</div>
+             <div>手机：{{scope.row.phone}}</div>
+           </div>
+        </div>
+      </template>
+
+      <template slot="goodsInfo" slot-scope="scope">
+        <div style="display: flex;">
+          <div style="display: flex;justify-content: center;align-items: center;">
+            <el-avatar size="large" :src="scope.row.goodsPic"></el-avatar>
+          </div>
+           <div style="padding: 10px;">
+             <div >
+               名称：{{scope.row.goodsName}}
+               <span style="font-weight: 800;padding: 0 10px;">X</span>
+             {{scope.row.count}}</div>
+           </div>
+        </div>
+      </template>
+
+      <template slot="medalInfo" slot-scope="scope">
+        <div style="display: flex;">
+          <div style="display: flex;justify-content: center;align-items: center;">
+            <el-avatar size="large" :src="scope.row.medalIcon"></el-avatar>
+          </div>
+           <div style="padding: 10px;">
+             <div >名称：{{scope.row.medalName}}</div>
+             <div>积分值：{{scope.row.medalPointsValue}}
+                <span style="font-weight: 800;padding: 0 10px;">X</span>
+                {{scope.row.count}}
+             </div>
+           </div>
+        </div>
+      </template>
+
       <template slot="menuLeft">
         <el-button type="danger"
                    size="small"
@@ -62,15 +103,32 @@
             {
               label: "用户id",
               prop: "userId",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入用户id",
                 trigger: "blur"
               }]
             },
+            {
+              label:"用户信息",
+              slot:true,
+              prop:'userInfo'
+            },
+            {
+              label:"手机号",
+              prop:"phone",
+              search:true
+            },
+            {
+              label:"昵称",
+              prop:"nickName",
+              search:true
+            },
             {
               label: "实物id",
               prop: "goodsId",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入实物id",
@@ -78,32 +136,36 @@
               }]
             },
             {
-              label: "捐赠的勋章名字",
-              prop: "medalName",
+              prop:"goodsInfo",
+              label:"捐赠的实物信息",
+              slot:true
+            },
+            {
+              label: "捐赠的实物数量",
+              hide:true,
+              prop: "count",
               rules: [{
                 required: true,
-                message: "请输入捐赠的勋章名字",
+                message: "请输入捐赠的个数",
                 trigger: "blur"
               }]
             },
+            {
+              label: "捐赠获取的勋章信息",
+              prop: "medalInfo",
+              slot:true
+            },
             {
               label: "捐赠的勋章id",
               prop: "medalId",
+              hide:true,
               rules: [{
                 required: true,
                 message: "请输入捐赠的勋章id",
                 trigger: "blur"
               }]
             },
-            {
-              label: "捐赠的个数",
-              prop: "count",
-              rules: [{
-                required: true,
-                message: "请输入捐赠的个数",
-                trigger: "blur"
-              }]
-            },
+
             {
               label: "捐赠的时间",
               prop: "donateTime",

src/views/withdrawrecords/withdrawrecords.vue

@@ -27,12 +27,35 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
+
+      <template slot="userInfo" slot-scope="scope">
+        <div style="display: flex;">
+          <div style="display: flex;justify-content: center;align-items: center;">
+            <el-avatar size="large" :src="scope.row.avatar"></el-avatar>
+          </div>
+           <div style="padding: 10px;">
+             <div >昵称：{{scope.row.nickName}}</div>
+             <div>手机：{{scope.row.phone}}</div>
+           </div>
+        </div>
+      </template>
+
+      <!-- 操作菜单 -->
+        <template slot-scope="scope" slot="menu">
+           <el-button v-if="scope.row.withdrawStatus==0" size="mini" @click.stop="confirm(scope.row)" type="primary">确定发款</el-button>
+        </template>
+
+      <template slot="withdrawStatus" slot-scope="scope">
+        <el-tag type="warning" v-if="scope.row.withdrawStatus==0">未发款</el-tag>
+        <el-tag type="success" v-if="scope.row.withdrawStatus==1">已发款</el-tag>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
   import {getList, getDetail, add, update, remove} from "@/api/withdrawrecords/withdrawrecords";
+  import {dateFormat} from "../../util/date.js"
   import {mapGetters} from "vuex";
 
   export default {
@@ -55,12 +78,13 @@
           searchMenuSpan: 6,
           border: true,
           index: true,
-          viewBtn: true,
+          viewBtn: false,
           selection: true,
           dialogClickModal: false,
           column: [
             {
               label: "用户id",
+              hide:true,
               prop: "userId",
               rules: [{
                 required: true,
@@ -68,6 +92,46 @@
                 trigger: "blur"
               }]
             },
+            {
+              slot:true,
+              label:"用户信息",
+              prop:"userInfo"
+            },
+            {
+              label:"手机号",
+              prop:"phone",
+              search:true
+            },
+            {
+              label:"昵称",
+              prop:"nickName",
+              search:true
+            },
+            {
+              label: "openid",
+              prop: "openid",
+              rules: [{
+                required: true,
+                message: "请输入用户id",
+                trigger: "blur"
+              }]
+            },
+            {
+              label:"提现状态",
+              search:true,
+              type: "select",
+              dicData:[
+                {
+                  label:'未发款',
+                  value:0
+                },
+                {
+                  label:'已发款',
+                  value:1
+                }
+              ],
+              prop:'withdrawStatus'
+            },
             {
               label: "备注说明",
               prop: "note",
@@ -119,6 +183,31 @@
       }
     },
     methods: {
+      confirm(row){
+        let _this=this
+        this.$alert('确定发款？', '提示', {
+          confirmButtonText: '确定',
+          callback: () => {
+            _this.doConfirm(row)
+          }
+        });
+      },
+      async doConfirm(row){
+        let grantTime=dateFormat(new Date())
+        let params={
+           id:row.id,
+           grantTime,
+           withdrawStatus:1
+        }
+        let res=await update(params)
+        if (res.data.success) {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: "发款成功!"
+          });
+        }
+      },
       rowSave(row, done, loading) {
         add(row).then(() => {
           this.onLoad(this.page);