car_id!=33

app.json

@@ -56,7 +56,10 @@
     "pages/storeData/index",
     "pages/storeData/customerData/index",
     "pages/storeData/wechatData/index",
-    "pages/storeData/orderData/index"
+    "pages/storeData/orderData/index",
+    "pages/order/editDeliveryckimg/index",
+    "pages/order/editQVImg/index",
+    "pages/order/editVoucherImg/index"
   ],
   "echarts": [
     {

commons/css/base/background.wxss

@@ -27,6 +27,8 @@
 
 .bg-2f3346-1a1c26{background-image:linear-gradient(#2f3346,#1a1c26);}
 
+.bg-f6-fff{background-image:linear-gradient(#f6f6f6,#fff);}
+
 .bg-f3f6fc{background-color:#f3f6fc;}
 .bg-fffaeb{background-color:#fffaeb;}
 .bg-f1f9f8{background-color:#f1f9f8;}

commons/css/base/layout.wxss

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

commons/css/base/margin.wxss

@@ -23,6 +23,7 @@
 .mt150{margin-top:150rpx;}
 .mt190{margin-top:190rpx;}
 .ml-1{margin-left:-1rpx;}
+.ml1{margin-left:1rpx;}
 .ml5{margin-left:5rpx;}
 .ml10{margin-left:10rpx;}
 .ml15{margin-left:15rpx;}
@@ -45,6 +46,7 @@
 .ml200{margin-left:200rpx;}
 .mr-20{margin-right:-20rpx;}
 .mr-30{margin-right:-30rpx;}
+.mr1{margin-right:1rpx;}
 .mr5{margin-right:5rpx;}
 .mr10{margin-right:10rpx;}
 .mr11{margin-right:11rpx;}

commons/js/config.js

@@ -1,4 +1,4 @@
-const env = "d";
+const env = "p";
 
 const version = 1,
 
@@ -151,7 +151,7 @@ api = {
 
   appCusorderdataInfo:'app/cusorderdata/info', //保单信息确认
 
-  appBizStats:'app/biz/stats', //门店数据首页
+  appBizStats:'app/biz/stats', //数据看板首页
   appBizStats_customer:'app/biz/stats_customer', //客户数据
   appBizStats_wxqy:'app/biz/stats_wxqy', //企微数据
   appBizStats_order:'app/biz/stats_order', //订单数据

commons/js/utils/apiQuery.js

@@ -896,7 +896,7 @@ apiQuery.putAppCusorderdataInfo = function (params) {
   })
 }
 
-//门店数据首页
+//数据看板首页
 apiQuery.getAppBizStats = function (params) {
   return new Promise(function (resolve, reject) {
     HttpRequest(false, Config.api.appBizStats, 2, params, "GET", resolve, reject)

pages/allot/detail/index.js

@@ -188,6 +188,26 @@ Page({
         urls:end_mileage,
       })
     }
+    else if(e.currentTarget.dataset.type=='edit_transport'){
+      let transportImg = []
+      this.data.transport.forEach(item => {
+        transportImg.push(item.src)
+      })
+      wx.previewImage({
+        current:e.currentTarget.dataset.current,
+        urls:transportImg,
+      })
+    }
+    else if(e.currentTarget.dataset.type=='edit_photos'){
+      let photos = []
+      this.data.photos.forEach(item => {
+        photos.push(item.src)
+      })
+      wx.previewImage({
+        current:e.currentTarget.dataset.current,
+        urls:photos,
+      })
+    }
 
   },
 
@@ -329,6 +349,7 @@ Page({
           title: '图片上传中',
         })
         let transport=that.data.transport
+        let k = 0
         for (let i = 0; i < res1.tempFilePaths.length; i++) {
           //上传图片
           wx.uploadFile({
@@ -339,6 +360,7 @@ Page({
               'app': 'liche'
             },
             success: (resp) => {
+              k = k + 1
               resp.data = JSON.parse(resp.data);
               wx.hideLoading();
               if (resp.data.code == 200) {
@@ -349,23 +371,20 @@ Page({
                   src:imgdata.data.full_url,
                 })
                 transport=transport.concat(list)
-                if(i+1==res1.tempFilePaths.length){
-                  setTimeout(function () {
-                    let params = {};
-                    params['id'] = that.data.info.id;
-                    params['type'] = 0;
-                    let imgs = []
-                    transport.forEach(item => {
-                      imgs.push(item.value)
+                if(k == res1.tempFilePaths.length){
+                  let params = {};
+                  params['id'] = that.data.info.id;
+                  params['type'] = 0;
+                  let imgs = []
+                  transport.forEach(item => {
+                    imgs.push(item.value)
+                  })
+                  params['imgs'] = imgs;
+                  _.apiQuery.postAppTransferTransport(params).then(res => {
+                    that.setData({
+                      transport,
                     })
-                    params['imgs'] = imgs;
-                    _.apiQuery.postAppTransferTransport(params).then(res => {
-                      that.setData({
-                        transport,
-                      })
-                    })
-                  }, 500);
-                  
+                  })
                 }
               }else{
                 wx.showToast({

pages/allot/detail/index.wxml

@@ -46,7 +46,7 @@
             <block wx:for='{{transport}}' wx:for-item='transport' wx:for-index="index" wx:key='transport'>
               <view class="inline-block img-200x180 mr20 relative">
                 <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-guanbi1 inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delTransport" data-index="{{index}}" ></i>
-                <image class='img-200x180 ulib-r10' src='{{transport.src}}' mode='aspectFill'></image>
+                <image class='img-200x180 ulib-r10' src='{{transport.src}}' mode='aspectFill' bindtap="previewImage" data-type="edit_transport" data-current="{{transport.src}}"></image>
               </view>
             </block>
             <block wx:if="{{transport.length<10}}">
@@ -119,7 +119,7 @@
         <block wx:for='{{photos}}' wx:for-item='photos' wx:for-index="index" wx:key='photo'>
           <view class="inline-block img-200x180 ml10 mr10 relative">
             <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-guanbi1 inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delPic" data-index="{{index}}" ></i>
-            <image class='img-200x180 ulib-r10' src='{{photos.src}}' mode='aspectFill'></image>
+            <image class='img-200x180 ulib-r10' src='{{photos.src}}' mode='aspectFill' bindtap="previewImage" data-type="edit_photos" data-current="{{photos.src}}"></image>
           </view>
         </block>
         <block wx:if="{{photos.length==0}}">
@@ -192,7 +192,7 @@
         <block wx:for='{{photos}}' wx:for-item='photos' wx:for-index="index" wx:key='photo'>
           <view class="inline-block img-200x180 ml10 mr10 relative">
             <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-guanbi1 inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delPic" data-index="{{index}}" ></i>
-            <image class='img-200x180 ulib-r10' src='{{photos.src}}' mode='aspectFill'></image>
+            <image class='img-200x180 ulib-r10' src='{{photos.src}}' mode='aspectFill' bindtap="previewImage" data-type="edit_photos" data-current="{{photos.src}}"></image>
           </view>
         </block>
         <block wx:if="{{photos.length==0}}">

pages/customer/addCard/index.js

@@ -35,6 +35,8 @@ Page({
     city_id:'',
     countyIndex:-1,
     county_id:'',
+
+    isShowExist:false, //客户是否已存在
   },
   //生命周期函数--监听页面加载
   onLoad: function (options) {
@@ -406,6 +408,13 @@ Page({
         this.setData({
           submitFlag: false,
         })
+        if(res.data.id){
+          wx.hideToast();
+          this.setData({
+            isShowExist: true,
+            exist: res,
+          })
+        }
       });
     }
   },
@@ -550,4 +559,18 @@ Page({
     }
   },
 
+  //查看存在客户信息
+  viewDetails(e){
+    wx.redirectTo({
+      url: '/pages/customer/detail/index?id=' + this.data.exist.data.id
+    })
+  },
+
+  //关闭客户已存在提示
+  colseExist(){
+    this.setData({
+      isShowExist: false,
+    })
+  },
+
 })

pages/customer/addCard/index.wxml

@@ -154,4 +154,17 @@
   </view>
 </view>
 <lcb-footer></lcb-footer>
-<lcb-backChannel></lcb-backChannel>
+<lcb-backChannel></lcb-backChannel>
+
+<!--客户已存在-->
+<lcb-msg isShow="{{isShowExist}}" isHasClose="{{true}}">
+  <view slot="content">
+    <view class="pt60 pl60 pr60 pb50">
+      <view class="font-36 text-center">{{exist.msg}}</view>
+    </view>
+    <view class="pl60 pr60 pb50 text-center font-32 color-666">
+      <button bindtap="viewDetails" class="inline-block wp50 btn-36afa2 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover" wx:if="{{exist.data.owner==1}}">前往查看</button>
+      <button bindtap="colseExist" class="inline-block wp50 btn-36afa2 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover" wx:else>知道了</button>
+    </view>
+	</view>
+</lcb-msg>

pages/customer/filterList/index.js

@@ -47,7 +47,7 @@ Page({
       })
     }
 
-    //回访待跟进tab
+    //顶部tab
     this.getAppCustomersVisit_tabs()
 
     //销售顾问

pages/customer/filterList/index.wxml

@@ -23,7 +23,7 @@
   <view class="mt10 pl30 pr30">
 
     <block wx:for='{{list}}' wx:key='index'>
-      <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/customer/detail/index?id={{item.id}}">
+      <view wx:if="{{item.complete_mobile}}" class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/customer/detail/index?id={{item.id}}">
         <view class="absolute top-0 left-0 ml40 bg-36afa2 font-22 color-fff">
           <text class="pl10 pr10" wx:if="{{item.tip}}">{{item.tip}}</text>
           <text class="pl10 pr10 {{item.defeat?'bls-1-eb':''}}" wx:if="{{item.defeat}}">{{item.defeat}}</text>
@@ -68,7 +68,30 @@
             <view wx:else class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
           </view>
         </block>
-
+      </view>
+      <view wx:elif="{{item.nickname}}" class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden">
+        <view class="absolute top-0 left-0 ml40 bg-36afa2 font-22 color-fff">
+          <text class="pl10 pr10" wx:if="{{item.tip}}">{{item.tip}}</text>
+          <text class="pl10 pr10 {{item.defeat?'bls-1-eb':''}}" wx:if="{{item.defeat}}">{{item.defeat}}</text>
+          <text class="pl10 pr10 {{item.orders_pay?'bls-1-eb':''}}" wx:if="{{item.orders_pay}}">{{item.orders_pay}}</text>
+        </view>
+        <view class="text-nowrap">
+          <image class='img-50x50 bds-1-eb ulib-r750 text-middle' lazy-load="{{true}}" mode="scaleToFill" src="{{item.avatar}}"></image>
+          <text class="pl10 text-middle font-26">{{item.nickname}}</text>
+        </view>
+        <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
+          <view class="mt25 fn-clear font-28">
+            <view class="fn-fl color-333">{{key}}</view>
+            <block wx:if="{{key=='销售顾问'}}">
+              <view class="fn-fr wp60 text-nowrap text-right">
+                <text class="text-middle color-666" wx:if="{{value}}">{{value}}</text>
+                <text class="text-middle color-f9394d" wx:else>待分配</text>
+                <text class="inline-block ml10 bg-36afa2 pt5 pb5 pl15 pr15 text-middle font-22 color-fff ulib-r10" catchtap="optEmployees" data-cid="{{item.id}}" data-level="{{item.level}}" wx:if="{{item.allot == 1}}">{{value?'重新分配':'分配'}}</text>
+              </view>
+            </block>
+            <view wx:else class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
+          </view>
+        </block>
       </view>
     </block>
     <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>

pages/customer/index.js

@@ -228,9 +228,21 @@ Page({
       load: false,
       loading: true,
     })
+
+    let admin_ids = ''
+    this.data.staffobj.forEach(item => {
+      if(item.checked){
+        if(admin_ids==''){
+          admin_ids=item.id
+        }else{
+          admin_ids=admin_ids+','+item.id
+        }
+      }
+    })
+    
     let params = {};
     params['page'] = this.data.pageNo;
-    params['size'] = 10;
+    params['size'] = 3;
     params['status'] = this.data.key;
     if(this.data.cus_id != ''){
       params['cus_id'] = this.data.cus_id;
@@ -272,9 +284,12 @@ Page({
     if(this.data.of2_id != ''){
       params['of2_id'] = this.data.of2_id;
     }
-    if(this.data.staffIndex>-1){
-      params['admin_id'] = this.data.staffobj[this.data.staffIndex].id;
+    if(admin_ids!=''){
+      params['admin_ids'] = admin_ids;
     }
+    // if(this.data.staffIndex>-1){
+    //   params['admin_id'] = this.data.staffobj[this.data.staffIndex].id;
+    // }
     if(this.data.s_visit_time != ''&&this.data.e_visit_time != ''){
       params['s_visit_time'] = this.data.s_visit_time;
       params['e_visit_time'] = this.data.e_visit_time;
@@ -505,7 +520,7 @@ Page({
     })
   },
 
-  //显示高级搜索
+  //显示隐藏高级搜索
   optfilter(){
     this.setData({
       isShowfilter: !this.data.isShowfilter
@@ -513,6 +528,13 @@ Page({
     this.resetFilter()
   },
 
+  //显示高级搜索
+  showfilter(){
+    this.setData({
+      isShowfilter:true,
+    })
+  },
+
   //确定高级搜索
   submitFilter() {
     this.setData({
@@ -523,7 +545,13 @@ Page({
 
   //重置高级搜索
   resetFilter() {
+    let staffobj = this.data.staffobj
+    staffobj.forEach(item => {
+      item.checked = false
+    })
+
     this.setData({
+      staffobj,
       cus_id:'',//编号
       name:'',//名字
       mobile:'',//手机号
@@ -885,6 +913,13 @@ Page({
     })
   },
 
+  //多选
+  checkPicker(e){
+    this.setData({
+      ['staffobj['+e.currentTarget.dataset.index+'].checked']:!this.data.staffobj[e.currentTarget.dataset.index].checked,
+    })
+  },
+
   //页面相关事件处理函数--监听用户下拉动作
   onPullDownRefresh(){
     this.setData({

pages/customer/index.wxml

@@ -30,7 +30,7 @@
       </picker>
     </view>
     <view class="fn-fr {{key<2?'pr180':'pr40'}} relative">
-      <text bindtap="optfilter" class="inner5 iconfont icon-gaojisousuo ml10"></text>
+      <text bindtap="showfilter" class="inner5 iconfont icon-gaojisousuo ml10"></text>
       <view bindtap="pushLink" data-url="/pages/customer/addCard/index?status={{key}}" class="absolute right-0 box-middle pt10 pb10 pl10 pr30 space-nowrap bg-333 font-22 color-fff ulib-rl750" wx:if="{{key<2}}"><i class="iconfont mr5 icon-jia"></i>客户建卡</view>
     </view>
   </view>
@@ -48,6 +48,9 @@
     <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{of1Index>-1}}">{{of1Arr[of1Index]}}</view>
     <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{of2Index>-1}}">{{of2Arr[of2Index]}}</view>
     <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{staffIndex>-1}}">{{staffArray[staffIndex]}}</view>
+    <block wx:for="{{staffobj}}" wx:key='index'>
+      <view class="inline-block text-middle bg-f6 color-666 mb15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{item.checked}}">{{item.uname}}</view>
+    </block>
   </view>
 
   <view class="mt10 pl30 pr30">
@@ -243,7 +246,7 @@
           </picker>
         </view>
       </view> -->
-      <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{staffArray.length>0&&userInfo.group_id>1}}">
+      <!-- <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{staffArray.length>0&&userInfo.group_id>1}}">
         <view class="absolute left-0 box-middle">销售顾问</view>
         <view class="pt25 pb25 text-right font-28 color-666">
           <picker bindchange="changeStaff" value="{{staffIndex}}" range="{{staffArray}}">
@@ -252,6 +255,16 @@
             <i class="iconfont ml5 icon-gengduo"></i>
           </picker>
         </view>
+      </view> -->
+      <view class="relative bbs-1-eb pt25 pb25 last-b-none">
+        <view class="font-22">销售顾问</view>
+        <view class="fn-clear">
+          <block wx:for="{{staffobj}}" wx:key='index'>
+            <view class="inline-block radio-btn mt20 mr15 pt15 pb15 pl20 pr20 ulib-r10 font-28 {{item.checked?'bg-333 color-fff':'bg-f8'}}" bindtap="checkPicker" data-index="{{index}}">
+              {{item.uname}}
+            </view>
+          </block>
+        </view>
       </view>
     </view>
     <view class="pt50 pb100"></view>

pages/index/index.wxml

@@ -15,25 +15,39 @@
         </view>
       </view>
     </view>
-    <view class="mb30 pt40 pb40 pl20 pr20 bg-fff box-shadow-000-10-10 ulib-r10 fn-flex text-center font-22 color-666">
-      <view class="relative fn-flex-item" bindtap="pushLink" data-url="/pages/inventory/list/index">
-        <view class="absolute peg-tip box-center ml30 bg-f9394d bds-2-fff img-24x24 text-center font-18 color-fff ulib-r750 z-index-1" wx:if="{{pandianNum}}"><text class="absolute box-center-middle">{{pandianNum}}</text></view>
-        <image class='img-60x60' mode="aspectFill" src='{{imgUrl}}index/icon2-tab-1.png' lazy-load="{{true}}"></image>
-        <view>车辆盘点</view>
+    <view class="mb30 pt40 pb40 bg-fff box-shadow-000-10-10 ulib-r10 text-center">
+      <view class="pl20 pr20 fn-flex font-22 color-666">
+        <view class="relative fn-flex-item" bindtap="pushLink" data-url="/pages/inventory/list/index">
+          <view class="absolute peg-tip box-center ml30 bg-f9394d bds-2-fff img-24x24 text-center font-18 color-fff ulib-r750 z-index-1" wx:if="{{pandianNum}}"><text class="absolute box-center-middle">{{pandianNum}}</text></view>
+          <image class='img-60x60' mode="aspectFill" src='{{imgUrl}}index/icon2-tab-1.png' lazy-load="{{true}}"></image>
+          <view>车辆盘点</view>
+        </view>
+        <view class="relative fn-flex-item" bindtap="pushLink" data-url="/pages/storeData/index" wx:if="{{userInfo.group_id>1}}">
+          <image class='img-60x60' mode="aspectFill" src='{{imgUrl}}index/icon-tab-2.png' lazy-load="{{true}}"></image>
+          <view>数据分析</view>
+        </view>
+        <view class="relative fn-flex-item" bindtap="pushLink" data-url="/pages/allot/list/index">
+          <view class="absolute peg-tip box-center ml30 bg-f9394d bds-2-fff img-24x24 text-center font-18 color-fff ulib-r750 z-index-1" wx:if="{{diaoboNum}}"><text class="absolute box-center-middle">{{diaoboNum}}</text></view>
+          <image class='img-60x60' mode="aspectFill" src='{{imgUrl}}index/icon2-tab-2.png' lazy-load="{{true}}"></image>
+          <view>车辆调拨</view>
+        </view>
+        <view class="relative fn-flex-item" bindtap="pushLink" data-url="/pages/inventory/warning/index">
+          <view class="absolute peg-tip box-center ml30 bg-f9394d bds-2-fff img-24x24 text-center font-18 color-fff ulib-r750 z-index-1" wx:if="{{inventory.value}}"><text class="absolute box-center-middle">{{inventory.value}}</text></view>
+          <image class='img-60x60' mode="aspectFill" src='{{imgUrl}}index/icon2-tab-3.png' lazy-load="{{true}}"></image>
+          <view style="color:{{inventory.color}};">{{inventory.title}}</view>
+        </view>
       </view>
-      <view class="relative fn-flex-item" bindtap="pushLink" data-url="/pages/storeData/index" wx:if="{{userInfo.group_id>1}}">
-        <image class='img-60x60' mode="aspectFill" src='{{imgUrl}}index/icon-tab-2.png' lazy-load="{{true}}"></image>
-        <view>门店数据</view>
-      </view>
-      <view class="relative fn-flex-item" bindtap="pushLink" data-url="/pages/allot/list/index">
-        <view class="absolute peg-tip box-center ml30 bg-f9394d bds-2-fff img-24x24 text-center font-18 color-fff ulib-r750 z-index-1" wx:if="{{diaoboNum}}"><text class="absolute box-center-middle">{{diaoboNum}}</text></view>
-        <image class='img-60x60' mode="aspectFill" src='{{imgUrl}}index/icon2-tab-2.png' lazy-load="{{true}}"></image>
-        <view>车辆调拨</view>
-      </view>
-      <view class="relative fn-flex-item" bindtap="pushLink" data-url="/pages/inventory/warning/index">
-        <view class="absolute peg-tip box-center ml30 bg-f9394d bds-2-fff img-24x24 text-center font-18 color-fff ulib-r750 z-index-1" wx:if="{{inventory.value}}"><text class="absolute box-center-middle">{{inventory.value}}</text></view>
-        <image class='img-60x60' mode="aspectFill" src='{{imgUrl}}index/icon2-tab-3.png' lazy-load="{{true}}"></image>
-        <view style="color:{{inventory.color}};">{{inventory.title}}</view>
+    </view>
+    <!-- 数据看板 -->
+    <view class="bg-fff mb30 inner30 box-shadow-000-10-10 ulib-r10">
+      <view class="font-36">数据看板</view>
+      <view class="fn-flex fn-flex-wrap pt20 pb10 text-center">
+        <block wx:for="{{userCal.statistics}}" wx:key='index'>
+          <view class="wp33 relative pt20 pb20 {{index>2?'bts-1-eb':''}} {{index%3==2?'':'brs-1-eb'}}" bindtap="pushLink" data-url="{{item.today.url}}">
+            <view class="text-bold"><text class="font-36">{{item.today.value}}</text><text class="font-28 color-666">/{{item.month.value}}</text></view>
+            <view class="font-22"><text>{{item.today.title}}</text><text class="color-666">/{{item.month.title}}</text></view>
+          </view>
+        </block>
       </view>
     </view>
     <!--客户代办事项-->

pages/inventory/detail/index.js

@@ -166,6 +166,21 @@ Page({
     }
   },
 
+  //查看图片
+  previewImage: function (e) {
+    if(e.currentTarget.dataset.type=='car_img'){
+      let car_img = []
+      this.data.car_img.forEach(item => {
+        car_img.push(item.src)
+      })
+      wx.previewImage({
+        current:e.currentTarget.dataset.current,
+        urls:car_img,
+      })
+    }
+
+  },
+
   //页面相关事件处理函数--监听用户下拉动作
   onPullDownRefresh(){
     this.getAppInventory()

pages/inventory/detail/index.wxml

@@ -22,11 +22,11 @@
         <view class="pl40 pr40 font-32">盘点信息</view>
         <view class="mt20 pl30">
           <block wx:for="{{car_img}}" wx:key='index'>
-            <view class="inline-block ml10 mr10 text-center ulib-r10 overflowhidden" bindtap="chooseImg" data-index="{{index}}" wx:if="{{item.value}}">
+            <view class="inline-block ml10 mr10 text-center ulib-r10 overflowhidden" wx:if="{{item.value}}">
               <view class="bg-f8 img-190x175 relative ulib-r10">
-                <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1"></i>
+                <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="chooseImg" data-index="{{index}}"></i>
                 <view class="absolute left-0 right-0 box-middle color-ccc">
-                  <image class='img-190x175 ulib-r10' src='{{item.src}}' mode='aspectFill'></image>
+                  <image class='img-190x175 ulib-r10' src='{{item.src}}' mode='aspectFill' bindtap="previewImage" data-type="car_img" data-current="{{item.src}}"></image>
                 </view>
               </view>
               <view class="mt10 font-24 color-666">{{item.title}}</view>

pages/order/detail/index.js

@@ -416,6 +416,7 @@ Page({
             title: '图片上传中',
           })
           let ins_img=that.data.ins_img
+          let k = 0
           for (let i = 0; i < res1.tempFilePaths.length; i++) {
             //上传图片
             wx.uploadFile({
@@ -426,6 +427,7 @@ Page({
                 'app': 'liche'
               },
               success: (resp) => {
+                k = k + 1
                 resp.data = JSON.parse(resp.data);
                 wx.hideLoading();
                 if (resp.data.code == 200) {
@@ -436,22 +438,20 @@ Page({
                     src:imgdata.data.full_url,
                   })
                   ins_img=ins_img.concat(list)
-                  if(i+1==res1.tempFilePaths.length){
-                    setTimeout(function () {
-                      let params = {};
-                      params['id'] = that.data.id;
-                      params['type'] = 0;
-                      let img = []
-                      ins_img.forEach(item => {
-                        img.push(item.value)
+                  if(k == res1.tempFilePaths.length){
+                    let params = {};
+                    params['id'] = that.data.id;
+                    params['type'] = 0;
+                    let img = []
+                    ins_img.forEach(item => {
+                      img.push(item.value)
+                    })
+                    params['img'] = img;
+                    _.apiQuery.putAppCusorderCdata(params).then(res => {
+                      that.setData({
+                        ins_img,
                       })
-                      params['img'] = img;
-                      _.apiQuery.putAppCusorderCdata(params).then(res => {
-                        that.setData({
-                          ins_img,
-                        })
-                      })
-                    }, 500);
+                    })
                   }
                 }else{
                   wx.showToast({

pages/order/detail/index2.js

@@ -18,6 +18,8 @@ Page({
     register_img:{},//登记证照片
     ins_img:[],//保险照片
     other_img:[],//交车合照
+    isShowCK:false,
+    isShowBill:false,
   },
   onLoad: function (options) {
     for (let key in options) {
@@ -28,11 +30,11 @@ Page({
 
     this.getAppCusorderV2()
     this.getUserInfo()
-    this.getAppCusorderdata()
+    
     
   },
   onShow: function () {
-
+    this.getAppCusorderdata()
   },
 
   //获取用户信息
@@ -100,6 +102,12 @@ Page({
           ins_img:res.data.imgs.ins_img.length==0?[]:res.data.imgs.ins_img,
           other_img:res.data.imgs.other_img.length==0?[]:res.data.imgs.other_img,
         })
+
+        if('delivery_ck_img' in res.data.imgs){
+          this.setData({
+            delivery_ck_img:res.data.imgs.delivery_ck_img.length==0?{}:res.data.imgs.delivery_ck_img,
+          })
+        }
       }
       wx.stopPullDownRefresh()
     })
@@ -465,6 +473,7 @@ Page({
             title: '上传中',
           })
           let ins_img=that.data.ins_img
+          let k = 0
           for (let i = 0; i < res1.tempFilePaths.length; i++) {
             //上传图片
             wx.uploadFile({
@@ -475,6 +484,7 @@ Page({
                 'app': 'liche'
               },
               success: (resp) => {
+                k = k + 1
                 resp.data = JSON.parse(resp.data);
                 if (resp.data.code == 200) {
                   let imgdata = resp.data
@@ -484,22 +494,20 @@ Page({
                     img:imgdata.data.full_url,
                   })
                   ins_img=ins_img.concat(list)
-                  if(i+1==res1.tempFilePaths.length){
+                  if(k == res1.tempFilePaths.length){
                     wx.hideLoading();
-                    setTimeout(function () {
-                      let params = {};
-                      params['id'] = that.data.id;
-                      let img = []
-                      ins_img.forEach(item => {
-                        img.push(item.value)
+                    let params = {};
+                    params['id'] = that.data.id;
+                    let img = []
+                    ins_img.forEach(item => {
+                      img.push(item.value)
+                    })
+                    params['ins_imgs'] = img;
+                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                      that.setData({
+                        ins_img,
                       })
-                      params['ins_imgs'] = img;
-                      _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                        that.setData({
-                          ins_img,
-                        })
-                      })
-                    }, 500);
+                    })
                   }
                 }
               },
@@ -529,6 +537,7 @@ Page({
             title: '上传中',
           })
           let other_img=that.data.other_img
+          let k = 0
           for (let i = 0; i < res1.tempFilePaths.length; i++) {
             //上传图片
             wx.uploadFile({
@@ -539,6 +548,7 @@ Page({
                 'app': 'liche'
               },
               success: (resp) => {
+                k = k + 1
                 resp.data = JSON.parse(resp.data);
                 if (resp.data.code == 200) {
                   let imgdata = resp.data
@@ -548,22 +558,20 @@ Page({
                     img:imgdata.data.full_url,
                   })
                   other_img=other_img.concat(list)
-                  if(i+1==res1.tempFilePaths.length){
+                  if(k == res1.tempFilePaths.length){
                     wx.hideLoading();
-                    setTimeout(function () {
-                      let params = {};
-                      params['id'] = that.data.id;
-                      let img = []
-                      other_img.forEach(item => {
-                        img.push(item.value)
+                    let params = {};
+                    params['id'] = that.data.id;
+                    let img = []
+                    other_img.forEach(item => {
+                      img.push(item.value)
+                    })
+                    params['other_imgs'] = img;
+                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                      that.setData({
+                        other_img,
                       })
-                      params['other_imgs'] = img;
-                      _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                        that.setData({
-                          other_img,
-                        })
-                      })
-                    }, 500);
+                    })
                   }
                 }
               },
@@ -693,9 +701,15 @@ Page({
   previewImage: function (e) {
     if(e.currentTarget.dataset.type=='bill_img'){
       let urls = [this.data.info.bill_img]
-      urls = urls.concat(this.data.imgInfo.imgs.bill_ck_img),
       wx.previewImage({
-        current:e.currentTarget.dataset.img,
+        current:e.currentTarget.dataset.current,
+        urls,
+      })
+    }
+    else if(e.currentTarget.dataset.type=='bill_ck_img'){
+      let urls = this.data.imgInfo.imgs.bill_ck_img
+      wx.previewImage({
+        current:e.currentTarget.dataset.current,
         urls,
       })
     }
@@ -755,6 +769,47 @@ Page({
         urls:img,
       })
     }
+    else if(e.currentTarget.dataset.type=='delivery_ck_img'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.delivery_ck_img.img,
+        urls:[this.data.imgInfo.imgs.delivery_ck_img.img],
+      })
+    }
+    else if(e.currentTarget.dataset.type=='wx_img'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.insurance_img.img,
+        urls:[this.data.imgInfo.imgs.insurance_img.img],
+      })
+    }
+    else if(e.currentTarget.dataset.type=='mut_wx_img'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.mut_wx_img.img,
+        urls:[this.data.imgInfo.imgs.mut_wx_img.img],
+      })
+    }
+    else if(e.currentTarget.dataset.type=='destory_img'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.destory_img.img,
+        urls:[this.data.imgInfo.imgs.destory_img.img],
+      })
+    }
+    else if(e.currentTarget.dataset.type=='notify'){
+      let img = []
+      this.data.info.notify_file.forEach(item => {
+        img.push(item.src)
+      })
+      wx.previewImage({
+        current:e.currentTarget.dataset.current,
+        urls:img,
+      })
+    }
+    else if(e.currentTarget.dataset.type=='lend'){
+      wx.previewImage({
+        current:this.data.info.lend_file.src,
+        urls:[this.data.info.lend_file.src],
+      })
+    }
+
   },
 
   //推送链接
@@ -802,6 +857,20 @@ Page({
     })
   },
 
+  //显示隐藏合格证
+  optShowCK(){
+    this.setData({
+      isShowCK:!this.data.isShowCK,
+    })
+  },
+
+  //显示隐藏合格证
+  optShowBill(){
+    this.setData({
+      isShowBill:!this.data.isShowBill,
+    })
+  },
+
   //删除订单
   putAppCusorderV2Status(){
     let that = this

pages/order/detail/index2.wxml

@@ -19,7 +19,7 @@
       </view>
       <view class="mt40 relative fn-clear">
         <view class="fn-fl pt10 font-32">{{info.main_type==0?'车主信息':'企业信息'}}</view>
-        <view class="fn-fr" wx:if="{{userInfo.uid==1&&info.edit_status==1}}">
+        <view class="fn-fr" wx:if="{{(userInfo.uid==1||info.car_id!=33)&&info.edit_status==1&&!info.refund_status}}">
           <button bindtap="pushLink" data-url="/pages/order/editOwner/index?id={{id}}" class="inline-block font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>修改</button>
         </view>
       </view>
@@ -57,7 +57,7 @@
       </view>
       <view class="mt40 fn-clear">
         <view class="fn-fl pt10 font-32">订单信息</view>
-        <view class="fn-fr" wx:if="{{info.edit_status==1}}">
+        <view class="fn-fr" wx:if="{{info.edit_status==1&&!info.refund_status}}">
           <button bindtap="pushLink" data-url="/pages/order/edit/index2?id={{id}}" class="inline-block font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>修改</button>
         </view>
       </view>
@@ -90,7 +90,7 @@
         </block>
         <block wx:else>
           <block wx:if="{{key == '按揭信息'}}">
-            <view class="relative bbs-1-eb pl140 font-28" bindtap="{{info.loan_status?'pushLink':''}}" data-url="/pages/order/editFinance/index?id={{id}}">
+            <view class="relative bbs-1-eb pl140 font-28" bindtap="{{info.loan_status&&!info.refund_status?'pushLink':''}}" data-url="/pages/order/editFinance/index?id={{id}}">
               <view class="absolute left-0 box-middle font-28 color-333">{{key}}</view>
               <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">
                 <text >{{value}}</text>
@@ -114,13 +114,30 @@
       <view class="relative bbs-1-eb pt30 pb30 text-right font-24 color-666" wx:if="{{info.inten_money}}">已付意向金<text class="pl5 pr5 color-f9394d">{{info.inten_money}}</text>元</view>
     </view>
 
-    <!--开票信息展示-->
-    <view class="pl30 pr30" wx:if="{{info.bill_img}}">
-      <view class="mt40 font-32">开票信息</view>
-      <view class="mt20"><image bindtap="previewImage" data-type="bill_img" data-img="{{info.bill_img}}" class='wp100' lazy-load="{{true}}" mode="widthFix" src="{{info.bill_img}}"></image></view>
-      <block wx:for='{{imgInfo.imgs.bill_ck_img}}' wx:key='index'>
-        <view class="mt20"><image bindtap="previewImage" data-type="bill_img" data-img="{{item}}" class='wp100' lazy-load="{{true}}" mode="widthFix" src="{{item}}"></image></view>
-      </block>
+    <!--合格证,发票展示-->
+    <view class="pl30 pr30">
+      <view class="bbs-1-eb" wx:if="{{imgInfo.imgs.bill_ck_img.length>0}}">
+        <view class="relative pt30 pb30" bindtap="optShowCK">
+          <text class="font-32">合格证</text>
+          <view class="absolute right-0 box-middle red-tip mr30 ulib-r750" wx:if="{{!isShowCK}}"></view>
+          <i class="absolute right-0 box-middle iconfont {{isShowCK?'icon-xuanze':'icon-gengduo'}} font-26 color-999"></i>
+        </view>
+        <view hidden="{{!isShowCK}}">
+          <block wx:for='{{imgInfo.imgs.bill_ck_img}}' wx:key='index'>
+            <view class="mt10 mb10 "><image bindtap="previewImage" data-type="bill_ck_img" data-current="{{item}}" class='wp100' lazy-load="{{true}}" mode="widthFix" src="{{item}}"></image></view>
+          </block>
+        </view>
+      </view>
+      <view class="bbs-1-eb" wx:if="{{info.bill_img}}">
+        <view class="relative pt30 pb30" bindtap="optShowBill">
+          <text class="font-32">发票</text>
+          <view class="absolute right-0 box-middle red-tip mr30 ulib-r750" wx:if="{{!isShowBill}}"></view>
+          <i class="absolute right-0 box-middle iconfont {{isShowBill?'icon-xuanze':'icon-gengduo'}} font-26 color-999"></i>
+        </view>
+        <view hidden="{{!isShowBill}}">
+          <view class="mt10 mb10"><image bindtap="previewImage" data-type="bill_img" data-current="{{info.bill_img}}" class='wp100' lazy-load="{{true}}" mode="widthFix" src="{{info.bill_img}}"></image></view>
+        </view>
+      </view>
     </view>
 
     <!--图片-->
@@ -129,7 +146,7 @@
       <block wx:if="{{imgInfo.img_status==1}}">
         <!--上传身份证-->
         <block wx:if="{{info.main_type == 0}}">
-          <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editCardid/index?id={{id}}">
+          <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editCardid/index?id={{id}}">
             <view class="absolute left-0 box-middle font-32 color-333">身份证</view>
             <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
               <view>{{cardida.value||cardidb.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
@@ -181,7 +198,7 @@
         </block>
         <!--上传营业执照-->
         <block wx:elif="{{info.main_type == 1}}">
-          <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editBusinessBicence/index?id={{id}}">
+          <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editBusinessBicence/index?id={{id}}">
             <view class="absolute left-0 box-middle font-32 color-333">营业执照</view>
             <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
               <view>{{business_licence.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
@@ -213,7 +230,7 @@
           </view> -->
         </block>
         <!--上传车辆证件-->
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editLicenseImg/index?id={{id}}">
+        <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editLicenseImg/index?id={{id}}">
           <view class="absolute left-0 box-middle font-32 color-333">车辆证件</view>
           <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
             <view>{{register_img.value||car_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
@@ -257,7 +274,7 @@
           </view> 
         </view>-->
         <!--上传保险单-->
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editInsImg/index?id={{id}}">
+        <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editInsImg/index?id={{id}}">
           <view class="absolute left-0 box-middle font-32 color-333">保险单</view>
           <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
             <view>{{ins_img.length>0||imgInfo.imgs.insurance_img.value||imgInfo.imgs.business_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
@@ -284,7 +301,7 @@
           </scroll-view>
         </view> -->
         <!--上传交车合照-->
-        <view class="relative bbs-1-eb pl140 font-28" bindtap="pushLink" data-url="/pages/order/editOtherImg/index?id={{id}}">
+        <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editOtherImg/index?id={{id}}">
           <view class="absolute left-0 box-middle font-32 color-333">交车合照</view>
           <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
             <view>{{other_img.length>0?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
@@ -310,6 +327,29 @@
             </block>
           </scroll-view>
         </view> -->
+        <!--上传交车合照-->
+        <!--添加企微-->
+        <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editQVImg/index?id={{id}}">
+          <view class="absolute left-0 box-middle font-32 color-333">企微信息</view>
+          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
+            <view>{{imgInfo.imgs.wx_img.value||imgInfo.imgs.mut_wx_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
+          </view>
+        </view>
+        <!--end添加企微-->
+        <!--实名认证资料-->
+        <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editVoucherImg/index?id={{id}}">
+          <view class="absolute left-0 box-middle font-32 color-333">实名认证资料</view>
+          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
+            <view>{{imgInfo.imgs.destory_img.value?'更新':'上传'}}<i class="iconfont ml10 icon-gengduo"></i></view>
+          </view>
+        </view>
+        <!--end实名认证资料-->
+        <view class="relative bbs-1-eb pl140 font-28" bindtap="{{!info.refund_status?'pushLink':''}}" data-url="/pages/order/editDeliveryckimg/index?id={{id}}" wx:if="{{!!imgInfo.imgs.delivery_ck_img}}">
+          <view class="absolute left-0 box-middle font-32 color-333">交付确认单</view>
+          <view class="pt30 pb30 text-right font-26 color-999" style="min-height:38rpx">
+            <view><i class="iconfont ml10 icon-gengduo"></i></view>
+          </view>
+        </view>
 
       </block>
       <!--图片展示-->
@@ -375,7 +415,68 @@
             </view>
           </view>
         </block>
+        <!--添加企微-->
+        <block wx:if="{{imgInfo.imgs.wx_img.img||imgInfo.imgs.mut_wx_img.img}}">
+          <view class="mt40 font-32">添加企微</view>
+          <view class="fn-flex mt30 text-center">
+            <view class="fn-flex-item relative mr10">
+              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" wx:if="{{imgInfo.imgs.wx_img.img}}" bindtap="previewImage" data-type="wx_img">  
+                <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.wx_img.img}}' lazy-load="{{true}}" mode="aspectFit"></image>
+              </view>
+            </view>
+            <view class="fn-flex-item relative ml10">
+              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" wx:if="{{imgInfo.imgs.mut_wx_img.img}}" bindtap="previewImage" data-type="mut_wx_img">
+                <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.mut_wx_img.img}}' lazy-load="{{true}}" mode="aspectFit"></image>
+              </view>
+            </view>
+          </view>
+        </block>
+        <!--实名认证资料-->
+        <block wx:if="{{imgInfo.imgs.destory_img.img}}">
+          <view class="mt40 font-32">实名认证资料</view>
+          <view class="mt30 pb20 text-center">
+            <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden" bindtap="previewImage" data-type="destory_img">
+              <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.destory_img.img}}' mode='aspectFit'></image>
+            </view>
+          </view>
+        </block>
+        <!--交付确认单-->
+        <block wx:if="{{imgInfo.imgs.delivery_ck_img.img}}">
+          <view class="mt40 font-32">交付确认单</view>
+          <view class="mt30 pb20 text-center">
+            <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden" bindtap="previewImage" data-type="delivery_ck_img">
+              <image class='block wp100 img-h-200 ulib-r10' src='{{imgInfo.imgs.delivery_ck_img.img}}' mode='aspectFit'></image>
+            </view>
+          </view>
+        </block>
       </block>
+
+      <!--按揭图片展示-->
+      <block wx:if="{{!info.loan_status}}">
+        <block wx:if="{{info.notify_file.length>0}}">
+          <view class="mt30 font-28">按揭通知函</view>
+          <view class="mt30 pb30 text-center">
+            <scroll-view class="space-nowrap" scroll-x="true">
+              <block wx:for='{{info.notify_file}}' wx:for-item='notify' wx:key='index'>
+                <view class="inline-block bg-f8 img-300x200 ml10 mr10 relative ulib-r10 overflowhidden">
+                  <image class='block wp100 img-h-200 ulib-r10' src='{{notify.src}}' mode='aspectFit' bindtap="previewImage" data-type="notify" data-current="{{notify.src}}"></image>
+                </view>
+              </block>
+            </scroll-view>
+          </view>
+        </block>
+        <block wx:if="{{info.lend_file.value}}">
+          <view class="mt30 font-28">放款通知函</view>
+          <view class="mt30 text-center">
+            <view class="inline-block img-300x200 relative ulib-r10 overflowhidden">
+              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+                <image class='block wp100 img-h-200 ulib-r10' src='{{info.lend_file.src}}' mode='aspectFit' bindtap="previewImage" data-type="lend"></image>
+              </view>
+            </view>
+          </view>
+        </block>
+      </block>
+
       <!--end 图片预览-->
     </view>
     
@@ -444,7 +545,7 @@
     <!--end交付随车信息-->
 
   <!--订单作废 收取意向金 操作-->
-  <view class="fixed left-0 right-0 bottom-0 pt20 pl30 pr30 pb40 bg-000-op80 fn-flex z-index-9999">
+  <view class="fixed left-0 right-0 bottom-0 pt20 pl30 pr30 pb40 bg-000-op80 fn-flex z-index-9999" wx:if="{{!info.refund_status}}">
     <button bindtap="putAppCusorderV2Status" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover" wx:if="{{!info.inten_money&&!info.price_book_status&&!info.price_last_status&&!price_srv_status}}"><i class="iconfont mr5 icon-zuofei"></i>订单作废</button>
     <button bindtap="optShowOrderCode" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover"><i class="iconfont mr5 icon-zhifu"></i>邀请扫码</button>
   </view>

pages/order/detail/index2.wxss

@@ -1,3 +1,9 @@
+.red-tip{
+  width:12rpx;
+  height:12rpx;
+  background-color:#f9394d;
+}
+
 /*复选框外框样式*/
 checkbox .wx-checkbox-input {
   width:30rpx;

pages/order/editBusinessBicence/index.js

@@ -69,26 +69,29 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
-                that.setData({
-                  'cardida.value':resp.data.data.url,
-                  'cardida.img':resp.data.data.full_url,
-                })
-
                 let params = {};
                 params['id'] = that.data.id;
                 params['cardida'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
+                  wx.hideLoading();
+                  that.setData({
+                    'cardida.value':resp.data.data.url,
+                    'cardida.img':resp.data.data.full_url,
+                  })
                 }).catch(res2=>{
+                  wx.hideLoading();
                   if(res2.code==418){
                     that.setData({
+                      'cardida.value':resp.data.data.url,
+                      'cardida.img':resp.data.data.full_url,
                       'cardida.err':!res2.data[0].caridA,
                       'cardida.errmsg':res2.data[0].errmsg,
                     })
                   }
                 });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -122,26 +125,29 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
-                that.setData({
-                  'cardidb.value':resp.data.data.url,
-                  'cardidb.img':resp.data.data.full_url,
-                })
-
                 let params = {};
                 params['id'] = that.data.id;
                 params['cardidb'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
+                  wx.hideLoading();
+                  that.setData({
+                    'cardidb.value':resp.data.data.url,
+                    'cardidb.img':resp.data.data.full_url,
+                  })
                 }).catch(res2=>{
+                  wx.hideLoading();
                   if(res2.code==418){
                     that.setData({
+                      'cardidb.value':resp.data.data.url,
+                      'cardidb.img':resp.data.data.full_url,
                       'cardidb.err':!res2.data[1].caridB,
                       'cardidb.errmsg':res2.data[1].errmsg,
                     })
                   }
                 });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -175,26 +181,29 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
-                that.setData({
-                  'business_licence.value':resp.data.data.url,
-                  'business_licence.img':resp.data.data.full_url,
-                })
-
                 let params = {};
                 params['id'] = that.data.id;
                 params['business_licence'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
+                  wx.hideLoading();
+                  that.setData({
+                    'business_licence.value':resp.data.data.url,
+                    'business_licence.img':resp.data.data.full_url,
+                  })
                 }).catch(res2=>{
+                  wx.hideLoading();
                   if(res2.code==418){
                     that.setData({
+                      'business_licence.value':resp.data.data.url,
+                      'business_licence.img':resp.data.data.full_url,
                       'business_licence.err':!res2.data[0].business_licence,
                       'business_licence.errmsg':res2.data[0].errmsg,
                     })
                   }
                 });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -228,17 +237,21 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
                 let params = {};
                 params['id'] = that.data.id;
                 params['register_img'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
                   that.setData({
                     'register_img.value':resp.data.data.url,
                     'register_img.img':resp.data.data.full_url,
                   })
-                })
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -272,17 +285,21 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
                 let params = {};
                 params['id'] = that.data.id;
                 params['car_img'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
                   that.setData({
                     'car_img.value':resp.data.data.url,
                     'car_img.img':resp.data.data.full_url,
                   })
-                })
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -308,6 +325,7 @@ Page({
             title: '上传中',
           })
           let ins_img=that.data.ins_img
+          let k = 0
           for (let i = 0; i < res1.tempFilePaths.length; i++) {
             //上传图片
             wx.uploadFile({
@@ -318,6 +336,7 @@ Page({
                 'app': 'liche'
               },
               success: (resp) => {
+                k = k + 1
                 resp.data = JSON.parse(resp.data);
                 if (resp.data.code == 200) {
                   let imgdata = resp.data
@@ -327,23 +346,25 @@ Page({
                     img:imgdata.data.full_url,
                   })
                   ins_img=ins_img.concat(list)
-                  if(i+1==res1.tempFilePaths.length){
-                    wx.hideLoading();
-                    setTimeout(function () {
-                      let params = {};
-                      params['id'] = that.data.id;
-                      let img = []
-                      ins_img.forEach(item => {
-                        img.push(item.value)
+                  if(k == res1.tempFilePaths.length){
+                    let params = {};
+                    params['id'] = that.data.id;
+                    let img = []
+                    ins_img.forEach(item => {
+                      img.push(item.value)
+                    })
+                    params['ins_imgs'] = img;
+                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                      wx.hideLoading();
+                      that.setData({
+                        ins_img,
                       })
-                      params['ins_imgs'] = img;
-                      _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                        that.setData({
-                          ins_img,
-                        })
-                      })
-                    }, 500);
+                    }).catch(res2=>{
+                      wx.hideLoading();
+                    });
                   }
+                }else{
+                  wx.hideLoading();
                 }
               },
         
@@ -372,6 +393,7 @@ Page({
             title: '上传中',
           })
           let other_img=that.data.other_img
+          let k = 0
           for (let i = 0; i < res1.tempFilePaths.length; i++) {
             //上传图片
             wx.uploadFile({
@@ -382,6 +404,7 @@ Page({
                 'app': 'liche'
               },
               success: (resp) => {
+                k = k + 1
                 resp.data = JSON.parse(resp.data);
                 if (resp.data.code == 200) {
                   let imgdata = resp.data
@@ -391,23 +414,25 @@ Page({
                     img:imgdata.data.full_url,
                   })
                   other_img=other_img.concat(list)
-                  if(i+1==res1.tempFilePaths.length){
-                    wx.hideLoading();
-                    setTimeout(function () {
-                      let params = {};
-                      params['id'] = that.data.id;
-                      let img = []
-                      other_img.forEach(item => {
-                        img.push(item.value)
+                  if(k == res1.tempFilePaths.length){
+                    let params = {};
+                    params['id'] = that.data.id;
+                    let img = []
+                    other_img.forEach(item => {
+                      img.push(item.value)
+                    })
+                    params['other_imgs'] = img;
+                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                      wx.hideLoading();
+                      that.setData({
+                        other_img,
                       })
-                      params['other_imgs'] = img;
-                      _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                        that.setData({
-                          other_img,
-                        })
-                      })
-                    }, 500);
+                    }).catch(res2=>{
+                      wx.hideLoading();
+                    });
                   }
+                }else{
+                  wx.hideLoading();
                 }
               },
         
@@ -461,4 +486,14 @@ Page({
     }
   },
 
+  //查看图片
+  previewImage: function (e) {
+    if(e.currentTarget.dataset.type=='business_licence'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.business_licence.img,
+        urls:[this.data.imgInfo.imgs.business_licence.img],
+      })
+    }
+  },
+
 })

pages/order/editBusinessBicence/index.wxml

@@ -3,18 +3,18 @@
     
     <!-- <view class="mt40 font-32">营业执照</view> -->
     <view class="mt30 text-center">
-      <view class="inline-block img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="business_licence">
+      <view class="inline-block img-300x200 relative ulib-r10 overflowhidden">
         <block wx:if="{{business_licence.value}}">
           <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4"></i>
+            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4" bindtap="chooseImg" data-type="business_licence"></i>
             <view class="absolute top-0 left-0 bottom-0 right-0 bg-f00-op50 z-index-3" wx:if="{{business_licence.err}}">
               <view class="absolute left-0 right-0 box-middle pl20 pr20 text-break font-22 color-fff"><i class="iconfont icon-jinggao"></i>{{business_licence.errmsg}}</view>
             </view>
-            <image class='block wp100 img-h-200 ulib-r10' src='{{business_licence.img}}' mode='aspectFit'></image>
+            <image class='block wp100 img-h-200 ulib-r10' src='{{business_licence.img}}' mode='aspectFit' bindtap="previewImage" data-type="business_licence"></image>
           </view>
         </block>
         <block wx:else>
-          <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+          <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="business_licence">
             <view class="absolute left-0 right-0 box-middle color-ccc">
               <i class="iconfont icon-fanmian font-60"></i>
               <view class="mt10 font-22">上传营业执照</view>

pages/order/editCardid/index.js

@@ -69,26 +69,30 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
-                that.setData({
-                  'cardida.value':resp.data.data.url,
-                  'cardida.img':resp.data.data.full_url,
-                })
-
                 let params = {};
                 params['id'] = that.data.id;
                 params['cardida'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
+                  that.setData({
+                    'cardida.value':resp.data.data.url,
+                    'cardida.img':resp.data.data.full_url,
+                  })
 
                 }).catch(res2=>{
+                  wx.hideLoading();
                   if(res2.code==418){
                     that.setData({
+                      'cardida.value':resp.data.data.url,
+                      'cardida.img':resp.data.data.full_url,
                       'cardida.err':!res2.data[0].caridA,
                       'cardida.errmsg':res2.data[0].errmsg,
                     })
                   }
                 });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -122,26 +126,29 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
-                that.setData({
-                  'cardidb.value':resp.data.data.url,
-                  'cardidb.img':resp.data.data.full_url,
-                })
-
                 let params = {};
                 params['id'] = that.data.id;
                 params['cardidb'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
+                  wx.hideLoading();
+                  that.setData({
+                    'cardidb.value':resp.data.data.url,
+                    'cardidb.img':resp.data.data.full_url,
+                  })
                 }).catch(res2=>{
+                  wx.hideLoading();
                   if(res2.code==418){
                     that.setData({
+                      'cardidb.value':resp.data.data.url,
+                      'cardidb.img':resp.data.data.full_url,
                       'cardidb.err':!res2.data[1].caridB,
                       'cardidb.errmsg':res2.data[1].errmsg,
                     })
                   }
                 });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -175,21 +182,22 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
-                that.setData({
-                  'business_licence.value':resp.data.data.url,
-                  'business_licence.img':resp.data.data.full_url,
-                })
-
                 let params = {};
                 params['id'] = that.data.id;
                 params['business_licence'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
+                  wx.hideLoading();
+                  that.setData({
+                    'business_licence.value':resp.data.data.url,
+                    'business_licence.img':resp.data.data.full_url,
+                  })
                 }).catch(res2=>{
+                  wx.hideLoading();
                   if(res2.code==418){
                     that.setData({
+                      'business_licence.value':resp.data.data.url,
+                      'business_licence.img':resp.data.data.full_url,
                       'business_licence.err':!res2.data[0].business_licence,
                       'business_licence.errmsg':res2.data[0].errmsg,
                     })
@@ -228,17 +236,21 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
                 let params = {};
                 params['id'] = that.data.id;
                 params['register_img'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
                   that.setData({
                     'register_img.value':resp.data.data.url,
                     'register_img.img':resp.data.data.full_url,
                   })
-                })
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -272,17 +284,21 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
                 let params = {};
                 params['id'] = that.data.id;
                 params['car_img'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
                   that.setData({
                     'car_img.value':resp.data.data.url,
                     'car_img.img':resp.data.data.full_url,
                   })
-                })
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -308,6 +324,7 @@ Page({
             title: '上传中',
           })
           let ins_img=that.data.ins_img
+          let k = 0
           for (let i = 0; i < res1.tempFilePaths.length; i++) {
             //上传图片
             wx.uploadFile({
@@ -318,6 +335,7 @@ Page({
                 'app': 'liche'
               },
               success: (resp) => {
+                k = k + 1
                 resp.data = JSON.parse(resp.data);
                 if (resp.data.code == 200) {
                   let imgdata = resp.data
@@ -327,23 +345,25 @@ Page({
                     img:imgdata.data.full_url,
                   })
                   ins_img=ins_img.concat(list)
-                  if(i+1==res1.tempFilePaths.length){
-                    wx.hideLoading();
-                    setTimeout(function () {
-                      let params = {};
-                      params['id'] = that.data.id;
-                      let img = []
-                      ins_img.forEach(item => {
-                        img.push(item.value)
+                  if(k == res1.tempFilePaths.length){
+                    let params = {};
+                    params['id'] = that.data.id;
+                    let img = []
+                    ins_img.forEach(item => {
+                      img.push(item.value)
+                    })
+                    params['ins_imgs'] = img;
+                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                      wx.hideLoading();
+                      that.setData({
+                        ins_img,
                       })
-                      params['ins_imgs'] = img;
-                      _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                        that.setData({
-                          ins_img,
-                        })
-                      })
-                    }, 500);
+                    }).catch(res2=>{
+                      wx.hideLoading();
+                    });
                   }
+                }else{
+                  wx.hideLoading();
                 }
               },
         
@@ -372,6 +392,7 @@ Page({
             title: '上传中',
           })
           let other_img=that.data.other_img
+          let k = 0
           for (let i = 0; i < res1.tempFilePaths.length; i++) {
             //上传图片
             wx.uploadFile({
@@ -382,6 +403,7 @@ Page({
                 'app': 'liche'
               },
               success: (resp) => {
+                k = k + 1
                 resp.data = JSON.parse(resp.data);
                 if (resp.data.code == 200) {
                   let imgdata = resp.data
@@ -391,23 +413,25 @@ Page({
                     img:imgdata.data.full_url,
                   })
                   other_img=other_img.concat(list)
-                  if(i+1==res1.tempFilePaths.length){
-                    wx.hideLoading();
-                    setTimeout(function () {
-                      let params = {};
-                      params['id'] = that.data.id;
-                      let img = []
-                      other_img.forEach(item => {
-                        img.push(item.value)
+                  if(k == res1.tempFilePaths.length){
+                    let params = {};
+                    params['id'] = that.data.id;
+                    let img = []
+                    other_img.forEach(item => {
+                      img.push(item.value)
+                    })
+                    params['other_imgs'] = img;
+                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                      wx.hideLoading();
+                      that.setData({
+                        other_img,
                       })
-                      params['other_imgs'] = img;
-                      _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                        that.setData({
-                          other_img,
-                        })
-                      })
-                    }, 500);
+                    }).catch(res2=>{
+                      wx.hideLoading();
+                    });
                   }
+                }else{
+                  wx.hideLoading();
                 }
               },
         
@@ -461,4 +485,20 @@ Page({
     }
   },
 
+  //查看图片
+  previewImage: function (e) {
+    if(e.currentTarget.dataset.type=='cardida'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.cardida.img,
+        urls:[this.data.imgInfo.imgs.cardida.img],
+      })
+    }
+    else if(e.currentTarget.dataset.type=='cardidb'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.cardidb.img,
+        urls:[this.data.imgInfo.imgs.cardidb.img],
+      })
+    }
+  },
+
 })

pages/order/editCardid/index.wxml

@@ -3,18 +3,18 @@
 
     <!-- <view class="mt40 font-32">身份证</view> -->
     <view class="fn-flex mt30 text-center">
-      <view class="fn-flex-item relative mr10" bindtap="chooseImg" data-type="cardida">
+      <view class="fn-flex-item relative mr10">
         <block wx:if="{{cardida.value}}">
           <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4"></i>
+            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4" bindtap="chooseImg" data-type="cardida"></i>
             <view class="absolute top-0 left-0 bottom-0 right-0 bg-f00-op50 z-index-3" wx:if="{{cardida.err}}">
               <view class="absolute left-0 right-0 box-middle pl20 pr20 text-break font-22 color-fff"><i class="iconfont icon-jinggao"></i>{{cardida.errmsg}}</view>
             </view>
-            <image class='block wp100 img-h-200 ulib-r10' src='{{cardida.img}}' mode='aspectFit'></image>
+            <image class='block wp100 img-h-200 ulib-r10' src='{{cardida.img}}' mode='aspectFit' bindtap="previewImage" data-type="cardida"></image>
           </view>
         </block>
         <block wx:else>
-          <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+          <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="cardida">
             <view class="absolute left-0 right-0 box-middle color-ccc">
               <i class="iconfont icon-zhengmian font-60"></i>
               <view class="mt10 font-22">上传身份证正面</view>
@@ -22,18 +22,18 @@
           </view>
         </block>
       </view>
-      <view class="fn-flex-item relative ml10" bindtap="chooseImg" data-type="cardidb">
+      <view class="fn-flex-item relative ml10">
         <block wx:if="{{cardidb.value}}">
           <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4"></i>
+            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4" bindtap="chooseImg" data-type="cardidb"></i>
             <view class="absolute top-0 left-0 bottom-0 right-0 bg-f00-op50 z-index-3" wx:if="{{cardidb.err}}">
               <view class="absolute left-0 right-0 box-middle pl20 pr20 text-break font-22 color-fff"><i class="iconfont icon-jinggao"></i>{{cardidb.errmsg}}</view>
             </view>
-            <image class='block wp100 img-h-200 ulib-r10' src='{{cardidb.img}}' mode='aspectFit'></image>
+            <image class='block wp100 img-h-200 ulib-r10' src='{{cardidb.img}}' mode='aspectFit' bindtap="previewImage" data-type="cardidb"></image>
           </view>
         </block>
         <block wx:else>
-          <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+          <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="cardidb">
             <view class="absolute left-0 right-0 box-middle color-ccc">
               <i class="iconfont icon-fanmian font-60"></i>
               <view class="mt10 font-22">上传身份证背面</view>

pages/order/editDeliveryckimg/index.js

@@ -0,0 +1,101 @@
+import _ from '../../../commons/js/commons'
+const app = getApp()
+Page({
+  data: {
+    delivery_ck_img:{},//交付确认单
+  },
+  onLoad: function (options) {
+    for (let key in options) {
+      this.setData({
+        [key]: options[key]
+      })
+    }
+
+    this.getAppCusorderdata()
+    
+  },
+  onShow: function () {
+
+  },
+
+  //获取订单图片
+  getAppCusorderdata(){
+    let params = {};
+    params['id'] = this.data.id;
+    _.apiQuery.getAppCusorderdata(params).then(res=>{
+      this.setData({
+        imgInfo:res.data,
+      })
+      if(res.data.img_status == 1){
+        this.setData({
+          delivery_ck_img:res.data.imgs.delivery_ck_img.length==0?{}:res.data.imgs.delivery_ck_img,
+        })
+      }
+      wx.stopPullDownRefresh()
+    })
+  },
+
+  //选择图片
+  chooseImg(e) {
+    let that = this
+
+    //上传登记证
+    if(e.currentTarget.dataset.type=='delivery_ck_img'){
+      wx.chooseImage({
+        count: 1, // 默认9
+        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+        success(res) {
+          wx.showLoading({
+            title: '上传中',
+          })
+          wx.uploadFile({
+            url:_.config.api.upImg,
+            filePath:res.tempFilePaths[0],
+            name: 'img',
+            formData: {
+              'app': 'liche'
+            },
+            success: (resp) => {
+              resp.data = JSON.parse(resp.data);
+              if (resp.data.code == 200) {
+                let params = {};
+                params['id'] = that.data.id;
+                params['delivery_ck_img'] = resp.data.data.url;
+                _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
+                  that.setData({
+                    'delivery_ck_img.value':resp.data.data.url,
+                    'delivery_ck_img.img':resp.data.data.full_url,
+                  })
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
+              }
+            },
+          })
+        },
+        fail: res => {
+          wx.showToast({
+            title: '文件选择失败',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      })
+    }
+  },
+
+  //查看图片
+  previewImage: function (e) {
+    if(e.currentTarget.dataset.type=='delivery_ck_img'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.delivery_ck_img.img,
+        urls:[this.data.imgInfo.imgs.delivery_ck_img.img],
+      })
+    }
+  },
+
+})

pages/order/editDeliveryckimg/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "交付确认单信息",
+  "usingComponents": {}
+}

pages/order/editDeliveryckimg/index.wxml

@@ -0,0 +1,10 @@
+<view class="container">
+  <view class="inner30">
+    <block wx:if="{{delivery_ck_img.img}}">
+      <image class='block wp100' src='{{delivery_ck_img.img}}' mode='widthFix' bindtap="previewImage" data-type="delivery_ck_img"></image>
+    </block>
+    <block wx:else>
+      <lcb-listmore isNoData='{{true}}'></lcb-listmore>
+    </block>
+  </view>
+</view>

pages/order/editDeliveryckimg/index.wxss

@@ -0,0 +1 @@
+/* pages/order/editDeliveryckimg/index.wxss */

pages/order/editFinance/index.js

@@ -14,6 +14,8 @@ Page({
     nums:[],//金融分期期数列表
     numIndex:-1,//分期期数索引
     num:'',//分期期数
+
+    notify_file_obj:[],
     
   },
   onLoad: function (options) {
@@ -133,33 +135,53 @@ Page({
   //上传按揭通知函
   chooseImg(e) {
     let that = this
+    
+    //上传保单
     if(e.currentTarget.dataset.type=='notify'){
       wx.chooseImage({
-        count: 1, // 默认9
+        count: 10 - that.data.notify_file_obj.length, //
         sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
         sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
+        success(res1) {
           wx.showLoading({
             title: '上传中',
           })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
-              if (resp.data.code == 200) {
-                that.setData({
-                  'notify_file_obj.value':resp.data.data.url,
-                  'notify_file_obj.src':resp.data.data.full_url,
-                })
-              }
-            },
-          })
+          let notify_file_obj=that.data.notify_file_obj
+          let k = 0
+          for (let i = 0; i < res1.tempFilePaths.length; i++) {
+            //上传图片
+            wx.uploadFile({
+              url:_.config.api.upImg,
+              filePath:res1.tempFilePaths[i],
+              name: 'img',
+              formData: {
+                'app': 'liche'
+              },
+              success: (resp) => {
+                k = k + 1
+                resp.data = JSON.parse(resp.data);
+                if (resp.data.code == 200) {
+                  let imgdata = resp.data
+                  let list = []
+                  list.push({
+                    value:imgdata.data.url,
+                    src:imgdata.data.full_url,
+                  })
+                  notify_file_obj=notify_file_obj.concat(list)
+                  if(k == res1.tempFilePaths.length){
+                    wx.hideLoading();
+                    that.setData({
+                      notify_file_obj,
+                    })
+                  }
+                }else{
+                  wx.hideLoading();
+                }
+              },
+        
+            })
+          }
+
         },
         fail: res => {
           wx.showToast({
@@ -170,6 +192,45 @@ Page({
         }
       })
     }
+
+    // if(e.currentTarget.dataset.type=='notify'){
+    //   wx.chooseImage({
+    //     count: 1, // 默认9
+    //     sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+    //     sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+    //     success(res) {
+    //       wx.showLoading({
+    //         title: '上传中',
+    //       })
+    //       wx.uploadFile({
+    //         url:_.config.api.upImg,
+    //         filePath:res.tempFilePaths[0],
+    //         name: 'img',
+    //         formData: {
+    //           'app': 'liche'
+    //         },
+    //         success: (resp) => {
+    //           resp.data = JSON.parse(resp.data);
+    //           wx.hideLoading();
+    //           if (resp.data.code == 200) {
+    //             that.setData({
+    //               'notify_file_obj.value':resp.data.data.url,
+    //               'notify_file_obj.src':resp.data.data.full_url,
+    //             })
+    //           }
+    //         },
+    //       })
+    //     },
+    //     fail: res => {
+    //       wx.showToast({
+    //         title: '文件选择失败',
+    //         icon: 'none',
+    //         duration: 2000
+    //       })
+    //     }
+    //   })
+    // }
+
     if(e.currentTarget.dataset.type=='lend'){
       wx.chooseImage({
         count: 1, // 默认9
@@ -223,7 +284,7 @@ Page({
         icon: 'none'
       })
     }
-    else if(!this.data.notify_file_obj.src){
+    else if(!this.data.notify_file_obj.length>0){
       wx.showToast({
         title: '请上传按揭通知函',
         icon: 'none'
@@ -235,6 +296,11 @@ Page({
           isShowConfirm:true,
         })
       }else{
+        let notify_file = []
+        this.data.notify_file_obj.forEach(item => {
+          notify_file.push(item.value)
+        })
+
         let that = this
         that.setData({
           submitFlag: true,
@@ -242,7 +308,7 @@ Page({
         let params = {};
         params['o_id'] = that.data.id;
         params['finance_id'] = that.data.finance_id;
-        params['notify_file'] = that.data.notify_file_obj.value;
+        params['notify_file'] = notify_file;
         params['price_loan'] = that.data.price_loan;
         if(that.data.lend_file_obj.value){
           params['lend_file'] = that.data.lend_file_obj.value;
@@ -286,6 +352,10 @@ Page({
 
   //修改贷款信息
   putAppLoan2() {
+    let notify_file = []
+    this.data.notify_file_obj.forEach(item => {
+      notify_file.push(item.value)
+    })
     let that = this
     that.setData({
       submitFlag: true,
@@ -293,7 +363,7 @@ Page({
     let params = {};
     params['o_id'] = that.data.id;
     params['finance_id'] = that.data.finance_id;
-    params['notify_file'] = that.data.notify_file_obj.value;
+    params['notify_file'] = notify_file;
     params['price_loan'] = that.data.price_loan;
     if(that.data.lend_file_obj.value){
       params['lend_file'] = that.data.lend_file_obj.value;
@@ -335,14 +405,6 @@ Page({
     });
   },
 
-  //查看图片
-  previewImage: function (e) {
-    wx.previewImage({
-      current:this.data.notify_file_obj.src,
-      urls:[this.data.notify_file_obj.src],
-    })
-  },
-
   //获取金融分期期数
   getAppFinanceNums(){
     _.apiQuery.getAppFinanceNums().then(res => {
@@ -375,4 +437,35 @@ Page({
     })
   },
 
+  //查看图片
+  previewImage: function (e) {
+    if(e.currentTarget.dataset.type=='notify'){
+      let img = []
+      this.data.notify_file_obj.forEach(item => {
+        img.push(item.src)
+      })
+      wx.previewImage({
+        current:e.currentTarget.dataset.current,
+        urls:img,
+      })
+    }
+    else if(e.currentTarget.dataset.type=='lend'){
+      wx.previewImage({
+        current:this.data.lend_file_obj.src,
+        urls:[this.data.lend_file_obj.src],
+      })
+    }
+  },
+
+  // 编辑页面删除图片
+  delImg(e){
+    if(e.currentTarget.dataset.type=='notify'){
+      let notify_file_obj = this.data.notify_file_obj
+      notify_file_obj.splice(e.currentTarget.dataset.index, 1)
+      this.setData({
+        notify_file_obj,
+      })
+    }
+  },
+
 })

pages/order/editFinance/index.wxml

@@ -29,16 +29,34 @@
       </view>
       <view class="relative">
         <view class="mt30 font-28">按揭通知函<text class="color-f9394d">*</text></view>
-        <view class="mt30 text-center">
-          <view class="inline-block img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="notify" >
+        <view class="mt30 pb30 text-center">
+          <scroll-view class="space-nowrap" scroll-x="true">
+            <block wx:for='{{notify_file_obj}}' wx:for-item='notify' wx:key='index'>
+              <view class="inline-block bg-f8 img-300x200 ml10 mr10 relative ulib-r10 overflowhidden">
+                <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-guanbi1 inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delImg" data-type="notify" data-index="{{index}}" ></i>
+                <image class='block wp100 img-h-200 ulib-r10' src='{{notify.src}}' mode='aspectFit' bindtap="previewImage" data-type="notify" data-current="{{notify.src}}"></image>
+              </view>
+            </block>
+            <block wx:if="{{notify_file_obj.length<10}}">
+              <view class="inline-block bg-f8 img-300x200 ml10 mr10 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="notify">
+                <view class="absolute left-0 right-0 box-middle color-ccc">
+                  <i class="iconfont icon-paizhao font-48"></i>
+                  <view class="mt10 font-22">上传按揭通知函</view>
+                </view>
+              </view>
+            </block>
+          </scroll-view>
+        </view>
+        <!-- <view class="mt30 text-center">
+          <view class="inline-block img-300x200 relative ulib-r10 overflowhidden" >
             <block wx:if="{{notify_file_obj.value}}">
               <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-                <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4"></i>
-                <image class='block wp100 img-h-200 ulib-r10' src='{{notify_file_obj.src}}' mode='aspectFit'></image>
+                <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4" bindtap="chooseImg" data-type="notify"></i>
+                <image class='block wp100 img-h-200 ulib-r10' src='{{notify_file_obj.src}}' mode='aspectFit' bindtap="previewImage" data-type="notify"></image>
               </view>
             </block>
             <block wx:else>
-              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+              <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="notify">
                 <view class="absolute left-0 right-0 box-middle color-ccc">
                   <i class="iconfont icon-fanmian font-60"></i>
                   <view class="mt10 font-22">上传按揭通知函</view>
@@ -46,7 +64,7 @@
               </view>
             </block>
           </view>
-        </view>
+        </view> -->
       </view>
     </block>
     <block wx:else>
@@ -60,29 +78,37 @@
       </view>
       <view class="relative">
         <view class="mt30 font-28">按揭通知函</view>
-        <view class="mt30 text-center">
-          <view class="inline-block img-300x200 relative ulib-r10 overflowhidden" bindtap="previewImage">
-            <block wx:if="{{notify_file_obj.value}}">
-              <view class="inline-block img-300x200 relative ulib-r10 overflowhidden">
-                <image class='block wp100 img-h-200 ulib-r10' src='{{notify_file_obj.src}}' mode='aspectFit'></image>
+        <view class="mt30 pb30 text-center">
+          <scroll-view class="space-nowrap" scroll-x="true">
+            <block wx:for='{{notify_file_obj}}' wx:for-item='notify' wx:key='index'>
+              <view class="inline-block bg-f8 img-300x200 ml10 mr10 relative ulib-r10 overflowhidden">
+                <image class='block wp100 img-h-200 ulib-r10' src='{{notify.src}}' mode='aspectFit' bindtap="previewImage" data-type="notify" data-current="{{notify.src}}"></image>
               </view>
             </block>
-          </view>
+            <block wx:if="{{notify_file_obj.length==0}}">
+              <view class="inline-block bg-f8 img-300x200 ml10 mr10 relative ulib-r10 overflowhidden">
+                <view class="absolute left-0 right-0 box-middle color-ccc">
+                  <i class="iconfont icon-paizhao font-48"></i>
+                  <view class="mt10 font-22">没有上传按揭通知函</view>
+                </view>
+              </view>
+            </block>
+          </scroll-view>
         </view>
       </view>
     </block>
     <view class="relative">
       <view class="mt30 font-28">放款通知函</view>
       <view class="mt30 text-center">
-        <view class="inline-block img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="lend">
+        <view class="inline-block img-300x200 relative ulib-r10 overflowhidden">
           <block wx:if="{{lend_file_obj.value}}">
             <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-              <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4"></i>
-              <image class='block wp100 img-h-200 ulib-r10' src='{{lend_file_obj.src}}' mode='aspectFit'></image>
+              <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-4" bindtap="chooseImg" data-type="lend"></i>
+              <image class='block wp100 img-h-200 ulib-r10' src='{{lend_file_obj.src}}' mode='aspectFit' bindtap="previewImage" data-type="lend"></image>
             </view>
           </block>
           <block wx:else>
-            <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+            <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="lend">
               <view class="absolute left-0 right-0 box-middle color-ccc">
                 <i class="iconfont icon-fanmian font-60"></i>
                 <view class="mt10 font-22">上传放款通知函</view>

pages/order/editInsImg/index.js

@@ -92,7 +92,6 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              
               if (resp.data.code == 200) {
                 let params = {};
                 params['id'] = that.data.id;
@@ -106,7 +105,11 @@ Page({
 
                   that.getAppCusorderdata()
 
-                })
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -140,7 +143,6 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              
               if (resp.data.code == 200) {
                 let params = {};
                 params['id'] = that.data.id;
@@ -154,7 +156,11 @@ Page({
 
                   that.getAppCusorderdata()
 
-                })
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -180,6 +186,7 @@ Page({
             title: '上传中',
           })
           let ins_img=that.data.ins_img
+          let k = 0
           for (let i = 0; i < res1.tempFilePaths.length; i++) {
             //上传图片
             wx.uploadFile({
@@ -190,6 +197,7 @@ Page({
                 'app': 'liche'
               },
               success: (resp) => {
+                k = k + 1
                 resp.data = JSON.parse(resp.data);
                 if (resp.data.code == 200) {
                   let imgdata = resp.data
@@ -199,24 +207,25 @@ Page({
                     img:imgdata.data.full_url,
                   })
                   ins_img=ins_img.concat(list)
-                  if(i+1==res1.tempFilePaths.length){
-                    
-                    setTimeout(function () {
-                      let params = {};
-                      params['id'] = that.data.id;
-                      let img = []
-                      ins_img.forEach(item => {
-                        img.push(item.value)
-                      })
-                      params['ins_imgs'] = img;
-                      _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  if(k == res1.tempFilePaths.length){
+                    let params = {};
+                    params['id'] = that.data.id;
+                    let img = []
+                    ins_img.forEach(item => {
+                      img.push(item.value)
+                    })
+                    params['ins_imgs'] = img;
+                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
 
-                        wx.hideLoading();
-                        that.getAppCusorderdata()
+                      wx.hideLoading();
+                      that.getAppCusorderdata()
 
-                      })
-                    }, 500);
+                    }).catch(res2=>{
+                      wx.hideLoading();
+                    });
                   }
+                }else{
+                  wx.hideLoading();
                 }
               },
         
@@ -346,4 +355,30 @@ Page({
     });
   },
 
+  //查看图片
+  previewImage: function (e) {
+    if(e.currentTarget.dataset.type=='insurance_img'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.insurance_img.img,
+        urls:[this.data.imgInfo.imgs.insurance_img.img],
+      })
+    }
+    else if(e.currentTarget.dataset.type=='business_img'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.business_img.img,
+        urls:[this.data.imgInfo.imgs.business_img.img],
+      })
+    }
+    else if(e.currentTarget.dataset.type=='ins_img'){
+      let img = []
+      this.data.imgInfo.imgs.ins_img.forEach(item => {
+        img.push(item.img)
+      })
+      wx.previewImage({
+        current:e.currentTarget.dataset.current,
+        urls:img,
+      })
+    }
+  },
+
 })

pages/order/editInsImg/index.wxml

@@ -5,15 +5,15 @@
 
       <view class="font-28 text-center text-bold">交强险</view>
       <view class="mt30 pb30 text-center">
-        <view class="inline-block img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="insurance_img">
+        <view class="inline-block img-300x200 relative ulib-r10 overflowhidden">
           <block wx:if="{{insurance_img.value}}">
             <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-              <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1"></i>
-              <image class='block wp100 img-h-200 ulib-r10' src='{{insurance_img.img}}' mode='aspectFit'></image>
+              <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="chooseImg" data-type="insurance_img"></i>
+              <image class='block wp100 img-h-200 ulib-r10' src='{{insurance_img.img}}' mode='aspectFit' bindtap="previewImage" data-type="insurance_img"></image>
             </view>
           </block>
           <block wx:else>
-            <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+            <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="insurance_img">
               <view class="absolute left-0 right-0 box-middle color-ccc">
                 <i class="iconfont icon-paizhao font-48"></i>
                 <view class="mt10 font-22">上传交强险</view>
@@ -68,15 +68,15 @@
     <view class="mt50 pl40 pr40 pt40 relative ulib-r10 box-shadow-000-10-10 overflowhidden">
       <view class="font-28 text-center text-bold">商业险</view>
       <view class="mt30 pb30 text-center">
-        <view class="inline-block img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="business_img">
+        <view class="inline-block img-300x200 relative ulib-r10 overflowhidden">
           <block wx:if="{{business_img.value}}">
             <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-              <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1"></i>
-              <image class='block wp100 img-h-200 ulib-r10' src='{{business_img.img}}' mode='aspectFit'></image>
+              <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="chooseImg" data-type="business_img"></i>
+              <image class='block wp100 img-h-200 ulib-r10' src='{{business_img.img}}' mode='aspectFit' bindtap="previewImage" data-type="business_img"></image>
             </view>
           </block>
           <block wx:else>
-            <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+            <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="business_img">
               <view class="absolute left-0 right-0 box-middle color-ccc">
                 <i class="iconfont icon-paizhao font-48"></i>
                 <view class="mt10 font-22">上传商业险</view>
@@ -136,7 +136,7 @@
           <block wx:for='{{ins_img}}' wx:for-item='ins_img' wx:key='index'>
             <view class="inline-block bg-f8 img-300x200 ml10 mr10 relative ulib-r10 overflowhidden">
               <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-guanbi1 inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delImg" data-type="ins_img" data-index="{{index}}" ></i>
-              <image class='block wp100 img-h-200 ulib-r10' src='{{ins_img.img}}' mode='aspectFit'></image>
+              <image class='block wp100 img-h-200 ulib-r10' src='{{ins_img.img}}' mode='aspectFit' bindtap="previewImage" data-type="ins_img" data-current="{{ins_img.img}}"></image>
             </view>
           </block>
           <block wx:if="{{ins_img.length<10}}">

pages/order/editLicenseImg/index.js

@@ -69,26 +69,29 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
-                that.setData({
-                  'cardida.value':resp.data.data.url,
-                  'cardida.img':resp.data.data.full_url,
-                })
-
                 let params = {};
                 params['id'] = that.data.id;
                 params['cardida'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
+                  wx.hideLoading();
+                  that.setData({
+                    'cardida.value':resp.data.data.url,
+                    'cardida.img':resp.data.data.full_url,
+                  })
                 }).catch(res2=>{
+                  wx.hideLoading();
                   if(res2.code==418){
                     that.setData({
+                      'cardida.value':resp.data.data.url,
+                      'cardida.img':resp.data.data.full_url,
                       'cardida.err':!res2.data[0].caridA,
                       'cardida.errmsg':res2.data[0].errmsg,
                     })
                   }
                 });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -122,26 +125,29 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
-                that.setData({
-                  'cardidb.value':resp.data.data.url,
-                  'cardidb.img':resp.data.data.full_url,
-                })
-
                 let params = {};
                 params['id'] = that.data.id;
                 params['cardidb'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
+                  wx.hideLoading();
+                  that.setData({
+                    'cardidb.value':resp.data.data.url,
+                    'cardidb.img':resp.data.data.full_url,
+                  })
                 }).catch(res2=>{
+                  wx.hideLoading();
                   if(res2.code==418){
                     that.setData({
+                      'cardidb.value':resp.data.data.url,
+                      'cardidb.img':resp.data.data.full_url,
                       'cardidb.err':!res2.data[1].caridB,
                       'cardidb.errmsg':res2.data[1].errmsg,
                     })
                   }
                 });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -175,26 +181,29 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
-                that.setData({
-                  'business_licence.value':resp.data.data.url,
-                  'business_licence.img':resp.data.data.full_url,
-                })
-
                 let params = {};
                 params['id'] = that.data.id;
                 params['business_licence'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
+                  wx.hideLoading();
+                  that.setData({
+                    'business_licence.value':resp.data.data.url,
+                    'business_licence.img':resp.data.data.full_url,
+                  })
                 }).catch(res2=>{
+                  wx.hideLoading();
                   if(res2.code==418){
                     that.setData({
+                      'business_licence.value':resp.data.data.url,
+                      'business_licence.img':resp.data.data.full_url,
                       'business_licence.err':!res2.data[0].business_licence,
                       'business_licence.errmsg':res2.data[0].errmsg,
                     })
                   }
                 });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -228,17 +237,21 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
                 let params = {};
                 params['id'] = that.data.id;
                 params['register_img'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
                   that.setData({
                     'register_img.value':resp.data.data.url,
                     'register_img.img':resp.data.data.full_url,
                   })
-                })
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -272,17 +285,21 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
                 let params = {};
                 params['id'] = that.data.id;
                 params['car_img'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
                   that.setData({
                     'car_img.value':resp.data.data.url,
                     'car_img.img':resp.data.data.full_url,
                   })
-                })
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -308,6 +325,7 @@ Page({
             title: '上传中',
           })
           let ins_img=that.data.ins_img
+          let k = 0
           for (let i = 0; i < res1.tempFilePaths.length; i++) {
             //上传图片
             wx.uploadFile({
@@ -318,6 +336,7 @@ Page({
                 'app': 'liche'
               },
               success: (resp) => {
+                k = k + 1
                 resp.data = JSON.parse(resp.data);
                 if (resp.data.code == 200) {
                   let imgdata = resp.data
@@ -327,23 +346,25 @@ Page({
                     img:imgdata.data.full_url,
                   })
                   ins_img=ins_img.concat(list)
-                  if(i+1==res1.tempFilePaths.length){
-                    wx.hideLoading();
-                    setTimeout(function () {
-                      let params = {};
-                      params['id'] = that.data.id;
-                      let img = []
-                      ins_img.forEach(item => {
-                        img.push(item.value)
+                  if(k == res1.tempFilePaths.length){
+                    let params = {};
+                    params['id'] = that.data.id;
+                    let img = []
+                    ins_img.forEach(item => {
+                      img.push(item.value)
+                    })
+                    params['ins_imgs'] = img;
+                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                      wx.hideLoading();
+                      that.setData({
+                        ins_img,
                       })
-                      params['ins_imgs'] = img;
-                      _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                        that.setData({
-                          ins_img,
-                        })
-                      })
-                    }, 500);
+                    }).catch(res2=>{
+                      wx.hideLoading();
+                    });
                   }
+                }else{
+                  wx.hideLoading();
                 }
               },
         
@@ -372,6 +393,7 @@ Page({
             title: '上传中',
           })
           let other_img=that.data.other_img
+          let k = 0
           for (let i = 0; i < res1.tempFilePaths.length; i++) {
             //上传图片
             wx.uploadFile({
@@ -382,6 +404,7 @@ Page({
                 'app': 'liche'
               },
               success: (resp) => {
+                k = k + 1
                 resp.data = JSON.parse(resp.data);
                 if (resp.data.code == 200) {
                   let imgdata = resp.data
@@ -391,23 +414,25 @@ Page({
                     img:imgdata.data.full_url,
                   })
                   other_img=other_img.concat(list)
-                  if(i+1==res1.tempFilePaths.length){
-                    wx.hideLoading();
-                    setTimeout(function () {
-                      let params = {};
-                      params['id'] = that.data.id;
-                      let img = []
-                      other_img.forEach(item => {
-                        img.push(item.value)
+                  if(k == res1.tempFilePaths.length){
+                    let params = {};
+                    params['id'] = that.data.id;
+                    let img = []
+                    other_img.forEach(item => {
+                      img.push(item.value)
+                    })
+                    params['other_imgs'] = img;
+                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                      wx.hideLoading();
+                      that.setData({
+                        other_img,
                       })
-                      params['other_imgs'] = img;
-                      _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                        that.setData({
-                          other_img,
-                        })
-                      })
-                    }, 500);
+                    }).catch(res2=>{
+                      wx.hideLoading();
+                    });
                   }
+                }else{
+                  wx.hideLoading();
                 }
               },
         
@@ -461,4 +486,20 @@ Page({
     }
   },
 
+  //查看图片
+  previewImage: function (e) {
+    if(e.currentTarget.dataset.type=='register_img'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.register_img.img,
+        urls:[this.data.imgInfo.imgs.register_img.img],
+      })
+    }
+    else if(e.currentTarget.dataset.type=='car_img'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.car_img.img,
+        urls:[this.data.imgInfo.imgs.car_img.img],
+      })
+    }
+  },
+
 })

pages/order/editLicenseImg/index.wxml

@@ -3,15 +3,15 @@
     
     <!-- <view class="mt40 font-32">车辆证件</view> -->
     <view class="fn-flex mt30 text-center">
-      <view class="fn-flex-item relative mr10" bindtap="chooseImg" data-type="register_img">
+      <view class="fn-flex-item relative mr10">
         <block wx:if="{{register_img.value}}">
           <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1"></i>
-            <image class='block wp100 img-h-200 ulib-r10' src='{{register_img.img}}' mode='aspectFit'></image>
+            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="chooseImg" data-type="register_img"></i>
+            <image class='block wp100 img-h-200 ulib-r10' src='{{register_img.img}}' mode='aspectFit' bindtap="previewImage" data-type="register_img"></image>
           </view>
         </block>
         <block wx:else>
-          <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+          <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="register_img">
             <view class="absolute left-0 right-0 box-middle color-ccc">
               <i class="iconfont icon-paizhao font-48"></i>
               <view class="mt10 font-22">上传登记证</view>
@@ -19,15 +19,15 @@
           </view>
         </block>
       </view>
-      <view class="fn-flex-item relative ml10" bindtap="chooseImg" data-type="car_img">
+      <view class="fn-flex-item relative ml10">
         <block wx:if="{{car_img.value}}">
           <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
-            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1"></i>
-            <image class='block wp100 img-h-200 ulib-r10' src='{{car_img.img}}' mode='aspectFit'></image>
+            <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="chooseImg" data-type="car_img"></i>
+            <image class='block wp100 img-h-200 ulib-r10' src='{{car_img.img}}' mode='aspectFit' bindtap="previewImage" data-type="car_img"></image>
           </view>
         </block>
         <block wx:else>
-          <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+          <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="car_img">
             <view class="absolute left-0 right-0 box-middle color-ccc">
               <i class="iconfont icon-paizhao font-48"></i>
               <view class="mt10 font-22">上传行驶证</view>

pages/order/editOtherImg/index.js

@@ -69,26 +69,29 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
-                that.setData({
-                  'cardida.value':resp.data.data.url,
-                  'cardida.img':resp.data.data.full_url,
-                })
-
                 let params = {};
                 params['id'] = that.data.id;
                 params['cardida'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
+                  wx.hideLoading();
+                  that.setData({
+                    'cardida.value':resp.data.data.url,
+                    'cardida.img':resp.data.data.full_url,
+                  })
                 }).catch(res2=>{
+                  wx.hideLoading();
                   if(res2.code==418){
                     that.setData({
+                      'cardida.value':resp.data.data.url,
+                      'cardida.img':resp.data.data.full_url,
                       'cardida.err':!res2.data[0].caridA,
                       'cardida.errmsg':res2.data[0].errmsg,
                     })
                   }
                 });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -122,26 +125,29 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
-                that.setData({
-                  'cardidb.value':resp.data.data.url,
-                  'cardidb.img':resp.data.data.full_url,
-                })
-
                 let params = {};
                 params['id'] = that.data.id;
                 params['cardidb'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
+                  wx.hideLoading();
+                  that.setData({
+                    'cardidb.value':resp.data.data.url,
+                    'cardidb.img':resp.data.data.full_url,
+                  })
                 }).catch(res2=>{
+                  wx.hideLoading();
                   if(res2.code==418){
                     that.setData({
+                      'cardidb.value':resp.data.data.url,
+                      'cardidb.img':resp.data.data.full_url,
                       'cardidb.err':!res2.data[1].caridB,
                       'cardidb.errmsg':res2.data[1].errmsg,
                     })
                   }
                 });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -175,26 +181,29 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
-                that.setData({
-                  'business_licence.value':resp.data.data.url,
-                  'business_licence.img':resp.data.data.full_url,
-                })
-
                 let params = {};
                 params['id'] = that.data.id;
                 params['business_licence'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
-
+                  wx.hideLoading();
+                  that.setData({
+                    'business_licence.value':resp.data.data.url,
+                    'business_licence.img':resp.data.data.full_url,
+                  })
                 }).catch(res2=>{
+                  wx.hideLoading();
                   if(res2.code==418){
                     that.setData({
+                      'business_licence.value':resp.data.data.url,
+                      'business_licence.img':resp.data.data.full_url,
                       'business_licence.err':!res2.data[0].business_licence,
                       'business_licence.errmsg':res2.data[0].errmsg,
                     })
                   }
                 });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -228,17 +237,21 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
                 let params = {};
                 params['id'] = that.data.id;
                 params['register_img'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
                   that.setData({
                     'register_img.value':resp.data.data.url,
                     'register_img.img':resp.data.data.full_url,
                   })
-                })
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -272,17 +285,21 @@ Page({
             },
             success: (resp) => {
               resp.data = JSON.parse(resp.data);
-              wx.hideLoading();
               if (resp.data.code == 200) {
                 let params = {};
                 params['id'] = that.data.id;
                 params['car_img'] = resp.data.data.url;
                 _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
                   that.setData({
                     'car_img.value':resp.data.data.url,
                     'car_img.img':resp.data.data.full_url,
                   })
-                })
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
               }
             },
           })
@@ -308,6 +325,7 @@ Page({
             title: '上传中',
           })
           let ins_img=that.data.ins_img
+          let k = 0
           for (let i = 0; i < res1.tempFilePaths.length; i++) {
             //上传图片
             wx.uploadFile({
@@ -318,6 +336,7 @@ Page({
                 'app': 'liche'
               },
               success: (resp) => {
+                k = k + 1
                 resp.data = JSON.parse(resp.data);
                 if (resp.data.code == 200) {
                   let imgdata = resp.data
@@ -327,23 +346,25 @@ Page({
                     img:imgdata.data.full_url,
                   })
                   ins_img=ins_img.concat(list)
-                  if(i+1==res1.tempFilePaths.length){
-                    wx.hideLoading();
-                    setTimeout(function () {
-                      let params = {};
-                      params['id'] = that.data.id;
-                      let img = []
-                      ins_img.forEach(item => {
-                        img.push(item.value)
+                  if(k == res1.tempFilePaths.length){
+                    let params = {};
+                    params['id'] = that.data.id;
+                    let img = []
+                    ins_img.forEach(item => {
+                      img.push(item.value)
+                    })
+                    params['ins_imgs'] = img;
+                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                      wx.hideLoading();
+                      that.setData({
+                        ins_img,
                       })
-                      params['ins_imgs'] = img;
-                      _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                        that.setData({
-                          ins_img,
-                        })
-                      })
-                    }, 500);
+                    }).catch(res2=>{
+                      wx.hideLoading();
+                    });
                   }
+                }else{
+                  wx.hideLoading();
                 }
               },
         
@@ -372,6 +393,7 @@ Page({
             title: '上传中',
           })
           let other_img=that.data.other_img
+          let k = 0
           for (let i = 0; i < res1.tempFilePaths.length; i++) {
             //上传图片
             wx.uploadFile({
@@ -382,6 +404,7 @@ Page({
                 'app': 'liche'
               },
               success: (resp) => {
+                k = k + 1
                 resp.data = JSON.parse(resp.data);
                 if (resp.data.code == 200) {
                   let imgdata = resp.data
@@ -391,23 +414,25 @@ Page({
                     img:imgdata.data.full_url,
                   })
                   other_img=other_img.concat(list)
-                  if(i+1==res1.tempFilePaths.length){
-                    wx.hideLoading();
-                    setTimeout(function () {
-                      let params = {};
-                      params['id'] = that.data.id;
-                      let img = []
-                      other_img.forEach(item => {
-                        img.push(item.value)
+                  if(k == res1.tempFilePaths.length){
+                    let params = {};
+                    params['id'] = that.data.id;
+                    let img = []
+                    other_img.forEach(item => {
+                      img.push(item.value)
+                    })
+                    params['other_imgs'] = img;
+                    _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                      wx.hideLoading();
+                      that.setData({
+                        other_img,
                       })
-                      params['other_imgs'] = img;
-                      _.apiQuery.putAppCusorderdata(params).then(res2 => {
-                        that.setData({
-                          other_img,
-                        })
-                      })
-                    }, 500);
+                    }).catch(res2=>{
+                      wx.hideLoading();
+                    });
                   }
+                }else{
+                  wx.hideLoading();
                 }
               },
         
@@ -461,4 +486,18 @@ Page({
     }
   },
 
+  //查看图片
+  previewImage: function (e) {
+    if(e.currentTarget.dataset.type=='other_img'){
+      let img = []
+      this.data.imgInfo.imgs.other_img.forEach(item => {
+        img.push(item.img)
+      })
+      wx.previewImage({
+        current:e.currentTarget.dataset.current,
+        urls:img,
+      })
+    }
+  },
+
 })

pages/order/editOtherImg/index.wxml

@@ -7,7 +7,7 @@
         <block wx:for='{{other_img}}' wx:for-item='other_img' wx:key='index'>
           <view class="inline-block bg-f8 img-300x200 ml15 mr15 relative ulib-r10 overflowhidden">
             <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-guanbi1 inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="delImg" data-type="other_img" data-index="{{index}}" ></i>
-            <image class='block wp100 img-h-200 ulib-r10' src='{{other_img.img}}' mode='aspectFit'></image>
+            <image class='block wp100 img-h-200 ulib-r10' src='{{other_img.img}}' mode='aspectFit' bindtap="previewImage" data-type="other_img" data-current="{{other_img.img}}"></image>
           </view>
         </block>
         <block wx:if="{{other_img.length<1}}">

pages/order/editOwner/index.js

@@ -269,6 +269,8 @@ Page({
                     owner_cardidpic:resp.data.data.url,
                   })
                 })
+              }else{
+                wx.hideLoading();
               }
             },
             fail: res => {

pages/order/editQVImg/index.js

@@ -0,0 +1,152 @@
+import _ from '../../../commons/js/commons'
+const app = getApp()
+Page({
+  data: {
+    wx_img:{},
+    mut_wx_img:{},
+  },
+  onLoad: function (options) {
+    for (let key in options) {
+      this.setData({
+        [key]: options[key]
+      })
+    }
+
+    this.getAppCusorderdata()
+    
+  },
+  onShow: function () {
+
+  },
+
+  //获取订单图片
+  getAppCusorderdata(){
+    let params = {};
+    params['id'] = this.data.id;
+    _.apiQuery.getAppCusorderdata(params).then(res=>{
+      this.setData({
+        imgInfo:res.data,
+      })
+      if(res.data.img_status == 1){
+        this.setData({
+          wx_img:res.data.imgs.insurance_img.length==0?{}:res.data.imgs.wx_img,
+          mut_wx_img:res.data.imgs.insurance_img.length==0?{}:res.data.imgs.mut_wx_img,
+        })
+      }
+      wx.stopPullDownRefresh()
+    })
+  },
+
+  //选择图片
+  chooseImg(e) {
+    let that = this
+
+    //上传交强险
+    if(e.currentTarget.dataset.type=='wx_img'){
+      wx.chooseImage({
+        count: 1, // 默认9
+        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+        success(res) {
+          wx.showLoading({
+            title: '上传中',
+          })
+          wx.uploadFile({
+            url:_.config.api.upImg,
+            filePath:res.tempFilePaths[0],
+            name: 'img',
+            formData: {
+              'app': 'liche'
+            },
+            success: (resp) => {
+              resp.data = JSON.parse(resp.data);
+              if (resp.data.code == 200) {
+                let params = {};
+                params['id'] = that.data.id;
+                params['wx_img'] = resp.data.data.url;
+                _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
+                  that.getAppCusorderdata()
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
+              }
+            },
+          })
+        },
+        fail: res => {
+          wx.showToast({
+            title: '文件选择失败',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      })
+    }
+
+    //上传商业险
+    if(e.currentTarget.dataset.type=='mut_wx_img'){
+      wx.chooseImage({
+        count: 1, // 默认9
+        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+        success(res) {
+          wx.showLoading({
+            title: '上传中',
+          })
+          wx.uploadFile({
+            url:_.config.api.upImg,
+            filePath:res.tempFilePaths[0],
+            name: 'img',
+            formData: {
+              'app': 'liche'
+            },
+            success: (resp) => {
+              resp.data = JSON.parse(resp.data);
+              if (resp.data.code == 200) {
+                let params = {};
+                params['id'] = that.data.id;
+                params['mut_wx_img'] = resp.data.data.url;
+                _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
+                  that.getAppCusorderdata()
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
+              }
+            },
+          })
+        },
+        fail: res => {
+          wx.showToast({
+            title: '文件选择失败',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      })
+    }
+
+  },
+
+  //查看图片
+  previewImage: function (e) {
+    if(e.currentTarget.dataset.type=='wx_img'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.insurance_img.img,
+        urls:[this.data.imgInfo.imgs.insurance_img.img],
+      })
+    }
+    else if(e.currentTarget.dataset.type=='mut_wx_img'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.mut_wx_img.img,
+        urls:[this.data.imgInfo.imgs.mut_wx_img.img],
+      })
+    }
+  },
+
+})

pages/order/editQVImg/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "企微信息",
+  "usingComponents": {}
+}

pages/order/editQVImg/index.wxml

@@ -0,0 +1,51 @@
+<view class="container">
+  <view class="inner30">
+
+    <view class="pl40 pr40 pt40 relative ulib-r10 box-shadow-000-10-10 overflowhidden">
+
+      <view class="font-28 text-center text-bold">企业微信</view>
+      <view class="mt30 pb30 text-center">
+        <view class="inline-block img-300x200 relative ulib-r10 overflowhidden">
+          <block wx:if="{{wx_img.value}}">
+            <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+              <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="chooseImg" data-type="wx_img"></i>
+              <image class='block wp100 img-h-200 ulib-r10' src='{{wx_img.img}}' mode='aspectFit' bindtap="previewImage" data-type="wx_img"></image>
+            </view>
+          </block>
+          <block wx:else>
+            <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="wx_img">
+              <view class="absolute left-0 right-0 box-middle color-ccc">
+                <i class="iconfont icon-paizhao font-48"></i>
+                <view class="mt10 font-22">上传企业微信</view>
+              </view>
+            </view>
+          </block>
+        </view>
+      </view>
+
+    </view>
+
+    <view class="mt50 pl40 pr40 pt40 relative ulib-r10 box-shadow-000-10-10 overflowhidden">
+      <view class="font-28 text-center text-bold">多对一群</view>
+      <view class="mt30 pb30 text-center">
+        <view class="inline-block img-300x200 relative ulib-r10 overflowhidden">
+          <block wx:if="{{mut_wx_img.value}}">
+            <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+              <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="chooseImg" data-type="mut_wx_img"></i>
+              <image class='block wp100 img-h-200 ulib-r10' src='{{mut_wx_img.img}}' mode='aspectFit' bindtap="previewImage" data-type="mut_wx_img"></image>
+            </view>
+          </block>
+          <block wx:else>
+            <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="mut_wx_img">
+              <view class="absolute left-0 right-0 box-middle color-ccc">
+                <i class="iconfont icon-paizhao font-48"></i>
+                <view class="mt10 font-22">上传多对一群</view>
+              </view>
+            </view>
+          </block>
+        </view>
+      </view>
+    </view>
+
+  </view>
+</view>

pages/order/editQVImg/index.wxss

@@ -0,0 +1 @@
+/* pages/order/editQVImg/index.wxss */

pages/order/editVoucherImg/index.js

@@ -0,0 +1,98 @@
+import _ from '../../../commons/js/commons'
+const app = getApp()
+Page({
+  data: {
+    destory_img:{},
+  },
+  onLoad: function (options) {
+    for (let key in options) {
+      this.setData({
+        [key]: options[key]
+      })
+    }
+
+    this.getAppCusorderdata()
+    
+  },
+  onShow: function () {
+
+  },
+
+  //获取订单图片
+  getAppCusorderdata(){
+    let params = {};
+    params['id'] = this.data.id;
+    _.apiQuery.getAppCusorderdata(params).then(res=>{
+      this.setData({
+        imgInfo:res.data,
+      })
+      if(res.data.img_status == 1){
+        this.setData({
+          destory_img:res.data.imgs.destory_img.length==0?{}:res.data.imgs.destory_img,
+        })
+      }
+      wx.stopPullDownRefresh()
+    })
+  },
+
+  //选择图片
+  chooseImg(e) {
+    let that = this
+
+    //上传交强险
+    if(e.currentTarget.dataset.type=='destory_img'){
+      wx.chooseImage({
+        count: 1, // 默认9
+        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+        success(res) {
+          wx.showLoading({
+            title: '上传中',
+          })
+          wx.uploadFile({
+            url:_.config.api.upImg,
+            filePath:res.tempFilePaths[0],
+            name: 'img',
+            formData: {
+              'app': 'liche'
+            },
+            success: (resp) => {
+              resp.data = JSON.parse(resp.data);
+              if (resp.data.code == 200) {
+                let params = {};
+                params['id'] = that.data.id;
+                params['destory_img'] = resp.data.data.url;
+                _.apiQuery.putAppCusorderdata(params).then(res2 => {
+                  wx.hideLoading();
+                  that.getAppCusorderdata()
+                }).catch(res2=>{
+                  wx.hideLoading();
+                });
+              }else{
+                wx.hideLoading();
+              }
+            },
+          })
+        },
+        fail: res => {
+          wx.showToast({
+            title: '文件选择失败',
+            icon: 'none',
+            duration: 2000
+          })
+        }
+      })
+    }
+  },
+
+  //查看图片
+  previewImage: function (e) {
+    if(e.currentTarget.dataset.type=='destory_img'){
+      wx.previewImage({
+        current:this.data.imgInfo.imgs.destory_img.img,
+        urls:[this.data.imgInfo.imgs.destory_img.img],
+      })
+    }
+  },
+
+})

pages/order/editVoucherImg/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "实名认证资料",
+  "usingComponents": {}
+}

pages/order/editVoucherImg/index.wxml

@@ -0,0 +1,24 @@
+<view class="container">
+  <view class="inner30">
+    
+    <view class="mt30 pb20 text-center">
+      <view class="inline-block img-300x200 relative ulib-r10 overflowhidden">
+          <block wx:if="{{destory_img.value}}">
+            <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden">
+              <i class="absolute top-0 right-0 bg-000-op50 iconfont icon-shuaxin inner10 font-26 color-fff ulib-rtr10 ulib-rbl10 z-index-1" bindtap="chooseImg" data-type="destory_img"></i>
+              <image class='block wp100 img-h-200 ulib-r10' src='{{destory_img.img}}' mode='aspectFit' bindtap="previewImage" data-type="destory_img"></image>
+            </view>
+          </block>
+          <block wx:else>
+            <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="destory_img">
+              <view class="absolute left-0 right-0 box-middle color-ccc">
+                <i class="iconfont icon-paizhao font-48"></i>
+                <view class="mt10 font-22">上传实名认证资料</view>
+              </view>
+            </view>
+          </block>
+        </view>
+    </view>
+
+  </view>
+</view>

pages/order/editVoucherImg/index.wxss

@@ -0,0 +1 @@
+/* pages/order/editVoucherImg/index.wxss */

pages/order/filterList/index2.js

@@ -19,6 +19,9 @@ Page({
     staffobj: [],
     employeeIndex:-1,//分配销售索引
     employee_id:'',//分配销售ID
+
+    tab:[],//回访待跟进tab
+    visit_tab_id:'',//回访待跟进tabid
   },
   onLoad: function (options) {
     for (let key in options) {
@@ -26,7 +29,11 @@ Page({
         [key]: options[key]
       })
     }
-    this.getAppCusorderV2List()
+
+    //顶部tab
+    this.getAppCustomersVisit_tabs()
+
+    //this.getAppCusorderV2List()
 
     wx.setNavigationBarTitle({
       title: this.data.title||'订单'
@@ -36,6 +43,26 @@ Page({
     this.getAppUserAdmins()
   },
 
+  //回访待跟进tab
+  getAppCustomersVisit_tabs() {
+    let params = {};
+    if(this.data.status != ''){
+      params['status'] = this.data.status;
+    }
+    _.apiQuery.getAppCustomersVisit_tabs(params).then(res => {
+      if(res.data.list.length>0){
+        this.setData({
+          tab:res.data.list,
+          visit_tab_id:res.data.list[0].id,
+        })
+      }
+
+      this.getAppCusorderV2List()
+
+      wx.stopPullDownRefresh()
+    });
+  },
+
   //获取订单列表
   getAppCusorderV2List() {
     this.setData({
@@ -51,6 +78,9 @@ Page({
     if(this.data.type != ''){
       params['type'] = this.data.type;
     }
+    if(this.data.visit_tab_id != ''){
+      params['visit_tab_id'] = this.data.visit_tab_id;
+    }
     _.apiQuery.getAppCusorderV2List(params).then(res => {
       this.setData({
         pageNo: this.data.pageNo + 1,
@@ -230,6 +260,20 @@ Page({
     }
   },
 
+  //切换tab
+  changeTab(e){
+    this.setData({
+      list: [],
+      pageNo: 1,
+      noData: false,
+      end: false,
+      load: true,
+      loading: false,
+      visit_tab_id: e.currentTarget.dataset.id,
+    })
+    this.getAppCusorderV2List()
+  },
+
   //页面相关事件处理函数--监听用户下拉动作
   onPullDownRefresh(){
     this.setData({

pages/order/filterList/index2.wxml

@@ -1,6 +1,26 @@
 <view class="container">
 
-  <view class="mt30 pl30 pr30">
+  <view wx:if="{{tab.length>0}}">
+    <view style="padding-top:110rpx"></view>
+    <view class="fixed top-0 left-0 right-0 bg-fff pl30 pr30 z-index-1">
+      <view class="fn-flex mt5 pl20 pr20 font-32 color-666 text-center" wx:if="{{tab.length<5}}">
+        <block wx:for='{{tab}}' wx:key='list'>
+          <view class="fn-flex-item pl20 pr20 tabmenu2 {{visit_tab_id == item.id?'active color-36afa2':''}}" data-id="{{item.id}}" bindtap="changeTab">
+            <view class="relative">{{item.name}}</view>
+          </view>
+        </block>
+      </view>
+      <scroll-view class="mt5 font-32 color-666 text-center space-nowrap" scroll-x="true" wx:else>
+        <block wx:for='{{tab}}' wx:key='list'>
+          <view class="pl20 pr20 tabmenu2 {{visit_tab_id == item.id?'active color-36afa2':''}}" data-id="{{item.id}}" bindtap="changeTab" >
+            <view class="relative">{{item.name}}</view>
+          </view>
+        </block>
+      </scroll-view>
+    </view>
+  </view>
+
+  <view class="mt10 pl30 pr30">
 
     <block wx:for='{{list}}' wx:key='index'>
       <block wx:if="{{item.id>=v2OrderId}}">

pages/order/index.js

@@ -28,6 +28,13 @@ Page({
     staffobj: [],
     employeeIndex:-1,//分配销售索引
     employee_id:'',//分配销售ID
+
+    brand_id:'',//品牌id
+    car_id:'',//车系id
+    v_id:'',//车辆版本id
+    brandIndex:-1,//车辆品牌索引
+    modelIndex:-1,//车系车型索引
+    levelIndex:-1,//车辆版本索引
   },
   onLoad: function (options) {
     for (let key in options) {
@@ -40,6 +47,9 @@ Page({
     //销售顾问
     this.getAppUserAdmins()
 
+    //品牌列表
+    this.getAppSeriesBrands()
+
   },
 
   //订单-tab
@@ -81,6 +91,18 @@ Page({
       load: false,
       loading: true,
     })
+
+    let admin_ids = ''
+    this.data.staffobj.forEach(item => {
+      if(item.checked){
+        if(admin_ids==''){
+          admin_ids=item.id
+        }else{
+          admin_ids=admin_ids+','+item.id
+        }
+      }
+    })
+
     let params = {};
     params['page'] = this.data.pageNo;
     params['size'] = 10;
@@ -95,6 +117,18 @@ Page({
       params['order_s_time'] = this.data.order_s_time;
       params['order_e_time'] = this.data.order_e_time;
     }
+    if(admin_ids!=''){
+      params['admin_ids'] = admin_ids;
+    }
+    if(this.data.brand_id!=''){
+      params['brand_id'] = this.data.brand_id;
+    }
+    if(this.data.car_id!=''){
+      params['car_id'] = this.data.car_id;
+    }
+    if(this.data.v_id!=''){
+      params['v_id'] = this.data.v_id;
+    }
     _.apiQuery.getAppCusorderV2List(params).then(res => {
       this.setData({
         flag: this.data.flag - 1
@@ -179,7 +213,7 @@ Page({
     }
   },
 
-  //显示高级搜索
+  //显示隐藏高级搜索
   optfilter(){
     this.setData({
       isShowfilter: !this.data.isShowfilter
@@ -187,6 +221,13 @@ Page({
     this.resetFilter()
   },
 
+  //显示高级搜索
+  showfilter(){
+    this.setData({
+      isShowfilter:true,
+    })
+  },
+
   //确定高级搜索
   submitFilter() {
     this.setData({
@@ -197,7 +238,19 @@ Page({
 
   //重置高级搜索
   resetFilter() {
+    let staffobj = this.data.staffobj
+    staffobj.forEach(item => {
+      item.checked = false
+    })
+
     this.setData({
+      brand_id:'',
+      car_id:'',
+      v_id:'',
+      brandIndex:-1,
+      modelIndex:-1,
+      levelIndex:-1,
+      staffobj,
       type:'',
       order_s_time:'',
       order_e_time:'',
@@ -314,6 +367,104 @@ Page({
     }
   },
 
+  //多选
+  checkPicker(e){
+    this.setData({
+      ['staffobj['+e.currentTarget.dataset.index+'].checked']:!this.data.staffobj[e.currentTarget.dataset.index].checked,
+    })
+  },
+
+  //获取车型品牌
+  getAppSeriesBrands(){
+    _.apiQuery.getAppSeriesBrands().then(res => {
+      if(res.data.list.length>0){
+        let brandArray = []
+        res.data.list.forEach(item => {
+          brandArray.push(item.name)
+        })
+        this.setData({
+          brandArray:brandArray,
+          brandList:res.data.list,
+        })
+      }
+    });
+  },
+
+  //获取车系车型
+  getAppSeries(){
+    let params = {};
+    params['brand_id'] = this.data.brand_id;
+    _.apiQuery.getAppSeries(params).then(res => {
+      if(res.data.list.length>0){
+        let modelArray = []
+        res.data.list.forEach(item => {
+          modelArray.push(item.name)
+        })
+        this.setData({
+          modelArray:modelArray,
+          modelList:res.data.list,
+        })
+      }
+    });
+  },
+
+  //获取车辆版本
+  getAppSeriesAttrslevel(){
+    let params = {};
+    params['id'] = this.data.car_id;
+    params['type'] = 0;
+    _.apiQuery.getAppSeriesAttrs(params).then(res => {
+      if(res.data.total>0){
+        let levelArray = []
+        res.data.list.forEach(item => {
+          levelArray.push(item.title)
+        })
+        this.setData({
+          levelArray:levelArray,
+          levelList:res.data.list,
+        })
+      }
+    });
+  },
+
+  //选择品牌
+  changeBrand(e) {
+    if(this.data.brandIndex != e.detail.value && e.detail.value >= 0){
+      this.setData({
+        brand_id:this.data.brandList[e.detail.value].id,
+        brandIndex:e.detail.value,
+        car_id:'',//车系id
+        v_id:'',//车辆版本id
+        modelIndex:-1,
+        levelIndex:-1,
+      })
+      this.getAppSeries()
+    }
+  },
+
+  //选择车系
+  changeModel(e) {
+    if(this.data.modelIndex != e.detail.value && e.detail.value >= 0){
+      this.setData({
+        car_id:this.data.modelList[e.detail.value].id,
+        modelIndex:e.detail.value,
+        v_id:'',//车辆版本id
+        levelIndex:-1,
+      })
+      this.getAppSeriesAttrslevel()
+    }
+  },
+
+  //车辆版本
+  changeLevel(e) {
+    if(this.data.levelIndex != e.detail.value && e.detail.value >= 0){
+      this.setData({
+        v_id:this.data.levelList[e.detail.value].id,
+        levelIndex:e.detail.value,
+      })
+    }
+  },
+
   //页面相关事件处理函数--监听用户下拉动作
   onPullDownRefresh(){
     this.setData({

pages/order/index.wxml

@@ -25,7 +25,7 @@
           <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">
-          <text bindtap="optfilter" class="inner5 iconfont icon-gaojisousuo mr40"></text>
+          <text bindtap="showfilter" class="inner5 iconfont icon-gaojisousuo mr40"></text>
         </view>
       </view>
     </view>
@@ -38,6 +38,12 @@
       <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'>
+        <view class="inline-block text-middle bg-f6 color-666 mt15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{item.checked}}">{{item.uname}}</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="{{brandIndex != -1}}">{{brandArray[brandIndex]}}</view>
+      <view class="inline-block text-middle bg-f6 color-666 mt15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{modelIndex != -1}}">{{modelArray[modelIndex]}}</view>
+      <view class="inline-block text-middle bg-f6 color-666 mt15 ml5 mr5 pt5 pb5 pl20 pr20 ulib-r10 font-22" wx:if="{{levelIndex != -1}}">{{levelArray[levelIndex]}}</view>
     </view>
 
   </view>
@@ -171,6 +177,46 @@
           </block>
         </view>
       </view>
+      <view class="relative bbs-1-eb pt25 pb25 last-b-none">
+        <view class="font-22">销售顾问</view>
+        <view class="fn-clear">
+          <block wx:for="{{staffobj}}" wx:key='index'>
+            <view class="inline-block radio-btn mt20 mr15 pt15 pb15 pl20 pr20 ulib-r10 font-28 {{item.checked?'bg-333 color-fff':'bg-f8'}}" bindtap="checkPicker" data-index="{{index}}">
+              {{item.uname}}
+            </view>
+          </block>
+        </view>
+      </view>
+      <view class="relative bbs-1-eb pl190">
+        <view class="absolute left-0 box-middle font-28 color-333">车辆品牌</view>
+        <view class="pt30 pb30 text-right font-28 color-666">
+          <picker bindchange="changeBrand" value="{{brandIndex}}" range="{{brandArray}}">
+            <text class="color-ccc" wx:if="{{brandIndex == -1}}">请选择</text>
+            <text wx:else>{{brandArray[brandIndex]}}</text>
+            <i class="iconfont ml5 icon-gengduo"></i>
+          </picker>
+        </view>
+      </view>
+      <view class="relative bbs-1-eb pl190" wx:if="{{brandIndex != -1}}">
+        <view class="absolute left-0 box-middle font-28 color-333">车系车型</view>
+        <view class="pt30 pb30 text-right font-28 color-666">
+          <picker bindchange="changeModel" value="{{modelIndex}}" range="{{modelArray}}">
+            <text class="color-ccc" wx:if="{{modelIndex == -1}}">请选择</text>
+            <text wx:else>{{modelArray[modelIndex]}}</text>
+            <i class="iconfont ml5 icon-gengduo"></i>
+          </picker>
+        </view>
+      </view>
+      <view class="relative bbs-1-eb pl190" wx:if="{{modelIndex != -1}}">
+        <view class="absolute left-0 box-middle font-28 color-333">车辆版本</view>
+        <view class="pt30 pb30 text-right font-28 color-666 text-nowrap">
+          <picker bindchange="changeLevel" value="{{levelIndex}}" range="{{levelArray}}">
+            <text class="color-ccc" wx:if="{{levelIndex == -1}}">请选择</text>
+            <text wx:else>{{levelArray[levelIndex]}}</text>
+            <i class="iconfont ml5 icon-gengduo"></i>
+          </picker>
+        </view>
+      </view>
     </view>
     <view class="pt50 pb100"></view>
   </scroll-view>

pages/storeData/customerData/index.js

@@ -67,13 +67,13 @@ Page({
       })
     }
 
-    popularData.getDateLater(0,0).then(res => {
-      this.setData({
-        s_date:res[0],
-        e_date:res[1],
-        current_date:res[1],
-      })
-    })
+    // popularData.getDateLater(0,0).then(res => {
+    //   this.setData({
+    //     s_date:res[0],
+    //     e_date:res[1],
+    //     current_date:res[1],
+    //   })
+    // })
 
     this.getAppBizStats_customer()
     
@@ -159,143 +159,161 @@ Page({
         title: res.data.title
       })
 
-      // Pie1ChartData = getPie1Option()
-      Pie1ChartData = {
-        tooltip: {
-          trigger: 'item',
-          formatter: '{b}: {c} ({d}%)'
-        },
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            selectedMode: 'single',
-            radius: [0, '30%'],
-            label: {
-              position: 'inner',
-              fontSize: 10
-            },
-            labelBar: {
-              show: false
-            },
-            data: []
-          },
-          {
-            name: 'Access From',
-            type: 'pie',
-            radius: ['45%', '65%'],
-            labelLine: {
-              fontSize:5,
-              length:10
-            },
-            label: {
-              formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
-              backgroundColor: '#F6F8FC',
-              borderColor: '#8C8D8E',
-              borderWidth: 1,
-              borderRadius: 4,
-              rich: {
-                hr: {
-                  borderColor: '#8C8D8E',
-                  width: '100%',
-                  borderWidth: 1,
-                  height: 0
-                },
-                b: {
-                  color: '#4C5058',
-                  fontSize:10,
-                  lineHeight:20,
-                  align: 'center',
-                },
-                c: {
-                  color: '#4C5058',
-                  fontSize:8,
-                  lineHeight:20,
-                  align: 'center',
-                },
-              }
-            },
-            data: []
-          },
-        ]
-      };
-      
-      Pie1ChartData.series[0].data = res.data.pie1.series_data_1
-      Pie1ChartData.series[1].data = res.data.pie1.series_data_2
       this.setData({
         Pie1title:res.data.pie1.title,
-        showPie1Chart:true,
-        ['ecPie1.onInit']:Pie1Chart,
+        Pie2title:res.data.pie2.title,
+        Bartitle:res.data.bar.title,
       })
 
+      // Pie1ChartData = getPie1Option()
+      if(res.data.pie1.series_data_1.length==0){
+        this.setData({
+          pie1noData:true,
+        })
+      }else{
+        Pie1ChartData = {
+          tooltip: {
+            trigger: 'item',
+            formatter: '{b}: {c} ({d}%)'
+          },
+          series: [
+            {
+              name: 'Access From',
+              type: 'pie',
+              selectedMode: 'single',
+              radius: [0, '30%'],
+              label: {
+                position: 'inner',
+                fontSize: 10
+              },
+              labelBar: {
+                show: false
+              },
+              data: []
+            },
+            {
+              name: 'Access From',
+              type: 'pie',
+              radius: ['45%', '65%'],
+              labelLine: {
+                fontSize:5,
+                length:10
+              },
+              label: {
+                formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
+                backgroundColor: '#F6F8FC',
+                borderColor: '#8C8D8E',
+                borderWidth: 1,
+                borderRadius: 4,
+                rich: {
+                  hr: {
+                    borderColor: '#8C8D8E',
+                    width: '100%',
+                    borderWidth: 1,
+                    height: 0
+                  },
+                  b: {
+                    color: '#4C5058',
+                    fontSize:10,
+                    lineHeight:20,
+                    align: 'center',
+                  },
+                  c: {
+                    color: '#4C5058',
+                    fontSize:8,
+                    lineHeight:20,
+                    align: 'center',
+                  },
+                }
+              },
+              data: []
+            },
+          ]
+        };
+        
+        Pie1ChartData.series[0].data = res.data.pie1.series_data_1
+        Pie1ChartData.series[1].data = res.data.pie1.series_data_2
+        this.setData({
+          pie1noData:false,
+          showPie1Chart:true,
+          ['ecPie1.onInit']:Pie1Chart,
+        })
+      }
+
       // Pie2ChartData = getPie2Option()
-      Pie2ChartData = {
-        tooltip: {
-          trigger: 'item',
-          formatter: '{b}: {c} ({d}%)'
-        },
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            selectedMode: 'single',
-            radius: [0, '30%'],
-            label: {
-              position: 'inner',
-              fontSize: 10
-            },
-            labelBar: {
-              show: false
-            },
-            data: []
+      if(res.data.pie2.series_data_1.length==0){
+        this.setData({
+          pie2noData:true,
+        })
+      }else{
+        Pie2ChartData = {
+          tooltip: {
+            trigger: 'item',
+            formatter: '{b}: {c} ({d}%)'
           },
-          {
-            name: 'Access From',
-            type: 'pie',
-            radius: ['45%', '65%'],
-            labelLine: {
-              fontSize:5,
-              length:10
+          series: [
+            {
+              name: 'Access From',
+              type: 'pie',
+              selectedMode: 'single',
+              radius: [0, '30%'],
+              label: {
+                position: 'inner',
+                fontSize: 10
+              },
+              labelBar: {
+                show: false
+              },
+              data: []
             },
-            label: {
-              formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
-              backgroundColor: '#F6F8FC',
-              borderColor: '#8C8D8E',
-              borderWidth: 1,
-              borderRadius: 4,
-              rich: {
-                hr: {
-                  borderColor: '#8C8D8E',
-                  width: '100%',
-                  borderWidth: 1,
-                  height: 0
-                },
-                b: {
-                  color: '#4C5058',
-                  fontSize:10,
-                  lineHeight:20,
-                  align: 'center',
-                },
-                c: {
-                  color: '#4C5058',
-                  fontSize:8,
-                  lineHeight:20,
-                  align: 'center',
-                },
-              }
+            {
+              name: 'Access From',
+              type: 'pie',
+              radius: ['45%', '65%'],
+              labelLine: {
+                fontSize:5,
+                length:10
+              },
+              label: {
+                formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
+                backgroundColor: '#F6F8FC',
+                borderColor: '#8C8D8E',
+                borderWidth: 1,
+                borderRadius: 4,
+                rich: {
+                  hr: {
+                    borderColor: '#8C8D8E',
+                    width: '100%',
+                    borderWidth: 1,
+                    height: 0
+                  },
+                  b: {
+                    color: '#4C5058',
+                    fontSize:10,
+                    lineHeight:20,
+                    align: 'center',
+                  },
+                  c: {
+                    color: '#4C5058',
+                    fontSize:8,
+                    lineHeight:20,
+                    align: 'center',
+                  },
+                }
+              },
+              data: []
             },
-            data: []
-          },
-        ]
-      };
-      
-      Pie2ChartData.series[0].data = res.data.pie2.series_data_1
-      Pie2ChartData.series[1].data = res.data.pie2.series_data_2
-      this.setData({
-        Pie2title:res.data.pie2.title,
-        showPie2Chart:true,
-        ['ecPie2.onInit']:Pie2Chart,
-      })
+          ]
+        };
+        
+        Pie2ChartData.series[0].data = res.data.pie2.series_data_1
+        Pie2ChartData.series[1].data = res.data.pie2.series_data_2
+        this.setData({
+          pie2noData:false,
+          showPie2Chart:true,
+          ['ecPie2.onInit']:Pie2Chart,
+        })
+      }
 
       //BarChartData = getBarOption()
       BarChartData = {
@@ -306,17 +324,18 @@ Page({
           }
         },
         xAxis: {
-          type: 'category',
+          type: 'value',
           data: []
         },
         yAxis: {
-          type: 'value'
+          type: 'category',
+          data: []
         },
         grid: {
-          top: '5%',
+          top: '1%',
           left: '2%',
           right: '5%',
-          bottom: '3%',
+          bottom: '1%',
           containLabel: true
         },
         series: [
@@ -329,10 +348,10 @@ Page({
         ]
       };
       
-      BarChartData.xAxis.data = res.data.bar.xAxis_data
+      BarChartData.yAxis.data = res.data.bar.xAxis_data
       BarChartData.series[0].data = res.data.bar.series_data
       this.setData({
-        Bartitle:res.data.bar.title,
+        Barheight:100 + 50*(res.data.bar.xAxis_data.length),
         showBarChart:true,
         ['ecBar.onInit']:BarChart,
       })
@@ -509,11 +528,12 @@ function getBarOption() {
       }
     },
     xAxis: {
-      type: 'category',
-      data: ['张三', '李四', '王五', '赵六', '孙七', '周八', '吴九','郑十']
+      type: 'value',
+      data: []
     },
     yAxis: {
-      type: 'value'
+      type: 'category',
+      data: ['张三', '李四', '王五', '赵六', '孙七', '周八', '吴九','郑十']
     },
     grid: {
       top: '5%',

pages/storeData/customerData/index.wxml

@@ -22,7 +22,8 @@
       <view class="relative">
         <view class="font-36">{{Pie1title}}</view>
       </view>
-      <view class="mt50 mb20 relative height-400 z-index-0">
+      <lcb-listmore isNoData='{{pie1noData}}' noDataMsg='暂无数据'></lcb-listmore>
+      <view class="mt50 mb20 relative height-400 z-index-0" wx:if="{{!pie1noData}}">
       <view class="absolute wp100 height-400"  wx:if="{{showPie1Chart}}">
         <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecPie1 }}"></ec-canvas>
       </view>
@@ -35,7 +36,8 @@
       <view class="relative">
         <view class="font-36">{{Pie2title}}</view>
       </view>
-      <view class="mt50 mb20 relative height-400 z-index-0">
+      <lcb-listmore isNoData='{{pie2noData}}' noDataMsg='暂无数据'></lcb-listmore>
+      <view class="mt50 mb20 relative height-400 z-index-0" wx:if="{{!pie2noData}}">
       <view class="absolute wp100 height-400"  wx:if="{{showPie2Chart}}">
         <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecPie2 }}"></ec-canvas>
       </view>
@@ -48,8 +50,8 @@
       <view class="relative">
         <view class="font-36">{{Bartitle}}</view>
       </view>
-      <view class="mt50 mb20 relative height-500 z-index-0">
-      <view class="absolute wp100 height-500"  wx:if="{{showBarChart}}">
+      <view class="mt50 mb20 relative z-index-0" style="height:{{Barheight}}rpx;">
+      <view class="absolute wp100" style="height:{{Barheight}}rpx;" wx:if="{{showBarChart}}">
         <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecBar }}"></ec-canvas>
       </view>
       </view>

pages/storeData/index.js

@@ -36,7 +36,9 @@ Page({
     showLineChart:false,//是否显示Line图表
     ecLine:{},
     daysIndex:0,
-    daysArray:['近7日','近30日'],
+    daysArray:['近一周','近30日'],
+    isShowTip:false,
+    tipIndex:0,
   },
 
   onLoad: function (options) {
@@ -47,15 +49,17 @@ Page({
     }
 
     popularData.getDateLater(0,0).then(res => {
+      let s_date = res[0]
+      s_date= s_date.split('-')[0]+'-'+s_date.split('-')[1]+'-01'
       this.setData({
-        s_date:res[0],
+        s_date,
         e_date:res[1],
         current_date:res[1],
       })
-    })
 
-    this.getAppBizStats()
-    this.getAppBizStats_days()
+      this.getAppBizStats()
+      this.getAppBizStats_days()
+    })
     
   },
 
@@ -122,7 +126,7 @@ Page({
     
   },
 
-  //门店数据-漏斗
+  //数据看板-漏斗
   getAppBizStats(){
     this.setData({
       showFunnelChart:false,
@@ -141,7 +145,7 @@ Page({
         tabs:res.data.tabs,
       })
 
-      // FunnelChartData = getFunnelOption()
+      //FunnelChartData = getFunnelOption()
       FunnelChartData = {
         series: [
           {
@@ -150,7 +154,7 @@ Page({
             top: '1%',
             bottom:'5%',
             left: '2%',
-            width: '80%',
+            width: '72%',
             label: {
               position: 'right',
               formatter: '{b}'
@@ -168,9 +172,9 @@ Page({
             type: 'funnel',
             top:'1%',
             bottom:'5%',
-            left: '2%',
-            width: '80%',
-            maxSize: '80%',
+            left: '7%',
+            width: '62%',
+            maxSize: '62%',
             label: {
               position: 'inside',
               formatter: '{c}',
@@ -213,7 +217,7 @@ Page({
     params['days'] = this.data.daysIndex == 0?'7':'30';
     _.apiQuery.getAppBizStats_days(params).then(res => {
 
-      // lineChartData = getLineOption()
+      //lineChartData = getLineOption()
       lineChartData = {
         tooltip: {
             trigger: 'axis'
@@ -263,6 +267,19 @@ Page({
     this.getAppBizStats_days()
   },
 
+  //显示隐藏提示
+  optShowTip(e) {
+    this.setData({
+      isShowTip:!this.data.isShowTip,
+    })
+    if(e.currentTarget.dataset.index){
+      this.setData({
+        tipIndex:e.currentTarget.dataset.index
+      })
+    }
+  },
+
+
   //推送链接
   pushLink(e) {
     if(e.currentTarget.dataset.url){
@@ -291,7 +308,7 @@ function getFunnelOption() {
         top: '1%',
         bottom:'5%',
         left: '2%',
-        width: '80%',
+        width: '72%',
         label: {
           position: 'right',
           formatter: '{b}'
@@ -305,7 +322,7 @@ function getFunnelOption() {
         data: [
           { value: 33.3, name: '成交数(10%)' },
           { value: 66.6, name: '到店数(25%)' },
-          { value: 100, name: '客户量' }
+          { value: 100, name: '客户数(100%)' }
         ]
       },
       {
@@ -313,9 +330,9 @@ function getFunnelOption() {
         type: 'funnel',
         top:'1%',
         bottom:'5%',
-        left: '2%',
-        width: '80%',
-        maxSize: '80%',
+        left: '7%',
+        width: '62%',
+        maxSize: '62%',
         label: {
           position: 'inside',
           formatter: '{c}',
@@ -351,7 +368,7 @@ function getLineOption() {
     },
     legend: {
       top: 'bottom',
-      data: ['近七日客户数', '近七日订单数',]
+      data: ['客户数', '订单数',]
     },
     grid: {
       top: '3%',
@@ -370,17 +387,17 @@ function getLineOption() {
     },
     series: [
         {
-            name: '近七日客户数',
+            name: '客户数',
             type: 'line',
-            stack: '总量',
+            //stack: '总量',//累加
             data: [20, 30, 50, 60, 66, 70, 73, ],
             smooth: true,
         },
         {
-            name: '近七日订单数',
+            name: '订单数',
             type: 'line',
-            stack: '总量',
-            data: [10, 15, 22,25, 26, 30, 35,],
+            //stack: '总量',//累加
+            data: [10, 10, 10,1, 1, 1, 1,],
             smooth: true,
         },
     ]

pages/storeData/index.wxml

@@ -17,15 +17,18 @@
     </view>
   </view>
 
-  <view class="mb40 pl30 pr30 fn-flex text-center color-fff">
+  <view class="mt10 mb40 pl30 pr30 fn-flex text-center color-fff">
     <block wx:for='{{tabs}}' wx:key='index'>
-      <view class="fn-flex-item" bindtap="pushLink" data-url="{{item.url}}">
+      <view class="fn-flex-item">
         <view class="inline-block text-left">
-          <view>
-            <text class="font-40">{{item.value_1}}</text>
-            <text class="font-28">{{item.value_2}}</text>
+          <view bindtap="optShowTip" data-index="{{index}}">
+            <view class="inline-block relative">
+              <text class="font-40">{{item.value_1}}</text>
+              <text class="font-28">{{item.value_2}}</text>
+              <i class="absolute font-24 iconfont icon-ziyuan" style="top:-10rpx;right:-20rpx;"></i>
+            </view>
           </view>
-          <view class="font-22">
+          <view class="pt10 font-22" bindtap="pushLink" data-url="{{item.url}}?s_date={{s_date}}&e_date={{e_date}}&current_date={{current_date}}">
             <text>{{item.title}}</text>
             <i class="iconfont ml5 icon-gengduo"></i>
           </view>
@@ -61,7 +64,6 @@
         <view class="font-36">{{linetitle}}</view>
         <picker class="absolute right-0 box-middle" bindchange="changeDays" value="{{daysIndex}}" range="{{daysArray}}">
           <view class="pt10 pb10 pl20 pr20 bg-f6 ulib-r10 font-22">
-            <text>厦门</text>
             <text>{{daysArray[daysIndex]}}</text>
             <i class="iconfont ml10 icon-xiala color-999"></i>
           </view>
@@ -76,4 +78,19 @@
   </view>
   
 </view>
-<lcb-footer></lcb-footer>
+<lcb-footer></lcb-footer>
+
+<lcb-msg isShow="{{isShowTip}}">
+	<view slot="content">
+		<view class="inner40 pt50 pb50 line-height-18 font-26 color-666" style="width:520rpx;">
+      <view class="text-center">
+        <text wx:if="{{tipIndex==0}}">发生在时间周期内的\n  [客户建档] / [进店客户]</text>
+        <text wx:elif="{{tipIndex==1}}">发生在时间周期内的\n [企微添加好友] / [企微好友完善手机号码]</text>
+        <text wx:elif="{{tipIndex==2}}">发生在时间周期内的\n [下定订单] / [退款订单]</text>
+      </view>
+    </view>
+    <view class="bts-1-eb text-center font-32 color-666">
+      <view class="pt25 pb25 color-36afa2" bindtap="optShowTip">知道了</view>
+    </view>
+	</view>
+</lcb-msg>

pages/storeData/orderData/index.js

@@ -44,7 +44,7 @@ function Pie2Chart(canvas, width, height, dpr) {
   let option = Pie2ChartData
   chart.setOption(option);
   chart.on('click',function(e){
-    _.eventBus.emit("pinpai",e.name)
+    //_.eventBus.emit("pinpai",e.name)
   });
   return chart;
 }
@@ -67,104 +67,104 @@ Page({
       })
     }
 
-    popularData.getDateLater(0,0).then(res => {
-      this.setData({
-        s_date:res[0],
-        e_date:res[1],
-        current_date:res[1],
-      })
-    })
+    // popularData.getDateLater(0,0).then(res => {
+    //   this.setData({
+    //     s_date:res[0],
+    //     e_date:res[1],
+    //     current_date:res[1],
+    //   })
+    // })
 
     this.getAppBizStats_order()
 
-    //消息通讯 是否显示授权用户信息按钮
-    _.eventBus.on("pinpai", this, function(res){
-      this.setData({
-        showPie2Chart:false,
-      })
+    // //消息通讯 是否显示授权用户信息按钮
+    // _.eventBus.on("pinpai", this, function(res){
+    //   this.setData({
+    //     showPie2Chart:false,
+    //   })
 
-      Pie2ChartData = {
-        tooltip: {
-          fontSize:10,
-          trigger: 'item',
-          formatter: '{b}: {c} ({d}%)'
-        },
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            selectedMode: 'single',
-            radius: [0, '30%'],
-            label: {
-              position: 'inner',
-              fontSize: 10
-            },
-            labelLine: {
-              show: false
-            },
-            data: []
-          },
-          {
-            name: 'Access From',
-            type: 'pie',
-            radius: ['45%', '65%'],
-            labelLine: {
-              fontSize:5,
-              length:10
-            },
-            label: {
-              formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
-              backgroundColor: '#F6F8FC',
-              borderColor: '#8C8D8E',
-              borderWidth: 1,
-              borderRadius: 4,
-              rich: {
-                hr: {
-                  borderColor: '#8C8D8E',
-                  width: '100%',
-                  borderWidth: 1,
-                  height: 0
-                },
-                b: {
-                  color: '#4C5058',
-                  fontSize:10,
-                  lineHeight:20,
-                  align: 'center',
-                },
-                c: {
-                  color: '#4C5058',
-                  fontSize:8,
-                  lineHeight:20,
-                  align: 'center',
-                },
-              }
-            },
-            data: []
-          },
-        ]
-      };
+    //   Pie2ChartData = {
+    //     tooltip: {
+    //       fontSize:10,
+    //       trigger: 'item',
+    //       formatter: '{b}: {c} ({d}%)'
+    //     },
+    //     series: [
+    //       {
+    //         name: 'Access From',
+    //         type: 'pie',
+    //         selectedMode: 'single',
+    //         radius: [0, '30%'],
+    //         label: {
+    //           position: 'inner',
+    //           fontSize: 10
+    //         },
+    //         labelLine: {
+    //           show: false
+    //         },
+    //         data: []
+    //       },
+    //       {
+    //         name: 'Access From',
+    //         type: 'pie',
+    //         radius: ['45%', '65%'],
+    //         labelLine: {
+    //           fontSize:5,
+    //           length:10
+    //         },
+    //         label: {
+    //           formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
+    //           backgroundColor: '#F6F8FC',
+    //           borderColor: '#8C8D8E',
+    //           borderWidth: 1,
+    //           borderRadius: 4,
+    //           rich: {
+    //             hr: {
+    //               borderColor: '#8C8D8E',
+    //               width: '100%',
+    //               borderWidth: 1,
+    //               height: 0
+    //             },
+    //             b: {
+    //               color: '#4C5058',
+    //               fontSize:10,
+    //               lineHeight:20,
+    //               align: 'center',
+    //             },
+    //             c: {
+    //               color: '#4C5058',
+    //               fontSize:8,
+    //               lineHeight:20,
+    //               align: 'center',
+    //             },
+    //           }
+    //         },
+    //         data: []
+    //       },
+    //     ]
+    //   };
       
-      Pie2ChartData.series[0].data = this.data.pie2.series_data
-      if(res == '成交数'){
-        Pie2ChartData.series[1].data = this.data.pie2.series_data_1
-      }
-      else if(res == '退定数'){
-        Pie2ChartData.series[1].data = this.data.pie2.series_data_2
-      }
+    //   Pie2ChartData.series[0].data = this.data.pie2.series_data
+    //   if(res == '成交'){
+    //     Pie2ChartData.series[1].data = this.data.pie2.series_data_1
+    //   }
+    //   else if(res == '退定'){
+    //     Pie2ChartData.series[1].data = this.data.pie2.series_data_2
+    //   }
 
-      this.setData({
-        showPie2Chart:true,
-        ['ecPie2.onInit']:Pie2Chart,
-      })
-    })
+    //   this.setData({
+    //     showPie2Chart:true,
+    //     ['ecPie2.onInit']:Pie2Chart,
+    //   })
+    // })
     
   },
 
-  //生命周期函数--监听页面卸载
-  onUnload: function () {
-    //卸载消息通讯 是否显示授权用户信息
-    _.eventBus.remove('pinpai',this);
-  },
+  // //生命周期函数--监听页面卸载
+  // onUnload: function () {
+  //   //卸载消息通讯 是否显示授权用户信息
+  //   _.eventBus.remove('pinpai',this);
+  // },
 
 
   //选择日期
@@ -247,137 +247,154 @@ Page({
         title: res.data.title
       })
 
-      // Pie1ChartData = getPie1Option()
-      Pie1ChartData = {
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            bottom:'10%',
-            radius: ['40%', '70%'],
-            avoidLabelOverlap: false,
-            itemStyle: {
-              borderRadius: 10,
-              borderColor: '#fff',
-              borderWidth: 2
-            },
-            label: {
-              show: false,
-              position: 'center'
-            },
-            labelLine: {
-              fontSize:5,
-              length:10
-            },
-            label: {
-              formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
-              backgroundColor: '#F6F8FC',
-              borderColor: '#8C8D8E',
-              borderWidth: 1,
-              borderRadius: 4,
-              rich: {
-                hr: {
-                  borderColor: '#8C8D8E',
-                  width: '100%',
-                  borderWidth: 1,
-                  height: 0
-                },
-                b: {
-                  color: '#4C5058',
-                  fontSize:10,
-                  lineHeight:20,
-                  align: 'center',
-                },
-                c: {
-                  color: '#4C5058',
-                  fontSize:8,
-                  lineHeight:20,
-                  align: 'center',
-                },
-              }
-            },
-            data: []
-          }
-        ]
-      };
-      
-      Pie1ChartData.series[0].data = res.data.pie1.series_data
       this.setData({
         Pie1title:res.data.pie1.title,
-        showPie1Chart:true,
-        ['ecPie1.onInit']:Pie1Chart,
+        Pie2title:res.data.pie2.title,
+        Bartitle:res.data.bar.title,
       })
+      // Pie1ChartData = getPie1Option()
+      if(res.data.pie1.series_data.length==0){
+        this.setData({
+          pie1noData:true,
+        })
+      }else{
+        Pie1ChartData = {
+          tooltip: {
+            trigger: 'item',
+            formatter: '{b}: {c} ({d}%)'
+          },
+          series: [
+            {
+              name: 'Access From',
+              type: 'pie',
+              bottom:'15%',
+              radius: ['40%', '70%'],
+              avoidLabelOverlap: false,
+              itemStyle: {
+                borderRadius: 10,
+                borderColor: '#fff',
+                borderWidth: 2
+              },
+              label: {
+                show: false,
+                position: 'center'
+              },
+              labelLine: {
+                fontSize:5,
+                length:10
+              },
+              label: {
+                formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
+                backgroundColor: '#F6F8FC',
+                borderColor: '#8C8D8E',
+                borderWidth: 1,
+                borderRadius: 4,
+                rich: {
+                  hr: {
+                    borderColor: '#8C8D8E',
+                    width: '100%',
+                    borderWidth: 1,
+                    height: 0
+                  },
+                  b: {
+                    color: '#4C5058',
+                    fontSize:10,
+                    lineHeight:20,
+                    align: 'center',
+                  },
+                  c: {
+                    color: '#4C5058',
+                    fontSize:8,
+                    lineHeight:20,
+                    align: 'center',
+                  },
+                }
+              },
+              data: []
+            }
+          ]
+        };
+        
+        Pie1ChartData.series[0].data = res.data.pie1.series_data
+        this.setData({
+          pie1noData:false,
+          showPie1Chart:true,
+          ['ecPie1.onInit']:Pie1Chart,
+          pie1Bottom:res.data.pie1.bottom,
+        })
+      }
 
       // Pie2ChartData = getPie2Option()
-      Pie2ChartData = {
-        tooltip: {
-          fontSize:10,
-          trigger: 'item',
-          formatter: '{b}: {c} ({d}%)'
-        },
-        series: [
-          {
-            name: 'Access From',
-            type: 'pie',
-            selectedMode: 'single',
-            radius: [0, '30%'],
-            label: {
-              position: 'inner',
-              fontSize: 10
-            },
-            labelLine: {
-              show: false
-            },
-            data: []
+      if(res.data.pie2.series_data.length==0){
+        this.setData({
+          pie2noData:true,
+        })
+      }else{
+        Pie2ChartData = {
+          tooltip: {
+            trigger: 'item',
+            formatter: '{b}: {c} ({d}%)'
           },
-          {
-            name: 'Access From',
-            type: 'pie',
-            radius: ['45%', '65%'],
-            labelLine: {
-              fontSize:5,
-              length:10
-            },
-            label: {
-              formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
-              backgroundColor: '#F6F8FC',
-              borderColor: '#8C8D8E',
-              borderWidth: 1,
-              borderRadius: 4,
-              rich: {
-                hr: {
-                  borderColor: '#8C8D8E',
-                  width: '100%',
-                  borderWidth: 1,
-                  height: 0
-                },
-                b: {
-                  color: '#4C5058',
-                  fontSize:10,
-                  lineHeight:20,
-                  align: 'center',
-                },
-                c: {
-                  color: '#4C5058',
-                  fontSize:8,
-                  lineHeight:20,
-                  align: 'center',
-                },
-              }
-            },
-            data: []
-          },
-        ]
-      };
-      
-      Pie2ChartData.series[0].data = res.data.pie2.series_data
-      Pie2ChartData.series[1].data = res.data.pie2.series_data_1
-      this.setData({
-        Pie2title:res.data.pie2.title,
-        showPie2Chart:true,
-        ['ecPie2.onInit']:Pie2Chart,
-        pie2:res.data.pie2,
-      })
+          series: [
+            {
+              name: 'Access From',
+              type: 'pie',
+              bottom:'15%',
+              radius: ['40%', '70%'],
+              avoidLabelOverlap: false,
+              itemStyle: {
+                borderRadius: 10,
+                borderColor: '#fff',
+                borderWidth: 2
+              },
+              label: {
+                show: false,
+                position: 'center'
+              },
+              labelLine: {
+                fontSize:5,
+                length:10
+              },
+              label: {
+                formatter: '{b|  {b}  }{abg|}\n{hr|}\n{c|  {c}({d}%)  }',
+                backgroundColor: '#F6F8FC',
+                borderColor: '#8C8D8E',
+                borderWidth: 1,
+                borderRadius: 4,
+                rich: {
+                  hr: {
+                    borderColor: '#8C8D8E',
+                    width: '100%',
+                    borderWidth: 1,
+                    height: 0
+                  },
+                  b: {
+                    color: '#4C5058',
+                    fontSize:10,
+                    lineHeight:20,
+                    align: 'center',
+                  },
+                  c: {
+                    color: '#4C5058',
+                    fontSize:8,
+                    lineHeight:20,
+                    align: 'center',
+                  },
+                }
+              },
+              data: []
+            }
+          ]
+        };
+        Pie2ChartData.series[0].data = res.data.pie2.series_data_1
+        this.setData({
+          pie2noData:false,
+          showPie2Chart:true,
+          ['ecPie2.onInit']:Pie2Chart,
+          pie2Bottom:res.data.pie2.bottom,
+          //pie2:res.data.pie2,
+        })
+      }
 
       //BarChartData = getBarOption()
       BarChartData = {
@@ -385,31 +402,28 @@ Page({
           trigger: 'axis'
         },
         grid: {
-          top: '8%',
+          top: '1%',
           left: '5%',
           right: '5%',
-          bottom: '5%',
+          bottom: '1%',
           containLabel: true
         },
         calculable: true,
-        xAxis: [
-          {
-            type: 'category',
-            data: []
-          }
-        ],
-        yAxis: [
-          {
-            type: 'value'
-          }
-        ],
+        xAxis: {
+          type: 'value',
+          data: []
+        },
+        yAxis: {
+          type: 'category',
+          data: []
+        },
         series: []
       };
       
-      BarChartData.xAxis.data = res.data.bar.xAxis_data
+      BarChartData.yAxis.data = res.data.bar.xAxis_data
       BarChartData.series = res.data.bar.series
       this.setData({
-        Bartitle:res.data.bar.title,
+        Barheight:100 + 100*(res.data.bar.xAxis_data.length),
         showBarChart:true,
         ['ecBar.onInit']:BarChart,
       })
@@ -518,8 +532,8 @@ function getPie2Option() {
           show: false
         },
         data: [
-          { value: 258, name:'成交数',selected:true},
-          { value: 77, name: '退定数' },
+          { value: 258, name:'成交',selected:true},
+          { value: 77, name: '退定' },
         ]
       },
       {
@@ -582,17 +596,14 @@ function getBarOption() {
       containLabel: true
     },
     calculable: true,
-    xAxis: [
-      {
-        type: 'category',
-        data: ['张三', '李四', '王五', '赵六', '孙七', '周八', '吴九','郑十']
-      }
-    ],
-    yAxis: [
-      {
-        type: 'value'
-      }
-    ],
+    xAxis: {
+      type: 'value',
+      data: []
+    },
+    yAxis: {
+      type: 'category',
+      data: ['张三', '李四', '王五', '赵六', '孙七', '周八', '吴九','郑十']
+    },
     series: [
       {
         name: '客户数',

pages/storeData/orderData/index.wxml

@@ -22,10 +22,12 @@
       <view class="relative">
         <view class="font-36">{{Pie1title}}</view>
       </view>
-      <view class="mt50 mb20 relative height-400 z-index-0">
-      <view class="absolute wp100 height-400"  wx:if="{{showPie1Chart}}">
-        <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecPie1 }}"></ec-canvas>
-      </view>
+      <lcb-listmore isNoData='{{pie1noData}}' noDataMsg='暂无数据'></lcb-listmore>
+      <view class="mt50 mb20 relative height-400 z-index-0" wx:if="{{!pie1noData}}">
+        <view class="absolute wp100 height-400"  wx:if="{{showPie1Chart}}">
+          <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecPie1 }}"></ec-canvas>
+        </view>
+        <view class="absolute left-0 bottom-0 right-0 text-center font-22 color-888">{{pie1Bottom}}</view>
       </view>
     </view>
   </view>
@@ -35,10 +37,12 @@
       <view class="relative">
         <view class="font-36">{{Pie2title}}</view>
       </view>
-      <view class="mt50 mb20 relative height-400 z-index-0">
-      <view class="absolute wp100 height-400"  wx:if="{{showPie2Chart}}">
-        <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecPie2 }}"></ec-canvas>
-      </view>
+      <lcb-listmore isNoData='{{pie2noData}}' noDataMsg='暂无数据'></lcb-listmore>
+        <view class="mt50 mb20 relative height-400 z-index-0" wx:if="{{!pie2noData}}">
+        <view class="absolute wp100 height-400"  wx:if="{{showPie2Chart}}">
+          <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecPie2 }}"></ec-canvas>
+        </view>
+        <view class="absolute left-0 bottom-0 right-0 text-center font-22 color-888">{{pie2Bottom}}</view>
       </view>
     </view>
   </view>
@@ -48,8 +52,8 @@
       <view class="relative">
         <view class="font-36">{{Bartitle}}</view>
       </view>
-      <view class="mt50 mb20 relative height-500 z-index-0">
-      <view class="absolute wp100 height-500"  wx:if="{{showBarChart}}">
+      <view class="mt50 mb20 relative z-index-0" style="height:{{Barheight}}rpx;">
+      <view class="absolute wp100" style="height:{{Barheight}}rpx;" wx:if="{{showBarChart}}">
         <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecBar }}"></ec-canvas>
       </view>
       </view>

pages/storeData/wechatData/index.js

@@ -50,13 +50,13 @@ Page({
       })
     }
 
-    popularData.getDateLater(0,0).then(res => {
-      this.setData({
-        s_date:res[0],
-        e_date:res[1],
-        current_date:res[1],
-      })
-    })
+    // popularData.getDateLater(0,0).then(res => {
+    //   this.setData({
+    //     s_date:res[0],
+    //     e_date:res[1],
+    //     current_date:res[1],
+    //   })
+    // })
 
     this.getAppBizStats_wxqy()
     
@@ -149,17 +149,18 @@ Page({
           }
         },
         xAxis: {
-          type: 'category',
+          type: 'value',
           data: []
         },
         yAxis: {
-          type: 'value'
+          type: 'category',
+          data: []
         },
         grid: {
-          top: '5%',
+          top: '1%',
           left: '2%',
           right: '5%',
-          bottom: '3%',
+          bottom: '1%',
           containLabel: true
         },
         series: [
@@ -173,9 +174,10 @@ Page({
         ]
       };
       
-      Bar1ChartData.xAxis.data = res.data.bar1.xAxis_data
+      Bar1ChartData.yAxis.data = res.data.bar1.xAxis_data
       Bar1ChartData.series[0].data = res.data.bar1.series_data
       this.setData({
+        Bar1height:100 + 50*(res.data.bar1.xAxis_data.length),
         Bar1title:res.data.bar1.title,
         showBar1Chart:true,
         ['ecBar1.onInit']:Bar1Chart,
@@ -190,16 +192,17 @@ Page({
           }
         },
         xAxis: {
-          type: 'category',
+          type: 'value',
           data: []
         },
         yAxis: {
-          type: 'value'
+          type: 'category',
+          data: []
         },
         grid: {
-          top: '5%',
+          top: '1%',
           left: '2%',
-          right: '5%',
+          right: '1%',
           bottom: '3%',
           containLabel: true
         },
@@ -214,9 +217,10 @@ Page({
         ]
       };
       
-      Bar2ChartData.xAxis.data = res.data.bar2.xAxis_data
+      Bar2ChartData.yAxis.data = res.data.bar2.xAxis_data
       Bar2ChartData.series[0].data = res.data.bar2.series_data
       this.setData({
+        Bar2height:100 + 50*(res.data.bar2.xAxis_data.length),
         Bar2title:res.data.bar2.title,
         showBar2Chart:true,
         ['ecBar2.onInit']:Bar2Chart,
@@ -252,11 +256,12 @@ function getBar1Option() {
       }
     },
     xAxis: {
-      type: 'category',
-      data: ['张三', '李四', '王五', '赵六', '孙七', '周八', '吴九','郑十']
+      type: 'value',
+      data: []
     },
     yAxis: {
-      type: 'value'
+      type: 'category',
+      data: ['张三', '李四', '王五', '赵六', '孙七', '周八', '吴九','郑十']
     },
     grid: {
       top: '5%',
@@ -287,11 +292,12 @@ function getBar2Option() {
       }
     },
     xAxis: {
-      type: 'category',
-      data: ['张三', '李四', '王五', '赵六', '孙七', '周八', '吴九','郑十']
+      type: 'value',
+      data: []
     },
     yAxis: {
-      type: 'value'
+      type: 'category',
+      data: ['张三', '李四', '王五', '赵六', '孙七', '周八', '吴九','郑十']
     },
     grid: {
       top: '5%',

pages/storeData/wechatData/index.wxml

@@ -22,8 +22,8 @@
       <view class="relative">
         <view class="font-36">{{Bar1title}}</view>
       </view>
-      <view class="mt50 mb20 relative height-500 z-index-0">
-      <view class="absolute wp100 height-500"  wx:if="{{showBar1Chart}}">
+      <view class="mt50 mb20 relative z-index-0" style="height:{{Bar1height}}rpx;">
+      <view class="absolute wp100" style="height:{{Bar1height}}rpx;" wx:if="{{showBar1Chart}}">
         <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecBar1 }}"></ec-canvas>
       </view>
       </view>
@@ -35,8 +35,8 @@
       <view class="relative">
         <view class="font-36">{{Bar2title}}</view>
       </view>
-      <view class="mt50 mb20 relative height-500 z-index-0">
-      <view class="absolute wp100 height-500"  wx:if="{{showBar2Chart}}">
+      <view class="mt50 mb20 relative z-index-0" style="height:{{Bar2height}}rpx;">
+      <view class="absolute wp100" style="height:{{Bar2height}}rpx;" wx:if="{{showBar2Chart}}">
         <ec-canvas class="absolute top-0 bottom-0 left-0 right-0" ec="{{ ecBar2 }}"></ec-canvas>
       </view>
       </view>