冲突之后的提交 8-23

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/crm/Business.java

@@ -13,6 +13,7 @@ public class Business {
     private int bc_id;
     private String code;
     private String num;
+    private String steps;
     private String name;
     private String leader;
     private String source;
@@ -121,4 +122,12 @@ public class Business {
     public void setCode(String code) {
         this.code = code;
     }
+
+    public String getSteps() {
+        return steps;
+    }
+
+    public void setSteps(String steps) {
+        this.steps = steps;
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessAddActivity.java

@@ -314,9 +314,8 @@ public class BusinessAddActivity extends BaseActivity implements View.OnClickLis
                         "\"bc_address\":\"" + bc_address + "\",\n" +   //地址
                         "\"bc_contact\":\"" + bc_contact + "\",\n" +   //联系人
                         "\"bc_position\":\"" + bc_position + "\",\n" +   //职位
-                        "\"bt_tel\":\"" + bt_tel + "\",\n" +   //电话
-                        "\"bc_type\":\"" + bc_type + "\",\n" +   //商机类型
-                     
+                        "\"bt_tel\":\"" + bt_tel + "\"\n" +   //电话
+                       /* "\"bc_type\":\"" + bc_type + "\",\n" +   //商机类型*/
                         "}";
         Log.i(TAG, "sendHttpResquest:" + formStore);
         params.put("formStore", formStore);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailActivty.java

@@ -50,6 +50,7 @@ import java.util.Map;
  * @return:
  */
 public class BusinessDetailActivty extends BaseActivity {
+    
     private BussinessDetailAdapter mAdapter;
     @ViewInject(R.id.ll_top_state)
     private LinearLayout ll_top_state;
@@ -128,7 +129,6 @@ public class BusinessDetailActivty extends BaseActivity {
     int type;
 
     private void initData() {
-        sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
         Intent intent = getIntent();
         type = 0;
         if (intent != null) {
@@ -144,20 +144,7 @@ public class BusinessDetailActivty extends BaseActivity {
             getSupportActionBar().setTitle("分配");
             ll_top_state.setVisibility(View.GONE);
         }
-       /* for (int i = 0; i < 22; i++) {
-            Business model = new Business();
-            model.setNum("013223" + i);
-            model.setName("xxx" + i);
-            model.setLeader("****" + i);
-            model.setNote("xxxxxxxxxxxx" + i);
-            model.setPhone("*********" + i);
-            model.setSource("####" + i);
-            model.setType(type);
-            mData.add(model);
-        }*/
-        mAdapter = new BussinessDetailAdapter(this, mData);
-        mlist.setAdapter(mAdapter);
-
+        sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page);
     }
 
 
@@ -201,6 +188,7 @@ public class BusinessDetailActivty extends BaseActivity {
                 holder.tv_phone = (TextView) convertView.findViewById(R.id.tv_crm_business_phone);
                 holder.tv_source = (TextView) convertView.findViewById(R.id.tv_crm_business_source);
                 //  holder.tv_num= (TextView) convertView.findViewById(R.id.tv_crm_business_num);
+                holder.tv_steps= (TextView) convertView.findViewById(R.id.tv_crm_business_steps);
                 holder.bt_event = (Button) convertView.findViewById(R.id.bt_business_qiang);
                 convertView.setTag(holder);
             } else {
@@ -215,6 +203,7 @@ public class BusinessDetailActivty extends BaseActivity {
             //holder.tv_leader.setText(mdata.get(position).getLeader());
             holder.tv_note.setText(mdata.get(position).getNote());
             holder.tv_phone.setText(mdata.get(position).getPhone());
+            holder.tv_steps.setText(mdata.get(position).getSteps());
             holder.tv_source.setText(mdata.get(position).getSource());
             if (mdata.get(position).getType() == 0) {
                 holder.bt_event.setVisibility(View.GONE);
@@ -299,7 +288,7 @@ public class BusinessDetailActivty extends BaseActivity {
             int bc_id;
             TextView tv_num;
             TextView tv_name;
-            TextView tv_leader;
+            TextView tv_steps;
             TextView tv_source;
             TextView tv_phone;
             TextView tv_note;
@@ -333,7 +322,8 @@ public class BusinessDetailActivty extends BaseActivity {
                             model.setName(array.getJSONObject(i).getString("bc_description"));
                             model.setPhone(array.getJSONObject(i).getString("bc_tel"));
                             model.setNote(array.getJSONObject(i).getString("bc_remark"));
-                            model.setSource(array.getJSONObject(i).getString("bc_from"));
+                            model.setSource(array.getJSONObject(i).getString("bc_from"));//BC_NICHEHOUSE
+                            model.setSteps(array.getJSONObject(i).getString("bc_nichehouse"));
                             if (array.getJSONObject(i).getObject("bc_id", Object.class) instanceof Integer) {
                                 model.setBc_id(array.getJSONObject(i).getInteger("bc_id"));
                             }
@@ -385,7 +375,15 @@ public class BusinessDetailActivty extends BaseActivity {
         params.put("page", page);
         params.put("pageSize", 10);
         params.put("caller", "BusinessChance");
-        params.put("condition", "(bc_type='公有' or nvl(bc_type,' ')=' ')");
+        if (type==1){//抢
+            params.put("condition", "bc_nichehouse in (select  bd_name from BusinessDataBase where bd_prop='公有')");
+        }else
+        if (type==2){//分配
+            params.put("condition", "bc_type='私有' and nvl(bc_doman,' ')=' ' and bc_nichehouse in (select bd_name from BusinessDataBase where bd_admincode=" +
+                    "'"+CommonUtil.getSharedPreferences(ct,"erp_username")+"')");
+        }else {//跟进
+            params.put("condition", "(bc_type='公有' or nvl(bc_type,' ')=' ')");
+        }
         //bc_currentprocess=商机阶段
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailInfoActivity.java

@@ -54,11 +54,14 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     private Button bt_qiang;
     @ViewInject(R.id.bt_manage_date)
     private Button bt_manage_date;
+    @ViewInject(R.id.bt_zhuanyi)
+    private Button bt_zhuanyi;
+ 
+    
     @ViewInject(R.id.bt_manage_go)
     private Button bt_manage_go;
     @ViewInject(R.id.crm_ll_followup)
     private LinearLayout crm_ll_followup;
-
     @ViewInject(R.id.crm_ll_qiang)
     private LinearLayout crm_ll_qiang;
     @ViewInject(R.id.crm_ll_manage)
@@ -66,20 +69,37 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
 
     @ViewInject(R.id.bc_from)
     private TextView bc_from;
-    @ViewInject(R.id.bc_phone)
-    private TextView bc_phone;
     @ViewInject(R.id.bc_remark)
     private TextView bc_remark;
-    @ViewInject(R.id.bc_state)
-    private TextView bc_state;
-    @ViewInject(R.id.bc_name)
-    private TextView bc_name;
     @ViewInject(R.id.bc_recorder)
     private TextView bc_recorder;
     @ViewInject(R.id.bc_recorddate)
     private TextView bc_recorddate;
-    @ViewInject(R.id.bc_recorddate_update)
-    private TextView bc_recorddate_update;
+
+    @ViewInject(R.id.bc_code)
+    private TextView bc_code;
+    @ViewInject(R.id.bc_description)
+    private TextView  bc_description;
+    @ViewInject(R.id.bc_nichehouse)
+    private TextView bc_nichehouse;
+    @ViewInject(R.id.bc_type)
+    private TextView  bc_type;
+    @ViewInject(R.id.bc_currentprocess)
+    private TextView  bc_currentprocess;
+    @ViewInject(R.id.bc_lastdate)
+    private TextView  bc_lastdate;
+    @ViewInject(R.id.bc_doman)
+    private TextView  bc_doman;
+    @ViewInject(R.id.bc_custname)
+    private TextView  bc_custname;
+    @ViewInject(R.id.bc_address)
+    private TextView        bc_address;
+    @ViewInject(R.id.bc_contact)
+    private TextView bc_contact;
+    @ViewInject(R.id.bc_position)
+    private TextView       bc_position;
+    @ViewInject(R.id.bt_tel)
+    private TextView  bt_tel;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -132,6 +152,8 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         bt_manage_go.setOnClickListener(this);
         bt_qiang.setOnClickListener(this);
         bt_fenpei.setOnClickListener(this);
+        bt_zhuanyi.setOnClickListener(this);
+
     }
 
     private void initData() {
@@ -156,6 +178,9 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
             case R.id.bt_fenpei:
                 startActivityForResult(new Intent(ct, DbfindListActivity.class), 1);
                 break;
+            case R.id.bt_zhuanyi:
+                startActivity(new Intent(ct, BusinessTransferActivity.class).putExtra("code",bt_code));
+                break;
         }
     }
 
@@ -297,13 +322,23 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                     JSONObject root = JSON.parseObject(msg.getData().getString("result")).getJSONObject("panelData");
                     if (root != null) {
                         bc_from.setText(root.getString("bc_from"));
-                        bc_name.setText(root.getString("bc_nichehouse"));
-                        bc_phone.setText("无");
+                        bc_nichehouse.setText(root.getString("bc_nichehouse"));
+                        bt_tel.setText(root.getString("bt_tel"));
                         bc_recorddate.setText(root.getString("bc_recorddate"));
-                        bc_recorddate_update.setText(root.getString("bc_lastdate"));
+                        bc_lastdate.setText(root.getString("bc_lastdate"));
                         bc_recorder.setText(root.getString("bc_recorder"));
                         bc_remark.setText(root.getString("bc_remark"));
-                        bc_state.setText("已分配");
+                        
+                        bc_doman.setText(root.getString("bc_doman"));
+                        bc_code.setText(root.getString("bc_code"));
+                        bc_address.setText(root.getString("bc_address"));
+                        bc_custname.setText(root.getString("bc_custname"));
+                        bc_position.setText(root.getString("bc_position"));
+                        bc_contact.setText(root.getString("bc_contact"));
+                        bc_description.setText(root.getString("bc_description"));
+                        bc_currentprocess.setText(root.getString("bc_currentprocess"));
+                        bc_type.setText(root.getString("bc_type"));
+                        
                         bt_doman = root.getString("bc_doman");
                         bt_code = root.getString("bc_code");
                         bt_process = root.getString("bc_currentprocess");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessLessActivity.java

@@ -13,6 +13,7 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
@@ -20,7 +21,10 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.util.ToastUtil;
+import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -31,7 +35,7 @@ import java.util.Map;
  * @param:
  * @return:
  */
-public class BusinessLessActivity extends BaseActivity {
+public class BusinessLessActivity extends BaseActivity implements View.OnClickListener{
     @ViewInject(R.id.ll_moment)
     private LinearLayout ll_moment;
     @ViewInject(R.id.ll_leader)
@@ -41,6 +45,10 @@ public class BusinessLessActivity extends BaseActivity {
     private EditText et_remark;
     @ViewInject(R.id.tv_business_state)
     private TextView tv_business_state;
+    @ViewInject(R.id.tv_leader)
+    private TextView tv_leader;
+    @ViewInject(R.id.tv_date)
+    private TextView  tv_date;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -57,7 +65,8 @@ public class BusinessLessActivity extends BaseActivity {
     }
 
     private void initListener() {
-
+        tv_date.setOnClickListener(this);
+        tv_leader.setOnClickListener(this);
     }
 
     int type = 1;
@@ -124,6 +133,13 @@ public class BusinessLessActivity extends BaseActivity {
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
 
+                    break;
+                case 2:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    String leader= JSON.parseObject(msg.getData().getString("result"))
+                            .getJSONObject("data").getString("em_name");
+                    tv_leader.setText(leader);
                     break;
             }
         }
@@ -135,8 +151,8 @@ public class BusinessLessActivity extends BaseActivity {
         String gridSore="{\n" +
                 "\"bcd_bccode\":\""+code+"\",\n" +
                 "\"bcd_remark\":\""+remark+"\",\n" +
-                "\"bcd_leader\":\"陈经理\",\n" +
-                "\"bcd_date\":\"2016-07-23\",\n" +
+                "\"bcd_leader\":\""+tv_leader.getText().toString()+"\",\n" +
+                "\"bcd_date\":\""+tv_date.getText().toString()+"\",\n" +
                 "\"bcd_bsname\":\""+process+"\",\n" +
                 "\"bcd_type\":\""+type+"\",\n" +
                 "\"bcd_man\":\""+doman+"\""+
@@ -150,4 +166,47 @@ public class BusinessLessActivity extends BaseActivity {
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
     }
+    
+    private void loadLeader(int what){
+        String url= Constants.getAppBaseUrl(ct)+"mobile/crm/getheadmanmsg.action";
+        Map<String,Object> params=new HashMap<>();
+        params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
+    }
+    
+    private void showDateWheel(final int resId){
+        DatePicker picker = new DatePicker(this,DatePicker.YEAR_MONTH_DAY);
+        picker.setRange(1950, 2030);
+        //Calendar.getInstance().get(Calendar.DAY_OF_MONTH)
+        picker.setSelectedItem(
+                Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH) + 1);
+        picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
+            @Override
+            public void onDatePicked(String year, String month,String day) {
+                switch (resId) {
+                    case R.id.tv_date://排名
+                        ToastUtil.showToast(ct, year + "-" + month);
+                       tv_date.setText(year + "-" + month+"-"+day);
+                        break;
+                }
+            }
+        });
+        picker.show();
+    }
+
+   
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.tv_leader:
+                loadLeader(2);
+                break;
+            case R.id.tv_date:
+                showDateWheel(R.id.tv_date);
+                break;
+        }
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessStateActivity.java

@@ -259,7 +259,8 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
                 holder.tv_datetv = (TextView) convertView.findViewById(R.id.tv_crm_business_datetv);
                 holder.tv_phone = (TextView) convertView.findViewById(R.id.tv_crm_business_phone);
                 holder.tv_source = (TextView) convertView.findViewById(R.id.tv_crm_business_source);
-                //  holder.tv_num= (TextView) convertView.findViewById(R.id.tv_crm_business_num);
+                holder.tv_steps= (TextView) convertView.findViewById(R.id.tv_crm_business_steps);
+                //holder.tv_datetv= (TextView) convertView.findViewById(R.id.tv_crm_business_datetv);
                 holder.bt_event = (Button) convertView.findViewById(R.id.bt_business_qiang);
                 convertView.setTag(holder);
             } else {
@@ -270,7 +271,8 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
             holder.tv_num.setText(mdata.get(position).getNum());
             holder.tv_name.setText(mdata.get(position).getName());
             holder.tv_date.setText(mdata.get(position).getDate());
-            holder.tv_datetv.setText("");
+            holder.tv_datetv.setText("创建时间");
+            holder.tv_steps.setText(mdata.get(position).getSteps());
             //holder.tv_leader.setText(mdata.get(position).getLeader());
             holder.tv_note.setText(mdata.get(position).getNote());
             holder.tv_phone.setText(mdata.get(position).getPhone());
@@ -346,7 +348,7 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
             int bc_id;
             TextView tv_num;
             TextView tv_name;
-            TextView tv_leader;
+            TextView tv_steps;
             TextView tv_source;
             TextView tv_phone;
             TextView tv_note;
@@ -410,6 +412,7 @@ public class BusinessStateActivity extends BaseActivity implements View.OnClickL
                             model.setName(array.getJSONObject(i).getString("BC_DOMAN"));
                             model.setPhone(array.getJSONObject(i).getString("BC_TEL"));
                             model.setNote(array.getJSONObject(i).getString("BC_REMARK"));
+                            model.setSteps(array.getJSONObject(i).getString("BC_NICHEHOUSE"));
                             model.setSource(array.getJSONObject(i).getString("BC_FROM"));
                             if (array.getJSONObject(i).getObject("BC_ID",Object.class) instanceof Integer)
                             { model.setBc_id(array.getJSONObject(i).getInteger("BC_ID"));}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListActivity.java

@@ -142,9 +142,7 @@ public class CustomerListActivity extends BaseActivity {
             case R.id.crm_data_find:
                 startActivity(new Intent(ct, CustomerListSelectActivity.class));
                 break;
-            case R.id.crm_data_select:
-                startActivity(new Intent(ct, CustomerMutilSelectActivity.class));
-                break;
+        
             case android.R.id.home:
                 onBackPressed();
                 break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/FunnelView.java

@@ -191,8 +191,8 @@ public class FunnelView extends View implements ValueAnimator.AnimatorUpdateList
         } else {
             
             size = maxHight + 20;
-//            if (size<900)
-//                size=900;
+            if (size<900)
+                size=900;
             Log.i("Arison", "getMeasuredLength:size :" + size  );
         }
         return size;

WeiChat/src/main/res/layout/activity_business_detail_info.xml

@@ -1,341 +1,509 @@
 <?xml version="1.0" encoding="utf-8"?><!--    com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView-->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:background="@drawable/bg_bar"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-
-    android:fillViewport="true">
-
-    <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-        android:background="@color/crm_basic_bg"
-        android:orientation="vertical"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessDetailInfoActivity">
-
-    <RelativeLayout
-
+    android:layout_height="match_parent">
+    <ScrollView
+        android:layout_above="@+id/ll_bottom"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
+        android:layout_height="wrap_content"
+        android:fillViewport="true">
         <LinearLayout
-            android:id="@+id/ll_left_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-
-            android:layout_alignParentLeft="true"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_marginTop="20dp"
-                android:layout_gravity="center_horizontal"
-                android:background="@drawable/shape_crm_round" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:textColor="@color/wheat"
-                android:text="xxxx提供" />
-        </LinearLayout>
-
-        <View
-            android:layout_toRightOf="@+id/ll_left_layout"
-            android:layout_toLeftOf="@+id/ll_center_layout"
-            android:layout_centerVertical="true"
-            android:layerType="software"
-            style="@style/app_line_xuxian_horizontal_05p"></View>
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessDetailInfoActivity">
+          <!--  <RelativeLayout
 
-        <LinearLayout
-            android:id="@+id/ll_center_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:layout_centerInParent="true"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_marginTop="20dp"
-                android:layout_gravity="center_horizontal"
-                android:background="@drawable/shape_crm_round" />
-
-            <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:textColor="@color/wheat"
-                android:text="xxxx提供" />
-        </LinearLayout>
+                android:visibility="gone">
 
-        <View
-            android:layout_toRightOf="@+id/ll_center_layout"
-            android:layout_toLeftOf="@+id/ll_right_layout"
-            android:layout_centerVertical="true"
-            android:layerType="software"
-            style="@style/app_line_xuxian_horizontal_05p"></View>
-        <LinearLayout
-            android:id="@+id/ll_right_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:layout_alignParentRight="true"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_marginTop="20dp"
-                android:layout_gravity="center_horizontal"
-                android:background="@drawable/shape_crm_round" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:textColor="@color/wheat"
-                android:text="xxxx提供" />
-        </LinearLayout>
-
-    </RelativeLayout>
-
-        <LinearLayout
-            style="@style/crm_ll_card"
-            android:layout_height="wrap_content">
-
-            <LinearLayout style="@style/LinearLayout_horizontal">
-
-                <TextView
-                    android:layout_width="10dp"
-                    android:layout_height="15dp"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/shape_tv_color"
-                    android:textColor="#FF8E57" />
-
-                <TextView
+                <LinearLayout
+                    android:id="@+id/ll_left_layout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
-                    android:textSize="15sp"
-                    android:textColor="#FF8E57"
-                    android:text="基本信息" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_margin="10dp"
-                style="@style/LinearLayout_horizontal">
-
-                <TextView
-                    android:text="来源"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
-                    android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
-
-                <TextView
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter"
-                    android:id="@+id/bc_from" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_margin="10dp"
-                style="@style/LinearLayout_horizontal">
-
-                <TextView
-                    android:text="联系方式"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
-                    android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
-
-                <TextView
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter"
-                    android:id="@+id/bc_phone" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_margin="10dp"
-                style="@style/LinearLayout_horizontal">
-
-                <TextView
-                    android:text="备注"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
-                    android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
-
-                <TextView
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter"
-                    android:id="@+id/bc_remark" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            style="@style/crm_ll_card"
-            android:layout_height="wrap_content">
-
-            <LinearLayout style="@style/LinearLayout_horizontal">
-
-                <TextView
-                    android:layout_width="10dp"
-                    android:layout_height="15dp"
-                    android:layout_gravity="center_vertical"
-                    android:background="@drawable/shape_tv_color"
-                    android:textColor="#FF8E57" />
 
-                <TextView
+                    android:layout_alignParentLeft="true"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="50dp"
+                        android:layout_height="50dp"
+                        android:layout_marginTop="20dp"
+                        android:layout_gravity="center_horizontal"
+                        android:background="@drawable/shape_crm_round" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:textColor="@color/wheat"
+                        android:text="xxxx提供" />
+                </LinearLayout>
+
+                <View
+                    android:layout_toRightOf="@+id/ll_left_layout"
+                    android:layout_toLeftOf="@+id/ll_center_layout"
+                    android:layout_centerVertical="true"
+                    android:layerType="software"
+                    style="@style/app_line_xuxian_horizontal_05p"></View>
+
+                <LinearLayout
+                    android:id="@+id/ll_center_layout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
-                    android:textSize="15sp"
-                    android:textColor="#FF8E57"
-                    android:text="其它" />
-            </LinearLayout>
-
+                    android:layout_centerInParent="true"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="50dp"
+                        android:layout_height="50dp"
+                        android:layout_marginTop="20dp"
+                        android:layout_gravity="center_horizontal"
+                        android:background="@drawable/shape_crm_round" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:textColor="@color/wheat"
+                        android:text="xxxx提供" />
+                </LinearLayout>
+
+                <View
+                    android:layout_toRightOf="@+id/ll_center_layout"
+                    android:layout_toLeftOf="@+id/ll_right_layout"
+                    android:layout_centerVertical="true"
+                    android:layerType="software"
+                    style="@style/app_line_xuxian_horizontal_05p"></View>
+                <LinearLayout
+                    android:id="@+id/ll_right_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:layout_alignParentRight="true"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="50dp"
+                        android:layout_height="50dp"
+                        android:layout_marginTop="20dp"
+                        android:layout_gravity="center_horizontal"
+                        android:background="@drawable/shape_crm_round" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:textColor="@color/wheat"
+                        android:text="xxxx提供" />
+                </LinearLayout>
+
+            </RelativeLayout>-->
             <LinearLayout
-                android:layout_margin="10dp"
-                style="@style/LinearLayout_horizontal">
-
-                <TextView
-                    android:text="状态"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
-                    android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
-
-                <TextView
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter"
-                    android:id="@+id/bc_state" />
+                style="@style/crm_ll_card"
+                android:layout_height="wrap_content">
+                <LinearLayout style="@style/LinearLayout_horizontal">
+                    <TextView
+                        android:layout_width="10dp"
+                        android:layout_height="15dp"
+                        android:layout_gravity="center_vertical"
+                        android:background="@drawable/shape_tv_color"
+                        android:textColor="#FF8E57" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="10dp"
+                        android:textSize="15sp"
+                        android:textColor="#FF8E57"
+                        android:text="基本信息" />
+                </LinearLayout>
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="商机库编号"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_code" />
+                </LinearLayout>
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="商机库名称"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_description" />
+                </LinearLayout>
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="来源"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_from" />
+                </LinearLayout>
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="商机库"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_nichehouse" />
+                </LinearLayout>
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:text="商机类型"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_type" />
+                </LinearLayout>
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="当前阶段"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_currentprocess" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="创建时间"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_recorddate" />
+                </LinearLayout>
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="创建人"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_recorder" />
+                </LinearLayout>
+
+          
+
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="最后跟进时间"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_lastdate" />
+                </LinearLayout>
+            
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="跟进人"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_doman" />
+                </LinearLayout>
+          
+
+         
             </LinearLayout>
-
             <LinearLayout
-                android:layout_margin="10dp"
-                style="@style/LinearLayout_horizontal">
-
-                <TextView
-                    android:text="商机库"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
-                    android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
-
-                <TextView
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter"
-                    android:id="@+id/bc_name" />
+                style="@style/crm_ll_card"
+                android:layout_marginTop="10dp"
+                android:layout_height="wrap_content">
+
+                <LinearLayout style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:layout_width="10dp"
+                        android:layout_height="15dp"
+                        android:layout_gravity="center_vertical"
+                        android:background="@drawable/shape_tv_color"
+                        android:textColor="#FF8E57" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="10dp"
+                        android:textSize="15sp"
+                        android:textColor="#FF8E57"
+                        android:text="联系方式" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="企业名称"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_custname" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="地址"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_address" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="联系人"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_contact" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="职位"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_position" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="电话"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bt_tel" />
+                </LinearLayout>
             </LinearLayout>
-
             <LinearLayout
-                android:layout_margin="10dp"
-                style="@style/LinearLayout_horizontal">
-
-                <TextView
-                    android:text="创建人"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
-                    android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
-
-                <TextView
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter"
-                    android:id="@+id/bc_recorder" />
+                style="@style/crm_ll_card"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="20dp"
+                android:layout_height="wrap_content">
+                <LinearLayout style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:layout_width="10dp"
+                        android:layout_height="15dp"
+                        android:layout_gravity="center_vertical"
+                        android:background="@drawable/shape_tv_color"
+                        android:textColor="#FF8E57" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="10dp"
+                        android:textSize="15sp"
+                        android:textColor="#FF8E57"
+                        android:text="其它" />
+                </LinearLayout>
+                <LinearLayout
+                    android:padding="5dp"
+                    style="@style/LinearLayout_horizontal">
+
+                    <TextView
+                        android:text="备注"
+                        android:textColor="@color/gray_light"
+                        android:layout_marginLeft="10dp"
+                        android:layout_width="70dp"
+                        style="@style/TextView_VerticalCenter" />
+
+                    <TextView
+                        android:layout_marginLeft="5dp"
+                        style="@style/TextView_VerticalCenter"
+                        android:id="@+id/bc_remark" />
+                </LinearLayout>
+
+            
+
+             
             </LinearLayout>
+     
+        </LinearLayout>
 
-            <LinearLayout
-                android:layout_margin="10dp"
-                style="@style/LinearLayout_horizontal">
-
-                <TextView
-                    android:text="创建时间"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
-                    android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
-
-                <TextView
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter"
-                    android:id="@+id/bc_recorddate" />
-            </LinearLayout>
+    </ScrollView>
+    <LinearLayout
+        android:id="@+id/ll_bottom"
+        style="@style/crm_ll_card"
+        android:layout_alignParentBottom="true"
+        android:layout_height="wrap_content">
 
-            <LinearLayout
-                android:layout_margin="10dp"
-                style="@style/LinearLayout_horizontal">
-
-                <TextView
-                    android:text="最后变化时间"
-                    android:textColor="@color/gray_light"
-                    android:layout_marginLeft="10dp"
-                    android:layout_width="70dp"
-                    style="@style/TextView_VerticalCenter" />
-
-                <TextView
-                    android:layout_marginLeft="5dp"
-                    style="@style/TextView_VerticalCenter"
-                    android:id="@+id/bc_recorddate_update" />
-            </LinearLayout>
+        <LinearLayout
+            android:id="@+id/crm_ll_followup"
+            style="@style/LinearLayout_horizontal"
+            android:weightSum="2">
+
+            <Button
+                android:id="@+id/bt_manage_date"
+                android:layout_weight="1"
+                android:text="添加日程"
+                style="@style/crm_business_btn_nomargin" />
+
+            <Button
+                android:id="@+id/bt_manage_go"
+                android:layout_weight="1"
+                android:text="跟进"
+                style="@style/crm_business_btn_nomargin" />
         </LinearLayout>
 
         <LinearLayout
-            style="@style/crm_ll_card"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:id="@+id/crm_ll_followup"
-                style="@style/LinearLayout_horizontal"
-                android:weightSum="2">
-
-                <Button
-                    android:id="@+id/bt_manage_date"
-                    android:layout_weight="1"
-                    android:text="添加日程"
-                    style="@style/crm_business_btn_nomargin" />
-
-                <Button
-                    android:id="@+id/bt_manage_go"
-                    android:layout_weight="1"
-                    android:text="跟进"
-                    style="@style/crm_business_btn_nomargin" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:visibility="gone"
-                android:id="@+id/crm_ll_qiang"
-                style="@style/LinearLayout_horizontal"
-                android:weightSum="2">
+            android:visibility="gone"
+            android:id="@+id/crm_ll_qiang"
+            style="@style/LinearLayout_horizontal"
+            android:weightSum="2">
 
-                <Button
-                    android:id="@+id/bt_qiang"
-                    android:layout_weight="1"
-                    android:text="抢"
-                    style="@style/crm_business_btn_nomargin" />
+            <Button
+                android:id="@+id/bt_qiang"
+                android:layout_weight="1"
+                android:text="抢"
+                style="@style/crm_business_btn_nomargin" />
 
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:visibility="gone"
-                android:id="@+id/crm_ll_manage"
-                style="@style/LinearLayout_horizontal"
-                android:weightSum="2">
+        </LinearLayout>
 
-                <Button
-                    android:id="@+id/bt_fenpei"
-                    android:layout_weight="1"
-                    android:text="分配"
-                    style="@style/crm_business_btn_nomargin" />
 
-            </LinearLayout>
+        <LinearLayout
+            android:visibility="gone"
+            android:id="@+id/crm_ll_manage"
+            style="@style/LinearLayout_horizontal"
+            android:weightSum="2">
+
+            <Button
+                android:id="@+id/bt_fenpei"
+                android:layout_weight="1"
+                android:text="分配"
+                style="@style/crm_business_btn_nomargin" />
+            <Button
+                android:id="@+id/bt_zhuanyi"
+                android:layout_weight="1"
+                android:text="转移"
+                style="@style/crm_business_btn_nomargin" />
         </LinearLayout>
     </LinearLayout>
-
-</ScrollView>
+</RelativeLayout>

WeiChat/src/main/res/layout/activity_business_less.xml

@@ -27,6 +27,14 @@
             android:text="直属领导:"
             android:layout_margin="10dp"
             style="@style/TextView_Basic" />
+        <TextView
+            android:background="@drawable/shape_from_edit"
+            android:drawableRight="@drawable/nav_icon_search_default"
+            android:layout_margin="10dp"
+            android:layout_width="260dp"
+            android:padding="5dp"
+            style="@style/TextView_Basic"
+            android:id="@+id/tv_leader" />
     </LinearLayout>
 
     <LinearLayout style="@style/LinearLayout_horizontal">
@@ -38,8 +46,13 @@
 
         <TextView
             android:text="2016年06月28日 11:23"
+            android:background="@drawable/shape_from_edit"
+            android:drawableRight="@drawable/nav_icon_search_default"
             android:layout_margin="10dp"
-            style="@style/TextView_Basic" />
+            android:layout_width="260dp"
+            android:padding="5dp"
+            style="@style/TextView_Basic"
+            android:id="@+id/tv_date" />
     </LinearLayout>
 
     <LinearLayout
@@ -54,7 +67,11 @@
         <TextView
             android:id="@+id/tv_business_state"
             android:text="未分配"
+            android:background="@drawable/shape_from_edit"
+            android:drawableRight="@drawable/nav_icon_search_default"
             android:layout_margin="10dp"
+            android:layout_width="260dp"
+            android:padding="5dp"
             style="@style/TextView_Basic" />
     </LinearLayout>
 </LinearLayout>

WeiChat/src/main/res/layout/activity_business_qiang_activty.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/crm_basic_bg"
+    android:background="@drawable/bg_bar"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.BusinessDetailActivty">
     
 
@@ -93,8 +93,6 @@
     </LinearLayout>
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
         style="@style/ListViewBasic">
     </com.handmark.pulltorefresh.library.PullToRefreshListView>
 

WeiChat/src/main/res/layout/activity_customer_list.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/crm_basic_bg"
+    android:background="@drawable/bg_bar"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.CustomerListActivity">
 
     <RelativeLayout
@@ -26,9 +26,10 @@
 
             <TextView
                 android:text="chensir"
-                android:textColor="@color/white"
+                android:textColor="#030303"
                 style="@style/TextView_Basic"
-                android:id="@+id/tv_name" />
+                android:id="@+id/tv_name"
+                android:textSize="18sp" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -36,7 +37,7 @@
 
                 <TextView
                     android:text="深圳总部"
-                    android:textColor="@color/white"
+                    android:textColor="#686666"
                     style="@style/TextView_Basic"
                     android:id="@+id/tv_department" />
 
@@ -45,7 +46,7 @@
                 <TextView
                     android:text="总经理"
                     android:layout_marginLeft="15dp"
-                    android:textColor="@color/white"
+                    android:textColor="#4f4848"
                     style="@style/TextView_Basic"
                     android:id="@+id/tv_position" />
             </LinearLayout>
@@ -57,7 +58,8 @@
             android:layout_margin="10dp"
             android:clickable="true"
             android:onClick="changeOnChange"
-            android:textColor="@color/white"
+            android:drawableRight="@drawable/nav_icon_search_default"
+            android:textColor="#1c1b1b"
             android:layout_centerVertical="true"
             style="@style/TextView_Basic"
             android:text="切换" />

WeiChat/src/main/res/layout/item_business_detail.xml

@@ -9,16 +9,27 @@
 
         <TextView
             android:text="商机编号："
+            android:minWidth="90dp"
             style="@style/TextView_Basic" />
         <TextView
             android:id="@+id/tv_crm_business_num"
             android:text="XXXXXXX"
             style="@style/TextView_Basic" />
     </LinearLayout>
+    <LinearLayout style="@style/crm_ll_sale_item">
 
+        <TextView
+            android:minWidth="90dp"
+            android:text="商机库："
+            style="@style/TextView_Basic" />
+        <TextView
+            android:id="@+id/tv_crm_business_steps"
+            style="@style/TextView_Basic" />
+    </LinearLayout>
     <LinearLayout style="@style/crm_ll_sale_item">
 
         <TextView
+            android:minWidth="90dp"
             android:text="商机名称："
             style="@style/TextView_Basic" />
 
@@ -31,6 +42,7 @@
     <LinearLayout style="@style/crm_ll_sale_item">
 
         <TextView
+            android:minWidth="90dp"
             android:text="商机来源："
             style="@style/TextView_Basic" />
 
@@ -43,7 +55,8 @@
     <LinearLayout style="@style/crm_ll_sale_item">
 
         <TextView
-            android:text="联系方式："
+            android:minWidth="90dp"
+            android:text="手机："
             style="@style/TextView_Basic" />
 
         <TextView
@@ -55,6 +68,7 @@
     <LinearLayout style="@style/crm_ll_sale_item">
 
         <TextView
+            android:minWidth="90dp"
             android:text="备注："
             style="@style/TextView_Basic" />
 
@@ -69,6 +83,7 @@
         android:layout_gravity="right">
 
         <TextView
+            android:minWidth="90dp"
             android:id="@+id/tv_crm_business_datetv"
             android:text="xx日期："
             android:layout_gravity="center_vertical"

WeiChat/src/main/res/layout/item_customer_main.xml

@@ -8,7 +8,7 @@
         <TextView
             android:id="@+id/tv_cu_title"
             android:text="深圳市优软科技有限公司"
-            android:textSize="16sp"
+            android:textSize="15sp"
             style="@style/TextView_Basic" />
 
         <TextView
@@ -78,7 +78,7 @@
     <LinearLayout style="@style/crm_ll_sale_item">
 
         <TextView
-            android:text="负责人："
+            android:text="业务员："
             android:minWidth="100dp"
             android:gravity="left"
             style="@style/TextView_Basic" />

WeiChat/src/main/res/menu/main_customer_top.xml

@@ -6,11 +6,6 @@
         android:icon="@drawable/abc_ic_search_api_mtrl_alpha"
         android:title="查找"
         app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/crm_data_select"
-        android:icon="@drawable/icon_select"
-        android:title="筛选"
-        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/crm_data_add"
         android:icon="@drawable/fab_add"