From 3c62dab9d0b11b9e189412e8a69ce8fb595fffc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Thu, 30 Jun 2022 16:05:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E6=9D=A5=E6=BA=90=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/customer/addCard/index.js    | 12 ++++++----
 pages/customer/addCard/index.wxml  | 38 ++++++++++++++++--------------
 pages/customer/editCard/index.js   | 12 +++++-----
 pages/customer/editCard/index.wxml | 38 ++++++++++++++++--------------
 pages/customer/index.js            |  4 ++--
 pages/customer/index.wxml          | 38 ++++++++++++++++--------------
 6 files changed, 75 insertions(+), 67 deletions(-)

diff --git a/pages/customer/addCard/index.js b/pages/customer/addCard/index.js
index b3c38c8..ee06997 100644
--- a/pages/customer/addCard/index.js
+++ b/pages/customer/addCard/index.js
@@ -271,13 +271,13 @@ Page({
         icon: 'none'
       })
     }
-    else if (that.data.of_id == '' ) {
+    else if (that.data.sources.length>0&&that.data.of_id == '' ) {
       wx.showToast({
         title: '请选择线索来源',
         icon: 'none'
       })
     }
-    else if (that.data.sources[that.data.of1Index].list.length>0&&that.data.of2_id == '' ) {
+    else if (that.data.sources.length>0&&that.data.sources[that.data.of1Index].list.length>0&&that.data.of2_id == '' ) {
       wx.showToast({
         title: '请选择'+that.data.sources[that.data.of1Index].name+'类型',
         icon: 'none'
@@ -320,7 +320,9 @@ Page({
       // if(this.data.b_s_id != ''){
       //   params['b_s_id'] = this.data.b_s_id;
       // }
-      params['of_id'] = this.data.of_id;
+      if(this.data.of_id != ''){
+        params['of_id'] = this.data.of_id;
+      }
       if(this.data.of2_id != ''){
         params['of2_id'] = this.data.of2_id;
       }
@@ -395,12 +397,12 @@ Page({
     params['status'] = this.data.status;
     _.apiQuery.getAppCustomersOffline_sources(params).then(res => {
       let of1Arr = []
-      res.data.forEach(item => {
+      res.data.sources.forEach(item => {
         of1Arr.push(item.name)
       })
       this.setData({
         of1Arr,
-        sources:res.data
+        sources:res.data.sources
       })
     });
   },
diff --git a/pages/customer/addCard/index.wxml b/pages/customer/addCard/index.wxml
index 6149402..d185760 100644
--- a/pages/customer/addCard/index.wxml
+++ b/pages/customer/addCard/index.wxml
@@ -72,26 +72,28 @@
           </picker>
         </view>
       </view> -->
-      <view class="relative bbs-1-eb last-b-none pl140 font-28">
-        <view class="absolute left-0 box-middle">线索来源</view>
-        <view class="pt30 pb30 text-right font-28 color-666">
-          <picker bindchange="changeOf1" value="{{of1Index}}" range="{{of1Arr}}">
-            <text class="color-ccc" wx:if="{{of1Index == -1}}">请选择</text>
-            <text wx:else>{{of1Arr[of1Index]}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </picker>
+      <block wx:if="{{sources.length>0}}">
+        <view class="relative bbs-1-eb last-b-none pl140 font-28">
+          <view class="absolute left-0 box-middle">线索来源</view>
+          <view class="pt30 pb30 text-right font-28 color-666">
+            <picker bindchange="changeOf1" value="{{of1Index}}" range="{{of1Arr}}">
+              <text class="color-ccc" wx:if="{{of1Index == -1}}">请选择</text>
+              <text wx:else>{{of1Arr[of1Index]}}</text>
+              <i class="iconfont ml5 icon-gengduo"></i>
+            </picker>
+          </view>
         </view>
-      </view>
-      <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{of2Arr.length>0}}">
-        <view class="absolute left-0 box-middle">{{sources[of1Index].name}}</view>
-        <view class="pt30 pb30 text-right font-28 color-666">
-          <picker bindchange="changeOf2" value="{{of2Index}}" range="{{of2Arr}}">
-            <text class="color-ccc" wx:if="{{of2Index == -1}}">请选择</text>
-            <text wx:else>{{of2Arr[of2Index]}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </picker>
+        <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{of2Arr.length>0}}">
+          <view class="absolute left-0 box-middle">{{sources[of1Index].name}}</view>
+          <view class="pt30 pb30 text-right font-28 color-666">
+            <picker bindchange="changeOf2" value="{{of2Index}}" range="{{of2Arr}}">
+              <text class="color-ccc" wx:if="{{of2Index == -1}}">请选择</text>
+              <text wx:else>{{of2Arr[of2Index]}}</text>
+              <i class="iconfont ml5 icon-gengduo"></i>
+            </picker>
+          </view>
         </view>
-      </view>
+      </block>
       <view class="relative bbs-1-eb last-b-none pl190" wx:if="{{status==0}}">
         <view class="absolute left-0 box-middle font-28 color-333">预计购车时间</view>
         <view class="pt30 pb30 text-right font-28 color-666">
diff --git a/pages/customer/editCard/index.js b/pages/customer/editCard/index.js
index a16bcb3..b91b756 100644
--- a/pages/customer/editCard/index.js
+++ b/pages/customer/editCard/index.js
@@ -338,13 +338,13 @@ Page({
         icon: 'none'
       })
     }
-    else if (that.data.of_id == '' ) {
+    else if (that.data.sources.length>0&&that.data.of_id == '' ) {
       wx.showToast({
         title: '请选择线索来源',
         icon: 'none'
       })
     }
-    else if (that.data.sources[that.data.of1Index].list.length>0&&that.data.of2_id == '' ) {
+    else if (that.data.sources.length>0&&that.data.sources[that.data.of1Index].list.length>0&&that.data.of2_id == '' ) {
       wx.showToast({
         title: '请选择'+that.data.sources[that.data.of1Index].name+'类型',
         icon: 'none'
@@ -454,15 +454,15 @@ Page({
   getAppCustomersOffline_sources(){
     _.apiQuery.getAppCustomersOffline_sources().then(res => {
       let of1Arr = []
-      res.data.forEach(item => {
+      res.data.sources.forEach(item => {
         of1Arr.push(item.name)
       })
       this.setData({
         of1Arr,
-        sources:res.data
+        sources:res.data.sources
       })
       if(this.data.of_id != ''){
-        res.data.forEach((item,index) => {
+        res.data.sources.forEach((item,index) => {
           if(item.id == this.data.of_id){
             this.setData({
               of1Index:index,
@@ -471,7 +471,7 @@ Page({
         })
         if(this.data.of2Index != ''){
           let of2Arr = []
-          res.data[this.data.of1Index].list.forEach((item,index) => {
+          res.data.sources[this.data.of1Index].list.forEach((item,index) => {
             of2Arr.push(item.name)
             if(item.id == this.data.of2_id){
               this.setData({
diff --git a/pages/customer/editCard/index.wxml b/pages/customer/editCard/index.wxml
index c010887..ad68408 100644
--- a/pages/customer/editCard/index.wxml
+++ b/pages/customer/editCard/index.wxml
@@ -53,26 +53,28 @@
           </picker>
         </view>
       </view> -->
-      <view class="relative bbs-1-eb last-b-none pl140 font-28">
-        <view class="absolute left-0 box-middle">线索来源</view>
-        <view class="pt30 pb30 text-right font-28 color-666">
-          <picker bindchange="changeOf1" value="{{of1Index}}" range="{{of1Arr}}">
-            <text class="color-ccc" wx:if="{{of1Index == -1}}">请选择</text>
-            <text wx:else>{{of1Arr[of1Index]}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </picker>
+      <block wx:if="{{sources.length>0}}">
+        <view class="relative bbs-1-eb last-b-none pl140 font-28">
+          <view class="absolute left-0 box-middle">线索来源</view>
+          <view class="pt30 pb30 text-right font-28 color-666">
+            <picker bindchange="changeOf1" value="{{of1Index}}" range="{{of1Arr}}">
+              <text class="color-ccc" wx:if="{{of1Index == -1}}">请选择</text>
+              <text wx:else>{{of1Arr[of1Index]}}</text>
+              <i class="iconfont ml5 icon-gengduo"></i>
+            </picker>
+          </view>
         </view>
-      </view>
-      <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{of2Arr.length>0}}">
-        <view class="absolute left-0 box-middle">{{sources[of1Index].name}}</view>
-        <view class="pt30 pb30 text-right font-28 color-666">
-          <picker bindchange="changeOf2" value="{{of2Index}}" range="{{of2Arr}}">
-            <text class="color-ccc" wx:if="{{of2Index == -1}}">请选择</text>
-            <text wx:else>{{of2Arr[of2Index]}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </picker>
+        <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{of2Arr.length>0}}">
+          <view class="absolute left-0 box-middle">{{sources[of1Index].name}}</view>
+          <view class="pt30 pb30 text-right font-28 color-666">
+            <picker bindchange="changeOf2" value="{{of2Index}}" range="{{of2Arr}}">
+              <text class="color-ccc" wx:if="{{of2Index == -1}}">请选择</text>
+              <text wx:else>{{of2Arr[of2Index]}}</text>
+              <i class="iconfont ml5 icon-gengduo"></i>
+            </picker>
+          </view>
         </view>
-      </view>
+      </block>
 
       <block wx:for='{{taglList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
         <view class="relative mt40">
diff --git a/pages/customer/index.js b/pages/customer/index.js
index 233a3d0..1a80a43 100644
--- a/pages/customer/index.js
+++ b/pages/customer/index.js
@@ -601,12 +601,12 @@ Page({
   getAppCustomersOffline_sources(){
     _.apiQuery.getAppCustomersOffline_sources().then(res => {
       let of1Arr = []
-      res.data.forEach(item => {
+      res.data.sources.forEach(item => {
         of1Arr.push(item.name)
       })
       this.setData({
         of1Arr,
-        sources:res.data
+        sources:res.data.sources
       })
     });
   },
diff --git a/pages/customer/index.wxml b/pages/customer/index.wxml
index 57d40d1..70d2762 100644
--- a/pages/customer/index.wxml
+++ b/pages/customer/index.wxml
@@ -211,26 +211,28 @@
           </picker>
         </view>
       </view> -->
-      <view class="relative bbs-1-eb last-b-none pl140 font-28">
-        <view class="absolute left-0 box-middle">客户来源</view>
-        <view class="pt25 pb25 text-right font-28 color-666">
-          <picker bindchange="changeOf1" value="{{of1Index}}" range="{{of1Arr}}">
-            <text class="color-ccc" wx:if="{{of1Index == -1}}">请选择</text>
-            <text wx:else>{{of1Arr[of1Index]}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </picker>
+      <block wx:if="{{sources.length>0}}">
+        <view class="relative bbs-1-eb last-b-none pl140 font-28">
+          <view class="absolute left-0 box-middle">客户来源</view>
+          <view class="pt25 pb25 text-right font-28 color-666">
+            <picker bindchange="changeOf1" value="{{of1Index}}" range="{{of1Arr}}">
+              <text class="color-ccc" wx:if="{{of1Index == -1}}">请选择</text>
+              <text wx:else>{{of1Arr[of1Index]}}</text>
+              <i class="iconfont ml5 icon-gengduo"></i>
+            </picker>
+          </view>
         </view>
-      </view>
-      <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{of2Arr.length>0}}">
-        <view class="absolute left-0 box-middle">{{sources[of1Index].name}}</view>
-        <view class="pt25 pb25 text-right font-28 color-666">
-          <picker bindchange="changeOf2" value="{{of2Index}}" range="{{of2Arr}}">
-            <text class="color-ccc" wx:if="{{of2Index == -1}}">请选择</text>
-            <text wx:else>{{of2Arr[of2Index]}}</text>
-            <i class="iconfont ml5 icon-gengduo"></i>
-          </picker>
+        <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{of2Arr.length>0}}">
+          <view class="absolute left-0 box-middle">{{sources[of1Index].name}}</view>
+          <view class="pt25 pb25 text-right font-28 color-666">
+            <picker bindchange="changeOf2" value="{{of2Index}}" range="{{of2Arr}}">
+              <text class="color-ccc" wx:if="{{of2Index == -1}}">请选择</text>
+              <text wx:else>{{of2Arr[of2Index]}}</text>
+              <i class="iconfont ml5 icon-gengduo"></i>
+            </picker>
+          </view>
         </view>
-      </view>
+      </block>
       <!-- <view class="relative bbs-1-eb pl190 last-b-none">
         <view class="absolute left-0 box-middle font-28 color-333">到店次数</view>
         <view class="pt25 pb25 text-right font-28 color-666">