客户列表

2021-07-05 20:57:54 +08:00
parent c6f8f75f1d
commit 1d01d03c5d
22 changed files with 553 additions and 1101 deletions
@@ -2,6 +2,7 @@

 ##  账号密码

+//狸车宝
 wx71095d4049de3ed1
 a80eb6ed68d7bae2d804fe507a4522f7

@@ -1,15 +1,17 @@
 {
  "pages": [
+    "pages/login/index",
+    "pages/index/index",
    "pages/order/index",
    "pages/customer/index",
-    "pages/index/index",
-    "pages/login/index",
    "pages/web-view/index",
    "pages/mine/index",
    "pages/customer/addCard/index",
    "pages/customer/detail/index",
    "pages/order/register/index",
-    "pages/order/detail/index"
+    "pages/order/detail/index",
+    "pages/mine/install/index",
+    "pages/mine/install/staff/index"
  ],
  "echarts": [
    {
@@ -12,6 +12,7 @@
 .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-208x170{width:208rpx;height:170rpx;box-sizing:border-box;}
 .img-250x250{width:250rpx;height:250rpx;box-sizing:border-box;}
 .img-750x250{width:750rpx;height:250rpx;box-sizing:border-box;}

@@ -59,6 +59,7 @@
 .box-x-scroll{overflow-x:auto;}

 .img-top-cover{background-repeat:no-repeat;background-position:center top;background-size:100% auto;}
+.img-bottom-cover{background-repeat:no-repeat;background-position:center bottom;background-size:100% auto;}
 .img-center-cover{background-repeat:no-repeat;background-position:center center;background-size:100% auto;}
 .img-middle-cover{background-repeat:no-repeat;background-position:center center;background-size:auto 100%;}
 .img-fill-cover{background-repeat:no-repeat;background-position:center center;background-size:100% 100%;}
@@ -2,98 +2,34 @@ const env = "d";

 const version = 1,

-//好店云
-app_id = 'ebb6d3808b2fa324',
-key = '06c92b4b954d06dab7b91a8886c7a69b';
-
-
 //狸车宝
-// app_id = '1c156bb57cd6984a',
-// key = '71fd71173b776766a2ae1209d9a2c2ed';
+app_id = '1c156bb57cd6984a',
+key = '71fd71173b776766a2ae1209d9a2c2ed';

+//好店云
+// app_id = 'ebb6d3808b2fa324',
+// key = '06c92b4b954d06dab7b91a8886c7a69b';

 let api, baseUrl;

 if (env == "d") {
-  baseUrl = "https://hd-api-dev.xiaoyu.com/hd/";
+  baseUrl = "https://liche-api-dev.xiaoyu.com/hd/";
 } else if (env == "t") {
-  baseUrl = "https://api.test.haodian.cn/hd/";
+  baseUrl = "https://api.test.liche.cn/hd/";
 } else if (env == "p") {
-  baseUrl = "https://api.haodian.cn/hd/";
+  baseUrl = "https://api.liche.cn/hd/";
 }
 api = {
  baseUrl: baseUrl,
  appUserUkey: "app/user/ukey", //登录/退出登录
  appUser: "app/user", //用户信息
-  appUserTel: "app/user/tel", //编辑拨打电话
-  appHomeIcon: "app/home/icon", //首页图标
-  appBiz: "app/biz",//店铺列表
-  appExchangeTab: "app/exchange/tab", //核销tab /接单宝tab二级
-  appExchange: "app/exchange", //核销记录列表 //核销
-  appReceiverTab: "app/receiver/tab", //接单宝tab
-  appReceiver: "app/receiver",//接单宝列表 //接单宝详情  //接单宝编辑
-  appReceiverTip: "app/receiver/tip",//接单宝温馨提示
-  appOtherMcode: "app/other/mcode",//发送验证码
-  appReceiverLogs: "app/receiver/logs", //接单宝小记
-  appYx: 'app/yx', //接单宝获取订单手机号
-  receiverOrders: 'app/receiver/orders', //接单宝-分配订单
-  receiverCustomer: 'app/receiver/customer', //客户信息修改
-
-  appSythome: 'app/sythome', //私域通首页
-  sytactivityMenu: 'app/sytactivity/menu', //推广活动菜单
-  appSytactivity: 'app/sytactivity', //推广活动列表 //推广活动编辑
-  sytactivityDetail: 'app/sytactivity/detail', //推广活动详情
-  sytactivityAchievement: 'app/sytactivity/achievement', //活动业绩
-  sytactivityAchievementData: 'app/sytactivity/achievement_data', //活动业绩-实时战报
-  sytactivityAchievementKpi: 'app/sytactivity/achievement_kpi', //活动业绩-kpi数据
-  appSytteam: 'app/sytteam', //团队管理 //团队管理-发起团队
-  sytteamMenu: 'app/sytteam/menu', //团队管理-菜单
-  sytteamLeader: 'app/sytteam/leader', //团队管理-任命团长
-  sytteamZb_top: 'app/sytteam/zb_top', //今日战报-TOP3
-  sytteamZb_menu: 'app/sytteam/zb_menu', //今日战报-菜单
-  sytteamZb_list: 'app/sytteam/zb_list', //今日战报-列表
-  achievement_detail: 'app/sytactivity/achievement_detail', //活动业绩-活动明细
-
-  bizTreasures: 'app/biz/treasures', //店铺订单宝/客多宝
-  customerTab: 'app/customer/tab', //客多宝-tab
-  appCustomer: 'app/customer', //客多宝-列表
-
-  customerField: 'app/customer/field', //客户_基础信息 /客户_新增/编辑
-  customerDistribution: 'app/customer/distribution', //客户_分配
-  customerInfo: 'app/customer/info', //客户_详情
-  customerLogs: 'app/customer/logs', //客户_小记
-  customerLog: 'app/customer/log', //客户_更新小记
-  customerStatus: 'app/customer/status', //客户_列表状态
-  customerSetting: 'app/customer/setting', //基础设置信息/基础设置
-  customerDockingPeople: 'app/customer/docking_people', //对接人列表
-
-  dxtHome: 'app/dxt/home', //电销通首页
+  appSms: "app/sms", //获取验证码
+  appSeriesCars: "app/series/cars", //获取车型库
+  appSeriesAttrs: "app/series/attrs", //获取车型属性
+  appCustomersTabs: "app/customers/tabs", //获取tab
+  appCustomers: "app/customers", //获取客户列表
+  appCustomersFilter: "app/customers/filter", //获取列表筛选条件
  
-  dxtEmployeesMenu: 'app/dxt/employees_menu', //员工管理_菜单
-  dxtEmployees: 'app/dxt/employees', //员工管理_列表
-  dxtEmployeesStatus: 'app/dxt/employees_status', //员工管理_修改状态
-  dxtEmployeesInfo: 'app/dxt/employees_info', //员工管理_新增/修改信息 /员工管理_员工详情
-  dxtMigration: 'app/dxt/migration', //员工管理_一键迁移
-  dxtAnalysis: 'app/dxt/analysis', //数据分析
-  dxtAnalysisChart: 'app/dxt/analysis_chart', //数据分析_趋势图
-  dxtPhoneBill: 'app/dxt/phone_bill', //话费清单
-
-  dxtCustomerField: 'app/dxt/customer_field', //客户_基础信息 /作废,移到客多宝
-  dxtCustomer: 'app/dxt/customer', //客户_新增/编辑/客户_列表 /作废,移到客多宝
-  dxtCustomerUb: 'app/dxt/customer_ub', //客户_分配 /作废,移到客多宝
-  dxtCustomerInfo: 'app/dxt/customer_info', //客户_详情 /作废,移到客多宝
-  dxtCustomerLogs: 'app/dxt/customer_logs', //客户_小记 /作废,移到客多宝
-  dxtCustomerLog: 'app/dxt/customer_log', //客户_更新小记 /作废,移到客多宝
-
-  appOrder: 'app/order', //订单保列表
-  orderMenu: 'app/order/menu', //订单保顶部菜单
-  orderDetail: 'app/order/detail', //订单保详情
-  orderStatus: 'app/order/status', //同意/拒绝核销
-
-  orderAccountMenu: 'app/order/account_menu', //帐户余额_顶部菜单
-  orderAccount: 'app/order/account', //帐户余额_列表
-
-  appXz: 'app/xz', //(新)接单宝获取订单手机号

 }

@@ -2,7 +2,6 @@ import Config from '../config';
 import { HttpNoUkeyRequest, HttpRequest, asyncLogin, app } from 'httpRequest';

 let apiQuery = Object.assign({});
-// console.log(apiQuery)

 apiQuery.asyncLogin = asyncLogin;

@@ -76,654 +75,60 @@ apiQuery.authUserPhone = function (params) {
  })
 }

-/** 
- * 登录
-*/
-apiQuery.putLogin = function(params){
+//登录
+apiQuery.getUserUkey = function(params){
  return new Promise(function (resolve, reject) {
-    HttpNoUkeyRequest(false, Config.api.appUserUkey, 2, params, "PUT", resolve, reject)
+    HttpNoUkeyRequest(false, Config.api.appUserUkey, 2, params, "GET", resolve, reject)
  })
 }

-/** 
- * 发送验证码
-*/
-apiQuery.getAppOtherMcode = function (params) {
+//获取验证码
+apiQuery.getAppSms = function (params) {
  return new Promise(function (resolve, reject) {
-    HttpNoUkeyRequest(false, Config.api.appOtherMcode, 2, params, "GET", resolve, reject)
+    HttpNoUkeyRequest(false, Config.api.appSms, 2, params, "GET", resolve, reject)
  })
 }

-/** 
- * 退出登录
-*/
+//退出登录 /作废
 apiQuery.putLogout = function (params) {
  return new Promise(function (resolve, reject) {
    HttpRequest(false, Config.api.appUserUkey, 2, params, "PUT", resolve, reject)
  })
 }

-/** 
- * 编辑拨打电话
-*/
-apiQuery.putAppUserTel = function (params) {
+//获取车型库
+apiQuery.getAppSeriesCars = function (params) {
  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appUserTel, 2, params, "PUT", resolve, reject)
+    HttpRequest(false, Config.api.appSeriesCars, 2, params, "GET", resolve, reject)
  })
 }

-/** 
- * 用户信息//废弃
-*/
-apiQuery.getAppUser = function (params) {
+//获取车型属性
+apiQuery.getAppSeriesAttrs = function (params) {
  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.appUser, 2, params, "GET", resolve, reject)
+    HttpRequest(false, Config.api.appSeriesAttrs, 2, params, "GET", resolve, reject)
  })
 }

-/** 
- * 首页图标
-*/
-apiQuery.getAppHomeIcon = function (params) {
+//获取tab
+apiQuery.getAppCustomersTabs = function (params) {
  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appHomeIcon, 2, params, "GET", resolve, reject)
+    HttpRequest(false, Config.api.appCustomersTabs, 2, params, "GET", resolve, reject)
  })
 }

-/** 
- * 店铺列表
-*/
-apiQuery.getAppBiz = function (params) {
+//获取客户列表
+apiQuery.getAppCustomers = function (params) {
  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appBiz, 2, params, "GET", resolve, reject)
+    HttpRequest(false, Config.api.appCustomers, 2, params, "GET", resolve, reject)
  })
 }

-/** 
- * 核销记录列表
-*/
-apiQuery.getAppExchange = function (params) {
+//获取列表筛选条件
+apiQuery.getAppCustomersFilter = function (params) {
  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appExchange, 2, params, "GET", resolve, reject)
+    HttpRequest(false, Config.api.appCustomersFilter, 2, params, "GET", resolve, reject)
  })
 }

-/** 
- * 核销tab
-*/
-apiQuery.getAppExchangeTab = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appExchangeTab, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 核销
-*/
-apiQuery.putAppExchange = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appExchange, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * 接单宝tab
-*/
-apiQuery.getAppReceiverTab = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appReceiverTab, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 接单宝列表
-*/
-apiQuery.getAppReceiverList = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appReceiver, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 接单宝详情
-*/
-apiQuery.getAppReceiverInfo = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.appReceiver, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 接单宝编辑
-*/
-apiQuery.putAppReceiver = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appReceiver, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * 接单宝温馨提示
-*/
-apiQuery.getAppReceiverTip = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appReceiverTip, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 接单宝小记
-*/
-apiQuery.getAppReceiverLogs = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appReceiverLogs, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 接单宝获取订单手机号
-*/
-apiQuery.getAppYx = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appYx, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 授权保存用户信息
-*/
-apiQuery.putAppUser = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appUser, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * 私域通首页
-*/
-apiQuery.getAppSythome = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appSythome, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 推广活动菜单
-*/
-apiQuery.getSytactivityMenu = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.sytactivityMenu, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 推广活动列表
-*/
-apiQuery.getAppSytactivity = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appSytactivity, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 推广活动编辑
-*/
-apiQuery.putAppSytactivity = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appSytactivity, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * 推广活动详情
-*/
-apiQuery.getSytactivityDetail = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.sytactivityDetail, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 活动业绩
-*/
-apiQuery.getSytactivityAchievement = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.sytactivityAchievement, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 活动业绩-实时战报
-*/
-apiQuery.getSytactivityAchievementData = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.sytactivityAchievementData, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 活动业绩-kpi数据
-*/
-apiQuery.getSytactivityAchievementKpi = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.sytactivityAchievementKpi, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 团队管理
-*/
-apiQuery.getAppSytteam = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appSytteam, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 团队管理-发起团队
-*/
-apiQuery.putAppSytteam = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appSytteam, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * 团队管理-菜单
-*/
-apiQuery.getSytteamMenu = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.sytteamMenu, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 团队管理-任命团长
-*/
-apiQuery.putSytteamLeader = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.sytteamLeader, 2, params, "PUT", resolve, reject)
-  })
-}
-
-
-/** 
- * 今日战报-TOP3
-*/
-apiQuery.getSytteamZb_top = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.sytteamZb_top, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 今日战报-菜单
-*/
-apiQuery.getSytteamZb_menu = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.sytteamZb_menu, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 今日战报-列表
-*/
-apiQuery.getSytteamZb_list = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.sytteamZb_list, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 店铺订单宝/客多宝
-*/
-apiQuery.getBizTreasures = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.bizTreasures, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 客多宝-tab
-*/
-apiQuery.getCustomerTab = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.customerTab, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 客多宝-列表
-*/
-apiQuery.getAppCustomer = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appCustomer, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 活动业绩-活动明细
-*/
-apiQuery.getAchievementDetail = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.achievement_detail, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 接单宝-分配订单
-*/
-apiQuery.putReceiverOrders = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.receiverOrders, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * 电销通首页
-*/
-apiQuery.getDxtHome = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtHome, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 客户_基础信息 /作废,移到客多宝
-*/
-apiQuery.getDxtCustomerField = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtCustomerField, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 客户_新增/编辑 /作废,移到客多宝
-*/
-apiQuery.putDxtCustomer = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(true, Config.api.dxtCustomer, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * 员工管理_菜单
-*/
-apiQuery.getDxtEmployeesMenu = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtEmployeesMenu, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 员工管理_列表
-*/
-apiQuery.getDxtEmployees = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtEmployees, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * //员工管理_修改状态
-*/
-apiQuery.putDxtEmployeesStatus = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtEmployeesStatus, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * //员工管理_新增/修改信息
-*/
-apiQuery.putDxtEmployeesInfo = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtEmployeesInfo, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * //员工管理_一键迁移
-*/
-apiQuery.putDxtMigration = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtMigration, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * 对接人列表
-*/
-apiQuery.getCustomerDockingPeople = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.customerDockingPeople, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * //客户_分配  /作废,移到客多宝
-*/
-apiQuery.putDxtCustomerUb = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtCustomerUb, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * //客户_更新小记 /作废,移到客多宝
-*/
-apiQuery.putDxtCustomerLog = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtCustomerLog, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * 客户_列表
-*/
-apiQuery.getDxtCustomerList = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtCustomer, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 员工管理_员工详情
-*/
-apiQuery.getDxtEmployeesInfo = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtEmployeesInfo, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 客户_详情 /作废,移到客多宝
-*/
-apiQuery.getDxtCustomerInfo = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtCustomerInfo, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 客户_小记  /作废,移到客多宝
-*/
-apiQuery.getDxtCustomerLogs = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtCustomerLogs, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 基础设置信息
-*/
-apiQuery.getCustomerSetting = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.customerSetting, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * //基础设置
-*/
-apiQuery.putCustomerSetting = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.customerSetting, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * 数据分析
-*/
-apiQuery.getDxtAnalysis = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtAnalysis, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 数据分析_趋势图
-*/
-apiQuery.getDxtAnalysisChart = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtAnalysisChart, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 话费清单
-*/
-apiQuery.getDxtPhoneBill = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.dxtPhoneBill, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 客户_基础信息
-*/
-apiQuery.getCustomerField = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.customerField, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * //客户_新增/编辑
-*/
-apiQuery.putCustomerField = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.customerField, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * //客户_分配
-*/
-apiQuery.putCustomerDistribution = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.customerDistribution, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * 客户_详情
-*/
-apiQuery.getCustomerInfo = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.customerInfo, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * 客户_更新小记
-*/
-apiQuery.getCustomerLogs = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.customerLogs, 2, params, "GET", resolve, reject)
-  })
-}
-
-/** 
- * //客户_新增/编辑
-*/
-apiQuery.putCustomerLog = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.customerLog, 2, params, "PUT", resolve, reject)
-  })
-}
-
-/** 
- * 客户_列表状态
-*/
-apiQuery.getCustomerStatus = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.customerStatus, 2, params, "GET", resolve, reject)
-  })
-}
-
-//客户信息修改
-apiQuery.putReceiverCustomer = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.receiverCustomer, 2, params, "PUT", resolve, reject)
-  })
-}
-
-//订单保列表
-apiQuery.getAppOrder = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appOrder, 2, params, "GET", resolve, reject)
-  })
-}
-
-//订单保顶部菜单
-apiQuery.getOrderMenu = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.orderMenu, 2, params, "GET", resolve, reject)
-  })
-}
-
-//订单保详情
-apiQuery.getOrderDetail = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.orderDetail, 2, params, "GET", resolve, reject)
-  })
-}
-
-//同意核销
-apiQuery.putOrderStatusAgree = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.orderStatus, 2, params, "PUT", resolve, reject)
-  })
-}
-
-//拒绝核销
-apiQuery.putOrderStatusRefuse = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.orderStatus, 2, params, "PUT", resolve, reject)
-  })
-}
-
-//帐户余额_顶部菜单
-apiQuery.getOrderAccountMenu = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.orderAccountMenu, 2, params, "GET", resolve, reject)
-  })
-}
-
-//帐户余额_列表
-apiQuery.getOrderAccount = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.orderAccount, 2, params, "GET", resolve, reject)
-  })
-}
-
-//(新)接单宝获取订单手机号
-apiQuery.getAppXz = function (params) {
-  return new Promise(function (resolve, reject) {
-    HttpRequest(false, Config.api.appXz, 2, params, "GET", resolve, reject)
-  })
-}
-
-
 export default apiQuery;
@@ -2,40 +2,28 @@ import _ from '../../commons/js/commons'
 const app = getApp()
 Page({
  data: {
+    key:'',
    list: [],
-    searchInp:{
-      value: '',
-      focus: false,
-    },
-    sourcetabindex: -1,
-    a_id: '',
-    c_time:'',
-    u_id:'',
-    r_time: '',
    pageNo: 1,
    noData: false,
    end: false,
    load: true,
    loading: false,
-    flag: 0,
-    tab_list: [],
-    tag_list: [],
-    activityList: [],
-    isShowScreen:false,
-    isShowDropDown:false,
-    form:'',
-    isRefresh:false,
-    status_pid:-2,
-    status_id:'',
-    tag_id:'',
-    user_list: [],
-    objUser_list: [],
-    userindex:-1,
-    serviceindex: -1,
+    flag:1,
+    s_time:'',
+    e_time:'',
+    if_driver:'',
+    level:'',
+    s_id:'',
+    v_id:'',
+    cfrom:'',
+    o_type:'',
+    

    isShowMessage:false,
-    isShowSort:false,
-    isClickSort:false,
+    isShowSort:true,
+
+    timeSlotIndex:-1,
    timeSlot:[
      {
        title:'今天',
@@ -50,7 +38,7 @@ Page({
        title:'近三十天',
      },
    ],
-    testDriveIndex:0,
+    testDriveIndex:-1,
    testDrive:[
      {
        title:'全部',
@@ -62,7 +50,9 @@ Page({
        title:'否',
      },
    ],
-    timeSlotIndex:0,
+    
+    sortList:['建卡日期','最近联系','特别关注',],
+    sortListIndex:0,
  },
  onLoad: function (options) {
    for (let key in options) {
@@ -70,13 +60,97 @@ Page({
        [key]: options[key]
      })
    }
-    this.getCustomerTab()
+    this.getAppCustomersTabs()
+    this.getAppCustomersFilter()
+  },
+
+  //客户-tab
+  getAppCustomersTabs() {
+    _.apiQuery.getAppCustomersTabs().then(res => {
+      this.setData({
+        tab:res.data,
+        key:this.data.key==''?res.data[0].key:this.data.key,
+      })
+
+      this.getAppCustomers()
+
+      wx.stopPullDownRefresh()
+    });
+  },
+
+  //获取列表筛选条件
+  getAppCustomersFilter(){
+    _.apiQuery.getAppCustomersFilter().then(res => {
+      this.setData({
+        filter:res.data,
+      })
+    });
+  },
+
+  //获取客户列表
+  getAppCustomers() {
+    this.setData({
+      load: false,
+      loading: true,
+    })
+    let params = {};
+    params['page'] = this.data.pageNo;
+    params['size'] = 10;
+    params['status'] = this.data.key;
+    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 != ''){
+      params['if_driver'] = this.data.if_driver;
+    }
+    if(this.data.level != ''){
+      params['level'] = this.data.level;
+    }
+    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;
+    }
+    _.apiQuery.getAppCustomers(params).then(res => {
+      this.setData({
+        flag: this.data.flag - 1
+      })
+      if (!this.data.flag) {
+        this.setData({
+          total: res.data.total,
+          pageNo: this.data.pageNo + 1,
+          list: this.data.list.concat(res.data.list),
+          load: true,
+          loading: false,
+        })
+        if (res.data.total == 0) {
+          this.setData({
+            noData: true
+          })
+        } else if (this.data.list.length == res.data.total) {
+          this.setData({
+            end: true
+          })
+        }
+      }
+      wx.stopPullDownRefresh()
+    });
  },

  //切换tab
  changeTab(e){
    this.setData({
-      status_pid: this.data.tab[e.currentTarget.dataset.index].id,
+      key: this.data.tab[e.currentTarget.dataset.index].key,
    })
    this.searchSubmit()
  },
@@ -85,7 +159,6 @@ Page({
  call(e) {
    let params = {};
    params['id'] = e.currentTarget.dataset.id;
-    params['type'] = e.currentTarget.dataset.type;
    _.apiQuery.getAppYx(params).then(res=>{
      if(!!res.data.service_msg){
        this.setData({
@@ -99,24 +172,6 @@ Page({
      }
    })
  },
-  //拨打客户电话Xz
-  callXz(e) {
-    let params = {};
-    params['id'] = e.currentTarget.dataset.id;
-    params['type'] = e.currentTarget.dataset.type;
-    _.apiQuery.getAppXz(params).then(res=>{
-      if(!!res.data.service_msg){
-        this.setData({
-          isShowNote:true,
-          notemsg:res.data.service_msg,
-        })
-      }else{
-        wx.makePhoneCall({
-          phoneNumber: res.data.mobile,
-        })
-      }
-    })
-  },

  //提交搜索
  searchSubmit(){
@@ -129,138 +184,35 @@ Page({
      loading: false,
      flag: this.data.flag + 1
    })
-    this.getAppCustomer()
+    this.getAppCustomers()
  },

-  //客多宝-tab
-  getCustomerTab() {
-    let params = {};
-    params['biz_id'] = !!this.data.bizid?this.data.bizid:'0';
-    _.apiQuery.getCustomerTab(params).then(res => {
-      this.setData({
-        tab_list:res.data.tab_list,
-        tag_list:res.data.tag_list,
-      })
+  //排序方式
+  changeSortList(e){

-      if(!!this.data.type){
-        let tab_list = res.data.tab_list
-        tab_list.forEach((item, index)=>{
-          if(item.value == this.data.type){
-            this.setData({
-              sourcetabindex:index,
-            })
-          }
-        });
-      }else{
-        this.setData({
-          type:res.data.tab_list[0].value,
-          sourcetabindex:0,
-        })
-      }
-
-      this.getCustomerStatus()
-
-      if(this.data.sourcetabindex>-1&&this.data.tab_list[this.data.sourcetabindex].value==2){
-        this.getAppSytactivity()
-      }
-
-      wx.stopPullDownRefresh()
-    });
-  },
-
-  //活动列表
-  getAppSytactivity() {
-    let params = {};
-    params['page'] = 1;
-    params['size'] = 50;
-    params['type'] = 0;
-    if(!!this.data.bizid){
-      params['biz_id'] = this.data.bizid;
+    let o_type = ''
+    if(e.detail.value == 0){
+      o_type = 1
+    }else if(e.detail.value == 1){
+      o_type = 2
    }
-    _.apiQuery.getAppSytactivity(params).then(res => {
-      this.setData({
-        activityList: res.data.list,
-      })
-    });
-  },

-  //客多宝列表
-  getAppCustomer() {
    this.setData({
-      load: false,
-      loading: true,
+      o_type: o_type,
+      sortListIndex: e.detail.value,
    })
-    let params = {};
-    if(this.data.isRefresh){
-      params['page'] = 1;
-      params['size'] = (this.data.pageNo - 1)*10;
-    }else{
-      params['page'] = this.data.pageNo;
-      params['size'] = 10;
-    }
-    params['biz_id'] = !!this.data.bizid?this.data.bizid:'0';
-
-    params['type'] = this.data.type;
-    if(this.data.searchInp.value != ''){
-      params['keyword'] = this.data.searchInp.value;
-    }
-    if(this.data.a_id != ''){
-      params['a_id'] = this.data.a_id;
-    }
-    if(this.data.c_time != ''){
-      params['c_time'] = this.data.c_time;
-    }
-    if(this.data.u_id != ''){
-      params['ubid'] = this.data.u_id;
-    }
-    if(this.data.r_time != ''){
-      params['r_time'] = this.data.r_time;
-    }
-    if(this.data.status_pid != -2){
-      params['status_pid'] = this.data.status_pid;
-    }
-    if(this.data.status_id != ''){
-      params['status_id'] = this.data.status_id;
-    }
-    if(this.data.tag_id != ''){
-      params['tag_id'] = this.data.tag_id;
-    }
-    _.apiQuery.getAppCustomer(params).then(res => {
-      console.log(res)
-      this.setData({
-        flag: this.data.flag - 1
-      })
-      if (!this.data.flag) {
-        if(this.data.isRefresh){
-          this.setData({
-            total: res.data.total,
-            list: res.data.list,
-            load: true,
-            loading: false,
-            isRefresh: false,
-          })
-        }else{
-          this.setData({
-            total: res.data.total,
-            pageNo: this.data.pageNo + 1,
-            list: this.data.list.concat(res.data.list),
-            load: true,
-            loading: false,
-          })
-        }
-        if (res.data.total == 0) {
-          this.setData({
-            noData: true
-          })
-        } else if (this.data.list.length == res.data.total) {
-          this.setData({
-            end: true
-          })
-        }
-      }
-      wx.stopPullDownRefresh()
-    });
+    this.searchSubmit()
  },
+
+  //建卡时间
+  startDate(e){
+    this.setData({
+      s_time: e.detail.value
+    })
+    this.searchSubmit()
+  },
+
+  
  bindEndDateChange: function(e) {
    this.setData({
      r_time: e.detail.value
@@ -308,7 +260,6 @@ Page({
  //显示高级搜索
  showSort(){
    this.setData({
-      isClickSort: true,
      isShowSort: !this.data.isShowSort
    })
  },
@@ -359,7 +310,7 @@ Page({
      loading: false,
      flag: this.data.flag + 1
    })
-    this.getAppCustomer()
+    this.getAppCustomers()
  },

  //页面上拉触底事件的处理函数
@@ -368,7 +319,7 @@ Page({
    this.setData({
      flag: this.data.flag + 1
    })
-    this.getAppCustomer()
+    this.getAppCustomers()
  },

 })
@@ -3,17 +3,17 @@
  <view>
    <view style="padding-top:110rpx"></view>
    <view class="fixed top-0 left-0 right-0 bg-fff z-index-1">
-      <view class="mt5 fn-flex font-32 color-666 text-center" wx:if="{{tab.length<5}}">
+      <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 {{status_pid == item.id?'active color-36afa2':''}}" data-index="{{index}}" bindtap="changeTab">
-            <view class="relative">{{item.title}}</view>
+          <view class="fn-flex-item pl20 pr20 tabmenu2 {{key == item.key?'active color-36afa2':''}}" data-index="{{index}}" bindtap="changeTab">
+            <view class="relative">{{item.name}}</view>
          </view>
        </block>
      </view>
      <scroll-view class="mt5 font-28 color-666 text-center space-nowrap" scroll-x="true" wx:else>
        <block wx:for='{{tab}}' wx:key='list'>
-          <view class="pl20 pr20 tabmenu2 {{status_pid == item.id?'active color-36afa2':''}}" data-index="{{index}}" bindtap="changeTab" >
-            <view class="relative">{{item.title}}</view>
+          <view class="pl20 pr20 tabmenu2 {{key == item.key?'active color-36afa2':''}}" data-index="{{index}}" bindtap="changeTab" >
+            <view class="relative">{{item.name}}</view>
          </view>
        </block>
      </scroll-view>
@@ -23,10 +23,9 @@
  <view class="pl40 pb15 fn-clear">
    <view class="fn-fl">
      <text class="text-middle">共<text class="color-f9394d">{{total}}</text>条</text>
-      <picker class="inline-block text-middle bg-f6 ml20 pt5 pb5 pl15 pr15 ulib-r750 font-22" mode="date" value="{{r_time}}" bindchange="bindEndDateChange">
-        <text class="color-666" wx:if="{{r_time == ''}}">建卡日期</text>
-        <text wx:else>{{r_time}}</text>
-        <i class="iconfont ml10 icon-gengduo"></i>
+      <picker class="inline-block text-middle bg-f6 color-666 ml20 pt5 pb5 pl15 pr10 ulib-r750 font-22" bindchange="changeSortList" value="{{sortListIndex}}" range="{{sortList}}">
+        <text>{{sortList[sortListIndex]}}</text>
+        <i class="iconfont ml5 icon-gengduo"></i>
      </picker>
    </view>
    <view class="fn-fr pr180 relative">
@@ -38,45 +37,38 @@
  <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="{{item.url}}">
+      <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="relative pr180">
          <view class="font-32">
-            <text>{{item.cust_name}}</text>
-            <text>(*382)</text>
-            <text class="iconfont icon-xingxing ml10"></text>
+            <text>{{item.name}}</text>
+            <text>({{item.mobile}})</text>
+            <text class="iconfont icon-xingxing ml10 {{item.is_top==1?'color-f9394d':'color-ccc'}}"></text>
          </view>
          <view class="text-nowrap">
-            <text class="inline-block mr10 pt5 pb5 pl10 pr10 bg-666 font-18 color-fff ulib-r750">H级客户</text>
-            <text class="inline-block mr10 pt5 pb5 pl10 pr10 bg-666 font-18 color-fff ulib-r750">H级客户</text>
-            <text class="inline-block mr10 pt5 pb5 pl10 pr10 bg-666 font-18 color-fff ulib-r750">H级客户</text>
-            <text class="inline-block mr10 pt5 pb5 pl10 pr10 bg-666 font-18 color-fff ulib-r750">H级客户</text>
-            ...
+            <block wx:for="{{item.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
+              <text class="inline-block mr10 pt5 pb5 pl10 pr10 bg-666 font-18 color-fff ulib-r750" wx:if="{{i<4}}">{{tag}}</text>
+            </block>
+            <block wx:if="{{item.tags.length>4}}">
+              ...
+            </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}}">
              <i class="absolute box-center-middle iconfont icon-liuyan"></i>
            </view>
-            <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" wx:if="{{item.disabled == 0}}" catchtap="{{item.call_type == 'xz'?'callXz':'call'}}" data-id="{{item.id}}" data-type="{{item.type}}">
+            <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>
          </view>
        </view>
-        <view class="mt25 fn-clear font-28">
-          <view class="fn-fl">品牌车型</view>
-          <view class="fn-fr wp60 text-nowrap text-right color-666">东风EX1</view>
-        </view>
-        <view class="mt25 fn-clear font-28">
-          <view class="fn-fl">品牌车型</view>
-          <view class="fn-fr wp60 text-nowrap text-right color-666">东风EX1</view>
-        </view>
-        <view class="mt25 fn-clear font-28">
-          <view class="fn-fl">品牌车型</view>
-          <view class="fn-fr wp60 text-nowrap text-right color-666">东风EX1</view>
-        </view>
-        <view class="mt25 fn-clear font-28">
-          <view class="fn-fl">品牌车型</view>
-          <view class="fn-fr wp60 text-nowrap text-right color-666">东风EX1</view>
-        </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">{{key}}</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>
@@ -97,15 +89,15 @@
 	</view>
 </lcb-msg>

-<view class="search-sort {{!isClickSort?'fn-hide':''}} {{!isShowSort?'sortout':'sortin'}} bg-fff fixed top-0 bottom-0 z-index-2 ulib-rl20 overflowhidden">
+<view class="search-sort {{!isShowSort?'fn-hide':''}} {{!isShowSort?'sortout':'sortin'}} bg-fff fixed top-0 bottom-0 z-index-2 ulib-rl20 overflowhidden">
  <scroll-view class="wp100" scroll-y="true" style="height:100%">
    <view class="inner30">
      <view class="relative bbs-1-eb pl190 last-b-none">
        <view class="absolute left-0 box-middle font-28">建卡开始时间</view>
        <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>
+          <picker mode="date" value="{{s_time}}" bindchange="startDate">
+            <text class="color-ccc" wx:if="{{s_time == ''}}">请选择</text>
+            <text wx:else>{{s_time}}</text>
            <i class="iconfont ml10 icon-gengduo"></i>
          </picker>
        </view>
@@ -151,17 +143,7 @@
        </view>
      </view>
      <view class="relative bbs-1-eb pl190 last-b-none">
-        <view class="absolute left-0 box-middle font-28">意向车名</view>
-        <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>
-            <i class="iconfont ml10 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">车型级别</view>
+        <view class="absolute left-0 box-middle font-28">品牌车型</view>
        <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>
@@ -5,7 +5,7 @@ Page({

  data: {
    mobile: '',
-    code: '',
+    sms_code: '',
    interval: 0,
    downCount: 119,
    text: '验证码',
@@ -14,20 +14,18 @@ Page({
  },

  onLoad: function (options) {
-    wx.login({
-      success: res => {
-
-        console.log('1111111111111')
-        console.log(res.code)
-
-      }
-    })
+    
  },

  onShow: function () {
    let ukey = app.getStorageByKey("ukey");
    if (!!ukey){
-      this.getUserInfo()
+      let pages = getCurrentPages();
+      if (pages.length > 1) {
+        wx.navigateBack();
+      }else{
+        _.$router.switchTab('/pages/index/index')
+      }
    }else{
      this.setData({
        pageshow: true,
@@ -43,25 +41,8 @@ Page({
    })
  },

-  //用户信息
-  getUserInfo() {
-    let params = {};
-    params['biz_id'] = 0;
-    _.apiQuery.getUserInfo(params).then(res => {
-      console.log(res)
-      if (res.biz_id == -1){
-        wx.redirectTo({
-          url: '/pages/brand/index',
-        })
-      }else{
-        wx.redirectTo({
-          url: '/pages/store/index?bizid=' + res.biz_id,
-        })
-      }
-    });
-  },
-
-  getAppOtherMcode() {
+  //获取验证码
+  getAppSms() {

    if (this.data.downCount == 119){
      if (!/^1[3456789]\d{9}$/.test(this.data.mobile)) {
@@ -72,7 +53,7 @@ Page({
      } else {
        let params = {};
        params['mobile'] = this.data.mobile;
-        _.apiQuery.getAppOtherMcode(params).then(res => {
+        _.apiQuery.getAppSms(params).then(res => {
          this.setData({
            text: 120 + 's'
          })
@@ -95,41 +76,45 @@ Page({
    }
  },

-  putLogin() {
+  //登录
+  getUserUkey() {
    if (!/^1[3456789]\d{9}$/.test(this.data.mobile)) {
      wx.showToast({
        title: '请输入正确的手机号',
        icon: 'none'
      })
-    } else if (this.data.code == '' ){
+    } else if (this.data.sms_code == '' ){
      wx.showToast({
        title: '请输入验证码',
        icon: 'none'
      })
    } else{
-      wx.showToast({
-        title: '登录中...',
-        icon: 'loading'
-      })
-      let params = {};
-      params['mobile'] = this.data.mobile;
-      params['code'] = this.data.code;
-      _.apiQuery.putLogin(params).then(res => {
-        console.log(res)
-        wx.setStorage({
-          key: "ukey",
-          data: res.data.ukey
-        })
-        if (res.data.biz_id == -1) {
-          wx.redirectTo({
-            url: '/pages/brand/index',
-          })
-        } else {
-          wx.redirectTo({
-            url: '/pages/store/index?bizid=' + res.data.biz_id,
+
+      wx.login({
+        success:resc => {
+          wx.showToast({
+            title: '登录中...',
+            icon: 'loading'
          })
+          let params = {};
+          params['mobile'] = this.data.mobile;
+          params['code'] =resc.code;
+          params['sms_code'] = this.data.sms_code;
+          _.apiQuery.getUserUkey(params).then(res => {
+            wx.setStorage({
+              key: "ukey",
+              data: res.data.ukey
+            })
+            let pages = getCurrentPages();
+            if (pages.length > 1) {
+              wx.navigateBack();
+            }else{
+              _.$router.switchTab('/pages/index/index')
+            }
+          });
+  
        }
-      });
+      })
    }
  },

@@ -12,14 +12,14 @@
        </view>
      </view>
      <view class="bg-e4 mt30 pt20 pb20 relative fn-clear ulib-r750">
-        <view class="absolute left-0 box-middle con-100 text-center iconfont icon-yanzhengma font-24 {{code.length>0?'':'color-999'}}"></view>
+        <view class="absolute left-0 box-middle con-100 text-center iconfont icon-yanzhengma font-24 {{sms_code.length>0?'':'color-999'}}"></view>
        <view class="pl90">
-          <input class="wp60 font-32" placeholder-class="color-999" type="number" placeholder="请输入验证码" bindinput='inputTx' data-key='code' value='{{code}}'/>
+          <input class="wp60 font-32" placeholder-class="color-999" type="number" placeholder="请输入验证码" bindinput='inputTx' data-key='sms_code' value='{{sms_code}}'/>
        </view>
-        <view class="absolute right-0 box-middle mr40 pt30 pb30 font-30 color-36afa2" bindtap='getAppOtherMcode'>{{text}}</view>
+        <view class="absolute right-0 box-middle mr40 pt30 pb30 font-30 color-36afa2" bindtap='getAppSms'>{{text}}</view>
      </view>
      <view class='mt60 relative'>
-        <button class='btn-36afa2 font-36 color-fff ulib-r750' hover-class='btn-36afa2-hover' bindtap='putLogin'>登录</button>
+        <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>
@@ -5,30 +5,21 @@ Page({
    imgUrl:_.config.imgUrl,
    list:[
      {
-        head:'http://img.cms.xmfish.com/data/upload/20217/file_1625105711.jpg',
-        name:'逆行的光',
-        id:0,
+        icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-zichan.png',
+        title:'我的资产',
+        url:'',
      },
      {
-        head:'http://img.cms.xmfish.com/data/upload/20217/file_1625105711.jpg',
-        name:'逆行的光',
-        id:0,
+        icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sucai.png',
+        title:'我的素材',
+        url:'',
      },
      {
-        head:'http://img.cms.xmfish.com/data/upload/20217/file_1625105711.jpg',
-        name:'逆行的光',
-        id:0,
-      },
-      {
-        head:'http://img.cms.xmfish.com/data/upload/20217/file_1625105711.jpg',
-        name:'逆行的光',
-        id:0,
-      },
-      {
-        head:'http://img.cms.xmfish.com/data/upload/20217/file_1625105711.jpg',
-        name:'逆行的光',
-        id:0,
+        icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sezhi.png',
+        title:'账户设置',
+        url:'/pages/mine/install/index',
      },
+      
    ],
    isShowAddStaff:false,
    name:'',
@@ -36,67 +27,39 @@ Page({
  },
  onLoad: function (options) {

+    for (let key in options) {
+      this.setData({
+        [key]: options[key]
+      })
+    }
+
+    wx.getSystemInfo({
+      success (res) {
+        if(res.system.indexOf('Android')>-1){
+          wx.setBackgroundColor({
+            backgroundColor: '#34ac9f',
+          })
+        }
+      }
+    })
  },
  onShow: function () {

  },

-  // 输入
-  inputTx(e) {
-    this.setData({
-      [e.currentTarget.dataset.key]: e.detail.value
+  //退出登录
+  logout(){
+    wx.clearStorage()
+    wx.reLaunch({
+      url: '/pages/login/index'
    })
  },

-  //显示新增员工
-  showAddStaff(){
-    this.setData({
-      isShowAddStaff:true,
-      name:'',
-      mobile:'',
-    })
-  },
-
-  //新增员工
-  addStaff(){
-    let list = this.data.list
-    list.push({name:'添加',head:'http://img.cms.xmfish.com/data/upload/20217/file_1625105711.jpg',}),
-    this.setData({
-      list:list,
-      isShowAddStaff:false,
-    })
-  },
-
-  //暂停
-  suspend(){
-    wx.showModal({
-      title: '',
-      content: '确定暂停该店员账号吗？',
-      confirmColor: '#36afa2',
-      success (res) {
-        if (res.confirm) {
-          console.log('用户点击确定')
-        } else if (res.cancel) {
-          console.log('用户点击取消')
-        }
-      }
-    })
-  },
-
-  //删除
-  delete(){
-    wx.showModal({
-      title: '',
-      content: '确定删除该店员账号吗？',
-      confirmColor: '#36afa2',
-      success (res) {
-        if (res.confirm) {
-          console.log('用户点击确定')
-        } else if (res.cancel) {
-          console.log('用户点击取消')
-        }
-      }
-    })
+  //推送链接
+  pushLink(e) {
+    if(e.currentTarget.dataset.url){
+      _.$router.openUrlScheme(e.currentTarget.dataset.url)
+    }
  },

 })
@@ -1,6 +1,10 @@
 {
  "navigationBarTitleText": "我的",
  "enablePullDownRefresh": true,
+  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#34ac9f",
+  "backgroundColor": "#ffffff",
+  "backgroundColorTop": "#34ac9f",
  "usingComponents": {
 
  }
@@ -1,7 +1,6 @@
 <view class="container">
-  <view class="inner30">
-
-    <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="inner30 img-top-cover" style="background-image:url({{imgUrl}}mine/mine-bg.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">
        <view class="img-135x135 bds-1-eb ulib-r750 overflowhidden">
          <open-data type="userAvatarUrl"></open-data>
@@ -12,50 +11,22 @@
          </view>
          <view class="mt10 font-22 color-666">积分：0</view>
        </view>
-      </view>
-    </view>
-
-  </view>
-  <view class="pl30">
-    <view class="mt20 font-22 relative">
-      <i class="iconfont icon-renyuanguanli mr10"></i>人员管理
-      <view bindtap="showAddStaff" class="absolute right-0 box-middle pt5 pb5 pl10 pr30 space-nowrap bg-333 font-22 color-fff ulib-rl750"><i class="iconfont mr5 icon-jia"></i>添加人员</view>
-    </view>
-  </view>
-  <view class="inner30">
-    <view class="pl40 pr40 pt30 pb10 bg-fff box-shadow-000-10-10 ulib-r10">
-      <view class="fn-flex font-22 text-center color-666">
-        <view class="fn-flex-item">店员</view>
-        <view class="fn-flex-item">操作</view>
-      </view>
-      <block wx:for="{{list}}" wx:key='index'>
-        <view class="relative pt30 pb30 pr250 bbs-1-eb last-b-none">
-          <view class="text-nowrap">
-            <image class='img-50x50 bds-1-eb ulib-r750 text-middle' lazy-load="{{true}}" mode="scaleToFill" src="{{item.head}}"></image>
-            <text class="pl10 text-middle font-28">{{item.name}}</text>
-          </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="suspend" data-index="{{index}}"><i class="iconfont icon-zanting mr5"></i>暂停</view>
-            <view class="inline-block bg-333 pt5 pb5 pl10 pr10 font-22 color-fff ulib-r750" bindtap="delete" data-index="{{index}}"><i class="iconfont icon-shanchu mr5"></i>删除</view>
-          </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>
-      </block>
+      </view>
    </view>
  </view>
-</view>
-<lcb-footer></lcb-footer>

-<lcb-msg isShow="{{isShowAddStaff}}">
-  <view slot="content" class="inner40 text-center">
-    <view class="pt10 pb10 font-36">新增员工</view>
-    <view class="pt20 pb10">
-      <input class="wp100 bg-f6 font-32 ulib-r750" placeholder-class="color-ccc" type="number" placeholder="请输入店员名称" bindinput='inputTx' data-key='name' value='{{name}}' style="height:90rpx" />
-    </view>
-    <view class="pt10 pb20">
-      <input class="wp100 bg-f6 font-32 ulib-r750" placeholder-class="color-ccc" type="number" placeholder="请输入店员手机号" bindinput='inputTx' data-key='mobile' value='{{mobile}}' style="height:90rpx" />
-    </view>
-    <view class="pt20 pb10 pl100 pr100 text-center">
-      <button class="btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="addStaff">添加</button>
-    </view>
+  <view class="pl40 pr40">
+    <block wx:for="{{list}}" wx:key="index">
+      <view class="relative pt30 pb30 pl60 font-32" bindtap="pushLink" data-url="{{item.url}}">
+        <image class='absolute left-0 box-middle img-50x50' mode="aspectFill" src='{{item.icon}}' lazy-load="{{true}}"></image>
+        <text>{{item.title}}</text>
+        <i class="absolute right-0 box-middle iconfont icon-gengduo"></i>
+      </view>
+    </block>
  </view>
-</lcb-msg>
+
+</view>
+<lcb-footer></lcb-footer>
@@ -0,0 +1,28 @@
+import _ from '../../../commons/js/commons'
+const app = getApp()
+Page({
+  data: {
+    imgUrl:_.config.imgUrl,
+    list:[
+      {
+        icon:'icon-renyuanguanli',
+        title:'人员管理',
+        url:'/pages/mine/install/staff/index',
+      },
+    ],
+  },
+  onLoad: function (options) {
+
+  },
+  onShow: function () {
+
+  },
+
+  //推送链接
+  pushLink(e) {
+    if(e.currentTarget.dataset.url){
+      _.$router.openUrlScheme(e.currentTarget.dataset.url)
+    }
+  },
+
+})
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "我的",
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+ 
+  }
+}
@@ -0,0 +1,43 @@
+<view class="container">
+  <view class="inner30">
+
+    <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">
+        <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>
+          </view>
+          <view class="mt10 font-22 color-666">积分：0</view>
+        </view>
+      </view>
+    </view>
+
+  </view>
+  <view class="fn-clear">
+    <block wx:for="{{list}}" wx:key='index'>
+      <view class="fn-fl mt30 ml30 pt35 bg-f8 img-208x170 text-center ulib-r10" bindtap="pushLink" data-url="{{item.url}}">
+        <i class="iconfont {{item.icon}}"></i>
+        <view class="mt5">{{item.title}}</view>
+      </view>
+    </block>
+  </view>
+</view>
+<lcb-footer></lcb-footer>
+
+<lcb-msg isShow="{{isShowAddStaff}}">
+  <view slot="content" class="inner40 text-center">
+    <view class="pt10 pb10 font-36">新增员工</view>
+    <view class="pt20 pb10">
+      <input class="wp100 bg-f6 font-32 ulib-r750" placeholder-class="color-ccc" type="number" placeholder="请输入店员名称" bindinput='inputTx' data-key='name' value='{{name}}' style="height:90rpx" />
+    </view>
+    <view class="pt10 pb20">
+      <input class="wp100 bg-f6 font-32 ulib-r750" placeholder-class="color-ccc" type="number" placeholder="请输入店员手机号" bindinput='inputTx' data-key='mobile' value='{{mobile}}' style="height:90rpx" />
+    </view>
+    <view class="pt20 pb10 pl100 pr100 text-center">
+      <button class="btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="addStaff">添加</button>
+    </view>
+  </view>
+</lcb-msg>
@@ -0,0 +1 @@
+/* pages/mine/index.wxss */
@@ -0,0 +1,102 @@
+import _ from '../../../../commons/js/commons'
+const app = getApp()
+Page({
+  data: {
+    imgUrl:_.config.imgUrl,
+    list:[
+      {
+        head:'http://img.cms.xmfish.com/data/upload/20217/file_1625105711.jpg',
+        name:'逆行的光',
+        id:0,
+      },
+      {
+        head:'http://img.cms.xmfish.com/data/upload/20217/file_1625105711.jpg',
+        name:'逆行的光',
+        id:0,
+      },
+      {
+        head:'http://img.cms.xmfish.com/data/upload/20217/file_1625105711.jpg',
+        name:'逆行的光',
+        id:0,
+      },
+      {
+        head:'http://img.cms.xmfish.com/data/upload/20217/file_1625105711.jpg',
+        name:'逆行的光',
+        id:0,
+      },
+      {
+        head:'http://img.cms.xmfish.com/data/upload/20217/file_1625105711.jpg',
+        name:'逆行的光',
+        id:0,
+      },
+    ],
+    isShowAddStaff:false,
+    name:'',
+    mobile:'',
+  },
+  onLoad: function (options) {
+
+  },
+  onShow: function () {
+
+  },
+
+  // 输入
+  inputTx(e) {
+    this.setData({
+      [e.currentTarget.dataset.key]: e.detail.value
+    })
+  },
+
+  //显示新增员工
+  showAddStaff(){
+    this.setData({
+      isShowAddStaff:true,
+      name:'',
+      mobile:'',
+    })
+  },
+
+  //新增员工
+  addStaff(){
+    let list = this.data.list
+    list.push({name:'添加',head:'http://img.cms.xmfish.com/data/upload/20217/file_1625105711.jpg',}),
+    this.setData({
+      list:list,
+      isShowAddStaff:false,
+    })
+  },
+
+  //暂停
+  suspend(){
+    wx.showModal({
+      title: '',
+      content: '确定暂停该店员账号吗？',
+      confirmColor: '#36afa2',
+      success (res) {
+        if (res.confirm) {
+          console.log('用户点击确定')
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  },
+
+  //删除
+  delete(){
+    wx.showModal({
+      title: '',
+      content: '确定删除该店员账号吗？',
+      confirmColor: '#36afa2',
+      success (res) {
+        if (res.confirm) {
+          console.log('用户点击确定')
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  },
+
+})
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "我的",
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+ 
+  }
+}
@@ -0,0 +1,61 @@
+<view class="container">
+  <view class="inner30">
+
+    <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">
+        <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>
+          </view>
+          <view class="mt10 font-22 color-666">积分：0</view>
+        </view>
+      </view>
+    </view>
+
+  </view>
+  <view class="pl30">
+    <view class="mt20 font-22 relative">
+      <i class="iconfont icon-renyuanguanli mr10"></i>人员管理
+      <view bindtap="showAddStaff" class="absolute right-0 box-middle pt5 pb5 pl10 pr30 space-nowrap bg-333 font-22 color-fff ulib-rl750"><i class="iconfont mr5 icon-jia"></i>添加人员</view>
+    </view>
+  </view>
+  <view class="inner30">
+    <view class="pl40 pr40 pt30 pb10 bg-fff box-shadow-000-10-10 ulib-r10">
+      <view class="fn-flex font-22 text-center color-666">
+        <view class="fn-flex-item">店员</view>
+        <view class="fn-flex-item">操作</view>
+      </view>
+      <block wx:for="{{list}}" wx:key='index'>
+        <view class="relative pt30 pb30 pr250 bbs-1-eb last-b-none">
+          <view class="text-nowrap">
+            <image class='img-50x50 bds-1-eb ulib-r750 text-middle' lazy-load="{{true}}" mode="scaleToFill" src="{{item.head}}"></image>
+            <text class="pl10 text-middle font-28">{{item.name}}</text>
+          </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="suspend" data-index="{{index}}"><i class="iconfont icon-zanting mr5"></i>暂停</view>
+            <view class="inline-block bg-333 pt5 pb5 pl10 pr10 font-22 color-fff ulib-r750" bindtap="delete" data-index="{{index}}"><i class="iconfont icon-shanchu mr5"></i>删除</view>
+          </view>
+        </view>
+      </block>
+    </view>
+  </view>
+</view>
+<lcb-footer></lcb-footer>
+
+<lcb-msg isShow="{{isShowAddStaff}}">
+  <view slot="content" class="inner40 text-center">
+    <view class="pt10 pb10 font-36">新增员工</view>
+    <view class="pt20 pb10">
+      <input class="wp100 bg-f6 font-32 ulib-r750" placeholder-class="color-ccc" type="number" placeholder="请输入店员名称" bindinput='inputTx' data-key='name' value='{{name}}' style="height:90rpx" />
+    </view>
+    <view class="pt10 pb20">
+      <input class="wp100 bg-f6 font-32 ulib-r750" placeholder-class="color-ccc" type="number" placeholder="请输入店员手机号" bindinput='inputTx' data-key='mobile' value='{{mobile}}' style="height:90rpx" />
+    </view>
+    <view class="pt20 pb10 pl100 pr100 text-center">
+      <button class="btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="addStaff">添加</button>
+    </view>
+  </view>
+</lcb-msg>
@@ -0,0 +1 @@
+/* pages/mine/index.wxss */