diff --git a/src/assets/css/common.less b/src/assets/css/common.less
index 5805215..3f7d8fa 100644
--- a/src/assets/css/common.less
+++ b/src/assets/css/common.less
@@ -101,5 +101,6 @@
   opacity: 0.5;
 }
 .small_img{
-  width: 18px;
+  width: 15px;
+  height: 17px;
 }
\ No newline at end of file
diff --git a/src/views/assistance/card.vue b/src/views/assistance/card.vue
index c89b360..2898344 100644
--- a/src/views/assistance/card.vue
+++ b/src/views/assistance/card.vue
@@ -2,21 +2,20 @@
     <div class=''>
         <div class="card rounded-corner m-top12" v-for="(item, index) in tableData">
             <div class="flex">
-                <van-tag type="primary">个性服务</van-tag>
-                <van-tag type="warning">共性需求</van-tag>
+                <van-tag :type="item.source % 2 === 0?'warning':'primary'">{{typeList[item.source]}}</van-tag>
                 <div class="  opacity5 m-left12 font-size13">
                     {{ item.categoryName }}
                 </div>
             </div>
             <div class="m-top5 flex flex-center">
                 <img src="@/assets/images/icon/address.png" class="small_img m-right7">
-                {{ item.serviceTargetName }} {{ item.serviceTargetMobile }}<br>
+                {{ item.serviceTargetName || '--' }} {{ item.serviceTargetMobile }}<br>
             </div>
             <div class="opacity5 font-size13 m-top5" style="margin-left: 29px;">{{ item.serviceTargetAddresses }}
                 </div>
             <div class="m-top5  flex flex-center">
                 <img src="@/assets/images/icon/time.png" class="small_img m-right7">
-                {{ item.serviceTimeStart }}
+                {{ item.serviceTimeStart || '--'}} 
             </div>
             <div class="m-top5 ">
                 <div class="flex flex-center3">
@@ -26,7 +25,10 @@
             </div>
             <hr class="  m-top12-right opacity5">
             <div class="flex flex-fend m-top12-right">
-                <van-button size="small" type="info" class="rounded-corner m-top5-bottom">接单</van-button>
+                <van-button size="small" type="info" class="m-left12 rounded-corner m-top5-bottom" v-if="item.processStatus === 10" @click="$emit('handleCLickReceive',item)">接单</van-button>
+                <van-button size="small" type="default" round  class="m-left12 rounded-corner m-top5-bottom" v-if="item.processStatus === 20 && item.source === 4 ">联系需求人</van-button>
+                <van-button size="small" type="info" class="m-left12 rounded-corner m-top5-bottom" v-if="item.processStatus === 20">确认服务</van-button>
+
             </div>
         </div>
     </div>
@@ -36,6 +38,7 @@
 export default {
     data() {
         return {
+            typeList:['公共服务','共性需求','政策找人','服务找人','个性需求','温暖找人','技能找人','岗位找人']
         };
     },
     props: {
diff --git a/src/views/assistance/index.vue b/src/views/assistance/index.vue
index 7cdf7fd..cdd2a68 100644
--- a/src/views/assistance/index.vue
+++ b/src/views/assistance/index.vue
@@ -3,7 +3,7 @@
         <div class="scroll-box" ref="scroll-content">
             <van-tabs :active="active" sticky @change="hadelChangeTab">
                 <van-tab title="待接单">
-                    <card :tableData="list"></card>
+                    <card :tableData="list" @handleCLickReceive="handleCLickReceive"></card>
                 </van-tab>
                 <van-tab title="待处理">
                     <card :tableData="list"></card>
@@ -11,6 +11,12 @@
                 <van-tab title="已完成">内容 3</van-tab>
             </van-tabs>
         </div>
+        <van-dialog v-model="showRole" title="请选择接单身份" show-cancel-button>
+            <van-radio-group v-model="radio">
+                <van-radio name="1">单选框 1</van-radio>
+                <van-radio name="2">单选框 2</van-radio>
+            </van-radio-group>
+        </van-dialog>
     </div>
 </template>
 <script>
@@ -24,10 +30,15 @@ export default {
             clientHeight: false,
             scroll: null,
             pageNo: 1,
-            pageSize: 10,
+            pageSize: 4,
             list: [],
             total: 0,
-            requestFlag:false
+            requestFlag:false,
+            showRole:false,
+            roleList:[
+                "公益岗-马魁1",
+                "志愿者-马魁1"
+            ]
         };
     },
     created() {
@@ -42,6 +53,10 @@ export default {
         })
     },
     methods: {
+        handleCLickReceive(item){
+            this.showRole = true;
+            console.log(item)
+        },
         hadelChangeTab(e){
             this.list = [];
             this.pageNo = 1;
@@ -82,9 +97,8 @@ export default {
             }).then(res => {
                 console.log(res);
                 this.total = res.total;
-                // this.requestFlag = res.list.length === this.pageSize;
-                this.list = res.data.list;
-                console.log(this.list,'see');
+                this.requestFlag = res.data.list.length === this.pageSize;
+               this.list =  this.list.concat(res.data.list)
             }).catch(err => {
 
             })
@@ -124,4 +138,13 @@ export default {
 }
 </script>
 
-<style lang='less' scoped></style>
+<style lang='less' scoped>
+:deep(.van-tabs__content){
+    padding: 0 10px;
+    box-sizing: border-box;
+}
+:deep(.van-dialog__content){
+    padding: 0 10px;
+    box-sizing: border-box;  
+}
+</style>