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

api/pages/mst/customer.js

@@ -23,7 +23,7 @@ module.exports = {
         key:'edit',url:'/package-basic-data/pages/customer-list/add/add'
       },
       followUp:{
-        key:'followUp',url:'/package-basic-data/pages/customer-follow-up/customer-follow-up',image:'btn-follow-up.png'
+        key:'followUp',url:'/package-basic-data/pages/customer-follow-up/customer-follow-up',image:'btn-follow-up.png',formMode: 'sourceCus',
       },
       detail:{
         key:'detail',url:'/package-basic-data/pages/customer-list/detail/detail'

components/dkbase/dk-number-input/dk-number-input.wxss

@@ -49,14 +49,14 @@
   font-size:var(--fontSize--) !important;
   color:var(--inputColor--) !important;
   font-weight: var(--inputFontWeight--) !important;
-  height: var(--height--) !important;
+  height: var(--height--) !important; 
 }
 .dk-cell-value-class-input{
   font-size:var(--fontSize--) !important;
   color:var(--inputColor--) !important;
   font-weight: var(--inputFontWeight--) !important;
   width: 110rpx !important;
-  height: var(--height--) !important;
+  height: var(--height--) !important; 
 }
 .van-field__input--right {
   text-align: right !important;
@@ -65,4 +65,5 @@
 .van-cell__title{
   margin-right: 0 !important;
   min-width: auto !important;
-}
+}
+

package-basic-data/pages/customer-follow-up/customer-follow-up.js

@@ -194,7 +194,7 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad(options) {
+  onLoad(options) { 
     //接收父页面传递的参数
     let that = this
     const eventChannel = this.getOpenerEventChannel()
@@ -205,11 +205,22 @@ Page({
           title: data.title,
         })
       }
+      
       let formData = that.setCus(JSON.parse(that.data.formData), item)
       that.setData({
         formData: formData
       })
     })
+
+
+    if(this.data.formMode == "sourceCus"){//从客户列表跳转过来的
+      let item = that.data.item
+      let formData = that.data.formData?JSON.parse(that.data.formData):{}
+      formData =  that.setCus(formData, item) 
+      that.setData({
+        formData: formData
+      })
+    }
     // 从推送消息过来的数据 
     if (options.item){
       let item = JSON.parse(decodeURIComponent(options.item))
@@ -344,6 +355,8 @@ Page({
     if (radioFollowUp == '3') {
       contentObj.main = this.data.formType == 'detail' ? radioFollowUpList33 : radioFollowUpList3
     }
+    let cusName_index =  contentObj.main.findIndex(it=>it.code == "cusName")
+    contentObj.main = ""
     this.setData({
       contentObj: contentObj
     })

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

@@ -191,7 +191,7 @@ Page({
         buttonList: [
           { name: 'followUp', title: mixins.$t('followUp') },
           { name: 'followUpTasks', title: mixins.$t('followUpTasks') },
-          { name: 'toReceipt', title: mixins.$t("cusCollection"), idKey: 'cusId' },//跳转收款单
+          { name: 'collection', title: mixins.$t("cusCollection"), idKey: 'cusId' },//跳转收款单  toReceipt
         ],
         tagList: [{ title: mixins.$t('potentialCus'), code: mixins.$t('salePotentialCus') },
         { title: mixins.$t('seasCus'), code: mixins.$t('saleSeasCus') },

package-basic-data/pages/draw-bill/add/add.js

@@ -79,7 +79,7 @@ Page({
                 },
                 {
                     code: 'totalInvoiceAmount',
-                    type: 'str',
+                    type: 'number',
                     readonly: true,
                     title: mixins.$t('totalInvoiceAmount')
                 }

package-basic-data/pages/draw-bill/draw-bill.js

@@ -33,6 +33,7 @@ Page({
             {
                 name: 'tradeAmount', // todo 颜色 先不用变
                 title: mixins.$t('paidInAmount'),
+                type:'amount'
             },
             {
                 name: 'tradeAmount', //todo  目前表还没有这个字段

package-basic-data/pages/draw-bill/draw-bill.wxss

@@ -1,4 +1,7 @@
-/* package-basic-data/pages/draw-bill/draw-bill.wxss */
+ 
 .van-checkbox__icon {
   border: 1px solid var(--checkbox-border-color, rgb(141, 139, 139)) !important;
 }
+.van-cell--borderless{
+	padding:  0 !important;
+  }

package-basic-data/pages/historical-purchase-history/historical-purchase-history.wxss

@@ -1 +1,3 @@
-/* package-basic-data/pages/historical-purchase-history/historical-purchase-history.wxss */
+.van-cell--borderless{
+	padding:  0 !important;
+  }

package-basic-data/pages/share/share.js

@@ -449,8 +449,7 @@ Page({
         }
       }
       const that = this
-      let path = '/pages/welcome/welcome?cpIdFrom=' + app.globalData.company.cpId + '&shareType=1&shareEndDate=' + that.data.integralShareItem.endDate + '&staffNameFrom=' + app.globalData.user.staffName + '&userIdFrom=' + app.globalData.user.userId
-      console.log("path",path);
+      let path = '/pages/welcome/welcome?cpIdFrom=' + app.globalData.company.cpId + '&shareType=1&shareEndDate=' + that.data.integralShareItem.endDate + '&staffNameFrom=' + app.globalData.user.staffName + '&userIdFrom=' + app.globalData.user.userId + '&shareId=' + integralShareItem.shareId
       return {
         title: '邀请好友，互利共赢',
         desc: '邀请注册拿云币',

package-basic-data/pages/sign-share-detail/coupon-detail.wxml

@@ -24,7 +24,7 @@
           优惠券:<view class="number" >{{ couponNumber }}</view>张
         </view>
         <view class="item" style="color: #95A8CB;text-decoration-line:underline;" data-name="couponHistory" bind:tap="open">
-          历史助力记录
+          助力记录
         </view>
       </view>
       <view class="rearmk-view">

package-basic-data/pages/sign-share-detail/integral-detail.wxml

@@ -24,7 +24,7 @@
           公司云币:<view class="number" data-name="integralDetail">{{integral}}</view>枚
         </view>
         <view class="item" style="color: #95A8CB;text-decoration-line:underline;" data-name="integralHistory" bind:tap="open">
-          历史邀请记录
+          邀请记录
         </view>
       </view>
       <view class="rearmk-view">

package-basic-data/pages/sign-share-history/integral-history.js

@@ -18,7 +18,8 @@ Page({
      */
     data: {
         // 路由
-        routeObjName: 'couponSend',
+        routeObjName: 'integralShare',
+        needHelpUserNumber: 1
     },
 
     /**
@@ -36,8 +37,12 @@ Page({
         let _this = this
         return this.excute(this.data.service, this.data.service.selectByCondHis, {}).then(res => {
             if (res.data.code == Constants.SUCESS_CODE) {
+                const list = res.data.data.list
+                list.forEach(res => {
+                  res.shareDate = new Date(res.shareDate).toDateTimeStr()
+                })
                 this.setData({
-                    itemList: res.data.data.list
+                    itemList: list
                 })
             }
         })

package-basic-data/pages/sign-share-history/integral-history.wxml

@@ -2,24 +2,23 @@
 <view class="content">
   <view class="content-card">
     <view class="card-content" wx:for="{{itemList}}" wx:key="index" wx:for-item="item" data-item="{{item}}">
-      <view class="title-info">
-        <view>邀请</view>
-        <view class="icon-view">
-          <view class="user-icon" wx:if="{{item.couponReceiveCount==1}}">
-            <image fit="fill" src="{{imageUrl+'/user_icon.png'}}" />
+        <view class="title-info">
+          <view>邀请</view>
+          <view class="icon-view">
+            <view class="user-icon" wx:if="{{item.itemUserNumber==needHelpUserNumber}}">
+              <image fit="fill" src="{{imageUrl+'/user_icon.png'}}" />
+            </view>
+            <view class="user-icon" wx:else>
+              <van-icon class="icon" name="add-o" />
+            </view>
           </view>
-          <view class="user-icon" wx:if="{{item.couponReceiveCount==0}}">
-            <van-icon class="icon" name="add-o" />
-          </view>
-
         </view>
-      </view>
-      <view class="user-info">
-        <view class="time-view">{{item.sendDate}}/{{item.sendStaff?item.sendStaff:''}}</view>
-        <view class="state-view">
-          {{item.couponReceiveCount == needHelpUserNumber?'注册成功':'注册失败'}}
+        <view class="user-info">
+          <view class="time-view">{{item.shareDate}}{{item.staffName?'/' + item.staffName:''}}</view>
+          <view class="state-view">
+            {{item.itemUserNumber == needHelpUserNumber?'注册成功':'注册失败'}}
+          </view>
         </view>
-      </view>
     </view>
 
   </view>

package-inventory/pages/ivt-detail-report/ivt-detail-report.wxml

@@ -64,6 +64,6 @@
   </view>
 </view> -->
 
-<view  style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="export">
+<view  style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 9;" bindtap="export">
   <image src="{{imageUrl + 'excel.png'}} " class="edit-class" />
 </view>