From f059af9a509215fe76be7fafe8e20a86490379d7 Mon Sep 17 00:00:00 2001
From: chenrx <zhufeng@nuzanyun.com>
Date: Sun, 2 Jun 2024 15:22:39 +0800
Subject: [PATCH] 20240602

---
 commons/js/config.js               |   1 +
 commons/js/utils/apiQuery.js       |   6 +
 pages/customer/detail/index.wxml   |   4 +-
 pages/mine/index.js                | 111 +++++----
 pages/order/detail/index2.js       | 349 ++++++++++++++---------------
 pages/order/detail/index2.wxml     |   5 +-
 pages/order/filterList/index2.js   |   2 +-
 pages/order/filterList/index2.wxml | 110 ++++-----
 pages/order/index.js               |   2 +-
 pages/order/index.wxml             |   6 +-
 10 files changed, 283 insertions(+), 313 deletions(-)

diff --git a/commons/js/config.js b/commons/js/config.js
index ed4cca6..80ccb8e 100644
--- a/commons/js/config.js
+++ b/commons/js/config.js
@@ -41,6 +41,7 @@ api = {
   appIdcard: "app/idcard", //创建申请开票信息
   appUserCal: "app/user/cal", //获取用户统计
   appCusorderCkcar: "app/cusorder/ckcar", //确认交付
+  appCusorderStatus: "app/cusorder/status", //修改订单状态
   appCustomersAdmins: "app/customers/admins", //分配客户
   appXz: "app/xz", //获取虚拟电话
   appCustomerlogs: "app/customerlogs", //新增日志
diff --git a/commons/js/utils/apiQuery.js b/commons/js/utils/apiQuery.js
index beaca71..d38a3dd 100644
--- a/commons/js/utils/apiQuery.js
+++ b/commons/js/utils/apiQuery.js
@@ -1034,4 +1034,10 @@ apiQuery.postAppSign = function (params) {
   })
 }
 
+//修改订单状态
+apiQuery.putAppCusorderStatus = function (params) {
+  return new Promise(function (resolve, reject) {
+    HttpRequest(true, Config.api.appCusorderStatus, 2, params, "PUT", resolve, reject)
+  })
+}
 export default apiQuery;
\ No newline at end of file
diff --git a/pages/customer/detail/index.wxml b/pages/customer/detail/index.wxml
index f9d2f6a..017c771 100644
--- a/pages/customer/detail/index.wxml
+++ b/pages/customer/detail/index.wxml
@@ -21,7 +21,9 @@
               <i class="absolute box-center-middle iconfont icon-dianhua"></i>
             </view>
           </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'>
@@ -479,7 +481,7 @@
     <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="inner30 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index2?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>
diff --git a/pages/mine/index.js b/pages/mine/index.js
index b73ece4..9dac3e2 100644
--- a/pages/mine/index.js
+++ b/pages/mine/index.js
@@ -2,15 +2,14 @@ import _ from '../../commons/js/commons'
 const app = getApp()
 Page({
   data: {
-    imgUrl:_.config.imgUrl,
-    isShowAddStaff:false,
-    name:'',
-    mobile:'',
-    isShowProfile:true,//是否显示授权用户信息按钮
-    isShowSwitchingRoles:false,
+    imgUrl: _.config.imgUrl,
+    isShowAddStaff: false,
+    name: '',
+    mobile: '',
+    isShowProfile: true, //是否显示授权用户信息按钮
+    isShowSwitchingRoles: false,
   },
   onLoad: function (options) {
-    console.log(options)
     for (let key in options) {
       this.setData({
         [key]: options[key]
@@ -18,7 +17,7 @@ Page({
     }
 
     let list = []
-    if(this.data.source=='channel'){
+    if (this.data.source == 'channel') {
       list = [
         // {
         //   icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-zichan2.png',
@@ -26,27 +25,27 @@ Page({
         //   url:'',
         // },
         {
-          icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sezhi2.png',
-          title:'账户设置',
-          url:'/pages/mine/install/index',
+          icon: 'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sezhi2.png',
+          title: '账户设置',
+          url: '/pages/mine/install/index',
         },
       ]
-    }else if(this.data.source=='shop'){
+    } 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-sucai2.png',
+        //   title:'签到码',
+        //   url:'/pages/signup/code',
+        // },
         {
-          icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sucai2.png',
-          title:'签到码',
-          url:'/pages/signup/code',
-        },
-        {
-          icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sezhi2.png',
-          title:'账户设置',
-          url:'/pages/mine/install/index',
+          icon: 'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sezhi2.png',
+          title: '账户设置',
+          url: '/pages/mine/install/index',
         },
         // {
         //   icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-siyutong2.png',
@@ -54,25 +53,25 @@ Page({
         //   url:'/pages/siyutong/index',
         // },
       ]
-    }else{
+    } else {
       list = [
-        {
-          icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sucai2.png',
-          title:'签到码',
-          url:'/pages/signup/code',
-        }
+        // {
+        //   icon:'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sucai2.png',
+        //   title:'签到码',
+        //   url:'/pages/signup/code',
+        // }
       ]
     }
 
     this.setData({
-      list:list,
+      list: list,
     })
 
     this.getUserInfo()
-
+    console.log(this.data)
     wx.getSystemInfo({
-      success (res) {
-        if(res.system.indexOf('Android')>-1){
+      success(res) {
+        if (res.system.indexOf('Android') > -1) {
           wx.setBackgroundColor({
             backgroundColor: '#34ac9f',
           })
@@ -81,9 +80,9 @@ Page({
     })
 
     //消息通讯 是否显示授权用户信息按钮
-    _.eventBus.on("isShowProfile", this, function(res){
+    _.eventBus.on("isShowProfile", this, function (res) {
       this.setData({
-        isShowProfile:res,
+        isShowProfile: res,
       })
     })
 
@@ -91,35 +90,35 @@ Page({
   onShow: function () {
 
   },
-  
+
   //生命周期函数--监听页面卸载
   onUnload: function () {
     //卸载消息通讯 是否显示授权用户信息
-    _.eventBus.remove('isShowProfile',this);
+    _.eventBus.remove('isShowProfile', this);
   },
 
   //获取用户信息
-  getUserInfo(){
+  getUserInfo() {
     _.apiQuery.getUserInfo().then(res => {
       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 != 4) {
+        let list = this.data.list
+        list.push({
+          icon: 'https://qs.haodian.cn/wechat_app/lichebao/mine/icon-sucai2.png',
+          title: '签到码',
+          url: '/pages/signup/code',
+        })
+        this.setData({
+          list,
+        })
+      }
     });
   },
 
   //退出登录
-  logout(){
+  logout() {
     wx.clearStorage()
     wx.reLaunch({
       url: '/pages/login/index'
@@ -128,7 +127,7 @@ Page({
 
   //推送链接
   pushLink(e) {
-    if(e.currentTarget.dataset.url){
+    if (e.currentTarget.dataset.url) {
       _.$router.openUrlScheme(e.currentTarget.dataset.url)
     }
   },
@@ -137,30 +136,30 @@ Page({
   pushLinkMsg(e) {
     if (e.currentTarget.dataset.url) {
       _.$router.openUrlScheme(e.currentTarget.dataset.url)
-    }else{
+    } else {
       wx.showToast({
-        title:'开发中，敬请期待！',
+        title: '开发中，敬请期待！',
         icon: "none"
       });
     }
   },
 
   //切换角色
-  putAppResetgroupid(e){
+  putAppResetgroupid(e) {
     let params = {};
     params['group_id'] = e.currentTarget.dataset.key;
-    _.apiQuery.putAppResetgroupid(params).then(res=>{
+    _.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){
+        if (res.group_id == 4) {
           wx.reLaunch({
             url: '/pages/channel/index',
           })
-        }else{
+        } else {
           wx.reLaunch({
             url: '/pages/index/index',
           })
@@ -170,9 +169,9 @@ Page({
   },
 
   //显示切换角色
-  switchingRoles(){
+  switchingRoles() {
     this.setData({
-      isShowSwitchingRoles:!this.data.isShowSwitchingRoles,
+      isShowSwitchingRoles: !this.data.isShowSwitchingRoles,
     })
   },
 
diff --git a/pages/order/detail/index2.js b/pages/order/detail/index2.js
index dd4caec..7b55101 100644
--- a/pages/order/detail/index2.js
+++ b/pages/order/detail/index2.js
@@ -4,28 +4,28 @@ var wxTimer = null
 const app = getApp()
 Page({
   data: {
-    imgUrl:_.config.imgUrl,
-    submitFlag:false,
-    isShowOrderCode:false,
-    remark:'',//补充说明
-    carInfoList:[],//随车资料选项
-    ckcarInfo:[],//随车资料选中内容
-    carToolList:[],//随车随车工具选项
-    ckcarTool:[],//随车工具选中内容
-    
-    pay_img:{},//支付凭证照片
-    contract_img:{},//合同图片照片
-    equity_ck_img:{},//权益确认书照片
-    bill_img:{},//发票照片
-    car_auth_img:{},//车机实名认证
-    delivery_ck_img:{},//交车确认图片
+    imgUrl: _.config.imgUrl,
+    submitFlag: false,
+    isShowOrderCode: false,
+    remark: '', //补充说明
+    carInfoList: [], //随车资料选项
+    ckcarInfo: [], //随车资料选中内容
+    carToolList: [], //随车随车工具选项
+    ckcarTool: [], //随车工具选中内容
 
-    cardida:{},//身份证正面照片
-    cardidb:{},//身份证反面照片
-    business_licence:{},//营业执照照片
-    car_img:{},//行驶证照片
-    isShowCK:false,
-    isShowBill:false,
+    pay_img: {}, //支付凭证照片
+    contract_img: {}, //合同图片照片
+    equity_ck_img: {}, //权益确认书照片
+    bill_img: {}, //发票照片
+    car_auth_img: {}, //车机实名认证
+    delivery_ck_img: {}, //交车确认图片
+
+    cardida: {}, //身份证正面照片
+    cardidb: {}, //身份证反面照片
+    business_licence: {}, //营业执照照片
+    car_img: {}, //行驶证照片
+    isShowCK: false,
+    isShowBill: false,
     isShowConfirm: false, //是否显示确认窗口
     confirm_count_down: 3,
     wxTimerList: {},
@@ -40,8 +40,8 @@ Page({
 
     this.getAppCusorderV2()
     this.getUserInfo()
-    
-    
+
+
   },
   onShow: function () {
     this.getAppCusorderdata()
@@ -62,7 +62,7 @@ Page({
   },
 
   //获取用户信息
-  getUserInfo(){
+  getUserInfo() {
     _.apiQuery.getUserInfo().then(res => {
       this.setData({
         userInfo: res
@@ -71,12 +71,12 @@ Page({
   },
 
   //获取订单详情
-  getAppCusorderV2(){
+  getAppCusorderV2() {
     let params = {};
     params['id'] = this.data.id;
-    _.apiQuery.getAppCusorderDetails(params).then(res=>{
+    _.apiQuery.getAppCusorderDetails(params).then(res => {
       this.setData({
-        info:res.data,
+        info: res.data,
       })
 
       wx.stopPullDownRefresh()
@@ -85,25 +85,25 @@ Page({
   },
 
   //获取订单图片
-  getAppCusorderdata(){
+  getAppCusorderdata() {
     let params = {};
     params['id'] = this.data.id;
-    _.apiQuery.getAppCusorderdata(params).then(res=>{
+    _.apiQuery.getAppCusorderdata(params).then(res => {
       this.setData({
-        imgInfo:res.data,
+        imgInfo: res.data,
       })
-      if(res.data.img_status == 1){
+      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,
-          pay_img:res.data.imgs.pay_img.length==0?[]:res.data.imgs.pay_img,
-          contract_img:res.data.imgs.contract_img.length==0?[]:res.data.imgs.contract_img,
-          equity_ck_img:res.data.imgs.equity_ck_img.length==0?[]:res.data.imgs.equity_ck_img,
-          bill_img:res.data.imgs.bill_img.length==0?[]:res.data.imgs.bill_img,
-          car_auth_img:res.data.imgs.car_auth_img.length==0?[]:res.data.imgs.car_auth_img,
-          delivery_ck_img:res.data.imgs.delivery_ck_img.length==0?[]:res.data.imgs.delivery_ck_img,
+          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,
+          pay_img: res.data.imgs.pay_img.length == 0 ? [] : res.data.imgs.pay_img,
+          contract_img: res.data.imgs.contract_img.length == 0 ? [] : res.data.imgs.contract_img,
+          equity_ck_img: res.data.imgs.equity_ck_img.length == 0 ? [] : res.data.imgs.equity_ck_img,
+          bill_img: res.data.imgs.bill_img.length == 0 ? [] : res.data.imgs.bill_img,
+          car_auth_img: res.data.imgs.car_auth_img.length == 0 ? [] : res.data.imgs.car_auth_img,
+          delivery_ck_img: res.data.imgs.delivery_ck_img.length == 0 ? [] : res.data.imgs.delivery_ck_img,
         })
 
       }
@@ -112,17 +112,17 @@ Page({
   },
 
   //显示短信弹框
-  showMessage(e){
+  showMessage(e) {
     this.setData({
-      isShowMessage:true,
-      content:'',
+      isShowMessage: true,
+      content: '',
     })
   },
 
   //关闭短信弹框
-  hideMessage(e){
+  hideMessage(e) {
     this.setData({
-      isShowMessage:false,
+      isShowMessage: false,
     })
   },
 
@@ -134,7 +134,7 @@ Page({
   },
 
   //发短信
-  postAppSmsCusorder(){
+  postAppSmsCusorder() {
     if (this.data.submitFlag) return;
     if (this.data.content == '') {
       wx.showToast({
@@ -148,11 +148,11 @@ Page({
       let params = {};
       params['id'] = this.data.id;
       params['content'] = this.data.content;
-      _.apiQuery.postAppSmsCusorder(params).then(res=>{
+      _.apiQuery.postAppSmsCusorder(params).then(res => {
         this.setData({
-          isShowMessage:false,
-          submitFlag:false,
-          content:'',
+          isShowMessage: false,
+          submitFlag: false,
+          content: '',
         })
         wx.showToast({
           title: res.msg,
@@ -167,7 +167,7 @@ Page({
   chooseImg(e) {
     let that = this
     //上传身份证正面
-    if(e.currentTarget.dataset.type=='cardida'){
+    if (e.currentTarget.dataset.type == 'cardida') {
       wx.chooseImage({
         count: 1, // 默认9
         sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
@@ -177,8 +177,8 @@ Page({
             title: '上传中',
           })
           wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
+            url: _.config.api.upImg,
+            filePath: res.tempFilePaths[0],
             name: 'img',
             formData: {
               'app': 'liche'
@@ -188,8 +188,8 @@ Page({
               wx.hideLoading();
               if (resp.data.code == 200) {
                 that.setData({
-                  'cardida.value':resp.data.data.url,
-                  'cardida.img':resp.data.data.full_url,
+                  'cardida.value': resp.data.data.url,
+                  'cardida.img': resp.data.data.full_url,
                 })
 
                 let params = {};
@@ -197,11 +197,11 @@ Page({
                 params['cardida'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
 
-                }).catch(res2=>{
-                  if(res2.code==418){
+                }).catch(res2 => {
+                  if (res2.code == 418) {
                     that.setData({
-                      'cardida.err':!res2.data[0].caridA,
-                      'cardida.errmsg':res2.data[0].errmsg,
+                      'cardida.err': !res2.data[0].caridA,
+                      'cardida.errmsg': res2.data[0].errmsg,
                     })
                   }
                 });
@@ -220,7 +220,7 @@ Page({
     }
 
     //上传身份证背面
-    if(e.currentTarget.dataset.type=='cardidb'){
+    if (e.currentTarget.dataset.type == 'cardidb') {
       wx.chooseImage({
         count: 1, // 默认9
         sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
@@ -230,8 +230,8 @@ Page({
             title: '上传中',
           })
           wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
+            url: _.config.api.upImg,
+            filePath: res.tempFilePaths[0],
             name: 'img',
             formData: {
               'app': 'liche'
@@ -241,8 +241,8 @@ Page({
               wx.hideLoading();
               if (resp.data.code == 200) {
                 that.setData({
-                  'cardidb.value':resp.data.data.url,
-                  'cardidb.img':resp.data.data.full_url,
+                  'cardidb.value': resp.data.data.url,
+                  'cardidb.img': resp.data.data.full_url,
                 })
 
                 let params = {};
@@ -250,11 +250,11 @@ Page({
                 params['cardidb'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
 
-                }).catch(res2=>{
-                  if(res2.code==418){
+                }).catch(res2 => {
+                  if (res2.code == 418) {
                     that.setData({
-                      'cardidb.err':!res2.data[1].caridB,
-                      'cardidb.errmsg':res2.data[1].errmsg,
+                      'cardidb.err': !res2.data[1].caridB,
+                      'cardidb.errmsg': res2.data[1].errmsg,
                     })
                   }
                 });
@@ -273,7 +273,7 @@ Page({
     }
 
     //上传营业执照
-    if(e.currentTarget.dataset.type=='business_licence'){
+    if (e.currentTarget.dataset.type == 'business_licence') {
       wx.chooseImage({
         count: 1, // 默认9
         sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
@@ -283,8 +283,8 @@ Page({
             title: '上传中',
           })
           wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
+            url: _.config.api.upImg,
+            filePath: res.tempFilePaths[0],
             name: 'img',
             formData: {
               'app': 'liche'
@@ -294,8 +294,8 @@ Page({
               wx.hideLoading();
               if (resp.data.code == 200) {
                 that.setData({
-                  'business_licence.value':resp.data.data.url,
-                  'business_licence.img':resp.data.data.full_url,
+                  'business_licence.value': resp.data.data.url,
+                  'business_licence.img': resp.data.data.full_url,
                 })
 
                 let params = {};
@@ -303,11 +303,11 @@ Page({
                 params['business_licence'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
 
-                }).catch(res2=>{
-                  if(res2.code==418){
+                }).catch(res2 => {
+                  if (res2.code == 418) {
                     that.setData({
-                      'business_licence.err':!res2.data[0].business_licence,
-                      'business_licence.errmsg':res2.data[0].errmsg,
+                      'business_licence.err': !res2.data[0].business_licence,
+                      'business_licence.errmsg': res2.data[0].errmsg,
                     })
                   }
                 });
@@ -326,7 +326,7 @@ Page({
     }
 
     //上传行驶证
-    if(e.currentTarget.dataset.type=='car_img'){
+    if (e.currentTarget.dataset.type == 'car_img') {
       wx.chooseImage({
         count: 1, // 默认9
         sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
@@ -336,8 +336,8 @@ Page({
             title: '上传中',
           })
           wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
+            url: _.config.api.upImg,
+            filePath: res.tempFilePaths[0],
             name: 'img',
             formData: {
               'app': 'liche'
@@ -351,8 +351,8 @@ Page({
                 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,
+                    'car_img.value': resp.data.data.url,
+                    'car_img.img': resp.data.data.full_url,
                   })
                 })
               }
@@ -370,7 +370,7 @@ Page({
     }
 
     //上传保单
-    if(e.currentTarget.dataset.type=='ins_img'){
+    if (e.currentTarget.dataset.type == 'ins_img') {
       wx.chooseImage({
         count: 10 - that.data.ins_img.length, //
         sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
@@ -379,13 +379,13 @@ Page({
           wx.showLoading({
             title: '上传中',
           })
-          let ins_img=that.data.ins_img
+          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],
+              url: _.config.api.upImg,
+              filePath: res1.tempFilePaths[i],
               name: 'img',
               formData: {
                 'app': 'liche'
@@ -397,11 +397,11 @@ Page({
                   let imgdata = resp.data
                   let list = []
                   list.push({
-                    value:imgdata.data.url,
-                    img:imgdata.data.full_url,
+                    value: imgdata.data.url,
+                    img: imgdata.data.full_url,
                   })
-                  ins_img=ins_img.concat(list)
-                  if(k == res1.tempFilePaths.length){
+                  ins_img = ins_img.concat(list)
+                  if (k == res1.tempFilePaths.length) {
                     wx.hideLoading();
                     let params = {};
                     params['id'] = that.data.id;
@@ -418,7 +418,7 @@ Page({
                   }
                 }
               },
-        
+
             })
           }
 
@@ -434,7 +434,7 @@ Page({
     }
 
     //上传交车合照
-    if(e.currentTarget.dataset.type=='other_img'){
+    if (e.currentTarget.dataset.type == 'other_img') {
       wx.chooseImage({
         count: 1, //
         sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
@@ -443,13 +443,13 @@ Page({
           wx.showLoading({
             title: '上传中',
           })
-          let other_img=that.data.other_img
+          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],
+              url: _.config.api.upImg,
+              filePath: res1.tempFilePaths[i],
               name: 'img',
               formData: {
                 'app': 'liche'
@@ -461,11 +461,11 @@ Page({
                   let imgdata = resp.data
                   let list = []
                   list.push({
-                    value:imgdata.data.url,
-                    img:imgdata.data.full_url,
+                    value: imgdata.data.url,
+                    img: imgdata.data.full_url,
                   })
-                  other_img=other_img.concat(list)
-                  if(k == res1.tempFilePaths.length){
+                  other_img = other_img.concat(list)
+                  if (k == res1.tempFilePaths.length) {
                     wx.hideLoading();
                     let params = {};
                     params['id'] = that.data.id;
@@ -482,7 +482,7 @@ Page({
                   }
                 }
               },
-        
+
             })
           }
 
@@ -499,8 +499,8 @@ Page({
   },
 
   // 编辑页面删除图片
-  delImg(e){
-    if(e.currentTarget.dataset.type=='ins_img'){
+  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 = {};
@@ -515,7 +515,7 @@ Page({
           ins_img,
         })
       })
-    }else if(e.currentTarget.dataset.type=='other_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 = {};
@@ -534,25 +534,23 @@ Page({
   },
 
   //确认交付
-  putAppCusorderCkcar(){
-    
-    if(this.data.ckcarInfo.length == 0){
+  putAppCusorderCkcar() {
+
+    if (this.data.ckcarInfo.length == 0) {
       wx.showToast({
         title: '请选择随车资料',
         icon: 'none'
       })
-    }
-    else if(this.data.ckcarTool.length == 0){
+    } else if (this.data.ckcarTool.length == 0) {
       wx.showToast({
         title: '请选择随车工具',
         icon: 'none'
       })
-    }
-    else{
+    } else {
       let that = this
       wx.showModal({
-        title:'确认交付车辆？',
-        content:'',
+        title: '确认交付车辆？',
+        content: '',
         success: function (res) {
           if (res.confirm) {
             that.setData({
@@ -568,13 +566,13 @@ Page({
                 submitFlag: false,
               })
               that.getAppCusorderV2()
-        
+
               wx.showToast({
                 title: '确认交付车辆成功',
                 icon: 'success'
               })
-        
-            }).catch(res=>{
+
+            }).catch(res => {
               that.setData({
                 submitFlag: false,
               })
@@ -588,129 +586,126 @@ Page({
   //订单支付码
   optShowOrderCode() {
     this.setData({
-      isShowOrderCode:!this.data.isShowOrderCode,
+      isShowOrderCode: !this.data.isShowOrderCode,
     })
   },
 
   //查看图片
   previewImage: function (e) {
-    if(e.currentTarget.dataset.type=='bill_img'){
+    if (e.currentTarget.dataset.type == 'bill_img') {
       let urls = [this.data.info.bill_img]
       wx.previewImage({
-        current:e.currentTarget.dataset.current,
+        current: e.currentTarget.dataset.current,
         urls,
       })
-    }
-    else if(e.currentTarget.dataset.type=='cardida'){
+    } else if (e.currentTarget.dataset.type == 'cardida') {
       wx.previewImage({
-        current:this.data.imgInfo.imgs.cardida.img,
-        urls:[this.data.imgInfo.imgs.cardida.img],
+        current: this.data.imgInfo.imgs.cardida.img,
+        urls: [this.data.imgInfo.imgs.cardida.img],
       })
-    }
-    else if(e.currentTarget.dataset.type=='cardidb'){
+    } else if (e.currentTarget.dataset.type == 'cardidb') {
       wx.previewImage({
-        current:this.data.imgInfo.imgs.cardidb.img,
-        urls:[this.data.imgInfo.imgs.cardidb.img],
+        current: this.data.imgInfo.imgs.cardidb.img,
+        urls: [this.data.imgInfo.imgs.cardidb.img],
       })
-    }
-    else if(e.currentTarget.dataset.type=='business_licence'){
+    } 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],
+        current: this.data.imgInfo.imgs.business_licence.img,
+        urls: [this.data.imgInfo.imgs.business_licence.img],
       })
-    }
-    else if(e.currentTarget.dataset.type=='car_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],
+        current: this.data.imgInfo.imgs.car_img.img,
+        urls: [this.data.imgInfo.imgs.car_img.img],
       })
-    }
-    else if(e.currentTarget.dataset.type=='insurance_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],
+        current: this.data.imgInfo.imgs.insurance_img.img,
+        urls: [this.data.imgInfo.imgs.insurance_img.img],
       })
-    }
-    else if(e.currentTarget.dataset.type=='business_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],
+        current: this.data.imgInfo.imgs.business_img.img,
+        urls: [this.data.imgInfo.imgs.business_img.img],
       })
-    }
-    else if(e.currentTarget.dataset.type=='accident_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],
+        current: this.data.imgInfo.imgs.accident_img.img,
+        urls: [this.data.imgInfo.imgs.accident_img.img],
       })
-    }
-    else if(e.currentTarget.dataset.type=='other_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,
+        current: this.data.imgInfo.imgs.other_img[0].img,
+        urls: img,
       })
-    }
-    else if(e.currentTarget.dataset.type=='wx_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],
+        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'){
+    } 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],
+        current: this.data.imgInfo.imgs.mut_wx_img.img,
+        urls: [this.data.imgInfo.imgs.mut_wx_img.img],
       })
-    }
-    else if(e.currentTarget.dataset.type=='notify'){
+    } 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,
+        current: e.currentTarget.dataset.current,
+        urls: img,
       })
-    }
-    else if(e.currentTarget.dataset.type=='lend'){
+    } else if (e.currentTarget.dataset.type == 'lend') {
       wx.previewImage({
-        current:this.data.info.lend_file.src,
-        urls:[this.data.info.lend_file.src],
+        current: this.data.info.lend_file.src,
+        urls: [this.data.info.lend_file.src],
       })
     }
 
   },
 
   //推送链接
-  pushLink(e){
-    if(e.currentTarget.dataset.url){
+  pushLink(e) {
+    if (e.currentTarget.dataset.url) {
       _.$router.openUrlScheme(e.currentTarget.dataset.url)
     }
   },
 
   //20240526 确认弹窗
-  bindShowConfirm(){
+  bindShowConfirm() {
     this.setData({
-      isShowConfirm:true,
+      isShowConfirm: true,
       submitFlag: true
-    },()=>{
+    }, () => {
       this.getTimes(this.data.confirm_count_down)
     })
   },
 
   //关闭短信弹框
-  hideConfirm(e){
+  hideConfirm(e) {
     this.setData({
-      isShowConfirm:false,
+      isShowConfirm: false,
     })
   },
 
   //20240526 确定无误接口
-  postConfirmOrder(){
-    console.log('postConfirmOrder')
+  postConfirmOrder() {
+    let params = {
+      'id': this.data.id,
+      'status': parseInt(this.data.info.status) + 1,
+    }
+    _.apiQuery.putAppCusorderStatus(params).then(res => {
+      _.utils.$toast(res.msg).then(res => {
+        this.getAppCusorderV2()
+        this.hideConfirm()
+      })
+    })
   },
 
   /** 
@@ -741,7 +736,7 @@ Page({
   },
 
   //页面相关事件处理函数--监听用户下拉动作
-  onPullDownRefresh(){
+  onPullDownRefresh() {
     this.getAppCusorderdata()
     this.getAppCusorderV2()
     this.setData({
diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index e17bc98..8602a40 100644
--- a/pages/order/detail/index2.wxml
+++ b/pages/order/detail/index2.wxml
@@ -338,7 +338,7 @@
   </view>
 
   <view class="fixed left-0 right-0 bottom-0 pt20 pl30 pr30 pb40 bg-000-op80 fn-flex" style="z-index:999">
-    <button bindtap="bindShowConfirm" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">下定信息确认无误</button>
+    <button bindtap="{{info.status<2?'bindShowConfirm':''}}" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">{{info.bt_cn}}</button>
   </view>
 </view>
 <lcb-backChannel></lcb-backChannel>
@@ -373,7 +373,8 @@
   <view slot="content">
     <view class="inner40">
       <view class="text-center font-32 text-bold">温馨提示</view>
-      <view class="text-center font-28 pt40" style="min-height:8vh;"> 确认提交订单信息至汽车之家系统?<view class="mt10">提交后将不可撤回。</view></view>
+      <view class="text-center font-28 pt40" style="min-height:8vh;"> 确认提交订单信息至汽车之家系统?<view class="mt10">提交后将不可撤回。</view>
+      </view>
     </view>
     <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
       <button bindtap="hideConfirm" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
diff --git a/pages/order/filterList/index2.js b/pages/order/filterList/index2.js
index 33d4d6f..88d277c 100644
--- a/pages/order/filterList/index2.js
+++ b/pages/order/filterList/index2.js
@@ -81,7 +81,7 @@ Page({
     if(this.data.visit_tab_id != ''){
       params['visit_tab_id'] = this.data.visit_tab_id;
     }
-    _.apiQuery.getAppCusorderV2List(params).then(res => {
+    _.apiQuery.getAppCusorderList(params).then(res => {
       this.setData({
         pageNo: this.data.pageNo + 1,
         list: this.data.list.concat(res.data.list),
diff --git a/pages/order/filterList/index2.wxml b/pages/order/filterList/index2.wxml
index f95c959..13801c9 100644
--- a/pages/order/filterList/index2.wxml
+++ b/pages/order/filterList/index2.wxml
@@ -12,7 +12,7 @@
       </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="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>
@@ -23,77 +23,43 @@
   <view class="mt10 pl30 pr30">
 
     <block wx:for='{{list}}' wx:key='index'>
-      <block wx:if="{{item.id>=v2OrderId}}">
-        <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index2?id={{item.id}}">
+
+      <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index2?id={{item.id}}">
         <!-- <view class="absolute top-0 left-0 ml40 pt5 pb5 pl10 pr10 bg-36afa2 font-22 color-fff" wx:if="{{item.status_name}}">{{item.status_name}}</view> -->
-          <view class="relative pt10 pb10 color-36afa2" catchtap="pushLink" data-url="/pages/customer/detail/index?id={{item.cus_id}}">
-            <view class="font-32">{{item.name}}({{item.mobile}})</view>
-            <i class="absolute right-0 box-middle iconfont icon-gengduo font-26"></i>
-          </view>
-          <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.owner_name}}">
-            <view class="fn-fl color-333">车主姓名</view>
-            <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.owner_name}}</view>
-          </view>
-          <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.owner_mobile}}">
-            <view class="fn-fl color-333">车主电话</view>
-            <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.owner_mobile}}</view>
-          </view>
-          <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.company}}">
-            <view class="fn-fl color-333">企业名称</view>
-            <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.company}}</view>
-          </view>
+        <view class="relative pt10 pb10 color-36afa2" catchtap="pushLink" data-url="/pages/customer/detail/index?id={{item.cus_id}}">
+          <view class="font-32">{{item.name}}({{item.mobile}})</view>
+          <i class="absolute right-0 box-middle iconfont icon-gengduo font-26"></i>
+        </view>
+        <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.company}}">
+          <view class="fn-fl color-333">企业名称</view>
+          <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.company}}</view>
+        </view>
 
-          <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item="pin" wx:key='i'>
-            <view class="mt20 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="{{pin.value}}">{{pin.value}}</text>
-                  <text class="inline-block ml10 bg-36afa2 pt5 pb5 pl15 pr15 text-middle font-22 color-fff ulib-r10" catchtap="showTransfer" data-id="{{item.id}}" wx:if="{{item.allot == 1}}">移交</text>
-                </view>
-              </block>
-              <view wx:else class="fn-fr wp60 text-nowrap text-right color-666">
-                <block wx:if="{{pin.type=='checkbox'}}">
-                  <block wx:for="{{pin.lists}}" wx:for-index='key' wx:for-item="lable" wx:key='j'>
-                    <view class="inline-block ml10 mr10"><i class="iconfont font-34 mr5 text-middle {{lable.selected?'icon-danxuan_xuanzhong color-36afa2':'icon-danxuan'}}" /><text class="text-middle">{{lable.value}}</text></view>
-                  </block>
-                </block>
-                <block wx:elif="{{pin.type=='text'}}">
-                  <text class="inline-block mr10 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750" style="background-color:{{pin.bg_color}};" wx:if="{{pin.bg_color}}">{{pin.value}}</text>
-                  <text wx:else>{{pin.value}}</text>
-                </block>
+        <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item="pin" wx:key='i'>
+          <view class="mt20 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="{{pin.value}}">{{pin.value}}</text>
+                <text class="inline-block ml10 bg-36afa2 pt5 pb5 pl15 pr15 text-middle font-22 color-fff ulib-r10" catchtap="showTransfer" data-id="{{item.id}}" wx:if="{{item.allot == 1}}">移交</text>
               </view>
-            </view>
-          </block>
-          <view class="mt20 pt5 pb5 pl20 pr20 bg-f6 font-22 color-666 ulib-rlb750 ulib-rr750" wx:if="{{item.remark}}">注：{{item.remark}}</view>
-
-        </view>
-      </block>
-      <block wx:else>
-        <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index?id={{item.id}}">
-          <view class="absolute top-0 left-0 ml40 pt5 pb5 pl10 pr10 bg-36afa2 font-22 color-fff" wx:if="{{item.status_name}}">{{item.status_name}}</view>
-          <view class="relative pt10 pb10 color-36afa2" catchtap="pushLink" data-url="/pages/customer/detail/index?id={{item.cus_id}}">
-            <view class="font-32">{{item.name}}({{item.mobile}})</view>
-            <i class="absolute right-0 box-middle iconfont icon-gengduo font-26"></i>
-          </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>
-              <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="inline-block ml10 bg-36afa2 pt5 pb5 pl15 pr15 text-middle font-22 color-fff ulib-r10" catchtap="showTransfer" data-id="{{item.id}}" wx:if="{{item.allot == 1}}">移交</text>
-                </view>
+            </block>
+            <view wx:else class="fn-fr wp60 text-nowrap text-right color-666">
+              <block wx:if="{{pin.type=='checkbox'}}">
+                <block wx:for="{{pin.lists}}" wx:for-index='key' wx:for-item="lable" wx:key='j'>
+                  <view class="inline-block ml10 mr10"><i class="iconfont font-34 mr5 text-middle {{lable.selected?'icon-danxuan_xuanzhong color-36afa2':'icon-danxuan'}}" /><text class="text-middle">{{lable.value}}</text></view>
+                </block>
+              </block>
+              <block wx:elif="{{pin.type=='text'}}">
+                <text class="inline-block mr10 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750" style="background-color:{{pin.bg_color}};" wx:if="{{pin.bg_color}}">{{pin.value}}</text>
+                <text wx:else>{{pin.value}}</text>
               </block>
-              <view wx:else class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
             </view>
-          </block>
+          </view>
+        </block>
+        <view class="mt20 pt5 pb5 pl20 pr20 bg-f6 font-22 color-666 ulib-rlb750 ulib-rr750" wx:if="{{item.remark}}">注：{{item.remark}}</view>
 
-          <view class="mt20 pt5 pb5 pl20 pr20 bg-f6 font-22 color-666 ulib-rlb750 ulib-rr750" wx:if="{{item.remark}}">注：{{item.remark}}</view>
-
-        </view>
-      </block>
+      </view>
     </block>
     <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>
   </view>
@@ -103,20 +69,20 @@
 <lcb-backChannel></lcb-backChannel>
 
 <lcb-msg isShow="{{isShowMessage}}">
-	<view slot="content">
-		<view class="inner40">
+  <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>
+  </view>
 </lcb-msg>
 
 <lcb-msg isShow="{{isShowTransfer}}">
-	<view slot="content">
-		<view class="inner30">
+  <view slot="content">
+    <view class="inner30">
       <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}}">
@@ -130,5 +96,5 @@
       <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="putAppCusorderV2Admins" 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>
\ No newline at end of file
diff --git a/pages/order/index.js b/pages/order/index.js
index c703aab..f31afd4 100644
--- a/pages/order/index.js
+++ b/pages/order/index.js
@@ -49,7 +49,7 @@ Page({
 
     //品牌列表
     this.getAppSeriesBrands()
-
+    console.log(this.data.type)
   },
 
   //订单-tab
diff --git a/pages/order/index.wxml b/pages/order/index.wxml
index d081369..1dd4cf2 100644
--- a/pages/order/index.wxml
+++ b/pages/order/index.wxml
@@ -21,7 +21,7 @@
       </scroll-view>
       <view class="mt20 pl30 pr100 relative">
         <view class="wp100 relative">
-          <view class="absolute box-center-middle font-22 color-ccc" bindtap="searchFocus" wx:if="{{searchInp.value == '' && searchInp.focus != true}}"><i class="iconfont mr10 icon-sousuo"></i>请输入客户或车主姓名</view>
+          <view class="absolute box-center-middle font-22 color-ccc" bindtap="searchFocus" wx:if="{{searchInp.value == '' && searchInp.focus != true}}"><i class="iconfont mr10 icon-sousuo"></i>请输入客户姓名</view>
           <input class="wp100 bg-f6 pl20 pr20 font-22 ulib-r750 text-center" bindinput="searchInput" bindfocus="searchFocus" bindblur="searchBlur" bindconfirm="searchSubmit" style="height:56rpx" type="text" />
         </view>
         <view class="absolute right-0 box-middle">
@@ -35,7 +35,7 @@
         <view class="inline-block text-middle bg-f6 color-666 mt15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22">{{order_s_time}}</view>
         <view class="inline-block text-middle bg-f6 color-666 mt15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22">{{order_e_time}}</view>
       </block>
-      <view class="inline-block text-middle bg-f6 color-666 mt15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{type}}">
+      <view class="inline-block text-middle bg-f6 color-666 mt15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{type!==''}}">
         <block wx:for="{{filters.type}}" wx:key='index' wx:if="{{type == item.key}}">{{item.name}}</block>
       </view>
       <block wx:for="{{staffobj}}" wx:key='index'>
@@ -136,7 +136,7 @@
         <view class="font-22">订单进展</view>
         <view class="fn-clear">
           <block wx:for="{{filters.type}}" wx:key='index'>
-            <view class="inline-block radio-btn mt20 mr15 pt10 pb10 pl15 pr15 ulib-r10 font-26 {{type == item.key?'bg-333 color-fff':'bg-f8'}}" bindtap="radioPicker" data-type="type" data-key="{{item.key}}">
+            <view class="inline-block radio-btn mt20 mr15 pt10 pb10 pl15 pr15 ulib-r10 font-26 {{type === item.key?'bg-333 color-fff':'bg-f8'}}" bindtap="radioPicker" data-type="type" data-key="{{item.key}}">
               {{item.name}}
             </view>
           </block>