Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

components/dkbusiness/dk-dropdown-menu/dk-dropdown-menu.wxss

@@ -23,6 +23,7 @@
 .dropdown-view{
   width: 30%;
   display: flex;
+  margin-right: 20rpx;
   justify-content: flex-start;
 }
 

package-base-select/pages/select-collection_confirm/select-collection_confirm.wxml

@@ -81,7 +81,7 @@
     </view>
     <view style="padding-top: 10rpx; text-align:center;">
 
-      <dk-number-input readonly="{{settlementTypeListLength > 1}}" negative="{{negative}}" min="{{min}}" signSize="15px" fontSize="27" color fontWeight="600" data-key="priceSale" inputValue="{{form.sumAmount}}" data-value="{{form.sumAmount}}" bind:triggerBindValue="changeSalesPriceField"></dk-number-input>
+      <dk-number-input readonly="{{settlementTypeListLength > 1}}" height="60rpx" negative="{{negative}}" min="{{min}}" signSize="15px" fontSize="27" color fontWeight="600" data-key="priceSale" inputValue="{{form.sumAmount}}" data-value="{{form.sumAmount}}" bind:triggerBindValue="changeSalesPriceField"></dk-number-input>
     </view>
 
     <view style="z-index: 12;margin-top:40rpx;box-shadow: 0px 4rpx 16rpx rgba(190, 144, 73, 0.5);border-radius: 15rpx;">

package-basic-data/pages/customer-reception/add/add.wxml

@@ -3,6 +3,7 @@
 <!-- 单据信息 -->
 <loading wx:if="{{loading}}"></loading>
 
+<!-- 
 <view class="top">
   <view class="top-center">
     <van-radio-group value="{{ radioFollowUp }}" class="radio" bind:change="onRadioFollowUp">
@@ -22,7 +23,7 @@
       </view>
     </van-radio-group>
   </view>
-</view>
+</view> -->
 
 
 <dk-form id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:changePhoneblur="changePhoneblur" bind:chooseData="chooseData" table="{{table}}">

package-basic-data/pages/customer-reception/customer-reception.js

@@ -104,6 +104,7 @@ Page({
   toPoint(e) {
     let item = e.detail.item
     let buttonList = this.data.buttonList
+    
     if (item.followStatus == mixins.$t('followStatusFoot') && item.measureStatus == mixins.$t('scaleStatusMeasured')) {
       buttonList = [
         { name: 'followUp', title: mixins.$t('follow') },
@@ -187,7 +188,7 @@ Page({
     params.followStatus = this.data.followStatus == 'all' ? '' : this.data.followStatus
     
     // if(this.data.followStatus === "跟进状态-约尺"){
-    //   params.measureStatus = "量尺状态-已量尺"
+    //   params.measureSe = "量尺状态-已量尺"
     // }
 
     params.nextFollowTime = null
@@ -203,12 +204,11 @@ Page({
   handleSearchData(tableData) {
     let contentSaveList = this.data.contentSaveList
     contentSaveList[0].bill = tableData.length
-    console.log('tableData', tableData);
     tableData.forEach(res => {
-      // res.followStatusName = res.measureStatusName ? res.measureStatusName: res.followStatusName
-      if(res.followStatusName === "接待" && !res.cusPhone){
-        res.flgPoint = false
+      if (res.followStatus == mixins.$t('followStatusFoot') && res.measureStatus == mixins.$t('scaleStatusMeasured')) {
+          res.measureStatusName = ''
       }
+      res.addressFull = res.addressFull + res.addressNo
     })
     this.setData({
       tableData: tableData,

package-basic-data/pages/customer-reception/customer-reception.wxml

@@ -2,14 +2,14 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}" ></loading>
 <van-sticky scroll-top="0">
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName'\,'telephone','adddress','contractNumber'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName'\,'telephone','adddress'])}}">
   </dk-dropdown-menu>
   <dk-tabs active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>
 </van-sticky>
 
 
 <!-- 列表区 -->
-<dk-list list="{{tableData}}" footerTag="cusFromName" title="cusName" collectCol="collectAmount" status="followStatusName" content="{{contentList}}"  footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint" contentObj="{{contentObj}}" contentCol="followStatus" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
+<dk-list list="{{tableData}}" footerTag="cusFromName" title="cusName" collectCol="collectAmount" status="followStatusName" content="{{contentList}}"  footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint" contentObj="{{contentObj}}" contentCol="followStatus" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open" customText="measureStatusName"></dk-list>
 
 <view style="height: 200rpx;"></view>
 

pages/home-page/home-page.wxml

@@ -87,9 +87,9 @@
           </view>
         </view>
         <view style="margin-left:15rpx;margin-top:35px;color:#3785E5;font-size: 11px; ">助力企业腾飞,共创企业辉煌</view>
-        <view style="width: 100%;height: 80rpx;"></view>
+        <view style="width: 100%;height: 60rpx;"></view>
         <!-- 卡片底部 -->
-        <view class="card-bottom-std">
+        <view class="card-bottom-std" >
           <view class="card-bottom-button-std" style="background: #1989fa;" bindtap="toAppStd" data-flg="{{false}}" data-url="{{'/package-basic-data/pages/func-buy/add/add'}}">
             <view style="margin-left: 15rpx; color:#fefeff;font-size: 13px;">立即升级</view>
             <van-icon style="padding-left: 14rpx;" name="arrow" size="2.2vw" color="{{'#fefeff'}}" />