新版logo添加版本号

扫码签名
私域通
2022-02-23 15:19:58 +08:00 · 2022-02-12 11:42:17 +08:00 · 2022-02-10 17:03:31 +08:00 · 2022-02-10 10:48:20 +08:00 · 2022-02-10 10:21:45 +08:00 · 2022-02-09 15:23:20 +08:00
178 changed files with 2899 additions and 22374 deletions
@@ -5,10 +5,6 @@ App({
    this.updateVersion()
    wx.getSystemInfo({
      success(res) {
-        console.log(res)
-        if(!!res.environment&&res.environment=='wxwork'){
-          console.log('当前企业微信')
-        }
        that.globalData.statusBarHeight = res.statusBarHeight;
        that.globalData.screenHeight = res.screenHeight;
        that.globalData.screenWidth = res.screenWidth;
@@ -137,11 +133,10 @@ App({
    updateManager.onCheckForUpdate(function (res) {
      // 请求完新版本信息的回调
    })
-    
    updateManager.onUpdateReady(function () {
      wx.showModal({
        title: '更新提示',
-        content: '新版本已经准备好，\n是否重启应用？',
+        content: '新版本已经准备好，是否重启应用？',
        success: function (res) {
          if (res.confirm) {
            // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
@@ -35,34 +35,9 @@
    "pages/recommend/index",
    "pages/allot/index",
    "pages/storeInfo/index",
-    "pages/order/detail/index2",
-    "pages/order/edit/index2",
-    "pages/order/editOwner/index",
-    "pages/order/filterList/index2",
    "pages/siyutong/index",
    "pages/siyutong/activityDetail/index",
-    "pages/siyutong/activityRanking/index",
-    "pages/inventory/detail/index",
-    "pages/inventory/list/index",
-    "pages/inventory/warning/index",
-    "pages/order/editFinance/index",
-    "pages/statement/registration/index",
-    "pages/statement/privacy/index",
-    "pages/order/editCardid/index",
-    "pages/order/editBusinessBicence/index",
-    "pages/order/editLicenseImg/index",
-    "pages/order/editInsImg/index",
-    "pages/order/editOtherImg/index",
-    "pages/storeData/index",
-    "pages/storeData/customerData/index",
-    "pages/storeData/wechatData/index",
-    "pages/storeData/orderData/index",
-    "pages/order/editDeliveryckimg/index",
-    "pages/order/editQVImg/index",
-    "pages/order/editVoucherImg/index",
-    "pages/dataAnalysis/detail/index",
-    "pages/order/editBuyer/index",
-    "pages/storeData/subData/index"
+    "pages/siyutong/activityRanking/index"
  ],
  "echarts": [
    {
@@ -10,7 +10,6 @@
 .bg-1a{background-color: #1a1a1a;}
 .bg-36afa2{background-color:#36afa2;}
 .bg-f9394d{background-color:#f9394d;}
-.bg-3f4047{background-color:#3f4047;}

 .bg-000-op30{background-color:rgba(0,0,0,.3);}
 .bg-000-op50{background-color:rgba(0,0,0,.5);}
@@ -27,8 +26,6 @@

 .bg-2f3346-1a1c26{background-image:linear-gradient(#2f3346,#1a1c26);}

-.bg-f6-fff{background-image:linear-gradient(#f6f6f6,#fff);}
-
 .bg-f3f6fc{background-color:#f3f6fc;}
 .bg-fffaeb{background-color:#fffaeb;}
 .bg-f1f9f8{background-color:#f1f9f8;}
@@ -9,19 +9,12 @@
 .bds-1-eb{border:#ebebeb 1rpx solid; box-sizing:border-box;}
 .btd-1-eb{border-top:#ebebeb 1rpx dashed;box-sizing:border-box;}

-.bds-2-eb{border:#ebebeb 2rpx solid; box-sizing:border-box;}
-
 .bds-2-fff{border:#fff 2rpx solid; box-sizing:border-box;}

 .bds-7dbeeb{border:#7dbeeb 1rpx solid;box-sizing:border-box;}
 .bds-2-36afa2{border:#36afa2 2rpx solid;box-sizing:border-box;}
-.bts-2-36afa2{border-top:#36afa2 2rpx solid;box-sizing:border-box;}
-.bls-2-36afa2{border-left:#36afa2 2rpx solid;box-sizing:border-box;}
-.brs-2-36afa2{border-right:#36afa2 2rpx solid;box-sizing:border-box;}
-.bbs-2-36afa2{border-bottom:#36afa2 2rpx solid;box-sizing:border-box;}
 .bds-2-f9394d{border:#f9394d 2rpx solid;box-sizing:border-box;}

-.bts-1-474a65{border-top:#474a65 1rpx 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;}
@@ -13,5 +13,4 @@
 .color-f9394d{color:#f9394d;}
 .color-fe4109{color:#fe4109;}
 .color-36afa2{color:#36afa2;}
-.color-00c800{color:#00c800;}
-.color-575b6a{color:#575b6a;}
+.color-00c800{color:#00c800;}
@@ -26,5 +26,4 @@
 .font-75{font-size:75rpx;}
 .font-80{font-size:80rpx;}
 .font-90{font-size:90rpx;}
-.font-120{font-size:120rpx;}
-.font-180{font-size:180rpx;}
+.font-120{font-size:120rpx;}
@@ -16,7 +16,6 @@
 .img-135x135{width:135rpx;height:135rpx;box-sizing:border-box;}
 .img-140x140{width:140rpx;height:140rpx;box-sizing:border-box;}
 .img-160x160{width:160rpx;height:160rpx;box-sizing:border-box;}
-.img-190x175{width:190rpx;height:175rpx;box-sizing:border-box;}
 .img-200x180{width:200rpx;height:180rpx;box-sizing:border-box;}
 .img-208x170{width:208rpx;height:170rpx;box-sizing:border-box;}
 .img-220x200{width:220rpx;height:200rpx;box-sizing:border-box;}
@@ -29,6 +29,7 @@

 /*layout flex*/
 .fn-flex{display:flex;flex-flow:row;align-items:stretch;}
+.fn-flex-center{align-items:center;}
 .fn-flex-item{display:block;flex:1;}
 .fn-flex-item.flexsize2{flex:2;}
 .fn-flex-item.flexsize3{flex:3;}
@@ -42,9 +43,8 @@
 .fn-flex-between{justify-content: space-between;}/*两端对齐*/
 .fn-flex-wrap{flex-wrap:wrap}/*多行*/
 .fn-flex-around{justify-content: space-around;}/*各项周围留有空白*/
-.fn-flex-middle{align-items:center;}/*交叉轴上上下居中对齐*/
-.fn-flex-center{justify-content: center;}/*居中对齐*/

+.wp20{width:20%;box-sizing:border-box;}
 .wp25{width:25%;box-sizing:border-box;}
 .wp31{width:31%;box-sizing:border-box;}
 .wp33{width:33%;box-sizing:border-box;}
@@ -117,8 +117,6 @@
 .line-height-20{line-height:2;}
 .rich-text-img{display:bolck;max-width:100% !important;height:auto !important;margin:40rpx 0 20rpx 0 !important;}

-.height-80{height:80rpx;box-sizing:border-box;}
-.height-90{height:90rpx;box-sizing:border-box;}
 .height-100{height:100rpx;box-sizing:border-box;}
 .height-120{height:120rpx;box-sizing:border-box;}
 .height-190{height:190rpx;box-sizing:border-box;}
@@ -130,7 +128,4 @@
 .tabmenu{line-height:80rpx;}
 .tabmenu.active::before{display:block;position:absolute;bottom:0;left:50%;width:30rpx;height:4rpx;margin-left:-15rpx;content:"";background-color:#36afa2;}

-.safe-pb{padding-bottom:calc(constant(safe-area-inset-bottom) - 15px );padding-bottom:calc(env(safe-area-inset-bottom) - 15px);}
-
-.datecell{width:14.28%;padding:30rpx 0;text-align:center;box-sizing:border-box;}
-.datecell.active{background-color:#36afa2;color:#fff;}
+.safe-pb{padding-bottom:calc(constant(safe-area-inset-bottom) - 15px );padding-bottom:calc(env(safe-area-inset-bottom) - 15px);}
@@ -19,11 +19,9 @@
 .mt90{margin-top:90rpx;}
 .mt110{margin-top:110rpx;}
 .mt120{margin-top:120rpx;}
-.mt130{margin-top:130rpx;}
 .mt150{margin-top:150rpx;}
 .mt190{margin-top:190rpx;}
 .ml-1{margin-left:-1rpx;}
-.ml1{margin-left:1rpx;}
 .ml5{margin-left:5rpx;}
 .ml10{margin-left:10rpx;}
 .ml15{margin-left:15rpx;}
@@ -46,7 +44,6 @@
 .ml200{margin-left:200rpx;}
 .mr-20{margin-right:-20rpx;}
 .mr-30{margin-right:-30rpx;}
-.mr1{margin-right:1rpx;}
 .mr5{margin-right:5rpx;}
 .mr10{margin-right:10rpx;}
 .mr11{margin-right:11rpx;}
@@ -66,7 +63,6 @@
 .mr170{margin-right:170rpx;}
 .mr180{margin-right:180rpx;}
 .mr190{margin-right:190rpx;}
-.mb5{margin-bottom:5rpx;}
 .mb10{margin-bottom:10rpx;}
 .mb15{margin-bottom:15rpx;}
 .mb20{margin-bottom:20rpx;}
@@ -1,4 +1,3 @@
-.inner6{padding:6rpx;}
 .inner8{padding:8rpx;}
 .inner10{padding:10rpx;}
 .inner20{padding:20rpx;}
@@ -9,8 +8,6 @@

 .pt0{padding-top:0;}
 .pt2{padding-top:2rpx;}
-.pt3{padding-top:3rpx;}
-.pt4{padding-top:4rpx;}
 .pt5{padding-top:5rpx}
 .pt8{padding-top:8rpx;}
 .pt10{padding-top:10rpx;}
@@ -1,4 +1,4 @@
-const env = "d";
+const env = "p";

 const version = 1,

@@ -36,7 +36,8 @@ api = {
  appCustomerData: "app/customers/data", //获取客户详细信息
  appCusorder: "app/cusorder", //新建订单 /获取订单列表 /获取订单详情 /修改付款方式 /修改委托协议
  appCusorderTabs: "app/cusorder/tabs", //获取tab
-  appEmployees: "app/employees", //获取客户详细信息 /获取店员列表 /更新店员信息 /删除店员 
+  appEmployees: "app/employees", //获取客户详细信息 /获取店员列表 /更新店员信息 /删除店员
+  appLoan: "app/loan", //获取贷款产品信息 /创建贷款信息 /修改贷款信息
  appIdcard: "app/idcard", //创建申请开票信息
  appUserCal: "app/user/cal", //获取用户统计
  appCusorderCkcar: "app/cusorder/ckcar", //确认交付
@@ -46,7 +47,6 @@ api = {
  appCustomerData: "app/customers/data", //修改客户基本信息
  appServicesPackage: "app/services/package", //获取代办包
  appSeriesInfo: "app/series/info", //获取车辆价格
-  appBusiness: "app/business", //获取商务政策

  appSeriesBrands: "app/series/brands", //获取车型品牌
  appSeries: "app/series", //获取车系车型
@@ -55,7 +55,6 @@ api = {

  appFinance: "app/finance", //获取金融产品列表
  appFinanceNums: "app/finance/nums", //获取金融分期期数
-  appLoan: "app/loan", //修改贷款信息

  appUserBizs: "app/user/bizs", //获取管理门店
  appStatisticsCust: "app/statistics/cust", //获取渠道客户统计
@@ -65,12 +64,6 @@ api = {
  appStatisticsOcust: "app/statistics/ocust", //数据分析-订单数据
  appStatisticsHcust: "app/statistics/hcust", //首页-客户图标数据
  appStatisticsHorder: "app/statistics/horder", //首页-订单图表数据
-
-  appStatisticsStats: "app/statistics/stats", //获取渠道经理数据分析入口数据
-  appStatisticsStats_days: "app/statistics/stats_days", //获取渠道经理数据分析数据
-  appStatisticsStats_customer: "app/statistics/stats_customer", //获取渠道经理数据分析数据
-
-
  appUserResetbiz: "app/user/resetbiz", //更新用户店铺id
  appXzStat: "app/xz/stat", //获取电话统计数据
  appCity: "app/city", //获取系统配置城市
@@ -89,7 +82,7 @@ api = {
  appCustomersDefeats: 'app/customers/defeats', //战败客户列表 /战败/再战申请

  appServices:'app/services', //获取代办服务列表
-  appFine:'app/fine', //获取精品赠送列表 /获取精品选装
+  appFine:'app/fine', //获取精品赠送列表

  materialHomeBiz:'material/home/biz', //店铺海报
  materialHomePosters:'material/home/posters', //保存店铺海报
@@ -126,48 +119,7 @@ api = {
  appSytactivityDetail:'app/sytactivity/detail', //活动详情
  appSytactivityLog:'app/sytactivity/log', //实时战报
  appSytactivityRanking:'app/sytactivity/ranking', //活动排名
-
-  appInventoryTabs:'app/inventory/tabs', //盘点记录_tab
-  appInventoryLists:'app/inventory/lists', //盘点记录
-  appInventory:'app/inventory', //盘点详情 /盘点上传图片
-  appInventoryRemind:'app/inventory/remind', //盘点提醒
-
-  appGoodsRemind:'app/goods/remind', //库存提醒/预警
-  appGoodsLists:'app/goods/lists', //库存列表
-
-  appCustomersOffline_sources:'app/customers/offline_sources', //客户来源
-  appCustomersTag:'app/customers/tag', //客户标签
-
-  appCityOncard:'app/city/oncard', //获取上牌城市
-  appFinanceNums:'app/finance/nums', //获取金融分期期数
-
-  appCusorderV2Customer:'app/cusorderV2/customer', //获取客户订单
-
-  appCustomersVisit_tabs:'app/customers/visit_tabs', //回访待跟进tab
-
-  appIdcardInfo:'app/idcard/info', //识别身份证号码
-
-  appCustomersComments:'app/customers/comments', //用户评论
-
-  appCityArea:'app/city/area', //获取省/市/区/街道
-
-  appEmployeesLeave:'app/employees/leave', //获取离职 //提交离职
-
-  appCusorderV2Admins:'app/cusorderV2/admins', //分配订单
-
-  appCusorderdataInfo:'app/cusorderdata/info', //保单信息确认
-
-  appBizStats:'app/biz/stats', //数据看板首页
-  appBizStats_customer:'app/biz/stats_customer', //客户数据
-  appBizStats_wxqy:'app/biz/stats_wxqy', //企微数据
-  appBizStats_order:'app/biz/stats_order', //订单数据
-  appBizStats_days:'app/biz/stats_days', //客户/订单走势图
-  appBizStats_customer_pid:'app/biz/stats_customer_pid', //客户数据二级
-  appBizStats_order_series:'app/biz/stats_order_series', //品牌数据二级
-
-  appOptions:'app/options', //获取车辆选装包
-
-  appResetgroupid:'app/user/resetgroupid', //切换角色
+  

 }

@@ -24,6 +24,33 @@ apiQuery.putUserInfo = function (params) {
  })
 }

+//用户信息授权
+apiQuery.authUserInfo = function (params) {
+  return new Promise(function (resolve, reject) {
+    wx.getSetting({
+      success(res) {
+        let userInfo = app.getStorageByKey("userInfo");
+        console.log(res.authSetting)
+        if (res.authSetting['scope.userInfo']) {
+          if (!userInfo.nickname || !userInfo.headimg || (userInfo.headimg != JSON.parse(params.detail.rawData).avatarUrl)) {
+            asyncLogin().then(res => {
+              apiQuery.putUserInfo({
+                encryptedData: params.detail.encryptedData,
+                iv: params.detail.iv
+              }).then(res => {
+                //设置本地存储
+                resolve(res)
+              })
+            })
+          } else {
+            resolve(userInfo)
+          }
+        }
+      }
+    })
+  })
+}
+
 //用户手机号码授权
 apiQuery.authUserPhone = function (params) {
  return new Promise(function (resolve, reject) {
@@ -202,7 +229,7 @@ apiQuery.postAppEmployees = function (params) {
  })
 }

-//更新店员信息  //提交离职
+//更新店员信息
 apiQuery.putAppEmployees = function (params) {
  return new Promise(function (resolve, reject) {
    HttpRequest(true, Config.api.appEmployees, 2, params, "PUT", resolve, reject)
@@ -216,6 +243,27 @@ apiQuery.deleteAppEmployees = function (params) {
  })
 }

+//获取贷款产品信息
+apiQuery.getAppLoan = function (params) {
+  return new Promise(function (resolve, reject) {
+    HttpRequest(false, Config.api.appLoan, 2, params, "GET", resolve, reject)
+  })
+}
+
+//创建贷款信息
+apiQuery.postAppLoan = function (params) {
+  return new Promise(function (resolve, reject) {
+    HttpRequest(true, Config.api.appLoan, 2, params, "POST", resolve, reject)
+  })
+}
+
+//修改贷款信息
+apiQuery.putAppLoan = function (params) {
+  return new Promise(function (resolve, reject) {
+    HttpRequest(true, Config.api.appLoan, 2, params, "PUT", resolve, reject)
+  })
+}
+
 //创建申请开票信息
 apiQuery.postAppIdcard = function (params) {
  return new Promise(function (resolve, reject) {
@@ -233,7 +281,7 @@ apiQuery.putAppIdcard = function (params) {
 //获取用户统计
 apiQuery.getAppUserCal = function (params) {
  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.appUserCal, 2, params, "GET", resolve, reject)
+    HttpRequest(false, Config.api.appUserCal, 2, params, "GET", resolve, reject)
  })
 }

@@ -258,7 +306,7 @@ apiQuery.getAppXz = function (params) {
  })
 }

-//新增日志  /作废
+//新增日志
 apiQuery.postAppCustomerlogs = function (params) {
  return new Promise(function (resolve, reject) {
    HttpRequest(true, Config.api.appCustomerlogs, 2, params, "POST", resolve, reject)
@@ -286,13 +334,6 @@ apiQuery.getAppSeriesInfo = function(params){
  })
 }

-//获取商务政策
-apiQuery.getAppBusiness = function(params){
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appBusiness, 2, params, "GET", resolve, reject)
-  })
-}
-
 //获取车型品牌
 apiQuery.getAppSeriesBrands = function(params){
  return new Promise(function (resolve, reject) {
@@ -748,236 +789,4 @@ apiQuery.getAppSytactivityRanking = function (params) {
  })
 }

-//盘点记录_tab
-apiQuery.getAppInventoryTabs = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appInventoryTabs, 2, params, "GET", resolve, reject)
-  })
-}
-
-//盘点列表
-apiQuery.getAppInventoryLists = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appInventoryLists, 2, params, "GET", resolve, reject)
-  })
-}
-
-//盘点详情
-apiQuery.getAppInventory = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appInventory, 2, params, "GET", resolve, reject)
-  })
-}
-
-//确认盘点
-apiQuery.postAppInventory = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.appInventory, 2, params, "POST", resolve, reject)
-  })
-}
-
-//盘点提醒
-apiQuery.getAppInventoryRemind = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appInventoryRemind, 2, params, "GET", resolve, reject)
-  })
-}
-
-//库存提醒/预警
-apiQuery.getAppGoodsRemind = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appGoodsRemind, 2, params, "GET", resolve, reject)
-  })
-}
-
-//库存列表
-apiQuery.getAppGoodsLists = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appGoodsLists, 2, params, "GET", resolve, reject)
-  })
-}
-
-//客户来源
-apiQuery.getAppCustomersOffline_sources = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appCustomersOffline_sources, 2, params, "GET", resolve, reject)
-  })
-}
-
-//客户标签
-apiQuery.getAppCustomersTag = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appCustomersTag, 2, params, "GET", resolve, reject)
-  })
-}
-
-//修改贷款信息
-apiQuery.putAppLoan = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.appLoan, 2, params, "PUT", resolve, reject)
-  })
-}
-
-//获取上牌城市
-apiQuery.getAppCityOncard = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appCityOncard, 2, params, "GET", resolve, reject)
-  })
-}
-
-//获取金融分期期数
-apiQuery.getAppFinanceNums = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appFinanceNums, 2, params, "GET", resolve, reject)
-  })
-}
-
-//获取客户订单
-apiQuery.getAppCusorderV2Customer = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appCusorderV2Customer, 2, params, "GET", resolve, reject)
-  })
-}
-
-//回访待跟进tab
-apiQuery.getAppCustomersVisit_tabs = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appCustomersVisit_tabs, 2, params, "GET", resolve, reject)
-  })
-}
-
-//识别身份证号码
-apiQuery.getAppIdcardInfo = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appIdcardInfo, 2, params, "GET", resolve, reject)
-  })
-}
-
-
-//用户评论
-apiQuery.postAppCustomersComments = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.appCustomersComments, 2, params, "POST", resolve, reject)
-  })
-}
-
-//获取省/市/区/街道
-apiQuery.getAppCityArea = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appCityArea, 2, params, "GET", resolve, reject)
-  })
-}
-
-//获取离职
-apiQuery.getAppEmployeesLeave = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appEmployeesLeave, 2, params, "GET", resolve, reject)
-  })
-}
-
-//提交离职
-apiQuery.putAppEmployeesLeave = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.appEmployeesLeave, 2, params, "PUT", resolve, reject)
-  })
-}
-
-//分配订单
-apiQuery.putAppCusorderV2Admins = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.appCusorderV2Admins, 2, params, "PUT", resolve, reject)
-  })
-}
-
-//保单信息确认
-apiQuery.putAppCusorderdataInfo = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.appCusorderdataInfo, 2, params, "PUT", resolve, reject)
-  })
-}
-
-//数据看板首页
-apiQuery.getAppBizStats = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appBizStats, 2, params, "GET", resolve, reject)
-  })
-}
-
-//客户数据
-apiQuery.getAppBizStats_customer = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appBizStats_customer, 2, params, "GET", resolve, reject)
-  })
-}
-
-//企微数据
-apiQuery.getAppBizStats_wxqy = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appBizStats_wxqy, 2, params, "GET", resolve, reject)
-  })
-}
-
-//订单数据
-apiQuery.getAppBizStats_order = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appBizStats_order, 2, params, "GET", resolve, reject)
-  })
-}
-
-//客户/订单走势图
-apiQuery.getAppBizStats_days = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appBizStats_days, 2, params, "GET", resolve, reject)
-  })
-}
-
-//客户数据二级
-apiQuery.getAppBizStats_customer_pid = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appBizStats_customer_pid, 2, params, "GET", resolve, reject)
-  })
-}
-
-//品牌数据二级
-apiQuery.getAppBizStats_order_series = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appBizStats_order_series, 2, params, "GET", resolve, reject)
-  })
-}
-
-//获取渠道经理数据分析入口数据
-apiQuery.getAppStatisticsStats = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appStatisticsStats, 2, params, "GET", resolve, reject)
-  })
-}
-
-//获取渠道经理数据分析数据
-apiQuery.getAppStatisticsStats_days = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appStatisticsStats_days, 2, params, "GET", resolve, reject)
-  })
-}
-
-//获取渠道经理数据分析数据
-apiQuery.getAppStatisticsStats_customer = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appStatisticsStats_customer, 2, params, "GET", resolve, reject)
-  })
-}
-
-//获取车辆选装包
-apiQuery.getAppOptions = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appOptions, 2, params, "GET", resolve, reject)
-  })
-}
-
-//切换角色
-apiQuery.putAppResetgroupid = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.appResetgroupid, 2, params, "PUT", resolve, reject)
-  })
-}
-
 export default apiQuery;
@@ -134,7 +134,6 @@ let combineUrl = (DATA) => {
 let toEncrypt = (DATA) => {
  // let secretKey = randomString()
  let data = combineUrl(DATA)
-  //console.log(data)//加密原始数据
  return md5.hex_md5(data);
 }

@@ -19,7 +19,7 @@ function getAjaxUserInfo(){
 function isAuthUserInfo() {
  return new Promise(function (resolve, reject) {
    api.getUserInfo().then(res=>{
-      resolve(Boolean(res && res.headimg))
+      resolve(Boolean(res && res.nickname && res.headimg))
    })
  })
 }
@@ -47,9 +47,155 @@ function isOpenCard() {
  })
 }

+
+/**
+ * 获得用户位置，返回一个promise，同时间只会跑一个
+ * {
+ *  lat,
+ *  lng,
+ *  from_storage //true表示是从缓存里获得, false表示从设置里获得
+ * }
+ */
+// function getUserLocation() {
+//   return new Promise((resolve, reject) => {
+//     // const lat = wx.getStorageSync('u_lat');
+//     // const lng = wx.getStorageSync('u_lng');
+//     // if (lat && lng) {
+//     //   return resolve({
+//     //     lat,
+//     //     lng,
+//     //     from_storage: true,
+//     //   })
+//     // } else {
+//       const loading = wx.getStorageSync('loading_gps');
+//       if (loading) {
+//         setTimeout(() => {
+//           return resolve(this.getUserLocation());
+//         }, 30);
+//         return;
+//       }
+//       wx.setStorageSync('loading_gps', 1)
+//       wx.getSetting({
+//         success(res) {
+//           console.log("======获取用户地理位置=====")
+//           console.log(res);
+//           wx.getLocation({
+//             type: 'gcj02',
+//             success: function (res) {
+//               var lat = res.latitude
+//               var lng = res.longitude
+//               wx.setStorageSync('u_lat', lat)
+//               wx.setStorageSync('u_lng', lng)
+//               wx.removeStorageSync('loading_gps')
+//               return resolve({
+//                 lat,
+//                 lng,
+//                 from_storage: false,
+//               })
+//             },
+//             fail: function (res) {
+//               console.log("用户没有授权地理位置")
+//               console.log(res);
+//               wx.removeStorageSync('loading_gps')
+//               wx.showModal({
+//                 title: '提示',
+//                 content: '请先授权地理位置权限',
+//                 showCancel: false,
+//                 success(res) {
+//                   if (res.confirm) {
+//                     console.log('用户点击确定')
+//                     wx.openSetting({
+//                       success(res) {
+//                         console.log(res.authSetting)
+
+//                       }
+//                     })
+//                   } else if (res.cancel) {
+//                     console.log('用户点击取消')
+//                   }
+//                 }
+//               })
+//               return reject('用户没有授权地理位置')
+//             }
+//           })
+//         },
+//       })
+//     // }
+//   })
+// }
+
+
+const getUserLocation = function () {
+  return new Promise(function (resolve, reject) {
+    wx.getLocation({
+      type: 'wgs84',
+      success(res) {
+        app.setStorage('u_lat', res.latitude)
+        app.setStorage('u_lng', res.longitude)
+        resolve({
+          lat:res.latitude,
+          lng:res.longitude,
+          from_storage: false,
+        });
+      },
+      fail(res) {
+        app.printErrorClient('userLocationFail', ['错误信息：'+ JSON.stringify(res)])
+        _ModelForGetLocationModel(resolve, reject);
+      }
+    })
+  })
+}
+
+
+function _ModelForGetLocationModel(resolve, reject) {
+  wx.showModal({
+    title: '',
+    content: '检测到你未打开地理位置的权限，是否前往开启',
+    confirmText: '前往开启',
+    showCancel:false,
+    success(res) {
+      if (res.confirm) {
+        //成功的时候只执行一次（通过手动的时候就没执行了）
+        wx.openSetting({
+          success(res) {
+            wx.authorize({
+              scope: 'scope.userLocation',
+              success() {
+                // resolve("toggle");
+                wx.getLocation({
+                  type: 'wgs84',
+                  success(res) {
+                    app.setStorage('u_lat', res.latitude)
+                    app.setStorage('u_lng', res.longitude)
+                    resolve({
+                      lat:res.latitude,
+                      lng:res.longitude,
+                      from_storage: false,
+                    });
+                  }
+                })
+              },
+              fail() {
+                app.printErrorClient('userLocationFail',['错误信息：打开打开地理位置的权限，未设置'])
+                _ModelForGetLocationModel(resolve, reject);
+              }
+            })
+          }
+        })
+      } else if (res.cancel) {
+        app.printErrorClient('userLocationFail',['错误信息：用户点击取消'])
+        reject()
+      }
+    }
+  })
+}
+
+
 module.exports = {
  getAjaxUserInfo,
  isAuthUserInfo,
  isBindMobile,
  isOpenCard,
+  getUserLocation
+  // getLocation
 }
@@ -1,105 +1,32 @@
 import _ from '../../commons/js/commons'
 const app = getApp()
 Component({
-  //组件的属性列表
+  /**
+   * 组件的属性列表
+   */
  properties: {
    isShow: {
      type: Boolean,
      value: false
    },
-    userInfo:{
-      type: Object,
-      value:""
-    },
-    //是否显示授权用户信息
-    isShowProfile: {
-      type: Boolean,
-      value: true
-    },
-    //是否强制显示授权用户信息
-    isForceProfile: {
-      type: Boolean,
-      value:false
-    },
-    title:{
-      type: String,
-      value: ''
-    },
-    cancelbtn:{
-      type: String,
-      value: ''
-    },
-    submitbtn:{
-      type: String,
-      value: ''
-    },
-    tip:{
-      type: String,
-      value: ''
-    },
-    type:{
-      type: String,
-      value: ''
-    },
-    zindex: {
-      type: Number,
-      value: 10
-    },
-    //专题模式登录样式
-    mode:{
-      type: String,
-      value: ''
-    },
-    modeDate:{
-      type: Object,
-      value:""
-    },
  },

-  //组件的初始数据
+  /**
+   * 组件的初始数据
+   */
  data: {
+    code:'',
    isRunning:false,
-    userCurrInfo:"",
-    isBindMobile:false
  },

  lifetimes: {
    attached: function () {
-      // 在组件实例进入页面节点树时执行
-      if (this.data.type == "mobile") {
-        if (!this.data.userInfo){
-          _.apiQuery.getUserInfo("",false).then(res => {
-            this.setData({
-              userCurrInfo: res
-            })
-          })
-        }else{
+      wx.login({
+        success: res => {
          this.setData({
-            userCurrInfo: this.data.userInfo
+            code: res.code,
          })
        }
-      }
-
-      if (this.data.type == "userinfo") {
-        _.userManager.isAuthUserInfo().then(re => {
-          if (re) {
-            this.setData({
-              isShowProfile:false
-            })
-          }else{
-            this.setData({
-              isShowProfile:true
-            })
-          }
-        })
-      }
-
-    },
-    detached: function () {
-      // 在组件实例被从页面节点树移除时执行
-      this.setData({
-        isBindMobile:false,
-        isShow:false
      })
    },
  },
@@ -108,8 +35,6 @@ Component({
   * 组件的方法列表
   */
  methods: {
-    //catchtap
-    emptyfunc(){},
    //授权用户信息
    getUserProfile(){
      let that = this
@@ -120,73 +45,32 @@ Component({
      wx.getUserProfile({
        desc:'获取你的昵称、头像、地区及性别',//不写不弹提示框
        success:function(res){
+
          let params = {};
+          params['code'] = that.data.code;
          params['userInfo'] = res.userInfo;
-          _.apiQuery.putUserInfo(params).then(res => {
+          that.setData({
+            isShow: false,
+          })
+          _.apiQuery.putAppUser(params).then(res => {
            that.setData({
              isRunning:false
            });
-            that.successEvent()
-            _.eventBus.emit("isShowProfile",false)
-          })
+            wx.showToast({
+              title: '授权成功',
+              icon: 'success',
+              duration: 2000
+            })
+          });
        },
        fail:function(err){
          that.setData({
            isRunning:false
          });
-          wx.showToast({
-            title: '您拒绝授权，将无法进行更多操作！',
-            icon: 'none',
-            duration: 2000
-          });
+          console.log('拒绝授权')
        }
      })
    },

-    //授权手机号码
-    getPhoneNumber(e) {
-      if (e.detail.errMsg && e.detail.errMsg.indexOf('ok') > -1){
-        let that = this;
-        _.apiQuery.authUserPhone(e).then(res=>{
-          _.apiQuery.getUserInfo()
-          this.setData({
-            isBindMobile: true
-          })
-        })
-      }else{
-        app.printErrorClient('failGetPhoneNumber',['用户拒绝授权手机号码：'+JSON.stringify(e)])
-      }
-    },
-    onShow:function () {
-      this.setData({
-        isShow: true
-      });
-      this.triggerEvent('onShow', {
-        type: this.data.type
-      });
-      
-    },
-    onClose: function () {
-      this.setData({
-        isShow: false
-      });
-      this.triggerEvent('onClose', {
-        type: this.data.type
-      });
-      if(this.data.type=="mobile" && this.data.isBindMobile){
-        this.setData({
-          isBindMobile:false
-        })
-        this.successEvent()
-      }
-    },
-
-    //成功回调方法
-    successEvent(){
-      this.triggerEvent('onSuccess', {
-        type: this.data.type
-      });
-    },
-
  }
 })
@@ -1,3 +1,6 @@
 {
-  "component": true
+  "component": true,
+  "usingComponents": {
+    "lcb-msg": "/components/msg/index"
+  }
 }
@@ -1,62 +1,16 @@
 <!-- 
-  type="mobile"用法
-  <lcb-auth type="mobile" isShow="true" bind:onSuccess="authEvent" bind:onClose="authFailEvent"></lcb-auth>
-  type="userinfo"用法 isForceProfile需要强制更新用户信息的时候才添加
-  <lcb-auth type="userinfo" isForceProfile="true" isShowProfile="{{isShowProfile}}" bind:onSuccess="authEvent"></lcb-auth>
+  用法
+  <lcb-auth isShow="true" bind:onSuccess="authEvent"></lcb-auth>
 -->

-<!-- <view catch:tap="emptyfunc" wx:if="{{type=='userinfo' || !type}}">
-  <button open-type="getUserInfo" class="auth-btngetUserInfo" bindgetuserinfo="getUserInfo">获取用户信息</button>
-</view> -->

-<view catch:tap="emptyfunc" wx:if="{{type=='userinfo' || !type}}">
-  <block wx:if="{{isForceProfile || isShowProfile}}">
-    <button class="auth-btngetUserInfo" bindtap="getUserProfile">获取用户信息</button>
-  </block>
-  <block wx:else>
-    <button class="auth-btngetUserInfo" bindtap="successEvent">已获取用户信息</button>
-  </block>
-</view>
-
-<view class="auth-dialog-special inner40" style="z-index:{{zindex+1}};" catchtouchmove="true" wx:if="{{type=='mobile' && isShow && mode=='special'}}">
-  <view class="mt30 pt2" wx:if="{{!isBindMobile}}">
-    <image class='block auth-dialog-logo box-shadow-000-10-10 img-100x100 ulib-r750' src="{{modeDate.logo}}" lazy-load="{{true}}" mode="scaleToFill"></image>
-    <view class="mt5 text-center font-32 text-bold" wx:if="{{modeDate.title}}">{{modeDate.title}}</view>
-    <view class="relative special-intro bg-f5 mt30 inner30 line-height-16 font-28 color-333 ulib-r10">{{modeDate.content}}</view>
-    <view class="mt30">
-      <button class="btn-1a1a1a text-spacing-10 font-34 color-fff ulib-r10" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">{{modeDate.btn}}</button>
+<lcb-msg isShow="{{isShow}}" isHasClose="{{true}}">
+  <view slot="content" class="inner40 text-center">
+    <view class='pt20 text-center'><i class="iconfont font-80 color-00c800 icon-weixin"></i></view>
+    <view class='pt20 pb30 text-center font-28 color-666'>
+      <view>授权您的公开信息（昵称和头像）</view>
+      <view>便于查看预定信息哦~</view>
    </view>
-    <text class="special-close iconfont icon-guanbi font-60 color-fff" bindtap="onClose"></text>
+    <button class='mt20 btn-36afa2 text-center font-32 color-fff ulib-r10' hover-class="btn-36afa2-hover" bindtap="getUserProfile">授权登录</button>
  </view>
-  <view class="pt20 pb20" wx:else>
-    <view class="text-center font-32 text-bold">{{modeDate.success}}</view>
-    <view class="relative special-intro bg-f5 mt30 inner30 line-height-16 font-28 color-333 ulib-r10">{{modeDate.content}}</view>
-    <view class="mt30 pl70 pr70">
-      <button class="btn-border-1a1a1a font-32 color-1a ulib-r10" bindtap="onClose">知道了</button>
-    </view>
-  </view>
-</view>
-
-<view class="auth-dialog" style="z-index:{{zindex+1}};" catchtouchmove="true" wx:elif="{{type=='mobile' && isShow}}">
-  <view wx:if="{{!isBindMobile}}">
-    <view class="cap">{{title || '立即登录'}}</view>
-    <view class="intro">授权手机号即可登录狸车小程序，了解更多狸车资讯，一手活动特惠即刻拥有。</view>
-    <view class="btn-list">
-      <view class="item-cell">
-        <button class="btn-cancel" bindtap="onClose">{{cancelbtn || '取消'}}</button>
-      </view>
-      <view class="item-cell">
-        <button class="btn-confirm" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">{{submitbtn || '授权手机号'}}</button>
-      </view>
-    </view>
-  </view>
-  <view wx:else>
-    <view class="cap">{{tip || '恭喜您，登录成功！'}}</view>
-    <view class="btn-list">
-      <view class="item-cell">
-        <button class="btn-cancel" bindtap="onClose">知道了</button>
-      </view>
-    </view>
-  </view>
-</view>
-<view class="auth-dialog-mask" style="z-index:{{zindex}};" catchtouchmove="true" wx:if="{{isShow && type=='mobile'}}"></view>
+</lcb-msg>
@@ -1,116 +1 @@
-@import "../../commons/css/common.wxss";
-.auth-dialog{
-  position: fixed;
-  left:50%;
-  top:50%;
-  transform: translate(-50%,-50%);
-  width:88%;
-  padding:70rpx 60rpx;
-  background-color:#fff;
-  box-sizing: border-box;
-  border-radius: 10rpx;
-  overflow: hidden; 
-  z-index: 10;
-}
-.auth-dialog-special{
-  position: fixed;
-  left:50%;
-  top:50%;
-  transform: translate(-50%,-50%);
-  width:80%;
-  background-color:#fff;
-  box-sizing: border-box;
-  border-radius: 10rpx;
-  z-index: 10;
-}
-
-
-.auth-btngetUserInfo{
-  position: absolute;
-  left:0;
-  top:0;
-  right:0;
-  bottom:0;  
-  opacity: 0;
-}
-
-.auth-dialog .cap{
-  color:#000;
-  font-size: 36rpx;
-  line-height: 36rpx;
-  text-align: center;
-  font-weight: bold;
-}
-
-.auth-dialog .intro{
-  margin-top:30rpx;
-  color:#666;
-  font-size: 28rpx;
-  line-height: 46rpx;
-}
-.auth-dialog .btn-list{
-  display: flex;
-  margin-top:40rpx;
-}
-
-.auth-dialog .btn-list .item-cell{
-  flex: 1;
-  padding:0 10rpx;
-}
-
-.auth-dialog .btn-list button{
-  width: 220rpx;
-  height: 72rpx;
-  line-height: 72rpx;
-  overflow: hidden;
-  border-radius: 50rpx;
-  font-size: 30rpx;
-  box-sizing: border-box;
-}
-
-.auth-dialog .btn-list button.btn-cancel{
-  background: #fff;
-  color: #1a1a1a;
-  line-height: 68rpx;
-  border:1rpx solid #1a1a1a;
-}
-.auth-dialog .btn-list button.btn-confirm{
-   background: #1a1a1a;
-  color: #fff;
-}
-.auth-dialog .btn-list button::after{
-  border:none;
-}
-.auth-dialog-mask{
-  position: fixed;
-  left:0;
-  right: 0;
-  top:0;
-  bottom:0;
-  background-color: rgba(0, 0, 0, 0.6); 
-}
-.auth-dialog-logo{
-  position:absolute;
-  top:-50rpx;
-  left:50%;
-  transform:translate(-50%,0);
-}
-.special-intro::before{
-  display:block;
-  position:absolute;
-  top:-20rpx;
-  left:50%;
-  transform:translate(-50%,0);
-  width: 0;
-  height: 0;
-  border-color: transparent transparent #f5f5f5 transparent;
-  border-style: solid;
-  border-width: 0 20rpx 20rpx 20rpx;
-  content:"";
-}
-.special-close{
-  position:absolute;
-  bottom:-100rpx;
-  left:50%;
-  transform:translate(-50%,0);
-}
+@import "../../commons/css/common.wxss";
@@ -1,277 +0,0 @@
-import _ from '../../commons/js/commons'
-import Canvas from '../../commons/js/utils/canvas'
-let isGetImgInfo = false
-const app = getApp()
-Component({
-  //组件的属性列表
-  properties: {
-    source: {
-      type: String,
-      value: 'goods'
-    },
-    isShow: {
-      type: Boolean,
-      value: false
-    },
-    isCreateQrcode: {
-      type: Boolean,
-      value: false
-    },
-    qccodeid: {
-      type: String,
-      value: ''
-    },
-    customImg: {
-      type: String,
-      value: ''
-    },
-    slogan: {
-      type: String,
-      value: ''
-    },
-    moments: {
-      type: String,
-      value: ''
-    },
-  },
-
-  //组件的初始数据
-  data: {
-    //headImg:app.getStorageByKey("userInfo").headimg,
-    defaultQrcode: _.config.imgUrl + 'common/qr.jpg',
-    imgs: [],
-    tempPosterPath: '',
-    showOptBtn:false,//操作按钮显示
-  },
-
-  attached: function () {
-    isGetImgInfo = false
-  },
-
-  //数据监听
-  observers: {
-    'isCreateQrcode': function (e) {
-      if (e) {
-        this.getMaterialHomeQrcode()
-      }
-    },
-    'isShow': function (e) {
-      if (e) {
-        this.setData({
-          showOptBtn:false,
-        })
-        this.createPoster()
-      }
-    },
-    'customImg': function (e) {
-      if (e) {
-        // this.setData({
-        //   headImg:app.getStorageByKey("userInfo").headimg,
-        // })
-        //头像
-        //this.getImageInfo(this.data.headImg, 4)
-        this.getImageInfo(this.data.customImg, 3)
-      }
-    },
-  },
-
-  //组件的方法列表
-  methods: {
-
-    // 转化网络图片，获取路径
-    getImageInfo(src, index) {
-      let that = this
-      isGetImgInfo = false
-      setTimeout(function () {
-        wx.getImageInfo({
-          src: src,
-          success: (res) => {
-            let arr = that.data.imgs
-            arr[index] = res
-            that.setData({
-              imgs: arr
-            })
-            isGetImgInfo = true
-          },
-          fail: (err) => {
-            console.log('error img is: ' + src)
-          }
-        })
-      }, 200)
-    },
-
-    //获取二维码
-    getMaterialHomeQrcode() {
-      let params = {};
-      params['page'] = 'pages/special2/index';
-      params['scene'] = this.data.qccodeid+'_'+app.getStorageByKey("userInfo").biz_id;
-      params['width'] = 1280;
-      _.apiQuery.getMaterialHomeQrcode(params).then(res => {
-        this.getImageInfo(res.data.url, 2)
-      }).catch(res => {
-        //this.getImageInfo(this.data.defaultQrcode, 2)
-      })
-    },
-
-    //自定义海报
-    customizePoster(CTX){
-
-      if(this.data.customImg){
-        let that = this
-        this.setData({
-          canvasInfo:{
-            width: parseFloat(this.data.imgs[3].width)+'px',
-            height: parseFloat(this.data.imgs[3].height)+'px'
-          }
-        })
-
-        console.log(this.data.imgs[3].width)
-        console.log(this.data.imgs[3].height)
-        
-        //背景
-        if (that.data.imgs[3]) {
-          CTX.drawImage(that.data.imgs[3].path, 0, 0, that.data.imgs[3].width, that.data.imgs[3].height, 0, 0, that.data.imgs[3].width, that.data.imgs[3].height)
-        }
-
-        // //头像
-        // if (that.data.imgs[4]) {
-        //   Canvas.circleImage(CTX,that.data.imgs[4].path,20, (that.data.imgs[3].height-170)/2,22/2)
-        // }
-
-        // //昵称
-        // Canvas.drawTextOverflow(CTX, app.getStorageByKey("userInfo").nickname, 150, 1, 14, '#fff', 20, 46, (that.data.imgs[3].height-132)/2)
-
-        // //标语
-        // if (that.data.slogan) {
-        //   Canvas.drawTextOverflow(CTX, that.data.slogan, 200, 2, 11, '#fff', 17, 20, (that.data.imgs[3].height-85)/2)
-        // }
-
-        // //标语
-        // if (that.data.slogan) {
-        //   Canvas.drawTextOverflow(CTX, that.data.slogan, 180, 2, 11, '#666', 17, 20, (that.data.imgs[3].height-100)/2)
-        // }
-      
-        //二维码
-        if (that.data.imgs[2]) {
-          if(this.data.imgs[3].width>this.data.imgs[3].height){
-            Canvas.circleImage(CTX,that.data.imgs[2].path,parseFloat(this.data.imgs[3].width)-parseFloat(this.data.imgs[3].height/5.5)-30, parseFloat(this.data.imgs[3].height)-parseFloat(this.data.imgs[3].height/5.5)-30,parseFloat(this.data.imgs[3].height/11))
-          }else{
-            Canvas.circleImage(CTX,that.data.imgs[2].path,parseFloat(this.data.imgs[3].width)-parseFloat(this.data.imgs[3].width/5.5)-30, parseFloat(this.data.imgs[3].height)-parseFloat(this.data.imgs[3].width/5.5)-30,parseFloat(this.data.imgs[3].width/11))
-          }
-        }
-
-        setTimeout(function(){
-          CTX.save()
-          CTX.draw(true, function () {
-            wx.hideLoading()
-            that.saveCanvas()
-          })
-        },200)
-        
-      }
-      
-    },
-
-    //生成海报
-    createPoster() {
-      let that = this
-      wx.showLoading({
-        title: '正在生成',
-      })
-      
-      if(isGetImgInfo){
-        this.setData({
-          tempPosterPath: ''
-        })
-        let ctx = wx.createCanvasContext('postercanvas', that)
-        that.customizePoster(ctx)
-      }
-    },
-
-    //临时存储canvas
-    saveCanvas() {
-      let that = this
-      wx.canvasToTempFilePath({
-        canvasId: 'postercanvas',
-        quality: 1,
-        success: (res) => {
-          // this.tempFilePath = res.tempFilePath
-          that.setData({
-            'tempPosterPath': res.tempFilePath
-          })
-
-          setTimeout(function () {
-            that.setData({
-              showOptBtn:true,
-            })
-          },200)
-
-        },
-        fail: (res) => {
-          app.printErrorClient('poseterfail',['错误信息：临时存储canvas失败',JSON.stringify(res)])
-        }
-      }, this)
-    },
-    
-    //保存到相册
-    saveToAblum() {
-      let that = this
-      wx.saveImageToPhotosAlbum({
-        filePath: this.data.tempPosterPath,
-        success: (res) => {
-          _.utils.$toast('保存成功')
-        },
-        fail: (err) => {
-          app.printErrorClient('poseterfail',['错误信息：图片保存失败',JSON.stringify(err)])
-          if (err.errMsg == 'saveImageToPhotosAlbum:fail cancel') {
-            _.utils.$toast('您已取消保存')
-          } else if (err.errMsg == 'saveImageToPhotosAlbum:fail auth deny') {
-            _.utils.$modal('提示', '保存图片失败，您可以点击确定设置获取相册权限后再尝试保存！', '去授权').then(res => {
-              if (res) {
-                wx.openSetting({}) // 打开小程序设置页面，可以设置权限
-              }
-            })
-          }
-        }
-      })
-    },
-
-    //隐藏海报弹框
-    hidePoster() {
-      this.setData({
-        isShow: false
-      })
-      wx.hideLoading()
-    },
-
-    //预览图片
-    preview() {
-      wx.previewImage({
-        current: this.data.tempPosterPath, // 当前显示图片的http链接
-        urls: [this.data.tempPosterPath] // 需要预览的图片http链接列表
-      })
-    },
-
-    //推送链接
-    pushLink(e) {
-      if(e.currentTarget.dataset.url){
-        _.$router.openUrlScheme(e.currentTarget.dataset.url)
-      }
-    },
-
-    //复制内容
-  copyWord(e){
-    if(e.currentTarget.dataset.tx){
-      wx.setClipboardData({
-        data: e.currentTarget.dataset.tx,
-        success (res) {
-          _.utils.$toast('复制成功')
-        }
-      })
-    }else{
-      _.utils.$toast('目前无文案')
-    }
-  },
-
-  }
-})
@@ -150,7 +150,7 @@ Component({
      
        //二维码
        if (that.data.imgs[2]) {
-          Canvas.circleImage(CTX,that.data.imgs[2].path,parseFloat(this.data.imgs[3].width/2)-parseFloat(this.data.imgs[3].width/8.5)-16, parseFloat(this.data.imgs[3].height/2)-parseFloat(this.data.imgs[3].width/8.5)-16,parseFloat(this.data.imgs[3].width/17))
+          Canvas.circleImage(CTX,that.data.imgs[2].path,(that.data.imgs[3].width-182)/2, (that.data.imgs[3].height-182)/2,70/2)
        }

        setTimeout(function(){
@@ -24,10 +24,6 @@ Component({
      type: Boolean,
      value: false
    },
-    isCustomTabBar: { //是否有底部自定义TabBar
-      type: Boolean,
-      value: false
-    },
    iconType: { //图标
      type: String,
      value: ''
@@ -67,7 +63,7 @@ Component({
        isShow: false
      })
      this.triggerEvent('closeevent', {
-        bubbles: true
+        isClose: true
      })
    },
    aaa(){
@@ -1,7 +1,7 @@
 <!-- "usingComponents": {
    "lcb-msg": "/components/msg/index"
  },
-  <lcb-msg bind:closeevent="closeevent"></lcb-msg>
+  <lcb-msg closeevent="closeevent"></lcb-msg>

  关闭方法： closeevent

@@ -10,7 +10,7 @@
  <view slot="opt">这里是插入到组件slot中的内容</view> -->
 <view class="lcb-msg" style="{{isShow?'display:block':'display:none'}}" catchmove="aaa">
  <view class="msgBg" style="background-color: rgba(0, 0, 0, .6);"></view>
-  <view class="msgMain {{isShow?'active':''}}" style="{{isTransparent?'background-color: transparent;':''}}{{isCustomTabBar?'margin-top: -95rpx;':''}}" catchmove="aaa">
+  <view class="msgMain {{isShow?'active':''}}" style="{{isTransparent?'background-color: transparent;':''}}" catchmove="aaa">
    <block wx:if="{{isHasClose !=''}}">
      <view wx:if="{{isHasClose=='up'}}" class="close up">
        <text class="iconfont icon-guanbi1 color-fff" bindtap="close"></text>
@@ -23,7 +23,7 @@ Page({
    
  },
  onShow: function () {
-    
+
  },

  //获取订单详情
@@ -188,26 +188,6 @@ Page({
        urls:end_mileage,
      })
    }
-    else if(e.currentTarget.dataset.type=='edit_transport'){
-      let transportImg = []
-      this.data.transport.forEach(item => {
-        transportImg.push(item.src)
-      })
-      wx.previewImage({
-        current:e.currentTarget.dataset.current,
-        urls:transportImg,
-      })
-    }
-    else if(e.currentTarget.dataset.type=='edit_photos'){
-      let photos = []
-      this.data.photos.forEach(item => {
-        photos.push(item.src)
-      })
-      wx.previewImage({
-        current:e.currentTarget.dataset.current,
-        urls:photos,
-      })
-    }

  },

@@ -349,7 +329,6 @@ Page({
          title: '图片上传中',
        })
        let transport=that.data.transport
-        let k = 0
        for (let i = 0; i < res1.tempFilePaths.length; i++) {
          //上传图片
          wx.uploadFile({
@@ -360,7 +339,6 @@ Page({
              'app': 'liche'
            },
            success: (resp) => {
-              k = k + 1
              resp.data = JSON.parse(resp.data);
              wx.hideLoading();
              if (resp.data.code == 200) {
@@ -371,20 +349,23 @@ Page({
                  src:imgdata.data.full_url,
                })
                transport=transport.concat(list)
-                if(k == res1.tempFilePaths.length){
-                  let params = {};
-                  params['id'] = that.data.info.id;
-                  params['type'] = 0;
-                  let imgs = []
-                  transport.forEach(item => {
-                    imgs.push(item.value)
-                  })
-                  params['imgs'] = imgs;
-                  _.apiQuery.postAppTransferTransport(params).then(res => {
-                    that.setData({
-                      transport,
+                if(i+1==res1.tempFilePaths.length){
+                  setTimeout(function () {
+                    let params = {};
+                    params['id'] = that.data.info.id;
+                    params['type'] = 0;
+                    let imgs = []
+                    transport.forEach(item => {
+                      imgs.push(item.value)
                    })
-                  })
+                    params['imgs'] = imgs;
+                    _.apiQuery.postAppTransferTransport(params).then(res => {
+                      that.setData({
+                        transport,
+                      })
+                    })
+                  }, 500);
+                  
                }
              }else{
                wx.showToast({
@@ -46,7 +46,7 @@
            <block wx:for='{{transport}}' wx:for-item='transport' wx:for-index="index" wx:key='transport'>
              <view class="inline-block img-200x180 mr20 relative">
                <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-guanbi1 inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delTransport" data-index="{{index}}" ></i>
-                <image class='img-200x180 ulib-r10' src='{{transport.src}}' mode='aspectFill' bindtap="previewImage" data-type="edit_transport" data-current="{{transport.src}}"></image>
+                <image class='img-200x180 ulib-r10' src='{{transport.src}}' mode='aspectFill'></image>
              </view>
            </block>
            <block wx:if="{{transport.length<10}}">
@@ -119,7 +119,7 @@
        <block wx:for='{{photos}}' wx:for-item='photos' wx:for-index="index" wx:key='photo'>
          <view class="inline-block img-200x180 ml10 mr10 relative">
            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-guanbi1 inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delPic" data-index="{{index}}" ></i>
-            <image class='img-200x180 ulib-r10' src='{{photos.src}}' mode='aspectFill' bindtap="previewImage" data-type="edit_photos" data-current="{{photos.src}}"></image>
+            <image class='img-200x180 ulib-r10' src='{{photos.src}}' mode='aspectFill'></image>
          </view>
        </block>
        <block wx:if="{{photos.length==0}}">
@@ -192,7 +192,7 @@
        <block wx:for='{{photos}}' wx:for-item='photos' wx:for-index="index" wx:key='photo'>
          <view class="inline-block img-200x180 ml10 mr10 relative">
            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-guanbi1 inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delPic" data-index="{{index}}" ></i>
-            <image class='img-200x180 ulib-r10' src='{{photos.src}}' mode='aspectFill' bindtap="previewImage" data-type="edit_photos" data-current="{{photos.src}}"></image>
+            <image class='img-200x180 ulib-r10' src='{{photos.src}}' mode='aspectFill'></image>
          </view>
        </block>
        <block wx:if="{{photos.length==0}}">
@@ -3,19 +3,11 @@ const app = getApp()
 Page({
  data: {
    imgUrl: _.config.imgUrl,
-    isShowReport:false,//是否显示调拨盘点弹框
  },
  onLoad: function (options) {
    this.getUserInfo()
  },
  onShow: function () {
-    this.setData({
-      isShowReport:false,//是否显示调拨盘点弹框
-      remindMsg:[],
-    });
-    this.getAppTransferRemind()
-    this.getAppInventoryRemind()
-    this.getAppGoodsRemind()
  },
  //获取用户信息
  getUserInfo(){
@@ -26,62 +18,6 @@ Page({
    });
  },

-  //调拨提醒
-  getAppTransferRemind(){
-    _.apiQuery.getAppTransferRemind().then(res => {
-      if(res.data.total>0){
-        let remindMsg = this.data.remindMsg
-        remindMsg.push({
-          title:'调拨提醒',
-          content:'您有新的车辆调拨，需要您进行确认操作。',
-          img:'https://qs.haodian.cn/wechat_app/lichebao/allot/car.gif?v=220224',
-          btn:{
-            title:'前往操作',
-            url:'/pages/allot/list/index',
-          },
-        })
-        this.setData({
-          remindMsg,
-          isShowReport:true,
-        })
-      }
-    });
-  },
-
-  //盘点提醒
-  getAppInventoryRemind(){
-    _.apiQuery.getAppInventoryRemind().then(res => {
-      if(res.data.total>0){
-        let remindMsg = this.data.remindMsg
-        remindMsg.push({
-          title:'盘点提醒',
-          content:'您有新的车辆盘点，需要您进行确认操作。',
-          img:'https://qs.haodian.cn/wechat_app/lichebao/inventory/animation.gif',
-          btn:{
-            title:'前往操作',
-            url:'/pages/inventory/list/index',
-          },
-        })
-        this.setData({
-          remindMsg,
-          isShowReport:true,
-        })
-      }
-    });
-  },
-
-  //库存提醒/预警
-  getAppGoodsRemind(){
-    let params = {};
-    params['type'] = 1;
-    _.apiQuery.getAppGoodsRemind(params).then(res => {
-      this.setData({
-        stock:res.data,
-      })
-      wx.stopPullDownRefresh()
-    });
-  },
-
  //推送链接
  pushLink(e) {
    if(e.currentTarget.dataset.url){
@@ -89,24 +25,4 @@ Page({
    }
  },

-  //显示隐藏调拨盘点弹窗
-  optShowReport(e){
-    this.setData({
-      isShowReport:!this.data.isShowReport,
-    })
-  },
-
-  //退出登录
-  logout(){
-    wx.clearStorage()
-    wx.reLaunch({
-      url: '/pages/login/index'
-    })
-  },
-
-  //页面相关事件处理函数--监听用户下拉动作
-  onPullDownRefresh: function () {
-    this.getAppGoodsRemind()
-  },
-
 })
@@ -1,5 +1,5 @@
 {
-  "enablePullDownRefresh": true,
+  "navigationBarTitleText": "调拨",
  "navigationBarTextStyle": "white",
  "navigationBarBackgroundColor": "#1a1c26",
  "backgroundColor": "#ffffff",
@@ -1,60 +1,15 @@
 <view class="container">
  <view class='pt160 text-center'>
    <image class='img-130x130 ulib-r750' mode="aspectFill" src='{{imgUrl}}/login/logo.jpg?v=220223'></image>
-    <view class='mt20 font-32 color-fff'>{{userInfo.uname}}，欢迎回到狸车宝！</view>
-    <!-- <view class="mt10 font-64 color-fff">{{userInfo.uname}}</view> -->
-    <view class="mt20">
-      <view class="inline-block bg-fff mt10 pt10 pb10 pl30 pr30 font-32 ulib-r750">{{userInfo.biz_name}}</view>
-    </view>
-    <view class="mt20">
-      <view class="inline-block pt10 pb10 pl30 pr30 font-24 color-fff ulib-r750" bindtap="logout">
-        <i class="iconfont icon-tuichu mr10"></i>退出
-      </view>
-    </view>
+    <view class='mt10 font-32 color-fff'>Hi~，欢迎回到狸车宝！</view>
+    <view class="mt10 font-64 color-fff">{{userInfo.uname}}</view>
+    <view class="inline-block bg-fff mt10 pl15 pr15 font-22 ulib-r750">{{userInfo.biz_name}}</view>
  </view>
-</view>
-
-<view class="fixed left-0 bottom-0 right-0 bg-fff pt200 pb20 pl100 pr100">
-  <!-- <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="pushLink" data-url="/pages/allot/list/index"><text class="iconfont icon-zengjia mr10"></text>新增调拨</button> -->
-</view>
-<view class="fixed left-0 bottom-0 right-0 pl30 pr30 pb50">
-  <view class="relative ml15 mr15 mb30 pt20 pb20 pl30 pr200 ulib-r750 font-24 color-fff" style="background-image:linear-gradient(45deg, #30cfbd, #2cbf8b);" bindtap="pushLink" data-url="/pages/inventory/warning/index" wx:if="{{stock.show==1}}">
-    <view class="text-left">{{stock.inventory.title}}</view>
-    <view class="absolute right-0 box-middle mr25 mb10">
-      <text class="text-middle">{{stock.inventory.value}}</text>
-      <i class="iconfont icon-gengduo ml5 text-middle"></i>
-    </view>
-  </view>
-  <view class="pt30 pb30 pl15 pr15 bg-fff box-shadow-000-10-10 ulib-r10">
-    <view class="fn-flex">
+  <view class="fixed left-0 bottom-0 right-0 bg-fff pt200 pb20 pl100 pr100">
+    <view class="absolute left-0 right-0 ml30 mr30 pt30 pb30 pl15 pr15 bg-fff box-shadow-000-10-10 fn-flex ulib-r10" style="top:-150rpx;">
      <view class="fn-flex-item ml15 mr15" bindtap="pushLink" data-url="/pages/allot/list/index?tabs_id=1&type=1&title=调拨发车"><image class='img-300x230' mode="aspectFill" src='{{imgUrl}}/allot/tip-1.png'></image></view>
      <view class="fn-flex-item ml15 mr15" bindtap="pushLink" data-url="/pages/allot/list/index?tabs_id=1&type=2&title=调拨收车"><image class='img-300x230' mode="aspectFill" src='{{imgUrl}}/allot/tip-2.png'></image></view>
    </view>
+    <!-- <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="pushLink" data-url="/pages/allot/list/index"><text class="iconfont icon-zengjia mr10"></text>新增调拨</button> -->
  </view>
-</view>
-
-<!-- 调拨提醒 盘点提醒 -->
-<lcb-msg isShow="{{isShowReport}}">
-	<view slot="content">
-    <swiper class='wp100' style="height:550rpx;" autoplay circular bindchange="bannerChange">
-      <swiper-item class="relative" wx:for="{{remindMsg}}" wx:key="index">
-        <view class="pt40 pl40 pr40">
-          <view class="font-36 text-center">{{item.title}}</view>
-          <view class="mt10 font-22 text-center color-999">{{item.content}}</view>
-        </view>
-        <view class="mt20 pl40 pr40 pb40">
-          <image class='wp100 ulib-r10' src='{{item.img}}' mode='widthFix'></image>
-        </view>
-        <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
-          <button bindtap="optShowReport" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
-          <button bindtap="pushLink" data-url="{{item.btn.url}}" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">{{item.btn.title}}</button>
-        </view>
-      </swiper-item>
-    </swiper>
-    <view class="absolute left-0 right-0 bottom-0 pb20 text-center" style='height:30rpx' wx:if="{{remindMsg.length>1&&remindMsg.length<16}}">
-      <block wx:for-items="{{remindMsg}}" wx:for-index="j" wx:key='j'>
-        <view class="inline-block indicator-pin {{banneractive==j?'active':''}}"></view>
-      </block>
-    </view>
-	</view>
-</lcb-msg>
+</view>
@@ -16,7 +16,6 @@ Page({
    tabs_id:'',//分类 1进行中2已完成
    tab:[],
    channel:'',//是否来自渠道
-    city_id:'',//城市ID
  },
  onLoad: function (options) {
    for (let key in options) {
@@ -68,9 +67,6 @@ Page({
    if(this.data.channel != ''){
      params['channel'] = this.data.channel;
    }
-    if(this.data.city_id != ''){
-      params['city_id'] = this.data.city_id;
-    }
    if(this.data.type != ''){
      params['type'] = this.data.type;
    }
@@ -43,11 +43,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="{{item.url}}">
-        <view class="relative font-34 fn-clear">
-          <i class="absolute box-center-middle iconfont icon-arrow font-30 color-888"></i>
-          <view class="fn-fl wp45 text-nowrap" style="color:{{item.out_car.color}}">{{item.out_car.title}}</view>
-          <view class="fn-fr wp45 text-nowrap text-right" style="color:{{item.in_car.color}}">{{item.in_car.title}}</view>
-        </view>
+        <view class="font-40" wx:if="{{item.biz_name}}">{{item.biz_name}}</view>
        <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='it' wx:key='i'>
          <view class="mt25 fn-clear font-28">
            <view class="fn-fl color-333">{{it.title}}</view>
@@ -37,7 +37,6 @@ Page({
    ecLine:{},
    deallist:'',
    hoursTip:'',
-    isShowProfile:true,//是否显示授权用户信息按钮
  },

  onLoad(options) {
@@ -50,13 +49,6 @@ Page({
    this.getUserInfo()
    this.getAppCity()

-    //消息通讯 是否显示授权用户信息按钮
-    _.eventBus.on("isShowProfile", this, function(res){
-      this.setData({
-        isShowProfile:res,
-      })
-    })
-
  },

  onShow: function () {
@@ -64,12 +56,6 @@ Page({
    this.getAppTransferRemind()
  },

-  //生命周期函数--监听页面卸载
-  onUnload: function () {
-    //卸载消息通讯 是否显示授权用户信息
-    _.eventBus.remove('isShowProfile',this);
-  },
-
  //候取时间
  getHoursTip(){
    let hoursTip = '';
@@ -2,9 +2,8 @@
  <view class="inner30 img-top-cover" style="background-image:url({{imgUrl}}channel/theme.jpg);">
    <view class="relative" style="height:200rpx;">
      <view class="relative pt30 pb30 pl110 pr10">
-        <image class='absolute left-0 box-middle mr10 img-90x90 ulib-r750 overflowhidden' mode="aspectFill" src="{{userInfo.headimg||imgUrl+'common/default-head.jpg'}}" lazy-load="{{true}}"></image>
-        <view class="absolute top-0 bottom-0 left-0 right-0 opacity-0 mt20 mr150 z-index-4">
-          <lcb-auth type="userinfo" isShowProfile="{{isShowProfile}}" bind:onSuccess="getUserInfo"></lcb-auth>
+        <view class="absolute left-0 box-middle mr10 img-90x90 ulib-r750 overflowhidden">
+          <open-data type="userAvatarUrl"></open-data>
        </view>
        <view>
          <view class="font-22 color-fff">Hi~ {{hoursTip}}欢迎回到狸车宝！</view>
@@ -13,7 +12,7 @@
          </view>
        </view>
      </view>
-      <view class="absolute allot-tip pt8 pb8 pl15 pr10 bg-f9394d font-22 color-fff ulib-rt10" bindtap="pushLink" data-url="/pages/allot/list/index?city_id={{city_id}}">车辆调拨记录<i class="iconfont icon-gengduo"></i></view>
+      <view class="absolute allot-tip pt8 pb8 pl15 pr10 bg-f9394d font-22 color-fff ulib-rt10" bindtap="pushLink" data-url="/pages/allot/list/index">车辆调拨记录<i class="iconfont icon-gengduo"></i></view>
    </view>
    <!-- 车辆调拨 -->
    <view class="mb40 bg-ffedeb ulib-rt10" style="height:140rpx;" bindtap="pushLink" data-url="/pages/allot/list/index?channel=1" wx:if="{{allotNum>0}}">
@@ -33,14 +32,6 @@
    </view>
    <!-- 管辖门店 -->
    <view class="mb40 inner30 pt40 bg-fff box-shadow-000-10-10 ulib-r10">
-      <!-- <view class="font-36">水平业务相关</view>
-      <view class="relative mt20 mb30 pt25 pb25 pl110 bg-fe606c-ff9026 color-fff ulib-r10" bindtap="pushLink" data-url="/pages/order/filterList/index2?title=水平业务资料未提交">
-        <i class="absolute left-0 box-middle ml35 iconfont icon-tijiao font-60"></i>
-        <view class="text-left">
-          <view class="font-40">10</view>
-          <view class="font-22">水平业务资料未提交</view>
-        </view>
-      </view> -->
      <view class="relative z-index-1">
        <view class="font-36">管辖门店</view>
        <picker class="absolute right-0 box-middle" bindchange="changeCity" value="{{cityIndex}}" range="{{cityArray}}">
@@ -117,7 +108,7 @@
    </view>
    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
      <button bindtap="optShowReport" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
-      <button bindtap="pushLink" data-url="/pages/allot/list/index" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">前往操作</button>
+      <button bindtap="pushLink" data-url="/pages/allot/list/index?channel=1" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">前往操作</button>
    </view>
 	</view>
 </lcb-msg>
@@ -1,3 +1,2 @@
 .bg-2e3246-8058fe{background-image:linear-gradient(45deg, #2e3246, #1a1c26);}
-.allot-tip{right:30rpx;bottom:0;}
-.bg-fe606c-ff9026{background-image:linear-gradient(45deg, #fe606c, #ff9026); text-align: center;}
+.allot-tip{right:30rpx;bottom:0;}
@@ -4,55 +4,31 @@ Page({
  data: {
    name:'',//名字
    mobile:'',//手机号
-    // brand_id:'',//品牌
-    // car_id:'',//车系id
-    // v_id:'',//车辆版本id
-    // color_id:'',//颜色id
-    // b_s_id:'',//备选车型id
+    brand_id:'',//品牌
+    car_id:'',//车系id
+    v_id:'',//车型级别id
+    color_id:'',//颜色id
+    b_s_id:'',//备选车型id
    buy_time:'',//预计购车时间
-    // brandIndex:-1,//车辆品牌索引
-    // modelIndex:-1,//车系车型索引
-    // spareIndex:-1,//备选车型索引
-    // colorArray:[],//车身颜色列表
-    // levelArray:[],//车辆版本列表
-    // colorIndex:-1,//车身颜色索引
-    // levelIndex:-1,//车辆版本索引
+    brandIndex:-1,//车辆品牌索引
+    modelIndex:-1,//车型车系索引
+    spareIndex:-1,//备选车型索引
+    colorArray:[],//车型颜色列表
+    levelArray:[],//车型级别列表
+    colorIndex:-1,//车型颜色索引
+    levelIndex:-1,//车型级别索引
    timeArray:[],//预计购车时间列表
    timeIndex:-1,//预计购车时间索引
+    cf_clues:'',//线索来源
+    cluesArray:[
+      '自然进店',
+      '外展外拓',
+      '转介绍',
+      '垂直媒体',
+      '自媒体',
+    ],//线索来源
+    cluesIndex:-1,//索来源索引
    submitFlag:false,
-
-    status:0,//状态
-    statuslist:[
-      '未见客户',
-      '到店客户',
-    ],
-
-    c_brands:[
-      '综合','东风纳米','哪吒','零跑'
-    ],
-
-    c_brandArray:[
-      {id:0, name:'综合'},
-      {id:1, name:'东风纳米'},
-      {id:4, name:'哪吒'},
-      {id:5, name:'零跑'},
-    ],
-
-    of_id:'',
-    of2_id:'',
-    of1Index:-1,
-    of2Index:-1,
-
-    cityIndex:-1,
-    city_id:'',
-    countyIndex:-1,
-    county_id:'',
-    c_brandIndex:-1,
-
-    isShowExist:false, //客户是否已存在
-    wxgr:0,//是否添加个微
-    wxgrimg:'',//个微
-    wxgrimg_url:'',//个微
  },
  //生命周期函数--监听页面加载
  onLoad: function (options) {
@@ -61,21 +37,8 @@ Page({
        [key]: options[key]
      })
    }
-    //获取车型品牌
-    // this.getAppSeriesBrands()
-    //获取列表筛选条件-时间
+    this.getAppSeriesBrands()
    this.getAppCustomersFilter()
-    //客户来源
-    this.getAppCustomersOffline_sources()
-    //客户标签
-    this.getAppCustomersTag()
-
-    if(this.data.status == 1){
-      this.setData({
-        buy_time:3,
-      })
-    }
-
  },

  //获取车型品牌
@@ -94,7 +57,7 @@ Page({
    });
  },

-  //获取车系车型
+  //获取车型车系
  getAppSeries(){
    let params = {};
    params['brand_id'] = this.data.brand_id;
@@ -112,7 +75,7 @@ Page({
    });
  },

-  //获取车辆版本
+  //获取车型级别
  getAppSeriesAttrslevel(){
    let params = {};
    params['id'] = this.data.car_id;
@@ -132,7 +95,7 @@ Page({
    });
  },

-  //获取车身颜色
+  //获取车型颜色
  getAppSeriesAttrscolor(){
    let params = {};
    params['id'] = this.data.car_id;
@@ -158,7 +121,7 @@ Page({
    _.apiQuery.getAppCustomersFilter().then(res => {
      let timeArray = []
      res.data.buy_time.forEach(item => {
-        timeArray.push(item.name)
+        timeArray.push(item + '天')
      })
      this.setData({
        timeArray:timeArray,
@@ -176,22 +139,6 @@ Page({
    })
  },

-  //选择状态
-  changeStatus(e) {
-    if(this.data.status != e.detail.value){
-      this.setData({
-        of_id:'',
-        of2_id:'',
-        of1Index:-1,
-        of2Index:-1,
-        of2Arr:[],
-        status:e.detail.value,
-        buy_time:e.detail.value==1?'3':'',
-      })
-      this.getAppCustomersOffline_sources()
-    }
-  },
-
  //选择品牌
  changeBrand(e) {
    if(this.data.brandIndex != e.detail.value && e.detail.value >= 0){
@@ -199,17 +146,17 @@ Page({
        brand_id:this.data.brandList[e.detail.value].id,
        brandIndex:e.detail.value,
        car_id:'',//车系id
-        v_id:'',//车辆版本id
-        color_id:'',//车身颜色id
+        v_id:'',//车型级别id
+        color_id:'',//车型颜色id
        incolor_id:'',//内饰颜色id
        b_s_id:'',//备选车型id
-        modelIndex:-1,//车系车型索引
+        modelIndex:-1,//车型车系索引
        spareIndex:-1,//备选车型索引
-        colorArray:[],//车身颜色列表
-        levelArray:[],//车辆版本列表
+        colorArray:[],//车型颜色列表
+        levelArray:[],//车型级别列表
        interiorArray:[],//内饰颜色
-        colorIndex:-1,//车身颜色索引
-        levelIndex:-1,//车辆版本索引
+        colorIndex:-1,//车型颜色索引
+        levelIndex:-1,//车型级别索引
        interiorIndex:-1,//内饰颜色索引
      })
      this.getAppSeries()
@@ -222,37 +169,37 @@ Page({
      this.setData({
        car_id:this.data.modelList[e.detail.value].id,
        modelIndex:e.detail.value,
-        v_id:'',//车辆版本id
-        color_id:'',//车身颜色id
+        v_id:'',//车型级别id
+        color_id:'',//车型颜色id
        incolor_id:'',//内饰颜色id
        b_s_id:'',//备选车型id
        spareIndex:-1,//备选车型索引
-        colorArray:[],//车身颜色列表
-        levelArray:[],//车辆版本列表
+        colorArray:[],//车型颜色列表
+        levelArray:[],//车型级别列表
        interiorArray:[],//内饰颜色
-        colorIndex:-1,//车身颜色索引
-        levelIndex:-1,//车辆版本索引
+        colorIndex:-1,//车型颜色索引
+        levelIndex:-1,//车型级别索引
        interiorIndex:-1,//内饰颜色索引
      })
      this.getAppSeriesAttrslevel()
    }
  },

-  //车辆版本
+  //车型级别
  changeLevel(e) {
    if(this.data.levelIndex != e.detail.value && e.detail.value >= 0){
      this.setData({
        v_id:this.data.levelList[e.detail.value].id,
        levelIndex:e.detail.value,
-        color_id:'',//车身颜色id
-        colorArray:[],//车身颜色列表
-        colorIndex:-1,//车身颜色索引
+        color_id:'',//车型颜色id
+        colorArray:[],//车型颜色列表
+        colorIndex:-1,//车型颜色索引
      })
      this.getAppSeriesAttrscolor()
    }
  },

-  //车身颜色
+  //车型颜色
  changeColor(e) {
    if(this.data.colorIndex != e.detail.value && e.detail.value >= 0){
      this.setData({
@@ -272,10 +219,18 @@ Page({
    }
  },

+  //线索来源
+  changeClues(e) {
+    this.setData({
+      cf_clues:this.data.cluesArray[e.detail.value],
+      cluesIndex:e.detail.value,
+    })
+  },
+
  //预计购车时间
  changeTime(e) {
    this.setData({
-      buy_time:this.data.timeList[e.detail.value].id,
+      buy_time:this.data.timeList[e.detail.value],
      timeIndex:e.detail.value,
    })
  },
@@ -293,96 +248,40 @@ Page({
        title: '请输入正确的手机号码',
        icon: 'none'
      })
-    }
-    else if (that.data.c_brandArray.length>0&&that.data.c_brandIndex == -1 ) {
+    }else if(that.data.car_id == '' ){
      wx.showToast({
-        title: '请选择客户品牌归属',
+        title: '请选择车型车系',
        icon: 'none'
      })
-    }
-    else if (that.data.sources.length>0&&that.data.of_id == '' ) {
+    }else if(that.data.v_id == '' ){
      wx.showToast({
-        title: '请选择客户来源',
+        title: '请选择车型级别',
        icon: 'none'
      })
-    }
-    else if (that.data.sources.length>0&&that.data.sources[that.data.of1Index].list.length>0&&that.data.of2_id == '' ) {
+    }else if(that.data.color_id == '' ){
      wx.showToast({
-        title: '请选择'+that.data.sources[that.data.of1Index].name+'类型',
+        title: '请选择车型颜色',
        icon: 'none'
      })
-    }
-    else if (that.data.city_id == '' ) {
-      wx.showToast({
-        title: '请选择所在城市',
-        icon: 'none'
-      })
-    }
-    else if (that.data.county_id == '' ) {
-      wx.showToast({
-        title: '请选择所在地区',
-        icon: 'none'
-      })
-    }
-    else if (that.data.buy_time == '' ) {
-      wx.showToast({
-        title: '请选择预计购车时间',
-        icon: 'none'
-      })
-    }
-    else if(this.data.wxgr==1&&this.data.wxgrimg==''){
-      wx.showToast({
-        title: '请上传个微截图',
-        icon: 'none'
-      })
-    }
-    // else if(that.data.car_id == '' ){
-    //   wx.showToast({
-    //     title: '请选择车系车型',
-    //     icon: 'none'
-    //   })
-    // }else if(that.data.v_id == '' ){
-    //   wx.showToast({
-    //     title: '请选择车辆版本',
-    //     icon: 'none'
-    //   })
-    // }else if(that.data.color_id == '' ){
-    //   wx.showToast({
-    //     title: '请选择车身颜色',
-    //     icon: 'none'
-    //   })
-    // }
-    else{
+    } else{
      that.setData({
        submitFlag: true,
      })
      let params = {};
-      params['status'] = that.data.status;
      params['name'] = that.data.name;
      params['mobile'] = that.data.mobile;
-      // params['car_id'] = that.data.car_id;
-      // params['v_id'] = that.data.v_id;
-      // params['color_id'] = that.data.color_id;
-      params['tag'] = that.data.taglList;
-      // if(this.data.b_s_id != ''){
-      //   params['b_s_id'] = this.data.b_s_id;
-      // }
-      if(this.data.c_brandIndex != -1){
-        params['c_brand'] = this.data.c_brandArray[this.data.c_brandIndex].id;
+      params['car_id'] = that.data.car_id;
+      params['v_id'] = that.data.v_id;
+      params['color_id'] = that.data.color_id;
+      if(this.data.b_s_id != ''){
+        params['b_s_id'] = this.data.b_s_id;
      }
-      if(this.data.of_id != ''){
-        params['of_id'] = this.data.of_id;
+      if(this.data.cf_clues != ''){
+        params['cf_clues'] = this.data.cf_clues;
      }
-      if(this.data.of2_id != ''){
-        params['of2_id'] = this.data.of2_id;
+      if(this.data.buy_time != ''){
+        params['buy_time'] = this.data.buy_time;
      }
-      params['wxgr'] = this.data.wxgr;
-      if(this.data.wxgr==1){
-        params['wxgrimg'] = this.data.wxgrimg;
-      }
-      params['city_id'] = this.data.city_id;
-      params['county_id'] = this.data.county_id;
-      params['buy_time'] = this.data.buy_time;
      _.apiQuery.postAppCustomers(params).then(res => {

        //刷新列表页
@@ -405,32 +304,21 @@ Page({
          success(res) {
            if (res.confirm) {
              that.setData({
-                name:'',//名字
-                mobile:'',//手机号
-                // brand_id:'',//品牌
-                // car_id:'',//车系id
-                // v_id:'',//车辆版本id
-                // color_id:'',//颜色id
-                // b_s_id:'',//备选车型id
-                buy_time:'',//预计购车时间
-                // brandIndex:-1,//车辆品牌索引
-                // modelIndex:-1,//车系车型索引
-                // spareIndex:-1,//备选车型索引
-                // colorArray:[],//车身颜色列表
-                // levelArray:[],//车辆版本列表
-                // colorIndex:-1,//车身颜色索引
-                // levelIndex:-1,//车辆版本索引
-                timeIndex:-1,//预计购车时间索引
+                name:'',
+                mobile:'',
+                car_id:'',
+                v_id:'',
+                color_id:'',
+                b_s_id:'',
+                cf_clues:'',
+                buy_time:'',
+                modelIndex:-1,
+                spareIndex:-1,
+                colorIndex:-1,
+                levelIndex:-1,
+                timeIndex:-1,
                submitFlag:false,
-
-
-                of_id:'',
-                of2_id:'',
-                of2Arr:[],
-                of1Index:-1,
-                of2Index:-1,
              })
-              that.getAppCustomersTag()
            } else if (res.cancel) {
              wx.navigateBack({
                delta: 1
@@ -443,255 +331,8 @@ Page({
        this.setData({
          submitFlag: false,
        })
-        if(res.data.id){
-          wx.hideToast();
-          this.setData({
-            isShowExist: true,
-            exist: res,
-          })
-        }
      });
    }
  },

-  //客户来源
-  getAppCustomersOffline_sources(){
-    let params = {};
-    params['status'] = this.data.status;
-    _.apiQuery.getAppCustomersOffline_sources(params).then(res => {
-      let of1Arr = []
-      res.data.sources.forEach(item => {
-        of1Arr.push(item.name)
-      })
-      this.setData({
-        of1Arr,
-        sources:res.data.sources
-      })
-    });
-  },
-
-  //客户来源
-  changeOf1(e) {
-    if(this.data.of1Index!=e.detail.value){
-      let of2Arr = []
-      this.data.sources[e.detail.value].list.forEach(item => {
-        of2Arr.push(item.name)
-      })
-      this.setData({
-        of2Arr,
-        of2Index:-1,
-        of_id:this.data.sources[e.detail.value].id,
-        of1Index:e.detail.value,
-      })
-    }
-  },
-
-  changeOf2(e) {
-    if(this.data.of2Index!=e.detail.value){
-      this.setData({
-        of2_id:this.data.sources[this.data.of1Index].list[e.detail.value].id,
-        of2Index:e.detail.value,
-      })
-    }
-  },
-
-  //客户标签
-  getAppCustomersTag(){
-    _.apiQuery.getAppCustomersTag().then(res => {
-      this.setData({
-        city_id:res.data.city_id,
-        county_id:res.data.county_id,
-        taglList:res.data.tags&&res.data.tags.length>0?res.data.tags:[],
-      })
-      this.data.c_brandArray.forEach((item,index) => {
-        if(res.data.c_brand == item.id){
-          this.setData({
-            c_brandIndex:index
-          })
-        }
-      })
-
-      //获取城市
-      this.getAppCityArea_city()
-      //获取地区
-      this.getAppCityArea_county()
-    });
-  },
-
-  //单选
-  radioPicker(e){
-    let taglList = this.data.taglList
-    taglList[e.currentTarget.dataset.i].list.forEach(item => {
-      item.checked=false
-    })
-    taglList[e.currentTarget.dataset.i].list[e.currentTarget.dataset.j].checked=true
-    this.setData({
-      taglList,
-    })
-  },
-  
-  //多选
-  checkPicker(e){
-    this.setData({
-      ['taglList['+e.currentTarget.dataset.i+'].list['+e.currentTarget.dataset.j+'].checked']:!this.data.taglList[e.currentTarget.dataset.i].list[e.currentTarget.dataset.j].checked,
-    })
-  },
-
-
-  //获取城市
-  getAppCityArea_city(){
-    let params = {};
-    params['type'] = 'city';
-    _.apiQuery.getAppCityArea(params).then(res => {
-      let cityArr = []
-      let cityIndex = -1
-      res.data.list.forEach((item,index) => {
-        cityArr.push(item.name)
-        if(this.data.city_id == item.id){
-          cityIndex = index
-        }
-      })
-      this.setData({
-        cityIndex,
-        cityArr,
-        city:res.data.list
-      })
-    });
-  },
-
-  //获取行政区
-  getAppCityArea_county(){
-    let params = {};
-    params['pid'] = this.data.city_id;
-    params['type'] = 'county';
-    _.apiQuery.getAppCityArea(params).then(res => {
-      let countyArr = []
-      let countyIndex = -1
-      res.data.list.forEach((item,index) => {
-        countyArr.push(item.name)
-        if(this.data.county_id == item.id){
-          countyIndex = index
-        }
-      })
-      this.setData({
-        countyIndex,
-        countyArr,
-        county:res.data.list
-      })
-    });
-  },
-
-  //选择城市
-  changeCbrand(e) {
-    if(this.data.c_brandIndex!=e.detail.value){
-      this.setData({
-        c_brandIndex:e.detail.value,
-      })
-    }
-  },
-
-  //选择城市
-  changeCity(e) {
-    if(this.data.cityIndex!=e.detail.value){
-      this.setData({
-        cityIndex:e.detail.value,
-        city_id:this.data.city[e.detail.value].id,
-      })
-      this.getAppCityArea_county()
-    }
-  },
-
-  //选择地区
-  changeCounty(e) {
-    if(this.data.countyIndex!=e.detail.value){
-      this.setData({
-        countyIndex:e.detail.value,
-        county_id:this.data.county[e.detail.value].id,
-      })
-    }
-  },
-
-  //查看存在客户信息
-  viewDetails(e){
-    wx.redirectTo({
-      url: '/pages/customer/detail/index?id=' + this.data.exist.data.id
-    })
-  },
-
-  //关闭客户已存在提示
-  colseExist(){
-    this.setData({
-      isShowExist: false,
-    })
-  },
-
-  //是否添加个微
-  switchWxgr:function(e){
-    this.setData({
-      wxgr:e.detail.value ? 1 :0
-    })
-  },
-
-    //选择图片
-    chooseImg(e) {
-      let that = this
-  
-      //上传个微截图
-      if(e.currentTarget.dataset.type=='gw_img'){
-        wx.chooseImage({
-          count: 1, // 默认9
-          sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-          sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-          success(res) {
-            wx.showLoading({
-              title: '上传中',
-            })
-            wx.uploadFile({
-              url:_.config.api.upImg,
-              filePath:res.tempFilePaths[0],
-              name: 'img',
-              formData: {
-                'app': 'liche'
-              },
-              success: (resp) => {
-                resp.data = JSON.parse(resp.data);
-                if (resp.data.code == 200) {
-                  wx.hideLoading();
-                  that.setData({
-                    wxgrimg:resp.data.data.url,
-                    wxgrimg_url:resp.data.data.full_url,
-                  })
-                }else{
-                  wx.hideLoading();
-                  wx.showToast({
-                    title: '上传失败',
-                    icon: 'none',
-                    duration: 2000
-                  })
-                }
-              },
-            })
-          },
-          fail: res => {
-            wx.showToast({
-              title: '文件选择失败',
-              icon: 'none',
-              duration: 2000
-            })
-          }
-        })
-      }
-  
-    },
-  
-    //查看图片
-    previewImage(e){
-      if(e.currentTarget.dataset.type=='gw_img'){
-        wx.previewImage({
-          current:this.data.wxgrimg_url,
-          urls:[this.data.wxgrimg_url],
-        })
-      }
-    },
-
 })
@@ -1,15 +1,6 @@
 <view class="container">
  <view class="inner30">
-    <view class="pl40 pr40 pt10 pb50 relative ulib-r10 box-shadow-000-10-10 overflowhidden">
-      <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 text-nowrap">
-          <picker bindchange="changeStatus" value="{{status}}" range="{{statuslist}}">
-            <text>{{statuslist[status]}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </picker>
-        </view>
-      </view>
+    <view class="pl40 pr40 pt10 pb10 relative ulib-r10 box-shadow-000-10-10 overflowhidden">
      <view class="relative bbs-1-eb last-b-none pl140 font-28">
        <view class="absolute left-0 box-middle">客户姓名</view>
        <view>
@@ -23,19 +14,18 @@
        </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="absolute left-0 box-middle font-28 color-333">车辆品牌</view>
        <view class="pt30 pb30 text-right font-28 color-666">
-          <picker bindchange="changeCbrand" value="{{c_brandIndex}}" range="{{c_brands}}">
-            <text class="color-ccc" wx:if="{{c_brandIndex == -1}}">请选择</text>
-            <text wx:else>{{c_brands[c_brandIndex]}}</text>
+          <picker bindchange="changeBrand" value="{{brandIndex}}" range="{{brandArray}}">
+            <text class="color-ccc" wx:if="{{brandIndex == -1}}">请选择</text>
+            <text wx:else>{{brandArray[brandIndex]}}</text>
            <i class="iconfont ml5 icon-gengduo"></i>
          </picker>
        </view>
      </view>
-      <!--
      <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{brandIndex != -1}}">
-        <view class="absolute left-0 box-middle font-28 color-333">车系车型</view>
-        <view class="pt30 pb30 text-right font-28 color-666 text-nowrap">
+        <view class="absolute left-0 box-middle font-28 color-333">车型车系</view>
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker bindchange="changeModel" value="{{modelIndex}}" range="{{modelArray}}">
            <text class="color-ccc" wx:if="{{modelIndex == -1}}">请选择</text>
            <text wx:else>{{modelArray[modelIndex]}}</text>
@@ -44,8 +34,8 @@
        </view>
      </view>
      <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{modelIndex != -1}}">
-        <view class="absolute left-0 box-middle font-28 color-333">车辆版本</view>
-        <view class="pt30 pb30 text-right font-28 color-666 text-nowrap">
+        <view class="absolute left-0 box-middle font-28 color-333">车型级别</view>
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker bindchange="changeLevel" value="{{levelIndex}}" range="{{levelArray}}">
            <text class="color-ccc" wx:if="{{levelIndex == -1}}">请选择</text>
            <text wx:else>{{levelArray[levelIndex]}}</text>
@@ -54,15 +44,15 @@
        </view>
      </view>
      <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{levelIndex != -1}}">
-        <view class="absolute left-0 box-middle font-28 color-333">车身颜色</view>
-        <view class="pt30 pb30 text-right font-28 color-666 text-nowrap">
+        <view class="absolute left-0 box-middle font-28 color-333">车型颜色</view>
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker bindchange="changeColor" value="{{colorIndex}}" range="{{colorArray}}">
            <text class="color-ccc" wx:if="{{colorIndex == -1}}">请选择</text>
            <text wx:else>{{colorArray[colorIndex]}}</text>
            <i class="iconfont ml5 icon-gengduo"></i>
          </picker>
        </view>
-      </view> -->
+      </view>
      <!-- <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{modelIndex != -1}}">
        <view class="absolute left-0 box-middle font-28 color-333">备选车型</view>
        <view class="pt30 pb30 text-right font-28 color-666">
@@ -73,49 +63,20 @@
          </picker>
        </view>
      </view> -->
-      <block wx:if="{{sources.length>0}}">
-        <view class="relative bbs-1-eb last-b-none pl140 font-28">
-          <view class="absolute left-0 box-middle">客户来源</view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <picker bindchange="changeOf1" value="{{of1Index}}" range="{{of1Arr}}">
-              <text class="color-ccc" wx:if="{{of1Index == -1}}">请选择</text>
-              <text wx:else>{{of1Arr[of1Index]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{of2Arr.length>0}}">
-          <view class="absolute left-0 box-middle">{{sources[of1Index].name}}</view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <picker bindchange="changeOf2" value="{{of2Index}}" range="{{of2Arr}}">
-              <text class="color-ccc" wx:if="{{of2Index == -1}}">请选择</text>
-              <text wx:else>{{of2Arr[of2Index]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
-          </view>
-        </view>
-      </block>
      <view class="relative bbs-1-eb last-b-none pl140 font-28">
-        <view class="absolute left-0 box-middle">所在城市</view>
+        <view class="absolute left-0 box-middle">线索来源</view>
+        <!-- <view>
+          <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入线索来源" bindinput='inputTx' data-key="cf_clues" name='cf_clues' value='{{cf_clues}}' />
+        </view> -->
        <view class="pt30 pb30 text-right font-28 color-666">
-          <picker bindchange="changeCity" value="{{cityIndex}}" range="{{cityArr}}">
-            <text class="color-ccc" wx:if="{{cityIndex == -1}}">请选择</text>
-            <text wx:else>{{cityArr[cityIndex]}}</text>
+          <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 last-b-none pl140 font-28" wx:if="{{city_id}}">
-        <view class="absolute left-0 box-middle">所在地区</view>
-        <view class="pt30 pb30 text-right font-28 color-666">
-          <picker bindchange="changeCounty" value="{{countyIndex}}" range="{{countyArr}}">
-            <text class="color-ccc" wx:if="{{countyIndex == -1}}">请选择</text>
-            <text wx:else>{{countyArr[countyIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </picker>
-        </view>
-      </view>
-      <view class="relative bbs-1-eb last-b-none pl190" wx:if="{{status==0}}">
+      <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">
          <picker bindchange="changeTime" value="{{timeIndex}}" range="{{timeArray}}">
@@ -125,78 +86,13 @@
          </picker>
        </view>
      </view>
-      <view class="relative bbs-1-eb last-b-none pl180 font-28">
-        <view class="absolute left-0 box-middle">是否添加个微</view>
-        <view class="relative pt30 pb30 text-right">
-          <switch checked="{{wxgr==1}}" bindchange="switchWxgr" type="switch" color='#36afa2' style="zoom:0.8" />
-        </view>
-      </view>
+    </view>

-      <view class="mt30 text-center" wx:if="{{wxgr==1}}">
-        <view class="inline-block img-250x150 relative ulib-r10 overflowhidden">
-          <block wx:if="{{wxgrimg_url}}">
-            <view class="inline-block bg-f8 img-250x150 relative ulib-r10 overflowhidden">
-              <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="chooseImg" data-type="gw_img"></i>
-              <image class='block wp100 img-250x150 ulib-r10' src='{{wxgrimg_url}}' mode='aspectFit' bindtap="previewImage" data-type="gw_img"></image>
-            </view>
-          </block>
-          <block wx:else>
-            <view class="inline-block bg-f8 img-250x150 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="gw_img">
-              <view class="absolute left-0 right-0 box-middle color-ccc">
-                <i class="iconfont icon-paizhao font-42"></i>
-                <view class="mt10 font-22">上传个微截图</view>
-              </view>
-            </view>
-          </block>
-        </view>
-      </view>
-      
-      <block wx:for='{{taglList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
-        <view class="relative mt30">
-          <view class="font-28">
-            <text class="text-middle">{{list.name}}</text>
-            <text class="text-middle font-24" wx:if="{{list.type=='radio'}}">（单选）</text>
-            <text class="text-middle font-24" wx:if="{{list.type=='checkbox'}}">（多选）</text>
-          </view>
-          <view class="fn-clear" wx:if="{{list.type=='radio'}}">
-            <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-              <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-36afa2 color-fff':'bg-f6 color-666'}}" bindtap="radioPicker" data-i="{{i}}" data-j="{{j}}">
-                {{option.name}}
-              </view>
-            </block>
-          </view>
-          <view class="fn-clear" wx:if="{{list.type=='checkbox'}}">
-            <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-              <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-36afa2 color-fff':'bg-f6 color-666'}}" bindtap="checkPicker" data-i="{{i}}" data-j="{{j}}">
-                {{option.name}}
-              </view>
-            </block>
-          </view>
-        </view>
-      </block>
-    </view>
    <view class="mt60 pl60 pr60">
-      <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="postAppCustomers">
-        确认建卡
-      </button>
+      <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="postAppCustomers">确认建卡</button>
    </view>
+
  </view>
 </view>
 <lcb-footer></lcb-footer>
-<lcb-backChannel></lcb-backChannel>
-<!-- 客户已存在 -->
-<lcb-msg isShow="{{isShowExist}}" isHasClose="{{true}}">
-  <view slot="content">
-    <view class="pt60 pl60 pr60 pb50">
-      <view class="font-36 text-center">{{exist.msg}}</view>
-    </view>
-    <view class="pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="viewDetails" class="inline-block wp50 btn-36afa2 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover" wx:if="{{exist.data.owner==1}}">
-        前往查看
-      </button>
-      <button bindtap="colseExist" class="inline-block wp50 btn-36afa2 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover" wx:else>
-        知道了
-      </button>
-    </view>
-  </view>
-</lcb-msg>
+<lcb-backChannel></lcb-backChannel>
@@ -14,17 +14,6 @@ Page({
    employeeArray:[],//店员选择列表
    employeeList:[],//店员信息列表
    employeeIndex:-1,//选择店员索引
-
-    isShowTimePicker:false,
-    weekList:['日','一','二','三','四','五','六'],
-    dateList:[],
-    nextIndex:-1,//计划回访时间
-
-    distTabId:1,
-    distBizIndex:-1,
-    distBiz_id:'',
-    bizArray: [],
-    bizobj: [],
  },
  onLoad(options) {
    for (let key in options) {
@@ -34,8 +23,6 @@ Page({
    }
    this.getAppCustomersList()
    this.getAppEmployees()
-
-    this.getTimePicker()
  },

  onShow(){
@@ -114,17 +101,10 @@ Page({
        res.data.list.forEach(item => {
          employeeArray.push(item.uname)
        })
-        let bizArray = []
-        res.data.bizs.forEach(item => {
-          bizArray.push(item.name)
-        })
        this.setData({
          employeeArray:employeeArray,
          employeeList:res.data.list,
          employeeIndex:-1,
-          distributetabs:res.data.tabs,
-          bizArray:bizArray,
-          bizobj: res.data.bizs,
        })
      }
      wx.stopPullDownRefresh()
@@ -147,12 +127,6 @@ Page({
  optEmployees(){
    this.setData({
      isShowEmployees:!this.data.isShowEmployees,
-      employeeIndex:-1,
-      employee_id:'',
-      nextIndex:-1,
-      distTabId:1,
-      distBiz_id:'',
-      distBizIndex:-1,
    })
  },

@@ -166,48 +140,28 @@ Page({
  //分配客户
  putAppCustomersAdmins(){
    let that = this
-    if (that.data.distTabId==1&&that.data.employeeIndex == -1 ) {
+    if (that.data.employeeIndex == -1 ) {
      wx.showToast({
        title: '请选择店员',
        icon: 'none'
      })
-    }
-    else if (that.data.distTabId==1&&that.data.nextIndex == -1 ) {
-      wx.showToast({
-        title: '请选择计划回访时间',
-        icon: 'none'
-      })
-    }
-    else if (that.data.distTabId==2&&that.data.distBizIndex == -1 ) {
-      wx.showToast({
-        title: '请选择门店',
-        icon: 'none'
-      })
-    }
-    else{
+    }else{
      that.setData({
        submitFlag: true,
      })
      let params = {};
      params['ids'] = that.data.ids;
-      if(that.data.distTabId==1){
-        params['admin_id'] = that.data.admin_id;
-        params['visit_time'] = that.data.dateList[that.data.nextIndex].year +'-'+ that.data.dateList[that.data.nextIndex].month +'-'+ that.data.dateList[that.data.nextIndex].day;
-      }
-      if(that.data.distTabId==2){
-        params['biz_id'] = that.data.distBiz_id;
-      }
+      params['admin_id'] = that.data.admin_id;
      _.apiQuery.putAppCustomersAdmins(params).then(res => {

        wx.showToast({
          title: '分配成功',
          icon: 'success',
-          duration: 2000,
+          duration: 2000
        })
        that.setData({
          isShowEmployees:false,
          submitFlag:false,
-          nextIndex:-1,
        })
        that.onPullDownRefresh()

@@ -219,149 +173,6 @@ Page({
    }
  },

-  //候取当前月日历
-  getTimePicker(){
-    let date = new Date();
-    let cYear = date.getFullYear(); //年份
-    let cMonth = date.getMonth()+1; //当前月份
-    let cDay = date.getDate();//当前日期
-    let fweek = new Date(cYear,cMonth-1,1).getDay();//本月第一天星期几
-    let days = new Date(cYear,cMonth,-1)
-    let cn = days.getDate()+1 //当月天数
-    let rn = ''//上个月天数
-    if (cMonth === 1) {
-      rn = 31
-    } else {
-      rn = new Date(cYear,cMonth-1,-1).getDate()+1
-    }
-
-    let dateList = []
-    for(let i=0;i<fweek;i++){
-      dateList.push({
-        isopt:false,
-        checked:false,
-        year:cMonth == 1?cYear-1:cYear,
-        month:cMonth == 1?12:cMonth-1,
-        day:rn-i,
-      })
-    }
-    for(let i=1;i<=cn;i++){
-      dateList.push({
-        isopt:false,
-        checked:false,
-        year:cYear,
-        month:cMonth,
-        day:i
-      })
-    }
-
-    if((cn-cDay)>29){//相差15天以上不用特意补下个月
-      let lweek = new Date(cYear,cMonth-1,cn).getDay();//本月最后天星期几
-      let sbu = 6 - lweek //最后一周补齐
-      for(let i=1;i<=sbu;i++){
-        dateList.push({
-          isopt:false,
-          checked:false,
-          year:cMonth == 12?cYear+1:cYear,
-          month:cMonth == 12?1:cMonth+1,
-          day:i
-        })
-      }
-    }else{
-      let zbu = 30 - (cn-cDay)  //至少要补多少天
-      let bweek = ''//至少要补的最后一天星期几
-      if(cMonth==12){
-        bweek = new Date(cYear+1,1,zbu).getDay()
-      }else{
-        bweek = new Date(cYear,cMonth,zbu).getDay()
-      }
-      let sbu = zbu + 6 - bweek //最后一周补齐
-      for(let i=1;i<=sbu;i++){
-        dateList.push({
-          isopt:false,
-          checked:false,
-          year:cMonth == 12?cYear+1:cYear,
-          month:cMonth == 12?1:cMonth+1,
-          day:i
-        })
-      }
-    }
-
-    this.setData({
-      cYear,
-      cMonth,
-      cDay,
-      dateList,
-    })
-
-  },
-
-  //显示隐藏时间选择器
-  optShowTimePicker(){
-    this.setData({
-      isShowTimePicker:!this.data.isShowTimePicker,
-    })
-
-    let kd = 15 //可操作天数
-    // if(this.data.level[this.data.levelIndex]=='H'){
-    //   kd = 3
-    // }else if(this.data.level[this.data.levelIndex]=='A'){
-    //   kd = 7
-    // }else if(this.data.level[this.data.levelIndex]=='B'){
-    //   kd = 15
-    // }
-    let cindex = ''
-    let dateList = this.data.dateList
-    dateList.forEach((item,index) => {
-      if(item.year == this.data.cYear&&item.month == this.data.cMonth&&item.day == this.data.cDay){
-        cindex = index
-      }
-    })
-    dateList.forEach((item,index) => {
-      item.isopt = false
-      if(cindex<=index&&index<cindex+kd+1){
-        item.isopt = true
-      }
-    })
-    this.setData({
-      dateList,
-    })
-
-  },
-
-  //选择计划回访时间
-  optday(e){
-    if(this.data.nextIndex != e.currentTarget.dataset.index){
-      this.setData({
-        nextIndex:e.currentTarget.dataset.index,
-      })
-    }
-  },
-
-  //切换分配本地，其他门店
-  changeDistTab(e){
-    this.setData({
-      distTabId:e.currentTarget.dataset.id,
-      employeeIndex:-1,
-      employee_id:'',
-      nextIndex:-1,
-      distBiz_id:'',
-      distBizIndex:-1,
-    })
-  },
-
-  //分配选择门店
-  changeDistBiz(e) {
-    let distBiz_id = ''
-    if(e.detail.value >= 0){
-      distBiz_id = this.data.bizobj[e.detail.value].id
-    }
-    this.setData({
-      distBiz_id,
-      distBizIndex:e.detail.value,
-    })
-  },
-
  //页面相关事件处理函数--监听用户下拉动作
  onPullDownRefresh(){
    this.setData({
@@ -6,21 +6,10 @@
      <block wx:for='{{list}}' wx:key='index' wx:key="index">
        <label class="block inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden">
          <view class="relative pr180">
-            <view class="font-32">
-              <text class="text-middle text-bold">{{item.name}}</text>
-              <text class="text-middle font-26 color-666">({{item.mobile}})</text>
-            </view>
-            <checkbox class="absolute right-0 box-middle font-30" value="{{item.id}}" checked="{{item.checked}}"/>
+            <view class="font-32">{{item.name}}</view>
+            <view class="mt10 font-22 color-666">{{item.mobile}}</view>
          </view>
-          <view class="text-nowrap" wx:if="{{item.reassign}}">
-            <text class="inline-block mr10 pl10 pr10 bg-666 font-18 color-fff ulib-r750">{{item.reassign}}</text>
-          </view>
-          <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
-            <view class="mt25 fn-clear font-28" wx:if="{{value}}">
-              <view class="fn-fl color-333">{{key}}</view>
-              <view class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
-            </view>
-          </block>
+          <checkbox class="absolute right-0 box-middle mr30 font-30" value="{{item.id}}" checked="{{item.checked}}"/>
        </label>
      </block>
    </checkbox-group>
@@ -41,76 +30,16 @@
 <lcb-msg isShow="{{isShowEmployees}}">
 	<view slot="content">
 		<view class="inner40">
-      <view class="mt10 font-28 text-center fn-flex" wx:if="{{distributetabs.length > 0}}">
-        <block wx:for="{{distributetabs}}" wx:key="index">
-          <view class="fn-flex-item relative ml10 mr10 pt20 pb20 ulib-r10 {{distTabId == item.id?'bg-36afa2 color-fff':'bg-f6'}}" bindtap="changeDistTab" data-id="{{item.id}}">{{item.name}}</view>
-        </block>
-      </view>
-      <block wx:if="{{distTabId == 1}}">
-        <view class="mt20 bds-2-eb inner20 font-28 color-666 fn-clear ulib-r10">
-          <view class="fn-fl">销售顾问</view>
-          <picker class="fn-fr wp60 text-right" bindchange="changeEmployee" value="{{employeeIndex}}" range="{{employeeArray}}">
-            <text class="color-ccc" wx:if="{{employeeIndex == -1}}">请选择</text>
-            <text wx:else>{{employeeArray[employeeIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </picker>
-        </view>
-        <view class="mt20 bds-2-eb inner20 font-28 color-666 fn-clear ulib-r10">
-          <view class="fn-fl">计划回访时间</view>
-          <view bindtap="optShowTimePicker" class="fn-fr wp60 text-right">
-            <text class="color-ccc" wx:if="{{nextIndex == -1}}">请选择</text>
-            <text wx:else>{{dateList[nextIndex].year}}-{{dateList[nextIndex].month}}-{{dateList[nextIndex].day}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </view>
-        </view>
-      </block>
-      <view class="mt20 ml10 mr10 bds-2-eb inner20 font-28 color-666 fn-clear ulib-r10" wx:else>
-        <view class="fn-fl">门店名称</view>
-        <picker class="fn-fr wp70 text-right" bindchange="changeDistBiz" value="{{distBizIndex}}" range="{{bizArray}}">
-          <view class="text-nowrap">
-            <text class="color-ccc" wx:if="{{distBizIndex == -1}}">请选择</text>
-            <text wx:else>{{bizArray[distBizIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </view>
-        </picker>
-      </view>
+      <view class="pb30 text-center font-36">销售选择</view>
+      <picker class="relative bg-f6 pt20 pb20 pl30 pr30 font-32 ulib-r10" bindchange="changeEmployee" value="{{employeeIndex}}" range="{{employeeArray}}">
+        <text class="color-ccc" wx:if="{{employeeIndex == -1}}">请选择</text>
+        <text wx:else>{{employeeArray[employeeIndex]}}</text>
+        <i class="absolute right-0 box-middle iconfont mr30 color-999 icon-xiala"></i>
+      </picker>
    </view>
    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
      <button bindtap="optEmployees" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
      <button disabled="{{submitFlag}}" bindtap="putAppCustomersAdmins" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
    </view>
 	</view>
-</lcb-msg>
-
-<page-container 
-  show="{{isShowTimePicker}}"
-  round="{{true}}"
-  overlay="true"
-  duration="300"
-  z-index="10000"
-  position="bottom"
-  close-on-slide-down="{{false}}"
-  bindenter="onEnter"
-  custom-style="false"
-  overlay-style="false"
->
-  <view class="">
-    <view class="relative pt30 pb30 text-center font-30">
-      <view class="color-666">计划回访时间</view>
-      <i bindtap="optShowTimePicker" class="absolute right-0 box-middle mr30 iconfont icon-guanbi1"></i>
-    </view>
-    <view class="fn-flex pt30 pb30 bbs-1-eb text-center font-24">
-      <block wx:for="{{weekList}}" wx:key="index">
-        <view class="fn-flex-item">{{item}}</view>
-      </block>
-    </view>
-    <view class="pb40 relative">
-      <view class="absolute top-0 box-center mt130 font-180 color-f8">{{cMonth}}</view>
-      <view class="relative fn-flex fn-flex-wrap pt30 pb30 text-center font-24 z-index-2">
-        <block wx:for="{{dateList}}" wx:key="index">
-          <view bindtap="{{item.isopt?'optday':''}}" data-index="{{index}}" class="datecell ulib-r10 {{nextIndex == index?'active':''}} {{item.isopt?'color-1a':'color-ccc'}}">{{item.day}}</view>
-        </block>
-      </view>
-    </view>
-  </view>
-</page-container>
+</lcb-msg>
@@ -1,21 +1,14 @@
 <view class="container">
  <view class="inner40 pb0">
    <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden">
-      <view class="absolute top-0 left-0 ml40 bg-36afa2 pl10 pr10 font-22 color-fff" wx:if="{{detailinfo.tip}}">
-        {{detailinfo.tip}}
-      </view>
+      <view class="absolute top-0 left-0 width-25 mt40 pt5 pb5 bg-36afa2 line-height-13 font-22 color-fff">{{detailinfo.tip}}</view>
      <view class="relative pr180">
-        <view class="font-28">
-          <text>
-            {{detailinfo.name}}<text class="ml10 font-22 color-666">编号 {{detailinfo.id}}</text>
-          </text>
-          <text class="text-middle iconfont icon-weixin1 ml10 color-00c800" wx:if="{{detailinfo.is_weChat}}"></text>
+        <view class="font-32">
+          <text>{{detailinfo.name}}</text>
+          <text class="font-26 color-666">({{detailinfo.mobile}})</text>
          <text class="iconfont icon-xingxing ml10 {{detailinfo.is_top==1?'color-f9394d':'color-ccc'}}" catchtap="optTop" data-index="{{index}}"></text>
        </view>
-        <view class="mt10 text-nowrap font-28">
-          <text>{{detailinfo.mobile}}</text>
-        </view>
-        <!-- <view class="text-nowrap">
+        <view class="text-nowrap">
          <text class="mr15 font-22 color-666">编号：{{detailinfo.id}}</text>
          <block wx:for="{{detailinfo.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
            <text class="inline-block mr10 pl10 pr10 bg-666 font-18 color-fff ulib-r750" wx:if="{{i<4}}">{{tag}}</text>
@@ -23,17 +16,14 @@
          <block wx:if="{{detailinfo.tags.length>4}}">
            ...
          </block>
-        </view> -->
-        <view class="absolute right-0 box-middle text-right mt5">
-          <view class="text-center">
-            <!--view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{detailinfo.id}}">
-              <i class="absolute box-center-middle iconfont icon-duanxinguanli"></i>
-            </view-->
-            <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{detailinfo.id}}">
-              <i class="absolute box-center-middle iconfont icon-dianhua"></i>
-            </view>
+        </view>
+        <view class="absolute right-0 box-middle">
+          <view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{detailinfo.id}}">
+            <i class="absolute box-center-middle iconfont icon-duanxinguanli"></i>
+          </view>
+          <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{detailinfo.id}}">
+            <i class="absolute box-center-middle iconfont icon-dianhua"></i>
          </view>
-          <view class="inline-block mt5 pt5 pb5 pl20 pr20 btn-36afa2 font-26 color-fff ulib-r750" bindtap="copyWord">复制</view>
        </view>
      </view>
      <block wx:for="{{detailinfo.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
@@ -45,14 +35,74 @@
    </view>
  </view>
  <view class="pl30 pr30">
-    <view class="fn-flex pl50 pr50 font-32 color-666 text-center">
+    <view class="fn-flex font-32 color-666 text-center">
      <block wx:for='{{tab}}' wx:key='list'>
        <view class="fn-flex-item pl20 pr20 tabmenu2 {{tabid == item.id?'active color-36afa2':''}}" data-index="{{index}}" bindtap="changeTab">
          <view class="relative">{{item.title}}</view>
        </view>
      </block>
    </view>
-    <view class="mt30 pb150" wx:if="{{tabid == 1}}">
+    <view class="mt30 pl10 pr10 pb200" wx:if="{{tabid == tab[0].id}}">
+      <!-- <view class="font-22">
+        <i class="iconfont icon-fenqi mr10"></i>
+        <text>分期信息</text>
+      </view> -->
+      <view class="text-right">
+        <button bindtap="pushLink" data-url="/pages/customer/editCard/index?id={{id}}" class="inline-block btn-36afa2 font-22 color-fff ulib-r10" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>编辑</button>
+      </view>
+      <view>
+        <view class="relative bbs-1-eb last-b-none pl140 font-28">
+          <view class="absolute left-0 box-middle">客户姓名</view>
+          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">
+            {{name}}
+          </view>
+        </view>
+        <view class="relative bbs-1-eb last-b-none pl140 font-28">
+          <view class="absolute left-0 box-middle">手机号码</view>
+          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">
+            {{mobile}}
+          </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" style="min-height:38rpx">
+            {{brandArray[brandIndex]}}
+          </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" style="min-height:38rpx">
+            {{modelArray[modelIndex]}}
+          </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" style="min-height:38rpx">
+            {{levelArray[levelIndex]}}
+          </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" style="min-height:38rpx">
+            {{colorArray[colorIndex]}}
+          </view>
+        </view>
+        <view class="relative bbs-1-eb last-b-none pl140 font-28">
+          <view class="absolute left-0 box-middle">线索来源</view>
+          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">
+            {{cf_clues}}
+          </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" style="min-height:38rpx">
+            {{buy_time}}天
+          </view>
+        </view>
+
+      </view>
+    </view>
+    <view class="mt30 pb150" wx:elif="{{tabid == tab[1].id}}">
      <view class="fn-flex text-center">
        <block wx:for="{{statistics}}" wx:key='index'>
          <view class="fn-flex-item ml15 mr15 pt20 pb20 bg-f3f6fc ulib-r10" style="background-color:{{item.color}}">
@@ -71,41 +121,32 @@
            <block wx:for="{{logslist}}" wx:for-index="index" wx:key="index">
              <view class="orderDtail-log-item pl40 relative">
                <view class="orderDtail-log-content">
-                  <!-- 时间 -->
-                  <view class="font-22">
-                    <text class="color-999">{{item.c_time}}</text>
-                    <!-- <text class="color-999"> · </text>
-                    <text class="color-36afa2">试驾/下定</text> -->
-                  </view>
-                  <!-- 内容 -->
+                  <view class="font-22 color-999">{{item.c_time}}</view>
                  <view class="font-28 text-break" style="min-height:50rpx;">{{item.content}}</view>
-                  <!-- 录音 -->
                  <view class="relative mt10 wp80 pt5 pb5 pl180 bg-e3f5f3 color-36afa2 font-30 ulib-r10" wx:if="{{!!item.record_url}}">
                    <i bindtap="audioPlay" data-index="{{index}}" class="absolute box-middle left-0 ml20 iconfont {{play?'icon-zanting1':'icon-bofang'}}" wx:if="{{currentIndex==index}}"></i>
                    <i bindtap="audioPlay" data-index="{{index}}" class="absolute box-middle left-0 ml20 iconfont icon-bofang" wx:else></i>
-                    <text class="absolute box-middle left-0 ml65 font-20">
-                      {{currentIndex==index?currentx:'00:00'}} / {{item.alltime}}
-                    </text>
-                    <slider bindtouchstart="handle_slider_move_start" bindchanging="hanle_slider_changing" bindchange="hanle_slider_change" data-index="{{index}}" min="0" step="0.000001" block-size="12" max="{{item.second}}" block-color="#5ec6bb" activeColor="#36afa2" backgroundColor="#d1eeeb" value="{{currentIndex==index?currentime:0}}" />
+                    <text class="absolute box-middle left-0 ml65 font-20">{{currentIndex==index?currentx:'00:00'}} / {{item.alltime}}</text>
+                    <slider
+                        bindtouchstart="handle_slider_move_start"
+                        bindchanging="hanle_slider_changing"
+                        bindchange="hanle_slider_change"
+                        data-index="{{index}}"
+                        min="0" 
+                        step="0.000001"
+                        block-size="12"
+                        max="{{item.second}}" 
+                        block-color="#5ec6bb"
+                        activeColor="#36afa2" 
+                        backgroundColor="#d1eeeb"
+                        value="{{currentIndex==index?currentime:0}}"
+                    />
                  </view>
-                  <!-- 图片 -->
                  <view wx:if="{{item.imgs.length>0}}">
                    <block wx:for="{{item.imgs}}" wx:for-item="img" wx:for-index="j" wx:key="j">
-                      <image bindtap="previewImage" data-type="logs" data-current="{{img}}" data-index="{{index}}" class='img-125x75 mr10 bds-2-eb ulib-r5' src='{{img}}' mode='aspectFill'></image>
+                      <image bindtap="previewImage" data-current="{{img}}" data-index="{{index}}" class='img-125x75 mr10 bds-1-eb ulib-r5' src='{{img}}' mode='aspectFill'></image>
                    </block>
                  </view>
-                  <!-- 评论 -->
-                  <view class="mt10 mb15 bg-f6 ulib-r20 ulib-rlt0 pt5 pb10 pl15 pr15 font-22" wx:if="{{item.comments.length>0}}">
-                    <view class="mt5 relative" wx:for="{{item.comments}}" wx:for-item="comment" wx:for-index="j" wx:key="j">
-                      <text class="iconfont icon-pinglun color-36afa2"></text>
-                      <text class="ml10 color-36afa2">{{comment.uname}}：</text>
-                      <text class="color-666">{{comment.content}}</text>
-                    </view>
-                  </view>
-                  <view class="ml15 font-22 color-36afa2 text-right" bindtap="optShowComment" data-id="{{item.id}}">
-                    <text class="iconfont icon-pinglun"></text>
-                    <text class="ml10">评论</text>
-                  </view>
                </view>
                <i class="absolute box-middle mt15 bg-fff line-height-11 font-22 color-999 iconfont icon-jiantou-up z-index-1" wx:if="{{index+1 != logslist.length}}"></i>
                <text class="absolute orderDtail-log-line2 z-index-0" wx:if="{{index != logslist.length-1}}"></text>
@@ -117,428 +158,111 @@
        </view>
      </view>
    </view>
-    <view class="mt30 pl50 pr30 pb200" wx:elif="{{tabid == 2}}">
-      <block wx:for='{{taglList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
-        <view class="relative mt20" wx:if="{{list.have}}">
-          <view class="absolute left-0 box-middle font-28">{{list.name}}</view>
-          <view class="pl150">
-            <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-              <view class="inline-block space-nowrap mt5 mb5 mr10 pt10 pb10 pl20 pr20 font-22 ulib-r10 bg-f3f6fc" wx:if="{{option.checked}}">
-                {{option.name}}
-              </view>
-            </block>
-          </view>
-        </view>
-      </block>
-      <block wx:for='{{daoDianList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
-        <view class="relative mt20" wx:if="{{list.have}}">
-          <view class="absolute left-0 box-middle font-28">{{list.name}}</view>
-          <view class="pl150">
-            <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-              <view class="inline-block space-nowrap mt5 mb5 mr10 pt10 pb10 pl20 pr20 font-22 ulib-r10 bg-f3f6fc" wx:if="{{option.checked}}">
-                {{option.name}}
-              </view>
-            </block>
-          </view>
-        </view>
-      </block>
-      <block wx:for='{{gouMaiList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
-        <view class="relative mt20" wx:if="{{list.have}}">
-          <view class="absolute left-0 box-middle font-28">{{list.name}}</view>
-          <view class="pl150">
-            <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-              <view class="inline-block space-nowrap mt5 mb5 mr10 pt10 pb10 pl20 pr20 font-22 ulib-r10 bg-f3f6fc" wx:if="{{option.checked}}">
-                {{option.name}}
-              </view>
-            </block>
-          </view>
-        </view>
-      </block>
-    </view>
-    <view class="mt30 pl50 pr30 pb200" wx:elif="{{tabid == 3}}">
-      <view class="relative mt20" wx:if="{{detailinfo.defeat.reason}}">
-        <view class="absolute left-0 box-middle font-28">战败理由</view>
-        <view class="pl150 font-28 color-666">
-          {{detailinfo.defeat.reason}}
-        </view>
+    <view class="mt30 pl5 pr5 pb150" wx:elif="{{tabid == tab[2].id}}">
+      <view>
+        <block wx:for="{{detailinfo.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
+          <text class="inline-block mr10 pt5 pb5 pl20 pr20 bg-f3f6fc font-22 ulib-r5">{{tag}}</text>
+        </block>
      </view>
-      <!-- <block wx:for='{{defeatList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
-        <view class="relative mt20" wx:if="{{list.have}}">
-          <view class="absolute left-0 box-middle font-28">{{list.name}}</view>
-          <view class="pl150">
-            <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-              <view class="inline-block space-nowrap mt5 mb5 mr10 pt10 pb10 pl20 pr20 font-22 ulib-r10 bg-f3f6fc" wx:if="{{option.checked}}">
-                {{option.name}}
-              </view>
-            </block>
-          </view>
-        </view>
-      </block> -->
    </view>
  </view>
-  <view class="fixed left-0 bottom-0 right-0 bg-fff-op90 pl40 pr40 pt20 pb40 z-index-1">
-    <!-- <view>
-      <button bindtap="pushLink" data-url="/pages/customer/editCard/index?id={{id}}" class="inline-block btn-36afa2 font-22 color-fff ulib-r10" hover-class="btn-36afa2-hover"></button>
-    </view> -->
-    <view class="fn-flex text-center">
-      <view class="fn-flex-item flexsize3 pt10 color-36afa2" bindtap="pushLink" data-url="/pages/customer/editCard/index?id={{id}}">
-        <i class="iconfont icon-bianjiwenjian font-36"></i>
-        <view class="font-22">修改信息</view>
-      </view>
-      <block wx:if="{{optDefeat}}">
-        <view class="fn-flex-item flexsize4 pt20 pb20 bds-2-36afa2 bg-fff font-32 color-36afa2 ulib-rl750" bindtap="putAppCustomersDefeats" data-type="0">
-          战败
-        </view>
-        <view class="fn-flex-item flexsize4 pt20 pb20 btn-36afa2 font-32 color-fff ulib-rr750" bindtap="putAppCustomersDefeats" data-type="1">
-          再战
-        </view>
-      </block>
-      <block wx:elif="{{detailinfo.status==2}}">
-        <view class="fn-flex-item flexsize4 pt20 pb20 bds-2-36afa2 bg-fff font-32 color-36afa2 ulib-rl750" bindtap="optShowNote">
-          客户跟进
-        </view>
-        <view class="fn-flex-item flexsize4 pt20 pb20 btn-36afa2 font-32 color-fff ulib-rr750" bindtap="optShowOrder">
-          订单（复购）
-        </view>
-      </block>
-      <block wx:elif="{{detailinfo.status==3}}">
-        <view class="fn-flex-item flexsize4 pt20 pb20 bds-2-36afa2 bg-fff font-32 color-36afa2 ulib-rl750" bindtap="optShowNote">
-          客户跟进
-        </view>
-        <view class="fn-flex-item flexsize4 pt20 pb20 btn-36afa2 font-32 color-fff ulib-rr750" bindtap="optShowNote">
-          再战
-        </view>
-      </block>
-      <block wx:else>
-        <view class="fn-flex-item flexsize4 pt20 pb20 bts-2-36afa2 bls-2-36afa2 bbs-2-36afa2 bg-fff font-32 color-36afa2 ulib-rl750" bindtap="optShowNote">
-          客户跟进
-        </view>
-        <view class="fn-flex-item flexsize4 pt20 pb20 btn-36afa2 font-32 color-fff ulib-rr750 {{detailinfo.generate_order||userInfo.group_id==2||userInfo.group_id==3||userInfo.group_id==4?'':'opacity-50'}}" bindtap="{{detailinfo.generate_order||userInfo.group_id==2||userInfo.group_id==3||userInfo.group_id==4?'pushLink':''}}" data-url="/pages/order/register/index?cus_id={{detailinfo.id}}&name={{detailinfo.name}}&mobile={{detailinfo.mobile}}&complete_mobile={{detailinfo.complete_mobile}}">
-          生成订单
-        </view>
-      </block>
+
+  <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="putAppCustomersDefeats" data-type="0">战败</button>
+      <button class="fn-flex-item btn-36afa2 ml20 pt10 pb10 text-center font-32 color-fff ulib-r750" bindtap="putAppCustomersDefeats" data-type="1">再战</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>
 <lcb-backChannel></lcb-backChannel>
-<page-container show="{{isShowTimePicker}}" round="{{true}}" overlay="true" duration="300" z-index="10000" position="bottom" close-on-slide-down="{{false}}" bindenter="onEnter" custom-style="false" overlay-style="false">
-  <view class="">
-    <view class="relative pt30 pb30 text-center font-30">
-      <view class="color-666">计划回访时间</view>
-      <i bindtap="optShowTimePicker" class="absolute right-0 box-middle mr30 iconfont icon-guanbi1"></i>
-    </view>
-    <view class="fn-flex pt30 pb30 bbs-1-eb text-center font-24">
-      <block wx:for="{{weekList}}" wx:key="index">
-        <view class="fn-flex-item">{{item}}</view>
-      </block>
-    </view>
-    <view class="pb40 relative">
-      <view class="absolute top-0 box-center mt130 font-180 color-f8">{{cMonth}}</view>
-      <view class="relative fn-flex fn-flex-wrap pt30 pb30 text-center font-24 z-index-2">
-        <block wx:for="{{dateList}}" wx:key="index">
-          <view bindtap="{{item.isopt?'optday':''}}" data-index="{{index}}" class="datecell ulib-r10 {{nextIndex == index?'active':''}} {{item.isopt?'color-1a':'color-ccc'}}">
-            {{item.day}}
-          </view>
-        </block>
-      </view>
-    </view>
-  </view>
-</page-container>
+
 <lcb-msg isShow="{{isShowMessage}}">
-  <view slot="content">
-    <view class="inner40">
-      <textarea class="wp100 inner20 bds-2-eb font-28 ulib-r10" placeholder-class="color-ccc" maxlength='100' placeholder="请输入短信内容" bindinput='inputTx' data-key="content" name='content' value='{{content}}' />
+	<view slot="content">
+		<view class="inner40">
+      <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" placeholder-class="color-ccc" maxlength='100' placeholder="请输入短信内容" bindinput='inputTx' data-key="content" name='content' value='{{content}}' />
    </view>
    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="hideMessage" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
-        取消
-      </button>
-      <button disabled="{{submitFlag}}" bindtap="postAppSmsCustomer" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">
-        确定
-      </button>
+      <button bindtap="hideMessage" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
+      <button disabled="{{submitFlag}}" bindtap="postAppSmsCustomer" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
    </view>
-  </view>
-</lcb-msg>
-<lcb-msg isShow="{{isShowNote}}">
-  <view slot="content" class="pt20">
-    <view class="mt30 pl30 pr30 font-28 text-center fn-flex" wx:if="{{detailinfo.status ==3}}">
-      <view class="fn-flex-item relative ml10 mr10 pt20 pb20 ulib-r10 {{statuskey == 0?'bg-36afa2 color-fff':'bg-f6'}}" bindtap="radioPicker" data-key="0">
-        未见客户
-      </view>
-      <view class="fn-flex-item relative ml10 mr10 pt20 pb20 ulib-r10 {{statuskey == 1?'bg-36afa2 color-fff':'bg-f6'}}" bindtap="radioPicker" data-key="1">
-        到店客户
-      </view>
-    </view>
-    <view class="mt30 pl30 pr30 font-28 text-center fn-flex" wx:elif="{{detailinfo.status!=2}}">
-      <view class="fn-flex-item relative ml10 mr10 pt20 pb20 ulib-r10 {{statuskey == 0?'bg-36afa2 color-fff':'bg-f6'}}" bindtap="radioPicker" data-key="0">
-        未见客户
-      </view>
-      <view class="fn-flex-item relative ml10 mr10 pt20 pb20 ulib-r10 {{statuskey == 1?'bg-36afa2 color-fff':'bg-f6'}}" bindtap="radioPicker" data-key="1">
-        到店客户
-      </view>
-      <view class="fn-flex-item relative ml10 mr10 pt20 pb20 ulib-r10 {{statuskey == 3?'bg-36afa2 color-fff':'bg-f6'}}" bindtap="radioPicker" data-key="3">
-        战败客户
-      </view>
-    </view>
-    <scroll-view scroll-y="true" style="max-height:1000rpx;">
-      <block wx:if="{{statuskey==0||statuskey==1}}">
-        <view class="mt20 bds-2-eb ml40 mr40 inner20 font-28 color-666 fn-clear ulib-r10">
-          <view class="fn-fl">跟进渠道</view>
-          <picker class="fn-fr wp60 text-right" bindchange="changeFollow" value="{{followIndex}}" range="{{follow}}">
-            <text class="color-ccc" wx:if="{{followIndex == -1}}">请选择</text>
-            <text wx:else>{{follow[followIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </picker>
-        </view>
-        <view class="mt20 bds-2-eb ml40 mr40 inner20 font-28 color-666 fn-clear ulib-r10">
-          <view class="fn-fl">客户等级</view>
-          <view class="fn-fr wp60 text-right" wx:if="{{detailinfo.status==0&&statuskey==1}}">H</view>
-          <picker class="fn-fr wp60 text-right" bindchange="changeLevel" value="{{levelIndex}}" range="{{level}}" wx:else>
-            <text class="color-ccc" wx:if="{{levelIndex == -1}}">请选择</text>
-            <text wx:else>{{level[levelIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </picker>
-        </view>
-        <block wx:for='{{daoDianTag}}' wx:for-item='list' wx:for-index='i' wx:key='i' wx:if="{{statuskey==0}}">
-          <view class="relative mt20 pl40 pr40">
-            <view class="font-28">
-              <text class="text-middle">{{list.name}}</text>
-            </view>
-            <view class="fn-clear" wx:if="{{list.type=='radio'}}">
-              <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-                <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-36afa2 color-fff':'bg-f6 color-666'}}" bindtap="daoDianRadioPicker" data-i="{{i}}" data-j="{{j}}">
-                  {{option.name}}
-                </view>
-              </block>
-            </view>
-            <view class="fn-clear" wx:if="{{list.type=='checkbox'}}">
-              <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-                <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-36afa2 color-fff':'bg-f6 color-666'}}" bindtap="daoDianCheckPicker" data-i="{{i}}" data-j="{{j}}">
-                  {{option.name}}
-                </view>
-              </block>
-            </view>
-          </view>
-        </block>
-        <block wx:for='{{gouMaiTag}}' wx:for-item='list' wx:for-index='i' wx:key='i' wx:if="{{statuskey==1}}">
-          <view class="relative mt20 pl40 pr40">
-            <view class="font-28">
-              <text class="text-middle">{{list.name}}</text>
-            </view>
-            <view class="fn-clear" wx:if="{{list.type=='radio'}}">
-              <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-                <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-36afa2 color-fff':'bg-f6 color-666'}}" bindtap="gouMaiRadioPicker" data-i="{{i}}" data-j="{{j}}">
-                  {{option.name}}
-                </view>
-              </block>
-            </view>
-            <view class="fn-clear" wx:if="{{list.type=='checkbox'}}">
-              <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-                <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-36afa2 color-fff':'bg-f6 color-666'}}" bindtap="gouMaiCheckPicker" data-i="{{i}}" data-j="{{j}}">
-                  {{option.name}}
-                </view>
-              </block>
-            </view>
-          </view>
-        </block>
-        <view class="mt20 bds-2-eb ml40 mr40 inner20 font-28 {{levelIndex>-1?'color-666':'color-ccc'}} fn-clear ulib-r10">
-          <view class="fn-fl">计划回访时间</view>
-          <view bindtap="{{levelIndex>-1?'optShowTimePicker':''}}" class="fn-fr wp60 text-right">
-            <text class="color-ccc" wx:if="{{nextIndex == -1}}">请选择</text>
-            <text wx:else>{{dateList[nextIndex].year}}-{{dateList[nextIndex].month}}-{{dateList[nextIndex].day}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </view>
-        </view>
-      </block>
-      <view class="mt20 ml40 mr40 font-28 text-center relative mr10 pt20 pb20 ulib-r10 overflowhidden {{baseinfo.wxgr==1?'opacity-80':''}} {{wxgr == 1?'bg-36afa2 color-fff':'bg-f6'}}" style="height:78rpx;box-sizing:border-box;" bindtap="{{baseinfo.wxgr==1?'':'checkPicker'}}" data-pointer="gewei" wx:if="{{statuskey==0}}">
-        <i class="absolute right-0 bottom-0 iconfont font-32 icon-xuanzhongjiaobiao" style="color:#56ffed;" wx:if="{{wxgr == 1}}"></i>
-        <text>已添加个微</text>
-      </view>
-      <view class="mt20 pl40 pr40 font-28 text-center fn-flex" wx:if="{{statuskey==1}}">
-        <view class="fn-flex-item flexsize6 relative mr10 pt20 pb20 ulib-r10 overflowhidden {{baseinfo.wxgr==1?'opacity-80':''}} {{wxgr == 1?'bg-36afa2 color-fff':'bg-f6'}}" style="height:78rpx;box-sizing:border-box;" bindtap="{{baseinfo.wxgr==1?'':'checkPicker'}}" data-pointer="gewei">
-          <i class="absolute right-0 bottom-0 iconfont font-32 icon-xuanzhongjiaobiao" style="color:#56ffed;" wx:if="{{wxgr == 1}}"></i>
-          <text>已添加个微</text>
-        </view>
-        <view class="fn-flex-item flexsize5 relative ml10 mr10 pt20 pb20 ulib-r10 overflowhidden {{a_num == 1?'bg-36afa2 color-fff':'bg-f6'}}" style="height:78rpx;box-sizing:border-box;" bindtap="checkPicker" data-pointer="daodian">
-          <i class="absolute right-0 bottom-0 iconfont font-32 icon-xuanzhongjiaobiao" style="color:#56ffed;" wx:if="{{a_num == 1}}"></i>
-          <text>再次到店</text>
-        </view>
-        <view class="fn-flex-item flexsize5 relative ml10 pt20 pb20 ulib-r10 overflowhidden {{t_num == 1?'bg-36afa2 color-fff':'bg-f6'}}" style="height:78rpx;box-sizing:border-box;" bindtap="checkPicker" data-pointer="shijia">
-          <i class="absolute right-0 bottom-0 iconfont font-32 icon-xuanzhongjiaobiao" style="color:#56ffed;" wx:if="{{t_num == 1}}"></i>
-          <text>客户试驾</text>
-        </view>
-      </view>
-      <view class="mt20 text-center" wx:if="{{(statuskey==0||statuskey==1)&&wxgr==1}}">
-        <view class="inline-block img-250x150 relative ulib-r10 overflowhidden">
-          <block wx:if="{{wxgrimg_url}}">
-            <view class="inline-block bg-f8 img-250x150 relative ulib-r10 overflowhidden">
-              <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="chooseImg" data-type="gw_img"></i>
-              <image class='block wp100 img-250x150 ulib-r10' src='{{wxgrimg_url}}' mode='aspectFit' bindtap="previewImage" data-type="gw_img"></image>
-            </view>
-          </block>
-          <block wx:else>
-            <view class="inline-block bg-f8 img-250x150 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="gw_img">
-              <view class="absolute left-0 right-0 box-middle color-ccc">
-                <i class="iconfont icon-paizhao font-42"></i>
-                <view class="mt10 font-22">上传个微截图</view>
-              </view>
-            </view>
-          </block>
-        </view>
-      </view>
-      <block wx:if="{{statuskey!=3}}">
-        <view class="mt15 pl40 pr40">
-          <textarea class="wp100 inner20 bds-2-eb font-28 ulib-r10" style="height:200rpx;" placeholder-class="color-ccc" placeholder="请输入小记内容" bname='note' model:value='{{note}}' />
-        </view>
-        <view class="mt20 pl25 pr25">
-          <view class="fn-flex">
-            <block wx:for='{{photos}}' wx:for-item='photos' wx:for-index="index" wx:key='photo'>
-              <view class="fn-flex-item ml15 mr15 relative">
-                <i class="absolute top-0 right-0 bg-ccc iconfont icon-shanchu inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delPic" data-index="{{index}}"></i>
-                <image class='img-250x150 ulib-r10' src='{{photos.img_url}}' mode='aspectFill'></image>
-              </view>
-            </block>
-            <block wx:if="{{photos.length==0}}">
-              <view class="fn-flex-item ml15 mr15 relative" bindtap="chooseImg" data-type="note_img">
-                <image class='img-250x150 ulib-r10' src='{{imgUrl}}common/add-pic.jpg' mode='aspectFill'></image>
-              </view>
-              <view class="fn-flex-item ml15 mr15 relative" bindtap="chooseImg" data-type="note_img">
-                <image class='img-250x150 ulib-r10' src='{{imgUrl}}common/add-pic.jpg' mode='aspectFill'></image>
-              </view>
-            </block>
-            <block wx:elif="{{photos.length==1}}">
-              <view class="fn-flex-item ml15 mr15 relative" bindtap="chooseImg" data-type="note_img">
-                <image class='img-250x150 ulib-r10' src='{{imgUrl}}common/add-pic.jpg' mode='aspectFill'></image>
-              </view>
-            </block>
-          </view>
-        </view>
-      </block>
-      <view class="pl40 pr40" wx:if="{{statuskey==3}}">
-        <view class="mt20 bds-2-eb inner20 font-28 color-666 ulib-r10">
-            <picker class="fn-clear" bindchange="changeDefeat" value="{{defeatIndex}}" range="{{defeatTitleList}}">
-                <view class="wp90 fn-fl text-nowrap color-ccc" wx:if="{{defeatIndex == -1}}">请选择</view>
-                <view class="wp90 fn-fl text-nowrap" wx:else>{{defeatTitleList[defeatIndex]}}</view>
-                <i class="fn-fr iconfont mt5 ml5 icon-gengduo color-ccc"></i>
-            </picker>
-        </view>
-        <block wx:if="{{defeatIndex > -1}}">
-            <view class="fn-clear" wx:if="{{defeatTag[defeatIndex].type=='radio'}}">
-              <block wx:for='{{defeatTag[defeatIndex].list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-                <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-36afa2 color-fff':'bg-f6 color-666'}}" bindtap="defeatRadioPicker" data-i="{{defeatIndex}}" data-j="{{j}}">
-                  {{option.name}}
-                </view>
-              </block>
-            </view>
-            <view class="fn-clear" wx:if="{{defeatTag[defeatIndex].type=='checkbox'}}">
-              <block wx:for='{{defeatTag[defeatIndex].list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-                <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-36afa2 color-fff':'bg-f6 color-666'}}" bindtap="defeatCheckPicker" data-i="{{defeatIndex}}" data-j="{{j}}">
-                  {{option.name}}
-                </view>
-              </block>
-            </view>
-        </block>
-        <!-- <block wx:for='{{defeatTag}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
-          <view class="relative mt20">
-            <view class="font-28">
-              <text class="text-middle">{{list.name}}</text>
-              <text class="text-middle font-24" wx:if="{{list.type=='radio'}}">（单选）</text>
-              <text class="text-middle font-24" wx:if="{{list.type=='checkbox'}}">（多选）</text>
-            </view>
-            <view class="fn-clear" wx:if="{{list.type=='radio'}}">
-              <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-                <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-36afa2 color-fff':'bg-f6 color-666'}}" bindtap="defeatRadioPicker" data-i="{{i}}" data-j="{{j}}">
-                  {{option.name}}
-                </view>
-              </block>
-            </view>
-            <view class="fn-clear" wx:if="{{list.type=='checkbox'}}">
-              <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-                <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-36afa2 color-fff':'bg-f6 color-666'}}" bindtap="defeatCheckPicker" data-i="{{i}}" data-j="{{j}}">
-                  {{option.name}}
-                </view>
-              </block>
-            </view>
-          </view>
-        </block> -->
-        <view class="mt20">
-          <textarea class="wp100 inner20 bds-2-eb font-28 ulib-r10" style="height:200rpx;" placeholder-class="color-ccc" maxlength='100' placeholder="请填写战败理由" name='defeat_reason' model:value='{{defeat_reason}}' />
-        </view>
-      </view>
-    </scroll-view>
-    <view class="fn-flex mt20 pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="optShowNote" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
-        取消
-      </button>
-      <button disabled="{{submitFlag}}" bindtap="putAppCustomers" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">
-        确定
-      </button>
-    </view>
-  </view>
-</lcb-msg>
-<lcb-msg isShow="{{isShowOrder}}">
-  <view slot="content">
-    <view class="mt50 font-36 text-center">查看订单</view>
-    <scroll-view class="pb50" scroll-y="true" style="max-height:600rpx;width:620rpx">
-      <view class="inner40">
-        <block wx:for='{{order}}' wx:key='index'>
-          <view class="inner30 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index{{item.id>=v2OrderId?'2':''}}?id={{item.id}}">
-            <view class="font-32 text-bold">{{item.name}}</view>
-            <view class="mt10 font-28 color-666">{{item.mobile}}</view>
-            <view class="mt10 font-28 color-666">{{item.car_name}}</view>
-            <i class="absolute right-0 mr30 box-middle iconfont icon-gengduo text-middle font-44 color-ccc"></i>
-          </view>
-        </block>
-      </view>
-    </scroll-view>
-    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="optShowOrder" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750" hover-class="btn-36afa2-hover">
-        返回
-      </button>
-      <button class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="pushLink" data-url="/pages/order/register/index?cus_id={{detailinfo.id}}&name={{detailinfo.name}}&mobile={{detailinfo.mobile}}&complete_mobile={{detailinfo.complete_mobile}}">
-        生成订单
-      </button>
-    </view>
-    <!-- <view class="pl60 pr60 pb50 text-center font-32 color-666" wx:else>
-      <button bindtap="optShowOrder" class="bds-2-36afa2 btn-no-bg wp45 font-28 color-36afa2 ulib-r750" hover-class="btn-36afa2-hover">
-        返回
-      </button>
-    </view> -->
-  </view>
-</lcb-msg>
-<lcb-msg isShow="{{isShowComment}}">
-  <view slot="content">
-    <view class="inner40">
-      <view class="font-36 text-center">小记评论</view>
-      <view class="mt20">
-        <textarea class="wp100 inner20 bds-2-eb font-28 ulib-r10" style="height:170rpx;" placeholder-class="color-ccc" maxlength='100' placeholder="请输入评论内容" model:value='{{comment}}' />
-      </view>
-    </view>
-    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="optShowComment" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
-        取消
-      </button>
-      <button disabled="{{submitFlag}}" bindtap="postAppCustomersComments" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">
-        确定
-      </button>
-    </view>
-  </view>
+	</view>
 </lcb-msg>

-<!-- 拨打电话 -->
-<lcb-msg isShow="{{isShowCall}}">
-  <view slot="content">
-    <view class="pt50 pb40">
-      <view class="font-36 text-center">号码绑定成功</view>
-      <view class="mt10 font-28 text-center color-666">现在呼叫 {{phoneNumber}} ？</view>
+<lcb-msg isShow="{{isShowNote}}">
+	<view slot="content">
+		<view class="pt40 pl40 pr40">
+      <view class="font-36 text-center">新增小记</view>
+      <textarea class="mt30 wp100 inner20 bds-1-eb font-28 ulib-r10" placeholder-class="color-ccc" placeholder="请输入小记内容" bindinput='inputTx' data-key="note" name='note' style="height:150rpx;" value='{{note}}' />
+    </view>
+    <view class="mt30 pl25 pr25 pb40">
+      <view class="fn-flex">
+        <block wx:for='{{photos}}' wx:for-item='photos' wx:for-index="index" wx:key='photo'>
+          <view class="fn-flex-item ml15 mr15 relative">
+            <i class="absolute top-0 right-0 bg-ccc iconfont icon-shanchu inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delPic" data-index="{{index}}" ></i>
+            <image class='img-250x150 ulib-r10' src='{{photos.img_url}}' mode='aspectFill'></image>
+          </view>
+        </block>
+        <block wx:if="{{photos.length==0}}">
+          <view class="fn-flex-item ml15 mr15 relative" bindtap="chooseImg">
+            <image class='img-250x150 ulib-r10' src='{{imgUrl}}common/add-pic.jpg' mode='aspectFill'></image>
+          </view>
+          <view class="fn-flex-item ml15 mr15 relative" bindtap="chooseImg">
+            <image class='img-250x150 ulib-r10' src='{{imgUrl}}common/add-pic.jpg' mode='aspectFill'></image>
+          </view>
+        </block>
+        <block wx:elif="{{photos.length==1}}">
+          <view class="fn-flex-item ml15 mr15 relative" bindtap="chooseImg">
+            <image class='img-250x150 ulib-r10' src='{{imgUrl}}common/add-pic.jpg' mode='aspectFill'></image>
+          </view>
+        </block>
+      </view>
    </view>
    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="hideCall" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
-        取消
-      </button>
-      <button bindtap="makePhoneCall" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">
-        确定
-      </button>
+      <button bindtap="optShowNote" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
+      <button disabled="{{submitFlag}}" bindtap="postAppCustomerlogs" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
    </view>
-  </view>
+	</view>
+</lcb-msg>
+
+<lcb-msg isShow="{{isShowSelectStatus}}">
+	<view slot="content">
+		<view class="mt50 font-36 text-center">变更状态</view>
+    <scroll-view class="pb50" scroll-y="true" style="max-height:600rpx;width:620rpx">
+      <view class="mt20 pl20 pr15 font-28 fn-clear">
+        <block wx:for="{{stateList}}" wx:key='index'>
+          <view wx:if="{{item.key<=detailinfo.status}}" class="fn-fl wp45 relative mt20 ml20 inner30 bg-f6 ulib-r10 opacity-50">
+            <text>{{item.name}}</text>
+            <i class="absolute right-0 box-middle mr30 iconfont icon-danxuan_xuanzhong color-36afa2"></i>
+          </view>
+          <view wx:else class="fn-fl wp45 relative mt20 ml20 inner30 bg-f6 ulib-r10" bindtap="radioPicker" data-key="{{item.key}}">
+            <text>{{item.name}}</text>
+            <i class="absolute right-0 box-middle mr30 iconfont {{statuskey == item.key?'icon-danxuan_xuanzhong color-36afa2':'icon-danxuan color-999'}}"></i>
+          </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="defeat_reason" name='defeat_reason' value='{{defeat_reason}}' />
+      </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">
+          <text>到店 +1次</text>
+          <i class="absolute right-0 box-middle mr30 iconfont {{a_num == 1?'icon-fuxuansel color-36afa2':'icon-fuxuankuang color-999'}}"></i>
+        </view>
+        <view class="fn-fl wp45 relative mt20 ml20 inner30 bg-f6 ulib-r10" bindtap="checkPicker" data-pointer="shijia">
+          <text>试驾 +1次</text>
+          <i class="absolute right-0 box-middle mr30 iconfont {{t_num == 1?'icon-fuxuansel color-36afa2':'icon-fuxuankuang color-999'}}"></i>
+        </view>
+      </view>
+    </scroll-view>
+    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
+      <button bindtap="cancelSelectStatus" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750" hover-class="btn-36afa2-hover">取消</button>
+      <button bindtap="putAppCustomers" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
+    </view>
+	</view>
 </lcb-msg>
@@ -4,43 +4,29 @@ Page({
  data: {
    name:'',//名字
    mobile:'',//手机号
-    // brand_id:'',//品牌
-    // car_id:'',//车系id
-    // v_id:'',//车辆版本id
-    // color_id:'',//颜色id
-    // brandIndex:-1,//车辆品牌索引
-    // modelIndex:-1,//车系车型索引
-    // colorArray:[],//车身颜色列表
-    // levelArray:[],//车辆版本列表
-    // colorIndex:-1,//车身颜色索引
-    // levelIndex:-1,//车辆版本索引
-
-    c_brands:[
-      '综合','东风纳米','哪吒','零跑'
-    ],
-
-    c_brandArray:[
-      {id:0, name:'综合'},
-      {id:1, name:'东风纳米'},
-      {id:4, name:'哪吒'},
-      {id:5, name:'零跑'},
-    ],
-  
+    brand_id:'',//品牌
+    car_id:'',//车系id
+    v_id:'',//车型级别id
+    color_id:'',//颜色id
+    buy_time:'',//预计购车时间
+    brandIndex:-1,//车辆品牌索引
+    modelIndex:-1,//车型车系索引
+    colorArray:[],//车型颜色列表
+    levelArray:[],//车型级别列表
+    colorIndex:-1,//车型颜色索引
+    levelIndex:-1,//车型级别索引
+    timeArray:[],//预计购车时间列表
+    timeIndex:-1,//预计购车时间索引
+    cf_clues:'',//线索来源
+    cluesArray:[
+      '自然进店',
+      '外展外拓',
+      '转介绍',
+      '垂直媒体',
+      '自媒体',
+    ],//线索来源
+    cluesIndex:-1,//索来源索引
    submitFlag:false,
-
-    of_id:'',
-    of2_id:'',
-    of1Index:-1,
-    of2Index:-1,
-    c_brandIndex:-1,
-
-    cityIndex:-1,
-    city_id:'',
-    countyIndex:-1,
-    county_id:'',
-    wxgr:0,//是否添加个微
-    wxgrimg:'',//个微
-    wxgrimg_url:'',//个微
  },
  //生命周期函数--监听页面加载
  onLoad: function (options) {
@@ -50,7 +36,6 @@ Page({
      })
    }
    this.getAppCustomerData()
-    this.getAppCustomersTag()
  },

  //获取客户详细信息
@@ -62,27 +47,23 @@ Page({
        baseinfo:res.data.baseinfo,
        name:res.data.baseinfo.name.value?res.data.baseinfo.name.value:'',
        mobile:res.data.baseinfo.mobile.value?res.data.baseinfo.mobile.value:'',
-        of_id:res.data.baseinfo.of_id.of_id?res.data.baseinfo.of_id.of_id:'',
-        of2_id:res.data.baseinfo.of_id.of2_id?res.data.baseinfo.of_id.of2_id:'',
-        wxgr:res.data.baseinfo.wxgr,
-        wxgrimg:res.data.baseinfo.wxgrimg,
-        wxgrimg_url:res.data.baseinfo.wxgrimg_url,
+        cf_clues:res.data.baseinfo.cf_clues.value?res.data.baseinfo.cf_clues.value:'',
      })

-      this.data.c_brandArray.forEach((item,index) => {
-        if(res.data.baseinfo.c_brand == item.id){
-          this.setData({
-            c_brandIndex:index
-          })
-        }
-      })
+      if(res.data.baseinfo.cf_clues.value){
+        this.data.cluesArray.forEach((item,index) => {
+          if(item == res.data.baseinfo.cf_clues.value){
+            this.setData({
+              cluesIndex:index,
+            })
+          }
+        })
+      }

      //编辑基础信息使用
-      //获取车型品牌
-      //this.getAppSeriesBrands()
-      //匹配车系车型
-      //this.getAppSeriesedit()
-      this.getAppCustomersOffline_sources()
+      this.getAppSeriesBrands()
+      this.getAppSeriesedit()
+      this.getAppCustomersFilter()

    })
  },
@@ -110,13 +91,14 @@ Page({
              })
            }
          })
+
        }

      }
    });
  },

-  //匹配车系车型
+  //匹配车型车系
  getAppSeriesedit(){
    let params = {};
    params['brand_id'] = this.data.baseinfo.brand_id.value;
@@ -142,7 +124,7 @@ Page({
            }
          })

-          //匹配颜色 车辆版本
+          //匹配颜色 车型级别
          this.getAppSeriesAttrsleveledit()

        }
@@ -151,7 +133,7 @@ Page({
    });
  },

-  //编辑品牌时车系车型
+  //编辑品牌时车型车系
  getAppSeries(){
    let params = {};
    params['brand_id'] = this.data.brand_id;
@@ -169,7 +151,7 @@ Page({
    });
  },

-  //获取车辆版本 ---编辑匹配信息
+  //获取车型级别 ---编辑匹配信息
  getAppSeriesAttrsleveledit(){

    let params = {};
@@ -204,7 +186,7 @@ Page({
    });
  },

-  //获取车身颜色 ---编辑匹配信息
+  //获取车型颜色 ---编辑匹配信息
  getAppSeriesAttrscoloredit(){
    let params = {};
    params['id'] = this.data.modelList[this.data.modelIndex].id;
@@ -238,7 +220,7 @@ Page({
  },
  

-  //获取车辆版本
+  //获取车型级别
  getAppSeriesAttrslevel(){
    let params = {};
    params['id'] = this.data.car_id;
@@ -258,7 +240,7 @@ Page({
    });
  },

-  //获取车身颜色
+  //获取车型颜色
  getAppSeriesAttrscolor(){
    let params = {};
    params['id'] = this.data.car_id;
@@ -279,6 +261,33 @@ Page({
    });
  },

+  //获取列表筛选条件-时间
+  getAppCustomersFilter(){
+    _.apiQuery.getAppCustomersFilter().then(res => {
+
+      let timeArray = []
+      res.data.buy_time.forEach(item => {
+        timeArray.push(item + '天')
+      })
+      this.setData({
+        timeArray:timeArray,
+        timeList:res.data.buy_time,
+      })
+
+      if(this.data.baseinfo.buy_time.value != 0){
+        res.data.buy_time.forEach((item,index) => {
+          if(item == this.data.baseinfo.buy_time.value){
+            this.setData({
+              buy_time:this.data.baseinfo.buy_time.value,
+              timeIndex:index,
+            })
+          }
+        })
+      }
+
+    });
+  },
+
  //输入
  inputTx(e) {
    this.setData({
@@ -287,15 +296,6 @@ Page({
    })
  },

-  //选择城市
-  changeCbrand(e) {
-    if(this.data.c_brandIndex!=e.detail.value){
-      this.setData({
-        c_brandIndex:e.detail.value,
-      })
-    }
-  },
-
  //选择品牌
  changeBrand(e) {
    if(this.data.brandIndex != e.detail.value && e.detail.value >= 0){
@@ -303,15 +303,15 @@ Page({
        brand_id:this.data.brandList[e.detail.value].id,
        brandIndex:e.detail.value,
        car_id:'',//车系id
-        v_id:'',//车辆版本id
-        color_id:'',//车身颜色id
+        v_id:'',//车型级别id
+        color_id:'',//车型颜色id
        incolor_id:'',//内饰颜色id
-        modelIndex:-1,//车系车型索引
-        colorArray:[],//车身颜色列表
-        levelArray:[],//车辆版本列表
+        modelIndex:-1,//车型车系索引
+        colorArray:[],//车型颜色列表
+        levelArray:[],//车型级别列表
        interiorArray:[],//内饰颜色
-        colorIndex:-1,//车身颜色索引
-        levelIndex:-1,//车辆版本索引
+        colorIndex:-1,//车型颜色索引
+        levelIndex:-1,//车型级别索引
        interiorIndex:-1,//内饰颜色索引
        priceinfo:'',
      })
@@ -325,14 +325,14 @@ Page({
      this.setData({
        car_id:this.data.modelList[e.detail.value].id,
        modelIndex:e.detail.value,
-        v_id:'',//车辆版本id
-        color_id:'',//车身颜色id
+        v_id:'',//车型级别id
+        color_id:'',//车型颜色id
        incolor_id:'',//内饰颜色id
-        colorArray:[],//车身颜色列表
-        levelArray:[],//车辆版本列表
+        colorArray:[],//车型颜色列表
+        levelArray:[],//车型级别列表
        interiorArray:[],//内饰颜色
-        colorIndex:-1,//车身颜色索引
-        levelIndex:-1,//车辆版本索引
+        colorIndex:-1,//车型颜色索引
+        levelIndex:-1,//车型级别索引
        interiorIndex:-1,//内饰颜色索引
        priceinfo:'',
      })
@@ -340,21 +340,21 @@ Page({
    }
  },

-  //车辆版本
+  //车型级别
  changeLevel(e) {
    if(this.data.levelIndex != e.detail.value && e.detail.value >= 0){
      this.setData({
        v_id:this.data.levelList[e.detail.value].id,
        levelIndex:e.detail.value,
-        color_id:'',//车身颜色id
-        colorArray:[],//车身颜色列表
-        colorIndex:-1,//车身颜色索引
+        color_id:'',//车型颜色id
+        colorArray:[],//车型颜色列表
+        colorIndex:-1,//车型颜色索引
      })
      this.getAppSeriesAttrscolor()
    }
  },

-  //车身颜色
+  //车型颜色
  changeColor(e) {
    if(this.data.colorIndex != e.detail.value && e.detail.value >= 0){
      this.setData({
@@ -364,6 +364,22 @@ Page({
    }
  },

+  //线索来源
+  changeClues(e) {
+    this.setData({
+      cf_clues:this.data.cluesArray[e.detail.value],
+      cluesIndex:e.detail.value,
+    })
+  },
+
+  //预计购车时间
+  changeTime(e) {
+    this.setData({
+      buy_time:this.data.timeList[e.detail.value],
+      timeIndex:e.detail.value,
+    })
+  },
+
  //编辑客户
  putAppCustomerData() {

@@ -373,107 +389,58 @@ Page({
        title: '请输入客户姓名',
        icon: 'none'
      })
-    } else if (that.data.mobile != that.data.baseinfo.mobile.value&&!/^1[3456789]\d{9}$/.test(that.data.mobile)){
+    } else if (that.data.mobile == '' ){
      wx.showToast({
        title: '请输入正确的手机号码',
        icon: 'none'
      })
-    }
-    else if (that.data.c_brandArray.length>0&&that.data.c_brandIndex == -1 ) {
+    }else if(that.data.car_id == '' ){
      wx.showToast({
-        title: '请选择客户品牌归属',
+        title: '请选择车型车系',
        icon: 'none'
      })
-    }
-    else if (that.data.sources.length>0&&that.data.of_id == '' ) {
+    }else if(that.data.v_id == '' ){
      wx.showToast({
-        title: '请选择客户来源',
+        title: '请选择车型级别',
        icon: 'none'
      })
-    }
-    else if (that.data.sources.length>0&&that.data.sources[that.data.of1Index].list.length>0&&that.data.of2_id == '' ) {
+    }else if(that.data.color_id == '' ){
      wx.showToast({
-        title: '请选择'+that.data.sources[that.data.of1Index].name+'类型',
+        title: '请选择车型颜色',
        icon: 'none'
      })
-    }
-    else if (that.data.city_id == '' ) {
+    } else if(that.data.name==that.data.baseinfo.name.value&&that.data.mobile==that.data.baseinfo.mobile.value&&that.data.cf_clues==that.data.baseinfo.cf_clues.value&&that.data.car_id==that.data.baseinfo.car_id.value&&that.data.v_id==that.data.baseinfo.v_id.value&&that.data.color_id==that.data.baseinfo.color_id.value&&that.data.buy_time==that.data.baseinfo.buy_time.value){
      wx.showToast({
-        title: '请选择所在城市',
+        title: '好像没改什么',
        icon: 'none'
      })
-    }
-    else if (that.data.county_id == '' ) {
-      wx.showToast({
-        title: '请选择所在地区',
-        icon: 'none'
-      })
-    }
-    else if(this.data.wxgr==1&&this.data.wxgrimg==''){
-      wx.showToast({
-        title: '请上传个微截图',
-        icon: 'none'
-      })
-    }
-    // else if(that.data.car_id == '' ){
-    //   wx.showToast({
-    //     title: '请选择车系车型',
-    //     icon: 'none'
-    //   })
-    // }else if(that.data.v_id == '' ){
-    //   wx.showToast({
-    //     title: '请选择车辆版本',
-    //     icon: 'none'
-    //   })
-    // }else if(that.data.color_id == '' ){
-    //   wx.showToast({
-    //     title: '请选择车身颜色',
-    //     icon: 'none'
-    //   })
-    // } 
-    // else if(that.data.name==that.data.baseinfo.name.value&&that.data.mobile==that.data.baseinfo.mobile.value&&that.data.of_id==that.data.baseinfo.of_id.of_id&&that.data.of2_id==that.data.baseinfo.of_id.of2_id&&that.data.car_id==that.data.baseinfo.car_id.value&&that.data.v_id==that.data.baseinfo.v_id.value&&that.data.color_id==that.data.baseinfo.color_id.value){
-    //   wx.showToast({
-    //     title: '好像没改什么',
-    //     icon: 'none'
-    //   })
-    // }
-    else{
+    }else{
      that.setData({
        submitFlag: true,
      })
      
      let params = {};
      params['cus_id'] = that.data.id;
-      params['tag'] = that.data.taglList;
      if(that.data.name != that.data.baseinfo.name.value){
        params['name'] = that.data.name;
      }
      if(that.data.mobile != that.data.baseinfo.mobile.value){
        params['mobile'] = that.data.mobile;
      }
-      if(this.data.c_brandIndex != -1){
-        params['c_brand'] = this.data.c_brandArray[this.data.c_brandIndex].id;
+      if(that.data.cf_clues != that.data.baseinfo.cf_clues.value){
+        params['cf_clues'] = that.data.cf_clues;
      }
-      if(that.data.of_id != that.data.baseinfo.of_id.of_id){
-        params['of_id'] = that.data.of_id;
+      if(that.data.car_id != that.data.baseinfo.car_id.value){
+        params['car_id'] = that.data.car_id;
      }
-      if(that.data.of2_id != that.data.baseinfo.of_id.of2_id){
-        params['of2_id'] = that.data.of2_id;
+      if(that.data.v_id != that.data.baseinfo.v_id.value){
+        params['v_id'] = that.data.v_id;
      }
-      params['city_id'] = that.data.city_id;
-      params['county_id'] = that.data.county_id;
-      // if(that.data.car_id != that.data.baseinfo.car_id.value){
-      //   params['car_id'] = that.data.car_id;
-      // }
-      // if(that.data.v_id != that.data.baseinfo.v_id.value){
-      //   params['v_id'] = that.data.v_id;
-      // }
-      // if(that.data.color_id != that.data.baseinfo.color_id.value){
-      //   params['color_id'] = that.data.color_id;
-      // }
-      params['wxgr'] = this.data.wxgr;
-      if(this.data.wxgr==1){
-        params['wxgrimg'] = this.data.wxgrimg;
+      if(that.data.color_id != that.data.baseinfo.color_id.value){
+        params['color_id'] = that.data.color_id;
+      }
+      if(that.data.buy_time != that.data.baseinfo.buy_time.value){
+        params['buy_time'] = that.data.buy_time;
      }
      _.apiQuery.putAppCustomerData(params).then(res => {

@@ -506,7 +473,6 @@ Page({
          success(res) {
            if (res.confirm) {
              that.getAppCustomerData()
-              that.getAppCustomersTag()
            } else if (res.cancel) {
              wx.navigateBack({
                delta: 1
@@ -524,236 +490,4 @@ Page({
    }
  },

-  //客户来源
-  getAppCustomersOffline_sources(){
-    _.apiQuery.getAppCustomersOffline_sources().then(res => {
-      let of1Arr = []
-      res.data.sources.forEach(item => {
-        of1Arr.push(item.name)
-      })
-      this.setData({
-        of1Arr,
-        sources:res.data.sources
-      })
-      if(this.data.of_id != ''){
-        res.data.sources.forEach((item,index) => {
-          if(item.id == this.data.of_id){
-            this.setData({
-              of1Index:index,
-            })
-          }
-        })
-        if(this.data.of2Index != ''){
-          let of2Arr = []
-          res.data.sources[this.data.of1Index].list.forEach((item,index) => {
-            of2Arr.push(item.name)
-            if(item.id == this.data.of2_id){
-              this.setData({
-                of2Index:index,
-              })
-            }
-          })
-          this.setData({
-            of2Arr,
-          })
-        }
-      }
-    });
-  },
-
-  //客户来源
-  changeOf1(e) {
-    if(this.data.of1Index!=e.detail.value){
-      let of2Arr = []
-      this.data.sources[e.detail.value].list.forEach(item => {
-        of2Arr.push(item.name)
-      })
-      this.setData({
-        of2Arr,
-        of2Index:-1,
-        of_id:this.data.sources[e.detail.value].id,
-        of1Index:e.detail.value,
-      })
-    }
-  },
-
-  changeOf2(e) {
-    if(this.data.of2Index!=e.detail.value){
-      this.setData({
-        of2_id:this.data.sources[this.data.of1Index].list[e.detail.value].id,
-        of2Index:e.detail.value,
-      })
-    }
-  },
-
-  //客户标签
-  getAppCustomersTag(){
-    let params = {};
-    params['id'] = this.data.id;
-    _.apiQuery.getAppCustomersTag(params).then(res => {
-      this.setData({
-        city_id:res.data.city_id,
-        county_id:res.data.county_id,
-        taglList:res.data.tags&&res.data.tags.length>0?res.data.tags:[],
-      })
-
-      //获取城市
-      this.getAppCityArea_city()
-      //获取地区
-      this.getAppCityArea_county()
-    });
-  },
-
-  //单选
-  radioPicker(e){
-    let taglList = this.data.taglList
-    taglList[e.currentTarget.dataset.i].list.forEach(item => {
-      item.checked=false
-    })
-    taglList[e.currentTarget.dataset.i].list[e.currentTarget.dataset.j].checked=true
-    this.setData({
-      taglList,
-    })
-  },
-  
-  //多选
-  checkPicker(e){
-    this.setData({
-      ['taglList['+e.currentTarget.dataset.i+'].list['+e.currentTarget.dataset.j+'].checked']:!this.data.taglList[e.currentTarget.dataset.i].list[e.currentTarget.dataset.j].checked,
-    })
-  },
-
-  //获取城市
-  getAppCityArea_city(){
-    let params = {};
-    params['type'] = 'city';
-    _.apiQuery.getAppCityArea(params).then(res => {
-      let cityArr = []
-      let cityIndex = -1
-      res.data.list.forEach((item,index) => {
-        cityArr.push(item.name)
-        if(this.data.city_id == item.id){
-          cityIndex = index
-        }
-      })
-      this.setData({
-        cityIndex,
-        cityArr,
-        city:res.data.list
-      })
-    });
-  },
-
-  //获取行政区
-  getAppCityArea_county(){
-    let params = {};
-    params['pid'] = this.data.city_id;
-    params['type'] = 'county';
-    _.apiQuery.getAppCityArea(params).then(res => {
-      let countyArr = []
-      let countyIndex = -1
-      res.data.list.forEach((item,index) => {
-        countyArr.push(item.name)
-        if(this.data.county_id == item.id){
-          countyIndex = index
-        }
-      })
-      this.setData({
-        countyIndex,
-        countyArr,
-        county:res.data.list
-      })
-    });
-  },
-
-  //选择城市
-  changeCity(e) {
-    if(this.data.cityIndex!=e.detail.value){
-      this.setData({
-        cityIndex:e.detail.value,
-        city_id:this.data.city[e.detail.value].id,
-      })
-      this.getAppCityArea_county()
-    }
-  },
-
-  //选择地区
-  changeCounty(e) {
-    if(this.data.countyIndex!=e.detail.value){
-      this.setData({
-        countyIndex:e.detail.value,
-        county_id:this.data.county[e.detail.value].id,
-      })
-    }
-  },
-
-  //是否添加个微
-  switchWxgr:function(e){
-    this.setData({
-      wxgr:e.detail.value ? 1 :0
-    })
-  },
-
-  //选择图片
-  chooseImg(e) {
-    let that = this
-
-    //上传个微截图
-    if(e.currentTarget.dataset.type=='gw_img'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              if (resp.data.code == 200) {
-                wx.hideLoading();
-                that.setData({
-                  wxgrimg:resp.data.data.url,
-                  wxgrimg_url:resp.data.data.full_url,
-                })
-              }else{
-                wx.hideLoading();
-                wx.showToast({
-                  title: '上传失败',
-                  icon: 'none',
-                  duration: 2000
-                })
-              }
-            },
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-  },
-
-  //查看图片
-  previewImage(e){
-    if(e.currentTarget.dataset.type=='gw_img'){
-      wx.previewImage({
-        current:this.data.wxgrimg_url,
-        urls:[this.data.wxgrimg_url],
-      })
-    }
-  },
-
 })
@@ -14,16 +14,6 @@
        </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">
-          <picker bindchange="changeCbrand" value="{{c_brandIndex}}" range="{{c_brands}}">
-            <text class="color-ccc" wx:if="{{c_brandIndex == -1}}">请选择</text>
-            <text wx:else>{{c_brands[c_brandIndex]}}</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">
          <picker bindchange="changeBrand" value="{{brandIndex}}" range="{{brandArray}}">
@@ -34,8 +24,8 @@
        </view>
      </view>
      <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{brandIndex != -1}}">
-        <view class="absolute left-0 box-middle font-28 color-333">车系车型</view>
-        <view class="pt30 pb30 text-right font-28 color-666 text-nowrap">
+        <view class="absolute left-0 box-middle font-28 color-333">车型车系</view>
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker bindchange="changeModel" value="{{modelIndex}}" range="{{modelArray}}">
            <text class="color-ccc" wx:if="{{modelIndex == -1}}">请选择</text>
            <text wx:else>{{modelArray[modelIndex]}}</text>
@@ -44,8 +34,8 @@
        </view>
      </view>
      <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{modelIndex != -1}}">
-        <view class="absolute left-0 box-middle font-28 color-333">车辆版本</view>
-        <view class="pt30 pb30 text-right font-28 color-666 text-nowrap">
+        <view class="absolute left-0 box-middle font-28 color-333">车型级别</view>
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker bindchange="changeLevel" value="{{levelIndex}}" range="{{levelArray}}">
            <text class="color-ccc" wx:if="{{levelIndex == -1}}">请选择</text>
            <text wx:else>{{levelArray[levelIndex]}}</text>
@@ -54,112 +44,44 @@
        </view>
      </view>
      <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{modelIndex != -1}}">
-        <view class="absolute left-0 box-middle font-28 color-333">车身颜色</view>
-        <view class="pt30 pb30 text-right font-28 color-666 text-nowrap">
+        <view class="absolute left-0 box-middle font-28 color-333">车型颜色</view>
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker bindchange="changeColor" value="{{colorIndex}}" range="{{colorArray}}">
            <text class="color-ccc" wx:if="{{colorIndex == -1}}">请选择</text>
            <text wx:else>{{colorArray[colorIndex]}}</text>
            <i class="iconfont ml5 icon-gengduo"></i>
          </picker>
        </view>
-      </view> -->
-      <block wx:if="{{sources.length>0}}">
-        <view class="relative bbs-1-eb last-b-none pl140 font-28">
-          <view class="absolute left-0 box-middle">客户来源</view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <picker bindchange="changeOf1" value="{{of1Index}}" range="{{of1Arr}}">
-              <text class="color-ccc" wx:if="{{of1Index == -1}}">请选择</text>
-              <text wx:else>{{of1Arr[of1Index]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{of2Arr.length>0}}">
-          <view class="absolute left-0 box-middle">{{sources[of1Index].name}}</view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <picker bindchange="changeOf2" value="{{of2Index}}" range="{{of2Arr}}">
-              <text class="color-ccc" wx:if="{{of2Index == -1}}">请选择</text>
-              <text wx:else>{{of2Arr[of2Index]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
-          </view>
-        </view>
-      </block>
+      </view>
      <view class="relative bbs-1-eb last-b-none pl140 font-28">
-        <view class="absolute left-0 box-middle">所在城市</view>
+        <view class="absolute left-0 box-middle">线索来源</view>
+        <!-- <view>
+          <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入线索来源" bindinput='inputTx' data-key="cf_clues" name='cf_clues' value='{{cf_clues}}' />
+        </view> -->
        <view class="pt30 pb30 text-right font-28 color-666">
-          <picker bindchange="changeCity" value="{{cityIndex}}" range="{{cityArr}}">
-            <text class="color-ccc" wx:if="{{cityIndex == -1}}">请选择</text>
-            <text wx:else>{{cityArr[cityIndex]}}</text>
+          <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 last-b-none pl140 font-28" wx:if="{{city_id}}">
-        <view class="absolute left-0 box-middle">所在地区</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">
-          <picker bindchange="changeCounty" value="{{countyIndex}}" range="{{countyArr}}">
-            <text class="color-ccc" wx:if="{{countyIndex == -1}}">请选择</text>
-            <text wx:else>{{countyArr[countyIndex]}}</text>
+          <picker bindchange="changeTime" value="{{timeIndex}}" range="{{timeArray}}">
+            <text class="color-ccc" wx:if="{{timeIndex == -1}}">请选择</text>
+            <text wx:else>{{timeArray[timeIndex]}}</text>
            <i class="iconfont ml5 icon-gengduo"></i>
          </picker>
        </view>
      </view>
-      <view class="relative bbs-1-eb last-b-none pl180 font-28">
-        <view class="absolute left-0 box-middle">是否添加个微</view>
-        <view class="relative pt30 pb30 text-right">
-          <switch class="{{baseinfo.wxgr==1?'opacity-50':''}}" checked="{{wxgr==1}}" bindchange="switchWxgr" type="switch" color='#36afa2' disabled='{{baseinfo.wxgr==1}}' style="zoom:0.8" />
-        </view>
-      </view>
-
-      <view class="mt30 text-center" wx:if="{{wxgr==1}}">
-        <view class="inline-block img-250x150 relative ulib-r10 overflowhidden">
-          <block wx:if="{{wxgrimg_url}}">
-            <view class="inline-block bg-f8 img-250x150 relative ulib-r10 overflowhidden">
-              <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="chooseImg" data-type="gw_img"></i>
-              <image class='block wp100 img-250x150 ulib-r10' src='{{wxgrimg_url}}' mode='aspectFit' bindtap="previewImage" data-type="gw_img"></image>
-            </view>
-          </block>
-          <block wx:else>
-            <view class="inline-block bg-f8 img-250x150 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="gw_img">
-              <view class="absolute left-0 right-0 box-middle color-ccc">
-                <i class="iconfont icon-paizhao font-42"></i>
-                <view class="mt10 font-22">上传个微截图</view>
-              </view>
-            </view>
-          </block>
-        </view>
-      </view>
-
-      <block wx:for='{{taglList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
-        <view class="relative mt30">
-          <view class="font-28">
-            <text class="text-middle">{{list.name}}</text>
-            <text class="text-middle font-24" wx:if="{{list.type=='radio'}}">（单选）</text>
-            <text class="text-middle font-24" wx:if="{{list.type=='checkbox'}}">（多选）</text>
-          </view>
-          <view class="fn-clear" wx:if="{{list.type=='radio'}}">
-            <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-              <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-36afa2 color-fff':'bg-f6 color-666'}}" bindtap="radioPicker" data-i="{{i}}" data-j="{{j}}">
-                {{option.name}}
-              </view>
-            </block>
-          </view>
-          <view class="fn-clear" wx:if="{{list.type=='checkbox'}}">
-            <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-              <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-36afa2 color-fff':'bg-f6 color-666'}}" bindtap="checkPicker" data-i="{{i}}" data-j="{{j}}">
-                {{option.name}}
-              </view>
-            </block>
-          </view>
-        </view>
-      </block>
    </view>
+
    <view class="mt60 pl60 pr60">
-      <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCustomerData">
-        确认
-      </button>
+      <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCustomerData">确认编辑</button>
    </view>
+
  </view>
 </view>
 <lcb-footer></lcb-footer>
@@ -23,31 +23,6 @@ Page({
    o_type:'',//排序类型
    visit:'',//只显示待回访客户(1是)
    a_id:'',//活动ID
-    level:'',//客户级别
-    status:'',//客户状态
-    status_tp:'',
-    tab:[],//回访待跟进tab
-    visit_tab_id:'',//回访待跟进tabid
-
-    isShowTimePicker:false,
-    weekList:['日','一','二','三','四','五','六'],
-    dateList:[],
-    nextIndex:-1,//计划回访时间
-
-    distTabId:1,
-    distBizIndex:-1,
-    distBiz_id:'',
-    bizArray: [],
-    bizobj: [],
-    isShowfilter:false,//是否显示筛查
-    levelIndex:-1,//意向等级索引
-    staffArray: [],
-    staffobj: [],
-    staffIndex:-1,
-    userInfo:'',
-
-    isShowCall:false,//是否显示拨打电话确认弹框
-    phoneNumber:'',//拨打的电话号码
  },
  onLoad(options) {
    for (let key in options) {
@@ -55,20 +30,7 @@ Page({
        [key]: options[key]
      })
    }
-
-    this.setData({
-      userInfo:app.getStorageByKey("userInfo"),
-    })
-
-    //顶部tab
-    this.getAppCustomersVisit_tabs()
-
-    //销售顾问
-    this.getAppUserAdmins()
-
-    this.getTimePicker()
-
-    this.getAppCustomersFilter()
+    this.getAppCustomersList()

    wx.setNavigationBarTitle({
      title: this.data.title||'客户'
@@ -79,42 +41,6 @@ Page({
    
  },

-  //回访待跟进tab
-  getAppCustomersVisit_tabs() {
-    let params = {};
-    if(this.data.status != ''){
-      params['status'] = this.data.status;
-    }
-    _.apiQuery.getAppCustomersVisit_tabs(params).then(res => {
-      if(res.data.list.length>0){
-        this.setData({
-          tab:res.data.list,
-          visit_tab_id:res.data.list[0].id,
-        })
-      }
-
-      this.getAppCustomersList()
-
-      wx.stopPullDownRefresh()
-    });
-  },
-
-  //获取列表筛选条件
-  getAppCustomersFilter(){
-    _.apiQuery.getAppCustomersFilter().then(res => {
-      this.setData({
-        filter:res.data,
-      })
-    });
-  },
-
-  //选择人员
-  changeStaff(e) {
-    this.setData({
-      staffIndex: e.detail.value
-    })
-  },
-
  //获取客户列表
  getAppCustomersList() {
    this.setData({
@@ -163,23 +89,6 @@ Page({
    if(this.data.a_id != ''){
      params['a_id'] = this.data.a_id;
    }
-    if(this.data.level != ''){
-      params['level'] = this.data.level;
-    }
-    if(this.data.status != ''){
-      params['status'] = this.data.status;
-    }
-    if(this.data.status_tp != ''){
-      params['status_tp'] = this.data.status_tp;
-    }
-    if(this.data.visit_tab_id != ''){
-      params['visit_tab_id'] = this.data.visit_tab_id;
-    }
-
-    if(this.data.staffIndex>-1){
-      params['admin_id'] = this.data.staffobj[this.data.staffIndex].id;
-    }
-
    _.apiQuery.getAppCustomersList(params).then(res => {
      this.setData({
        total: res.data.total,
@@ -219,79 +128,12 @@ Page({
    params['id'] = e.currentTarget.dataset.id;
    params['type'] = 0;
    _.apiQuery.getAppXz(params).then(res=>{
-      this.setData({
-        isShowCall:true,
-        phoneNumber:res.data.mobile,
+      wx.makePhoneCall({
+        phoneNumber: res.data.mobile,
      })
    })
  },

-  //提交搜索
-  searchSubmit(){
-    this.setData({
-      list: [],
-      pageNo: 1,
-      noData: false,
-      end: false,
-      load: true,
-      loading: false,
-      flag: this.data.flag + 1
-    })
-    this.getAppCustomersList()
-  },
-
-  //客户等级
-  changeLevel(e){
-
-    let level = ''
-    if(e.detail.value >= 0){
-      level = this.data.filter.level[e.detail.value]
-    }
-
-    this.setData({
-      level:level,
-      levelIndex: e.detail.value,
-    })
-  },
-
-  //显示隐藏高级搜索
-  optfilter(){
-    this.setData({
-      isShowfilter: !this.data.isShowfilter
-    })
-    this.resetFilter()
-  },
-
-  //显示高级搜索
-  showfilter(){
-    this.setData({
-      isShowfilter:true,
-    })
-  },
-
-  //确定高级搜索
-  submitFilter() {
-    this.setData({
-      isShowfilter:false,
-    })
-    this.searchSubmit()
-  },
-
-  //重置高级搜索
-  resetFilter() {
-    let staffobj = this.data.staffobj
-    staffobj.forEach(item => {
-      item.checked = false
-    })
-
-    this.setData({
-      staffobj,
-      level:'',
-      levelIndex:-1,
-      staffIndex:-1,
-    })
-  },
-
  //显示短信弹框
  showMessage(e){
    this.setData({
@@ -352,296 +194,6 @@ Page({
    }
  },

-  //获取销售顾问
-  getAppUserAdmins(){
-    let params = {};
-    params['page'] = 1;
-    params['size'] = 1000;
-    _.apiQuery.getAppUserAdmins(params).then(res => {
-      let staffArray = []
-      res.data.list.forEach(item => {
-        staffArray.push(item.uname)
-      })
-      let bizArray = []
-      res.data.bizs.forEach(item => {
-        bizArray.push(item.name)
-      })
-      this.setData({
-        staffArray:staffArray,
-        staffobj: res.data.list,
-        distributetabs:res.data.tabs,
-        bizArray:bizArray,
-        bizobj: res.data.bizs,
-      })
-    });
-  },
-
-  //销售弹窗显示隐藏
-  optEmployees(e){
-    if(e.currentTarget.dataset.cid){
-      this.setData({
-        isShowEmployees:true,
-        employeeIndex:-1,
-        employee_id:'',
-        cid:[e.currentTarget.dataset.cid],
-        optLevel:e.currentTarget.dataset.level,
-      })
-    }else{
-      this.setData({
-        isShowEmployees:!this.data.isShowEmployees,
-        employeeIndex:-1,
-        employee_id:'',
-        cid:[],
-        optLevel:'',
-        nextIndex:-1,
-        distTabId:1,
-        distBiz_id:'',
-        distBizIndex:-1,
-      })
-    }
-  },
-
-  //选择店员
-  changeEmployee(e) {
-    let employee_id = ''
-    if(e.detail.value >= 0){
-      employee_id = this.data.staffobj[e.detail.value].id
-    }
-    this.setData({
-      employee_id,
-      employeeIndex:e.detail.value,
-    })
-  },
-
-  //分配客户
-  putAppCustomersAdmins(){
-    let that = this
-    if (that.data.distTabId==1&&that.data.employeeIndex == -1 ) {
-      wx.showToast({
-        title: '请选择店员',
-        icon: 'none'
-      })
-    }
-    else if (that.data.distTabId==1&&that.data.nextIndex == -1 ) {
-      wx.showToast({
-        title: '请选择计划回访时间',
-        icon: 'none'
-      })
-    }
-    else if (that.data.distTabId==2&&that.data.distBizIndex == -1 ) {
-      wx.showToast({
-        title: '请选择门店',
-        icon: 'none'
-      })
-    }
-    else{
-      that.setData({
-        submitFlag: true,
-      })
-      let params = {};
-      params['ids'] = that.data.cid;
-      if(that.data.distTabId==1){
-        params['admin_id'] = that.data.employee_id;
-        params['visit_time'] = that.data.dateList[that.data.nextIndex].year +'-'+ that.data.dateList[that.data.nextIndex].month +'-'+ that.data.dateList[that.data.nextIndex].day;
-      }
-      if(that.data.distTabId==2){
-        params['biz_id'] = that.data.distBiz_id;
-      }
-      _.apiQuery.putAppCustomersAdmins(params).then(res => {
-
-        wx.showToast({
-          title: '分配成功',
-          icon: 'success',
-          duration: 2000
-        })
-        that.setData({
-          isShowEmployees:false,
-          submitFlag:false,
-          nextIndex:-1,
-        })
-        that.onPullDownRefresh()
-
-      }).catch(res=>{
-        that.setData({
-          submitFlag: false,
-        })
-      });
-    }
-  },
-
-  //候取当前月日历
-  getTimePicker(){
-    let date = new Date();
-    let cYear = date.getFullYear(); //年份
-    let cMonth = date.getMonth()+1; //当前月份
-    let cDay = date.getDate();//当前日期
-    let fweek = new Date(cYear,cMonth-1,1).getDay();//本月第一天星期几
-    let days = new Date(cYear,cMonth,-1)
-    let cn = days.getDate()+1 //当月天数
-    let rn = ''//上个月天数
-    if (cMonth === 1) {
-      rn = 31
-    } else {
-      rn = new Date(cYear,cMonth-1,-1).getDate()+1
-    }
-
-    let dateList = []
-    for(let i=0;i<fweek;i++){
-      dateList.push({
-        isopt:false,
-        checked:false,
-        year:cMonth == 1?cYear-1:cYear,
-        month:cMonth == 1?12:cMonth-1,
-        day:rn-i,
-      })
-    }
-    for(let i=1;i<=cn;i++){
-      dateList.push({
-        isopt:false,
-        checked:false,
-        year:cYear,
-        month:cMonth,
-        day:i
-      })
-    }
-
-    if((cn-cDay)>29){//相差15天以上不用特意补下个月
-      let lweek = new Date(cYear,cMonth-1,cn).getDay();//本月最后天星期几
-      let sbu = 6 - lweek //最后一周补齐
-      for(let i=1;i<=sbu;i++){
-        dateList.push({
-          isopt:false,
-          checked:false,
-          year:cMonth == 12?cYear+1:cYear,
-          month:cMonth == 12?1:cMonth+1,
-          day:i
-        })
-      }
-    }else{
-      let zbu = 30 - (cn-cDay)  //至少要补多少天
-      let bweek = ''//至少要补的最后一天星期几
-      if(cMonth==12){
-        bweek = new Date(cYear+1,1,zbu).getDay()
-      }else{
-        bweek = new Date(cYear,cMonth,zbu).getDay()
-      }
-      let sbu = zbu + 6 - bweek //最后一周补齐
-      for(let i=1;i<=sbu;i++){
-        dateList.push({
-          isopt:false,
-          checked:false,
-          year:cMonth == 12?cYear+1:cYear,
-          month:cMonth == 12?1:cMonth+1,
-          day:i
-        })
-      }
-    }
-
-    this.setData({
-      cYear,
-      cMonth,
-      cDay,
-      dateList,
-    })
-
-  },
-
-  //显示隐藏时间选择器
-  optShowTimePicker(){
-    this.setData({
-      isShowTimePicker:!this.data.isShowTimePicker,
-    })
-
-    let kd = 15 //可操作天数
-    if(this.data.optLevel=='H'){
-      kd = 3
-    }else if(this.data.optLevel=='A'){
-      kd = 7
-    }else if(this.data.optLevel=='B'){
-      kd = 15
-    }else if(this.data.optLevel=='C'){
-      kd = 30
-    }
-    let cindex = ''
-    let dateList = this.data.dateList
-    dateList.forEach((item,index) => {
-      if(item.year == this.data.cYear&&item.month == this.data.cMonth&&item.day == this.data.cDay){
-        cindex = index
-      }
-    })
-    dateList.forEach((item,index) => {
-      item.isopt = false
-      if(cindex<=index&&index<cindex+kd+1){
-        item.isopt = true
-      }
-    })
-    this.setData({
-      dateList,
-    })
-
-  },
-
-  //选择计划回访时间
-  optday(e){
-    if(this.data.nextIndex != e.currentTarget.dataset.index){
-      this.setData({
-        nextIndex:e.currentTarget.dataset.index,
-      })
-    }
-  },
-
-  //切换tab
-  changeTab(e){
-    this.setData({
-      list: [],
-      pageNo: 1,
-      noData: false,
-      end: false,
-      load: true,
-      loading: false,
-      visit_tab_id: e.currentTarget.dataset.id,
-    })
-    this.getAppCustomersList()
-  },
-
-  //切换分配本地，其他门店
-  changeDistTab(e){
-    this.setData({
-      distTabId:e.currentTarget.dataset.id,
-      employeeIndex:-1,
-      employee_id:'',
-      nextIndex:-1,
-      distBiz_id:'',
-      distBizIndex:-1,
-    })
-  },
-
-  //分配选择门店
-  changeDistBiz(e) {
-    let distBiz_id = ''
-    if(e.detail.value >= 0){
-      distBiz_id = this.data.bizobj[e.detail.value].id
-    }
-    this.setData({
-      distBiz_id,
-      distBizIndex:e.detail.value,
-    })
-  },
-
-  //隐藏电话弹框
-  hideCall(){
-    this.setData({
-      isShowCall:false,
-    })
-  },
-
-  //拨打电话
-  makePhoneCall(){
-    wx.makePhoneCall({
-      phoneNumber: this.data.phoneNumber,
-    })
-  },
-
  //页面相关事件处理函数--监听用户下拉动作
  onPullDownRefresh(){
    this.setData({
@@ -1,52 +1,18 @@
 <view class="container">

-  <view wx:if="{{tab.length>0}}">
-    <view style="padding-top:110rpx"></view>
-    <view class="fixed top-0 left-0 right-0 bg-fff pl30 pr30 z-index-1">
-      <view class="fn-flex mt5 pl20 pr20 font-32 color-666 text-center" wx:if="{{tab.length<5}}">
-        <block wx:for='{{tab}}' wx:key='list'>
-          <view class="fn-flex-item pl20 pr20 tabmenu2 {{visit_tab_id == item.id?'active color-36afa2':''}}" data-id="{{item.id}}" bindtap="changeTab">
-            <view class="relative">{{item.name}}</view>
-          </view>
-        </block>
-      </view>
-      <scroll-view class="mt5 font-32 color-666 text-center space-nowrap" scroll-x="true" wx:else>
-        <block wx:for='{{tab}}' wx:key='list'>
-          <view class="pl20 pr20 tabmenu2 {{visit_tab_id == item.id?'active color-36afa2':''}}" data-id="{{item.id}}" bindtap="changeTab" >
-            <view class="relative">{{item.name}}</view>
-          </view>
-        </block>
-      </scroll-view>
-    </view>
-  </view>
-  
-  <view class="pl40 pb15 fn-clear">
-    <view class="fn-fl">
-      <text class="text-middle">共<text class="color-f9394d"> {{total}} </text>位客户</text>
-    </view>
-    <view class="fn-fr pr40 relative">
-    <text bindtap="showfilter" class="inner5 iconfont icon-gaojisousuo ml10"></text>
-    </view>
-  </view>
-
  <view class="mt10 pl30 pr30">

    <block wx:for='{{list}}' wx:key='index'>
-      <view wx:if="{{item.complete_mobile}}" 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 font-22 color-fff">
-          <text class="pl10 pr10" wx:if="{{item.tip}}">{{item.tip}}</text>
-          <text class="pl10 pr10 {{item.defeat?'bls-1-eb':''}}" wx:if="{{item.defeat}}">{{item.defeat}}</text>
-          <text class="pl10 pr10 {{item.orders_pay?'bls-1-eb':''}}" wx:if="{{item.orders_pay}}">{{item.orders_pay}}</text>
-        </view>
+      <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" wx:if="{{item.defeat}}">{{item.defeat}}</view>
        <view class="relative pr180">
          <view class="font-32">
-            <text class="text-middle">{{item.name}}</text>
-            <text class="text-middle font-26 color-666">({{item.mobile}})</text>
-            <text class="text-middle iconfont icon-weixin1 ml10 color-00c800" wx:if="{{item.is_weChat}}"></text>
-            <text class="text-middle iconfont icon-xingxing ml10 {{item.is_top==1?'color-f9394d':'color-ccc'}}" catchtap="optTop" data-index="{{index}}"></text>
+            <text>{{item.name}}</text>
+            <text class="font-26 color-666">({{item.mobile}})</text>
+            <text class="iconfont icon-xingxing ml10 {{item.is_top==1?'color-f9394d':'color-ccc'}}" catchtap="optTop" data-index="{{index}}"></text>
          </view>
          <view class="text-nowrap">
-            <text class="mr15 font-22 color-666">编号 {{item.id}}</text>
+            <text class="mr15 font-22 color-666">编号：{{item.id}}</text>
            <block wx:for="{{item.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
              <text class="inline-block mr10 pl10 pr10 bg-666 font-18 color-fff ulib-r750" wx:if="{{i<4}}">{{tag}}</text>
            </block>
@@ -55,9 +21,9 @@
            </block>
          </view>
          <view class="absolute right-0 box-middle">
-            <!--view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{item.id}}">
+            <view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{item.id}}">
              <i class="absolute box-center-middle iconfont icon-duanxinguanli"></i>
-            </view-->
+            </view>
            <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{item.id}}">
              <i class="absolute box-center-middle iconfont icon-dianhua"></i>
            </view>
@@ -67,40 +33,10 @@
        <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
          <view class="mt25 fn-clear font-28">
            <view class="fn-fl color-333">{{key}}</view>
-            <block wx:if="{{key=='销售顾问'}}">
-              <view class="fn-fr wp60 text-nowrap text-right">
-                <text class="text-middle color-666" wx:if="{{value}}">{{value}}</text>
-                <text class="text-middle color-f9394d" wx:else>待分配</text>
-                <text class="inline-block ml10 bg-36afa2 pt5 pb5 pl15 pr15 text-middle font-22 color-fff ulib-r10" catchtap="optEmployees" data-cid="{{item.id}}" data-level="{{item.level}}" wx:if="{{item.allot == 1}}">{{value?'重新分配':'分配'}}</text>
-              </view>
-            </block>
-            <view wx:else class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
-          </view>
-        </block>
-      </view>
-      <view wx:elif="{{item.nickname}}" class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden">
-        <view class="absolute top-0 left-0 ml40 bg-36afa2 font-22 color-fff">
-          <text class="pl10 pr10" wx:if="{{item.tip}}">{{item.tip}}</text>
-          <text class="pl10 pr10 {{item.defeat?'bls-1-eb':''}}" wx:if="{{item.defeat}}">{{item.defeat}}</text>
-          <text class="pl10 pr10 {{item.orders_pay?'bls-1-eb':''}}" wx:if="{{item.orders_pay}}">{{item.orders_pay}}</text>
-        </view>
-        <view class="text-nowrap">
-          <image class='img-50x50 bds-1-eb ulib-r750 text-middle' lazy-load="{{true}}" mode="scaleToFill" src="{{item.avatar}}"></image>
-          <text class="pl10 text-middle font-26">{{item.nickname}}</text>
-        </view>
-        <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
-          <view class="mt25 fn-clear font-28">
-            <view class="fn-fl color-333">{{key}}</view>
-            <block wx:if="{{key=='销售顾问'}}">
-              <view class="fn-fr wp60 text-nowrap text-right">
-                <text class="text-middle color-666" wx:if="{{value}}">{{value}}</text>
-                <text class="text-middle color-f9394d" wx:else>待分配</text>
-                <text class="inline-block ml10 bg-36afa2 pt5 pb5 pl15 pr15 text-middle font-22 color-fff ulib-r10" catchtap="optEmployees" data-cid="{{item.id}}" data-level="{{item.level}}" wx:if="{{item.allot == 1}}">{{value?'重新分配':'分配'}}</text>
-              </view>
-            </block>
-            <view wx:else class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
+            <view class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
          </view>
        </block>
+
      </view>
    </block>
    <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>
@@ -110,40 +46,6 @@
 <lcb-footer></lcb-footer>
 <lcb-backChannel></lcb-backChannel>

-<view class="search-sort {{!isShowfilter?'fn-hide':''}} {{!isShowfilter?'sortout':'sortin'}} bg-fff fixed top-0 bottom-0 z-index-2 ulib-rl20 overflowhidden">
-  <scroll-view class="wp100" scroll-y="true" style="height:90%">
-    <view class="pt10 pb10 pl30 pr30">
-      <view class="relative bbs-1-eb pl190 last-b-none">
-        <view class="absolute left-0 box-middle font-28 color-333">意向等级</view>
-        <view class="pt25 pb25 text-right font-28 color-666">
-          <picker bindchange="changeLevel" value="{{levelIndex}}" range="{{filter.level}}">
-            <text class="color-ccc" wx:if="{{levelIndex == -1}}">请选择</text>
-            <text wx:else>{{filter.level[levelIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </picker>
-        </view>
-      </view>
-      <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{staffArray.length>0&&userInfo.group_id>1}}">
-        <view class="absolute left-0 box-middle">销售顾问</view>
-        <view class="pt25 pb25 text-right font-28 color-666">
-          <picker bindchange="changeStaff" value="{{staffIndex}}" range="{{staffArray}}">
-            <text class="color-ccc" wx:if="{{staffIndex == -1}}">请选择</text>
-            <text wx:else>{{staffArray[staffIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </picker>
-        </view>
-      </view>
-    </view>
-    <view class="pt50 pb100"></view>
-  </scroll-view>
-  <view class="absolute left-0 bottom-0 right-0 fn-flex pt20 pb200 pl60 pr60 bg-fff-op90 text-center">
-    <view class="fn-flex-item mr20 pt15 pb15 bds-2-36afa2 font-32 color-36afa2 ulib-r750" bindtap="resetFilter">重置</view>
-    <view class="fn-flex-item ml20 pt15 pb15 bg-36afa2 font-32 color-fff ulib-r750" bindtap="submitFilter">确定</view>
-  </view>
-</view>
-
-<view class="search-bg fixed left-0 right-0 top-0 bottom-0" bindtap="optfilter" hidden="{{!isShowfilter}}" style="background-color:rgba(0,0,0,.5);"></view>
-
 <lcb-msg isShow="{{isShowMessage}}">
 	<view slot="content">
 		<view class="inner40">
@@ -154,99 +56,4 @@
      <button disabled="{{submitFlag}}" bindtap="postAppSmsCustomer" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
    </view>
 	</view>
-</lcb-msg>
-
-<lcb-msg isShow="{{isShowEmployees}}">
-	<view slot="content">
-		<view class="inner30">
-      <view class="mt10 font-28 text-center fn-flex" wx:if="{{distributetabs.length > 0}}">
-        <block wx:for="{{distributetabs}}" wx:key="index">
-          <view class="fn-flex-item relative ml10 mr10 pt20 pb20 ulib-r10 {{distTabId == item.id?'bg-36afa2 color-fff':'bg-f6'}}" bindtap="changeDistTab" data-id="{{item.id}}">{{item.name}}</view>
-        </block>
-      </view>
-      <block wx:if="{{distTabId == 1}}">
-        <view class="mt20 ml10 mr10 bds-2-eb inner20 font-28 color-666 fn-clear ulib-r10">
-          <view class="fn-fl">销售顾问</view>
-          <picker class="fn-fr wp60 text-right" bindchange="changeEmployee" value="{{employeeIndex}}" range="{{staffArray}}">
-            <text class="color-ccc" wx:if="{{employeeIndex == -1}}">请选择</text>
-            <text wx:else>{{staffArray[employeeIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </picker>
-        </view>
-        <view class="mt20 ml10 mr10 bds-2-eb inner20 font-28 color-666 fn-clear ulib-r10">
-          <view class="fn-fl">计划回访时间</view>
-          <view bindtap="optShowTimePicker" class="fn-fr wp60 text-right">
-            <text class="color-ccc" wx:if="{{nextIndex == -1}}">请选择</text>
-            <text wx:else>{{dateList[nextIndex].year}}-{{dateList[nextIndex].month}}-{{dateList[nextIndex].day}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </view>
-        </view>
-      </block>
-      <view class="mt20 ml10 mr10 bds-2-eb inner20 font-28 color-666 fn-clear ulib-r10" wx:else>
-        <view class="fn-fl">门店名称</view>
-        <picker class="fn-fr wp70 text-right" bindchange="changeDistBiz" value="{{distBizIndex}}" range="{{bizArray}}">
-          <view class="text-nowrap">
-            <text class="color-ccc" wx:if="{{distBizIndex == -1}}">请选择</text>
-            <text wx:else>{{bizArray[distBizIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </view>
-        </picker>
-      </view>
-    </view>
-    <view class="fn-flex ml10 mr10 pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="optEmployees" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
-      <button disabled="{{submitFlag}}" bindtap="putAppCustomersAdmins" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
-    </view>
-	</view>
-</lcb-msg>
-
-<page-container 
-  show="{{isShowTimePicker}}"
-  round="{{true}}"
-  overlay="true"
-  duration="300"
-  z-index="10000"
-  position="bottom"
-  close-on-slide-down="{{false}}"
-  bindenter="onEnter"
-  custom-style="false"
-  overlay-style="false"
->
-  <view class="">
-    <view class="relative pt30 pb30 text-center font-30">
-      <view class="color-666">计划回访时间</view>
-      <i bindtap="optShowTimePicker" class="absolute right-0 box-middle mr30 iconfont icon-guanbi1"></i>
-    </view>
-    <view class="fn-flex pt30 pb30 bbs-1-eb text-center font-24">
-      <block wx:for="{{weekList}}" wx:key="index">
-        <view class="fn-flex-item">{{item}}</view>
-      </block>
-    </view>
-    <view class="pb40 relative">
-      <view class="absolute top-0 box-center mt130 font-180 color-f8">{{cMonth}}</view>
-      <view class="relative fn-flex fn-flex-wrap pt30 pb30 text-center font-24 z-index-2">
-        <block wx:for="{{dateList}}" wx:key="index">
-          <view bindtap="{{item.isopt?'optday':''}}" data-index="{{index}}" class="datecell ulib-r10 {{nextIndex == index?'active':''}} {{item.isopt?'color-1a':'color-ccc'}}">{{item.day}}</view>
-        </block>
-      </view>
-    </view>
-  </view>
-</page-container>
-
-<!-- 拨打电话 -->
-<lcb-msg isShow="{{isShowCall}}">
-  <view slot="content">
-    <view class="pt50 pb40">
-      <view class="font-36 text-center">号码绑定成功</view>
-      <view class="mt10 font-28 text-center color-666">现在呼叫 {{phoneNumber}} ？</view>
-    </view>
-    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="hideCall" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
-        取消
-      </button>
-      <button bindtap="makePhoneCall" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">
-        确定
-      </button>
-    </view>
-  </view>
 </lcb-msg>
@@ -18,27 +18,25 @@ Page({
    e_time:'',//结束时间
    if_driver:'',//是否试驾
    level:'',//客户顶级
-    // brand_id:'',//品牌
-    // s_id:'',//车型id
-    // v_id:'',//车辆版本id
+    brand_id:'',//品牌
+    s_id:'',//车型id
+    v_id:'',//车型级别id
    cfrom:'',//客户来源
    o_type:'',//排序类型
    isShowfilter:false,//是否显示筛查
    timeSlotIndex:-1,//常用时间索引
-    s_visit_time:'',//跟进时间段开始
-    e_visit_time:'',//跟进时间段结束
    timeSlot:[//常用时间数组
      {
        title:'今天',
      },
      {
-        title:'明天',
+        title:'昨天',
      },
      {
-        title:'未来三天',
+        title:'近七天',
      },
      {
-        title:'未来七天',
+        title:'近三十天',
      },
    ],
    testDriveIndex:-1,//是否试驾索引
@@ -57,45 +55,25 @@ Page({
    sortListIndex:0,//排序索引
    levelIndex:-1,//意向等级索引
    brandIndex:-1,//车辆品牌索引
-    modelIndex:-1,//车系车型索引
+    modelIndex:-1,//车型车系索引
    cfromIndex:-1,//客户来源索引
    isShowMessage:false,//是否显示短信弹窗
    content:'',//短信内容
    isRefresh:false,//判断返回是否需要刷新
    isShowMobile: false,
+    cf_clues:'',//线索来源
+    cluesArray:[
+      '自然进店',
+      '外展外拓',
+      '转介绍',
+      '垂直媒体',
+      '自媒体',
+    ],//线索来源
+    cluesIndex:-1,//索来源索引
    staffArray: [],
    staffobj: [],
    staffIndex:-1,
-    userInfo:'',
-
-    of_id:'',
-    of2_id:'',
-    of1Index:-1,
-    of2Index:-1,
-
-    cid:[],//分配客户ID
-    employee_id:'',//分配销售ID
-    employeeIndex:-1,//分配销售索引
-
-    isShowTimePicker:false,
-    weekList:['日','一','二','三','四','五','六'],
-    dateList:[],
-    nextIndex:-1,//计划回访时间
-
-    distTabId:1,
-    distBizIndex:-1,
-    distBiz_id:'',
-    bizArray: [],
-    bizobj: [],
-    tag_ids:'',
-
-    cityIndex:-1,
-    city_id:'',
-    countyIndex:-1,
-    county_id:'',
-
-    isShowCall:false,//是否显示拨打电话确认弹框
-    phoneNumber:'',//拨打的电话号码
+    userInfo:app.getStorageByKey("userInfo")
  },
  onLoad(options) {
    for (let key in options) {
@@ -103,33 +81,13 @@ Page({
        [key]: options[key]
      })
    }
-
-    this.setData({
-      userInfo:app.getStorageByKey("userInfo"),
-    })
-
-    //客户-tab
    this.getAppCustomersTabs()
-    //获取列表筛选条件
    this.getAppCustomersFilter()
-    //获取车型品牌
-    //this.getAppSeriesBrands()
-    //销售顾问
+    this.getAppSeriesBrands()
    this.getAppUserAdmins()
-    //客户来源
-    this.getAppCustomersOffline_sources()
-
-    this.getTimePicker()
-
-    this.getAppCustomersTag()
-
-    //获取城市列表
-    this.getAppCityArea_city()
-
  },

  onShow(){
-    //获取常用时间段
    this.getDateLater()
  },

@@ -157,16 +115,9 @@ Page({
      res.data.list.forEach(item => {
        staffArray.push(item.uname)
      })
-      let bizArray = []
-      res.data.bizs.forEach(item => {
-        bizArray.push(item.name)
-      })
      this.setData({
        staffArray:staffArray,
        staffobj: res.data.list,
-        distributetabs:res.data.tabs,
-        bizArray:bizArray,
-        bizobj: res.data.bizs,
      })
    });
  },
@@ -211,7 +162,7 @@ Page({
    });
  },

-  //获取车系车型
+  //获取车型车系
  getAppSeries(){
    let params = {};
    params['brand_id'] = this.data.brand_id;
@@ -242,21 +193,9 @@ Page({
      load: false,
      loading: true,
    })
-
-    let admin_ids = ''
-    this.data.staffobj.forEach(item => {
-      if(item.checked){
-        if(admin_ids==''){
-          admin_ids=item.id
-        }else{
-          admin_ids=admin_ids+','+item.id
-        }
-      }
-    })
-    
    let params = {};
    params['page'] = this.data.pageNo;
-    params['size'] = 3;
+    params['size'] = 10;
    params['status'] = this.data.key;
    if(this.data.cus_id != ''){
      params['cus_id'] = this.data.cus_id;
@@ -267,8 +206,10 @@ Page({
    if(this.data.mobile != ''){
      params['mobile'] = this.data.mobile;
    }
-    if(this.data.s_time != ''&&this.data.e_time != ''){
+    if(this.data.s_time != ''){
      params['s_time'] = this.data.s_time;
+    }
+    if(this.data.e_time != ''){
      params['e_time'] = this.data.e_time;
    }
    if(this.data.if_driver != ''){
@@ -277,45 +218,26 @@ Page({
    if(this.data.level != ''){
      params['level'] = this.data.level;
    }
-    // if(this.data.brand_id != ''){
-    //   params['brand_id'] = this.data.brand_id;
-    // }
-    // if(this.data.s_id != ''){
-    //   params['s_id'] = this.data.s_id;
-    // }
-    // if(this.data.v_id != ''){
-    //   params['v_id'] = this.data.v_id;
-    // }
+    if(this.data.brand_id != ''){
+      params['brand_id'] = this.data.brand_id;
+    }
+    if(this.data.s_id != ''){
+      params['s_id'] = this.data.s_id;
+    }
+    if(this.data.v_id != ''){
+      params['v_id'] = this.data.v_id;
+    }
    if(this.data.cfrom != ''){
      params['cfrom'] = this.data.cfrom;
    }
    if(this.data.o_type != ''){
      params['o_type'] = this.data.o_type;
    }
-    if(this.data.of_id != ''){
-      params['of_id'] = this.data.of_id;
+    if(this.data.cf_clues != ''){
+      params['cf_clues'] = this.data.cf_clues;
    }
-    if(this.data.of2_id != ''){
-      params['of2_id'] = this.data.of2_id;
-    }
-    if(admin_ids!=''){
-      params['admin_ids'] = admin_ids;
-    }
-    if(this.data.tag_ids!=''){
-      params['tag_ids'] = this.data.tag_ids;
-    }
-    // if(this.data.staffIndex>-1){
-    //   params['admin_id'] = this.data.staffobj[this.data.staffIndex].id;
-    // }
-    if(this.data.city_id!=''){
-      params['city_id'] = this.data.city_id;
-    }
-    if(this.data.county_id!=''){
-      params['county_id'] = this.data.county_id;
-    }
-    if(this.data.s_visit_time != ''&&this.data.e_visit_time != ''){
-      params['s_visit_time'] = this.data.s_visit_time;
-      params['e_visit_time'] = this.data.e_visit_time;
+    if(this.data.staffIndex>-1){
+      params['admin_id'] = this.data.staffobj[this.data.staffIndex].id;
    }
    _.apiQuery.getAppCustomersList(params).then(res => {
      this.setData({
@@ -355,38 +277,28 @@ Page({
    })
  },

-  //获取常用时间段
+  //候取常用时间段
  getDateLater(){
    popularData.getDateLater(0,0).then(res => {
      this.setData({
        today:res,
      })
    })
-    popularData.getDateLater(-1,0).then(res => {
+    popularData.getDateLater(1,0).then(res => {
      this.setData({
        tomorrow:res,
      })
    })
-    popularData.getDateLater(-3,2).then(res => {
+    popularData.getDateLater(0,6).then(res => {
      this.setData({
-        next3:res,
+        last7:res,
      })
    })
-    popularData.getDateLater(-7,6).then(res => {
+    popularData.getDateLater(0,29).then(res => {
      this.setData({
-        next7:res,
+        last30:res,
      })
    })
-    // popularData.getDateLater(0,6).then(res => {
-    //   this.setData({
-    //     last7:res,
-    //   })
-    // })
-    // popularData.getDateLater(0,29).then(res => {
-    //   this.setData({
-    //     last30:res,
-    //   })
-    // })
  },

  //拨打客户电话xz
@@ -395,9 +307,8 @@ Page({
    params['id'] = e.currentTarget.dataset.id;
    params['type'] = 0;
    _.apiQuery.getAppXz(params).then(res=>{
-      this.setData({
-        isShowCall:true,
-        phoneNumber:res.data.mobile,
+      wx.makePhoneCall({
+        phoneNumber: res.data.mobile,
      })
    })
  },
@@ -438,6 +349,7 @@ Page({
    this.setData({
      s_time: e.detail.value,
    })
+    this.matchDate()
  },

  //建卡时间
@@ -445,6 +357,34 @@ Page({
    this.setData({
      e_time: e.detail.value,
    })
+    this.matchDate()
+  },
+
+  //匹配选择时间是否等于常用时间
+  matchDate(){
+    this.setData({
+      timeSlotIndex:-1,
+    })
+    if(this.data.s_time == this.data.today[0] && this.data.e_time == this.data.today[1] ){
+      this.setData({
+        timeSlotIndex:0,
+      })
+    }
+    if(this.data.s_time == this.data.tomorrow[0] && this.data.e_time == this.data.tomorrow[1] ){
+      this.setData({
+        timeSlotIndex:1,
+      })
+    }
+    if(this.data.s_time == this.data.last7[0] && this.data.e_time == this.data.last7[1] ){
+      this.setData({
+        timeSlotIndex:2,
+      })
+    }
+    if(this.data.s_time == this.data.last30[0] && this.data.e_time == this.data.last30[1] ){
+      this.setData({
+        timeSlotIndex:3,
+      })
+    }
  },

  //单选
@@ -456,26 +396,26 @@ Page({
      switch (e.currentTarget.dataset.index) {
        case 0:
          this.setData({
-            s_visit_time:this.data.today[0],
-            e_visit_time:this.data.today[1],
+            s_time:this.data.today[0],
+            e_time:this.data.today[1],
          })
          break;
        case 1:
          this.setData({
-            s_visit_time:this.data.tomorrow[0],
-            e_visit_time:this.data.tomorrow[1],
+            s_time:this.data.tomorrow[0],
+            e_time:this.data.tomorrow[1],
          })
          break;
        case 2:
          this.setData({
-            s_visit_time:this.data.next3[0],
-            e_visit_time:this.data.next3[1],
+            s_time:this.data.last7[0],
+            e_time:this.data.last7[1],
          })
          break;
        case 3:
          this.setData({
-            s_visit_time:this.data.next7[0],
-            e_visit_time:this.data.next7[1],
+            s_time:this.data.last30[0],
+            e_time:this.data.last30[1],
          })
          break;
      }
@@ -514,7 +454,7 @@ Page({
        brand_id:this.data.brandList[e.detail.value].id,
        brandIndex:e.detail.value,
        s_id:'',//车系id
-        modelIndex:-1,//车系车型索引
+        modelIndex:-1,//车型车系索引
      })
      this.getAppSeries()
    }
@@ -544,7 +484,15 @@ Page({
    })
  },

-  //显示隐藏高级搜索
+  //线索来源
+  changeClues(e) {
+    this.setData({
+      cf_clues:this.data.cluesArray[e.detail.value],
+      cluesIndex:e.detail.value,
+    })
+  },
+
+  //显示高级搜索
  optfilter(){
    this.setData({
      isShowfilter: !this.data.isShowfilter
@@ -552,13 +500,6 @@ Page({
    this.resetFilter()
  },

-  //显示高级搜索
-  showfilter(){
-    this.setData({
-      isShowfilter:true,
-    })
-  },
-
  //确定高级搜索
  submitFilter() {
    this.setData({
@@ -569,13 +510,7 @@ Page({

  //重置高级搜索
  resetFilter() {
-    let staffobj = this.data.staffobj
-    staffobj.forEach(item => {
-      item.checked = false
-    })
-
    this.setData({
-      staffobj,
      cus_id:'',//编号
      name:'',//名字
      mobile:'',//手机号
@@ -583,29 +518,19 @@ Page({
      e_time:'',
      if_driver:'',
      level:'',
-      // brand_id:'',
-      // s_id:'',
+      brand_id:'',
+      s_id:'',
      cfrom:'',
-      of_id:'',
-      of2_id:'',
-      of1Index:-1,
-      of2Index:-1,
+      cf_clues:'',//线索来源
      timeSlotIndex:-1,
-      s_visit_time:'',//跟进时间段开始
-      e_visit_time:'',//跟进时间段结束
      testDriveIndex:-1,
      levelIndex:-1,
      brandIndex:-1,
      modelIndex:-1,
      cfromIndex:-1,
+      cluesIndex:-1,//索来源索引
      staffIndex:-1,
-      tag_ids:'',
-      cityIndex:-1,
-      city_id:'',
-      countyIndex:-1,
-      county_id:'',
    })
-    this.getAppCustomersTag()
  },

  //显示短信弹框
@@ -668,420 +593,6 @@ Page({
    }
  },

-  //客户来源
-  getAppCustomersOffline_sources(){
-    _.apiQuery.getAppCustomersOffline_sources().then(res => {
-      let of1Arr = []
-      res.data.sources.forEach(item => {
-        of1Arr.push(item.name)
-      })
-      this.setData({
-        of1Arr,
-        sources:res.data.sources
-      })
-    });
-  },
-
-  //客户来源
-  changeOf1(e) {
-    if(this.data.of1Index!=e.detail.value){
-      let of2Arr = []
-      this.data.sources[e.detail.value].list.forEach(item => {
-        of2Arr.push(item.name)
-      })
-      this.setData({
-        of2Arr,
-        of2Index:-1,
-        of_id:this.data.sources[e.detail.value].id,
-        of1Index:e.detail.value,
-      })
-    }
-  },
-
-  changeOf2(e) {
-    if(this.data.of2Index!=e.detail.value){
-      this.setData({
-        of2_id:this.data.sources[this.data.of1Index].list[e.detail.value].id,
-        of2Index:e.detail.value,
-      })
-    }
-  },
-
-  //销售弹窗显示隐藏
-  optEmployees(e){
-    if(e.currentTarget.dataset.cid){
-      this.setData({
-        isShowEmployees:true,
-        employeeIndex:-1,
-        employee_id:'',
-        cid:[e.currentTarget.dataset.cid],
-        optLevel:e.currentTarget.dataset.level,
-      })
-    }else{
-      this.setData({
-        isShowEmployees:!this.data.isShowEmployees,
-        employeeIndex:-1,
-        employee_id:'',
-        cid:[],
-        optLevel:'',
-        nextIndex:-1,
-        distTabId:1,
-        distBiz_id:'',
-        distBizIndex:-1,
-      })
-    }
-  },
-
-  //选择店员
-  changeEmployee(e) {
-    let employee_id = ''
-    if(e.detail.value >= 0){
-      employee_id = this.data.staffobj[e.detail.value].id
-    }
-    this.setData({
-      employee_id,
-      employeeIndex:e.detail.value,
-    })
-  },
-
-  //分配客户
-  putAppCustomersAdmins(){
-    let that = this
-    if (that.data.distTabId==1&&that.data.employeeIndex == -1 ) {
-      wx.showToast({
-        title: '请选择店员',
-        icon: 'none'
-      })
-    }
-    else if (that.data.distTabId==1&&that.data.nextIndex == -1 ) {
-      wx.showToast({
-        title: '请选择计划回访时间',
-        icon: 'none'
-      })
-    }
-    else if (that.data.distTabId==2&&that.data.distBizIndex == -1 ) {
-      wx.showToast({
-        title: '请选择门店',
-        icon: 'none'
-      })
-    }
-    else{
-      that.setData({
-        submitFlag: true,
-      })
-      let params = {};
-      params['ids'] = that.data.cid;
-      if(that.data.distTabId==1){
-        params['admin_id'] = that.data.employee_id;
-        params['visit_time'] = that.data.dateList[that.data.nextIndex].year +'-'+ that.data.dateList[that.data.nextIndex].month +'-'+ that.data.dateList[that.data.nextIndex].day;
-      }
-      if(that.data.distTabId==2){
-        params['biz_id'] = that.data.distBiz_id;
-      }
-      _.apiQuery.putAppCustomersAdmins(params).then(res => {
-
-        wx.showToast({
-          title: '分配成功',
-          icon: 'success',
-          duration: 2000
-        })
-        that.setData({
-          isShowEmployees:false,
-          submitFlag:false,
-          nextIndex:-1,
-        })
-        that.onPullDownRefresh()
-
-      }).catch(res=>{
-        that.setData({
-          submitFlag: false,
-        })
-      });
-    }
-  },
-
-  //候取当前月日历
-  getTimePicker(){
-    let date = new Date();
-    let cYear = date.getFullYear(); //年份
-    let cMonth = date.getMonth()+1; //当前月份
-    let cDay = date.getDate();//当前日期
-    let fweek = new Date(cYear,cMonth-1,1).getDay();//本月第一天星期几
-    let days = new Date(cYear,cMonth,-1)
-    let cn = days.getDate()+1 //当月天数
-    let rn = ''//上个月天数
-    if (cMonth === 1) {
-      rn = 31
-    } else {
-      rn = new Date(cYear,cMonth-1,-1).getDate()+1
-    }
-
-    let dateList = []
-    for(let i=0;i<fweek;i++){
-      dateList.push({
-        isopt:false,
-        checked:false,
-        year:cMonth == 1?cYear-1:cYear,
-        month:cMonth == 1?12:cMonth-1,
-        day:rn-i,
-      })
-    }
-    for(let i=1;i<=cn;i++){
-      dateList.push({
-        isopt:false,
-        checked:false,
-        year:cYear,
-        month:cMonth,
-        day:i
-      })
-    }
-
-    if((cn-cDay)>29){//相差15天以上不用特意补下个月
-      let lweek = new Date(cYear,cMonth-1,cn).getDay();//本月最后天星期几
-      let sbu = 6 - lweek //最后一周补齐
-      for(let i=1;i<=sbu;i++){
-        dateList.push({
-          isopt:false,
-          checked:false,
-          year:cMonth == 12?cYear+1:cYear,
-          month:cMonth == 12?1:cMonth+1,
-          day:i
-        })
-      }
-    }else{
-      let zbu = 30 - (cn-cDay)  //至少要补多少天
-      let bweek = ''//至少要补的最后一天星期几
-      if(cMonth==12){
-        bweek = new Date(cYear+1,1,zbu).getDay()
-      }else{
-        bweek = new Date(cYear,cMonth,zbu).getDay()
-      }
-      let sbu = zbu + 6 - bweek //最后一周补齐
-      for(let i=1;i<=sbu;i++){
-        dateList.push({
-          isopt:false,
-          checked:false,
-          year:cMonth == 12?cYear+1:cYear,
-          month:cMonth == 12?1:cMonth+1,
-          day:i
-        })
-      }
-    }
-
-    this.setData({
-      cYear,
-      cMonth,
-      cDay,
-      dateList,
-    })
-
-  },
-
-  //显示隐藏时间选择器
-  optShowTimePicker(){
-    this.setData({
-      isShowTimePicker:!this.data.isShowTimePicker,
-    })
-
-    let kd = 15 //可操作天数
-    if(this.data.optLevel=='H'){
-      kd = 3
-    }else if(this.data.optLevel=='A'){
-      kd = 7
-    }else if(this.data.optLevel=='B'){
-      kd = 15
-    }else if(this.data.optLevel=='C'){
-      kd = 30
-    }
-    let cindex = ''
-    let dateList = this.data.dateList
-    dateList.forEach((item,index) => {
-      if(item.year == this.data.cYear&&item.month == this.data.cMonth&&item.day == this.data.cDay){
-        cindex = index
-      }
-    })
-    dateList.forEach((item,index) => {
-      item.isopt = false
-      if(cindex<=index&&index<cindex+kd+1){
-        item.isopt = true
-      }
-    })
-    this.setData({
-      dateList,
-    })
-
-  },
-
-  //选择计划回访时间
-  optday(e){
-    if(this.data.nextIndex != e.currentTarget.dataset.index){
-      this.setData({
-        nextIndex:e.currentTarget.dataset.index,
-      })
-    }
-  },
-
-  //切换分配本地，其他门店
-  changeDistTab(e){
-    this.setData({
-      distTabId:e.currentTarget.dataset.id,
-      employeeIndex:-1,
-      employee_id:'',
-      nextIndex:-1,
-      distBiz_id:'',
-      distBizIndex:-1,
-    })
-  },
-
-  //分配选择门店
-  changeDistBiz(e) {
-    let distBiz_id = ''
-    if(e.detail.value >= 0){
-      distBiz_id = this.data.bizobj[e.detail.value].id
-    }
-    this.setData({
-      distBiz_id,
-      distBizIndex:e.detail.value,
-    })
-  },
-
-  //多选
-  checkPicker(e){
-    this.setData({
-      ['staffobj['+e.currentTarget.dataset.index+'].checked']:!this.data.staffobj[e.currentTarget.dataset.index].checked,
-    })
-  },
-
-  //客户标签
-  getAppCustomersTag(){
-    _.apiQuery.getAppCustomersTag().then(res => {
-      this.setData({
-        taglList:res.data.tags&&res.data.tags.length>0?res.data.tags:[],
-      })
-    });
-  },
-
-  //单选
-  tagRadioPicker(e){
-    let taglList = this.data.taglList
-    taglList[e.currentTarget.dataset.i].list.forEach(item => {
-      item.checked=false
-    })
-    taglList[e.currentTarget.dataset.i].list[e.currentTarget.dataset.j].checked=true
-    this.setData({
-      taglList,
-    })
-    this.tagforEach()
-  },
-  
-  //多选
-  tagCheckPicker(e){
-    this.setData({
-      ['taglList['+e.currentTarget.dataset.i+'].list['+e.currentTarget.dataset.j+'].checked']:!this.data.taglList[e.currentTarget.dataset.i].list[e.currentTarget.dataset.j].checked,
-    })
-    this.tagforEach()
-  },
-
-  //tag遍历
-  tagforEach(){
-    let taglList = this.data.taglList
-    let tag_ids = ''
-    taglList.forEach(itemA => {
-      itemA.list.forEach(itemB => {
-        if(itemB.checked){
-          itemA.have=true
-          if(tag_ids==''){
-            tag_ids=itemB.id
-          }else{
-            tag_ids=tag_ids+','+itemB.id
-          }
-        }
-      })
-    })
-    this.setData({
-      tag_ids,
-      taglList,
-    })
-  },
-
-  //获取城市
-  getAppCityArea_city(){
-    let params = {};
-    params['type'] = 'city';
-    _.apiQuery.getAppCityArea(params).then(res => {
-      let cityArr = []
-      let cityIndex = -1
-      res.data.list.forEach((item,index) => {
-        cityArr.push(item.name)
-        // if(this.data.city_id == item.id){
-        //   cityIndex = index
-        // }
-      })
-      this.setData({
-        cityIndex,
-        cityArr,
-        city:res.data.list
-      })
-    });
-  },
-
-  //获取行政区
-  getAppCityArea_county(){
-    let params = {};
-    params['pid'] = this.data.city_id;
-    params['type'] = 'county';
-    _.apiQuery.getAppCityArea(params).then(res => {
-      let countyArr = []
-      let countyIndex = -1
-      res.data.list.forEach((item,index) => {
-        countyArr.push(item.name)
-        if(this.data.county_id == item.id){
-          countyIndex = index
-        }
-      })
-      this.setData({
-        countyIndex,
-        countyArr,
-        county:res.data.list
-      })
-    });
-  },
-
-  //选择城市
-  changeCity(e) {
-    if(this.data.cityIndex!=e.detail.value){
-      this.setData({
-        cityIndex:e.detail.value,
-        city_id:this.data.city[e.detail.value].id,
-      })
-      this.getAppCityArea_county()
-    }
-  },
-
-  //选择地区
-  changeCounty(e) {
-    if(this.data.countyIndex!=e.detail.value){
-      this.setData({
-        countyIndex:e.detail.value,
-        county_id:this.data.county[e.detail.value].id,
-      })
-    }
-  },
-
-  //隐藏电话弹框
-  hideCall(){
-    this.setData({
-      isShowCall:false,
-    })
-  },
-
-  //拨打电话
-  makePhoneCall(){
-    wx.makePhoneCall({
-      phoneNumber: this.data.phoneNumber,
-    })
-  },
-
  //页面相关事件处理函数--监听用户下拉动作
  onPullDownRefresh(){
    this.setData({
@@ -29,57 +29,25 @@
        <i class="iconfont ml5 icon-gengduo"></i>
      </picker>
    </view>
-    <view class="fn-fr {{key<2?'pr180':'pr40'}} relative">
-      <text bindtap="showfilter" class="inner5 iconfont icon-gaojisousuo ml10"></text>
-      <view bindtap="pushLink" data-url="/pages/customer/addCard/index?status={{key}}" class="absolute right-0 box-middle pt10 pb10 pl10 pr30 space-nowrap bg-333 font-22 color-fff ulib-rl750" wx:if="{{key<2}}"><i class="iconfont mr5 icon-jia"></i>客户建卡</view>
+    <view class="fn-fr pr180 relative">
+      <text bindtap="optfilter" class="inner5 iconfont icon-gaojisousuo ml10"></text>
+      <view bindtap="pushLink" data-url="/pages/customer/addCard/index" class="absolute right-0 box-middle pt10 pb10 pl10 pr30 space-nowrap bg-333 font-22 color-fff ulib-rl750"><i class="iconfont mr5 icon-jia"></i>客户建卡</view>
    </view>
  </view>

-  <view class="pl20 pr20 fn-flex fn-flex-wrap">
-    <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{cus_id}}">{{cus_id}}</view>
-    <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{name}}">{{name}}</view>
-    <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{mobile}}">{{mobile}}</view>
-    <block wx:for="{{city}}" wx:key='index'>
-      <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{item.id==city_id}}">{{item.name}}</view>
-    </block>
-    <block wx:for="{{county}}" wx:key='index'>
-      <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{item.id==county_id}}">{{item.name}}</view>
-    </block>
-    <block wx:if="{{s_time&&e_time}}">
-      <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22">{{s_time}}</view>
-      <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22">{{e_time}}</view>
-    </block>
-    <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{timeSlotIndex>-1}}">{{timeSlot[timeSlotIndex].title}}</view>
-    <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{levelIndex>-1}}">{{filter.level[levelIndex]}}</view>
-    <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{of1Index>-1}}">{{of1Arr[of1Index]}}</view>
-    <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{of2Index>-1}}">{{of2Arr[of2Index]}}</view>
-    <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{staffIndex>-1}}">{{staffArray[staffIndex]}}</view>
-    <block wx:for="{{staffobj}}" wx:key='index'>
-      <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{item.checked}}">{{item.uname}}</view>
-    </block>
-    <block wx:for='{{taglList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
-      <block wx:if="{{list.have}}" wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-        <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{option.checked}}">{{option.name}}</view>
-      </block>
-    </block>
-  </view>
-
  <view class="mt10 pl30 pr30">
+
    <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 font-22 color-fff" wx:if="{{item.defeat||item.orders_pay}}">
-          <text class="pl10 pr10" wx:if="{{item.defeat}}">{{item.defeat}}</text>
-          <text class="pl10 pr10 {{item.defeat&&item.orders_pay?'bls-1-eb':''}}" wx:if="{{item.orders_pay}}">{{item.orders_pay}}</text>
-        </view>
+        <view class="absolute top-0 left-0 ml40 bg-36afa2 pl10 pr10 font-22 color-fff" wx:if="{{item.defeat}}">{{item.defeat}}</view>
        <view class="relative pr180">
          <view class="font-32">
-            <text class="text-middle">{{item.name}}</text>
-            <text class="text-middle font-26 color-666">({{item.mobile}})</text>
-            <text class="text-middle iconfont icon-weixin1 ml10 color-00c800" wx:if="{{item.is_weChat}}"></text>
-            <text class="text-middle iconfont icon-xingxing ml10 {{item.is_top==1?'color-f9394d':'color-ccc'}}" catchtap="optTop" data-index="{{index}}"></text>
+            <text>{{item.name}}</text>
+            <text class="font-26 color-666">({{item.mobile}})</text>
+            <text class="iconfont icon-xingxing ml10 {{item.is_top==1?'color-f9394d':'color-ccc'}}" catchtap="optTop" data-index="{{index}}"></text>
          </view>
          <view class="text-nowrap">
-            <text class="mr15 font-22 color-666">编号 {{item.id}}</text>
+            <text class="mr15 font-22 color-666">编号：{{item.id}}</text>
            <block wx:for="{{item.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
              <text class="inline-block mr10 pl10 pr10 bg-666 font-18 color-fff ulib-r750" wx:if="{{i<4}}">{{tag}}</text>
            </block>
@@ -88,9 +56,9 @@
            </block>
          </view>
          <view class="absolute right-0 box-middle">
-            <!--view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{item.id}}">
+            <view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{item.id}}">
              <i class="absolute box-center-middle iconfont icon-duanxinguanli"></i>
-            </view-->
+            </view>
            <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{item.id}}">
              <i class="absolute box-center-middle iconfont icon-dianhua"></i>
            </view>
@@ -100,14 +68,7 @@
        <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
          <view class="mt25 fn-clear font-28">
            <view class="fn-fl color-333">{{key}}</view>
-            <block wx:if="{{key=='销售顾问'}}">
-              <view class="fn-fr wp60 text-nowrap text-right">
-                <text class="text-middle color-666" wx:if="{{value}}">{{value}}</text>
-                <text class="text-middle color-f9394d" wx:else>待分配</text>
-                <text class="inline-block ml10 bg-36afa2 pt5 pb5 pl15 pr15 text-middle font-22 color-fff ulib-r10" catchtap="optEmployees" data-cid="{{item.id}}" data-level="{{item.level}}" wx:if="{{item.allot == 1}}">{{value?'重新分配':'分配'}}</text>
-              </view>
-            </block>
-            <view wx:else class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
+            <view class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
          </view>
        </block>

@@ -134,49 +95,29 @@
 </lcb-msg>

 <view class="search-sort {{!isShowfilter?'fn-hide':''}} {{!isShowfilter?'sortout':'sortin'}} bg-fff fixed top-0 bottom-0 z-index-2 ulib-rl20 overflowhidden">
-  <scroll-view class="wp100" scroll-y="true" style="height:90%">
-    <view class="pt10 pb10 pl30 pr30">
+  <scroll-view class="wp100" scroll-y="true" style="height:100%">
+    <view class="inner30">
      <view class="relative bbs-1-eb last-b-none pl140 font-28">
        <view class="absolute left-0 box-middle">客户编号</view>
        <view>
-          <input class="wp100 height-90 text-right font-28" placeholder-class="color-ccc" type="number" placeholder="请输入客户编号" model:value="{{cus_id}}" />
+          <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="number" placeholder="请输入客户编号" model:value="{{cus_id}}" />
        </view>
      </view>
      <view class="relative bbs-1-eb last-b-none pl140 font-28">
        <view class="absolute left-0 box-middle">客户姓名</view>
        <view>
-          <input class="wp100 height-90 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入客户姓名" bindinput='inputTx' data-key="name" name='name' value='{{name}}' />
+          <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入客户姓名" bindinput='inputTx' data-key="name" name='name' value='{{name}}' />
        </view>
      </view>
      <view class="relative bbs-1-eb last-b-none pl140 font-28">
        <view class="absolute left-0 box-middle">手机号码</view>
        <view>
-          <input class="wp100 height-90 text-right font-28" placeholder-class="color-ccc" type="number" placeholder="请输入客户手机号" bindinput='inputTx' data-key="mobile" name='mobile' value='{{mobile}}' />
-        </view>
-      </view>
-      <view class="relative bbs-1-eb last-b-none pl140 font-28">
-        <view class="absolute left-0 box-middle">所在城市</view>
-        <view class="pt30 pb30 text-right font-28 color-666">
-          <picker bindchange="changeCity" value="{{cityIndex}}" range="{{cityArr}}">
-            <text class="color-ccc" wx:if="{{cityIndex == -1}}">请选择</text>
-            <text wx:else>{{cityArr[cityIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </picker>
-        </view>
-      </view>
-      <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{city_id}}">
-        <view class="absolute left-0 box-middle">所在地区</view>
-        <view class="pt30 pb30 text-right font-28 color-666">
-          <picker bindchange="changeCounty" value="{{countyIndex}}" range="{{countyArr}}">
-            <text class="color-ccc" wx:if="{{countyIndex == -1}}">请选择</text>
-            <text wx:else>{{countyArr[countyIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </picker>
+          <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="number" placeholder="请输入客户手机号" bindinput='inputTx' data-key="mobile" name='mobile' value='{{mobile}}' />
        </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="pt25 pb25 text-right font-28 color-666">
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker mode="date" value="{{s_time}}" bindchange="startDate">
            <text class="color-ccc" wx:if="{{s_time == ''}}">请选择</text>
            <text wx:else>{{s_time}}</text>
@@ -186,7 +127,7 @@
      </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="pt25 pb25 text-right font-28 color-666">
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker mode="date" value="{{e_time}}" bindchange="endDate">
            <text class="color-ccc" wx:if="{{e_time == ''}}">请选择</text>
            <text wx:else>{{e_time}}</text>
@@ -194,17 +135,17 @@
          </picker>
        </view>
      </view>
-      <view class="relative bbs-1-eb pt25 pb25 last-b-none">
-        <view class="font-22">跟进时间</view>
+      <view class="relative bbs-1-eb pt30 pb30 last-b-none">
+        <view class="font-22">常用时间段</view>
        <view class="fn-clear">
          <block wx:for="{{timeSlot}}" wx:key='index'>
-            <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{timeSlotIndex == index?'bg-333 color-fff':'bg-f8'}}" bindtap="radioPicker" data-type="timeSlot" data-index="{{index}}">
+            <view class="inline-block radio-btn mt20 mr20 pt15 pb15 pl25 pr25 ulib-r10 font-28 {{timeSlotIndex == index?'bg-333 color-fff':'bg-f8'}}" bindtap="radioPicker" data-type="timeSlot" data-index="{{index}}">
              {{item.title}}
            </view>
          </block>
        </view>
      </view>
-      <!-- <view class="relative bbs-1-eb pt25 pb25 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'>
@@ -216,7 +157,7 @@
      </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="pt25 pb25 text-right font-28 color-666">
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker bindchange="changeLevel" value="{{levelIndex}}" range="{{filter.level}}">
            <text class="color-ccc" wx:if="{{levelIndex == -1}}">请选择</text>
            <text wx:else>{{filter.level[levelIndex]}}</text>
@@ -224,9 +165,9 @@
          </picker>
        </view>
      </view>
-      <!-- <view class="relative bbs-1-eb pl190 last-b-none">
+      <view class="relative bbs-1-eb pl190 last-b-none">
        <view class="absolute left-0 box-middle font-28 color-333">车辆品牌</view>
-        <view class="pt25 pb25 text-right font-28 color-666">
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker bindchange="changeBrand" value="{{brandIndex}}" range="{{brandArray}}">
            <text class="color-ccc" wx:if="{{brandIndex == -1}}">请选择</text>
            <text wx:else>{{brandArray[brandIndex]}}</text>
@@ -235,40 +176,38 @@
        </view>
      </view>
      <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{brandIndex != -1}}">
-        <view class="absolute left-0 box-middle font-28 color-333">车系车型</view>
-        <view class="pt25 pb25 text-right font-28 color-666">
+        <view class="absolute left-0 box-middle font-28 color-333">车型车系</view>
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker bindchange="changeModel" value="{{modelIndex}}" range="{{modelArray}}">
            <text class="color-ccc" wx:if="{{modelIndex == -1}}">请选择</text>
            <text wx:else>  {{modelArray[modelIndex]}}</text>
            <i class="iconfont ml5 icon-gengduo"></i>
          </picker>
        </view>
-      </view> -->
-      <block wx:if="{{sources.length>0}}">
-        <view class="relative bbs-1-eb last-b-none pl140 font-28">
-          <view class="absolute left-0 box-middle">客户来源</view>
-          <view class="pt25 pb25 text-right font-28 color-666">
-            <picker bindchange="changeOf1" value="{{of1Index}}" range="{{of1Arr}}">
-              <text class="color-ccc" wx:if="{{of1Index == -1}}">请选择</text>
-              <text wx:else>{{of1Arr[of1Index]}}</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">
+          <picker bindchange="changeCfrom" value="{{cfromIndex}}" range="{{filter.cfrom}}">
+            <text class="color-ccc" wx:if="{{cfromIndex == -1}}">请选择</text>
+            <text wx:else>{{filter.cfrom[cfromIndex]}}</text>
+            <i class="iconfont ml5 icon-gengduo"></i>
+          </picker>
        </view>
-        <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{of2Arr.length>0}}">
-          <view class="absolute left-0 box-middle">{{sources[of1Index].name}}</view>
-          <view class="pt25 pb25 text-right font-28 color-666">
-            <picker bindchange="changeOf2" value="{{of2Index}}" range="{{of2Arr}}">
-              <text class="color-ccc" wx:if="{{of2Index == -1}}">请选择</text>
-              <text wx:else>{{of2Arr[of2Index]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </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>
-      </block>
+      </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="pt25 pb25 text-right font-28 color-666">
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker mode="date" value="{{c_time}}" bindchange="bindStartDateChange">
            <text class="color-ccc" wx:if="{{c_time == ''}}">请选择</text>
            <text wx:else>{{c_time}}</text>
@@ -276,51 +215,20 @@
          </picker>
        </view>
      </view> -->
-      <!-- <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{staffArray.length>0&&userInfo.group_id>1}}">
+      <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{staffArray.length>0&&userInfo.group_id>1}}">
        <view class="absolute left-0 box-middle">销售顾问</view>
-        <view class="pt25 pb25 text-right font-28 color-666">
+        <view class="pt30 pb30 text-right font-28 color-666">
          <picker bindchange="changeStaff" value="{{staffIndex}}" range="{{staffArray}}">
            <text class="color-ccc" wx:if="{{staffIndex == -1}}">请选择</text>
            <text wx:else>{{staffArray[staffIndex]}}</text>
            <i class="iconfont ml5 icon-gengduo"></i>
          </picker>
        </view>
-      </view> -->
-      <view class="relative bbs-1-eb pt25 pb25 last-b-none">
-        <view class="font-22">销售顾问</view>
-        <view class="fn-clear">
-          <block wx:for="{{staffobj}}" wx:key='index'>
-            <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{item.checked?'bg-333 color-fff':'bg-f8'}}" bindtap="checkPicker" data-index="{{index}}">
-              {{item.uname}}
-            </view>
-          </block>
-        </view>
      </view>
-
-      <block wx:for='{{taglList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
-        <view class="relative mt40">
-          <view class="font-28">
-            <text class="text-middle">{{list.name}}</text>
-            <text class="text-middle font-24" wx:if="{{list.type=='radio'}}">（单选）</text>
-            <text class="text-middle font-24" wx:if="{{list.type=='checkbox'}}">（多选）</text>
-          </view>
-          <view class="fn-clear" wx:if="{{list.type=='radio'}}">
-            <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-              <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-333 color-fff':'bg-f8 color-666'}}" bindtap="tagRadioPicker" data-i="{{i}}" data-j="{{j}}">{{option.name}}</view>
-            </block>
-          </view>
-          <view class="fn-clear" wx:if="{{list.type=='checkbox'}}">
-            <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-              <view class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 {{option.checked?'bg-333 color-fff':'bg-f8 color-666'}}" bindtap="tagCheckPicker" data-i="{{i}}" data-j="{{j}}">{{option.name}}</view>
-            </block>
-          </view>
-        </view>
-      </block>
-
    </view>
    <view class="pt50 pb100"></view>
  </scroll-view>
-  <view class="absolute left-0 bottom-0 right-0 fn-flex pt20 pb200 pl60 pr60 bg-fff-op90 text-center">
+  <view class="absolute left-0 bottom-0 right-0 fn-flex mb180 pt20 pb20 pl60 pr60 bg-fff-op90 text-center">
    <view class="fn-flex-item mr20 pt15 pb15 bds-2-36afa2 font-32 color-36afa2 ulib-r750" bindtap="resetFilter">重置</view>
    <view class="fn-flex-item ml20 pt15 pb15 bg-36afa2 font-32 color-fff ulib-r750" bindtap="submitFilter">确定</view>
  </view>
@@ -336,99 +244,4 @@
  </view>
 </view>

-<lcb-changeMobile isShow="{{isShowMobile}}"></lcb-changeMobile>
-
-<lcb-msg isShow="{{isShowEmployees}}" isCustomTabBar="{{true}}">
-	<view slot="content">
-		<view class="inner30">
-      <view class="mt10 font-28 text-center fn-flex" wx:if="{{distributetabs.length > 0}}">
-        <block wx:for="{{distributetabs}}" wx:key="index">
-          <view class="fn-flex-item relative ml10 mr10 pt20 pb20 ulib-r10 {{distTabId == item.id?'bg-36afa2 color-fff':'bg-f6'}}" bindtap="changeDistTab" data-id="{{item.id}}">{{item.name}}</view>
-        </block>
-      </view>
-      <block wx:if="{{distTabId == 1}}">
-        <view class="mt20 ml10 mr10 bds-2-eb inner20 font-28 color-666 fn-clear ulib-r10">
-          <view class="fn-fl">销售顾问</view>
-          <picker class="fn-fr wp60 text-right" bindchange="changeEmployee" value="{{employeeIndex}}" range="{{staffArray}}">
-            <text class="color-ccc" wx:if="{{employeeIndex == -1}}">请选择</text>
-            <text wx:else>{{staffArray[employeeIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </picker>
-        </view>
-        <view class="mt20 ml10 mr10 bds-2-eb inner20 font-28 color-666 fn-clear ulib-r10">
-          <view class="fn-fl">计划回访时间</view>
-          <view bindtap="optShowTimePicker" class="fn-fr wp60 text-right">
-            <text class="color-ccc" wx:if="{{nextIndex == -1}}">请选择</text>
-            <text wx:else>{{dateList[nextIndex].year}}-{{dateList[nextIndex].month}}-{{dateList[nextIndex].day}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </view>
-        </view>
-      </block>
-      <view class="mt20 ml10 mr10 bds-2-eb inner20 font-28 color-666 fn-clear ulib-r10" wx:else>
-        <view class="fn-fl">门店名称</view>
-        <picker class="fn-fr wp70 text-right" bindchange="changeDistBiz" value="{{distBizIndex}}" range="{{bizArray}}">
-          <view class="text-nowrap">
-            <text class="color-ccc" wx:if="{{distBizIndex == -1}}">请选择</text>
-            <text wx:else>{{bizArray[distBizIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </view>
-        </picker>
-      </view>
-    </view>
-    <view class="fn-flex ml10 mr10 pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="optEmployees" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
-      <button disabled="{{submitFlag}}" bindtap="putAppCustomersAdmins" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
-    </view>
-	</view>
-</lcb-msg>
-
-<page-container 
-  show="{{isShowTimePicker}}"
-  round="{{true}}"
-  overlay="true"
-  duration="300"
-  z-index="10000"
-  position="bottom"
-  close-on-slide-down="{{false}}"
-  bindenter="onEnter"
-  custom-style="false"
-  overlay-style="false"
->
-  <view class="">
-    <view class="relative pt30 pb30 text-center font-30">
-      <view class="color-666">计划回访时间</view>
-      <i bindtap="optShowTimePicker" class="absolute right-0 box-middle mr30 iconfont icon-guanbi1"></i>
-    </view>
-    <view class="fn-flex pt30 pb30 bbs-1-eb text-center font-24">
-      <block wx:for="{{weekList}}" wx:key="index">
-        <view class="fn-flex-item">{{item}}</view>
-      </block>
-    </view>
-    <view class="pb180 relative">
-      <view class="absolute top-0 box-center mt130 font-180 color-f8">{{cMonth}}</view>
-      <view class="relative fn-flex fn-flex-wrap pt30 pb30 text-center font-24 z-index-2">
-        <block wx:for="{{dateList}}" wx:key="index">
-          <view bindtap="{{item.isopt?'optday':''}}" data-index="{{index}}" class="datecell ulib-r10 {{nextIndex == index?'active':''}} {{item.isopt?'color-1a':'color-ccc'}}">{{item.day}}</view>
-        </block>
-      </view>
-    </view>
-  </view>
-</page-container>
-
-<!-- 拨打电话 -->
-<lcb-msg isShow="{{isShowCall}}" isCustomTabBar="{{true}}">
-  <view slot="content">
-    <view class="pt50 pb40">
-      <view class="font-36 text-center">号码绑定成功</view>
-      <view class="mt10 font-28 text-center color-666">现在呼叫 {{phoneNumber}} ？</view>
-    </view>
-    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="hideCall" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
-        取消
-      </button>
-      <button bindtap="makePhoneCall" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">
-        确定
-      </button>
-    </view>
-  </view>
-</lcb-msg>
+<lcb-changeMobile isShow="{{isShowMobile}}"></lcb-changeMobile>
@@ -1,754 +0,0 @@
-import _ from '../../../commons/js/commons';
-import popularData from '../../../commons/js/lib/popularData';
-import * as echarts from '../../../ecCanvas/components/ec-canvas/echarts';
-const app = getApp()
-
-let BarChartData;
-let Pie1ChartData;
-let Pie2ChartData;
-let Pie3ChartData;
-function BarChart(canvas, width, height, dpr) {
-  const chart = echarts.init(canvas, null, {
-    width: width,
-    height: height,
-    devicePixelRatio: dpr // new
-  });
-  canvas.setChart(chart);
-  let option = BarChartData
-  chart.setOption(option);
-  chart.on('click',function(e){
-    console.log(e)
-  });
-  return chart;
-}
-function Pie1Chart(canvas, width, height, dpr) {
-  const chart = echarts.init(canvas, null, {
-    width: width,
-    height: height,
-    devicePixelRatio: dpr // new
-  });
-  canvas.setChart(chart);
-  let option = Pie1ChartData
-  chart.setOption(option);
-  chart.on('click',function(e){
-    console.log(e)
-  });
-  return chart;
-}
-function Pie2Chart(canvas, width, height, dpr) {
-  const chart = echarts.init(canvas, null, {
-    width: width,
-    height: height,
-    devicePixelRatio: dpr // new
-  });
-  canvas.setChart(chart);
-  let option = Pie2ChartData
-  chart.setOption(option);
-  chart.on('click',function(e){
-    //_.eventBus.emit("pinpai",e.name)
-  });
-  return chart;
-}
-function Pie3Chart(canvas, width, height, dpr) {
-  const chart = echarts.init(canvas, null, {
-    width: width,
-    height: height,
-    devicePixelRatio: dpr // new
-  });
-  canvas.setChart(chart);
-  let option = Pie3ChartData
-  chart.setOption(option);
-  chart.on('click',function(e){
-    //_.eventBus.emit("pinpai",e.name)
-  });
-  return chart;
-}
-
-Page({
-  data: {
-    imgUrl: _.config.imgUrl,//静态图片路径
-    showPie1Chart:false,//是否显示Pie1图表
-    ecPie1:{},
-    showPie2Chart:false,//是否显示Pie2图表
-    ecPie2:{},
-    showPie3Chart:false,//是否显示Pie3图表
-    ecPie3:{},
-    showBarChart:false,//是否显示Bar图表
-    ecBar:{},
-    Pie1title:'',
-    Pie2title:'',
-    Pie3title:'',
-    Bartitle:'',
-  },
-
-  onLoad: function (options) {
-    for (let key in options) {
-      this.setData({
-        [key]: options[key]
-      })
-    }
-
-    this.getAppCity()
-    
-  },
-
-  //获取系统配置城市
-  getAppCity(){
-    _.apiQuery.getAppCity().then(res => {
-      this.setData({
-        city_id:this.data.city_id?this.data.city_id:res.data.default,
-      })
-      let cityArray = []
-      res.data.list.forEach((item,index) => {
-        cityArray.push(item.name)
-        if(item.city_id==this.data.city_id){
-          this.setData({
-            cityIndex:index,
-          })
-        }
-      })
-      this.setData({
-        cityArray:cityArray,
-        cityList:res.data.list,
-      })
-
-      this.getAppStatisticsStats_customer()
-
-    });
-  },
-
-
-  //选择日期
-  changeDate(e){
-    if(e.currentTarget.dataset.type=="s_date"){
-      let begin = new Date(e.detail.value).getTime();
-      let end = new Date(this.data.e_date).getTime();
-      let day = 0
-      if(end>=begin){
-        day = (end - begin)/(24*60*60*1000);
-        this.setData({
-          s_date: e.detail.value,
-        })
-      }
-      else{
-        day = (begin - end)/(24*60*60*1000);
-        let s_date = this.data.e_date
-        let e_date = e.detail.value
-        this.setData({
-          s_date,
-          e_date,
-        })
-      }
-      if (day > 365) {
-        wx.showToast({
-          title: '请选择一年时间内',
-          icon: 'none'
-        })
-      }
-      else{
-        this.getAppStatisticsStats_customer()
-      }
-    }
-    if(e.currentTarget.dataset.type=="e_date"){
-      let begin = new Date(this.data.s_date).getTime();
-      let end = new Date(e.detail.value).getTime();
-      let day = 0
-      if(end>=begin){
-        day = (end - begin)/(24*60*60*1000);
-        this.setData({
-          e_date: e.detail.value,
-        })
-      }
-      else{
-        day = (begin - end)/(24*60*60*1000);
-        let e_date = this.data.s_date
-        let s_date = e.detail.value
-        this.setData({
-          s_date,
-          e_date,
-        })
-      }
-      if (day > 365) {
-        wx.showToast({
-          title: '请选择一年时间内',
-          icon: 'none'
-        })
-      }
-      else{
-        this.getAppStatisticsStats_customer()
-      }
-    }
-    
-  },
-
-  //订单数据
-  getAppStatisticsStats_customer(){
-    this.setData({
-      showPie1Chart:false,
-      showPie2Chart:false,
-      showPie3Chart:false,
-      showBarChart:false,
-    })
-
-    let params = {};
-    params['type'] = this.data.type;
-    params['city_id'] = this.data.city_id;
-    params['s_time'] = this.data.s_date;
-    params['e_time'] = this.data.e_date;
-    _.apiQuery.getAppStatisticsStats_customer(params).then(res => {
-
-      wx.setNavigationBarTitle({
-        title: res.data.title
-      })
-
-      this.setData({
-        Pie1title:res.data.pie1?res.data.pie1.title:'',
-        Pie2title:res.data.pie2?res.data.pie2.title:'',
-        Pie3title:res.data.pie3?res.data.pie3.title:'',
-        Bartitle:res.data.bar?res.data.bar.title:'',
-      })
-      
-      //Pie1ChartData = getPie1Option()
-      if(res.data.pie1){
-        if(res.data.pie1.series_data_1.length==0){
-          this.setData({
-            pie1noData:true,
-          })
-        }else{
-          Pie1ChartData = {
-            tooltip: {
-              trigger: 'item',
-              formatter: '{b}: {c} ({d}%)'
-            },
-            series: [
-              {
-                name: 'Access From',
-                type: 'pie',
-                bottom:'12%',
-                selectedMode: 'single',
-                radius: [0, '30%'],
-                label: {
-                  position: 'inner',
-                  fontSize: 10
-                },
-                labelBar: {
-                  show: false
-                },
-                data: []
-              },
-              {
-                name: 'Access From',
-                type: 'pie',
-                bottom:'12%',
-                radius: ['45%', '65%'],
-                labelLine: {
-                  fontSize:5,
-                  length:10
-                },
-                label: {
-                  formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
-                  backgroundColor: '#F6F8FC',
-                  borderColor: '#8C8D8E',
-                  borderWidth: 1,
-                  borderRadius: 4,
-                  rich: {
-                    hr: {
-                      borderColor: '#8C8D8E',
-                      width: '100%',
-                      borderWidth: 1,
-                      height: 0
-                    },
-                    b: {
-                      color: '#4C5058',
-                      fontSize:10,
-                      lineHeight:20,
-                      align: 'center',
-                    },
-                    c: {
-                      color: '#4C5058',
-                      fontSize:8,
-                      lineHeight:20,
-                      align: 'center',
-                    },
-                  }
-                },
-                data: []
-              },
-            ]
-          };
-          
-          Pie1ChartData.series[0].data = res.data.pie1.series_data_1
-          Pie1ChartData.series[1].data = res.data.pie1.series_data_2
-          this.setData({
-            pie1noData:false,
-            showPie1Chart:true,
-            ['ecPie1.onInit']:Pie1Chart,
-            pie1Bottom:res.data.pie1.bottom,
-          })
-        }
-      }
-
-      //Pie2ChartData = getPie2Option()
-      if(res.data.pie2){
-        if(res.data.pie2.series_data_1.length==0){
-          this.setData({
-            pie2noData:true,
-          })
-        }else{
-          Pie2ChartData = {
-            tooltip: {
-              trigger: 'item',
-              formatter: '{b}: {c} ({d}%)'
-            },
-            series: [
-              {
-                name: 'Access From',
-                type: 'pie',
-                bottom:'12%',
-                radius: '70%',
-                // avoidLabelOverlap: false,
-                // itemStyle: {
-                //   borderRadius: 10,
-                //   borderColor: '#fff',
-                //   borderWidth: 2
-                // },
-                label: {
-                  show: false,
-                  position: 'center'
-                },
-                labelLine: {
-                  fontSize:5,
-                  length:10
-                },
-                label: {
-                  formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
-                  backgroundColor: '#F6F8FC',
-                  borderColor: '#8C8D8E',
-                  borderWidth: 1,
-                  borderRadius: 4,
-                  rich: {
-                    hr: {
-                      borderColor: '#8C8D8E',
-                      width: '100%',
-                      borderWidth: 1,
-                      height: 0
-                    },
-                    b: {
-                      color: '#4C5058',
-                      fontSize:10,
-                      lineHeight:20,
-                      align: 'center',
-                    },
-                    c: {
-                      color: '#4C5058',
-                      fontSize:8,
-                      lineHeight:20,
-                      align: 'center',
-                    },
-                  }
-                },
-                data: []
-              }
-            ]
-          };
-          Pie2ChartData.series[0].data = res.data.pie2.series_data_1
-          this.setData({
-            pie2noData:false,
-            showPie2Chart:true,
-            ['ecPie2.onInit']:Pie2Chart,
-            pie2Bottom:res.data.pie2.bottom,
-          })
-        }
-      }
-
-      //Pie3ChartData = getPie3Option()
-      if(res.data.pie3){
-        if(res.data.pie3.series_data_1.length==0){
-          this.setData({
-            pie3noData:true,
-          })
-        }else{
-          Pie3ChartData = {
-            tooltip: {
-              trigger: 'item',
-              formatter: '{b}: {c} ({d}%)'
-            },
-            series: [
-              {
-                name: 'Access From',
-                type: 'pie',
-                bottom:'12%',
-                radius: '70%',
-                // avoidLabelOverlap: false,
-                // itemStyle: {
-                //   borderRadius: 10,
-                //   borderColor: '#fff',
-                //   borderWidth: 2
-                // },
-                label: {
-                  show: false,
-                  position: 'center'
-                },
-                labelLine: {
-                  fontSize:5,
-                  length:10
-                },
-                label: {
-                  formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
-                  backgroundColor: '#F6F8FC',
-                  borderColor: '#8C8D8E',
-                  borderWidth: 1,
-                  borderRadius: 4,
-                  rich: {
-                    hr: {
-                      borderColor: '#8C8D8E',
-                      width: '100%',
-                      borderWidth: 1,
-                      height: 0
-                    },
-                    b: {
-                      color: '#4C5058',
-                      fontSize:10,
-                      lineHeight:20,
-                      align: 'center',
-                    },
-                    c: {
-                      color: '#4C5058',
-                      fontSize:8,
-                      lineHeight:20,
-                      align: 'center',
-                    },
-                  }
-                },
-                data: []
-              }
-            ]
-          };
-          Pie3ChartData.series[0].data = res.data.pie3.series_data_1
-          this.setData({
-            pie3noData:false,
-            showPie3Chart:true,
-            ['ecPie3.onInit']:Pie3Chart,
-            pie3Bottom:res.data.pie3.bottom,
-          })
-        }
-      }
-
-      //BarChartData = getBarOption()
-      if(res.data.bar){
-        BarChartData = {
-          tooltip: {
-            trigger: 'axis',
-            axisPointer: {
-              type: 'shadow'
-            }
-          },
-          xAxis: {
-            type: 'value',
-            data: []
-          },
-          yAxis: {
-            type: 'category',
-            data: []
-          },
-          grid: {
-            top: '1%',
-            left: '5%',
-            right: '5%',
-            bottom: '35',
-            containLabel: true
-          },
-          series: [
-            {
-              data: [],
-              type: 'bar',
-              top: 0,
-              bottom:'0',
-            }
-          ]
-        };
-
-        let xAxis_data = res.data.bar.xAxis_data
-        let yAxis_data = []
-        xAxis_data.forEach(item => {
-          if(item.length > 6){
-            yAxis_data.push(item.substring(0,6)+'...')
-          }else{
-            yAxis_data.push(item)
-          }
-        })
-
-        BarChartData.yAxis.data = yAxis_data
-        BarChartData.series[0].data = res.data.bar.series_data
-        this.setData({
-          Barheight:100 + 60*(res.data.bar.xAxis_data.length),
-          Bartitle:res.data.bar.title,
-          showBarChart:true,
-          ['ecBar.onInit']:BarChart,
-          barBottom:res.data.bar.bottom,
-        })
-        
-      }
-
-      wx.stopPullDownRefresh()
-
-    });
-  },
-
-  //推送链接
-  pushLink(e) {
-    if(e.currentTarget.dataset.url){
-      _.$router.openUrlScheme(e.currentTarget.dataset.url)
-    }
-  },
-
-  //选择城市
-  changeCity(e) {
-    this.setData({
-      city_id:this.data.cityList[e.detail.value].city_id,
-      cityIndex: e.detail.value
-    })
-    this.getAppStatisticsStats_customer()
-  },
-
-  //页面相关事件处理函数--监听用户下拉动作
-  onPullDownRefresh: function () {
-    this.getAppStatisticsStats_customer()
-  },
-
-})
-
-function getPie1Option() {
-  return {
-    tooltip: {
-      trigger: 'item',
-      formatter: '{b}: {c} ({d}%)'
-    },
-    series: [
-      {
-        name: 'Access From',
-        type: 'pie',
-        selectedMode: 'single',
-        radius: [0, '30%'],
-        label: {
-          position: 'inner',
-          fontSize: 10
-        },
-        labelBar: {
-          show: false
-        },
-        data: [
-          { value: 1548, name: 'H' },
-          { value: 775, name: 'A' },
-          { value: 679, name: 'B', }
-        ]
-      },
-      {
-        name: 'Access From',
-        type: 'pie',
-        radius: ['45%', '65%'],
-        labelLine: {
-          fontSize:5,
-          length:10
-        },
-        label: {
-          formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
-          backgroundColor: '#F6F8FC',
-          borderColor: '#8C8D8E',
-          borderWidth: 1,
-          borderRadius: 4,
-          rich: {
-            hr: {
-              borderColor: '#8C8D8E',
-              width: '100%',
-              borderWidth: 1,
-              height: 0
-            },
-            b: {
-              color: '#4C5058',
-              fontSize:10,
-              lineHeight:20,
-              align: 'center',
-            },
-            c: {
-              color: '#4C5058',
-              fontSize:8,
-              lineHeight:20,
-              align: 'center',
-            },
-          }
-        },
-        data: [
-          { value: 1048, name: '转介绍' },
-          { value: 335, name: '网络推广' },
-          { value: 310, name: '外展外拓' },
-          { value: 251, name: '自媒体' },
-        ]
-      },
-    ]
-  };
-}
-
-function getPie2Option() {
-  return {
-    // tooltip: {
-    //   trigger: 'item',
-    //   formatter: '{b}: {c} ({d}%)'
-    // },
-    series: [
-      {
-        name: 'Access From',
-        type: 'pie',
-        bottom:'10%',
-        radius: ['40%', '70%'],
-        avoidLabelOverlap: false,
-        itemStyle: {
-          borderRadius: 10,
-          borderColor: '#fff',
-          borderWidth: 2
-        },
-        label: {
-          show: false,
-          position: 'center'
-        },
-        labelLine: {
-          fontSize:5,
-          length:10
-        },
-        label: {
-          formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
-          backgroundColor: '#F6F8FC',
-          borderColor: '#8C8D8E',
-          borderWidth: 1,
-          borderRadius: 4,
-          rich: {
-            hr: {
-              borderColor: '#8C8D8E',
-              width: '100%',
-              borderWidth: 1,
-              height: 0
-            },
-            b: {
-              color: '#4C5058',
-              fontSize:10,
-              lineHeight:20,
-              align: 'center',
-            },
-            c: {
-              color: '#4C5058',
-              fontSize:8,
-              lineHeight:20,
-              align: 'center',
-            },
-          }
-        },
-        data: [
-          { value: 48, name: '转介绍' },
-          { value: 35, name: '网络推广' },
-          { value: 30, name: '外展外拓' },
-          { value: 21, name: '自媒体' },
-        ]
-      }
-    ]
-  };
-}
-
-function getPie3Option() {
-  return {
-    // tooltip: {
-    //   trigger: 'item',
-    //   formatter: '{b}: {c} ({d}%)'
-    // },
-    series: [
-      {
-        name: 'Access From',
-        type: 'pie',
-        bottom:'10%',
-        radius: ['40%', '70%'],
-        avoidLabelOverlap: false,
-        itemStyle: {
-          borderRadius: 10,
-          borderColor: '#fff',
-          borderWidth: 2
-        },
-        label: {
-          show: false,
-          position: 'center'
-        },
-        labelLine: {
-          fontSize:5,
-          length:10
-        },
-        label: {
-          formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
-          backgroundColor: '#F6F8FC',
-          borderColor: '#8C8D8E',
-          borderWidth: 1,
-          borderRadius: 4,
-          rich: {
-            hr: {
-              borderColor: '#8C8D8E',
-              width: '100%',
-              borderWidth: 1,
-              height: 0
-            },
-            b: {
-              color: '#4C5058',
-              fontSize:10,
-              lineHeight:20,
-              align: 'center',
-            },
-            c: {
-              color: '#4C5058',
-              fontSize:8,
-              lineHeight:20,
-              align: 'center',
-            },
-          }
-        },
-        data: [
-          { value: 48, name: '转介绍' },
-          { value: 35, name: '网络推广' },
-          { value: 30, name: '外展外拓' },
-          { value: 21, name: '自媒体' },
-        ]
-      }
-    ]
-  };
-}
-
-function getBarOption() {
-
-  return{
-    tooltip: {
-      trigger: 'axis',
-      axisPointer: {
-        type: 'shadow'
-      }
-    },
-    xAxis: {
-      type: 'value',
-      data: []
-    },
-    yAxis: {
-      type: 'category',
-      data: ['张三', '李四', '王五', '赵六', '孙七', '周八', '吴九','郑十']
-    },
-    grid: {
-      top: '5%',
-      left: '2%',
-      right: '5%',
-      bottom: '3%',
-      containLabel: true
-    },
-    series: [
-
-      {
-        data: [20, 20, 10, 20, 20, 20, 25, 2],
-        type: 'bar',
-        top: 0,
-        bottom:'0',
-      }
-    ]
-  };
-}
@@ -1,10 +0,0 @@
-{
-  "navigationBarTitleText": "订单数据",
-  "navigationBarTextStyle": "white",
-  "navigationBarBackgroundColor": "#ff7052",
-  "backgroundColor": "#ffffff",
-  "backgroundColorTop": "#ff7052",
-  "usingComponents": {
-    "ec-canvas": "../../../ecCanvas/components/ec-canvas/ec-canvas"
-  }
-}
@@ -1,88 +0,0 @@
-<view class="container img-top-cover" style="background-image:url({{imgUrl}}storedata/theme.png);">
-  <view class="text-center pt20 pb40 pl30 pr30 fn-clear">
-    <view class="fn-fl bg-fff-op20 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750">
-      <picker bindchange="changeCity" value="{{cityIndex}}" range="{{cityArray}}">
-        <view>
-          <text>{{cityArray[cityIndex]}}</text>
-          <i class="iconfont ml5 icon-xuanze"></i>
-        </view>
-      </picker>
-    </view>
-    <view class="fn-fr bg-fff-op20 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750">
-      <picker class="inline-block" mode="date" value="{{s_date}}" end="{{current_date}}" bindchange="changeDate" data-type="s_date">
-        <view>
-          <text>{{s_date}}</text>
-          <i class="iconfont ml5 icon-xuanze"></i>
-        </view>
-      </picker>
-      <text class="pl10 pr10">至</text>
-      <picker class="inline-block" mode="date" value="{{e_date}}" end="{{current_date}}" bindchange="changeDate" data-type="e_date">
-        <view>
-          <text>{{e_date}}</text>
-          <i class="iconfont ml5 icon-xuanze"></i>
-        </view>
-      </picker>
-    </view>
-  </view>
-
-  <view class="mb30 pl30 pr30" wx:if="{{Pie1title != ''}}">
-    <view class="inner30 pt40 bg-fff box-shadow-000-10-10 ulib-r10">
-      <view class="relative">
-        <view class="font-36">{{Pie1title}}</view>
-      </view>
-      <lcb-listmore isNoData='{{pie1noData}}' noDataMsg='暂无数据'></lcb-listmore>
-      <view class="mt50 mb20 relative height-600 z-index-0" wx:if="{{!pie1noData}}">
-        <view class="absolute wp100 height-600"  wx:if="{{showPie1Chart}}">
-          <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecPie1 }}"></ec-canvas>
-        </view>
-        <view class="absolute left-0 bottom-0 right-0 text-center font-22 color-888">{{pie1Bottom}}</view>
-      </view>
-    </view>
-  </view>
-
-  <view class="mb30 pl30 pr30" wx:if="{{Pie2title != ''}}">
-    <view class="inner30 pt40 bg-fff box-shadow-000-10-10 ulib-r10">
-      <view class="relative">
-        <view class="font-36">{{Pie2title}}</view>
-      </view>
-      <lcb-listmore isNoData='{{pie2noData}}' noDataMsg='暂无数据'></lcb-listmore>
-        <view class="mt50 mb20 relative height-600 z-index-0" wx:if="{{!pie2noData}}">
-        <view class="absolute wp100 height-600"  wx:if="{{showPie2Chart}}">
-          <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecPie2 }}"></ec-canvas>
-        </view>
-        <view class="absolute left-0 bottom-0 right-0 text-center font-22 color-888" >{{pie2Bottom}}</view>
-      </view>
-    </view>
-  </view>
-
-  <view class="mb30 pl30 pr30" wx:if="{{Pie3title != ''}}">
-    <view class="inner30 pt40 bg-fff box-shadow-000-10-10 ulib-r10">
-      <view class="relative">
-        <view class="font-36">{{Pie3title}}</view>
-      </view>
-      <lcb-listmore isNoData='{{pie3noData}}' noDataMsg='暂无数据'></lcb-listmore>
-        <view class="mt50 mb20 relative height-600 z-index-0" wx:if="{{!pie3noData}}">
-        <view class="absolute wp100 height-600"  wx:if="{{showPie3Chart}}">
-          <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecPie3 }}"></ec-canvas>
-        </view>
-        <view class="absolute left-0 bottom-0 right-0 text-center font-22 color-888" >{{pie3Bottom}}</view>
-      </view>
-    </view>
-  </view>
-
-  <view class="mb30 pl30 pr30" wx:if="{{Bartitle != ''}}">
-    <view class="inner30 pt40 bg-fff box-shadow-000-10-10 ulib-r10">
-      <view class="relative">
-        <view class="font-36">{{Bartitle}}</view>
-      </view>
-      <view class="mt50 mb20 relative z-index-0" style="height:{{Barheight}}rpx;">
-        <view class="absolute wp100" style="height:{{Barheight}}rpx;" wx:if="{{showBarChart}}">
-          <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecBar }}"></ec-canvas>
-        </view>
-        <view class="absolute left-0 bottom-0 right-0 text-center font-22 color-888" >{{barBottom}}</view>
-      </view>
-    </view>
-  </view>
-  
-</view>
-<lcb-footer></lcb-footer>
@@ -1 +0,0 @@
-/* pages/storeData/index.wxss */
@@ -1,10 +1,21 @@
-import _ from '../../commons/js/commons';
+import _ from '../../commons/js/commons'
 import popularData from '../../commons/js/lib/popularData';
 import * as echarts from '../../ecCanvas/components/ec-canvas/echarts';
 const app = getApp()

+let barChartData;
 let lineChartData;
-let FunnelChartData;
+function barChart(canvas, width, height, dpr) {
+  const chart = echarts.init(canvas, null, {
+    width: width,
+    height: height,
+    devicePixelRatio: dpr // new
+  });
+  canvas.setChart(chart);
+  let option = barChartData
+  chart.setOption(option);
+  return chart;
+}
 function lineChart(canvas, width, height, dpr) {
  const chart = echarts.init(canvas, null, {
    width: width,
@@ -16,50 +27,52 @@ function lineChart(canvas, width, height, dpr) {
  chart.setOption(option);
  return chart;
 }
-function FunnelChart(canvas, width, height, dpr) {
-  const chart = echarts.init(canvas, null, {
-    width: width,
-    height: height,
-    devicePixelRatio: dpr // new
-  });
-  canvas.setChart(chart);
-  let option = FunnelChartData
-  chart.setOption(option);
-  return chart;
-}

 Page({
  data: {
-    imgUrl: _.config.imgUrl,//静态图片路径
-    showFunnelChart:false,//是否显示Funnel图表
-    ecFunnel:{},
+    imgUrl:_.config.imgUrl,
+    showBarChart:false,//是否显示Bar图表
+    ecBar:{},
    showLineChart:false,//是否显示Line图表
    ecLine:{},
-    daysIndex:0,
-    daysArray:['近一周','近30日'],
-    isShowTip:false,
-    tipIndex:0,
+    storeArray: [],
+    storeobj: [],
+    storeIndex:0,
+    staffArray: [],
+    staffobj: [],
+    staffIndex:-1,
+    tabId:'1',
+    tab:[
+      {
+        id: 1,
+        title: '客户数据'
+      },
+      {
+        id: 2,
+        title: '订单数据'
+      },
+    ],
+    custom:[],//客户数据
+    order:[],//订单数据
  },

-  onLoad: function (options) {
+  onLoad(options) {
    for (let key in options) {
      this.setData({
        [key]: options[key]
      })
    }
-
    popularData.getDateLater(0,0).then(res => {
-      let s_date = res[0]
-      s_date= s_date.split('-')[0]+'-'+s_date.split('-')[1]+'-01'
      this.setData({
-        s_date,
-        e_date:res[1],
-        current_date:res[1],
+        dateTime:res[2],
      })
-
-      this.getAppCity()
-      
    })
+
+    this.getAppCity()
+    
+  },
+
+  onShow: function () {
    
  },

@@ -81,150 +94,93 @@ Page({
        cityList:res.data.list,
      })

-      this.getAppStatisticsStats()
-      this.getAppStatisticsStats_days()
+      this.getAppUserBizs()

    });
  },

-  //选择日期
-  changeDate(e){
-    if(e.currentTarget.dataset.type=="s_date"){
-      let begin = new Date(e.detail.value).getTime();
-      let end = new Date(this.data.e_date).getTime();
-      let day = 0
-      if(end>=begin){
-        day = (end - begin)/(24*60*60*1000);
-        this.setData({
-          s_date: e.detail.value,
-        })
-      }
-      else{
-        day = (begin - end)/(24*60*60*1000);
-        let s_date = this.data.e_date
-        let e_date = e.detail.value
-        this.setData({
-          s_date,
-          e_date,
-        })
-      }
-      if (day > 365) {
-        wx.showToast({
-          title: '请选择一年时间内',
-          icon: 'none'
-        })
-      }
-      else{
-        this.getAppStatisticsStats()
-      }
-    }
-    if(e.currentTarget.dataset.type=="e_date"){
-      let begin = new Date(this.data.s_date).getTime();
-      let end = new Date(e.detail.value).getTime();
-      let day = 0
-      if(end>=begin){
-        day = (end - begin)/(24*60*60*1000);
-        this.setData({
-          e_date: e.detail.value,
-        })
-      }
-      else{
-        day = (begin - end)/(24*60*60*1000);
-        let e_date = this.data.s_date
-        let s_date = e.detail.value
-        this.setData({
-          s_date,
-          e_date,
-        })
-      }
-      if (day > 365) {
-        wx.showToast({
-          title: '请选择一年时间内',
-          icon: 'none'
-        })
-      }
-      else{
-        this.getAppStatisticsStats()
-      }
-    }
-    
-  },
-
-  //数据看板-漏斗
-  getAppStatisticsStats(){
-    this.setData({
-      showFunnelChart:false,
-    })
-
+  //获取管理门店
+  getAppUserBizs(){
    let params = {};
    params['city_id'] = this.data.city_id;
-    params['s_time'] = this.data.s_date;
-    params['e_time'] = this.data.e_date;
-    _.apiQuery.getAppStatisticsStats(params).then(res => {
+    _.apiQuery.getAppUserBizs(params).then(res => {
+      if(res.data.list.length>0){
+        let storeArray = []
+        res.data.list.forEach(item => {
+          storeArray.push(item.name)
+        })
+        this.setData({
+          storeArray:storeArray,
+          storeobj:res.data.list,
+          storeIndex:0,
+          staffIndex:-1,
+        })

-      wx.setNavigationBarTitle({
-        title: res.data.title
-      })
-
-      this.setData({
-        tabs:res.data.tabs,
-      })
-
-      //FunnelChartData = getFunnelOption()
-      FunnelChartData = {
-        series: [
-          {
-            name: 'Expected',
-            type: 'funnel',
-            top: '1%',
-            bottom:'5%',
-            left: '2%',
-            width: '72%',
-            label: {
-              position: 'right',
-              formatter: '{b}'
-            },
-            labelLine: {
-              show: false
-            },
-            itemStyle: {
-              opacity: 0.7
-            },
-            data: []
-          },
-          {
-            name: 'Actual',
-            type: 'funnel',
-            top:'1%',
-            bottom:'5%',
-            left: '7%',
-            width: '62%',
-            maxSize: '62%',
-            label: {
-              position: 'inside',
-              formatter: '{c}',
-              color: '#000'
-            },
-            itemStyle: {
-              opacity: 0.4,
-              borderColor: '#fff',
-              borderWidth:1
-            },
-            data: [],
-            z: 100
-          }
-        ]
-      };
-      if(res.data.funnel.actual_data[0].value==0&&res.data.funnel.actual_data[1].value==0&&res.data.funnel.actual_data[2].value==0){
-        FunnelChartData.series[1].itemStyle.opacity = 0
+        this.getAppUserAdmins()
+        if(this.data.tabId==1){
+          this.getAppXzStat()
+          this.getAppStatisticsScust()
+        }else if(this.data.tabId==2){
+          this.getAppStatisticsOcust()
+        }
      }
-      
-      FunnelChartData.series[0].data = res.data.funnel.expected_data
-      FunnelChartData.series[1].data = res.data.funnel.actual_data
+
+    });
+  },
+
+  //获取管理门店
+  getAppUserAdmins(){
+    let params = {};
+    params['biz_id'] = this.data.storeobj[this.data.storeIndex].id;
+    params['page'] = 1;
+    params['size'] = 1000;
+    _.apiQuery.getAppUserAdmins(params).then(res => {
+      let staffArray = []
+      res.data.list.forEach(item => {
+        staffArray.push(item.uname)
+      })
      this.setData({
-        funneltitle:res.data.funnel.title,
-        showFunnelChart:true,
-        ['ecFunnel.onInit']:FunnelChart,
+        staffArray:staffArray,
+        staffobj: res.data.list,
+      })
+    });
+  },
+
+  //获取电话统计数据
+  getAppXzStat(){
+    let params = {};
+    params['biz_id'] = this.data.storeobj[this.data.storeIndex].id;
+    params['day'] = this.data.dateTime;
+    if(this.data.staffIndex>-1){
+      params['admin_id'] = this.data.staffobj[this.data.staffIndex].id;
+    }
+    _.apiQuery.getAppXzStat(params).then(res => {
+      this.setData({
+        xzstat:res.data,
+      })
+    });
+  },
+
+  //数据分析-客户数据
+  getAppStatisticsScust(){
+    this.setData({
+      ecBar:{},
+      showBarChart:false,
+    })
+    let params = {};
+    params['biz_id'] = this.data.storeobj[this.data.storeIndex].id;
+    params['day'] = this.data.dateTime;
+    if(this.data.staffIndex>-1){
+      params['admin_id'] = this.data.staffobj[this.data.staffIndex].id;
+    }
+    _.apiQuery.getAppStatisticsScust(params).then(res => {
+
+      barChartData = res.data.stat_data
+      //barChartData.tooltip.position=['10', '10']
+      this.setData({
+        custom:res.data.custom,
+        showBarChart:true,
+        ['ecBar.onInit']:barChart,
      })

      wx.stopPullDownRefresh()
@@ -232,49 +188,24 @@ Page({
    });
  },

-  //客户/订单走势图
-  getAppStatisticsStats_days(){
+  //数据分析-订单数据
+  getAppStatisticsOcust(){
    this.setData({
+      ecLine:{},
      showLineChart:false,
    })
-
    let params = {};
-    params['city_id'] = this.data.city_id;
-    params['days'] = this.data.daysIndex == 0?'7':'30';
-    _.apiQuery.getAppStatisticsStats_days(params).then(res => {
+    params['biz_id'] = this.data.storeobj[this.data.storeIndex].id;
+    params['day'] = this.data.dateTime;
+    if(this.data.staffIndex>-1){
+      params['admin_id'] = this.data.staffobj[this.data.staffIndex].id;
+    }
+    _.apiQuery.getAppStatisticsOcust(params).then(res => {

-      //lineChartData = getLineOption()
-      lineChartData = {
-        tooltip: {
-            trigger: 'axis'
-        },
-        legend: {
-          top: 'bottom',
-          data: []
-        },
-        grid: {
-          top: '3%',
-          left: '2%',
-          right: '5%',
-          bottom: '20%',
-          containLabel: true
-        },
-        xAxis: {
-            type: 'category',
-            boundaryGap: false,
-            data: []
-        },
-        yAxis: {
-            type: 'value'
-        },
-        series: []
-      };
-
-      lineChartData.legend.data = res.data.legend_data
-      lineChartData.xAxis.data = res.data.xAxis
-      lineChartData.series = res.data.series
+      lineChartData = res.data.stat_data
+      //lineChartData.tooltip.position=['10', '10']
      this.setData({
-        linetitle:res.data.title,
+        order:res.data.custom,
        showLineChart:true,
        ['ecLine.onInit']:lineChart,
      })
@@ -282,35 +213,6 @@ Page({
      wx.stopPullDownRefresh()

    });
-
-  },
-
-  //选择天数
-  changeDays(e) {
-    this.setData({
-      daysIndex: e.detail.value
-    })
-    this.getAppStatisticsStats_days()
-  },
-
-  //显示隐藏提示
-  optShowTip(e) {
-    this.setData({
-      isShowTip:!this.data.isShowTip,
-    })
-    if(e.currentTarget.dataset.index){
-      this.setData({
-        tipIndex:e.currentTarget.dataset.index
-      })
-    }
-  },
-
-
-  //推送链接
-  pushLink(e) {
-    if(e.currentTarget.dataset.url){
-      _.$router.openUrlScheme(e.currentTarget.dataset.url)
-    }
  },

  //选择城市
@@ -319,79 +221,110 @@ Page({
      city_id:this.data.cityList[e.detail.value].city_id,
      cityIndex: e.detail.value
    })
-    this.getAppStatisticsStats()
-    this.getAppStatisticsStats_days()
+    this.getAppUserBizs()
+  },
+
+  //选择门店
+  changeStore(e) {
+    this.setData({
+      storeIndex: e.detail.value
+    })
+    if(this.data.tabId==1){
+      this.getAppStatisticsScust()
+    }else if(this.data.tabId==2){
+      this.getAppStatisticsOcust()
+    }
+  },
+
+  //日期选择
+  changeDate(e){
+    this.setData({
+      dateTime: e.detail.value,
+    })
+    if(this.data.tabId==1){
+      this.getAppStatisticsScust()
+    }else if(this.data.tabId==2){
+      this.getAppStatisticsOcust()
+    }
+  },
+
+  //选择人员
+  changeStaff(e) {
+    this.setData({
+      staffIndex: e.detail.value
+    })
+    if(this.data.tabId==1){
+      this.getAppStatisticsScust()
+    }else if(this.data.tabId==2){
+      this.getAppStatisticsOcust()
+    }
+  },
+
+  //切换tab
+  changeTab(e){
+    this.setData({
+      tabId:e.currentTarget.dataset.id,
+    })
+    if(this.data.tabId==1){
+      this.getAppStatisticsScust()
+    }else if(this.data.tabId==2){
+      this.getAppStatisticsOcust()
+    }
+  },
+
+  //推送链接
+  pushLink(e) {
+    if(e.currentTarget.dataset.url){
+      _.$router.openUrlScheme(e.currentTarget.dataset.url)
+    }
  },

  //页面相关事件处理函数--监听用户下拉动作
  onPullDownRefresh: function () {
-    this.getAppStatisticsStats()
-    this.getAppStatisticsStats_days()
+    this.getAppUserBizs()
  },

 })

-function getFunnelOption() {
+function getBarOption() {
  return {
-    // legend: {
-    //   top: 'bottom', 
-    //   data: ['客户量', '到店数', '成交数']
-    // },
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      }
+    },
+    grid: {
+      top: '10%',
+      left: '2%',
+      right: '5%',
+      bottom: '5%',
+      containLabel: true
+    },
+    xAxis: {
+      type: 'value',
+      boundaryGap: [0, 0.01]
+    },
+    yAxis: {
+      type: 'category',
+      data: ['1月', '2月', '3月',],
+    },
    series: [
      {
-        name: 'Expected',
-        type: 'funnel',
-        top: '1%',
-        bottom:'5%',
-        left: '2%',
-        width: '72%',
-        label: {
-          position: 'right',
-          formatter: '{b}'
-        },
-        labelLine: {
-          show: false
-        },
+        type: 'bar',
        itemStyle: {
-          opacity: 0.7
+          color:'#2e3246',
+          borderRadius: [0, 20, 20, 0],
        },
-        data: [
-          { value: 33.3, name: '成交数(10%)' },
-          { value: 66.6, name: '到店数(25%)' },
-          { value: 100, name: '客户数(100%)' }
-        ]
+        barWidth:'15',
+        data: [33, 23, 29,],
+        label: {
+            show: true,
+            position: 'right',
+            formatter: '{@[n]}',
+            valueAnimation: true
+        }
      },
-      {
-        name: 'Actual',
-        type: 'funnel',
-        top:'1%',
-        bottom:'5%',
-        left: '7%',
-        width: '62%',
-        maxSize: '62%',
-        label: {
-          position: 'inside',
-          formatter: '{c}',
-          color: '#000'
-        },
-        itemStyle: {
-          opacity: 0.4,
-          borderColor: '#fff',
-          borderWidth:1
-        },
-        // emphasis: {
-        //   label: {
-        //     position: 'inside',
-        //     formatter: '{b}: {c}'
-        //   }
-        // },
-        data: [
-          { value: 20, name: '成交数' },
-          { value: 50, name: '到店数' },
-          { value:200, name: '客户量' }
-        ],
-        z: 100
-      }
    ]
  };
 }
@@ -399,43 +332,24 @@ function getFunnelOption() {
 function getLineOption() {

  return{
-    tooltip: {
-        trigger: 'axis'
-    },
-    legend: {
-      top: 'bottom',
-      data: ['客户数', '订单数',]
-    },
    grid: {
-      top: '3%',
+      top: '15%',
      left: '2%',
      right: '5%',
-      bottom: '20%',
+      bottom: '5%',
      containLabel: true
    },
    xAxis: {
-        type: 'category',
-        boundaryGap: false,
-        data: ['1', '2', '3','4','5','6','7',]
+      type: 'category',
+      data: ['1月', '2月', '3月',]
    },
    yAxis: {
-        type: 'value'
+      type: 'value'
    },
-    series: [
-        {
-            name: '客户数',
-            type: 'line',
-            //stack: '总量',//累加
-            data: [20, 30, 50, 60, 66, 70, 73, ],
-            smooth: true,
-        },
-        {
-            name: '订单数',
-            type: 'line',
-            //stack: '总量',//累加
-            data: [10, 10, 10,1, 1, 1, 1,],
-            smooth: true,
-        },
-    ]
+    series: [{
+        data: [20, 932, 901,],
+        type: 'line',
+        smooth: true
+    }]
  };
 }
@@ -1,8 +1,10 @@
 {
+  "navigationBarTitleText": "数据分析",
+  "enablePullDownRefresh": true,
  "navigationBarTextStyle": "white",
-  "navigationBarBackgroundColor": "#ff7052",
+  "navigationBarBackgroundColor": "#1a1c26",
  "backgroundColor": "#ffffff",
-  "backgroundColorTop": "#ff7052",
+  "backgroundColorTop": "#1a1c26",
  "usingComponents": {
    "ec-canvas": "../../ecCanvas/components/ec-canvas/ec-canvas"
  }
@@ -1,101 +1,132 @@
-<view class="container img-top-cover" style="background-image:url({{imgUrl}}storedata/theme.png);">
-  <view class="text-center pt20 pb40 pl30 pr30 fn-clear">
-    <view class="fn-fl bg-fff-op20 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750">
-      <picker bindchange="changeCity" value="{{cityIndex}}" range="{{cityArray}}">
-        <view>
-          <text>{{cityArray[cityIndex]}}</text>
-          <i class="iconfont ml5 icon-xuanze"></i>
-        </view>
-      </picker>
-    </view>
-    <view class="fn-fr bg-fff-op20 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750">
-      <picker class="inline-block" mode="date" value="{{s_date}}" end="{{current_date}}" bindchange="changeDate" data-type="s_date">
-        <view>
-          <text>{{s_date}}</text>
-          <i class="iconfont ml5 icon-xuanze"></i>
-        </view>
-      </picker>
-      <text class="pl10 pr10">至</text>
-      <picker class="inline-block" mode="date" value="{{e_date}}" end="{{current_date}}" bindchange="changeDate" data-type="e_date">
-        <view>
-          <text>{{e_date}}</text>
-          <i class="iconfont ml5 icon-xuanze"></i>
-        </view>
-      </picker>
-    </view>
-  </view>
-
-  <view class="mt10 mb40 pl30 pr30 fn-flex text-center color-fff">
-    <block wx:for='{{tabs}}' wx:key='index'>
-      <view class="fn-flex-item" bindtap="pushLink" data-url="{{item.url}}&city_id={{city_id}}&s_date={{s_date}}&e_date={{e_date}}&current_date={{current_date}}">
-        <view class="inline-block text-left">
-          <view class="text-center">
-            <text class="font-40">{{item.value_1}}</text>
-          </view>
-          <view class="pt10 font-22">
-            <text>{{item.title}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </view>
-        </view>
-      </view>
-    </block>
-  </view>
-
-  <view class="mb30 pl30 pr30">
-    <view class="relative inner30 pb60 pt40 bg-fff box-shadow-000-10-10 ulib-r10">
-      <view class="relative">
-        <view class="font-36">{{funneltitle}}</view>
-        <!-- <picker class="absolute right-0 box-middle" bindchange="changeCity" value="{{cityIndex}}" range="{{cityArray}}">
-          <view class="pt10 pb10 pl20 pr20 bg-f6 ulib-r10 font-22">
-            <text>厦门</text>
-            <text>{{cityArray[cityIndex]}}</text>
-            <i class="iconfont ml10 icon-xiala color-999"></i>
-          </view>
-        </picker> -->
-      </view>
-      <view class="mt50 mb20 relative height-400 z-index-0">
-      <view class="absolute wp100 height-400"  wx:if="{{showFunnelChart}}">
-        <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecFunnel }}"></ec-canvas>
-      </view>
-      </view>
-      <view class="absolute left-0 bottom-0 mb40 wp100 text-center font-22 color-999">注：时间跨度越大越具参考性</view>
-    </view>
-  </view>
-
-  <view class="mb30 pl30 pr30">
+<view class="container">
+  <view class="inner30 img-top-cover" style="background-image:url({{imgUrl}}channel/theme.jpg);">
+    
+    <!-- 管辖门店 -->
    <view class="inner30 pt40 bg-fff box-shadow-000-10-10 ulib-r10">
-      <view class="relative">
-        <view class="font-36">{{linetitle}}</view>
-        <picker class="absolute right-0 box-middle" bindchange="changeDays" value="{{daysIndex}}" range="{{daysArray}}">
-          <view class="pt10 pb10 pl20 pr20 bg-f6 ulib-r10 font-22">
-            <text>{{daysArray[daysIndex]}}</text>
-            <i class="iconfont ml10 icon-xiala color-999"></i>
+      <view class="bg-f6 pt25 pb25 pl30 pr30 font-32 fn-clear ulib-r10">
+        <view class="fn-fl">城市</view>
+        <picker class="fn-fr" bindchange="changeCity" value="{{cityIndex}}" range="{{cityArray}}">
+          <view class="color-666">
+            <text>{{cityArray[cityIndex]}}</text>
+            <i class="iconfont ml10 icon-gengduo font-26 color-999"></i>
          </view>
        </picker>
      </view>
-      <view class="mt50 mb20 relative height-500 z-index-0">
-      <view class="absolute wp100 height-500"  wx:if="{{showLineChart}}">
-        <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecLine }}"></ec-canvas>
+      <view class="mt20 bg-f6 pt25 pb25 pl30 pr30 font-32 fn-clear ulib-r10">
+        <view class="fn-fl">门店</view>
+        <picker class="fn-fr" bindchange="changeStore" value="{{storeIndex}}" range="{{storeArray}}">
+          <view class="color-666">
+            <text>{{storeArray[storeIndex]}}</text>
+            <i class="iconfont ml10 icon-gengduo font-26 color-999"></i>
+          </view>
+        </picker>
      </view>
+      <view class="mt20 bg-f6 pt25 pb25 pl30 pr30 font-32 fn-clear ulib-r10">
+        <view class="fn-fl">月份选择</view>
+        <picker class="fn-fr" mode="date" fields="month" value="{{dateTime}}" bindchange="changeDate">
+          <view class="color-666">
+            <text>{{dateTime}}</text>
+            <i class="iconfont ml10 icon-gengduo font-26 color-999"></i>
+          </view>
+        </picker>
+      </view>
+      <view class="mt20 bg-f6 pt25 pb25 pl30 pr30 font-32 fn-clear ulib-r10">
+        <view class="fn-fl">人员选择</view>
+        <picker class="fn-fr" bindchange="changeStaff" value="{{staffIndex}}" range="{{staffArray}}">
+          <view class="color-666">
+            <text wx:if="{{staffIndex == -1}}">全部</text>
+            <text wx:else>{{staffArray[staffIndex]}}</text>
+            <i class="iconfont ml10 icon-gengduo font-26 color-999"></i>
+          </view>
+        </picker>
+      </view>
+    </view>
+    <!-- 客户数据 / 订单数据 -->
+    <view class="mt40 bg-fff box-shadow-000-10-10 ulib-r10 overflowhidden">
+      <view class="fn-flex font-36 text-center">
+        <block wx:for='{{tab}}' wx:key='index'>
+          <view class="fn-flex-item pt20 pb20 {{ tabId == item.id?'':'bg-ffedeb'}}" data-id="{{item.id}}" bindtap="changeTab">
+            <view class="relative">{{item.title}}</view>
+          </view>
+        </block>
+      </view>
+      <view class="pl30 pb30" wx:if="{{tabId==1}}">
+        <view class="fn-flex fn-flex-wrap text-left">
+          <block wx:for='{{custom}}' wx:key='index'>
+            <view class="wp33 mt30 pr25">
+            <view class="relative pt15 pb15 pl75 bg-f6 ulib-r10 overflowhidden line-height-13">
+              <view class="absolute top-0 left-0 bottom-0 pl60 bg-999">
+                <i class="absolute box-center-middle iconfont font-30 color-fff {{item.icon}}"></i>
+              </view>
+              <view class="font-28 text-bold">{{item.value}}</view>
+              <view class="font-22 color-666">{{item.title}}</view>
+            </view>
+            </view>
+          </block>
+        </view>
+        <view class="mt30 mr30 inner30 bg-f6 ulib-r10">
+          <view class="font-32 text-bold">通话数据</view>
+          <view class="mt10 fn-flex text-center">
+            <view class="fn-flex-item">
+              <view class="font-22 color-666">通话总时长/min</view>
+              <view class="text-bold font-28 color-f9394d">{{xzstat.call_time}}</view>
+            </view>
+            <view class="fn-flex-item">
+              <view class="font-22 color-666">平均通话/min</view>
+              <view class="text-bold font-28 color-f9394d">{{xzstat.avg_time}}</view>
+            </view>
+            <view class="fn-flex-item">
+              <view class="font-22 color-666">未接通/次</view>
+              <view class="text-bold font-28 color-999">{{xzstat.unget_num}}</view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="pl30 pb30" wx:if="{{tabId==2}}">
+        <view class="fn-flex fn-flex-wrap text-left">
+          <block wx:for='{{order}}' wx:key='index'>
+            <view class="wp33 mt30 pr25">
+            <view class="relative pt15 pb15 pl75 bg-f6 ulib-r10 overflowhidden line-height-13">
+              <view class="absolute top-0 left-0 bottom-0 pl60 bg-999">
+                <i class="absolute box-center-middle iconfont font-30 color-fff {{item.icon}}"></i>
+              </view>
+              <view class="font-28 text-bold">{{item.value}}</view>
+              <view class="font-22 color-666">{{item.title}}</view>
+            </view>
+            </view>
+          </block>
+        </view>
+      </view>
+    </view>
+    <!-- 数据分析·客户 -->
+    <view class="{{tabId==1?'':'height-0'}}">
+      <view class="mt40 inner30 pt40 bg-fff box-shadow-000-10-10 ulib-r10" >
+        <view class="relative">
+          <view class="font-36">数据分析·客户</view>
+        </view>
+        <view class="relative height-400 z-index-0">
+        <view class="absolute wp100 height-400" wx:if="{{showBarChart}}">
+          <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecBar }}"></ec-canvas>
+        </view>
+        </view>
+      </view>
+    </view>
+    <!-- 数据分析·订单 -->
+    <view class="{{tabId==2?'':'height-0'}}">
+      <view class="mt40 inner30 pt40 bg-fff box-shadow-000-10-10 ulib-r10">
+        <view class="relative">
+          <view class="font-36">数据分析·订单</view>
+        </view>
+        <view class="relative height-400 z-index-0">
+        <view class="absolute wp100 height-400" wx:if="{{showLineChart}}">
+          <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecLine }}"></ec-canvas>
+        </view>
+        </view>
      </view>
    </view>
-  </view>
-  
-</view>
-<!-- <lcb-footer></lcb-footer> -->
-<lcb-channelTabBarNav currentIndex='1'></lcb-channelTabBarNav>

-<lcb-msg isShow="{{isShowTip}}">
-	<view slot="content">
-		<view class="inner40 pt50 pb50 line-height-18 font-26 color-666" style="width:520rpx;">
-      <view class="text-center">
-        <text wx:if="{{tipIndex==0}}">发生在时间周期内的\n  [客户建档] / [进店客户]</text>
-        <text wx:elif="{{tipIndex==1}}">发生在时间周期内的\n [企微添加好友] / [企微好友完善手机号码]</text>
-        <text wx:elif="{{tipIndex==2}}">发生在时间周期内的\n [下定订单] / [退款订单]</text>
-      </view>
-    </view>
-    <view class="bts-1-eb text-center font-32 color-666">
-      <view class="pt25 pb25 color-36afa2" bindtap="optShowTip">知道了</view>
-    </view>
-	</view>
-</lcb-msg>
+  </view>
+
+</view>
+
+<lcb-channelTabBarNav currentIndex='1'></lcb-channelTabBarNav>
@@ -1 +1,6 @@
-/* pages/storeData/index.wxss */
+.bg-ffedeb{background-color:#ffedeb;}
+.height-0{
+  position:relative;
+  height:0;
+  overflow:hidden;
+}
@@ -4,7 +4,6 @@ Page({
    info:'',
    submitFlag:false,
    isShowSuccess:false,
-    isShowProfile:true,//是否显示授权用户信息按钮
  },
  onLoad: function (options) {
    
@@ -14,35 +13,10 @@ Page({
      })
    }

-    this.getUserInfo()
-
-    //消息通讯 是否显示授权用户信息按钮
-    _.eventBus.on("isShowProfile", this, function(res){
-      this.setData({
-        isShowProfile:res,
-      })
-    })
-
    //this.getDistributionCash()

  },

-  //生命周期函数--监听页面卸载
-  onUnload: function () {
-    //卸载消息通讯 是否显示授权用户信息
-    _.eventBus.remove('isShowProfile',this);
-  },
-
-  //获取用户信息
-  getUserInfo(){
-    _.apiQuery.getUserInfo().then(res => {
-      this.setData({
-        userInfo: res
-      })
-    });
-  },
-  
-
  //提现信息
  getDistributionCash() {
    let params = {};
@@ -2,10 +2,9 @@
  <view class="inner30">
    <view class="font-22">提现到</view>
    <view class="mt20 relative">
-      <image class='absolute left-0 img-70x70 ulib-r10 overflowhidden' mode="aspectFill" src="{{userInfo.headimg||imgUrl+'common/default-head.jpg'}}" lazy-load="{{true}}"></image>
-        <view class="absolute top-0 bottom-0 left-0 right-0 opacity-0 mt20 mr150 z-index-4">
-          <lcb-auth type="userinfo" isShowProfile="{{isShowProfile}}" bind:onSuccess="getUserInfo"></lcb-auth>
-        </view>
+      <view class="absolute left-0 img-70x70 ulib-r10 overflowhidden">
+        <open-data type="userAvatarUrl"></open-data>
+      </view>
      <view class="pl90">
        <view class="font-28">
          <open-data type="userNickName"></open-data>的微信钱包(**** 769)
@@ -44,8 +44,8 @@
      <view class="relative">
 				<button class="btn-concat">去添加</button>
 				<view class="absolute left-0 top-0 right-0 bottom-0 opacity-0 text-center overflowhidden">
-					<QYWXcontact buttonText="{{4}}" class="pt40 pb40" bind:completemessage="completemessage" styleType='1' plugid='9280d952ecab1136d907a34b6799df97' />
-					<QYWXcontact buttonText="{{4}}" class="pt40 pb40" bind:completemessage="completemessage" styleType='1' plugid='9280d952ecab1136d907a34b6799df97' />
+					<QYWXcontact buttonText="{{4}}" class="pt40 pb40" bind:completemessage="completemessage" styleType='3' plugid='877ffe64ccc36a5f308252eadc3066df' />
+					<QYWXcontact buttonText="{{4}}" class="pt40 pb40" bind:completemessage="completemessage" styleType='3' plugid='877ffe64ccc36a5f308252eadc3066df' />
 				</view>
 			</view>
 		</view>
@@ -6,7 +6,7 @@
        
      </swiper-item>
    </swiper>
-    <view class="absolute left-0 right-0 bottom-0 mb30 text-center" style='height:45rpx' wx:if="{{info.lists.length>1&&info.lists.length<16}}">
+    <view class="absolute left-0 right-0 bottom-0 mb30 text-center" style='height:45rpx' wx:if="{{info.lists.length > 1}}">
      <block wx:for-items="{{info.lists}}" wx:for-index="j" wx:key='j'>
        <view class="inline-block indicator-pin {{banneractive==j?'active':''}}"></view>
      </block>
@@ -118,9 +118,7 @@ Page({
        })

        //上传图片-保存店铺海报 - 作废
-        // wx.showLoading({
-        //   title: '上传中',
-        // })
+        // wx.showLoading();
        // wx.uploadFile({
        //   url:_.config.api.upImg,
        //   filePath:res.tempFilePaths[0],
@@ -29,7 +29,6 @@ function pieChart(canvas, width, height, dpr) {

 Page({
  data: {
-    isShowMain:false,//显示页面内容
    imgUrl:_.config.imgUrl,
    userCal:'',
    deallist:'',
@@ -40,32 +39,7 @@ Page({
    ecPie:{},
    isShowNotice:false,//是否显示通知
    stopNotice:false,//是否不再显示通知
-    isShowReport:false,//是否显示调拨盘点弹框
-    isShowProfile:true,//是否显示授权用户信息按钮
-    isShowGoods:false,//是否显示库存预警
-    banneractive: 0,
-    banneractive2: 0,
-    banneractive3: 0,
-    remindTab:[],//调拨盘点入口
-    remindMsg:[],//调拨盘点弹框
-    levelStIndex:0,
-    levelSt:[],//客户等级
-    isResetbiz:false,//是否重置过BIZID
-    isShowVersionInfo:false,//是否显示版本更新
-    versionInfo:{
-      number:'V3.0.51',
-      list:[
-        // '',
-        // '',
-        // '',
-        // '',
-        // '',
-        // '',
-
-        // '修改【订单详情】页面样式及交互；',
-        // '修改【保单上传】的相应内容，上传后需补充相应保单信息。',
-      ],
-    },
+    isShowReport:false,
  },

  onLoad(options) {
@@ -76,63 +50,22 @@ Page({
    }

    if(this.data.biz_id){
-      let that = this
-      setTimeout(function () {
-        that.putAppUserResetbiz()
-      }, 500)
+      this.putAppUserResetbiz()
    }else{
-      this.setData({
-        isResetbiz:true,
-      });
      this.getUserInfo()
    }
-
-    //this.getAppStatisticsHorder()
-
-    //消息通讯 是否显示授权用户信息按钮
-    _.eventBus.on("isShowProfile", this, function(res){
-      this.setData({
-        isShowProfile:res,
-      })
-    })
-
-    //判断是否显示版本更新内容
-    if(this.data.versionInfo.list.length>0&&app.getStorageByKey("appversion")!=this.data.versionInfo.number){
-      this.setData({
-        isShowVersionInfo:true,
-      })
-    }
+    
+    this.getAppStatisticsHcust()
+    this.getAppStatisticsHorder()

  },

  onShow: function () {
-
+    this.getAppUserCal()
    this.getHoursTip()
-
-    //确保bizID重置完成再执行
-    if(this.data.isResetbiz){
-      this.setData({
-        remindTab:[],
-        remindMsg:[],
-        isShowReport:false,//是否显示调拨盘点弹框
-        isShowGoods:false,
-      });
-      this.getAppUserCal()
-      this.getAppTransferRemind()
-      this.getAppInventoryRemind()
-      this.getAppGoodsRemind()
-      this.getAppStatisticsHcust()
-    }
-
+    this.getAppTransferRemind()
  },

-  //生命周期函数--监听页面卸载
-  onUnload: function () {
-    //卸载消息通讯 是否显示授权用户信息
-    _.eventBus.remove('isShowProfile',this);
-  },
-  
-
  //候取时间
  getHoursTip(){
    let hoursTip = '';
@@ -154,15 +87,8 @@ Page({
    let params = {};
    params['biz_id'] = this.data.biz_id;
    _.apiQuery.putAppUserResetbiz(params).then(res => {
-      this.setData({
-        isResetbiz:true,
-      });
      this.getUserInfo()
      this.getAppUserCal()
-      this.getAppTransferRemind()
-      this.getAppInventoryRemind()
-      this.getAppGoodsRemind()
-      this.getAppStatisticsHcust()
    });
  },

@@ -170,150 +96,21 @@ Page({
  getAppTransferRemind(){
    _.apiQuery.getAppTransferRemind().then(res => {
      this.setData({
-        diaoboNum:res.data.total,
+        allotNum: res.data.total,
      })
      if(res.data.total>0){
-        let remindTab = this.data.remindTab
-        remindTab.push({
-          title:'车辆调拨',
-          content:'您有新的车辆调拨，需要您进行确认操作。',
-          img:'https://qs.haodian.cn/wechat_app/lichebao/allot/car.gif?v=220224',
-          url:'/pages/allot/list/index',
-          allotNum:res.data.total,
-        })
-        let remindMsg = this.data.remindMsg
-        remindMsg.push({
-          title:'调拨提醒',
-          content:'您有新的车辆调拨，需要您进行确认操作。',
-          img:'https://qs.haodian.cn/wechat_app/lichebao/allot/car.gif?v=220224',
-          btn:{
-            title:'前往操作',
-            url:'/pages/allot/list/index',
-          },
-        })
        this.setData({
-          remindTab,
-          remindMsg,
          isShowReport:true,
          isShowNotice:false,
-          isShowGoods:false,
-        })
-      }
-    });
-  },
-
-  //盘点提醒
-  getAppInventoryRemind(){
-    _.apiQuery.getAppInventoryRemind().then(res => {
-      this.setData({
-        pandianNum:res.data.total,
-      })
-      if(res.data.total>0){
-        let remindTab = this.data.remindTab
-        remindTab.push({
-          title:'车辆盘点',
-          content:'您有新的车辆调拨，需要您进行确认操作。',
-          img:'https://qs.haodian.cn/wechat_app/lichebao/inventory/icon.png',
-          url:'/pages/inventory/list/index',
-          allotNum:res.data.total,
-        })
-        let remindMsg = this.data.remindMsg
-        remindMsg.push({
-          title:'盘点提醒',
-          content:'您有新的车辆盘点，需要您进行确认操作。',
-          img:'https://qs.haodian.cn/wechat_app/lichebao/inventory/animation.gif',
-          btn:{
-            title:'前往操作',
-            url:'/pages/inventory/list/index',
-          },
        })
+      }else{
        this.setData({
-          remindTab,
-          remindMsg,
-          isShowReport:true,
-          isShowNotice:false,
-          isShowGoods:false,
+          isShowReport:false,
        })
      }
    });
  },

-  //库存提醒/预警
-  getAppGoodsRemind(){
-    _.apiQuery.getAppGoodsRemind().then(res => {
-      this.setData({
-        inventory:res.data.inventory,
-        warning:res.data.warning,
-      })
-      if(res.data.warning.list&&res.data.warning.list.length>0){
-        if(!app.getStorageByKey("showGoods")||app.getStorageByKey("showGoods").data!=new Date().getDate()){
-          //清除
-          wx.removeStorageSync('showGoods')
-          this.setData({
-            isShowGoods:true,
-          })
-          let showGoods = {}
-          if(this.data.biz_id){
-            showGoods.data = new Date().getDate()
-            showGoods.list =[{
-              biz_id:this.data.biz_id,
-              num:1,
-            }]
-          }else{
-            showGoods.data = new Date().getDate()
-            showGoods.list =[{
-              biz_id:'b1',
-              num:1,
-            }]
-          }
-          app.setStorage('showGoods',showGoods)
-        }else{
-          let showGoods = app.getStorageByKey("showGoods")
-          let index = -1
-          if(this.data.biz_id){
-            showGoods.list.forEach((item,i) => {
-              if(item.biz_id == this.data.biz_id){
-                index = i
-                item.num = item.num + 1
-              }
-            })
-          }else{
-            showGoods.list.forEach((item,i) => {
-              if(item.biz_id == 'b1'){
-                index = i
-                item.num = item.num + 1
-              }
-            })
-          }
-          if(index > -1){
-            if(showGoods.list[index].num<4){
-              this.setData({
-                isShowGoods:true,
-              })
-              app.setStorage('showGoods',showGoods)
-            }
-          }else{
-            this.setData({
-              isShowGoods:true,
-            })
-            if(this.data.biz_id){
-              showGoods.list.push({
-                biz_id:this.data.biz_id,
-                num:1,
-              })
-            }else{
-              showGoods.list.push({
-                biz_id:'b1',
-                num:1,
-              })
-            }
-            app.setStorage('showGoods',showGoods)
-          }
-        }
-      }
-    });
-  },
-
  //获取用户信息
  getUserInfo(){
    _.apiQuery.getUserInfo().then(res => {
@@ -331,14 +128,16 @@ Page({
    }
    _.apiQuery.getAppUserCal(params).then(res => {
      this.setData({
-        isShowMain:true,
        userCal:res.data,
-        levelSt:res.data.levelSt,
      })

      if(res.data.deallist.length>0){
        let deallist = res.data.deallist
-        if(res.data.deallist.length%2==1){
+        if(res.data.deallist.length%3==1){
+          deallist.push({})
+          deallist.push({})
+        }
+        if(res.data.deallist.length%3==2){
          deallist.push({})
        }
        this.setData({
@@ -457,24 +256,18 @@ Page({
  //公众号关注组件
  officialaccount(e){
    if(e.detail.status == 0&&!app.getStorageByKey("stopNotice")&&!this.data.isShowReport){
-      // this.setData({
-      //   isShowNotice:true,
-      // })
+      this.setData({
+        isShowNotice:true,
+      })
    }
  },

-  //显示隐藏调拨盘点弹窗
+  //显示短信弹框
  optShowReport(e){
    this.setData({
      isShowReport:!this.data.isShowReport,
    })
  },
-  //显示隐藏库存预警弹窗
-  optShowGoods(e){
-    this.setData({
-      isShowGoods:!this.data.isShowGoods,
-    })
-  },

  //开发中
  development(){
@@ -485,54 +278,12 @@ Page({
    })
  },

-  //调拨盘点轮播点
-  bannerChange: function (e) {
-    this.setData({
-      banneractive:e.detail.current,
-    });
-  },
-  //banner轮播点
-  bannerChange2: function (e) {
-    this.setData({
-      banneractive2:e.detail.current,
-    });
-  },
-  //库存预警轮播点
-  bannerChange3: function (e) {
-    this.setData({
-      banneractive3:e.detail.current,
-    });
-  },
-
-  //关闭版本提示
-  closeVersionInfo(){
-    this.setData({
-      isShowVersionInfo:false,
-    })
-    app.setStorage('appversion',this.data.versionInfo.number)
-  },
-
-  //切换tab
-  changeTab(e){
-    this.setData({
-      levelStIndex:e.currentTarget.dataset.index,
-    })
-  },
-
  //页面相关事件处理函数--监听用户下拉动作
  onPullDownRefresh: function () {
-    this.setData({
-      remindTab:[],
-      remindMsg:[],
-      isShowReport:false,//是否显示调拨盘点弹框
-      isShowGoods:false,
-    });
    this.getAppUserCal()
    this.getAppStatisticsHcust()
-    //this.getAppStatisticsHorder()
+    this.getAppStatisticsHorder()
    this.getAppTransferRemind()
-    this.getAppInventoryRemind()
-    this.getAppGoodsRemind()
  },

 })
@@ -1,10 +1,9 @@
-<view class="container" wx:if="{{isShowMain}}">
+<view class="container">
  <view class="inner30 img-top-cover" style="background-image:url({{imgUrl}}index/theme.png);">
    <view style="height:200rpx;">
      <view class="relative pt30 pb30 pl110 pr10">
-        <image class='absolute left-0 box-middle mr10 img-90x90 ulib-r750 overflowhidden' mode="aspectFill" src="{{userInfo.headimg||imgUrl+'common/default-head.jpg'}}" lazy-load="{{true}}"></image>
-        <view class="absolute top-0 bottom-0 left-0 right-0 opacity-0 mt20 mr150 z-index-4" wx:if="{{isResetbiz}}">
-          <lcb-auth type="userinfo" isShowProfile="{{isShowProfile}}" bind:onSuccess="getUserInfo"></lcb-auth>
+        <view class="absolute left-0 box-middle mr10 img-90x90 ulib-r750 overflowhidden">
+          <open-data type="userAvatarUrl"></open-data>
        </view>
        <view>
          <view class="font-22 color-fff">Hi~ {{hoursTip}}欢迎回到狸车宝！</view>
@@ -15,135 +14,78 @@
        </view>
      </view>
    </view>
-    <view class="mb30 pt40 pb40 bg-fff box-shadow-000-10-10 ulib-r10 text-center">
-      <view class="pl20 pr20 fn-flex font-22 color-666">
-        <view class="relative fn-flex-item" bindtap="pushLink" data-url="/pages/inventory/list/index">
-          <view class="absolute peg-tip box-center ml30 bg-f9394d bds-2-fff img-24x24 text-center font-18 color-fff ulib-r750 z-index-1" wx:if="{{pandianNum}}"><text class="absolute box-center-middle">{{pandianNum}}</text></view>
-          <image class='img-60x60' mode="aspectFill" src='{{imgUrl}}index/icon2-tab-1.png' lazy-load="{{true}}"></image>
-          <view>车辆盘点</view>
-        </view>
-        <view class="relative fn-flex-item" bindtap="pushLink" data-url="/pages/storeData/index" wx:if="{{userInfo.group_id>1}}">
-          <image class='img-60x60' mode="aspectFill" src='{{imgUrl}}index/icon-tab-2.png' lazy-load="{{true}}"></image>
-          <view>数据分析</view>
-        </view>
-        <view class="relative fn-flex-item" bindtap="pushLink" data-url="/pages/allot/list/index">
-          <view class="absolute peg-tip box-center ml30 bg-f9394d bds-2-fff img-24x24 text-center font-18 color-fff ulib-r750 z-index-1" wx:if="{{diaoboNum}}"><text class="absolute box-center-middle">{{diaoboNum}}</text></view>
-          <image class='img-60x60' mode="aspectFill" src='{{imgUrl}}index/icon2-tab-2.png' lazy-load="{{true}}"></image>
-          <view>车辆调拨</view>
-        </view>
-        <view class="relative fn-flex-item" bindtap="pushLink" data-url="/pages/inventory/warning/index">
-          <view class="absolute peg-tip box-center ml30 bg-f9394d bds-2-fff img-24x24 text-center font-18 color-fff ulib-r750 z-index-1" wx:if="{{inventory.value}}"><text class="absolute box-center-middle">{{inventory.value}}</text></view>
-          <image class='img-60x60' mode="aspectFill" src='{{imgUrl}}index/icon2-tab-3.png' lazy-load="{{true}}"></image>
-          <view style="color:{{inventory.color}};">{{inventory.title}}</view>
-        </view>
+    <view class="mb30 pt40 pb40 pl20 pr20 bg-fff box-shadow-000-10-10 ulib-r10 fn-flex text-center font-22 color-666" wx:if="{{userInfo.group_id == 4}}">
+      <view class="fn-flex-item" bindtap="pushLink" data-url="/pages/storeInfo/index">
+        <image class='img-50x50' mode="aspectFill" src='{{imgUrl}}index/icon-tab-1.png' lazy-load="{{true}}"></image>
+        <view>店铺概况</view>
+      </view>
+      <view class="fn-flex-item" bindtap="development">
+        <image class='img-50x50' mode="aspectFill" src='{{imgUrl}}index/icon-tab-2.png' lazy-load="{{true}}"></image>
+        <view>当月表现</view>
+      </view>
+      <view class="fn-flex-item" bindtap="development">
+        <image class='img-50x50' mode="aspectFill" src='{{imgUrl}}index/icon-tab-3.png' lazy-load="{{true}}"></image>
+        <view>访店SOP</view>
+      </view>
+      <view class="fn-flex-item" bindtap="development">
+        <image class='img-50x50' mode="aspectFill" src='{{imgUrl}}index/icon-tab-4.png' lazy-load="{{true}}"></image>
+        <view>数据模型</view>
      </view>
    </view>
-    <!-- 数据看板 -->
-    <view class="bg-fff mb30 inner30 box-shadow-000-10-10 ulib-r10">
-      <view class="font-36">数据看板</view>
-      <view class="fn-flex fn-flex-wrap pt20 pb10 text-center">
-        <block wx:for="{{userCal.statistics}}" wx:key='index'>
-          <view class="wp33 relative pt20 pb20 {{index>2?'bts-1-eb':''}} {{index%3==2?'':'brs-1-eb'}}" bindtap="pushLink" data-url="{{item.today.url}}">
-            <view class="text-bold"><text class="font-36">{{item.today.value}}</text><text class="font-28 color-666">/{{item.month.value}}</text></view>
-            <view class="font-22"><text>{{item.today.title}}</text><text class="color-666">/{{item.month.title}}</text></view>
-          </view>
-        </block>
-      </view>
-    </view>
-    <!--客户代办事项-->
-    <view class="bg-fff mb30 box-shadow-000-10-10 ulib-r10">
-      <!-- <view class="bg-ffedeb ulib-rt10" style="height:140rpx;" wx:if="{{remindTab.length > 0}}">
-        <view class="relative pt30 pl30 pr30">
-          <swiper class='wp100' style="height:90rpx;" autoplay circular bindchange="bannerChange2">
-            <swiper-item class="wp100 relative pl110 pr110" wx:for="{{remindTab}}" wx:key="index" bindtap="pushLink" data-url="{{item.url}}">
-              <image class='block absolute left-0 box-middle img-90x90 ulib-r750 z-index-1' mode="aspectFill" src='{{item.img}}' lazy-load="{{true}}"></image>
-              <view class="color-f9394d">
-                <view class="font-32">{{item.title}}</view>
-                <view class="mt10 font-20">{{item.content}}</view>
-              </view>
-              <view class="absolute right-0 box-middle">
-                <text class="inline-block text-middle pt5 pb5 pl10 pr10 bg-f9394d font-22 color-fff ulib-r10">{{item.allotNum}}</text>
-                <text class="ml5 text-middle iconfont icon-gengduo font-32 color-f9394d"></text>
-              </view>
-            </swiper-item>
-          </swiper>
-          <view class="absolute left-0 right-0 text-center" style='bottom:-20rpx;height:20rpx' wx:if="{{remindTab.length>1&&remindTab.length<16}}">
-            <block wx:for-items="{{remindTab}}" wx:for-index="j" wx:key='j'>
-              <view class="inline-block indicator-pin2 {{banneractive2==j?'active':''}}"></view>
-            </block>
+    <!--客户代办事项 订单代办事项 -->
+    <view class="bg-fff box-shadow-000-10-10 ulib-r10">
+      <view class="bg-ffedeb ulib-rt10" style="height:140rpx;" bindtap="pushLink" data-url="/pages/allot/list/index" wx:if="{{allotNum>0}}">
+        <view class="pt30 pl30 pr30">
+          <view class="relative pl110 pr110">
+            <image class='block absolute left-0 box-middle img-90x90 ulib-r750 z-index-1' mode="aspectFill" src='{{imgUrl}}index/diaobo-icon.png' lazy-load="{{true}}"></image>
+            <view class="color-f9394d">
+              <view class="font-32">车辆调拨</view>
+              <view class="mt10 font-20">您有新的车辆调拨，需要您进行确认操作</view>
+            </view>
+            <view class="absolute right-0 box-middle">
+              <text class="inline-block text-middle pt5 pb5 pl10 pr10 bg-f9394d font-22 color-fff ulib-r10">{{allotNum}}</text>
+              <text class="ml5 text-middle iconfont icon-gengduo font-32 color-f9394d"></text>
+            </view>
          </view>
        </view>
-      </view> -->
-      <view class="inner30">
-
-        <!-- <view class="relative pt20 pb20 pl30 pr200 ulib-r750 font-24 color-fff" style="background-image:linear-gradient(45deg, {{inventory.color1}}, {{inventory.color2}});" bindtap="pushLink" data-url="/pages/inventory/warning/index">
-          <view class="text-left">{{inventory.title}}</view>
-          <view class="absolute right-0 box-middle mr25 mb10">
-            <text class="text-middle">{{inventory.value}}</text>
-            <i class="iconfont icon-gengduo ml5 text-middle"></i>
-          </view>
-        </view> -->
-
-        <view class="font-36">客户跟进</view>
+      </view>
+      <view class="inner30 pt40">
+        <view class="font-36">客户代办事项</view>
        <view class="fn-flex pt20 pb20 color-fff">
-          <view class="fn-flex-item relative mr15 pt25 pb25 pl110 bg-1c89fd-8058fe ulib-r10" bindtap="pushLink" data-url="{{userCal.wl_count.url}}" >
+          <view class="fn-flex-item relative mr15 pt25 pb25 pl110 bg-1c89fd-8058fe ulib-r10" bindtap="pushLink" data-url="/pages/customer/filterList/index?iscall=0&title=未联系潜客" >
            <i class="absolute left-0 box-middle ml35 iconfont icon-qianke font-60"></i>
-            <view class="text-left">
-              <view class="font-40">{{userCal.wl_count.num}}</view>
-              <view class="font-22">{{userCal.wl_count.title}}</view>
+            <view>
+              <view class="font-40">{{userCal.wl_count}}</view>
+              <view class="font-22">未联系潜客(人)</view>
            </view>
          </view>
-          <view class="fn-flex-item relative ml15 pt25 pb25 pl110 bg-fe606c-ff9026 ulib-r10" bindtap="pushLink" data-url="{{userCal.gz_count.url}}">
+          <view class="fn-flex-item relative ml15 pt25 pb25 pl110 bg-fe606c-ff9026 ulib-r10" bindtap="pushLink" data-url="/pages/customer/filterList/index?istop=1&title=特别关注客户">
            <i class="absolute left-0 box-middle ml35 iconfont icon-guanzhu font-60"></i>
-            <view class="text-left">
-              <view class="font-40">{{userCal.gz_count.num}}</view>
-              <view class="font-22">{{userCal.gz_count.title}}</view>
+            <view>
+              <view class="font-40">{{userCal.gz_count}}</view>
+              <view class="font-22">特别关注客户(人)</view>
            </view>
          </view>
        </view>
-        <view class="relative mt10 m140 bg-2f3346-1a1c26 ulib-r10">
-          <view class="inner30" wx:if="{{levelSt.length>0}}">
-            <view class="relative bg-999 inner6 ulib-r750 text-center font-28 color-575b6a fn-flex">
-              <block wx:for="{{levelSt}}" wx:key='index'>
-                <view class="relative fn-flex-item pt5 pb5 z-index-1 ulib-r750" bindtap="changeTab" data-index="{{index}}">{{item.title}}</view>
-              </block>
-              <view class="glider glider-{{levelStIndex}}"></view>
-            </view>
-            <view class="fn-flex pt20 text-center color-fff">
-              <block wx:for="{{levelSt[levelStIndex].list}}" wx:key='index'>
-                <view class="fn-flex-item" bindtap="pushLink" data-url="{{item.url}}">
-                  <view class="font-32 text-bold">{{item.num}}</view>
-                  <view class="font-22">{{item.title}}</view>
-                </view>
-              </block>
-            </view>
-          </view>
-          <view class="color-fff ulib-r10" wx:if="{{userCal.customer_op_list.length>0}}">
-            <block wx:for="{{userCal.customer_op_list}}" wx:key='index'>
-              <view class="relative pt20 pb30 pl30 pr30 bts-1-474a65" bindtap="pushLink" data-url="{{item.page}}">
-                <view>
-                  <i class="iconfont {{item.icon}} text-middle font-30"></i>
-                  <text class="ml10 font-22 text-middle">{{item.title}}</text>
-                </view>
-                <view class="absolute right-0 box-middle mr25 mb10 font-40">
-                  <text class="text-middle">{{item.total}}</text>
-                  <i class="iconfont icon-gengduo ml5 text-middle font-26"></i>
-                </view>
+        <view class="relative mt10 mb40 bg-2f3346-1a1c26 color-fff ulib-r10" wx:if="{{userCal.customer_op_list.length>0}}" >
+          <block wx:for="{{userCal.customer_op_list}}" wx:key='index'>
+            <view class="relative pt20 pb30 pl30 pr30 bbs-1-474a65 last-b-none" bindtap="pushLink" data-url="{{item.page}}">
+              <view>
+                <i class="iconfont {{item.icon}} text-middle font-30"></i>
+                <text class="ml10 font-22 text-middle">{{item.title}}</text>
              </view>
-            </block>
-          </view>
+              <view class="absolute right-0 box-middle mr25 mb10 font-40">
+                <text class="text-middle">{{item.total}}</text>
+                <i class="iconfont icon-gengduo ml5 text-middle font-26"></i>
+              </view>
+            </view>
+          </block>
        </view>
-      </view>
-    </view>
-
-    <!--订单跟进 -->
-    <view class="bg-fff mb30 box-shadow-000-10-10 ulib-r10">
-      <view class="inner30">
-        <view class="font-36">订单跟进</view>
-        <view class="fn-flex fn-flex-wrap pt20 pb10">
+        <view class="mt20 font-36">订单代办事项</view>
+        <view class="fn-flex fn-flex-wrap pt30 pb10">
          <block wx:for="{{deallist}}" wx:key='index'>
-            <view class="wp50 relative pl120 pt20 pb20 {{index>1?'bts-1-eb':''}} {{index%2==1?'':'brs-1-eb'}}" bindtap="pushLink" data-url="{{item.page}}">
-              <i class="absolute left-0 box-middle ml60 iconfont font-50 {{item.icon}}"></i>
+            <view class="wp33 relative pl80 pt20 pb20 {{index>2?'bts-1-eb':''}} {{index%3==2?'':'brs-1-eb'}}" bindtap="pushLink" data-url="{{item.page}}">
+              <i class="absolute left-0 box-middle ml20 iconfont font-50 {{item.icon}}"></i>
              <view>
                <view class="font-40">{{item.total}}</view>
                <view class="font-22 color-666">{{item.title}}</view>
@@ -155,7 +97,7 @@
    </view>

    <!-- 客户数据 -->
-    <!-- <view class="inner30 pt40 bg-fff box-shadow-000-10-10 ulib-r10">
+    <view class="mt40 inner30 pt40 bg-fff box-shadow-000-10-10 ulib-r10">
      <view class="relative">
        <view class="font-36">客户数据</view>
        <view class="absolute right-0 box-middle pt10 pb10 pl20 pr20 bg-ffedeb color-ff4a3a ulib-r10 font-22">累计线索总量 {{cust_total}} 条</view>
@@ -181,9 +123,9 @@
        <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecPie }}"></ec-canvas>
      </view>
      </view>
-    </view> -->
+    </view>
    <!-- 订单数据 -->
-    <!-- <view class="mt40 inner30 pt40 bg-fff box-shadow-000-10-10 ulib-r10">
+    <view class="mt40 inner30 pt40 bg-fff box-shadow-000-10-10 ulib-r10">
      <view class="relative">
        <view class="font-36">订单数据</view>
        <view class="absolute right-0 box-middle pt10 pb10 pl20 pr20 bg-ffedeb color-ff4a3a ulib-r10 font-22">累计订单总量 {{order_total}} 条</view>
@@ -193,7 +135,7 @@
        <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecBar }}"></ec-canvas>
      </view>
      </view>
-    </view> -->
+    </view>

  </view>

@@ -203,7 +145,7 @@
 <lcb-shopTabBarNav currentIndex='0'></lcb-shopTabBarNav>

 <!-- 客服提示 -->
-<lcb-msg isShow="{{!isShowVersionInfo&&isShowNotice}}" isCustomTabBar="{{true}}">
+<lcb-msg isShow="{{isShowNotice}}">
 	<view slot="content">
    <view class="mt40 text-center relative overflowhidden" style="height:100px;">
      <!-- <image class='img-w-280' show-menu-by-longpress='true' lazy-load="{{true}}" mode="widthFix" src="https://qs.haodian.cn/wechat_app/lichebao/index/jrKF-code2.jpg"></image> -->
@@ -223,71 +165,19 @@
 	</view>
 </lcb-msg>

-<!-- 调拨提醒 盘点提醒 -->
-<lcb-msg isShow="{{!isShowVersionInfo&&isShowReport}}" isCustomTabBar="{{true}}">
+<!-- 调拨提醒 -->
+<lcb-msg isShow="{{isShowReport}}">
 	<view slot="content">
-    <swiper class='wp100' style="height:550rpx;" autoplay circular bindchange="bannerChange">
-      <swiper-item class="relative" wx:for="{{remindMsg}}" wx:key="index">
-        <view class="pt40 pl40 pr40">
-          <view class="font-36 text-center">{{item.title}}</view>
-          <view class="mt10 font-22 text-center color-999">{{item.content}}</view>
-        </view>
-        <view class="mt20 pl40 pr40 pb40">
-          <image class='wp100 ulib-r10' src='{{item.img}}' mode='widthFix'></image>
-        </view>
-        <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
-          <button bindtap="optShowReport" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
-          <button bindtap="pushLink" data-url="{{item.btn.url}}" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">{{item.btn.title}}</button>
-        </view>
-      </swiper-item>
-    </swiper>
-    <view class="absolute left-0 right-0 bottom-0 pb20 text-center" style='height:30rpx' wx:if="{{remindMsg.length>1&&remindMsg.length<16}}">
-      <block wx:for-items="{{remindMsg}}" wx:for-index="j" wx:key='j'>
-        <view class="inline-block indicator-pin {{banneractive==j?'active':''}}"></view>
-      </block>
+		<view class="pt40 pl40 pr40">
+      <view class="font-36 text-center">调拨提醒</view>
+      <view class="mt10 font-22 text-center color-999">您有新的车辆调拨，需要您进行确认操作。</view>
    </view>
-	</view>
-</lcb-msg>
-
-<!-- 库存提醒 -->
-<lcb-msg isShow="{{!isShowVersionInfo&&!isShowReport&&isShowGoods}}" isCustomTabBar="{{true}}">
-	<view slot="content" class="inner40" style="width:550rpx;">
-    <view class="text-center font-36">{{warning.title}}</view>
-    <view class="mt10 text-center font-22 color-f9394d">{{warning.note}}</view>
-    <view class="relative">
-      <swiper class='wp100' style="height:420rpx;" autoplay circular bindchange="bannerChange3">
-        <swiper-item class="relative" wx:for="{{warning.list}}" wx:key="index">
-          <view class="mt40 fn-clear">
-            <view class="fn-fl">
-              <view class="font-36">{{item.title}}</view>
-              <view class="mt10 font-22 color-666">{{item.vin}}</view>
-            </view>
-            <view class="fn-fr pt5 pb5 pl20 pr20 bg-f9394d font-22 color-fff ulib-r750">{{item.days}}</view>
-          </view>
-          <view class="mt10 pb10">
-            <image class='wp100' src='{{item.img}}' mode='widthFix'></image>
-          </view>
-        </swiper-item>
-      </swiper>
-      <view class="absolute left-0 right-0 bottom-0 pb20 text-center" style='height:30rpx' wx:if="{{warning.list.length>1&&warning.list.length<16}}">
-        <block wx:for-items="{{warning.list}}" wx:for-index="j" wx:key='j'>
-          <view class="inline-block indicator-pin {{banneractive3==j?'active':''}}"></view>
-        </block>
-      </view>
+    <view class="mt20 pl40 pr40 pb40">
+      <image class='wp100 ulib-r10' src='{{imgUrl}}allot/car.gif' mode='widthFix'></image>
    </view>
-    <view class="fn-flex pl60 pr60 pb20 text-center font-32 color-666">
-      <button bindtap="optShowGoods" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
-      <button bindtap="pushLink" data-url="/pages/inventory/warning/index" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">点击查看</button>
+    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
+      <button bindtap="optShowReport" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
+      <button bindtap="pushLink" data-url="/pages/allot/list/index" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">前往操作</button>
    </view>
 	</view>
-</lcb-msg>
-
-<!-- 更新新版本提醒 -->
-<lcb-msg isShow="{{isShowVersionInfo}}" isBottomOpt="{{true}}" closeWord="我知道了" bind:closeevent="closeVersionInfo" isCustomTabBar="{{true}}">
-	<view slot="content" class="inner40 text-center" style="width:550rpx;">
-    <view class="font-36">狸车宝 {{versionInfo.number}} 更新说明</view>
-    <view class="inline-block mt10 font-28 color-666">
-      <view class="mt15 text-left" wx:for-items="{{versionInfo.list}}" wx:key='index'>{{index+1}}、{{item}}</view>
-    </view>  
-	</view>
 </lcb-msg>
@@ -1,18 +1,4 @@
 .bg-1c89fd-8058fe{background-image:linear-gradient(45deg, #1c89fd, #8058fe);}
 .bg-fe606c-ff9026{background-image:linear-gradient(45deg, #fe606c, #ff9026); text-align: center;}
 .bg-ffedeb{background-color:#ffedeb;}
-.color-ff4a3a{color:#ff4a3a;}
-
-.indicator-pin{width:20rpx;height:6rpx;display:inline-block;background-color:#ddd;cursor:pointer;transition:all .3s ease-in-out;-ms-transition:all .3s ease-in-out;-moz-transition:all .3s ease-in-out;-webkit-transition:all .3s ease-in-out;-o-transition:all .3s ease-in-out;margin:0 6rpx;vertical-align:top}
-.indicator-pin.active{background-color:#36afa2;}
-
-.indicator-pin2{width:20rpx;height:6rpx;display:inline-block;background-color:#fad6c9;cursor:pointer;transition:all .3s ease-in-out;-ms-transition:all .3s ease-in-out;-moz-transition:all .3s ease-in-out;-webkit-transition:all .3s ease-in-out;-o-transition:all .3s ease-in-out;margin:0 6rpx;vertical-align:top}
-.indicator-pin2.active{background-color:#f9394d;}
-
-.peg-tip{top:-7rpx;}
-
-.glider{position:absolute;width:24.5%;height:46rpx;background:#fff;z-index:0;transition:0.25s ease-out;border-radius:750rpx;}
-.glider-0{transform:translatex(0%);}
-.glider-1{transform:translatex(99%);}
-.glider-2{transform:translatex(199%);}
-.glider-3{transform:translatex(300%);}
+.color-ff4a3a{color:#ff4a3a;}
@@ -1,189 +0,0 @@
-import _ from '../../../commons/js/commons'
-const app = getApp()
-Page({
-  data: {
-    imgUrl:_.config.imgUrl,
-    isShowTransfer:false,//是否显示确认弹窗
-    car_img:[],//请上传运输单
-    id:'',//查看id
-    mileage:'',//里程数
-    note:'',//备注
-  },
-  onLoad: function (options) {
-    for (let key in options) {
-      this.setData({
-        [key]: options[key]
-      })
-    }
-
-    this.getAppInventory()
-    
-  },
-  onShow: function () {
-
-  },
-
-  //获取订单详情
-  getAppInventory(){
-    let params = {};
-    if(this.data.id != ''){
-      params['id'] = this.data.id;
-    }
-    _.apiQuery.getAppInventory(params).then(res=>{
-      this.setData({
-        info:res.data,
-        car_img:res.data.car_img,
-        mileage:res.data.mileage?res.data.mileage:'',
-        note:res.data.note?res.data.note:'',
-      })
-
-      wx.stopPullDownRefresh()
-
-    })
-  },
-
-  //选择图片
-  chooseImg(e) {
-    let that = this
-    wx.chooseImage({
-      count: 1,
-      sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-      sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-      success(res1) {
-        wx.showLoading({
-          title: '图片上传中',
-        })
-        wx.uploadFile({
-          url: _.config.api.upImg,
-          filePath: res1.tempFilePaths[0],
-          name: 'img',
-          formData: {
-            'app': 'liche'
-          },
-          success(res) {
-            setTimeout(function () {
-              wx.hideLoading()
-            }, 500);
-            let imgdata = JSON.parse(res.data)
-            that.setData({
-              ['car_img['+e.currentTarget.dataset.index+'].src']:imgdata.data.full_url,
-              ['car_img['+e.currentTarget.dataset.index+'].value']:imgdata.data.url,
-            })
-          },
-          fail(res) {
-            wx.hideLoading()
-            wx.showToast({
-              title: res.data.msg,
-              icon: 'none',
-              duration: 2000
-            })
-          }
-        })
-      },
-      fail: res => {
-        wx.showToast({
-          title: '文件选择失败',
-          icon: 'none',
-          duration: 2000
-        })
-      }
-    })
-  },
-  
-  //显示报备异常弹框
-  optShowReport(e){
-    this.setData({
-      isShowReport:!this.data.isShowReport,
-      photos:[],
-      note:'',
-      optid:e.currentTarget.dataset.id?e.currentTarget.dataset.id:'',
-    })
-  },
-
- 
-  //推送链接
-  pushLink(e){
-    if(e.currentTarget.dataset.url){
-      _.$router.openUrlScheme(e.currentTarget.dataset.url)
-    }
-  },
-
-  //确认盘点信息
-  postAppInventory() {
-    let that = this
-    if (that.data.mileage == ''){
-      wx.showToast({
-        title: '请填定里程数',
-        icon: 'none'
-      })
-    }else{
-      that.setData({
-        submitFlag: true,
-      })
-
-      let params = {};
-      params['id'] = that.data.id;
-      params['car_img'] = that.data.car_img;
-      params['mileage'] = that.data.mileage;
-      if(that.data.note){
-        params['note'] = that.data.note;
-      }
-      _.apiQuery.postAppInventory(params).then(res => {
-
-        let pages = getCurrentPages();
-        let prevPage = null; //上一个页面
-        if (pages.length >= 2) {
-          prevPage = pages[pages.length - 2]; //上一个页面
-          if(prevPage.route == 'pages/inventory/list/index'){
-            prevPage.onPullDownRefresh()
-          }
-        }
-
-        that.onPullDownRefresh()
-
-        that.setData({
-          submitFlag: false,
-        })
-        wx.showModal({
-          title: '操作成功',
-          content: '',
-          confirmText: "返回",
-          confirmColor: "#36afa2",
-          showCancel:false,
-          success(res) {
-            if (res.confirm) {
-              wx.navigateBack({
-                delta: 1
-              })
-            }
-          }
-        })
-      }).catch(res=>{
-        that.setData({
-          submitFlag: false,
-        })
-      });
-    }
-  },
-
-  //查看图片
-  previewImage: function (e) {
-    if(e.currentTarget.dataset.type=='car_img'){
-      let car_img = []
-      this.data.car_img.forEach(item => {
-        car_img.push(item.src)
-      })
-      wx.previewImage({
-        current:e.currentTarget.dataset.current,
-        urls:car_img,
-      })
-    }
-
-  },
-
-  //页面相关事件处理函数--监听用户下拉动作
-  onPullDownRefresh(){
-    this.getAppInventory()
-  },
-
-})
@@ -1,6 +0,0 @@
-{
-  "navigationBarTitleText": "盘点详情",
-  "usingComponents": {
- 
-  }
-}
@@ -1,60 +0,0 @@
-<view class="container">
-  <view class="inner30 {{info.status==1?'pb200':'pb100'}}">
-    <view class="relative bg-fff ulib-r10 box-shadow-000-10-10">
-      <view class="inner40">
-        <view class="font-40">{{info.biz_name}}</view>
-        <view class="mt10 pb10">
-          <image class='wp100' src='{{info.car_cor_img}}' mode='widthFix'></image>
-        </view>
-        <block wx:for="{{info.other_data}}" wx:key='i'>
-          <view class="mt25 fn-clear font-28 color-666">
-            <view class="fn-fl">{{item.title}}</view>
-            <view class="fn-fr wp60 text-right" wx:if="{{item.list}}">
-              <block wx:for="{{item.list}}" wx:for-item="it" wx:key='i'>
-                <text class="inline-block ml5 mr5 pl10 pr10 bg-999 font-22 color-fff ulib-r750">{{it}}</text>
-              </block>
-            </view>
-            <view class="fn-fr wp60 text-nowrap text-right" wx:elif="{{item.value}}">{{item.value}}</view>
-          </view>
-        </block>
-      </view>
-      <view class="pb40">
-        <view class="pl40 pr40 font-32">盘点信息</view>
-        <view class="mt20 pl30">
-          <block wx:for="{{car_img}}" wx:key='index'>
-            <view class="inline-block ml10 mr10 text-center ulib-r10 overflowhidden" wx:if="{{item.value}}">
-              <view class="bg-f8 img-190x175 relative ulib-r10">
-                <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="chooseImg" data-index="{{index}}"></i>
-                <view class="absolute left-0 right-0 box-middle color-ccc">
-                  <image class='img-190x175 ulib-r10' src='{{item.src}}' mode='aspectFill' bindtap="previewImage" data-type="car_img" data-current="{{item.src}}"></image>
-                </view>
-              </view>
-              <view class="mt10 font-24 color-666">{{item.title}}</view>
-            </view>
-
-            <view class="inline-block ml10 mr10 text-center ulib-r10 overflowhidden" bindtap="chooseImg" data-index="{{index}}" wx:else>
-              <view class="bg-f8 img-190x175 relative ulib-r10">
-                <view class="absolute left-0 right-0 box-middle color-ccc">
-                  <i class="iconfont icon-paizhao font-48"></i>
-                  <view class="mt5 font-22">上传{{item.title}}</view>
-                </view>
-              </view>
-              <view class="mt10 font-24 color-666">{{item.title}}</view>
-            </view>
-          </block>
-        </view>
-        <view class="relative mt30 pl40 pr100">
-          <input class="wp100 pl20 pr20 bds-1-eb font-28 ulib-r10" placeholder-class="color-ccc" placeholder="请填写里程数" type="digit"  style="height:70rpx;" model:value='{{mileage}}'/>
-          <view class="absolute box-middle right-0 pr40 font-26 color-666">km</view>
-        </view>
-        <view class="relative mt30 pl40 pr40">
-          <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" placeholder-class="color-ccc" placeholder="请填写备注" type="text"  style="height:120rpx;" model:value='{{note}}' />
-        </view>
-        <view class="mt40 pl40 pr40">
-          <button disabled="{{submitFlag}}" bindtap="postAppInventory" class="btn-36afa2 wp100 pt10 pb10 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
-        </view>
-      </view>
-    </view>
-    <view class="mt30 font-24 color-999"><i class="mr5 iconfont icon-tishi"></i>请盘点以上对应信息。</view>
-  </view>
-</view>
@@ -1 +0,0 @@
-/* pages/allot/detail/index.wxss */
@@ -1,161 +0,0 @@
-import _ from '../../../commons/js/commons'
-const app = getApp()
-Page({
-  data: {
-    list: [],//客户列表
-    pageNo: 1,
-    noData: false,
-    end: false,
-    load: true,
-    loading: false,
-    flag:1,
-    s_date:'',
-    e_date:'',
-
-    tabs_id:'',//分类 1进行中2已完成
-    tab:[],
-    channel:'',//是否来自渠道
-  },
-  onLoad: function (options) {
-    for (let key in options) {
-      this.setData({
-        [key]: options[key]
-      })
-    }
-
-    if(this.data.title){
-      wx.setNavigationBarTitle({
-        title:this.data.title,
-      })
-    }
-
-    this.getAppInventoryTabs()
-  },
-
-  //tab
-  getAppInventoryTabs() {
-    _.apiQuery.getAppInventoryTabs().then(res => {
-      this.setData({
-        tab:res.data,
-        tabs_id:this.data.tabs_id==''?res.data[0].id:this.data.tabs_id,
-      })
-
-      this.getAppInventoryLists()
-
-      wx.stopPullDownRefresh()
-    });
-  },
-
-  //切换tab
-  changeTab(e){
-    this.setData({
-      tabs_id: this.data.tab[e.currentTarget.dataset.index].id,
-    })
-    this.searchSubmit()
-  },
-
-  //获取客户列表
-  getAppInventoryLists() {
-    this.setData({
-      load: false,
-      loading: true,
-    })
-    let params = {};
-    params['page'] = this.data.pageNo;
-    params['size'] = 10;
-    if(this.data.channel != ''){
-      params['channel'] = this.data.channel;
-    }
-    if(this.data.tabs_id != ''){
-      params['tabs_id'] = this.data.tabs_id;
-    }
-    if(this.data.s_date != ''){
-      params['s_date'] = this.data.s_date;
-    }
-    if(this.data.e_date != ''){
-      params['e_date'] = this.data.e_date;
-    }
-    _.apiQuery.getAppInventoryLists(params).then(res => {
-      this.setData({
-        flag: this.data.flag - 1
-      })
-      if (!this.data.flag) {
-        this.setData({
-          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()
-    });
-  },
-
-  //提交搜索
-  searchSubmit(){
-    this.setData({
-      list: [],
-      pageNo: 1,
-      noData: false,
-      end: false,
-      load: true,
-      loading: false,
-      flag: this.data.flag + 1
-    })
-    this.getAppInventoryLists()
-  },
-
-  //建卡时间
-  startDate(e){
-    this.setData({
-      s_date: e.detail.value,
-    })
-  },
-
-  //建卡时间
-  endDate(e){
-    this.setData({
-      e_date: e.detail.value,
-    })
-  },
-
-  //推送链接
-  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,
-      flag: this.data.flag + 1
-    })
-    this.getAppInventoryLists()
-  },
-
-  //页面上拉触底事件的处理函数
-  onReachBottom(){
-    if (this.data.noData || this.data.end||!this.data.load) return;
-    this.setData({
-      flag: this.data.flag + 1
-    })
-    this.getAppInventoryLists()
-  },
-
-})
@@ -1,6 +0,0 @@
-{
-  "navigationBarTitleText": "盘点列表",
-  "usingComponents": {
- 
-  }
-}
@@ -1,65 +0,0 @@
-<view class="container">
-
-  <view>
-    <view style="padding-top:110rpx"></view>
-    <view class="fixed top-0 left-0 right-0 bg-fff z-index-1">
-      <view class="fn-flex mt5 pl100 pr100 font-32 color-666 text-center" wx:if="{{tab.length<5}}">
-        <block wx:for='{{tab}}' wx:key='list'>
-          <view class="fn-flex-item pl20 pr20 tabmenu2 {{tabs_id == item.id?'active color-36afa2':''}}" data-index="{{index}}" bindtap="changeTab">
-            <view class="relative">{{item.name}}</view>
-          </view>
-        </block>
-      </view>
-      <scroll-view class="mt5 font-32 color-666 text-center space-nowrap" scroll-x="true" wx:else>
-        <view class="pl20 inline-block"></view>
-        <block wx:for='{{tab}}' wx:key='list'>
-          <view class="pl20 pr20 tabmenu2 {{tabs_id == item.id?'active color-36afa2':''}}" data-index="{{index}}" bindtap="changeTab" >
-            <view class="relative">{{item.name}}</view>
-          </view>
-        </block>
-        <view class="pl40 inline-block"></view>
-      </scroll-view>
-    </view>
-  </view>
-
-  <view class="pl30 relative text-center font-22">
-    <view class="inline-block text-middle pt10 pb10 bg-f6 ulib-r750" style="width:240rpx;">
-      <picker mode="date" value="{{s_date}}" bindchange="startDate">
-        <text class="color-ccc" wx:if="{{s_date == ''}}">请选择</text>
-        <text wx:else>{{s_date}}</text>
-      </picker>
-    </view>
-    <view class="inline-block text-middle pt10 pb10 pl10 pr10">-</view>
-    <view class="wp33 inline-block text-middle pt10 pb10 bg-f6 ulib-r750" style="width:240rpx;">
-      <picker mode="date" value="{{e_date}}" bindchange="endDate">
-        <text class="color-ccc" wx:if="{{e_date == ''}}">请选择</text>
-        <text wx:else>{{e_date}}</text>
-      </picker>
-    </view>
-    <view bindtap="searchSubmit" class="inline-block text-middle ml10 pt10 pb10 bg-333 color-fff ulib-r750" style="width:140rpx;">搜索</view>
-  </view>
-
-  <view class="mt30 pl30 pr30 pb50">
-
-    <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/inventory/detail/index?id={{item.id}}">
-        <view class="relative {{tabs_id == 1?'pr150':''}}">
-          <view class="font-40" wx:if="{{item.biz_name}}">{{item.biz_name}}</view>
-          <view class="absolute box-middle right-0 pt5 pb5 pl15 pr15 bg-f9394d font-26 color-fff ulib-r10" wx:if="{{tabs_id == 1}}">立即盘点</view>
-        </view>
-        <view class="mt10 pb10">
-          <image class='wp100' src='{{item.car_cor_img}}' mode='widthFix'></image>
-        </view>
-        <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='it' wx:key='i'>
-          <view class="mt25 fn-clear font-28">
-            <view class="fn-fl color-333">{{it.title}}</view>
-            <view class="fn-fr wp60 text-nowrap text-right color-666">{{it.value}}</view>
-          </view>
-        </block>
-        <view class="mt20 pt5 pb5 pl20 pr20 bg-f6 font-22 color-666 ulib-rlb750 ulib-rr750" wx:if="{{item.c_time}}">{{item.c_time}}</view>
-      </view>
-    </block>
-    <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>
-  </view>
-
-</view>
@@ -1,3 +0,0 @@
-.tabmenu2{display:inline-block;line-height:72rpx;}
-.tabmenu2.active view.relative{display:inline-block;}
-.tabmenu2.active view.relative::before{display:inline-block;position:absolute;bottom:0;left:50%;transform:translate(-50%,0);width:64rpx;height:6rpx;content:"";background-color:#36afa2;}
@@ -1,86 +0,0 @@
-import _ from '../../../commons/js/commons'
-const app = getApp()
-Page({
-  data: {
-    list: [],//库存列表
-    pageNo: 1,
-    noData: false,
-    end: false,
-    load: true,
-    loading: false,
-  },
-  onLoad: function (options) {
-    for (let key in options) {
-      this.setData({
-        [key]: options[key]
-      })
-    }
-
-    if(this.data.title){
-      wx.setNavigationBarTitle({
-        title:this.data.title,
-      })
-    }
-
-    this.getAppGoodsLists()
-  },
-
-  //获取库存列表
-  getAppGoodsLists() {
-    this.setData({
-      load: false,
-      loading: true,
-    })
-    let params = {};
-    params['page'] = this.data.pageNo;
-    params['size'] = 10;
-    _.apiQuery.getAppGoodsLists(params).then(res => {
-      this.setData({
-        flag: this.data.flag - 1
-      })
-      this.setData({
-        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()
-    });
-  },
-
-  //推送链接
-  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.getAppGoodsLists()
-  },
-
-  //页面上拉触底事件的处理函数
-  onReachBottom(){
-    if (this.data.noData || this.data.end||!this.data.load) return;
-    this.getAppGoodsLists()
-  },
-
-})
@@ -1,6 +0,0 @@
-{
-  "navigationBarTitleText": "库存列表",
-  "usingComponents": {
- 
-  }
-}
@@ -1,22 +0,0 @@
-<view class="container">
-
-  <view class="mt30 pl30 pr30 pb50">
-
-    <block wx:for='{{list}}' wx:key='index'>
-      <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden">
-        <view class="font-40" wx:if="{{item.title}}">{{item.title}}</view>
-        <view class="mt10 pb10">
-          <image class='wp100' src='{{item.car_cor_img}}' mode='widthFix'></image>
-        </view>
-        <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='it' wx:key='i'>
-          <view class="mt25 fn-clear font-28">
-            <view class="fn-fl color-333">{{it.title}}</view>
-            <view class="fn-fr wp60 text-nowrap text-right color-666" style="{{it.color?'color:'+it.color:''}}">{{it.value}}</view>
-          </view>
-        </block>
-      </view>
-    </block>
-    <lcb-listmore isLoading='{{loading}}' isEnd='{{list.length>5&&end}}' isNoData='{{noData}}'></lcb-listmore>
-  </view>
-
-</view>
@@ -150,11 +150,4 @@ Page({
    }
  },

-  //推送链接
-  pushLink(e){
-    if(e.currentTarget.dataset.url){
-      _.$router.openUrlScheme(e.currentTarget.dataset.url)
-    }
-  },
-
 })
@@ -18,21 +18,15 @@
        </view>
        <view class="absolute right-0 box-middle mr40 pt30 pb30 font-30 color-36afa2" bindtap='getAppSms'>{{text}}</view>
      </view>
-      <view class="mt30 font-22 color-ccc text-center">
-        <label class="inline-block text-middle statement fn-clear"><checkbox class="fn-fl" checked="true" /><text class="pt3 fn-fl">我已阅读并同意</text></label>
-        <text class="text-middle color-36afa2" bindtap="pushLink" data-url="/pages/statement/registration/index">《狸车用户注册协议》</text>
-        <!-- <text class="text-middle">和</text>
-        <text class="text-middle color-36afa2" bindtap="pushLink" data-url="/pages/statement/privacy/index">《狸车用户隐私政策》</text> -->
-      </view>
-      <view class='mt30 relative'>
+      <view class='mt60 relative'>
        <button class='btn-36afa2 font-36 color-fff ulib-r750' hover-class='btn-36afa2-hover' bindtap='getUserUkey'>登录</button>
      </view>
    </view>
    <view class="absolute wp100 login-light img-fill-cover" style="background-image:url({{imgUrl}}/login/login-light.png?v=1);"></view>
    <view class="absolute wp100 bottom-170 text-center font-28 color-999">
      <view class="absolute left-0 top-0 right-0 bottom-0 opacity-0 overflowhidden">
-        <QYWXcontact buttonText="{{4}}" class="pt40 pb40" styleType='1' plugid='9280d952ecab1136d907a34b6799df97' />
-        <QYWXcontact buttonText="{{4}}" class="pt40 pb40" styleType='1' plugid='9280d952ecab1136d907a34b6799df97' />
+        <QYWXcontact buttonText="{{4}}" class="pt40 pb40" styleType='3' plugid='877ffe64ccc36a5f308252eadc3066df' />
+        <QYWXcontact buttonText="{{4}}" class="pt40 pb40" styleType='3' plugid='877ffe64ccc36a5f308252eadc3066df' />
      </view>
      <i class="iconfont icon-kefu mr5"></i>联系小狸
    </view>
@@ -11,24 +11,4 @@ page{
 .login-light{left:0;bottom:322rpx;height:138rpx;animation:light linear 2s infinite;}
@keyframes light{0%{opacity:1}100%{opacity:0}}

-.bottom-170{bottom:170rpx;}
-
-/*复选框外框样式*/
-.statement checkbox .wx-checkbox-input {
-  width:22rpx;
-  height:22rpx;
-  border-color: #999;
-  background: #f9f9f9;
-} 
-/* 选中后的 背景样式*/
-.statement checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-  border-color: #36afa2;
-  background: #36afa2;
-}
-/*复选框选中后内部样式*/
-.statement checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
-  font-size:18rpx;
-  color:#fff;
-  transform:translate(-50%, -50%) scale(1);
-  -webkit-transform:translate(-50%, -50%) scale(1);
-}
+.bottom-170{bottom:170rpx;}
@@ -6,8 +6,6 @@ Page({
    isShowAddStaff:false,
    name:'',
    mobile:'',
-    isShowProfile:true,//是否显示授权用户信息按钮
-    isShowSwitchingRoles:false,
  },
  onLoad: function (options) {

@@ -20,11 +18,11 @@ Page({
    let list = []
    if(this.data.source=='channel'){
      list = [
-        // {
-        //   icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-zichan2.png',
-        //   title:'我的资产',
-        //   url:'',
-        // },
+        {
+          icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-zichan2.png',
+          title:'我的资产',
+          url:'',
+        },
        {
          icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sezhi2.png',
          title:'账户设置',
@@ -33,11 +31,11 @@ Page({
      ]
    }else if(this.data.source=='shop'){
      list = [
-        // {
-        //   icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-zichan2.png',
-        //   title:'我的资产',
-        //   url:'',
-        // },
+        {
+          icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-zichan2.png',
+          title:'我的资产',
+          url:'',
+        },
        {
          icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sucai2.png',
          title:'我的素材',
@@ -48,11 +46,11 @@ Page({
          title:'账户设置',
          url:'/pages/mine/install/index',
        },
-        // {
-        //   icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-siyutong2.png',
-        //   title:'私域通',
-        //   url:'/pages/siyutong/index',
-        // },
+        {
+          icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-siyutong2.png',
+          title:'私域通',
+          url:'/pages/siyutong/index',
+        },
      ]
    }

@@ -71,24 +69,10 @@ Page({
        }
      }
    })
-
-    //消息通讯 是否显示授权用户信息按钮
-    _.eventBus.on("isShowProfile", this, function(res){
-      this.setData({
-        isShowProfile:res,
-      })
-    })
-
  },
  onShow: function () {

  },
-  
-  //生命周期函数--监听页面卸载
-  onUnload: function () {
-    //卸载消息通讯 是否显示授权用户信息
-    _.eventBus.remove('isShowProfile',this);
-  },

  //获取用户信息
  getUserInfo(){
@@ -96,17 +80,17 @@ Page({
      this.setData({
        userInfo: res
      })
-      // if(res.group_id==2||res.group_id==3){
-      //   let list = this.data.list
-      //   list.push({
-      //     icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-jieshao2.png',
-      //     title:'转介绍',
-      //     url:'/pages/recommend/index',
-      //   })
-      //   this.setData({
-      //     list,
-      //   })
-      // }
+      if(res.group_id==2||res.group_id==3){
+        let list = this.data.list
+        list.push({
+          icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-jieshao2.png',
+          title:'转介绍',
+          url:'/pages/recommend/index',
+        })
+        this.setData({
+          list,
+        })
+      }
    });
  },

@@ -137,34 +121,4 @@ Page({
    }
  },

-  //切换角色
-  putAppResetgroupid(e){
-    let params = {};
-    params['group_id'] = e.currentTarget.dataset.key;
-    _.apiQuery.putAppResetgroupid(params).then(res=>{
-      _.apiQuery.getUserInfo().then(res => {
-        if(res.biz_type==4){
-          wx.reLaunch({
-            url: '/pages/allot/index',
-          })
-        }else if(res.group_id==4){
-          wx.reLaunch({
-            url: '/pages/channel/index',
-          })
-        }else{
-          wx.reLaunch({
-            url: '/pages/index/index',
-          })
-        }
-      });
-    })
-  },
-
-  //显示切换角色
-  switchingRoles(){
-    this.setData({
-      isShowSwitchingRoles:!this.data.isShowSwitchingRoles,
-    })
-  },
-
 })
@@ -2,25 +2,19 @@
  <view class="inner30 img-top-cover" style="background-image:url({{imgUrl}}mine/mine-bg2.png);">
    <view class="wp100 pt5 pb5 bg-fff img-fill-cover box-shadow-000-10-10 ulib-r10" style="background-image:url({{imgUrl}}mine/theme.jpg);">
      <view class="relative inner40">
-        <image class='img-135x135 bds-1-eb ulib-r750 overflowhidden' mode="aspectFill" src="{{userInfo.headimg||imgUrl+'common/default-head.jpg'}}" lazy-load="{{true}}"></image>
-        <view class="absolute top-0 bottom-0 left-0 right-0 opacity-0 mt50 mr150 z-index-4">
-          <lcb-auth type="userinfo" isShowProfile="{{isShowProfile}}" bind:onSuccess="getUserInfo"></lcb-auth>
+        <view class="img-135x135 bds-1-eb ulib-r750 overflowhidden">
+          <open-data type="userAvatarUrl"></open-data>
        </view>
        <view class="absolute left-0 right-0 box-middle pl200">
          <view class="text-bold font-32">
+            <!-- <open-data type="userNickName"></open-data> -->
            {{userInfo.uname}}
            <text class="font-22 color-666" wx:if="{{userInfo.group_name}}">({{userInfo.group_name}})</text>
          </view>
          <view class="mt10 font-22 color-666">{{userInfo.biz_name}}</view>
        </view>
-
-        <view class="absolute right-0 box-middle pb40" >
-          <view class="bg-f6 mb25 pt10 pb10 pl20 pr15 font-22 color-666 ulib-rl750" bindtap="switchingRoles" wx:if="{{userInfo.group_name_arr.length>0}}">
-            <i class="iconfont icon-cheliangfenpei mr10"></i>切换角色
-          </view>
-          <view class="bg-f6 pt10 pb10 pl20 pr20 font-22 color-666 ulib-rl750" bindtap="logout">
-            <i class="iconfont icon-tuichu mr10"></i>退出
-          </view>
+        <view class="absolute right-0 box-middle bg-f6 pt10 pb10 pl20 pr20 font-22 color-666 ulib-rl750" bindtap="logout">
+          <i class="iconfont icon-tuichu mr10"></i>退出
        </view>
      </view>
    </view>
@@ -49,21 +43,4 @@
 <!-- <lcb-footer></lcb-footer> -->
 <lcb-backChannel isShow='{{source=="shop"?true:false}}'></lcb-backChannel>
 <lcb-channelTabBarNav currentIndex='2' wx:if="{{source=='channel'}}"></lcb-channelTabBarNav>
-<lcb-shopTabBarNav currentIndex='3' wx:if="{{source=='shop'}}"></lcb-shopTabBarNav>
-
-<lcb-msg isShow="{{isShowSwitchingRoles}}" isHasClose="{{true}}">
-	<view slot="content">
-    <view class="pt50 font-28 text-center">
-      当前角色： 
-      <!-- <block wx:for='{{userInfo.group_name_arr}}' wx:key='index' wx:if="{{item.group_id == userInfo.group_id}}">
-        {{item.geoup_name}}
-      </block> -->
-      {{userInfo.group_name}}
-    </view>
-    <view class="pb40 mt30 text-center font-32 color-666">
-      <button bindtap="putAppResetgroupid" data-key="{{item.group_id}}" class="inline-block wp80 btn-36afa2 pt5 pb5 font-28 color-fff ulib-r750" wx:for='{{userInfo.group_name_arr}}' wx:key='index' wx:if="{{item.group_id != userInfo.group_id}}">
-        {{item.geoup_name}}
-      </button>
-    </view>
-	</view>
-</lcb-msg>
+<lcb-shopTabBarNav currentIndex='3' wx:if="{{source=='shop'}}"></lcb-shopTabBarNav>
@@ -4,7 +4,6 @@ Page({
  data: {
    imgUrl:_.config.imgUrl,
    list:[],
-    isShowProfile:true,//是否显示授权用户信息按钮
  },
  onLoad: function (options) {

@@ -15,24 +14,11 @@ Page({
    }

    this.getUserInfo()
-
-    //消息通讯 是否显示授权用户信息按钮
-    _.eventBus.on("isShowProfile", this, function(res){
-      this.setData({
-        isShowProfile:res,
-      })
-    })
  },
  onShow: function () {

  },

-  //生命周期函数--监听页面卸载
-  onUnload: function () {
-    //卸载消息通讯 是否显示授权用户信息
-    _.eventBus.remove('isShowProfile',this);
-  },
-
  //获取用户信息
  getUserInfo(){
    _.apiQuery.getUserInfo().then(res => {
@@ -3,12 +3,12 @@

    <view class="wp100 pt5 pb5 bg-fff img-fill-cover box-shadow-000-10-10 ulib-r10" style="background-image: url({{imgUrl}}mine/theme.jpg);">
      <view class="relative inner40">
-        <image class='img-135x135 bds-1-eb ulib-r750 overflowhidden' mode="aspectFill" src="{{userInfo.headimg||imgUrl+'common/default-head.jpg'}}" lazy-load="{{true}}"></image>
-        <view class="absolute top-0 bottom-0 left-0 right-0 opacity-0 mt50 mr150 z-index-4">
-          <lcb-auth type="userinfo" isShowProfile="{{isShowProfile}}" bind:onSuccess="getUserInfo"></lcb-auth>
+        <view class="img-135x135 bds-1-eb ulib-r750 overflowhidden">
+          <open-data type="userAvatarUrl"></open-data>
        </view>
        <view class="absolute left-0 right-0 box-middle pl200">
          <view class="text-bold font-32">
+            <!-- <open-data type="userNickName"></open-data> -->
            {{userInfo.uname}}
            <text class="font-22 color-666" wx:if="{{userInfo.group_name}}">({{userInfo.group_name}})</text>
          </view>
@@ -12,7 +12,6 @@ Page({
    end: false,
    load: true,
    loading: false,
-    isShowProfile:true,//是否显示授权用户信息按钮
  },
  onLoad: function (options) {
    for (let key in options) {
@@ -22,24 +21,11 @@ Page({
    }

    this.getUserInfo()
-
-    //消息通讯 是否显示授权用户信息按钮
-    _.eventBus.on("isShowProfile", this, function(res){
-      this.setData({
-        isShowProfile:res,
-      })
-    })
  },
  onShow: function () {
    this.getAppEmployees()
  },

-  //生命周期函数--监听页面卸载
-  onUnload: function () {
-    //卸载消息通讯 是否显示授权用户信息
-    _.eventBus.remove('isShowProfile',this);
-  },
-
  //获取用户信息
  getUserInfo(){
    _.apiQuery.getUserInfo().then(res => {
@@ -196,99 +182,6 @@ Page({
    }
  },

-  //获取离职
-  getAppEmployeesLeave(e){
-    let params = {};
-    params['id'] = e.currentTarget.dataset.id;
-    _.apiQuery.getAppEmployeesLeave(params).then(res => {
-      let adviserArray = []
-      res.data.adviser.list.forEach(item => {
-        adviserArray.push(item.name)
-      })
-      this.setData({
-        out_id:e.currentTarget.dataset.id,
-        transfer:res.data.transfer,
-        adviser:res.data.adviser,
-        adviserArray,
-        isShowTransfer:true,
-        adviserIndex:-1,
-      })
-      
-    });
-  },
-
-  //显示隐藏移交
-  optTransfer(){
-    this.setData({
-      isShowTransfer:!this.data.isShowTransfer,
-    })
-  },
-
-  //选择移交内容
-  changeTransfer(e){
-    let transfer = this.data.transfer
-    transfer.list[e.currentTarget.dataset.index].checked = !transfer.list[e.currentTarget.dataset.index].checked
-    this.setData({
-      transfer,
-    })
-  },
-
-  //选择顾问
-  changeAdviser(e) {
-    this.setData({
-      adviserIndex: e.detail.value,
-    })
-  },
-
-  //确定移交
-  putAppEmployeesLeave(){
-    let ischecked = false
-    this.data.transfer.list.forEach(item => {
-      if(item.checked){
-        ischecked = true
-      }
-    })
-    console.log(ischecked)
-    if (ischecked == false ) {
-      wx.showToast({
-        title: '请选择移交内容',
-        icon: 'none'
-      })
-    } else if(this.data.adviserIndex == -1){
-      wx.showToast({
-        title: '请选择销售顾问',
-        icon: 'none'
-      })
-    }else{
-      let that = this
-      wx.showModal({
-        title: '',
-        content:'确定移交该店员工作吗？',
-        confirmColor: '#36afa2',
-        success (res) {
-          if (res.confirm) {
-            let params = {};
-            params['out_id'] = that.data.out_id;
-            params['in_id'] = that.data.adviser.list[that.data.adviserIndex].id;
-            params['transfer'] = that.data.transfer;
-            _.apiQuery.putAppEmployeesLeave(params).then(res => {
-              that.setData({
-                isShowTransfer:false,
-              })
-              wx.showToast({
-                title: '移交成功',
-                icon: 'success'
-              })
-              that.onPullDownRefresh()
-            })
-          } else if (res.cancel) {
-            
-          }
-        }
-      })
-    }
-  },
-
  //页面相关事件处理函数--监听用户下拉动作
  onPullDownRefresh(){
    this.setData({
@@ -3,12 +3,12 @@

    <view class="wp100 pt5 pb5 bg-fff img-fill-cover box-shadow-000-10-10 ulib-r10" style="background-image: url({{imgUrl}}mine/theme.jpg);">
      <view class="relative inner40">
-        <image class='img-135x135 bds-1-eb ulib-r750 overflowhidden' mode="aspectFill" src="{{userInfo.headimg||imgUrl+'common/default-head.jpg'}}" lazy-load="{{true}}"></image>
-        <view class="absolute top-0 bottom-0 left-0 right-0 opacity-0 mt50 mr150 z-index-4">
-          <lcb-auth type="userinfo" isShowProfile="{{isShowProfile}}" bind:onSuccess="getUserInfo"></lcb-auth>
+        <view class="img-135x135 bds-1-eb ulib-r750 overflowhidden">
+          <open-data type="userAvatarUrl"></open-data>
        </view>
        <view class="absolute left-0 right-0 box-middle pl200">
          <view class="text-bold font-32">
+            <!-- <open-data type="userNickName"></open-data> -->
            {{userInfo.uname}}
            <text class="font-22 color-666" wx:if="{{userInfo.group_name}}">({{userInfo.group_name}})</text>
          </view>
@@ -35,12 +35,11 @@
        <view class="relative pt30 pb30 pr250 bbs-1-eb last-b-none {{item.status==1?'':'opacity-50'}}">
          <view class="text-nowrap">
            <image class='img-50x50 bds-1-eb ulib-r750 text-middle' lazy-load="{{true}}" mode="scaleToFill" src="{{imgUrl}}common/default-head.jpg?v=220223"></image>
-            <text class="pl10 text-middle font-26">{{item.uname}}</text>
-            <text class="pl10 text-middle font-26">{{item.mobile}}</text>
+            <text class="pl10 text-middle font-28">{{item.uname}}</text>
+            <text class="pl10 text-middle font-28">{{item.mobile}}</text>
          </view>
-          <view class="absolute right-0 box-middle font-26">
-            <view class="inline-block bg-333 mr10 pt5 pb5 pl10 pr10 font-22 color-fff ulib-r750" bindtap="getAppEmployeesLeave" data-id="{{item.id}}"><i class="iconfont icon-yuangonglizhi mr5"></i>离职</view>
-            <view class="inline-block bg-333 mr10 pt5 pb5 pl10 pr10 font-22 color-fff ulib-r750" bindtap="putAppEmployees" data-index="{{index}}"><i class="iconfont icon-zanting mr5"></i>{{item.status == 1?'暂停':'开启'}}</view>
+          <view class="absolute right-0 box-middle">
+            <view class="inline-block bg-333 mr20 pt5 pb5 pl10 pr10 font-22 color-fff ulib-r750" bindtap="putAppEmployees" data-index="{{index}}"><i class="iconfont icon-zanting mr5"></i>{{item.status == 1?'暂停':'开启'}}</view>
            <view class="inline-block bg-333 pt5 pb5 pl10 pr10 font-22 color-fff ulib-r750" bindtap="deleteAppEmployees" data-index="{{index}}"><i class="iconfont icon-shanchu mr5"></i>删除</view>
          </view>
        </view>
@@ -70,31 +69,4 @@
      <button disabled="{{submitFlag}}" bindtap="postAppEmployees" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">添加</button>
    </view>
  </view>
-</lcb-msg>
-
-
-<lcb-msg isShow="{{isShowTransfer}}">
-	<view slot="content">
-		<view class="inner30">
-      <view class="mt10 font-28 text-center fn-flex" wx:if="{{transfer.list.length > 0}}">
-        <block wx:for="{{transfer.list}}" wx:key="index">
-          <view class="fn-flex-item relative ml10 mr10 pt20 pb20 ulib-r10 {{item.checked?'bg-36afa2 color-fff':'bg-f6'}}" bindtap="changeTransfer" data-index="{{index}}">{{item.name}}</view>
-        </block>
-      </view>
-      <view class="mt20 ml10 mr10 bds-2-eb inner20 font-28 color-666 fn-clear ulib-r10">
-        <view class="fn-fl">{{adviser.title}}</view>
-        <picker class="fn-fr wp70 text-right" bindchange="changeAdviser" value="{{adviserIndex}}" range="{{adviserArray}}">
-          <view class="text-nowrap">
-            <text class="color-ccc" wx:if="{{adviserIndex == -1}}">请选择</text>
-            <text wx:else>{{adviserArray[adviserIndex]}}</text>
-            <i class="iconfont ml5 icon-gengduo color-ccc"></i>
-          </view>
-        </picker>
-      </view>
-    </view>
-    <view class="fn-flex ml10 mr10 pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="optTransfer" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
-      <button disabled="{{submitFlag}}" bindtap="putAppEmployeesLeave" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定移交</button>
-    </view>
-	</view>
 </lcb-msg>
@@ -45,14 +45,12 @@ Page({
    ckcarInfo:[],//随车资料选中内容
    carToolList:[],//随车随车工具选项
    ckcarTool:[],//随车工具选中内容
+    nextCode:false,

    ins_img:[],
    register_img:{},
    car_img:{},

-    isShowCall:false,//是否显示拨打电话确认弹框
-    phoneNumber:'',//拨打的电话号码
-
  },
  onLoad: function (options) {
    for (let key in options) {
@@ -100,6 +98,7 @@ Page({
        })
      }

+      this.getAppLoan()
      if(!this.data.isChangePayway){
        this.getAppServicesPackage()
      }
@@ -160,6 +159,44 @@ Page({
    })
  },

+  //获取贷款产品信息
+  getAppLoan(){
+    let params = {};
+    params['id'] = this.data.id;
+    _.apiQuery.getAppLoan(params).then(res=>{
+
+      this.setData({
+        loanSource:res.data,
+        money:res.data.first_price,
+      })
+      
+      if(this.data.info.loan_status == 1 && this.data.info.loan_data.id){
+        
+        if(this.data.info.loan_data.bank != ''){
+          this.data.loanSource.banks.forEach((item,index) => {
+            if(item == this.data.info.loan_data.bank){
+              this.setData({
+                banksIndex:index,
+              })
+            }
+          })
+        }
+
+        if(this.data.info.loan_data.year != 0){
+          this.data.loanSource.years.forEach((item,index) => {
+            if(item == this.data.info.loan_data.year){
+              this.setData({
+                yearsIndex:index,
+              })
+            }
+          })
+        }
+
+      }
+
+    })
+  },
+
  //获取代办包
  getAppServicesPackage(){
    let params = {};
@@ -331,6 +368,102 @@ Page({
    }
  },

+  //创建贷款信息
+  postAppLoan() {
+    let that = this
+    if (that.data.banksIndex == -1 ) {
+      wx.showToast({
+        title: '请选择分期产品',
+        icon: 'none'
+      })
+    }else if(that.data.yearsIndex == -1 ){
+      wx.showToast({
+        title: '请选择分期年限',
+        icon: 'none'
+      })
+    }
+    // else if(that.data.money == '' ){
+    //   wx.showToast({
+    //     title: '请填写贷款金额',
+    //     icon: 'none'
+    //   })
+    // }
+    else{
+      that.setData({
+        submitFlag: true,
+      })
+      let params = {};
+      params['oid'] = that.data.id;
+      params['bank'] = that.data.loanSource.banks[that.data.banksIndex];
+      params['year'] = that.data.loanSource.years[that.data.yearsIndex];
+      params['money'] = that.data.money;
+      _.apiQuery.postAppLoan(params).then(res => {
+        this.setData({
+          submitFlag: false,
+        })
+        this.getAppCusorderDetails()
+
+        wx.showToast({
+          title: '保存成功',
+          icon: 'success'
+        })
+
+      }).catch(res=>{
+        this.setData({
+          submitFlag: false,
+        })
+      });
+    }
+  },
+
+  //修改贷款信息
+  putAppLoan() {
+    let that = this
+    if (that.data.banksIndex == -1 ) {
+      wx.showToast({
+        title: '请选择分期产品',
+        icon: 'none'
+      })
+    }else if(that.data.yearsIndex == -1 ){
+      wx.showToast({
+        title: '请选择分期年限',
+        icon: 'none'
+      })
+    }
+    // else if(that.data.money == '' && that.data.info.loan_data.money == '0.00'){
+    //   wx.showToast({
+    //     title: '请填写贷款金额',
+    //     icon: 'none'
+    //   })
+    // }
+    else{
+      that.setData({
+        submitFlag: true,
+      })
+      let params = {};
+      params['id'] = that.data.info.loan_data.id;
+      params['bank'] = that.data.loanSource.banks[that.data.banksIndex];
+      params['year'] = that.data.loanSource.years[that.data.yearsIndex];
+      params['money'] = that.data.money || that.data.info.loan_data.money;
+      _.apiQuery.putAppLoan(params).then(res => {
+        this.setData({
+          submitFlag: false,
+        })
+        this.getAppCusorderDetails()
+
+        wx.showToast({
+          title: '修改成功',
+          icon: 'success'
+        })
+
+      }).catch(res=>{
+        this.setData({
+          submitFlag: false,
+        })
+      });
+    }
+  },
+
  //选择图片
  chooseImg(e) {
    this.setData({
@@ -343,9 +476,7 @@ Page({
      sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
      success(res) {

-        wx.showLoading({
-          title: '上传中',
-        })
+        wx.showLoading();
        wx.uploadFile({
          url:_.config.api.upImg,
          filePath:res.tempFilePaths[0],
@@ -419,7 +550,6 @@ Page({
            title: '图片上传中',
          })
          let ins_img=that.data.ins_img
-          let k = 0
          for (let i = 0; i < res1.tempFilePaths.length; i++) {
            //上传图片
            wx.uploadFile({
@@ -430,7 +560,6 @@ Page({
                'app': 'liche'
              },
              success: (resp) => {
-                k = k + 1
                resp.data = JSON.parse(resp.data);
                wx.hideLoading();
                if (resp.data.code == 200) {
@@ -441,20 +570,22 @@ Page({
                    src:imgdata.data.full_url,
                  })
                  ins_img=ins_img.concat(list)
-                  if(k == res1.tempFilePaths.length){
-                    let params = {};
-                    params['id'] = that.data.id;
-                    params['type'] = 0;
-                    let img = []
-                    ins_img.forEach(item => {
-                      img.push(item.value)
-                    })
-                    params['img'] = img;
-                    _.apiQuery.putAppCusorderCdata(params).then(res => {
-                      that.setData({
-                        ins_img,
+                  if(i+1==res1.tempFilePaths.length){
+                    setTimeout(function () {
+                      let params = {};
+                      params['id'] = that.data.id;
+                      params['type'] = 0;
+                      let img = []
+                      ins_img.forEach(item => {
+                        img.push(item.value)
                      })
-                    })
+                      params['img'] = img;
+                      _.apiQuery.putAppCusorderCdata(params).then(res => {
+                        that.setData({
+                          ins_img,
+                        })
+                      })
+                    }, 500);
                  }
                }else{
                  wx.showToast({
@@ -822,6 +953,14 @@ Page({
  optShowCode() {
    this.setData({
      isShowCode:!this.data.isShowCode,
+      nextCode:false,
+    })
+  },
+
+  //生成合同
+  optNextCode() {
+    this.setData({
+      nextCode:true,
    })
  },

@@ -838,9 +977,8 @@ Page({
    params['id'] = e.currentTarget.dataset.id;
    params['type'] = 1;
    _.apiQuery.getAppXz(params).then(res=>{
-      this.setData({
-        isShowCall:true,
-        phoneNumber:res.data.mobile,
+      wx.makePhoneCall({
+        phoneNumber: res.data.mobile,
      })
    })
  },
@@ -879,20 +1017,6 @@ Page({
    })
  },

-  //隐藏电话弹框
-  hideCall(){
-    this.setData({
-      isShowCall:false,
-    })
-  },
-
-  //拨打电话
-  makePhoneCall(){
-    wx.makePhoneCall({
-      phoneNumber: this.data.phoneNumber,
-    })
-  },
-
  //随车工具
  changeTool(e) {
    let carToolList = this.data.carToolList
@@ -3,7 +3,7 @@
    <view class="pl30 pr30">
      <view class="mt20 relative">
        <view class="font-32">用户信息</view>
-        <view class="absolute right-0 box-middle font-22 color-666">销售顾问：<text class="color-36afa2">{{info.admin_name}}</text></view>
+        <view class="absolute right-0 box-middle font-22 color-666">销售顾问：<text class="color-36afa2">{{userInfo.uname}}</text></view>
      </view>
      <view class="mt20 pl40 pr40 pt10 pb10 relative ulib-r10 box-shadow-000-10-10 overflowhidden">
        <view class="pt30 pb30 font-28">
@@ -11,9 +11,9 @@
          <view class="mt5 font-22 color-666">手机号：{{info.mobile}}</view>
        </view>
        <view class="absolute right-0 mr30 box-middle">
-          <!--view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{info.id}}">
+          <view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{info.id}}">
            <i class="absolute box-center-middle iconfont icon-duanxinguanli"></i>
-          </view-->
+          </view>
          <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{info.id}}">
            <i class="absolute box-center-middle iconfont icon-dianhua"></i>
          </view>
@@ -118,44 +118,38 @@
    </view>

    <!--交付随车信息-->
-    <block wx:if="{{info.ckcar_status == 1}}">
-      <view class="mt30 pl30">
-        <view>
-          <view class="bts-1-eb mr30 pt30 pb20 font-28 color-333">随车资料</view>
-          <view class="pb10 fn-clear">
-            <checkbox-group bindchange="changeMaterial">
-              <block wx:for="{{carInfoList}}" wx:key='index'>
-                <label class="fn-fl block mb20 relative inner30 pr80 bg-f6 font-28 ulib-r10 mr20">
-                  <text>{{item.title}}</text>
-                  <checkbox class="absolute right-0 box-middle mr15" value="{{item.title}}" checked="{{item.checked}}"/>
-                </label>
-              </block>
-            </checkbox-group>
-          </view>
-        </view>
-        <view>
-          <view class="bts-1-eb mr30 pt30 pb20 font-28 color-333">随车工具</view>
-          <view class="pb10 fn-clear">
-            <checkbox-group bindchange="changeTool">
-              <block wx:for="{{carToolList}}" wx:key='index'>
-                <label class="fn-fl block mb20 relative inner30 pr80 bg-f6 font-28 ulib-r10 mr20">
-                  <text>{{item.title}}</text>
-                  <checkbox class="absolute right-0 box-middle mr15" value="{{item.title}}" checked="{{item.checked}}"/>
-                </label>
-              </block>
-            </checkbox-group>
-          </view>
-        </view>
-        <view class="pr30">
-          <view class="bts-1-eb pt30 pb20 font-28 color-333">补充说明</view>
-          <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" style="height:120rpx;" placeholder-class="color-ccc" maxlength='140' placeholder="请输入补充说明" model:value="{{remark}}" />
+    <view class="mt30 pl30" wx:if="{{info.ckcar_status == 1}}">
+      <view>
+        <view class="bts-1-eb mr30 pt30 pb20 font-28 color-333">随车资料</view>
+        <view class="pb10 fn-clear">
+          <checkbox-group bindchange="changeMaterial">
+            <block wx:for="{{carInfoList}}" wx:key='index'>
+              <label class="fn-fl block mb20 relative inner30 pr80 bg-f6 font-28 ulib-r10 mr20">
+                <text>{{item.title}}</text>
+                <checkbox class="absolute right-0 box-middle mr15" value="{{item.title}}" checked="{{item.checked}}"/>
+              </label>
+            </block>
+          </checkbox-group>
        </view>
      </view>
-      <view class="mt50 pb20 pl60 pr60">
-        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCusorderCkcar">确认随车物品</button>
+      <view>
+        <view class="bts-1-eb mr30 pt30 pb20 font-28 color-333">随车工具</view>
+        <view class="pb10 fn-clear">
+          <checkbox-group bindchange="changeTool">
+            <block wx:for="{{carToolList}}" wx:key='index'>
+              <label class="fn-fl block mb20 relative inner30 pr80 bg-f6 font-28 ulib-r10 mr20">
+                <text>{{item.title}}</text>
+                <checkbox class="absolute right-0 box-middle mr15" value="{{item.title}}" checked="{{item.checked}}"/>
+              </label>
+            </block>
+          </checkbox-group>
+        </view>
      </view>
-    </block>
-
+      <view class="pr30">
+        <view class="bts-1-eb pt30 pb20 font-28 color-333">补充说明</view>
+        <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" style="height:120rpx;" placeholder-class="color-ccc" maxlength='140' placeholder="请输入补充说明" model:value="{{remark}}" />
+      </view>
+    </view>
    <view class="pt30 pl30 pr30" wx:if="{{info.ckcar_status == 0&&info.ckcar_data.info.length>0}}">
      <view class="relative bts-1-eb bbs-1-eb pl140 font-28">
        <view class="absolute left-0 box-middle font-28 color-333">随车资料</view>
@@ -269,6 +263,15 @@
      </block>
    </view>

+    <view class="mt60 pl60 pr60" wx:if="{{info.loan_status == -10000}}"><!--210909不显示-->
+      <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="{{info.loan_data.id?'putAppLoan':'postAppLoan'}}">{{info.loan_data.id?'修改信息':'保存信息'}}</button>
+    </view>
+    <!-- <view class="mt60 pl60 pr60" wx:elif="{{info.bill_status == 1}}">
+      <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="{{info.bill_data.id?'putAppIdcard':'postAppIdcard'}}">更新信息</button>
+    </view> -->
+    <view class="mt60 pl60 pr60" wx:elif="{{info.ckcar_status == 1}}">
+      <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCusorderCkcar">确认随车物品</button>
+    </view>
  </view>
  <view class="mt40 pt20 pl30 pr30 pb40 bg-000-op80 fn-flex">
    <button bindtap="optShowCode" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover"><i class="iconfont mr5 icon-qianming"></i>邀请签名</button>
@@ -365,7 +368,7 @@
 <lcb-msg isShow="{{isShowOrderCode}}">
 	<view slot="content">
    <view class="inner40">
-      <view class="font-36 text-center">邀请客户扫码</view>
+      <view class="font-36 text-center">邀请客户扫码支付</view>
      <view class="pt40 text-center">
        <image class='inline-block img-250x250' lazy-load="{{true}}" mode="aspectFit" src="{{info.pay_img}}"></image>
      </view>
@@ -386,22 +389,4 @@
      <button disabled="{{submitFlag}}" bindtap="postAppSmsCusorder" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
    </view>
 	</view>
-</lcb-msg>
-
-<!-- 拨打电话 -->
-<lcb-msg isShow="{{isShowCall}}">
-  <view slot="content">
-    <view class="pt50 pb40">
-      <view class="font-36 text-center">号码绑定成功</view>
-      <view class="mt10 font-28 text-center color-666">现在呼叫 {{phoneNumber}} ？</view>
-    </view>
-    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="hideCall" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">
-        取消
-      </button>
-      <button bindtap="makePhoneCall" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">
-        确定
-      </button>
-    </view>
-  </view>
 </lcb-msg>
@@ -1,921 +0,0 @@
-import _ from '../../../commons/js/commons'
-const app = getApp()
-Page({
-  data: {
-    imgUrl:_.config.imgUrl,
-    submitFlag:false,
-    isShowOrderCode:false,
-    remark:'',//补充说明
-    carInfoList:[],//随车资料选项
-    ckcarInfo:[],//随车资料选中内容
-    carToolList:[],//随车随车工具选项
-    ckcarTool:[],//随车工具选中内容
-    
-    cardida:{},//身份证正面照片
-    cardidb:{},//身份证反面照片
-    business_licence:{},//营业执照照片
-    car_img:{},//行驶证照片
-    register_img:{},//登记证照片
-    //ins_img:[],//保险照片
-    other_img:[],//交车合照
-    isShowCK:false,
-    isShowBill:false,
-  },
-  onLoad: function (options) {
-    for (let key in options) {
-      this.setData({
-        [key]: options[key]
-      })
-    }
-
-    this.getAppCusorderV2()
-    this.getUserInfo()
-    
-    
-  },
-  onShow: function () {
-    this.getAppCusorderdata()
-  },
-
-  //获取用户信息
-  getUserInfo(){
-    _.apiQuery.getUserInfo().then(res => {
-      this.setData({
-        userInfo: res
-      })
-    });
-  },
-
-  //获取订单详情
-  getAppCusorderV2(){
-    let params = {};
-    params['id'] = this.data.id;
-    _.apiQuery.getAppCusorderV2(params).then(res=>{
-      this.setData({
-        info:res.data,
-      })
-
-      if(res.data.ckcar_status==1){
-        this.setData({
-          remark:res.data.ckcar_data.remark,//补充说明
-          ckcarInfo:res.data.ckcar_data.info,//随车资料选中内容
-          ckcarTool:res.data.ckcar_data.tool,//随车工具选中内容
-        })
-        this.getAppDelivery()
-      }
-
-      //匹配上牌城市
-      if(!!res.data.c_city_id){
-        _.apiQuery.getAppCityOncard().then(res1 => {
-          if(res1.data.list.length>0){
-            res1.data.list.forEach((item,index) => {
-              if(item.city_id == res.data.c_city_id){
-                this.setData({
-                  c_city_name:item.name,
-                })
-              }
-            })
-          }
-        })
-      }
-
-      wx.stopPullDownRefresh()
-
-    })
-  },
-
-  //获取订单图片
-  getAppCusorderdata(){
-    let params = {};
-    params['id'] = this.data.id;
-    _.apiQuery.getAppCusorderdata(params).then(res=>{
-      this.setData({
-        imgInfo:res.data,
-      })
-      if(res.data.img_status == 1){
-        this.setData({
-          cardida:res.data.imgs.cardida.length==0?{}:res.data.imgs.cardida,
-          cardidb:res.data.imgs.cardidb.length==0?{}:res.data.imgs.cardidb,
-          business_licence:res.data.imgs.business_licence.length==0?{}:res.data.imgs.business_licence,
-          car_img:res.data.imgs.car_img.length==0?{}:res.data.imgs.car_img,
-          register_img:res.data.imgs.register_img.length==0?{}:res.data.imgs.register_img,
-          //ins_img:res.data.imgs.ins_img.length==0?[]:res.data.imgs.ins_img,
-          other_img:res.data.imgs.other_img.length==0?[]:res.data.imgs.other_img,
-        })
-
-        if('delivery_ck_img' in res.data.imgs){
-          this.setData({
-            delivery_ck_img:res.data.imgs.delivery_ck_img.length==0?{}:res.data.imgs.delivery_ck_img,
-          })
-        }
-      }
-      wx.stopPullDownRefresh()
-    })
-  },
-
-  //获取车辆确认交付车辆
-  getAppDelivery(){
-    _.apiQuery.getAppDelivery().then(res=>{
-
-      let delivery = res.data
-      let carInfoList = []
-      let ckcar_data = this.data.info.ckcar_data
-      delivery.info.forEach(item => {
-        carInfoList.push({
-          title:item,
-          checked:false,
-        })
-      })
-      if(ckcar_data.info.length>0){
-        carInfoList.forEach(item1 => {
-          ckcar_data.info.forEach(item2 => {
-            if(item1.title == item2){
-              item1.checked = true
-            }
-          }) 
-        })
-      }
-      let carToolList = []
-      delivery.tool.forEach(item => {
-        carToolList.push({
-          title:item,
-          checked:false,
-        })
-      })
-      if(ckcar_data.tool.length>0){
-        carToolList.forEach(item1 => {
-          ckcar_data.tool.forEach(item2 => {
-            if(item1.title == item2){
-              item1.checked = true
-            }
-          }) 
-        })
-      }
-
-      this.setData({
-        carInfoList,
-        carToolList,
-      })
-
-    })
-  },
-
-  //显示短信弹框
-  showMessage(e){
-    this.setData({
-      isShowMessage:true,
-      content:'',
-    })
-  },
-
-  //关闭短信弹框
-  hideMessage(e){
-    this.setData({
-      isShowMessage:false,
-    })
-  },
-
-  // 输入
-  inputTx(e) {
-    this.setData({
-      [e.currentTarget.dataset.key]: e.detail.value
-    })
-  },
-
-  //发短信
-  postAppSmsCusorder(){
-    if (this.data.submitFlag) return;
-    if (this.data.content == '') {
-      wx.showToast({
-        title: '请填写短信内容',
-        icon: 'none'
-      })
-    } else {
-      this.setData({
-        submitFlag: true,
-      })
-      let params = {};
-      params['id'] = this.data.id;
-      params['content'] = this.data.content;
-      _.apiQuery.postAppSmsCusorder(params).then(res=>{
-        this.setData({
-          isShowMessage:false,
-          submitFlag:false,
-          content:'',
-        })
-        wx.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-
-      })
-    }
-  },
-
-  //选择图片
-  chooseImg(e) {
-    let that = this
-    //上传身份证正面
-    if(e.currentTarget.dataset.type=='cardida'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
-              if (resp.data.code == 200) {
-                that.setData({
-                  'cardida.value':resp.data.data.url,
-                  'cardida.img':resp.data.data.full_url,
-                })
-
-                let params = {};
-                params['id'] = that.data.id;
-                params['cardida'] = resp.data.data.url;
-                _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
-                }).catch(res2=>{
-                  if(res2.code==418){
-                    that.setData({
-                      'cardida.err':!res2.data[0].caridA,
-                      'cardida.errmsg':res2.data[0].errmsg,
-                    })
-                  }
-                });
-              }
-            },
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-    //上传身份证背面
-    if(e.currentTarget.dataset.type=='cardidb'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
-              if (resp.data.code == 200) {
-                that.setData({
-                  'cardidb.value':resp.data.data.url,
-                  'cardidb.img':resp.data.data.full_url,
-                })
-
-                let params = {};
-                params['id'] = that.data.id;
-                params['cardidb'] = resp.data.data.url;
-                _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
-                }).catch(res2=>{
-                  if(res2.code==418){
-                    that.setData({
-                      'cardidb.err':!res2.data[1].caridB,
-                      'cardidb.errmsg':res2.data[1].errmsg,
-                    })
-                  }
-                });
-              }
-            },
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-    //上传营业执照
-    if(e.currentTarget.dataset.type=='business_licence'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
-              if (resp.data.code == 200) {
-                that.setData({
-                  'business_licence.value':resp.data.data.url,
-                  'business_licence.img':resp.data.data.full_url,
-                })
-
-                let params = {};
-                params['id'] = that.data.id;
-                params['business_licence'] = resp.data.data.url;
-                _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
-                }).catch(res2=>{
-                  if(res2.code==418){
-                    that.setData({
-                      'business_licence.err':!res2.data[0].business_licence,
-                      'business_licence.errmsg':res2.data[0].errmsg,
-                    })
-                  }
-                });
-              }
-            },
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-    //上传登记证
-    if(e.currentTarget.dataset.type=='register_img'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
-              if (resp.data.code == 200) {
-                let params = {};
-                params['id'] = that.data.id;
-                params['register_img'] = resp.data.data.url;
-                _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                  that.setData({
-                    'register_img.value':resp.data.data.url,
-                    'register_img.img':resp.data.data.full_url,
-                  })
-                })
-              }
-            },
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-    //上传行驶证
-    if(e.currentTarget.dataset.type=='car_img'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
-              if (resp.data.code == 200) {
-                let params = {};
-                params['id'] = that.data.id;
-                params['car_img'] = resp.data.data.url;
-                _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                  that.setData({
-                    'car_img.value':resp.data.data.url,
-                    'car_img.img':resp.data.data.full_url,
-                  })
-                })
-              }
-            },
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-    //上传保单
-    if(e.currentTarget.dataset.type=='ins_img'){
-      wx.chooseImage({
-        count: 10 - that.data.ins_img.length, //
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res1) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          let ins_img=that.data.ins_img
-          let k = 0
-          for (let i = 0; i < res1.tempFilePaths.length; i++) {
-            //上传图片
-            wx.uploadFile({
-              url:_.config.api.upImg,
-              filePath:res1.tempFilePaths[i],
-              name: 'img',
-              formData: {
-                'app': 'liche'
-              },
-              success: (resp) => {
-                k = k + 1
-                resp.data = JSON.parse(resp.data);
-                if (resp.data.code == 200) {
-                  let imgdata = resp.data
-                  let list = []
-                  list.push({
-                    value:imgdata.data.url,
-                    img:imgdata.data.full_url,
-                  })
-                  ins_img=ins_img.concat(list)
-                  if(k == res1.tempFilePaths.length){
-                    wx.hideLoading();
-                    let params = {};
-                    params['id'] = that.data.id;
-                    let img = []
-                    ins_img.forEach(item => {
-                      img.push(item.value)
-                    })
-                    params['ins_imgs'] = img;
-                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                      that.setData({
-                        ins_img,
-                      })
-                    })
-                  }
-                }
-              },
-        
-            })
-          }
-
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-    //上传交车合照
-    if(e.currentTarget.dataset.type=='other_img'){
-      wx.chooseImage({
-        count: 1, //
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res1) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          let other_img=that.data.other_img
-          let k = 0
-          for (let i = 0; i < res1.tempFilePaths.length; i++) {
-            //上传图片
-            wx.uploadFile({
-              url:_.config.api.upImg,
-              filePath:res1.tempFilePaths[i],
-              name: 'img',
-              formData: {
-                'app': 'liche'
-              },
-              success: (resp) => {
-                k = k + 1
-                resp.data = JSON.parse(resp.data);
-                if (resp.data.code == 200) {
-                  let imgdata = resp.data
-                  let list = []
-                  list.push({
-                    value:imgdata.data.url,
-                    img:imgdata.data.full_url,
-                  })
-                  other_img=other_img.concat(list)
-                  if(k == res1.tempFilePaths.length){
-                    wx.hideLoading();
-                    let params = {};
-                    params['id'] = that.data.id;
-                    let img = []
-                    other_img.forEach(item => {
-                      img.push(item.value)
-                    })
-                    params['other_imgs'] = img;
-                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                      that.setData({
-                        other_img,
-                      })
-                    })
-                  }
-                }
-              },
-        
-            })
-          }
-
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-  },
-
-  // 编辑页面删除图片
-  delImg(e){
-    if(e.currentTarget.dataset.type=='ins_img'){
-      let ins_img = this.data.ins_img
-      ins_img.splice(e.currentTarget.dataset.index, 1)
-      let params = {};
-      params['id'] = this.data.id;
-      let img = []
-      ins_img.forEach(item => {
-        img.push(item.value)
-      })
-      params['ins_imgs'] = img;
-      _.apiQuery.putAppCusorderdata(params).then(res => {
-        this.setData({
-          ins_img,
-        })
-      })
-    }else if(e.currentTarget.dataset.type=='other_img'){
-      let other_img = this.data.other_img
-      other_img.splice(e.currentTarget.dataset.index, 1)
-      let params = {};
-      params['id'] = this.data.id;
-      let img = []
-      other_img.forEach(item => {
-        img.push(item.value)
-      })
-      params['other_imgs'] = img;
-      _.apiQuery.putAppCusorderdata(params).then(res => {
-        this.setData({
-          other_img,
-        })
-      })
-    }
-  },
-
-  //确认交付
-  putAppCusorderCkcar(){
-    
-    if(this.data.ckcarInfo.length == 0){
-      wx.showToast({
-        title: '请选择随车资料',
-        icon: 'none'
-      })
-    }
-    else if(this.data.ckcarTool.length == 0){
-      wx.showToast({
-        title: '请选择随车工具',
-        icon: 'none'
-      })
-    }
-    else{
-      let that = this
-      wx.showModal({
-        title:'确认交付车辆？',
-        content:'',
-        success: function (res) {
-          if (res.confirm) {
-            that.setData({
-              submitFlag: true,
-            })
-            let params = {};
-            params['id'] = that.data.id;
-            params['info'] = that.data.ckcarInfo;
-            params['tool'] = that.data.ckcarTool;
-            params['remark'] = that.data.remark;
-            _.apiQuery.putAppCusorderCkcar(params).then(res => {
-              that.setData({
-                submitFlag: false,
-              })
-              that.getAppCusorderV2()
-        
-              wx.showToast({
-                title: '确认交付车辆成功',
-                icon: 'success'
-              })
-        
-            }).catch(res=>{
-              that.setData({
-                submitFlag: false,
-              })
-            });
-          }
-        }
-      })
-    }
-  },
-
-  //订单支付码
-  optShowOrderCode() {
-    this.setData({
-      isShowOrderCode:!this.data.isShowOrderCode,
-    })
-  },
-
-  //查看图片
-  previewImage: function (e) {
-    if(e.currentTarget.dataset.type=='bill_img'){
-      let urls = [this.data.info.bill_img]
-      wx.previewImage({
-        current:e.currentTarget.dataset.current,
-        urls,
-      })
-    }
-    else if(e.currentTarget.dataset.type=='bill_ck_img'){
-      let urls = this.data.imgInfo.imgs.bill_ck_img
-      wx.previewImage({
-        current:e.currentTarget.dataset.current,
-        urls,
-      })
-    }
-    else if(e.currentTarget.dataset.type=='cardida'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.cardida.img,
-        urls:[this.data.imgInfo.imgs.cardida.img],
-      })
-    }
-    else if(e.currentTarget.dataset.type=='cardidb'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.cardidb.img,
-        urls:[this.data.imgInfo.imgs.cardidb.img],
-      })
-    }
-    else if(e.currentTarget.dataset.type=='business_licence'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.business_licence.img,
-        urls:[this.data.imgInfo.imgs.business_licence.img],
-      })
-    }
-    else if(e.currentTarget.dataset.type=='register_img'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.register_img.img,
-        urls:[this.data.imgInfo.imgs.register_img.img],
-      })
-    }
-    else if(e.currentTarget.dataset.type=='car_img'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.car_img.img,
-        urls:[this.data.imgInfo.imgs.car_img.img],
-      })
-    }
-    else if(e.currentTarget.dataset.type=='insurance_img'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.insurance_img.img,
-        urls:[this.data.imgInfo.imgs.insurance_img.img],
-      })
-    }
-    else if(e.currentTarget.dataset.type=='business_img'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.business_img.img,
-        urls:[this.data.imgInfo.imgs.business_img.img],
-      })
-    }
-    else if(e.currentTarget.dataset.type=='accident_img'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.accident_img.img,
-        urls:[this.data.imgInfo.imgs.accident_img.img],
-      })
-    }
-    // else if(e.currentTarget.dataset.type=='ins_img'){
-    //   let img = []
-    //   if(this.data.imgInfo.imgs.insurance_img.img){
-    //     img.push(this.data.imgInfo.imgs.insurance_img.img)
-    //   }
-    //   if(this.data.imgInfo.imgs.business_img.img){
-    //     img.push(this.data.imgInfo.imgs.business_img.img)
-    //   }
-    //   this.data.imgInfo.imgs.ins_img.forEach(item => {
-    //     img.push(item.img)
-    //   })
-    //   wx.previewImage({
-    //     current:this.data.imgInfo.imgs.insurance_img.img,
-    //     urls:img,
-    //   })
-    // }
-    else if(e.currentTarget.dataset.type=='other_img'){
-      let img = []
-      this.data.imgInfo.imgs.other_img.forEach(item => {
-        img.push(item.img)
-      })
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.other_img[0].img,
-        urls:img,
-      })
-    }
-    else if(e.currentTarget.dataset.type=='delivery_ck_img'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.delivery_ck_img.img,
-        urls:[this.data.imgInfo.imgs.delivery_ck_img.img],
-      })
-    }
-    else if(e.currentTarget.dataset.type=='wx_img'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.wx_img.img,
-        urls:[this.data.imgInfo.imgs.wx_img.img],
-      })
-    }
-    else if(e.currentTarget.dataset.type=='mut_wx_img'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.mut_wx_img.img,
-        urls:[this.data.imgInfo.imgs.mut_wx_img.img],
-      })
-    }
-    else if(e.currentTarget.dataset.type=='destory_img'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.destory_img.img,
-        urls:[this.data.imgInfo.imgs.destory_img.img],
-      })
-    }
-    else if(e.currentTarget.dataset.type=='notify'){
-      let img = []
-      this.data.info.notify_file.forEach(item => {
-        img.push(item.src)
-      })
-      wx.previewImage({
-        current:e.currentTarget.dataset.current,
-        urls:img,
-      })
-    }
-    else if(e.currentTarget.dataset.type=='lend'){
-      wx.previewImage({
-        current:this.data.info.lend_file.src,
-        urls:[this.data.info.lend_file.src],
-      })
-    }
-
-  },
-
-  //推送链接
-  pushLink(e){
-    if(e.currentTarget.dataset.url){
-      _.$router.openUrlScheme(e.currentTarget.dataset.url)
-    }
-  },
-
-  //随车资料
-  changeMaterial(e) {
-    let carInfoList = this.data.carInfoList
-    let values = e.detail.value
-    carInfoList.forEach(item1 => {
-      item1.checked = false
-      values.forEach(item2 => {
-        if(item1.title == item2){
-          item1.checked = true
-        }
-      })
-    })
-
-    this.setData({
-      ckcarInfo:e.detail.value,
-      carInfoList,
-    })
-  },
-
-  //随车工具
-  changeTool(e) {
-    let carToolList = this.data.carToolList
-    let values = e.detail.value
-    carToolList.forEach(item1 => {
-      item1.checked = false
-      values.forEach(item2 => {
-        if(item1.title == item2){
-          item1.checked = true
-        }
-      })
-    })
-
-    this.setData({
-      ckcarTool:e.detail.value,
-      carToolList,
-    })
-  },
-
-  //显示隐藏合格证
-  optShowCK(){
-    this.setData({
-      isShowCK:!this.data.isShowCK,
-    })
-  },
-
-  //显示隐藏合格证
-  optShowBill(){
-    this.setData({
-      isShowBill:!this.data.isShowBill,
-    })
-  },
-
-  //删除订单
-  putAppCusorderV2Status(){
-    let that = this
-    wx.showModal({
-      title: '确定删除订单？',
-      content: '',
-      confirmColor: "#36afa2",
-      success(resW) {
-        if (resW.confirm) {
-          let params = {};
-          params['id'] = that.data.id;
-          _.apiQuery.putAppCusorderV2Status(params).then(res => {   
-            //刷新列表页
-            let pages = getCurrentPages();
-            pages.forEach(item => {
-              if(item.route == 'pages/order/index2'){
-                item.onPullDownRefresh()
-              }
-            })
-            wx.showToast({
-              title: '删除成功',
-              icon: 'success',
-              duration: 2000
-            })
-            setTimeout(function () {
-              wx.navigateBack({
-                delta: 1
-              })
-            }, 500)
-          })
-        }
-      }
-    })
-  },
-
-  //页面相关事件处理函数--监听用户下拉动作
-  onPullDownRefresh(){
-    this.getAppCusorderdata()
-    this.getAppCusorderV2()
-  },
-
-})
@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "订单详情",
-  "enablePullDownRefresh": true,
-  "usingComponents": {}
-}
@@ -1,570 +0,0 @@
-<view class="container pb150">
-  <view>
-    <view class="pl30 pr30">
-      <view class="mt20 relative">
-        <view class="font-22 color-666">销售顾问：<text class="color-36afa2">{{info.admin_name}}</text></view>
-      </view>
-      <view class="mt20 fn-clear">
-        <view class="fn-fl pt10 font-32">购车人信息</view>
-        <view class="fn-fr" wx:if="{{info.edit_status==1&&!info.refund_status}}">
-          <button bindtap="pushLink" data-url="/pages/order/editBuyer/index?id={{id}}" class="inline-block font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>修改</button>
-        </view>
-      </view>
-      <view class="relative bbs-1-eb pl140 font-28">
-        <view class="absolute left-0 box-middle font-28 color-333">客户姓名</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.name}}</view>
-      </view>
-      <view class="relative bbs-1-eb pl140 font-28">
-        <view class="absolute left-0 box-middle font-28 color-333">客户手机号</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.mobile}}</view>
-      </view>
-      <view class="relative bbs-1-eb pl140 font-28" wx:if="{{info.cardid}}">
-        <view class="absolute left-0 box-middle font-28 color-333">客户身份证</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.cardid}}</view>
-      </view>
-      <view class="mt40 relative fn-clear">
-        <view class="fn-fl pt10 font-32">{{info.main_type==0?'车主信息':'企业信息'}}</view>
-        <view class="fn-fr" wx:if="{{info.edit_status==1&&!info.refund_status}}">
-          <button bindtap="pushLink" data-url="/pages/order/editOwner/index?id={{id}}" class="inline-block font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>修改</button>
-        </view>
-      </view>
-      <block wx:if="{{info.main_type==0}}">
-        <view class="relative bbs-1-eb pl140 font-28">
-          <view class="absolute left-0 box-middle font-28 color-333">车主姓名</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.owner_name}}</view>
-        </view>
-        <view class="relative bbs-1-eb pl140 font-28">
-          <view class="absolute left-0 box-middle font-28 color-333">车主手机号</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.owner_mobile}}</view>
-        </view>
-        <view class="relative bbs-1-eb pl140 font-28" wx:if="{{info.owner_cardid}}">
-          <view class="absolute left-0 box-middle font-28 color-333">车主身份证</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.owner_cardid}}</view>
-        </view>
-        <view class="relative bbs-1-eb pl140 font-28" wx:if="{{info.address}}">
-          <view class="absolute left-0 box-middle font-28 color-333">车主地址</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.address}}</view>
-        </view>
-      </block>
-      <block wx:if="{{info.main_type==1}}">
-        <view class="relative bbs-1-eb pl140 font-28">
-          <view class="absolute left-0 box-middle font-28 color-333">企业名称</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.company}}</view>
-        </view>
-        <view class="relative bbs-1-eb pl140 font-28">
-          <view class="absolute left-0 box-middle font-28 color-333">企业信用代号</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.credit}}</view>
-        </view>
-      </block>
-      <view class="relative bbs-1-eb pl140 font-28" wx:if="{{c_city_name}}">
-        <view class="absolute left-0 box-middle font-28 color-333">上牌城市</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{c_city_name}}</view>
-      </view>
-      <view class="mt40 fn-clear">
-        <view class="fn-fl pt10 font-32">订单信息</view>
-        <view class="fn-fr" wx:if="{{info.edit_status==1&&!info.refund_status}}">
-          <button bindtap="pushLink" data-url="/pages/order/edit/index2?id={{id}}" class="inline-block font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>修改</button>
-        </view>
-      </view>
-      <block wx:for="{{info.car_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
-        <block wx:if="{{!!value.list}}">
-          <view class="relative bbs-1-eb pl140 font-28">
-            <view class="absolute left-0 box-middle font-28 color-333">{{key}}</view>
-            <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{value.value}}</view>
-          </view>
-          <block wx:for="{{value.list}}" wx:for-index='key2' wx:for-item='value2' wx:key='j'>
-            <block wx:if="{{!!value2.list}}">
-              <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" style="min-height:30rpx">
-                <view class="pt25 pb25"><i class="iconfont ml5 mr5 icon-dian"></i>{{key2}}</view>
-                <view class="absolute right-0 box-middle">{{value2.value}}</view>
-              </view>
-              <block wx:for="{{value2.list}}" wx:for-index='key3' wx:for-item='value3' wx:key='k'>
-                <view class="relative ml80 bbs-1-eb pl140 font-22 color-666" style="min-height:30rpx">
-                  <view class="pt25 pb25"><i class="iconfont ml5 mr5 icon-dian"></i>{{key3}}</view>
-                  <view class="absolute right-0 box-middle">{{value3}}</view>
-                </view>
-              </block>
-            </block>
-            <block wx:else>
-              <view class="relative ml40 bbs-1-eb pr150 font-22 color-666" style="min-height:30rpx">
-                <view class="pt25 pb25"><i class="iconfont ml5 mr5 icon-dian"></i>{{key2}}</view>
-                <view class="absolute right-0 box-middle">{{value2}}</view>
-              </view>
-            </block>
-          </block>
-        </block>
-        <block wx:else>
-          <block wx:if="{{key == '按揭信息'}}">
-            <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editFinance/index?id={{id}}">
-              <view class="absolute left-0 box-middle font-28 color-333">{{key}}</view>
-              <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">
-                <text >{{value}}</text>
-                <i wx:if="{{!info.refund_status}}" class="iconfont ml10 icon-gengduo font-26 color-999"></i>
-              </view>
-            </view>
-          </block>
-          <block wx:else>
-            <view class="relative bbs-1-eb pl140 font-28" wx:if="{{value}}">
-              <view class="absolute left-0 box-middle font-28 color-333">{{key}}</view>
-              <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{value}}</view>
-            </view>
-          </block>
-        </block>
-      </block>
-      <block wx:if="{{info.sa}}">
-        <view class="relative pt30 font-28 color-333">特别约定</view>
-        <view class="mt20 inner30 bds-1-eb line-height-16 font-28 color-666 ulib-r10">{{info.sa}}</view>
-      </block>
-      <view class="relative bbs-1-eb pt30 pb30 text-right font-24 color-666" wx:if="{{info.inten_money}}">已付意向金<text class="pl5 pr5 color-f9394d">{{info.inten_money}}</text>元</view>
-    </view>
-
-    <!--合格证,发票展示-->
-    <view class="pl30 pr30">
-      <view class="bbs-1-eb" wx:if="{{imgInfo.imgs.bill_ck_img.length>0}}">
-        <view class="relative pt30 pb30" bindtap="optShowCK">
-          <text class="font-32">合格证</text>
-          <view class="absolute right-0 box-middle red-tip mr30 ulib-r750" wx:if="{{!isShowCK}}"></view>
-          <i class="absolute right-0 box-middle iconfont {{isShowCK?'icon-xuanze':'icon-gengduo'}} font-26 color-999"></i>
-        </view>
-        <view hidden="{{!isShowCK}}">
-          <block wx:for='{{imgInfo.imgs.bill_ck_img}}' wx:key='index'>
-            <view class="mt10 mb10 "><image bindtap="previewImage" data-type="bill_ck_img" data-current="{{item}}" class='wp100' lazy-load="{{true}}" mode="widthFix" src="{{item}}"></image></view>
-          </block>
-        </view>
-      </view>
-      <view class="bbs-1-eb" wx:if="{{info.bill_img}}">
-        <view class="relative pt30 pb30" bindtap="optShowBill">
-          <text class="font-32">发票</text>
-          <view class="absolute right-0 box-middle red-tip mr30 ulib-r750" wx:if="{{!isShowBill}}"></view>
-          <i class="absolute right-0 box-middle iconfont {{isShowBill?'icon-xuanze':'icon-gengduo'}} font-26 color-999"></i>
-        </view>
-        <view hidden="{{!isShowBill}}">
-          <view class="mt10 mb10"><image bindtap="previewImage" data-type="bill_img" data-current="{{info.bill_img}}" class='wp100' lazy-load="{{true}}" mode="widthFix" src="{{info.bill_img}}"></image></view>
-        </view>
-      </view>
-    </view>
-
-    <!--图片-->
-    <view class="pl30 pr30">
-      <!--图片修改-->
-      <block wx:if="{{imgInfo.img_status==1}}">
-        <!--上传身份证-->
-        <block wx:if="{{info.main_type == 0}}">
-          <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editCardid/index?id={{id}}">
-            <view class="absolute left-0 box-middle font-32 color-333">身份证</view>
-            <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-              <view>{{cardida.value||cardidb.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
-              <!-- <button bindtap="pushLink" data-url="/pages/order/editCardid/index?id={{id}}" class="inline-block text-middle font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>{{cardida.value||cardidb.value?'更新':'上传'}}</button> -->
-            </view>
-          </view>
-
-          <!-- <view class="mt40 font-32">身份证</view>
-          <view class="fn-flex mt30 text-center">
-            <view class="fn-flex-item relative mr10" bindtap="chooseImg" data-type="cardida">
-              <block wx:if="{{cardida.value}}">
-                <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-                  <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4"></i>
-                  <view class="absolute top-0 left-0 bottom-0 right-0 bg-f00-op50 z-index-3" wx:if="{{cardida.err}}">
-                    <view class="absolute left-0 right-0 box-middle pl20 pr20 text-break font-22 color-fff"><i class="iconfont icon-jinggao"></i>{{cardida.errmsg}}</view>
-                  </view>
-                  <image class='block wp100 img-h-200 ulib-r10' src='{{cardida.img}}' mode='aspectFit'></image>
-                </view>
-              </block>
-              <block wx:else>
-                <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-                  <view class="absolute left-0 right-0 box-middle color-ccc">
-                    <i class="iconfont icon-zhengmian font-60"></i>
-                    <view class="mt10 font-22">上传身份证正面</view>
-                  </view>
-                </view>
-              </block>
-            </view>
-            <view class="fn-flex-item relative ml10" bindtap="chooseImg" data-type="cardidb">
-              <block wx:if="{{cardidb.value}}">
-                <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-                  <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4"></i>
-                  <view class="absolute top-0 left-0 bottom-0 right-0 bg-f00-op50 z-index-3" wx:if="{{cardidb.err}}">
-                    <view class="absolute left-0 right-0 box-middle pl20 pr20 text-break font-22 color-fff"><i class="iconfont icon-jinggao"></i>{{cardidb.errmsg}}</view>
-                  </view>
-                  <image class='block wp100 img-h-200 ulib-r10' src='{{cardidb.img}}' mode='aspectFit'></image>
-                </view>
-              </block>
-              <block wx:else>
-                <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-                  <view class="absolute left-0 right-0 box-middle color-ccc">
-                    <i class="iconfont icon-fanmian font-60"></i>
-                    <view class="mt10 font-22">上传身份证背面</view>
-                  </view>
-                </view>
-              </block>
-            </view>
-          </view> -->
-        </block>
-        <!--上传营业执照-->
-        <block wx:elif="{{info.main_type == 1}}">
-          <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editBusinessBicence/index?id={{id}}">
-            <view class="absolute left-0 box-middle font-32 color-333">营业执照</view>
-            <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-              <view>{{business_licence.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
-              <!-- <button bindtap="pushLink" data-url="/pages/order/editBusinessBicence/index?id={{id}}" class="inline-block text-middle font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>{{business_licence.value?'更新':'上传'}}</button> -->
-            </view>
-          </view>
-
-          <!-- <view class="mt40 font-32">营业执照</view>
-          <view class="mt30 text-center">
-            <view class="inline-block img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="business_licence">
-              <block wx:if="{{business_licence.value}}">
-                <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-                  <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4"></i>
-                  <view class="absolute top-0 left-0 bottom-0 right-0 bg-f00-op50 z-index-3" wx:if="{{business_licence.err}}">
-                    <view class="absolute left-0 right-0 box-middle pl20 pr20 text-break font-22 color-fff"><i class="iconfont icon-jinggao"></i>{{business_licence.errmsg}}</view>
-                  </view>
-                  <image class='block wp100 img-h-200 ulib-r10' src='{{business_licence.img}}' mode='aspectFit'></image>
-                </view>
-              </block>
-              <block wx:else>
-                <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-                  <view class="absolute left-0 right-0 box-middle color-ccc">
-                    <i class="iconfont icon-fanmian font-60"></i>
-                    <view class="mt10 font-22">上传营业执照</view>
-                  </view>
-                </view>
-              </block>
-            </view>
-          </view> -->
-        </block>
-        <!--上传车辆证件-->
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editLicenseImg/index?id={{id}}">
-          <view class="absolute left-0 box-middle font-32 color-333">车辆证件</view>
-          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-            <view>{{register_img.value||car_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
-            <!-- <button bindtap="pushLink" data-url="/pages/order/editLicenseImg/index?id={{id}}" class="inline-block text-middle font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>{{register_img.value||car_img.value?'更新':'上传'}}</button> -->
-          </view>
-        </view>
-
-        <!-- <view class="mt40 font-32">车辆证件</view>
-        <view class="fn-flex mt30 text-center">
-          <view class="fn-flex-item relative mr10" bindtap="chooseImg" data-type="register_img">
-            <block wx:if="{{register_img.value}}">
-              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-                <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1"></i>
-                <image class='block wp100 img-h-200 ulib-r10' src='{{register_img.img}}' mode='aspectFit'></image>
-              </view>
-            </block>
-            <block wx:else>
-              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-                <view class="absolute left-0 right-0 box-middle color-ccc">
-                  <i class="iconfont icon-paizhao font-48"></i>
-                  <view class="mt10 font-22">上传登记证</view>
-                </view>
-              </view>
-            </block>
-          </view>
-          <view class="fn-flex-item relative ml10" bindtap="chooseImg" data-type="car_img">
-            <block wx:if="{{car_img.value}}">
-              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-                <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1"></i>
-                <image class='block wp100 img-h-200 ulib-r10' src='{{car_img.img}}' mode='aspectFit'></image>
-              </view>
-            </block>
-            <block wx:else>
-              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-                <view class="absolute left-0 right-0 box-middle color-ccc">
-                  <i class="iconfont icon-paizhao font-48"></i>
-                  <view class="mt10 font-22">上传行驶证</view>
-                </view>
-              </view>
-            </block>
-          </view> 
-        </view>-->
-        <!--上传保险单-->
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editInsImg/index?id={{id}}">
-          <view class="absolute left-0 box-middle font-32 color-333">保险单</view>
-          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-            <view>{{imgInfo.imgs.accident_img.value||imgInfo.imgs.insurance_img.value||imgInfo.imgs.business_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
-            <!-- <button bindtap="pushLink" data-url="/pages/order/editInsImg/index?id={{id}}" class="inline-block text-middle font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>{{ins_img.length>0?'更新':'上传'}}</button> -->
-          </view>
-        </view>
-        <!-- <view class="mt40 font-32">保险单</view>
-        <view class="mt30 pb20 text-center">
-          <scroll-view class="space-nowrap" scroll-x="true">
-            <block wx:for='{{ins_img}}' wx:for-item='ins_img' wx:key='index'>
-              <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden">
-                <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-guanbi1 inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delImg" data-type="ins_img" data-index="{{index}}" ></i>
-                <image class='block wp100 img-h-200 ulib-r10' src='{{ins_img.img}}' mode='aspectFit'></image>
-              </view>
-            </block>
-            <block wx:if="{{ins_img.length<10}}">
-              <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="ins_img">
-                <view class="absolute left-0 right-0 box-middle color-ccc">
-                  <i class="iconfont icon-paizhao font-48"></i>
-                  <view class="mt10 font-22">上传保险单</view>
-                </view>
-              </view>
-            </block>
-          </scroll-view>
-        </view> -->
-        <!--上传交车合照-->
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editOtherImg/index?id={{id}}">
-          <view class="absolute left-0 box-middle font-32 color-333">交车合照</view>
-          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-            <view>{{other_img.length>0?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
-            <!-- <button bindtap="pushLink" data-url="/pages/order/editOtherImg/index?id={{id}}" class="inline-block text-middle font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>{{other_img.length>0?'更新':'上传'}}</button> -->
-          </view>
-        </view>
-        <!-- <view class="mt40 font-32">交车合照</view>
-        <view class="mt30 pb20 text-center">
-          <scroll-view class="space-nowrap" scroll-x="true">
-            <block wx:for='{{other_img}}' wx:for-item='other_img' wx:key='index'>
-              <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden">
-                <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-guanbi1 inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delImg" data-type="other_img" data-index="{{index}}" ></i>
-                <image class='block wp100 img-h-200 ulib-r10' src='{{other_img.img}}' mode='aspectFit'></image>
-              </view>
-            </block>
-            <block wx:if="{{other_img.length<1}}">
-              <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="other_img">
-                <view class="absolute left-0 right-0 box-middle color-ccc">
-                  <i class="iconfont icon-paizhao font-48"></i>
-                  <view class="mt10 font-22">上传合照</view>
-                </view>
-              </view>
-            </block>
-          </scroll-view>
-        </view> -->
-        <!--上传交车合照-->
-        <!--添加企微-->
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editQVImg/index?id={{id}}">
-          <view class="absolute left-0 box-middle font-32 color-333">企微信息</view>
-          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-            <view>{{imgInfo.imgs.wx_img.value||imgInfo.imgs.mut_wx_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
-          </view>
-        </view>
-        <!--end添加企微-->
-        <!--实名认证资料-->
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editVoucherImg/index?id={{id}}">
-          <view class="absolute left-0 box-middle font-32 color-333">实名认证资料</view>
-          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-            <view>{{imgInfo.imgs.destory_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
-          </view>
-        </view>
-        <!--end实名认证资料-->
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editDeliveryckimg/index?id={{id}}" wx:if="{{!!imgInfo.imgs.delivery_ck_img}}">
-          <view class="absolute left-0 box-middle font-32 color-333">交付确认单</view>
-          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
-            <view><i class="iconfont ml10 icon-gengduo"></i></view>
-          </view>
-        </view>
-
-      </block>
-      <!--图片展示-->
-      <block wx:if="{{imgInfo.img_status==2}}">
-        <!--身份证-->
-        <block wx:if="{{imgInfo.imgs.cardida.img||imgInfo.imgs.cardidb.img}}">
-          <view class="mt40 font-32">身份证</view>
-          <view class="fn-flex mt30 text-center">
-            <view class="fn-flex-item relative mr10">
-              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" wx:if="{{imgInfo.imgs.cardida.img}}" bindtap="previewImage" data-type="cardida">  
-                <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.cardida.img}}' lazy-load="{{true}}" mode="aspectFit"></image>
-              </view>
-            </view>
-            <view class="fn-flex-item relative ml10">
-              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" wx:if="{{imgInfo.imgs.cardidb.img}}" bindtap="previewImage" data-type="cardidb">
-                <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.cardidb.img}}' lazy-load="{{true}}" mode="aspectFit"></image>
-              </view>
-            </view>
-          </view>
-        </block>
-        <!--营业执照-->
-        <block wx:if="{{imgInfo.imgs.business_licence.img}}">
-          <view class="mt40 font-32">营业执照</view>
-          <view class="mt30 text-center">
-            <view class="inline-block img-300x200 relative ulib-r10 overflowhidden" bindtap="previewImage" data-type="business_licence">
-              <image class='block wp100 img-h-200 ulib-r10' src="{{imgInfo.imgs.business_licence.img}}" lazy-load="{{true}}" mode="aspectFit"></image>
-            </view>
-          </view>
-        </block>
-        <!--国家补材料-->
-        <block wx:if="{{imgInfo.imgs.register_img.img||imgInfo.imgs.car_img.img}}">
-          <view class="mt40 font-32">车辆证件</view>
-          <view class="fn-flex mt30 text-center">
-            <view class="fn-flex-item relative mr10">
-              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" wx:if="{{imgInfo.imgs.register_img.img}}" bindtap="previewImage" data-type="register_img">  
-                <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.register_img.img}}' lazy-load="{{true}}" mode="aspectFit"></image>
-              </view>
-            </view>
-            <view class="fn-flex-item relative ml10">
-              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" wx:if="{{imgInfo.imgs.car_img.img}}" bindtap="previewImage" data-type="car_img">
-                <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.car_img.img}}' lazy-load="{{true}}" mode="aspectFit"></image>
-              </view>
-            </view>
-          </view>
-        </block>
-        <!--保险单-->
-        <block wx:if="{{imgInfo.imgs.ins_img.length>0}}">
-          <view class="mt40 font-32">保险单</view>
-          <view class="mt30 pb20 text-center box-x-scroll space-nowrap">
-            <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden" bindtap="previewImage" data-type="insurance_img" wx:if="{{imgInfo.imgs.insurance_img.value}}">
-              <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.insurance_img.img}}' mode='aspectFit'></image>
-            </view>
-            <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden" bindtap="previewImage" data-type="business_img" wx:if="{{imgInfo.imgs.business_img.value}}">
-              <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.business_img.img}}' mode='aspectFit'></image>
-            </view>
-            <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden" bindtap="previewImage" data-type="accident_img" wx:if="{{imgInfo.imgs.accident_img.value}}">
-              <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.accident_img.img}}' mode='aspectFit'></image>
-            </view>
-          </view>
-          <!-- <view class="mt30 pb20 text-center">
-            <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden" bindtap="previewImage" data-type="ins_img">
-              <view class="absolute box-center-middle font-28 color-fff z-index-1">{{imgInfo.imgs.ins_img.length+2}}张</view>
-              <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.insurance_img.img}}' mode='aspectFit'></image>
-            </view>
-          </view> -->
-        </block>
-        <!--交车合照-->
-        <block wx:if="{{imgInfo.imgs.other_img.length>0}}">
-          <view class="mt40 font-32">交车合照</view>
-          <view class="mt30 pb20 text-center">
-            <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden" bindtap="previewImage" data-type="other_img">
-              <view class="absolute box-center-middle font-28 color-fff z-index-1" wx:if="{{imgInfo.imgs.other_img.length>1}}">{{imgInfo.imgs.other_img.length}}张</view>
-              <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.other_img[0].img}}' mode='aspectFit'></image>
-            </view>
-          </view>
-        </block>
-        <!--添加企微-->
-        <block wx:if="{{imgInfo.imgs.wx_img.img||imgInfo.imgs.mut_wx_img.img}}">
-          <view class="mt40 font-32">添加企微</view>
-          <view class="fn-flex mt30 text-center">
-            <view class="fn-flex-item relative mr10">
-              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" wx:if="{{imgInfo.imgs.wx_img.img}}" bindtap="previewImage" data-type="wx_img">  
-                <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.wx_img.img}}' lazy-load="{{true}}" mode="aspectFit"></image>
-              </view>
-            </view>
-            <view class="fn-flex-item relative ml10">
-              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" wx:if="{{imgInfo.imgs.mut_wx_img.img}}" bindtap="previewImage" data-type="mut_wx_img">
-                <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.mut_wx_img.img}}' lazy-load="{{true}}" mode="aspectFit"></image>
-              </view>
-            </view>
-          </view>
-        </block>
-        <!--实名认证资料-->
-        <block wx:if="{{imgInfo.imgs.destory_img.img}}">
-          <view class="mt40 font-32">实名认证资料</view>
-          <view class="mt30 pb20 text-center">
-            <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden" bindtap="previewImage" data-type="destory_img">
-              <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.destory_img.img}}' mode='aspectFit'></image>
-            </view>
-          </view>
-        </block>
-        <!--交付确认单-->
-        <block wx:if="{{imgInfo.imgs.delivery_ck_img.img}}">
-          <view class="mt40 font-32">交付确认单</view>
-          <view class="mt30 pb20 text-center">
-            <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden" bindtap="previewImage" data-type="delivery_ck_img">
-              <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.delivery_ck_img.img}}' mode='aspectFit'></image>
-            </view>
-          </view>
-        </block>
-      </block>
-
-      <!--end 图片预览-->
-    </view>
-    
-  </view>
-
-  <!--交付随车信息-->
-  <block wx:if="{{info.ckcar_status == 1}}">
-      <view class="pl30">
-        <view>
-          <view class="mr30 pt30 pb30 font-28 color-333">随车资料</view>
-          <view class="fn-clear">
-            <checkbox-group bindchange="changeMaterial">
-              <block wx:for="{{carInfoList}}" wx:key='index'>
-                <label class="fn-fl block mb20 relative inner30 pr80 bg-f6 font-28 ulib-r10 mr20">
-                  <text>{{item.title}}</text>
-                  <checkbox class="absolute right-0 box-middle mr15" value="{{item.title}}" checked="{{item.checked}}"/>
-                </label>
-              </block>
-            </checkbox-group>
-          </view>
-        </view>
-        <view>
-          <view class="mr30 pt30 pb30 font-28 color-333">随车工具</view>
-          <view class="fn-clear">
-            <checkbox-group bindchange="changeTool">
-              <block wx:for="{{carToolList}}" wx:key='index'>
-                <label class="fn-fl block mb20 relative inner30 pr80 bg-f6 font-28 ulib-r10 mr20">
-                  <text>{{item.title}}</text>
-                  <checkbox class="absolute right-0 box-middle mr15" value="{{item.title}}" checked="{{item.checked}}"/>
-                </label>
-              </block>
-            </checkbox-group>
-          </view>
-        </view>
-        <view class="pr30">
-          <view class="pt30 pb30 font-28 color-333">补充说明</view>
-          <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" style="height:120rpx;" placeholder-class="color-ccc" maxlength='140' placeholder="请输入补充说明" model:value="{{remark}}" />
-        </view>
-      </view>
-      <view class="mt40 pb60 pl60 pr60">
-        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCusorderCkcar">确认交车</button>
-      </view>
-    </block>
-    <view class="pl30 pr30" wx:if="{{info.ckcar_status == 0&&info.ckcar_data.info.length>0}}">
-      <view class="relative bbs-1-eb bbs-1-eb pl140 font-28">
-        <view class="absolute left-0 box-middle font-28 color-333">随车资料</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">
-          <block wx:for="{{info.ckcar_data.info}}" wx:key='index'>
-            <text class="pl10">{{item}}</text>
-          </block>
-        </view>
-      </view>
-      <view class="relative bbs-1-eb pl140 font-28">
-        <view class="absolute left-0 box-middle font-28 color-333">随车工具</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">
-          <block wx:for="{{info.ckcar_data.tool}}" wx:key='index'>
-            <text class="pl10">{{item}}</text>
-          </block>
-        </view>
-      </view>
-      <view class="relative bbs-1-eb pl140 font-28">
-        <view class="absolute left-0 box-middle font-28 color-333">补充说明</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">{{info.ckcar_data.remark}}</view>
-      </view>
-    </view>
-    <!--end交付随车信息-->
-
-  <!--订单作废 收取意向金 操作-->
-  <view class="fixed left-0 right-0 bottom-0 pt20 pl30 pr30 pb40 bg-000-op80 fn-flex z-index-9999" wx:if="{{!info.refund_status}}">
-    <button bindtap="putAppCusorderV2Status" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover" wx:if="{{!info.inten_money&&!info.price_book_status&&!info.price_last_status&&!price_srv_status}}"><i class="iconfont mr5 icon-zuofei"></i>订单作废</button>
-    <button bindtap="optShowOrderCode" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover"><i class="iconfont mr5 icon-zhifu"></i>邀请扫码</button>
-  </view>
-
-</view>
-<!-- <lcb-footer></lcb-footer> -->
-<lcb-backChannel></lcb-backChannel>
-
-<lcb-msg isShow="{{isShowOrderCode}}">
-	<view slot="content">
-    <view class="inner40">
-      <view class="font-36 text-center">邀请客户扫码</view>
-      <view class="pt40 text-center">
-        <image class='inline-block img-250x250' lazy-load="{{true}}" mode="aspectFit" src="{{info.pay_img}}"></image>
-      </view>
-    </view>
-    <view class="pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="optShowOrderCode" class="inline-block wp50 btn-36afa2 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">我知道了</button>
-    </view>
-	</view>
-</lcb-msg>
-
-<lcb-msg isShow="{{isShowMessage}}">
-	<view slot="content">
-		<view class="inner40">
-      <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" placeholder-class="color-ccc" maxlength='100' placeholder="请输入短信内容" bindinput='inputTx' data-key="content" name='content' value='{{content}}' />
-    </view>
-    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="hideMessage" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
-      <button disabled="{{submitFlag}}" bindtap="postAppSmsCusorder" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
-    </view>
-	</view>
-</lcb-msg>
@@ -1,25 +0,0 @@
-.red-tip{
-  width:12rpx;
-  height:12rpx;
-  background-color:#f9394d;
-}
-
-/*复选框外框样式*/
-checkbox .wx-checkbox-input {
-  width:30rpx;
-  height:30rpx;
-  border-color: #999;
-  background: #f6f6f6;
-} 
-/* 选中后的 背景样式*/
-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-  border-color: #36afa2;
-  background: #36afa2;
-}
-/*复选框选中后内部样式*/
-checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
-  font-size:20rpx;
-  color:#fff;
-  transform:translate(-50%, -50%) scale(1);
-  -webkit-transform:translate(-50%, -50%) scale(1);
-}
@@ -29,20 +29,20 @@ Page({
    brand_id:'',//品牌
    brandIndex:-1,//车辆品牌索引
    car_id:'',//车系id
-    modelIndex:-1,//车系车型索引
+    modelIndex:-1,//车型车系索引

-    v_id:'',//车辆版本id
-    color_id:'',//车身颜色id
+    v_id:'',//车型级别id
+    color_id:'',//车型颜色id
    incolor_id:'',//内饰颜色id
    b_s_id:'',//备选车型id
    finance_id:'',//金融机构id
    
    spareIndex:-1,//备选车型索引
-    colorArray:[],//车身颜色列表
-    levelArray:[],//车辆版本列表
+    colorArray:[],//车型颜色列表
+    levelArray:[],//车型级别列表
    interiorArray:[],//内饰颜色
-    colorIndex:-1,//车身颜色索引
-    levelIndex:-1,//车辆版本索引
+    colorIndex:-1,//车型颜色索引
+    levelIndex:-1,//车型级别索引
    interiorIndex:-1,//内饰颜色索引
    financeArray:[],//金融机构
    financeIndex:-1,//金融机构索引
@@ -51,7 +51,7 @@ Page({
    submitFlag:false,

    paymentIndex:-1,//付款方式
-    payment:['全款', '按揭',],
+    payment:['全款', '分期',],
    mainIndex:-1,//购车主体
    main:['个人', '公司',],

@@ -142,7 +142,7 @@ Page({
                    modelList:res2.data.list,
                  })

-                  //匹配车辆版本
+                  //匹配车型级别
                  if(!!res.data.v_id){
                    let levelparams = {};
                    levelparams['id'] = res.data.car_id;
@@ -164,7 +164,7 @@ Page({
                          levelList:res3.data.list,
                        })

-                        //匹配车身颜色
+                        //匹配车型颜色
                        if(!!res.data.color_id){
                          let colorparams = {};
                          colorparams['id'] = res.data.car_id;
@@ -187,7 +187,7 @@ Page({
                                colorList:res4.data.list,
                              })

-                              //匹配车身颜色
+                              //匹配车型颜色
                              if(!!res.data.incolor_id){
                                let interiorparams = {};
                                interiorparams['id'] = res.data.car_id;
@@ -408,17 +408,17 @@ Page({
      case 2:
        if(this.data.car_id == '' ){
          wx.showToast({
-            title: '请选择车系车型',
+            title: '请选择车型车系',
            icon: 'none'
          })
        }else if(this.data.v_id == '' ){
          wx.showToast({
-            title: '请选择车辆版本',
+            title: '请选择车型级别',
            icon: 'none'
          })
        }else if(this.data.color_id == '' ){
          wx.showToast({
-            title: '请选择车身颜色',
+            title: '请选择车型颜色',
            icon: 'none'
          })
        }else if(this.data.incolor_id == '' ){
@@ -445,7 +445,7 @@ Page({
            icon: 'none'
          })
        }
-        else if(this.data.srv_ids.length == 0 && this.data.userInfo.biz_type == 1){
+        else if(this.data.srv_ids.length == 0 && this.data.userInfo.biz_type != 3){
          wx.showToast({
            title: '请选择代办内容',
            icon: 'none'
@@ -528,7 +528,7 @@ Page({
    });
  },

-  //获取车系车型
+  //获取车型车系
  getAppSeries(){
    let params = {};
    params['brand_id'] = this.data.brand_id;
@@ -546,7 +546,7 @@ Page({
    });
  },

-  //获取车辆版本
+  //获取车型级别
  getAppSeriesAttrslevel(){
    let params = {};
    params['id'] = this.data.car_id;
@@ -566,7 +566,7 @@ Page({
    });
  },

-  //获取车身颜色
+  //获取车型颜色
  getAppSeriesAttrscolor(){
    let params = {};
    params['id'] = this.data.car_id;
@@ -616,17 +616,17 @@ Page({
        brand_id:this.data.brandList[e.detail.value].id,
        brandIndex:e.detail.value,
        car_id:'',//车系id
-        v_id:'',//车辆版本id
-        color_id:'',//车身颜色id
+        v_id:'',//车型级别id
+        color_id:'',//车型颜色id
        incolor_id:'',//内饰颜色id
        b_s_id:'',//备选车型id
-        modelIndex:-1,//车系车型索引
+        modelIndex:-1,//车型车系索引
        spareIndex:-1,//备选车型索引
-        colorArray:[],//车身颜色列表
-        levelArray:[],//车辆版本列表
+        colorArray:[],//车型颜色列表
+        levelArray:[],//车型级别列表
        interiorArray:[],//内饰颜色
-        colorIndex:-1,//车身颜色索引
-        levelIndex:-1,//车辆版本索引
+        colorIndex:-1,//车型颜色索引
+        levelIndex:-1,//车型级别索引
        interiorIndex:-1,//内饰颜色索引
        priceinfo:'',
      })
@@ -640,16 +640,16 @@ Page({
      this.setData({
        car_id:this.data.modelList[e.detail.value].id,
        modelIndex:e.detail.value,
-        v_id:'',//车辆版本id
-        color_id:'',//车身颜色id
+        v_id:'',//车型级别id
+        color_id:'',//车型颜色id
        incolor_id:'',//内饰颜色id
        b_s_id:'',//备选车型id
        spareIndex:-1,//备选车型索引
-        colorArray:[],//车身颜色列表
-        levelArray:[],//车辆版本列表
+        colorArray:[],//车型颜色列表
+        levelArray:[],//车型级别列表
        interiorArray:[],//内饰颜色
-        colorIndex:-1,//车身颜色索引
-        levelIndex:-1,//车辆版本索引
+        colorIndex:-1,//车型颜色索引
+        levelIndex:-1,//车型级别索引
        interiorIndex:-1,//内饰颜色索引
        priceinfo:'',
      })
@@ -657,17 +657,17 @@ Page({
    }
  },

-  //车辆版本
+  //车型级别
  changeLevel(e) {
    if(this.data.levelIndex != e.detail.value && e.detail.value >= 0){
      this.setData({
        v_id:this.data.levelList[e.detail.value].id,
        levelIndex:e.detail.value,
-        color_id:'',//车身颜色id
+        color_id:'',//车型颜色id
        incolor_id:'',//内饰颜色id
-        colorArray:[],//车身颜色列表
+        colorArray:[],//车型颜色列表
        interiorArray:[],//内饰颜色
-        colorIndex:-1,//车身颜色索引
+        colorIndex:-1,//车型颜色索引
        interiorIndex:-1,//内饰颜色索引
        priceinfo:'',
      })
@@ -677,7 +677,7 @@ Page({
    }
  },

-  //车身颜色
+  //车型颜色
  changeColor(e) {
    if(this.data.colorIndex != e.detail.value && e.detail.value >= 0){
      this.setData({
@@ -855,7 +855,7 @@ Page({
    if(that.data.fine_ids.length>0){
      params['fine_ids'] = that.data.fine_ids;
    }
-    if(that.data.priceinfo.fine_money && that.data.userInfo.biz_type == 1){
+    if(that.data.priceinfo.fine_money){
      params['if_fine'] = that.data.if_fine?'1':'0';
      if(that.data.if_fine&&that.data.disc_fine_money!= ''){
        params['disc_fine_money'] = that.data.disc_fine_money;
@@ -23,7 +23,7 @@
          </view>
        </view>
        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{brandIndex != -1}}">
-          <view class="absolute left-0 box-middle font-28 color-333">车系车型<text class="color-f9394d">*</text></view>
+          <view class="absolute left-0 box-middle font-28 color-333">车型车系<text class="color-f9394d">*</text></view>
          <view class="pt30 pb30 text-right font-28 color-666">
            <picker bindchange="changeModel" value="{{modelIndex}}" range="{{modelArray}}">
              <text class="color-ccc" wx:if="{{modelIndex == -1}}">请选择</text>
@@ -33,7 +33,7 @@
          </view>
        </view>
        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{modelIndex != -1}}">
-          <view class="absolute left-0 box-middle font-28 color-333">车辆版本<text class="color-f9394d">*</text></view>
+          <view class="absolute left-0 box-middle font-28 color-333">车型级别<text class="color-f9394d">*</text></view>
          <view class="pt30 pb30 text-right font-28 color-666">
            <picker bindchange="changeLevel" value="{{levelIndex}}" range="{{levelArray}}">
              <text class="color-ccc" wx:if="{{levelIndex == -1}}">请选择</text>
@@ -43,7 +43,7 @@
          </view>
        </view>
        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{levelIndex != -1}}">
-          <view class="absolute left-0 box-middle font-28 color-333">车身颜色<text class="color-f9394d">*</text></view>
+          <view class="absolute left-0 box-middle font-28 color-333">车型颜色<text class="color-f9394d">*</text></view>
          <view class="pt30 pb30 text-right font-28 color-666">
            <picker bindchange="changeColor" value="{{colorIndex}}" range="{{colorArray}}">
              <text class="color-ccc" wx:if="{{colorIndex == -1}}">请选择</text>
@@ -114,55 +114,53 @@
            <view class="absolute right-0 box-middle font-28 color-666">元</view>
          </view>
        </view>
-        <block wx:if="{{userInfo.biz_type == 1}}">
-          <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.fine_money}}">
-            <view class="absolute left-0 box-middle">精品尊享包<text class="ml10 font-24">{{priceinfo.fine_money}}元</text></view>
-            <view class="relative pt30 pb30 text-right" bindtap="changeFineBag">
-              <checkbox value="{{if_fine}}" checked="{{if_fine}}"/>
+        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.fine_money}}">
+          <view class="absolute left-0 box-middle">精品尊享包<text class="ml10 font-24">{{priceinfo.fine_money}}元</text></view>
+          <view class="relative pt30 pb30 text-right" bindtap="changeFineBag">
+            <checkbox value="{{if_fine}}" checked="{{if_fine}}"/>
+          </view>
+        </view>
+        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{if_fine&&priceinfo.dis_fine_money}}">
+          <view class="absolute left-0 box-middle">精品优惠</view>
+          <view class="relative pr40">
+            <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入精品优惠金额" bindinput='inputDiscFine' data-key="disc_fine_money" name='disc_fine_money' value="{{disc_fine_money}}" />
+            <view class="absolute right-0 box-middle font-28 color-666">元</view>
+          </view>
+        </view>
+        <view class="bbs-1-eb last-b-none">
+          <view class="relative pl190">
+            <view class="absolute left-0 box-middle font-28 color-333">代办相关<text class="color-f9394d" wx:if="{{userInfo.biz_type != 3}}">*</text></view>
+            <view class="pt30 pb30 text-right font-28 color-666">
+              当前代办费用：<text class="color-f9394d">{{srv_total}}</text>元
            </view>
          </view>
-          <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{if_fine&&priceinfo.dis_fine_money}}">
-            <view class="absolute left-0 box-middle">精品优惠</view>
-            <view class="relative pr40">
-              <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入精品优惠金额" bindinput='inputDiscFine' data-key="disc_fine_money" name='disc_fine_money' value="{{disc_fine_money}}" />
-              <view class="absolute right-0 box-middle font-28 color-666">元</view>
+          <view class="pb10 fn-clear">
+            <checkbox-group bindchange="changeAgency">
+              <block wx:for="{{agencyList}}" wx:key='index'>
+                <label class="fn-fl block mb20 wp31 relative inner30 bg-f6 font-28 ulib-r10 {{(index+1)%3==0?'':'mr20'}}">
+                  <text>{{item.title}}</text>
+                  <checkbox class="absolute right-0 box-middle mr15" value="{{item.id}}" checked="{{item.checked}}"/>
+                </label>
+              </block>
+            </checkbox-group>
+          </view>
+        </view>
+        <view class="bbs-1-eb last-b-none">
+          <view class="relative pl190">
+            <view class="absolute left-0 box-middle font-28 color-333">精品赠送</view>
+            <view class="pt30 pb30 text-right font-28 color-666">
+              精品价值：<text class="color-f9394d">{{fine_total}}</text>元
            </view>
          </view>
-          <view class="bbs-1-eb last-b-none">
-            <view class="relative pl190">
-              <view class="absolute left-0 box-middle font-28 color-333">代办相关<text class="color-f9394d" wx:if="{{userInfo.biz_type != 3}}">*</text></view>
-              <view class="pt30 pb30 text-right font-28 color-666">
-                总计：<text class="color-f9394d">{{srv_total}}</text>元
-              </view>
-            </view>
-            <view class="pb10 fn-clear">
-              <checkbox-group bindchange="changeAgency">
-                <block wx:for="{{agencyList}}" wx:key='index'>
-                  <label class="fn-fl block mb20 wp31 relative inner30 bg-f6 font-28 ulib-r10 {{(index+1)%3==0?'':'mr20'}}">
-                    <text>{{item.title}}</text>
-                    <checkbox class="absolute right-0 box-middle mr15" value="{{item.id}}" checked="{{item.checked}}"/>
-                  </label>
-                </block>
-              </checkbox-group>
-            </view>
+          <view class="pb10">
+              <block wx:for="{{fineList}}" wx:key='index'>
+                <view class="block mb20 relative inner30 bg-f6 font-28 ulib-r10" bindtap="changeFine" data-index="{{index}}">
+                  <text>{{item.title}}</text>
+                  <checkbox class="absolute right-0 box-middle mr15" value="{{item.id}}" checked="{{item.checked}}"/>
+                </view>
+              </block>
          </view>
-          <view class="bbs-1-eb last-b-none">
-            <view class="relative pl190">
-              <view class="absolute left-0 box-middle font-28 color-333">精品赠送</view>
-              <view class="pt30 pb30 text-right font-28 color-666">
-                精品价值：<text class="color-f9394d">{{fine_total}}</text>元
-              </view>
-            </view>
-            <view class="pb10">
-                <block wx:for="{{fineList}}" wx:key='index'>
-                  <view class="block mb20 relative inner30 bg-f6 font-28 ulib-r10" bindtap="changeFine" data-index="{{index}}">
-                    <text>{{item.title}}</text>
-                    <checkbox class="absolute right-0 box-middle mr15" value="{{item.id}}" checked="{{item.checked}}"/>
-                  </view>
-                </block>
-            </view>
-          </view>
-        </block>
+        </view>
      </view>

    </view>
@@ -182,15 +180,15 @@
      <view class="pt30 pb30 text-right font-28 color-666">{{brandArray[brandIndex]}}</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="absolute left-0 box-middle font-28 color-333">车型车系</view>
      <view class="pt30 pb30 text-right font-28 color-666">{{modelArray[modelIndex]}}</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="absolute left-0 box-middle font-28 color-333">车型级别</view>
      <view class="pt30 pb30 text-right font-28 color-666">{{levelArray[levelIndex]}}</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="absolute left-0 box-middle font-28 color-333">车型颜色</view>
      <view class="pt30 pb30 text-right font-28 color-666">{{colorArray[colorIndex]}}</view>
    </view>
    <view class="relative bbs-1-eb pl190 last-b-none">
@@ -225,36 +223,34 @@
      <view class="absolute left-0 box-middle font-28 color-333">车身优惠</view>
      <view class="pt30 pb30 text-right font-28 color-f9394d" style="min-height:38rpx;">{{disc_money}}元</view>
    </view>
-    <block wx:if="{{userInfo.biz_type == 1}}">
-      <view class="mt40 font-32">其他信息</view>
-      <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{if_fine}}">
-        <view class="absolute left-0 box-middle font-28 color-333">精品尊享包</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">{{priceinfo.fine_money}}元</view>
+    <view class="mt40 font-32">其他信息</view>
+    <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{if_fine}}">
+      <view class="absolute left-0 box-middle font-28 color-333">精品尊享包</view>
+      <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">{{priceinfo.fine_money}}元</view>
+    </view>
+    <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{disc_fine_money != ''}}">
+      <view class="absolute left-0 box-middle font-28 color-333">精品优惠</view>
+      <view class="pt30 pb30 text-right font-28 color-f9394d" style="min-height:38rpx;">{{disc_fine_money}}元</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" style="min-height:38rpx;">
+        <block wx:for="{{agencyList}}" wx:key='index'>
+          <text class="pl10" wx:if="{{item.checked}}">{{item.title}}</text>
+        </block>
      </view>
-      <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{disc_fine_money != ''}}">
-        <view class="absolute left-0 box-middle font-28 color-333">精品优惠</view>
-        <view class="pt30 pb30 text-right font-28 color-f9394d" style="min-height:38rpx;">{{disc_fine_money}}元</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" style="min-height:38rpx;">
+        <block wx:for="{{fineList}}" wx:key='index'>
+          <text class="pl10" wx:if="{{item.checked}}">{{item.title}}</text>
+        </block>
      </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" style="min-height:38rpx;">
-          <block wx:for="{{agencyList}}" wx:key='index'>
-            <text class="pl10" wx:if="{{item.checked}}">{{item.title}}</text>
-          </block>
-        </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" style="min-height:38rpx;">
-          <block wx:for="{{fineList}}" wx:key='index'>
-            <text class="pl10" wx:if="{{item.checked}}">{{item.title}}</text>
-          </block>
-        </view>
-      </view>
-    </block>
+    </view>
    <view class="fixed left-0 right-0 bottom-0 bg-fff-op90 inner40 fn-flex safe-pb">
      <button class="wp100 bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" hover-class="btn-36afa2-hover" bindtap="optPreview">重新编辑</button>
-      <button class="wp100 btn-36afa2 ml20 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCusorder2">确认</button>
+      <button class="wp100 btn-36afa2 ml20 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCusorder2">确认编辑</button>
    </view>

  </view>
@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "编辑订单",
-  "usingComponents": {}
-}
@@ -1,539 +0,0 @@
-<view class="container">
-  <view class="pl30 pr30 pb200" wx:if="{{!isPreview}}">
-    <view class="height-100">
-      <view class="fixed top-0 left-0 right-0 height-100 fn-flex pt30 pl20 pr20 bg-fff text-center z-index-1">
-        <view class="pl40 pr40" wx:for="{{tab}}" wx:key="index">
-          <view class="inline-block {{step==item.step?'font-40 color-1a':'pt10 font-32'}} {{step>item.step?'color-666':''}} {{step<item.step?'color-999':''}}" bindtap="{{item.step < step?'optstep':''}}" data-step="{{item.step}}">
-            {{item.title}}
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="pb200">
-      <view wx:if="{{step == 2}}">
-        <view class="relative bbs-1-eb pl190 last-b-none">
-          <view class="absolute left-0 box-middle font-28 color-333">车辆品牌<text class="color-f9394d">*</text></view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <picker bindchange="changeBrand" value="{{brandIndex}}" range="{{brandArray}}">
-              <text class="color-ccc" wx:if="{{brandIndex == -1}}">请选择</text>
-              <text wx:else>{{brandArray[brandIndex]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{brandIndex != -1}}">
-          <view class="absolute left-0 box-middle font-28 color-333">车系车型<text class="color-f9394d">*</text></view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <picker bindchange="changeModel" value="{{modelIndex}}" range="{{modelArray}}">
-              <text class="color-ccc" wx:if="{{modelIndex == -1}}">请选择</text>
-              <text wx:else>{{modelArray[modelIndex]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{modelIndex != -1}}">
-          <view class="absolute left-0 box-middle font-28 color-333">车辆版本<text class="color-f9394d">*</text></view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <picker bindchange="changeLevel" value="{{levelIndex}}" range="{{levelArray}}">
-              <text class="color-ccc" wx:if="{{levelIndex == -1}}">请选择</text>
-              <text wx:else>{{levelArray[levelIndex]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{levelIndex != -1}}">
-          <view class="absolute left-0 box-middle font-28 color-333">车身颜色<text class="color-f9394d">*</text></view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <picker bindchange="changeColor" value="{{colorIndex}}" range="{{colorArray}}">
-              <text class="color-ccc" wx:if="{{colorIndex == -1}}">请选择</text>
-              <text wx:else>{{colorArray[colorIndex]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{colorIndex != -1}}">
-          <view class="absolute left-0 box-middle font-28 color-333">内饰颜色<text class="color-f9394d">*</text></view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <picker bindchange="changeInterior" value="{{interiorIndex}}" range="{{interiorArray}}">
-              <text class="color-ccc" wx:if="{{interiorIndex == -1}}">请选择</text>
-              <text wx:else>{{interiorArray[interiorIndex]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
-          </view>
-        </view>
-
-        <!--选装-->
-        <block wx:if="{{packageList.length>0&&interiorIndex != -1}}">
-          <view class="pt30 pb30 font-32">选装</view>
-          <checkbox-group bindchange="choosePackage">
-            <block wx:for='{{packageList}}' wx:key='index' wx:key="index">
-              <label class="block inner40 pb5 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden">
-                <view class="relative pr100">
-                  <view class="font-30">{{item.title}}</view>
-                  <checkbox class="absolute top-0 right-0 font-30" value="{{item.id}}" checked="{{item.checked}}"/>
-                </view>
-                <view class="mt15 text-middle font-28 color-666">￥{{item.price}}</view>
-                <view class="mt15 font-24 color-666 text-break line-height-18" >
-                  <rich-text nodes="{{item.descrip}}"></rich-text>
-                </view>
-              </label>
-            </block>
-          </checkbox-group>
-        </block>
-
-      </view>
-
-      <view wx:if="{{step == 3}}">
-        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{!info.price_loan0_status&&!info.price_loan_status}}">
-          <view class="absolute left-0 box-middle font-28 color-333">付款方式<text class="color-f9394d">*</text></view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <picker bindchange="changePayment" value="{{paymentIndex}}" range="{{payment}}">
-              <text class="color-ccc" wx:if="{{paymentIndex == -1}}">请选择</text>
-              <text wx:else>{{payment[paymentIndex]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb pl190 last-b-none" wx:else>
-          <view class="absolute left-0 box-middle font-28 color-333">付款方式</view>
-          <view class="pt30 pb30 text-right font-28 color-666">{{payment[paymentIndex]}}</view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28">
-          <view class="absolute left-0 box-middle">期望交付时间<text class="color-f9394d">*</text></view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <picker mode="date" value="{{delry_time}}" bindchange="delryTime">
-              <text class="color-ccc" wx:if="{{delry_time == ''}}">请选择</text>
-              <text wx:else>{{delry_time}}</text>
-              <i class="iconfont ml10 icon-gengduo"></i>
-            </picker>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price}}">
-          <view class="absolute left-0 box-middle color-333">平台售价</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.price}}</text>元</view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price_color}}">
-          <view class="absolute left-0 box-middle color-333">颜色加价</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.price_color}}</text>元</view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price_coplus}}">
-          <view class="absolute left-0 box-middle color-333">公司加价</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.price_coplus}}</text>元</view>
-        </view>
-        <block wx:if="{{paymentIndex == 1}}">
-          <block wx:if="{{info.price_book_status||info.price_loan0_status}}">
-            <view class="relative bbs-1-eb last-b-none pl180 font-28">
-              <view class="absolute left-0 box-middle color-333">首付类型</view>
-              <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">{{firstPayArr[firstPayIndex]}}</view>
-            </view>
-            <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{price_loan0>0}}">
-              <view class="absolute left-0 box-middle color-333">首付按揭金额</view>
-              <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">{{price_loan0}}</view>
-            </view>
-          </block>
-          <block wx:else>
-            <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">
-                <picker bindchange="changeFirstPay" value="{{firstPayIndex}}" range="{{firstPayArr}}">
-                  <text class="color-ccc" wx:if="{{firstPayIndex == -1}}">请选择</text>
-                  <text wx:else>{{firstPayArr[firstPayIndex]}}</text>
-                  <i class="iconfont ml5 icon-gengduo"></i>
-                </picker>
-              </view>
-            </view>
-            <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{if_zero_firstpay==1&&firstPayArr[firstPayIndex]=='按揭'}}">
-              <view class="absolute left-0 box-middle">首付按揭金额</view>
-              <view>
-                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="digit" placeholder="请输入首付按揭金额" model:value='{{price_loan0}}' 	always-embed='{{true}}' />
-              </view>
-            </view>
-          </block>
-        </block>
-        <block wx:if="{{info.price_book_status}}">
-          <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.sdeposit&&if_zero_firstpay!=1}}">
-            <view class="absolute left-0 box-middle color-333">定金</view>
-            <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.sdeposit}}</text>元</view>
-          </view>
-          <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price}}">
-            <view class="absolute left-0 box-middle color-333">最终售价</view>
-            <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{options_total+priceinfo.price+priceinfo.price_color+priceinfo.price_coplus-(priceinfo.sdisc_money>0?priceinfo.sdisc_money:0)}}</text>元</view>
-          </view>
-        </block>
-        <block wx:else>
-          <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{priceinfo.deposit_list&&paymentIndex != -1&&if_zero_firstpay!=1}}">
-            <view class="absolute left-0 box-middle font-28 color-333">定金<text class="color-f9394d">*</text></view>
-            <view class="pt30 pb30 text-right font-28 color-666">
-              <view class="fn-clear">
-                <block wx:for="{{priceinfo.deposit_list}}" wx:key='index'>
-                  <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdeposit == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDeposit" data-deposit="{{item}}">
-                    {{item}}
-                  </view>
-                </block>
-                <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDeposit' bindblur='inputBlurDeposit' value="{{priceinfo.sdeposit}}" always-embed='{{true}}' />
-              </view>
-            </view>
-          </view>
-        </block>
-        <block wx:if="{{info.price_last_status}}">
-          <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{!!priceinfo.sdisc_money&&priceinfo.sdisc_money != ''}}">
-            <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>优惠</view>
-            <view class="pt25 pb25 text-right" style="min-height:30rpx"><text class="mr10 color-f9394d">{{priceinfo.sdisc_money}}</text>元</view>
-          </view>
-        </block>
-        <block wx:else>
-          <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.dis_money}}">
-            <view class="absolute left-0 box-middle font-28 color-333">车身优惠</view>
-            <view class="pt30 pb30 text-right font-28 color-666">
-              <view class="fn-clear">
-                <block wx:for="{{priceinfo.dis_money_list}}" wx:key='index'>
-                  <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdisc_money == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDisc_money" data-disc_money="{{item}}">
-                    {{item}}
-                  </view>
-                </block>
-                <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDisc_money' bindblur='inputBlurDisc_money' value="{{priceinfo.sdisc_money}}" always-embed='{{true}}' />
-              </view>
-            </view>
-          </view>
-        </block>
-        <!--水平业务编辑-->
-        <block wx:if="{{userInfo.biz_type == 1}}">
-          <block wx:if="{{info.price_srv_status}}">
-            <!-- <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{if_fine}}">
-              <view class="absolute left-0 box-middle font-28 color-333">精品尊享包<text class="ml10 font-24">{{priceinfo.fine_money}}元</text></view>
-              <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.fine_money-(priceinfo.sdisc_fine_money>0?priceinfo.sdisc_fine_money:0)}}</text>元</view>
-            </view>
-            <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{!!priceinfo.sdisc_fine_money&&priceinfo.sdisc_fine_money != ''}}">
-              <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>优惠</view>
-              <view class="pt25 pb25 text-right" style="min-height:30rpx"><text class="mr10 color-f9394d">{{priceinfo.sdisc_fine_money}}</text>元</view>
-            </view> -->
-            <view class="relative bbs-1-eb last-b-none pl180 font-28">
-              <view class="absolute left-0 box-middle color-333">委托代办</view>
-              <view class="pt30 pb30 text-right font-28 color-666" style="height:38rpx;"><text class="mr10 color-f9394d">{{srv_total}}</text>元</view>
-            </view>
-            <block wx:for="{{agencyList}}" wx:key='index'>
-              <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{item.checked}}">
-                <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>{{item.title}}</view>
-                <view class="pt25 pb25 text-right" style="min-height:30rpx">
-                  <block wx:if="{{item.price>0}}"><text class="mr10 color-f9394d">{{item.sprice}}</text>元</block>
-                  <block wx:elif="{{item.text}}">{{item.text}}</block>
-                </view>
-              </view>
-            </block>
-            <view class="relative bbs-1-eb last-b-none pl180 font-28">
-              <view class="absolute left-0 box-middle color-333">精品选装</view>
-              <view class="pt30 pb30 text-right font-28 color-666" style="height:38rpx;"><text class="mr10 color-f9394d">{{fine_total}}</text>元</view>
-            </view>
-            <block wx:for="{{fines}}" wx:key='index'>
-              <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{item.txt}}">
-                <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>{{item.txt}}</view>
-                <view class="pt25 pb25 text-right" style="min-height:30rpx">
-                  <blcok wx:if="{{item.price}}"><text class="mr10 color-f9394d">{{item.price}}</text>元</blcok>
-                </view>
-              </view>
-            </block>
-          </block>
-          <block wx:else>
-            <!-- <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.fine_money}}">
-              <view class="absolute left-0 box-middle">精品尊享包<text class="ml10 font-24">{{priceinfo.fine_money}}元</text></view>
-              <view class="relative pt30 pb30 text-right" bindtap="changeFineBag">
-                <checkbox value="{{if_fine}}" checked="{{if_fine}}"/>
-              </view>
-            </view>
-            <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{if_fine&&priceinfo.dis_fine_money}}">
-              <view class="absolute left-0 box-middle font-28 color-333">精品优惠</view>
-              <view class="pt30 pb30 text-right font-28 color-666">
-                <view class="fn-clear">
-                  <block wx:for="{{priceinfo.dis_fine_money_list}}" wx:key='index'>
-                    <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdisc_fine_money == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDisc_fine_money" data-disc_fine_money="{{item}}">
-                      {{item}}
-                    </view>
-                  </block>
-                  <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDisc_fine_money' bindblur='inputBlurDisc_fine_money' value="{{priceinfo.sdisc_fine_money}}" always-embed='{{true}}' />
-                </view>
-              </view>
-            </view> -->
-            <view class="bbs-1-eb last-b-none" wx:if="{{agencyList.length>0}}">
-              <view class="relative pl190">
-                <view class="absolute left-0 box-middle font-28 color-333">委托代办</view>
-                <view class="pt30 pb30 text-right font-28 color-666">
-                  总计：<text class="mr10 color-f9394d">{{srv_total}}</text>元
-                </view>
-              </view>
-              <view class="pb10">
-                <checkbox-group bindchange="changeAgency">
-                  <block wx:for="{{agencyList}}" wx:key='index'>
-                    <view class="mb20 block relative height-100 pl220 pr20 bg-f6 font-28 ulib-r10">
-                      <label class="absolute box-middle left-0 ml30">
-                        <checkbox class="text-middle mr5" value="{{item.id}}" checked="{{item.checked}}"/>
-                        <text class="text-middle">{{item.title}}</text>
-                      </label>
-                      <view class="pt25 text-right" wx:if="{{item.checked&&item.price>0}}">
-                        <block wx:for="{{item.price_list}}" wx:for-item='price_list' wx:for-index='i' wx:key='i'>
-                          <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == price_list?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{price_list}}">{{price_list}}</text>
-                        </block>
-                        <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="价格" bindinput='inputAgency' data-index="{{index}}" value="{{item.sprice}}" always-embed='{{true}}' />
-                      </view>
-                      <view class="pt30 text-right color-666" wx:elif="{{item.text}}">{{item.text}}</view>
-                    </view>
-                  </block>
-                </checkbox-group>
-              </view>
-            </view>
-            <view class="bbs-1-eb last-b-none">
-              <view class="relative pl190">
-                <view class="absolute left-0 box-middle font-28 color-333">精品选装</view>
-                <view class="pt30 pb30 text-right font-28 color-666">
-                  总计：<text class="mr10 color-f9394d">{{fine_total}}</text>元
-                </view>
-              </view>
-              <view class="pb10">
-                <block wx:for="{{fines}}" wx:key='index'>
-                  <view class="fn-clear mb20 relative pl30 pr80 bg-f6 ulib-r10">
-                    <view class="fn-fl wp70">
-                      <input class="wp100 height-100 font-28" placeholder-class="color-ccc" type="text" placeholder="精品名称" bindinput='inputFines' data-index="{{index}}" data-type="txt" value="{{item.txt}}" always-embed='{{true}}' />
-                    </view>
-                    <view class="fn-fr wp25">
-                      <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="digit" placeholder="精品价格" bindinput='inputFines' data-index="{{index}}" data-type="price" value="{{item.price}}" always-embed='{{true}}' />
-                    </view>
-                    <i class="absolute box-middle right-0 mr20 iconfont icon-guanbi1 font-30 color-666" bindtap="delFine" data-index="{{index}}"></i>
-                  </view>
-                </block>
-                <picker class="mb20 inner20 bds-2-36afa2 text-center font-28 color-36afa2 ulib-r10" bindchange="changeFine" value="{{finedIndex}}" range="{{fineArr}}">
-                <i class="iconfont mr10 font-24 icon-jia1"></i>添加
-              </picker>
-              </view>
-            </view>
-          </block>
-        </block>
-        <block wx:if="{{userInfo.biz_type != 1}}">
-          <block wx:for="{{fines}}" wx:key='index'>
-            <view class="relative bbs-1-eb last-b-none pl180 font-28">
-              <view class="absolute left-0 box-middle">{{item.txt}}</view>
-              <view>
-                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="digit" placeholder="请输入服务费" bindinput='inputFines' data-index="{{index}}" data-type="price" value="{{item.price}}" always-embed='{{true}}' />
-              </view>
-            </view>
-          </block>
-        </block>
-        <!--特别约定编辑-->
-        <block wx:if="{{userInfo.show_sa}}">
-          <block wx:if="{{info.price_srv_status}}">
-            <view class="relative pt30 font-28 color-333">特别约定</view>
-            <view class="mt20 inner30 bds-1-eb line-height-16 font-28 color-666 ulib-r10">{{sa}}</view>
-          </block>
-          <block wx:else>
-            <view class="relative pt30 font-28 color-333">特别约定</view>
-            <textarea class="wp100 mt20 inner20 line-height-16 bg-f6 font-28 ulib-r10" style="height:180rpx;" placeholder-class="color-ccc" placeholder="请填写特别约定" model:value='{{sa}}' always-embed='{{true}}' />
-          </block>
-        </block>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.show_local_bill}}">
-          <view class="absolute left-0 box-middle">需开具本地发票</view>
-          <view class="relative pt30 pb30 text-right">
-            <switch checked="{{if_local_bill}}" bindchange="switchAddrDef" type="switch" color='#36afa2' style="zoom:0.8" />
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="fixed left-0 right-0 bottom-0 bg-fff-op90 inner40 fn-flex safe-pb">
-      <block wx:if="{{step==2}}">
-        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="nextstep" wx:if="{{business_type==0||business_type==2}}">下一步</button>
-        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" wx:elif="{{business_type==1}}">下一步</button>
-        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="getAppBusiness" wx:elif="{{business_type==3}}">下一步</button>
-      </block>
-      <block wx:elif="{{step==3}}">
-        <button class="wp100 bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" hover-class="btn-36afa2-hover" bindtap="optstep" data-step="{{step-1}}">上一步</button>
-        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="nextstep">登记预览</button>
-      </block>
-    </view>
-  </view>
-
-  <view class="pl30 pr30 text-break pb200" wx:else>
-    <view class="mt40 font-32">车辆信息</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">{{brandArray[brandIndex]}}</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">{{modelArray[modelIndex]}}</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">{{levelArray[levelIndex]}}</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">{{colorArray[colorIndex]}}</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">{{interiorArray[interiorIndex]}}</view>
-    </view>
-    <block wx:if="{{options_ids.length>0}}">
-      <view class="relative bbs-1-eb last-b-none pl180 font-28">
-        <view class="absolute left-0 box-middle color-333">选装</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="height:38rpx;"><text class="mr10 color-f9394d">{{options_total}}</text>元</view>
-      </view>
-      <block wx:for="{{packageList}}" wx:key='index'>
-        <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{item.checked}}">
-          <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>{{item.title}}</view>
-          <view class="pt25 pb25 text-right" style="min-height:30rpx">
-            <block wx:if="{{item.price>0}}"><text class="mr10 color-f9394d">{{item.price}}</text>元</block>
-          </view>
-        </view>
-      </block>
-    </block>
-    <view class="mt40 font-32">其他信息</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">{{payment[paymentIndex]}}</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">{{delry_time}}</view>
-    </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price}}">
-      <view class="absolute left-0 box-middle color-333">平台售价</view>
-      <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.price}}</text>元</view>
-    </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price_color}}">
-      <view class="absolute left-0 box-middle color-333">颜色加价</view>
-      <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.price_color}}</text>元</view>
-    </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price_coplus}}">
-      <view class="absolute left-0 box-middle color-333">公司加价</view>
-      <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.price_coplus}}</text>元</view>
-    </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{paymentIndex == 1}}">
-      <view class="absolute left-0 box-middle color-333">首付类型</view>
-      <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">{{firstPayArr[firstPayIndex]}}</view>
-    </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{price_loan0>0}}">
-      <view class="absolute left-0 box-middle color-333">首付按揭金额</view>
-      <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">{{price_loan0}}</view>
-    </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.sdeposit&&if_zero_firstpay!=1}}">
-      <view class="absolute left-0 box-middle color-333">定金</view>
-      <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.sdeposit}}</text>元</view>
-    </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price}}">
-      <view class="absolute left-0 box-middle color-333">最终售价</view>
-      <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{options_total+priceinfo.price+priceinfo.price_color+priceinfo.price_coplus-(priceinfo.sdisc_money>0?priceinfo.sdisc_money:0)}}</text>元</view>
-    </view>
-    <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{!!priceinfo.sdisc_money&&priceinfo.sdisc_money != ''}}">
-      <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>优惠</view>
-      <view class="pt25 pb25 text-right" style="min-height:30rpx"><text class="mr10 color-f9394d">{{priceinfo.sdisc_money}}</text>元</view>
-    </view>
-    <!-- <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{if_fine}}">
-      <view class="absolute left-0 box-middle font-28 color-333">精品尊享包<text class="ml10 font-24">{{priceinfo.fine_money}}元</text></view>
-      <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.fine_money-(priceinfo.sdisc_fine_money>0?priceinfo.sdisc_fine_money:0)}}</text>元</view>
-    </view>
-    <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{!!priceinfo.sdisc_fine_money&&priceinfo.sdisc_fine_money != ''}}">
-      <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>优惠</view>
-      <view class="pt25 pb25 text-right" style="min-height:30rpx"><text class="mr10 color-f9394d">{{priceinfo.sdisc_fine_money}}</text>元</view>
-    </view> -->
-    <block wx:if="{{userInfo.biz_type == 1}}">
-      <view class="relative bbs-1-eb last-b-none pl180 font-28">
-        <view class="absolute left-0 box-middle color-333">委托代办</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="height:38rpx;"><text class="mr10 color-f9394d">{{srv_total}}</text>元</view>
-      </view>
-      <block wx:for="{{agencyList}}" wx:key='index'>
-        <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{item.checked}}">
-          <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>{{item.title}}</view>
-          <view class="pt25 pb25 text-right" style="min-height:30rpx">
-            <block wx:if="{{item.price>0}}"><text class="mr10 color-f9394d">{{item.sprice}}</text>元</block>
-            <block wx:elif="{{item.text}}">{{item.text}}</block>
-          </view>
-        </view>
-      </block>
-      <view class="relative bbs-1-eb last-b-none pl180 font-28">
-        <view class="absolute left-0 box-middle color-333">精品选装</view>
-        <view class="pt30 pb30 text-right font-28 color-666" style="height:38rpx;"><text class="mr10 color-f9394d">{{fine_total}}</text>元</view>
-      </view>
-      <block wx:for="{{fines}}" wx:key='index'>
-        <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{item.txt}}">
-          <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>{{item.txt}}</view>
-          <view class="pt25 pb25 text-right" style="min-height:30rpx">
-            <blcok wx:if="{{item.price}}"><text class="mr10 color-f9394d">{{item.price}}</text>元</blcok>
-          </view>
-        </view>
-      </block>
-    </block>
-    <block wx:if="{{userInfo.biz_type != 1}}">
-      <block wx:for="{{fines}}" wx:key='index'>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28">
-          <view class="absolute left-0 box-middle color-333">{{item.txt}}</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{item.price>0?item.price:0}}</text>元</view>
-        </view>
-      </block>
-    </block>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.show_local_bill}}">
-      <view class="absolute left-0 box-middle color-333">需开具本地发票</view>
-      <view class="pt30 pb30 text-right font-28 color-666" style="height:38rpx;">{{if_local_bill?'需要':'不需要'}}</view>
-    </view>
-    <block wx:if="{{userInfo.show_sa}}">
-      <view class="relative pt30 font-28 color-333">特别约定</view>
-      <view class="mt20 inner30 bds-1-eb line-height-16 font-28 color-666 ulib-r10">{{sa}}</view>
-    </block>
-    <view class="fixed left-0 right-0 bottom-0 bg-fff-op90 inner40 fn-flex safe-pb">
-      <button class="wp100 bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" hover-class="btn-36afa2-hover" bindtap="optPreview">重新编辑</button>
-      <button class="wp100 btn-36afa2 ml20 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCusorderV2">确认</button>
-    </view>
-
-  </view>
-
-</view>
-<!-- <lcb-footer></lcb-footer> -->
-<!-- <lcb-backChannel></lcb-backChannel> -->
-
-<lcb-msg isShow="{{isShowSelectCustomer}}" isHasClose="{{true}}">
-	<view slot="content">
-		<view class="mt50 font-36 text-center">选择客户</view>
-    <scroll-view class="pb50" scroll-y="true" bindscrolltolower="scrolltolower" style="max-height:600rpx;">
-      <view class="pl40 pr40 mt20">
-        <block wx:for="{{customer}}" wx:key='index'>
-          <view class="relative mt20 inner30 bg-f6 ulib-r10" bindtap="radioPicker" data-index="{{index}}">
-            <view class="font-32">{{item.name}}</view>
-            <view class="mt5 font-22 color-666">手机号：{{item.mobile}}</view>
-            <i class="absolute right-0 box-middle mr30 iconfont {{customerIndex == index?'icon-danxuan_xuanzhong color-36afa2':'icon-danxuan color-999'}}"></i>
-          </view>
-        </block>
-      </view>
-    </scroll-view>
-    <view class="bts-1-eb text-center font-32 color-666">
-      <view class="pt25 pb25 color-36afa2" bindtap="hideSelectCustomer">确定</view>
-    </view>
-	</view>
-</lcb-msg>
-
-<lcb-msg isShow="{{isShowcheck}}">
-	<view slot="content">
-		<view class="inner40 pt60 pb60 line-height-16 font-34 color-666">
-      <view class="text-center text-bold">请确认填写信息准确无误！</view>
-      <!-- <view class="mt20">
-        <view>客户姓名：{{name}}</view>
-        <view>客户手机号：{{mobile}}</view>
-        <view>客户身份证号：{{cardid}}</view>
-        <view>客户地址：{{sign}}</view>
-      </view> -->
-      </view>
-    <view class="bts-1-eb text-center font-32 color-666">
-      <view class="pt25 pb25 {{checkCount==5?'color-36afa2':'color-ccc'}}" bindtap="{{checkCount==5?'optShowcheck':''}}">{{checktext}}</view>
-    </view>
-	</view>
-</lcb-msg>
-
-<!--意向金备注-->
-<lcb-msg isShow="{{isShowRemarks}}">
-	<view slot="content">
-		<view class="inner40 pt50 pb50 line-height-16">
-      <view class="font-28 color-666">意向金：旨在客户尚未明确购车决策时(车型、付款方式等)，在不需要签订合同的情况下，收取订车费用锁定客户</view>
-    </view>
-    <view class="bts-1-eb text-center font-32 color-666">
-      <view class="pt25 pb25 color-36afa2" bindtap="optShowRemarks">知道了</view>
-    </view>
-	</view>
-</lcb-msg>
@@ -1,19 +0,0 @@
-/*复选框外框样式*/
-checkbox .wx-checkbox-input {
-  width:30rpx;
-  height:30rpx;
-  border-color: #999;
-  background: #f6f6f6;
-} 
-/* 选中后的 背景样式*/
-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-  border-color: #36afa2;
-  background: #36afa2;
-}
-/*复选框选中后内部样式*/
-checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
-  font-size:20rpx;
-  color:#fff;
-  transform:translate(-50%, -50%) scale(1);
-  -webkit-transform:translate(-50%, -50%) scale(1);
-}
@@ -1,524 +0,0 @@
-import _ from '../../../commons/js/commons'
-const app = getApp()
-Page({
-  data: {
-    cardida:{},//身份证正面照片
-    cardidb:{},//身份证反面照片
-    business_licence:{},//营业执照照片
-    car_img:{},//行驶证照片
-    register_img:{},//登记证照片
-    ins_img:[],//保险照片
-    other_img:[],//交车合照 
-  },
-  onLoad: function (options) {
-    for (let key in options) {
-      this.setData({
-        [key]: options[key]
-      })
-    }
-
-    this.getAppCusorderdata()
-    
-  },
-  onShow: function () {
-
-  },
-
-  //获取订单图片
-  getAppCusorderdata(){
-    let params = {};
-    params['id'] = this.data.id;
-    _.apiQuery.getAppCusorderdata(params).then(res=>{
-      this.setData({
-        imgInfo:res.data,
-      })
-      if(res.data.img_status == 1){
-        this.setData({
-          cardida:res.data.imgs.cardida.length==0?{}:res.data.imgs.cardida,
-          cardidb:res.data.imgs.cardidb.length==0?{}:res.data.imgs.cardidb,
-          business_licence:res.data.imgs.business_licence.length==0?{}:res.data.imgs.business_licence,
-          car_img:res.data.imgs.car_img.length==0?{}:res.data.imgs.car_img,
-          register_img:res.data.imgs.register_img.length==0?{}:res.data.imgs.register_img,
-          ins_img:res.data.imgs.ins_img.length==0?[]:res.data.imgs.ins_img,
-          other_img:res.data.imgs.other_img.length==0?[]:res.data.imgs.other_img,
-        })
-      }
-      wx.stopPullDownRefresh()
-    })
-  },
-
-  //选择图片
-  chooseImg(e) {
-    let that = this
-    //上传身份证正面
-    if(e.currentTarget.dataset.type=='cardida'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              if (resp.data.code == 200) {
-                let params = {};
-                params['id'] = that.data.id;
-                params['cardida'] = resp.data.data.url;
-                _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                  wx.hideLoading();
-                  that.setData({
-                    'cardida.value':resp.data.data.url,
-                    'cardida.img':resp.data.data.full_url,
-                  })
-                }).catch(res2=>{
-                  wx.hideLoading();
-                  if(res2.code==418){
-                    that.setData({
-                      'cardida.value':resp.data.data.url,
-                      'cardida.img':resp.data.data.full_url,
-                      'cardida.err':!res2.data[0].caridA,
-                      'cardida.errmsg':res2.data[0].errmsg,
-                    })
-                  }
-                });
-              }else{
-                wx.hideLoading();
-                wx.showToast({
-                  title: '上传失败',
-                  icon: 'none',
-                  duration: 2000
-                })
-              }
-            },
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-    //上传身份证背面
-    if(e.currentTarget.dataset.type=='cardidb'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              if (resp.data.code == 200) {
-                let params = {};
-                params['id'] = that.data.id;
-                params['cardidb'] = resp.data.data.url;
-                _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                  wx.hideLoading();
-                  that.setData({
-                    'cardidb.value':resp.data.data.url,
-                    'cardidb.img':resp.data.data.full_url,
-                  })
-                }).catch(res2=>{
-                  wx.hideLoading();
-                  if(res2.code==418){
-                    that.setData({
-                      'cardidb.value':resp.data.data.url,
-                      'cardidb.img':resp.data.data.full_url,
-                      'cardidb.err':!res2.data[1].caridB,
-                      'cardidb.errmsg':res2.data[1].errmsg,
-                    })
-                  }
-                });
-              }else{
-                wx.hideLoading();
-                wx.showToast({
-                  title: '上传失败',
-                  icon: 'none',
-                  duration: 2000
-                })
-              }
-            },
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-    //上传营业执照
-    if(e.currentTarget.dataset.type=='business_licence'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              if (resp.data.code == 200) {
-                let params = {};
-                params['id'] = that.data.id;
-                params['business_licence'] = resp.data.data.url;
-                _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                  wx.hideLoading();
-                  that.setData({
-                    'business_licence.value':resp.data.data.url,
-                    'business_licence.img':resp.data.data.full_url,
-                  })
-                }).catch(res2=>{
-                  wx.hideLoading();
-                  if(res2.code==418){
-                    that.setData({
-                      'business_licence.value':resp.data.data.url,
-                      'business_licence.img':resp.data.data.full_url,
-                      'business_licence.err':!res2.data[0].business_licence,
-                      'business_licence.errmsg':res2.data[0].errmsg,
-                    })
-                  }
-                });
-              }else{
-                wx.hideLoading();
-                wx.showToast({
-                  title: '上传失败',
-                  icon: 'none',
-                  duration: 2000
-                })
-              }
-            },
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-    //上传登记证
-    if(e.currentTarget.dataset.type=='register_img'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              if (resp.data.code == 200) {
-                let params = {};
-                params['id'] = that.data.id;
-                params['register_img'] = resp.data.data.url;
-                _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                  wx.hideLoading();
-                  that.setData({
-                    'register_img.value':resp.data.data.url,
-                    'register_img.img':resp.data.data.full_url,
-                  })
-                }).catch(res2=>{
-                  wx.hideLoading();
-                });
-              }else{
-                wx.hideLoading();
-                wx.showToast({
-                  title: '上传失败',
-                  icon: 'none',
-                  duration: 2000
-                })
-              }
-            },
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-    //上传行驶证
-    if(e.currentTarget.dataset.type=='car_img'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              if (resp.data.code == 200) {
-                let params = {};
-                params['id'] = that.data.id;
-                params['car_img'] = resp.data.data.url;
-                _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                  wx.hideLoading();
-                  that.setData({
-                    'car_img.value':resp.data.data.url,
-                    'car_img.img':resp.data.data.full_url,
-                  })
-                }).catch(res2=>{
-                  wx.hideLoading();
-                });
-              }else{
-                wx.hideLoading();
-                wx.showToast({
-                  title: '上传失败',
-                  icon: 'none',
-                  duration: 2000
-                })
-              }
-            },
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-    //上传保单
-    if(e.currentTarget.dataset.type=='ins_img'){
-      wx.chooseImage({
-        count: 10 - that.data.ins_img.length, //
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res1) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          let ins_img=that.data.ins_img
-          let k = 0
-          for (let i = 0; i < res1.tempFilePaths.length; i++) {
-            //上传图片
-            wx.uploadFile({
-              url:_.config.api.upImg,
-              filePath:res1.tempFilePaths[i],
-              name: 'img',
-              formData: {
-                'app': 'liche'
-              },
-              success: (resp) => {
-                k = k + 1
-                resp.data = JSON.parse(resp.data);
-                if (resp.data.code == 200) {
-                  let imgdata = resp.data
-                  let list = []
-                  list.push({
-                    value:imgdata.data.url,
-                    img:imgdata.data.full_url,
-                  })
-                  ins_img=ins_img.concat(list)
-                  if(k == res1.tempFilePaths.length){
-                    let params = {};
-                    params['id'] = that.data.id;
-                    let img = []
-                    ins_img.forEach(item => {
-                      img.push(item.value)
-                    })
-                    params['ins_imgs'] = img;
-                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                      wx.hideLoading();
-                      that.setData({
-                        ins_img,
-                      })
-                    }).catch(res2=>{
-                      wx.hideLoading();
-                    });
-                  }
-                }else{
-                  wx.hideLoading();
-                }
-              },
-        
-            })
-          }
-
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
-    //上传交车合照
-    if(e.currentTarget.dataset.type=='other_img'){
-      wx.chooseImage({
-        count: 1, //
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res1) {
-          wx.showLoading({
-            title: '上传中',
-          })
-          let other_img=that.data.other_img
-          let k = 0
-          for (let i = 0; i < res1.tempFilePaths.length; i++) {
-            //上传图片
-            wx.uploadFile({
-              url:_.config.api.upImg,
-              filePath:res1.tempFilePaths[i],
-              name: 'img',
-              formData: {
-                'app': 'liche'
-              },
-              success: (resp) => {
-                k = k + 1
-                resp.data = JSON.parse(resp.data);
-                if (resp.data.code == 200) {
-                  let imgdata = resp.data
-                  let list = []
-                  list.push({
-                    value:imgdata.data.url,
-                    img:imgdata.data.full_url,
-                  })
-                  other_img=other_img.concat(list)
-                  if(k == res1.tempFilePaths.length){
-                    let params = {};
-                    params['id'] = that.data.id;
-                    let img = []
-                    other_img.forEach(item => {
-                      img.push(item.value)
-                    })
-                    params['other_imgs'] = img;
-                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                      wx.hideLoading();
-                      that.setData({
-                        other_img,
-                      })
-                    }).catch(res2=>{
-                      wx.hideLoading();
-                    });
-                  }
-                }else{
-                  wx.hideLoading();
-                }
-              },
-        
-            })
-          }
-
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-  },
-
-  // 编辑页面删除图片
-  delImg(e){
-    if(e.currentTarget.dataset.type=='ins_img'){
-      let ins_img = this.data.ins_img
-      ins_img.splice(e.currentTarget.dataset.index, 1)
-      let params = {};
-      params['id'] = this.data.id;
-      let img = []
-      ins_img.forEach(item => {
-        img.push(item.value)
-      })
-      params['ins_imgs'] = img;
-      _.apiQuery.putAppCusorderdata(params).then(res => {
-        this.setData({
-          ins_img,
-        })
-      })
-    }else if(e.currentTarget.dataset.type=='other_img'){
-      let other_img = this.data.other_img
-      other_img.splice(e.currentTarget.dataset.index, 1)
-      let params = {};
-      params['id'] = this.data.id;
-      let img = []
-      other_img.forEach(item => {
-        img.push(item.value)
-      })
-      params['other_imgs'] = img;
-      _.apiQuery.putAppCusorderdata(params).then(res => {
-        this.setData({
-          other_img,
-        })
-      })
-    }
-  },
-
-  //查看图片
-  previewImage: function (e) {
-    if(e.currentTarget.dataset.type=='business_licence'){
-      wx.previewImage({
-        current:this.data.imgInfo.imgs.business_licence.img,
-        urls:[this.data.imgInfo.imgs.business_licence.img],
-      })
-    }
-  },
-
-})
@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "营业执照信息",
-  "usingComponents": {}
-}
@@ -1,28 +0,0 @@
-<view class="container">
-  <view class="inner30">
-    
-    <!-- <view class="mt40 font-32">营业执照</view> -->
-    <view class="mt30 text-center">
-      <view class="inline-block img-300x200 relative ulib-r10 overflowhidden">
-        <block wx:if="{{business_licence.value}}">
-          <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4" bindtap="chooseImg" data-type="business_licence"></i>
-            <view class="absolute top-0 left-0 bottom-0 right-0 bg-f00-op50 z-index-3" wx:if="{{business_licence.err}}">
-              <view class="absolute left-0 right-0 box-middle pl20 pr20 text-break font-22 color-fff"><i class="iconfont icon-jinggao"></i>{{business_licence.errmsg}}</view>
-            </view>
-            <image class='block wp100 img-h-200 ulib-r10' src='{{business_licence.img}}' mode='aspectFit' bindtap="previewImage" data-type="business_licence"></image>
-          </view>
-        </block>
-        <block wx:else>
-          <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="business_licence">
-            <view class="absolute left-0 right-0 box-middle color-ccc">
-              <i class="iconfont icon-fanmian font-60"></i>
-              <view class="mt10 font-22">上传营业执照</view>
-            </view>
-          </view>
-        </block>
-      </view>
-    </view>
-
-  </view>
-</view>
@@ -1 +0,0 @@
-/* pages/order/editBusinessBicence/index.wxss */
@@ -1,169 +0,0 @@
-import _ from '../../../commons/js/commons'
-const app = getApp()
-Page({
-  data: {
-    name:'',//姓名
-    mobile:'',//手机号
-    cardid:'',//身份证
-  },
-  onLoad: function (options) {
-    for (let key in options) {
-      this.setData({
-        [key]: options[key]
-      })
-    }
-
-    this.getAppCusorderV2()
-    
-  },
-  onShow: function () {
-
-  },
-
-  //获取订单详情
-  getAppCusorderV2(){
-    let params = {};
-    params['id'] = this.data.id;
-    _.apiQuery.getAppCusorderV2(params).then(res=>{
-      this.setData({
-        name:res.data.name?res.data.name:'',
-        mobile:res.data.mobile?res.data.mobile:'',
-        cardid:res.data.cardid?res.data.cardid:'',
-      })
-
-      wx.stopPullDownRefresh()
-
-    })
-  },
-
-  //修改订单基本信息
-  putAppCusorderV2Info() {
-    this.setData({
-      mobile:this.trimAll(this.data.mobile),
-      cardid:this.trimAll(this.data.cardid),
-    })
-    if (this.data.name == '' ) {
-      wx.showToast({
-        title: '请输入客户姓名',
-        icon: 'none'
-      })
-    }else if (this.data.mobile != this.data.org_mobile && !/^1[3456789]\d{9}$/.test(this.data.mobile)){
-      wx.showToast({
-        title: '请输入客户手机号',
-        icon: 'none'
-      })
-    }
-    else if(this.data.cardid == ''|| !/^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|[xX])$/.test(this.data.cardid)){
-      wx.showToast({
-        title: '请填写正确客户身份证',
-        icon: 'none'
-      })
-    }
-    else{
-      let that = this
-      that.setData({
-        submitFlag: true,
-      })
-      let params = {};
-      params['id'] = that.data.id;
-      params['name'] = that.data.name;
-      params['mobile'] = that.data.mobile;
-      params['cardid'] = that.data.cardid;
-      _.apiQuery.putAppCusorderV2Info(params).then(res => {
-
-        //刷新详情页
-        let pages = getCurrentPages();
-        let prevPage = null; //上一个页面
-        if (pages.length >= 2) {
-          prevPage = pages[pages.length - 2]; //上一个页面
-          if(prevPage.route == 'pages/order/detail/index2'){
-            prevPage.onPullDownRefresh()
-          }
-        }
-        wx.showToast({
-          title: '编辑成功',
-          icon: 'success',
-          duration: 2000
-        })
-        setTimeout(function () {
-          wx.navigateBack({
-            delta: 1
-          })
-        }, 500)
-
-      }).catch(res=>{
-        that.setData({
-          submitFlag: false,
-        })
-      });
-    }
-  },
-
-  //推送链接
-  pushLink(e){
-    if(e.currentTarget.dataset.url){
-      _.$router.openUrlScheme(e.currentTarget.dataset.url)
-    }
-  },
-
-  //选择图片
-  chooseImg(e) {
-    let that = this
-    //上传身份证正面-车主身份证
-    //上传身份证正面-客户身份证
-    if(e.currentTarget.dataset.type=='customer'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '识别中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              if (resp.data.code == 200) {
-                let params = {};
-                params['img'] = resp.data.data.url;
-                _.apiQuery.getAppIdcardInfo(params).then(res2 => {
-                  wx.hideLoading();
-                  that.setData({
-                    cardid:res2.data.IdNum,
-                    name:res2.data.Name,
-                  })
-                })
-              }
-            },
-            fail: res => {
-              wx.hideLoading();
-            }
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-  },
-
-  //去除空格
-  trimAll(ele){
-    if(typeof ele === 'string'){
-       return ele.split(' ').join('');
-    }else{
-        console.error(`${typeof ele} is not the expected type, but the string type is expected`)
-    }
-  },
-
-})
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
老叶	e3182a26c8	新版logo添加版本号	2022-02-23 15:19:58 +08:00
yerz	5396e0f043	扫码签名	2022-02-12 11:42:17 +08:00
老叶	5b6d49c224	私域通	2022-02-10 17:03:31 +08:00
老叶	25155bc8f5	调拨	2022-02-10 10:48:20 +08:00
老叶	f6a5aae77e	私域通	2022-02-10 10:21:45 +08:00
老叶	7dc6064d32	调拨信息	2022-02-09 15:23:20 +08:00
老叶	516e8b2911	私域通入口	2022-02-08 10:51:17 +08:00
老叶	66f1e96e25	私域通	2022-02-08 10:31:20 +08:00
				`@@ -1 +0,0 @@`
				`/* pages/order/editBusinessBicence/index.wxss */`