From 3e91a4325af5fa0192d66b0ed9926b9a55840e2c Mon Sep 17 00:00:00 2001
From: chenrx <zhufeng@nuzanyun.com>
Date: Mon, 3 Jun 2024 20:01:49 +0800
Subject: [PATCH] 20240603

---
 pages/channel/index.wxml             |  2 +-
 pages/customer/filterList/index.wxml | 33 ++++++++++------------------
 pages/customer/index.wxml            | 33 +++++++++++-----------------
 pages/signup/index.js                | 19 ++++++++++++----
 4 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/pages/channel/index.wxml b/pages/channel/index.wxml
index e016c1b..4caccb7 100644
--- a/pages/channel/index.wxml
+++ b/pages/channel/index.wxml
@@ -49,7 +49,7 @@
             <i class="iconfont ml20 icon-xiala color-999"></i>
           </view>
         </picker>
-
+        
         <picker mode="multiSelector" class="absolute right-0 box-middle" bindchange="changeArea" bindcolumnchange="columnChangeArea" value="{{areaIndex}}" range="{{areaArr}}" range-key="name">
           <view class="pt10 pb10 pl20 pr20 bg-f6 ulib-r10 font-22">
             <text>{{area_list[areaIndex[0]].name}}-{{area_list[areaIndex[0]].children[areaIndex[1]].name}}</text>
diff --git a/pages/customer/filterList/index.wxml b/pages/customer/filterList/index.wxml
index 911192a..ff0754a 100644
--- a/pages/customer/filterList/index.wxml
+++ b/pages/customer/filterList/index.wxml
@@ -12,20 +12,20 @@
       </view>
       <scroll-view class="mt5 font-32 color-666 text-center space-nowrap" scroll-x="true" wx:else>
         <block wx:for='{{tab}}' wx:key='list'>
-          <view class="pl20 pr20 tabmenu2 {{visit_tab_id == item.id?'active color-36afa2':''}}" data-id="{{item.id}}" bindtap="changeTab" >
+          <view class="pl20 pr20 tabmenu2 {{visit_tab_id == item.id?'active color-36afa2':''}}" data-id="{{item.id}}" bindtap="changeTab">
             <view class="relative">{{item.name}}</view>
           </view>
         </block>
       </scroll-view>
     </view>
   </view>
-  
+
   <view class="pl40 pb15 fn-clear">
     <view class="fn-fl">
       <text class="text-middle">共<text class="color-f9394d"> {{total}} </text>位客户</text>
     </view>
     <view class="fn-fr pr40 relative">
-    <text bindtap="showfilter" class="inner5 iconfont icon-gaojisousuo ml10"></text>
+      <text bindtap="showfilter" class="inner5 iconfont icon-gaojisousuo ml10"></text>
     </view>
   </view>
 
@@ -46,7 +46,7 @@
             <text class="text-middle iconfont icon-xingxing ml10 {{item.is_top==1?'color-f9394d':'color-ccc'}}" catchtap="optTop" data-index="{{index}}"></text>
           </view>
           <view class="text-nowrap">
-            <text class="mr15 font-22 color-666">编号 {{item.id}}</text>
+            <text class="mr15 font-22 color-666" wx:if="{{item.cid}}">编号 {{item.cid}}</text>
             <block wx:for="{{item.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
               <text class="inline-block mr10 pl10 pr10 bg-666 font-18 color-fff ulib-r750" wx:if="{{i<4}}">{{tag}}</text>
             </block>
@@ -145,20 +145,20 @@
 <view class="search-bg fixed left-0 right-0 top-0 bottom-0" bindtap="optfilter" hidden="{{!isShowfilter}}" style="background-color:rgba(0,0,0,.5);"></view>
 
 <lcb-msg isShow="{{isShowMessage}}">
-	<view slot="content">
-		<view class="inner40">
+  <view slot="content">
+    <view class="inner40">
       <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" placeholder-class="color-ccc" maxlength='100' placeholder="请输入短信内容" bindinput='inputTx' data-key="content" name='content' value='{{content}}' />
     </view>
     <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
       <button bindtap="hideMessage" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
       <button disabled="{{submitFlag}}" bindtap="postAppSmsCustomer" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
     </view>
-	</view>
+  </view>
 </lcb-msg>
 
 <lcb-msg isShow="{{isShowEmployees}}">
-	<view slot="content">
-		<view class="inner30">
+  <view slot="content">
+    <view class="inner30">
       <view class="mt10 font-28 text-center fn-flex" wx:if="{{distributetabs.length > 0}}">
         <block wx:for="{{distributetabs}}" wx:key="index">
           <view class="fn-flex-item relative ml10 mr10 pt20 pb20 ulib-r10 {{distTabId == item.id?'bg-36afa2 color-fff':'bg-f6'}}" bindtap="changeDistTab" data-id="{{item.id}}">{{item.name}}</view>
@@ -197,21 +197,10 @@
       <button bindtap="optEmployees" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
       <button disabled="{{submitFlag}}" bindtap="putAppCustomersAdmins" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
     </view>
-	</view>
+  </view>
 </lcb-msg>
 
-<page-container 
-  show="{{isShowTimePicker}}"
-  round="{{true}}"
-  overlay="true"
-  duration="300"
-  z-index="10000"
-  position="bottom"
-  close-on-slide-down="{{false}}"
-  bindenter="onEnter"
-  custom-style="false"
-  overlay-style="false"
->
+<page-container show="{{isShowTimePicker}}" round="{{true}}" overlay="true" duration="300" z-index="10000" position="bottom" close-on-slide-down="{{false}}" bindenter="onEnter" custom-style="false" overlay-style="false">
   <view class="">
     <view class="relative pt30 pb30 text-center font-30">
       <view class="color-666">计划回访时间</view>
diff --git a/pages/customer/index.wxml b/pages/customer/index.wxml
index 527e5f7..362904d 100644
--- a/pages/customer/index.wxml
+++ b/pages/customer/index.wxml
@@ -12,7 +12,7 @@
       </view>
       <scroll-view class="mt5 font-32 color-666 text-center space-nowrap" scroll-x="true" wx:else>
         <block wx:for='{{tab}}' wx:key='list'>
-          <view class="pl20 pr20 tabmenu2 {{key == item.key?'active color-36afa2':''}}" data-index="{{index}}" bindtap="changeTab" >
+          <view class="pl20 pr20 tabmenu2 {{key == item.key?'active color-36afa2':''}}" data-index="{{index}}" bindtap="changeTab">
             <view class="relative">{{item.name}}</view>
           </view>
         </block>
@@ -79,7 +79,7 @@
             <text class="text-middle iconfont icon-xingxing ml10 {{item.is_top==1?'color-f9394d':'color-ccc'}}" catchtap="optTop" data-index="{{index}}"></text>
           </view>
           <view class="text-nowrap">
-            <text class="mr15 font-22 color-666">编号 {{item.id}}</text>
+            <text class="mr15 font-22 color-666">编号 {{item.cid}}</text>
             <block wx:for="{{item.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
               <text class="inline-block mr10 pl10 pr10 bg-666 font-18 color-fff ulib-r750" wx:if="{{i<4}}">{{tag}}</text>
             </block>
@@ -122,15 +122,15 @@
 <lcb-shopTabBarNav currentIndex='1'></lcb-shopTabBarNav>
 
 <lcb-msg isShow="{{isShowMessage}}">
-	<view slot="content">
-		<view class="inner40">
+  <view slot="content">
+    <view class="inner40">
       <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" placeholder-class="color-ccc" maxlength='100' placeholder="请输入短信内容" bindinput='inputTx' data-key="content" name='content' value='{{content}}' />
     </view>
     <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
       <button bindtap="hideMessage" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
       <button disabled="{{submitFlag}}" bindtap="postAppSmsCustomer" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
     </view>
-	</view>
+  </view>
 </lcb-msg>
 
 <view class="search-sort {{!isShowfilter?'fn-hide':''}} {{!isShowfilter?'sortout':'sortin'}} bg-fff fixed top-0 bottom-0 z-index-2 ulib-rl20 overflowhidden">
@@ -154,6 +154,7 @@
           <input class="wp100 height-90 text-right font-28" placeholder-class="color-ccc" type="number" placeholder="请输入客户手机号" bindinput='inputTx' data-key="mobile" name='mobile' value='{{mobile}}' />
         </view>
       </view>
+      <!--
       <view class="relative bbs-1-eb last-b-none pl140 font-28">
         <view class="absolute left-0 box-middle">所在城市</view>
         <view class="pt30 pb30 text-right font-28 color-666">
@@ -174,6 +175,7 @@
           </picker>
         </view>
       </view>
+      -->
       <view class="relative bbs-1-eb pl190 last-b-none">
         <view class="absolute left-0 box-middle font-28 color-333">建卡开始时间</view>
         <view class="pt25 pb25 text-right font-28 color-666">
@@ -339,13 +341,15 @@
 <lcb-changeMobile isShow="{{isShowMobile}}"></lcb-changeMobile>
 
 <lcb-msg isShow="{{isShowEmployees}}" isCustomTabBar="{{true}}">
-	<view slot="content">
-		<view class="inner30">
+  <view slot="content">
+    <view class="inner30">
+      <!--
       <view class="mt10 font-28 text-center fn-flex" wx:if="{{distributetabs.length > 0}}">
         <block wx:for="{{distributetabs}}" wx:key="index">
           <view class="fn-flex-item relative ml10 mr10 pt20 pb20 ulib-r10 {{distTabId == item.id?'bg-36afa2 color-fff':'bg-f6'}}" bindtap="changeDistTab" data-id="{{item.id}}">{{item.name}}</view>
         </block>
       </view>
+      -->
       <block wx:if="{{distTabId == 1}}">
         <view class="mt20 ml10 mr10 bds-2-eb inner20 font-28 color-666 fn-clear ulib-r10">
           <view class="fn-fl">销售顾问</view>
@@ -379,21 +383,10 @@
       <button bindtap="optEmployees" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
       <button disabled="{{submitFlag}}" bindtap="putAppCustomersAdmins" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
     </view>
-	</view>
+  </view>
 </lcb-msg>
 
-<page-container 
-  show="{{isShowTimePicker}}"
-  round="{{true}}"
-  overlay="true"
-  duration="300"
-  z-index="10000"
-  position="bottom"
-  close-on-slide-down="{{false}}"
-  bindenter="onEnter"
-  custom-style="false"
-  overlay-style="false"
->
+<page-container show="{{isShowTimePicker}}" round="{{true}}" overlay="true" duration="300" z-index="10000" position="bottom" close-on-slide-down="{{false}}" bindenter="onEnter" custom-style="false" overlay-style="false">
   <view class="">
     <view class="relative pt30 pb30 text-center font-30">
       <view class="color-666">计划回访时间</view>
diff --git a/pages/signup/index.js b/pages/signup/index.js
index 9872797..356f25b 100644
--- a/pages/signup/index.js
+++ b/pages/signup/index.js
@@ -71,10 +71,21 @@ Page({
 
   getappUserConf(params) {
     _.apiQuery.getappUserConf(params).then(res => {
-      this.setData({
-        info: res.data,
-        show_sign: true
-      })
+      if (res.data.type === 'fail') {
+        let arr = [];
+        for (const key in res.data) {
+          arr.push(`${key}=${res.data[key]}`)
+        }
+        let string = '?' + arr.join('&')
+        wx.navigateTo({
+          url: '/pages/signup/status' + string,
+        })
+      } else {
+        this.setData({
+          info: res.data,
+          show_sign: true
+        })
+      }
     })
   },
   /**