diff --git a/app.json b/app.json
index 64e8e4b..a6552dc 100644
--- a/app.json
+++ b/app.json
@@ -24,7 +24,8 @@
     "pages/customer/editCard/index",
     "pages/channel/index",
     "pages/dataAnalysis/index",
-    "pages/distribute/special/index"
+    "pages/distribute/special/index",
+    "pages/customer/optDefeat/index"
   ],
   "echarts": [
     {
diff --git a/commons/css/base/border.wxss b/commons/css/base/border.wxss
index 580a24a..a5a7128 100644
--- a/commons/css/base/border.wxss
+++ b/commons/css/base/border.wxss
@@ -14,4 +14,6 @@
 .bds-7dbeeb{border:#7dbeeb 1rpx solid;box-sizing:border-box;}
 .bds-2-36afa2{border:#36afa2 2rpx solid;box-sizing:border-box;}
 
+.bbs-1-474a65{border-bottom:#474a65 1rpx solid; box-sizing:border-box;}
+
 .last-b-none:last-child{border-bottom:none;}
diff --git a/commons/js/config.js b/commons/js/config.js
index 03159fb..1e3ffb2 100644
--- a/commons/js/config.js
+++ b/commons/js/config.js
@@ -1,4 +1,4 @@
-const env = "p";
+const env = "d";
 
 const version = 1,
 
diff --git a/pages/customer/detail/index.wxml b/pages/customer/detail/index.wxml
index c7daa86..dd5c1ca 100644
--- a/pages/customer/detail/index.wxml
+++ b/pages/customer/detail/index.wxml
@@ -191,9 +191,15 @@
     </view>
   </view>
 
-  <view class="fixed left-0 bottom-0 right-0 bg-fff-op80 pl40 pr40 pt20 pb40 fn-flex z-index-1">
-    <button class="fn-flex-item bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" bindtap="optShowNote"><i class="iconfont icon-xiaoji mr10"></i>小记</button>
-    <button class="fn-flex-item btn-36afa2 ml20 pt10 pb10 text-center font-32 color-fff ulib-r750" bindtap="showSelectStatus">变更状态</button>
+  <view class="fixed left-0 bottom-0 right-0 bg-fff-op80 pl40 pr40 pt20 pb40 z-index-1">
+    <view class="fn-flex" wx:if="{{optDefeat}}">
+      <button class="fn-flex-item bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" bindtap="optShowNote">战败</button>
+      <button class="fn-flex-item btn-36afa2 ml20 pt10 pb10 text-center font-32 color-fff ulib-r750" bindtap="showSelectStatus">再战</button>
+    </view>
+    <view class="fn-flex" wx:else>
+      <button class="fn-flex-item bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" bindtap="optShowNote"><i class="iconfont icon-xiaoji mr10"></i>小记</button>
+      <button class="fn-flex-item btn-36afa2 ml20 pt10 pb10 text-center font-32 color-fff ulib-r750" bindtap="showSelectStatus">变更状态</button>
+    </view>
   </view>
 
 </view>
@@ -263,6 +269,9 @@
           </view>
         </block>
       </view>
+      <view class="pt20 pl40 pr40" wx:if="{{statuskey==3}}">
+        <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" style="height:120rpx;" placeholder-class="color-ccc" maxlength='100' placeholder="请填写战败理由" bindinput='inputTx' data-key="defeatNote" name='defeatNote' value='{{defeatNote}}' />
+      </view>
       <view class="mt40 bts-1-eb ml40 mr40"></view>
       <view class="mt20 pl20 pr15 font-28 fn-clear">
         <view class="fn-fl wp45 relative mt20 ml20 inner30 bg-f6 ulib-r10" bindtap="checkPicker" data-pointer="daodian">
diff --git a/pages/customer/index.js b/pages/customer/index.js
index 010fc9e..30e832a 100644
--- a/pages/customer/index.js
+++ b/pages/customer/index.js
@@ -60,6 +60,15 @@ Page({
     content:'',//短信内容
     isRefresh:false,//判断返回是否需要刷新
     isShowMobile: false,
+    cf_clues:'',//线索来源
+    cluesArray:[
+      '自然进店',
+      '外展',
+      'DM',
+      '转介绍',
+      '其他',
+    ],//线索来源
+    cluesIndex:-1,//索来源索引
   },
   onLoad(options) {
     for (let key in options) {
@@ -191,6 +200,9 @@ Page({
     if(this.data.o_type != ''){
       params['o_type'] = this.data.o_type;
     }
+    if(this.data.cf_clues != ''){
+      params['cf_clues'] = this.data.cf_clues;
+    }
     _.apiQuery.getAppCustomersList(params).then(res => {
       this.setData({
         flag: this.data.flag - 1
@@ -436,6 +448,14 @@ Page({
     })
   },
 
+  //线索来源
+  changeClues(e) {
+    this.setData({
+      cf_clues:this.data.cluesArray[e.detail.value],
+      cluesIndex:e.detail.value,
+    })
+  },
+
   //显示高级搜索
   optfilter(){
     this.setData({
@@ -464,12 +484,14 @@ Page({
       brand_id:'',
       s_id:'',
       cfrom:'',
+      cf_clues:'',//线索来源
       timeSlotIndex:-1,
       testDriveIndex:-1,
       levelIndex:-1,
       brandIndex:-1,
       modelIndex:-1,
       cfromIndex:-1,
+      cluesIndex:-1,//索来源索引
     })
   },
 
diff --git a/pages/customer/index.wxml b/pages/customer/index.wxml
index 3abd7bb..ea35ef2 100644
--- a/pages/customer/index.wxml
+++ b/pages/customer/index.wxml
@@ -39,6 +39,7 @@
 
     <block wx:for='{{list}}' wx:key='index'>
       <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/customer/detail/index?id={{item.id}}">
+        <view class="absolute top-0 left-0 ml40 bg-36afa2 pl10 pr10 font-22 color-fff">战败申请中</view>
         <view class="relative pr180">
           <view class="font-32">
             <text>{{item.name}}</text>
@@ -137,7 +138,7 @@
           </block>
         </view>
       </view>
-      <view class="relative bbs-1-eb pt30 pb30 last-b-none">
+      <!-- <view class="relative bbs-1-eb pt30 pb30 last-b-none">
         <view class="font-22">是否试驾</view>
         <view class="fn-clear">
           <block wx:for="{{testDrive}}" wx:key='index'>
@@ -146,7 +147,7 @@
             </view>
           </block>
         </view>
-      </view>
+      </view> -->
       <view class="relative bbs-1-eb pl190 last-b-none">
         <view class="absolute left-0 box-middle font-28 color-333">意向等级</view>
         <view class="pt30 pb30 text-right font-28 color-666">
@@ -187,6 +188,16 @@
           </picker>
         </view>
       </view>
+      <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{cfrom=='平台分配'}}">
+        <view class="absolute left-0 box-middle">线索来源</view>
+        <view class="pt30 pb30 text-right font-28 color-666">
+          <picker bindchange="changeClues" value="{{cluesIndex}}" range="{{cluesArray}}">
+            <text class="color-ccc" wx:if="{{cluesIndex == -1}}">请选择</text>
+            <text wx:else>{{cluesArray[cluesIndex]}}</text>
+            <i class="iconfont ml5 icon-gengduo"></i>
+          </picker>
+        </view>
+      </view>
       <!-- <view class="relative bbs-1-eb pl190 last-b-none">
         <view class="absolute left-0 box-middle font-28 color-333">到店次数</view>
         <view class="pt30 pb30 text-right font-28 color-666">
diff --git a/pages/customer/optDefeat/index.js b/pages/customer/optDefeat/index.js
new file mode 100644
index 0000000..03be685
--- /dev/null
+++ b/pages/customer/optDefeat/index.js
@@ -0,0 +1,112 @@
+import _ from '../../../commons/js/commons'
+import popularData from '../../../commons/js/lib/popularData';
+const app = getApp()
+Page({
+  data: {
+    key:'',//tab状态值
+    list: [],//客户列表
+    pageNo: 1,
+    noData: false,
+    end: false,
+    load: true,
+    loading: false,
+    isfirstonShow: true,
+  },
+  onLoad(options) {
+    for (let key in options) {
+      this.setData({
+        [key]: options[key]
+      })
+    }
+    this.getAppCustomersList()
+  },
+
+  onShow(){
+    if(this.data.isfirstonShow){
+      this.setData({
+        isfirstonShow:false,
+      })
+    }else{
+      this.getAppCustomersListOnShow()
+    }
+  },
+
+  //获取客户列表
+  getAppCustomersList(){
+    this.setData({
+      load: false,
+      loading: true,
+    })
+    let params = {};
+    params['page'] = this.data.pageNo;
+    params['size'] = 10;
+    _.apiQuery.getAppCustomersList(params).then(res => {
+      this.setData({
+        total: res.data.total,
+        pageNo: this.data.pageNo + 1,
+        list: this.data.list.concat(res.data.list),
+        load: true,
+        loading: false,
+      })
+      if (res.data.total == 0) {
+        this.setData({
+          noData: true
+        })
+      } else if (this.data.list.length == res.data.total) {
+        this.setData({
+          end: true
+        })
+      }
+      wx.stopPullDownRefresh()
+    });
+  },
+
+  //获取客户列表
+  getAppCustomersListOnShow(){
+    let params = {};
+    params['page'] = 1;
+    params['size'] = (this.data.pageNo-1)*10;
+    _.apiQuery.getAppCustomersList(params).then(res => {
+      this.setData({
+        total: res.data.total,
+        list:res.data.list,
+      })
+      if (res.data.total == 0) {
+        this.setData({
+          noData: true
+        })
+      } else if (this.data.list.length == res.data.total) {
+        this.setData({
+          end: true
+        })
+      }
+    });
+  },
+
+  //推送链接
+  pushLink(e){
+    if(e.currentTarget.dataset.url){
+      _.$router.openUrlScheme(e.currentTarget.dataset.url)
+    }
+  },
+
+  //页面相关事件处理函数--监听用户下拉动作
+  onPullDownRefresh(){
+    this.setData({
+      list: [],
+      pageNo: 1,
+      noData: false,
+      end: false,
+      load: true,
+      loading: false,
+    })
+    this.getAppCustomersList()
+  },
+
+  //页面上拉触底事件的处理函数
+  onReachBottom(){
+    if (this.data.noData || this.data.end||!this.data.load) return;
+    this.getAppCustomersList()
+  },
+
+})
\ No newline at end of file
diff --git a/pages/customer/optDefeat/index.json b/pages/customer/optDefeat/index.json
new file mode 100644
index 0000000..c990648
--- /dev/null
+++ b/pages/customer/optDefeat/index.json
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "战败申请",
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+ 
+  }
+}
\ No newline at end of file
diff --git a/pages/customer/optDefeat/index.wxml b/pages/customer/optDefeat/index.wxml
new file mode 100644
index 0000000..96a5cdb
--- /dev/null
+++ b/pages/customer/optDefeat/index.wxml
@@ -0,0 +1,22 @@
+<view class="container">
+
+  <view class="mt20 pl30 pr30">
+    <view class="mb20 font-28" wx:if="{{total>0}}">共<text class="pl5 pr5 color-f9394d">{{total}}</text>个</view>
+    <block wx:for='{{list}}' wx:key='index'>
+      <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/customer/detail/index?id={{item.id}}&optDefeat=true">
+        <view class="relative pr180">
+          <view>
+            <text class="font-32">{{item.name}}</text>
+            <text class="font-28 color-666">({{item.mobile}})</text>
+          </view>
+          <view class="absolute right-0 box-middle font-24 color-666">查看详情<text class="iconfont icon-gengduo ml10"></text></view>
+        </view>
+        <view class="mt15 pt5 pb5 pl20 pr20 font-22 color-f9394d tip-radius">战败理由：该用户已经在其他地方购买了车辆。</view>
+      </view>
+    </block>
+    <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>
+  </view>
+
+</view>
+<lcb-footer></lcb-footer>
+<lcb-backChannel></lcb-backChannel>
\ No newline at end of file
diff --git a/pages/customer/optDefeat/index.wxss b/pages/customer/optDefeat/index.wxss
new file mode 100644
index 0000000..12c7779
--- /dev/null
+++ b/pages/customer/optDefeat/index.wxss
@@ -0,0 +1,4 @@
+.tip-radius{
+  background-color:#fff5f6;
+  border-radius:0 20rpx 20rpx 15rpx;
+}
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 90d9b14..f5355b1 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -32,14 +32,36 @@
           </view>
         </view>
       </view>
-      <view class="relative mt10 mb40 pt20 pb30 pl30 pr30 bg-2f3346-1a1c26 color-fff ulib-r10" wx:if="{{userInfo.group_id == 2 || userInfo.group_id == 3 || userInfo.group_id == 4}}" bindtap="pushLink" data-url="/pages/customer/allot/index">
-        <view>
-          <i class="iconfont icon-daifenpei text-middle font-30"></i>
-          <text class="ml10 font-22 text-middle">待分配客户(人)</text>
+      <view class="relative mt10 mb40 bg-2f3346-1a1c26 color-fff ulib-r10" >
+        <view class="relative pt20 pb30 pl30 pr30 bbs-1-474a65 last-b-none" wx:if="{{userInfo.group_id == 2 || userInfo.group_id == 3 || userInfo.group_id == 4}}" bindtap="pushLink" data-url="/pages/customer/allot/index">
+          <view>
+            <i class="iconfont icon-daifenpei text-middle font-30"></i>
+            <text class="ml10 font-22 text-middle">待分配客户(人)</text>
+          </view>
+          <view class="absolute right-0 box-middle mr25 mb10 font-40">
+            <text class="text-middle">{{userCal.unuse_count}}</text>
+            <i class="iconfont icon-gengduo ml5 text-middle font-26"></i>
+          </view>
         </view>
-        <view class="absolute right-0 box-middle mr25 mb10 font-40">
-          <text class="text-middle">{{userCal.unuse_count}}</text>
-          <i class="iconfont icon-gengduo ml5 text-middle font-26"></i>
+        <view class="relative pt20 pb30 pl30 pr30 bbs-1-474a65 last-b-none" wx:if="{{userInfo.group_id == 2 || userInfo.group_id == 3 || userInfo.group_id == 4}}" bindtap="pushLink" data-url="/pages/customer/allot/index">
+          <view>
+            <i class="iconfont icon-statistics-custom-4 text-middle font-30"></i>
+            <text class="ml10 font-22 text-middle">待回访客户(人)</text>
+          </view>
+          <view class="absolute right-0 box-middle mr25 mb10 font-40">
+            <text class="text-middle">{{userCal.unuse_count}}</text>
+            <i class="iconfont icon-gengduo ml5 text-middle font-26"></i>
+          </view>
+        </view>
+        <view class="relative pt20 pb30 pl30 pr30 bbs-1-474a65 last-b-none" wx:if="{{userInfo.group_id == 2 || userInfo.group_id == 3 || userInfo.group_id == 4}}" bindtap="pushLink" data-url="/pages/customer/optDefeat/index">
+          <view>
+            <i class="iconfont icon-statistics-custom-5 text-middle font-30"></i>
+            <text class="ml10 font-22 text-middle">战败申请(人)</text>
+          </view>
+          <view class="absolute right-0 box-middle mr25 mb10 font-40">
+            <text class="text-middle">{{userCal.unuse_count}}</text>
+            <i class="iconfont icon-gengduo ml5 text-middle font-26"></i>
+          </view>
         </view>
       </view>
       <view class="mt20 font-36">订单代办事项</view>