diff --git a/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java b/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
index 08a7621..960e66d 100644
--- a/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
+++ b/app/src/main/java/com/shunzhi/parent/adapter/MyConsultAdapter.java
@@ -87,7 +87,7 @@ public class MyConsultAdapter extends BaseRecyclerViewAdapter<ChannelContextBean
                 normal_content.setVisibility(View.VISIBLE);
                 tvConsultTitle.setText(object.getTitle());
                 tvConsultContent.setText(object.getContent());
-                tvPingLunNums.setText("评论:"+object.getTalkNum()+"");
+                tvPingLunNums.setText("浏览量:"+object.getLookNum()+"");
                 tvZhuanFaNums.setText("转发:"+object.getForwardingNum()+"");
                 GlideUtils.showImg(mContext,iv_consult,object.getImage());
                 normal_content.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/com/shunzhi/parent/bean/channel/ChannelContextBean.java b/app/src/main/java/com/shunzhi/parent/bean/channel/ChannelContextBean.java
index bcf7b16..077e2c0 100644
--- a/app/src/main/java/com/shunzhi/parent/bean/channel/ChannelContextBean.java
+++ b/app/src/main/java/com/shunzhi/parent/bean/channel/ChannelContextBean.java
@@ -16,7 +16,15 @@ public class ChannelContextBean implements Serializable{
     private int talkNum;
     private int orderById;
     private int isAds;
+    private int lookNum;
 
+    public int getLookNum() {
+        return lookNum;
+    }
+
+    public void setLookNum(int lookNum) {
+        this.lookNum = lookNum;
+    }
 
     public int getId() {
         return id;
@@ -92,17 +100,18 @@ public class ChannelContextBean implements Serializable{
 
     @Override
     public String toString() {
-        return "ChannelContextBean:{" +
-                ",id='" + id + '\'' +
-                ",image='" + image + '\'' +
-                ",title='" + title + '\'' +
-                ",url='" + url + '\'' +
-                ",content='" + content + '\'' +
-                ",forwardingNum='" + forwardingNum + '\'' +
-                ",talkNum='" + talkNum + '\'' +
-                ",orderById='" + orderById + '\'' +
+        return "ChannelContextBean{" +
+                "id=" + id +
+                ", image='" + image + '\'' +
+                ", title='" + title + '\'' +
+                ", url='" + url + '\'' +
+                ", content='" + content + '\'' +
+                ", forwardingNum=" + forwardingNum +
+                ", talkNum=" + talkNum +
+                ", orderById=" + orderById +
                 ", isAds=" + isAds +
-                "}";
+                ", lookNum=" + lookNum +
+                '}';
     }
 
 }
diff --git a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
index 3f1f209..00f4f3d 100644
--- a/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
+++ b/app/src/main/java/com/shunzhi/parent/manager/MessageManager.java
@@ -79,9 +79,9 @@ public class MessageManager {
             public void onEvent(StatusCode statusCode) {
                 if (statusCode == StatusCode.KICKOUT) {
                     Context context = AppContext.getInstance();
-                    Intent i = new Intent(context, LoginAndRegistActivity.class);
-                    i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-                    context.startActivity(i);
+//                    Intent i = new Intent(context, LoginAndRegistActivity.class);
+//                    i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+//                    context.startActivity(i);
                 }
             }
         }, true);
diff --git a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
index b004a1f..d2949dc 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/MainActivity.java
@@ -103,13 +103,14 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
             if (index == i) fragmentTransaction.show(fragments[index]);
             else fragmentTransaction.hide(fragments[i]);
         }
+        if (index==CONSULT_INDEX)consultFragment.refresh();
         fragmentTransaction.commit();
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        handIntent(intent);
+//        handIntent(intent);
     }
 
     private void handIntent(Intent intent) {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java
index 959ec19..9b607e9 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java
@@ -175,19 +175,19 @@ public class OrderDetailActivity extends BaseMVPCompatActivity<OrderDetailContra
                         switch (object.payState){
                             case 0://待支付
                                 tvPayState.setText("待支付");
-                                ivState.setBackgroundColor(getResources().getColor(R.color.md_red_500));
+                                ivState.setImageDrawable(getResources().getDrawable(R.drawable.order_wait));
                                 break;
                             case 1://支付成功
                                 tvPayState.setText("支付成功");
-                                ivState.setImageDrawable(getResources().getDrawable(R.drawable.success));
+                                ivState.setImageDrawable(getResources().getDrawable(R.drawable.order_success));
                                 break;
                             case 2://交易关闭
                                 tvPayState.setText("交易关闭");
-                                ivState.setBackgroundColor(getResources().getColor(R.color.gray));
+                                ivState.setImageDrawable(getResources().getDrawable(R.drawable.wait_fail));
                                 break;
                             case 3:
                                 tvPayState.setText("支付失败");
-                                ivState.setImageDrawable(getResources().getDrawable(R.drawable.close));
+                                ivState.setImageDrawable(getResources().getDrawable(R.drawable.wait_fail));
                                 break;
                         }
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
index 48fc1a0..bbfe399 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
@@ -100,10 +100,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
     @Override
     public void onResume() {
         super.onResume();
-//        if (!tvLocalAddress.getText().toString().equals(AppContext.getInstance().cityName)){
         tvLocalAddress.setText(AppContext.getInstance().district);
-//        addTools();
-//        }
     }
 
     private void initListeners(View view) {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
index d147386..c55cb3e 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
@@ -94,7 +94,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
         videoplayer.replayTextView.setVisibility(View.GONE);
         videoplayer.backButton.setVisibility(View.GONE);
 
-
         mPresenter.getBanners("2", AppContext.getInstance().district);
 
         initBroadCast();
@@ -103,7 +102,8 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
     }
 
     private void initRecycler() {
-        recycler_context.setLayoutManager(new LinearLayoutManager(getActivity()));
+
+        recycler_context.setPullRefreshEnabled(false);
         recycler_context.setLoadingListener(new XRecyclerView.LoadingListener() {
             @Override
             public void onRefresh() {
@@ -275,4 +275,8 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
         AppContext.getInstance().cityName = name.split(" ")[1];
         AppContext.getInstance().district = name.split(" ")[2];
     }
+
+    public void refresh() {
+        mPresenter.getContextChannel(AppContext.getInstance().district,0,1,pageIndex);
+    }
 }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
index cdad70d..25b15ac 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
@@ -110,7 +110,6 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult
 
     private void initBannes(List<GuangGaoBean> guangGaoBeanList) {
         try {
-            Log.d("66666","initBannes"+guangGaoBeanList);
             if (isQidong) {
                 String fileUrl = "", describe = "";
                 for (int i = 0; i < guangGaoBeanList.size(); i++) {
diff --git a/app/src/main/res/drawable-xhdpi/order_wait.png b/app/src/main/res/drawable-xhdpi/order_wait.png
new file mode 100644
index 0000000..dc7b81b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/order_wait.png differ
diff --git a/app/src/main/res/drawable-xhdpi/oredr_success.png b/app/src/main/res/drawable-xhdpi/oredr_success.png
new file mode 100644
index 0000000..81a2eec
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/oredr_success.png differ
diff --git a/app/src/main/res/drawable-xhdpi/wait_fail.png b/app/src/main/res/drawable-xhdpi/wait_fail.png
new file mode 100644
index 0000000..abe0eb2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/wait_fail.png differ
diff --git a/app/src/main/res/layout/fragment_consult_one_level.xml b/app/src/main/res/layout/fragment_consult_one_level.xml
index ae0649b..8634969 100644
--- a/app/src/main/res/layout/fragment_consult_one_level.xml
+++ b/app/src/main/res/layout/fragment_consult_one_level.xml
@@ -4,17 +4,12 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/bgColor"
-    android:paddingTop="@dimen/size_dp_10"
-    android:paddingRight="@dimen/size_dp_10"
-    android:paddingLeft="@dimen/size_dp_10"
     tools:context="com.shunzhi.parent.ui.fragment.consult.ConsultOneLevelFragment">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recyclerViewGrally"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginBottom="@dimen/size_dp_10"
+        android:layout_height="150dp"
         ></android.support.v7.widget.RecyclerView>
 
     <include layout="@layout/layout_textandimgshow"/>
@@ -22,8 +17,9 @@
     <com.jcodecraeer.xrecyclerview.XRecyclerView
         android:layout_marginTop="@dimen/size_dp_10"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="3"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="@dimen/size_dp_10"
+        android:layout_marginRight="@dimen/size_dp_10"
         android:id="@+id/recyclerViewConsultOne"
         ></com.jcodecraeer.xrecyclerview.XRecyclerView>
 
diff --git a/app/src/main/res/layout/fragment_zi_xun.xml b/app/src/main/res/layout/fragment_zi_xun.xml
index f6458d9..59b8a7e 100644
--- a/app/src/main/res/layout/fragment_zi_xun.xml
+++ b/app/src/main/res/layout/fragment_zi_xun.xml
@@ -37,7 +37,6 @@
                 android:orientation="vertical"
                 android:paddingLeft="@dimen/size_dp_10"
                 android:paddingRight="@dimen/size_dp_10">
-
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/layout_consult_content.xml b/app/src/main/res/layout/layout_consult_content.xml
index 35cf703..d7b62e3 100644
--- a/app/src/main/res/layout/layout_consult_content.xml
+++ b/app/src/main/res/layout/layout_consult_content.xml
@@ -72,6 +72,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:text="转发:50"
+                        android:visibility="gone"
                         android:textSize="@dimen/textSize14" />
                 </RelativeLayout>
             </FrameLayout>
diff --git a/app/src/main/res/layout/text_and_img_show.xml b/app/src/main/res/layout/text_and_img_show.xml
index d370ef7..be7f4cb 100644
--- a/app/src/main/res/layout/text_and_img_show.xml
+++ b/app/src/main/res/layout/text_and_img_show.xml
@@ -16,8 +16,9 @@
 
         <ImageView
             android:id="@+id/image"
-            android:layout_width="@dimen/size_dp_50"
-            android:layout_height="@dimen/size_dp_50"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/zczx"
             android:scaleType="fitXY"
             />
 
--
libgit2 0.21.0