diff --git a/miniprogram/images/qr-code-active.png b/miniprogram/images/qr-code-active.png
index ca132e5a12d76091f45efc025da64a358b785f4b..b5a8035236b556f65552f4b950263b699cf04f6d 100644
Binary files a/miniprogram/images/qr-code-active.png and b/miniprogram/images/qr-code-active.png differ
diff --git a/miniprogram/images/qr-code-default.png b/miniprogram/images/qr-code-default.png
index b1dda96cce723ab437e0ef6830a47edf563d5223..243d1dcc0d2a9fdc032a36b84870de82225965b0 100644
Binary files a/miniprogram/images/qr-code-default.png and b/miniprogram/images/qr-code-default.png differ
diff --git a/miniprogram/images/user-active.png b/miniprogram/images/user-active.png
index 49089a65ce094522f87aeeb0fef461613c56fdfc..8f4913e037d7cf6a6012a04837bb3a6aa8776c14 100644
Binary files a/miniprogram/images/user-active.png and b/miniprogram/images/user-active.png differ
diff --git a/miniprogram/images/user-default.png b/miniprogram/images/user-default.png
index 59b52f83e7868595102b83dd714394ac5a7859ee..275b2b2ce8423d145afb36b07986d1b28cbf666a 100644
Binary files a/miniprogram/images/user-default.png and b/miniprogram/images/user-default.png differ
diff --git a/miniprogram/pages/focus/focus.json b/miniprogram/pages/focus/focus.json
index 8835af0699ccec004cbe685ef938cd2d63ea7037..64e13543ed1aff42c1fdeedcdfe3a19ec1ebf292 100644
--- a/miniprogram/pages/focus/focus.json
+++ b/miniprogram/pages/focus/focus.json
@@ -1,3 +1,7 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "mp-cells": "../components/cells/cells",
+    "mp-cell": "../components/cell/cell",
+    "mp-icon": "../../components/icon/icon"
+  }
 }
\ No newline at end of file
diff --git a/miniprogram/pages/focus/focus.wxml b/miniprogram/pages/focus/focus.wxml
index 7b0f52b15db782df1259d4e8aae7f833c901e1a9..774b7c2b7d99f10153620585ef79eca1ae3d5e4c 100644
--- a/miniprogram/pages/focus/focus.wxml
+++ b/miniprogram/pages/focus/focus.wxml
@@ -1,11 +1,15 @@
-
 <view class="page">
   <view class="page__bd">
-    <view wx:key="_id" wx:for="{{mylist}}" class="weui-cells weui-cells_after-title" style="margin-top: 10px">
+    <mp-cells title="我的订阅" footer="">
+      <mp-cell wx:key="_id" wx:for="{{mylist}}" link hover url="../room/room?roomId={{item._id}}" value="{{typeMap[item.typeName]}} {{item.typeValue}} {{item.date}}" footer="查看">
+        <mp-icon icon="group-detail" slot="icon" color="green" class="yq-m-r"></mp-icon>
+      </mp-cell>
+    </mp-cells>
+    <!-- <view wx:key="_id" wx:for="{{mylist}}" class="weui-cells weui-cells_after-title" style="margin-top: 10px">
       <navigator url="../room/room?roomId={{item._id}}" open-type="navigate" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
         <view class="weui-cell__bd">{{typeMap[item.typeName]}} {{item.typeValue}} {{item.date}}</view>
         <view class="weui-cell__ft weui-cell__ft_in-access">查看</view>
       </navigator>
-    </view>
+    </view> -->
   </view>
 </view>
\ No newline at end of file
diff --git a/miniprogram/pages/focus/focus.wxss b/miniprogram/pages/focus/focus.wxss
index ba8d4d9d0863fc321800114139e1a07b02febedc..ce39be5b3f035a7c7be5328c43fcb5524908e26b 100644
--- a/miniprogram/pages/focus/focus.wxss
+++ b/miniprogram/pages/focus/focus.wxss
@@ -2,3 +2,6 @@
 
 @import "../../lib/weui-miniprogram/weui-wxss/dist/style/weui.wxss";
 
+.yq-m-r {
+  margin-right: 15px;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/im/room/room.js b/miniprogram/pages/im/room/room.js
index f1961f02815dec4260d2a88c5224126033729bde..83bb8d0ced39add05dc0e30d1b642164be534870 100644
--- a/miniprogram/pages/im/room/room.js
+++ b/miniprogram/pages/im/room/room.js
@@ -9,7 +9,7 @@ Page({
     requestResult: '',
     chatRoomCollection: 'chatroom',
     chatRoomGroupId: 'demo',
-    chatRoomGroupName: '聊天室',
+    chatRoomGroupName: '疫情提问',
 
     // functions for used in chatroom components
     onGetUserInfo: null,
diff --git a/miniprogram/pages/member/member.wxml b/miniprogram/pages/member/member.wxml
index a8e77063cb6df97ef493d5a004f3b3d9b455ce9d..4700381500596ebd7125cbcf1c87ff3b8c2394eb 100644
--- a/miniprogram/pages/member/member.wxml
+++ b/miniprogram/pages/member/member.wxml
@@ -1,6 +1,6 @@
 <!--miniprogram/pages/member/member.wxml-->
 <view style="margin:20px">
-  <view>成员列表({{memberNum}})</view>
+  <view>同行者列表({{memberNum}})</view>
   <view class="group">
     <block wx:key="openid" wx:for="{{members}}">
       <image src="{{item.src}}" style="width:32px;height:32px;border-radius:16px;margin:10px"></image>
diff --git a/miniprogram/pages/room/room.json b/miniprogram/pages/room/room.json
index 8835af0699ccec004cbe685ef938cd2d63ea7037..64e13543ed1aff42c1fdeedcdfe3a19ec1ebf292 100644
--- a/miniprogram/pages/room/room.json
+++ b/miniprogram/pages/room/room.json
@@ -1,3 +1,7 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "mp-cells": "../components/cells/cells",
+    "mp-cell": "../components/cell/cell",
+    "mp-icon": "../../components/icon/icon"
+  }
 }
\ No newline at end of file
diff --git a/miniprogram/pages/room/room.wxml b/miniprogram/pages/room/room.wxml
index c2c651dc9406bbeb6ccc8032bda8fd59bd23493e..fc43d1875e5c5c292577211a6daaa0f36b158669 100644
--- a/miniprogram/pages/room/room.wxml
+++ b/miniprogram/pages/room/room.wxml
@@ -1,97 +1,40 @@
 <view class="page">
   <view class="page__bd">
-    <view class="weui-cells__title">交通信息</view>
-    <view class="weui-cells weui-cells_after-title">
-      <view class="weui-cell">
-        <view class="weui-cell__bd">交通类型</view>
-        <view class="weui-cell__ft">{{typeMap[room.typeName]}}</view>
-      </view>
-      <view class="weui-cell">
-        <view class="weui-cell__bd">车次/班次</view>
-        <view class="weui-cell__ft">{{room.typeValue}}</view>
-      </view>
-      <view class="weui-cell">
-        <view class="weui-cell__bd">日期</view>
-        <view class="weui-cell__ft">{{room.date}}</view>
+    <mp-cells title="交通信息" footer="">
+      <mp-cell value="交通类型" footer="{{typeMap[room.typeName]}}">
+        <mp-icon icon="discover" slot="icon" color="blue" class="yq-m-r"></mp-icon>
+      </mp-cell>
+      <mp-cell value="车次/班次" footer="{{room.typeValue}}">
+        <mp-icon icon="note" slot="icon" color="green" class="yq-m-r"></mp-icon>
+      </mp-cell>
+      <mp-cell value="日期" footer="{{room.date}}">
+        <mp-icon icon="time" slot="icon" color="grey" class="yq-m-r"></mp-icon>
+      </mp-cell>
+    </mp-cells>
+    <view wx:if="{{userInfo}}">
+      <mp-cells title="同行信息" footer="">
+        <mp-cell link hover url="../member/member?roomId={{room.id}}" value="同行者" footer="{{memberNum}}人">
+          <mp-icon icon="group-detail" slot="icon" color="green" class="yq-m-r"></mp-icon>
+        </mp-cell>
+        <mp-cell link hover url="../im/room/room?roomId={{room.id}}" value="疫情提问" footer="进入">
+          <mp-icon icon="search" slot="icon" color="grey" class="yq-m-r"></mp-icon>
+        </mp-cell>
+        <mp-cell value="病例报告" footer="{{reportText ? reportText : '当前无疫情'}}">
+          <mp-icon icon="bellring-on" slot="icon" color="red" class="yq-m-r"></mp-icon>
+        </mp-cell>
+        <mp-cell link hover url="../report/report?roomId={{room.id}}" value="报告疫情" footer="我要报告">
+          <mp-icon icon="tag" slot="icon" color="blue" class="yq-m-r"></mp-icon>
+        </mp-cell>
+      </mp-cells>
+      <view class="page" style="margin-top:20px">
+        <view class="page__bd page__bd_spacing">
+          <button class="weui-btn" type="primary" bindtap="showWXCode">显示二维码</button>
+          <button class="weui-btn" bindtap="exitRoom">退出</button>
+        </view>
       </view>
     </view>
+    <view wx:else style="margin-top:20px">
+      <button class="weui-btn" open-type="getUserInfo" type="primary" bindgetuserinfo="onJoinRoom">查看同乘信息</button>
+    </view>
   </view>
-</view>
-
-<view wx:if="{{userInfo}}">
-
-<view class="weui-cells__title">同行信息</view>
-<view class="weui-cells weui-cells_after-title">
-  <navigator url="../member/member?roomId={{room.id}}" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
-    <view class="weui-cell__bd">同行者</view>
-    <view class="weui-cell__ft weui-cell__ft_in-access">{{memberNum}}人</view>
-  </navigator>
-  <navigator url="../im/room/room?roomId={{room.id}}" open-type="navigate" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
-    <view class="weui-cell__bd">聊天室</view>
-    <view class="weui-cell__ft weui-cell__ft_in-access">进入</view>
-  </navigator>
-  <navigator wx:if="{{reportText}}" url="../report/list?roomId={{room.id}}" open-type="navigate" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
-    <view class="weui-cell__bd">病例报告</view>
-    <view class="weui-cell__ft weui-cell__ft_in-access">{{reportText}}</view>
-  </navigator>
-  <view wx:else class="weui-cell">
-    <view class="weui-cell__bd">病例报告</view>
-    <view class="weui-cell__ft">当前无疫情</view>
-  </view>
-  <navigator url="../report/report?roomId={{room.id}}" open-type="navigate" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
-    <view class="weui-cell__bd">报告疫情</view>
-    <view class="weui-cell__ft weui-cell__ft_in-access">我要报告</view>
-  </navigator>
-</view>
-
-<!-- <view>
-  <view>成员({{memberNum}})</view>
-  <view class="group">
-    <block wx:key="openid" wx:for="{{members}}">
-      <image src="{{item.src}}"></image>
-    </block>
-  </view>
-</view> -->
-
-<!-- <view class="uploader">
-  <navigator url="../im/room/room?roomId={{room.id}}" open-type="navigate" class="uploader-text">
-    <text>进入聊天室</text>
-  </navigator>
-</view> -->
-
-<!-- <view wx:if="{{reportText}}">
-  <icon type='warn'></icon>
-  <navigator url="../report/list?roomId={{room.id}}" open-type="navigate">
-    <text>{{reportText}}</text>
-  </navigator>
-</view>
-<view wx:else>
-  <text>当前无疫情报告</text>
-</view> -->
-
-<!-- <view class="uploader" bindtap="showWXCode">
-  <text>显示二维码</text>
-</view> -->
-
-<!-- <view class="uploader">
-  <navigator url="../report/report?roomId={{room.id}}" open-type="navigate" class="uploader-text">
-    <text>报告疫情</text>
-  </navigator>
-</view> -->
-<!-- <view class="uploader" bindtap="exitRoom">
-  <text>退出</text>
-</view> -->
-
-<view class="page" style="margin-top:20px">
-  <view class="page__bd page__bd_spacing">
-    <button class="weui-btn" type="primary" bindtap="showWXCode">显示二维码</button>
-    <button class="weui-btn"  bindtap="exitRoom">退出</button>
-  </view>
-</view>
-
-</view>
-
-<view wx:else  style="margin-top:20px">
-    <button class="weui-btn" open-type="getUserInfo" type="primary" bindgetuserinfo="onJoinRoom">查看同乘信息</button>
-</view>
-
+</view>
\ No newline at end of file
diff --git a/miniprogram/pages/room/room.wxss b/miniprogram/pages/room/room.wxss
index 2a8237896b664d7bc734e798a02a16f5b09d2c01..a118af62345864c77c83ed008e8246c7e84a4f8d 100644
--- a/miniprogram/pages/room/room.wxss
+++ b/miniprogram/pages/room/room.wxss
@@ -11,3 +11,7 @@
 .mini-btn{
     margin: 0 4px;
 }
+
+.yq-m-r {
+  margin-right: 15px;
+}
\ No newline at end of file