接口联调(未完成，等有数据了再继续)

src/views/modules/member/components/activityRecord.vue

@@ -4,17 +4,17 @@
       <el-table-column prop="xxx" label="序号">
         <template slot-scope="scope">{{ scope.$index + 1 }}</template>
       </el-table-column>
-      <el-table-column prop="xxx" label="活动ID"></el-table-column>
-      <el-table-column prop="xxx" label="活动类型"></el-table-column>
-      <el-table-column prop="xxx" label="活动名称"></el-table-column>
-      <el-table-column prop="xxx" label="公益支持内容"></el-table-column>
-      <el-table-column prop="xxx" label="活动时间"></el-table-column>
+      <el-table-column prop="activityId" label="活动ID"></el-table-column>
+      <el-table-column prop="typeName" label="活动类型"></el-table-column>
+      <el-table-column prop="activityName" label="活动名称"></el-table-column>
+      <el-table-column prop="loveValueContent" label="公益支持内容"></el-table-column>
+      <el-table-column prop="activityStartTime" label="活动时间"></el-table-column>
       <el-table-column prop="xxx" label="活动地点"></el-table-column>
-      <el-table-column prop="xxx" label="活动状态">
-        <template slot-scope="scope"></template>
+      <el-table-column prop="signupState" label="活动状态">
+        <template slot-scope="scope">{{ statusDict[scope.row.signupState] }}</template>
       </el-table-column>
-      <el-table-column prop="xxx" label="捐献爱心值"></el-table-column>
-      <el-table-column prop="xxx" label="操作">
+      <el-table-column prop="loveValue" label="捐献爱心值"></el-table-column>
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text">查看档案</el-button>
         </template>
@@ -34,23 +34,35 @@
 
 <script>
 export default {
+  props: ['userId'],
   data () {
     return {
       queryParams: {
-        memberId: this.$route.query.memberId || '',
+        userId: '',
         page: 1,
         limit: 10
       },
       dataList: [],
       total: 0,
-      loading: false
+      loading: false,
+      statusDict: {
+        0: '未报名',
+        1: '已报名',
+        2: '未签到',
+        3: '已签到',
+        4: '已填档案'
+      }
     }
   },
+  mounted () {
+    this.queryParams.userId = this.userId
+    this.getList()
+  },
   methods: {
     getList () {
       this.loading = true
-      this.$http.get('/xxx', { params: this.queryParams }).then(({ data: res }) => {
-        if (res.code === 200) {
+      this.$http.get('/core/activity/signup/page', { params: this.queryParams }).then(({ data: res }) => {
+        if (res.code === 0) {
           this.dataList = res.data.list
           this.total = res.data.total
         }

src/views/modules/member/components/familyMember.vue

@@ -33,10 +33,11 @@
 
 <script>
 export default {
+  props: ['userId'],
   data () {
     return {
       queryParams: {
-        memberId: this.$route.query.memberId || '',
+        userId: '',
         page: 1,
         limit: 10
       },
@@ -45,10 +46,14 @@ export default {
       loading: false
     }
   },
+  mounted () {
+    this.queryParams.userId = this.userId
+    this.getList()
+  },
   methods: {
     getList () {
       this.loading = true
-      this.$http.get('/xxx', { params: this.queryParams }).then(({ data: res }) => {
+      this.$http.get('/core/family/member/page', { params: this.queryParams }).then(({ data: res }) => {
         if (res.code === 200) {
           this.dataList = res.data.list
           this.total = res.data.total

src/views/modules/member/components/heartRecorrd.vue

@@ -4,17 +4,21 @@
       <el-table-column prop="xxx" label="序号">
         <template slot-scope="scope">{{ scope.$index + 1 }}</template>
       </el-table-column>
-      <el-table-column prop="xxx" label="订单编号"></el-table-column>
-      <el-table-column prop="xxx" label="操作时间"></el-table-column>
+      <!-- <el-table-column prop="xxx" label="订单编号"></el-table-column> -->
+      <el-table-column prop="createDate" label="操作时间"></el-table-column>
       <el-table-column prop="xxx" label="爱心值数值">
-        <template slot-scope="scope"></template>
+        <template slot-scope="scope">
+          <div class="loveValue" :class="{'green':scope.row.capitalFlow==1,'red':scope.row.capitalFlow==2}">{{ scope.row.capitalFlow==1?'+':'-' }}{{ scope.row.loveQuantity||0 }}</div>
+        </template>
       </el-table-column>
-      <el-table-column prop="xxx" label="类型"></el-table-column>
-      <el-table-column prop="xxx" label="状态">
-        <template slot-scope="scope"></template>
+      <el-table-column prop="transactionType" label="类型">
+        <template slot-scope="scope">{{ transactionTypeDict[scope.row.transactionType] }}</template>
       </el-table-column>
-      <el-table-column prop="xxx" label="操作人员"></el-table-column>
-      <el-table-column prop="xxx" label="备注"></el-table-column>
+      <!-- <el-table-column prop="xxx" label="状态">
+        <template slot-scope="scope"></template>
+      </el-table-column> -->
+      <el-table-column prop="creatorName" label="操作人员"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
     </el-table>
     <el-pagination
       :current-page="queryParams.page"
@@ -30,23 +34,36 @@
 
 <script>
 export default {
+  props: ['userId'],
   data () {
     return {
       queryParams: {
-        memberId: this.$route.query.memberId || '',
+        userId: '',
         page: 1,
         limit: 10
       },
       dataList: [],
       total: 0,
-      loading: false
+      loading: false,
+      capitalFlowDict: {
+        1: '收入',
+        2: '支出'
+      },
+      transactionTypeDict: {
+        1: '渠道导入',
+        2: '公益捐赠'
+      }
     }
   },
+  mounted () {
+    this.queryParams.userId = this.userId
+    this.getList()
+  },
   methods: {
     getList () {
       this.loading = true
-      this.$http.get('/xxx', { params: this.queryParams }).then(({ data: res }) => {
-        if (res.code === 200) {
+      this.$http.get('/core/love/value/record/page', { params: this.queryParams }).then(({ data: res }) => {
+        if (res.code === 0) {
           this.dataList = res.data.list
           this.total = res.data.total
         }

src/views/modules/member/components/onlySelfTicket.vue

@@ -26,10 +26,11 @@
 
 <script>
 export default {
+  props: ['userId'],
   data () {
     return {
       queryParams: {
-        memberId: this.$route.query.memberId || '',
+        userId: '',
         page: 1,
         limit: 10
       },
@@ -38,10 +39,14 @@ export default {
       loading: false
     }
   },
+  mounted () {
+    this.queryParams.userId = this.userId
+    this.getList()
+  },
   methods: {
     getList () {
       this.loading = true
-      this.$http.get('/xxx', { params: this.queryParams }).then(({ data: res }) => {
+      this.$http.get('/core/activity/coupon/page', { params: this.queryParams }).then(({ data: res }) => {
         if (res.code === 200) {
           this.dataList = res.data.list
           this.total = res.data.total

src/views/modules/member/detail.vue

@@ -93,11 +93,11 @@
                 <div class="tab adfac">
                     <div class="tab-pre" v-for="(item,index) in tabList" :key="index" :class="{'active':tabIndex===index}" @click="changeTab(index)">{{ item }}</div>
                 </div>
-                <div class="table">
-                    <activity-record v-if="tabIndex===0"></activity-record>
-                    <heart-recorrd v-else-if="tabIndex===1"></heart-recorrd>
-                    <only-self-ticket v-else-if="tabIndex===2"></only-self-ticket>
-                    <family-member v-else></family-member>
+                <div class="table" v-if="userId">
+                    <activity-record v-if="tabIndex===0" :userId="userId"></activity-record>
+                    <heart-recorrd v-else-if="tabIndex===1" :userId="userId"></heart-recorrd>
+                    <only-self-ticket v-else-if="tabIndex===2" :userId="userId"></only-self-ticket>
+                    <family-member v-else-if="tabIndex===3" :userId="userId"></family-member>
                 </div>
             </div>
         </el-card>
@@ -162,6 +162,7 @@ export default {
       tabList: ['活动记录', '爱心值记录', '专享券', '家庭成员'],
       show: false,
       buttonLoading: false,
+      userId: this.$route.query.id,
       userInfo: null,
       assetInfo: null,
       form: {