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

components/dkbase/dk-form-bill/dk-form-bill.js

@@ -1702,11 +1702,11 @@ Component({
         if (this.data.type == Constants.billType.pur) {
           // this.setPurGoodsAmount(e.data);
         }
-        console.log('jm3', this.data.cardList);
+        console.log('jm3', this.data.form);
         // 设置是否进行收缩
         let card = this.data.cardList.filter(it => it.name == 'items');
         this.handleContentObj(card[0])
-        console.log('jm2', this.data.cardList);
+        console.log('jm2', this.data.form);
         // 外露setGoods方法
         this.triggerEvent("setGoods", {
           data: goodsList
@@ -1878,14 +1878,14 @@ Component({
             item.discount = Number(0)
             item.discAmt = Number(0)
           }
-          item.itemAmt = item.priceSale * item.itemQty //商品金额
-          item.sumPrice = item.priceSale * item.itemQty //商品金额
-          item.priceDiscount = item.priceStd ? Number((item.priceSale / item.priceStd) * 100).toFixed(2) : 100 //售价折扣  
+          item.itemAmt =  Number(item.priceSale) *  Number(item.itemQty) //商品金额
+          item.sumPrice =  Number(item.priceSale) *  Number(item.itemQty) //商品金额
+          item.priceDiscount = item.priceStd ? Number(( Number(item.priceSale) /  Number(item.priceStd)) * 100).toFixed(2) : 100 //售价折扣  
           item.factAmt = Number(item.factPrice) * Number(item.itemQty)
-          sumQuantity += item.itemQty //数量
-          sumAmount += item.priceSale * item.itemQty //没有售价默认取标价
-          factAmt += item.factAmt
-          sumStandard += (item.priceStd ? item.priceStd : item.priceStandard) * item.itemQty
+          sumQuantity += Number(item.itemQty) //数量
+          sumAmount +=  Number(item.priceSale) *  Number(item.itemQty) //没有售价默认取标价
+          factAmt +=  Number(item.factAmt)
+          sumStandard +=  Number((item.priceStd ? item.priceStd : item.priceStandard)) *  Number(item.itemQty)
         })
         //标价合计
         cardList[index].sumStandard = sumStandard

components/dkbase/dk-form-bill/dk-form-bill.wxml

@@ -173,7 +173,7 @@
             </view>
             <view wx:if="{{sumAmountColFlag}}" class="amount-item-class">
               <!--条数-->
-              <dk-cell titleColor="#95A8CB;" title="{{$t['goodsQuantity']+':' + (card[sumQuantityCol]?card[sumQuantityCol]:0) + $t['piece']}}" amount="{{false}}"></dk-cell>
+              <dk-cell titleColor="#95A8CB;" contentColor="#95A8CB" title="{{$t['goodsQuantity'] }}"contentFontWeight="700"  amount="{{false}}"content="{{(card[sumQuantityCol]?card[sumQuantityCol]:0) + $t['piece']}}"></dk-cell>
               <!--合计金额-->
               <dk-cell fontSize="16" fontWeight="bold" contentFontWeight="700" contentColor="#FF7B1A" titleColor="#1B365D;" title="合计金额" content="{{card[sumAmountCol]?card[sumAmountCol]:0}}"></dk-cell>
               <!-- <view style="display: flex;width: calc(100% - 260rpx);">
@@ -186,7 +186,7 @@
             </view>
             <view wx:if="{{reverseCalculationFlag}}" class="amount-item-class">
               <!--整单折扣-->
-              <dk-cell titleColor="#95A8CB;" title="{{$t['wholeOrderDiscount']+':' + (card[wholeOrderDiscountCol]?card[wholeOrderDiscountCol]:100) + '%'}}" amount="{{false}}"></dk-cell>
+              <dk-cell contentColor="#95A8CB" titleColor="#95A8CB;"  title="{{$t['wholeOrderDiscount']}}" amount="{{false}}"content="{{(card[wholeOrderDiscountCol]?card[wholeOrderDiscountCol]:100) + '%'}}"></dk-cell>
               <!--优惠金额-->
               <dk-cell   contentColor="#95A8CB" titleColor="#95A8CB;" title="优惠金额" content="{{card[discountAmountCol]?card[discountAmountCol]:0}}"></dk-cell>
            

components/dkbase/dk-navbar/dk-navbar.js

@@ -32,6 +32,10 @@ Component({
       operateUrl:{
         type: String,
         value: ''
+      },
+      customStyle:{
+        type: String,
+        value: ''
       }
     },
 
@@ -41,11 +45,30 @@ Component({
     data: {
       paddingTopNum: wx.getSystemInfoSync().statusBarHeight+7
     },
-
+    lifetimes: {
+      attached: function() {
+        // 在组件实例进入页面节点树时执行
+        this.getHeight()
+      },
+      detached: function() {
+        // 在组件实例被从页面节点树移除时执行
+      },
+    },
     /**
      * 组件的方法列表
      */
     methods: {
+      /**
+       * 获取自定义组件高度并向上抛出
+       * @author 刘尧
+       */
+      getHeight(){
+        let that = this
+        let query = wx.createSelectorQuery().in(this);
+        query.select('.van-nav-bar').boundingClientRect(function (rect) {
+          that.triggerEvent('getNavbarHeight', rect);
+        }).exec()
+      },
       clickLeft(e){
         this.triggerEvent('clickBack', {
           value: e

components/dkbase/dk-navbar/dk-navbar.wxml

@@ -1,12 +1,28 @@
 <!--components/dkbase/dk-navbar/dk-navbar.wxml-->
-<view class="content" style="padding-top: {{paddingTopNum}}px;background: {{navigationStyle === 'none' || fixed == true ? none : '#ffffff'}}; {{fixed == false ? '': 'position: fixed;'}}">
+<van-nav-bar
+  left-arrow
+  z-index="998"
+  bind:click-left="clickLeft"
+  fixed="{{fixed}}"
+  custom-style="{{customStyle}}"
+  border="{{false}}"
+  class="van-nav-bar"
+>
+  <view slot="title">
+    <view class="title">
+        <text style="color: {{titleFontColor}};">{{navbarTitle}}</text>
+        <van-icon wx:if="{{operateShow}}" style="margin-left: 10rpx;" size="15px" name="question-o" data-item="{{item}}" catchtap="operateClick" color="{{titleFontColor}}" />
+    </view>
+  </view>
+</van-nav-bar>
+<!-- <view class="content" style="padding-top: {{paddingTopNum}}px;background: {{navigationStyle === 'none' || fixed == true ? none : '#ffffff'}}; {{fixed == false ? '': 'position: fixed;'}}">
   <view class="title-content">
     <view class="left-button" bindtap="clickLeft">
       <van-icon name="arrow-left" size="18px" color="{{titleFontColor}}"/>
     </view>
     <view class="title">
-      <text style="color: {{titleFontColor}};">{{navbarTitle}}</text>
+      <text style="color: {{titleFontColor}};"></text>
       <van-icon wx:if="{{operateShow}}" style="margin-left: 10rpx;" size="15px" name="question-o" data-item="{{item}}" catchtap="operateClick" color="{{titleFontColor}}" />
     </view>
   </view>
-</view>
+</view> -->

components/dkbase/dk-save-button/dk-save-button.wxml

@@ -30,7 +30,7 @@
     <!-- <view style="display: flex;width: {{contentList && contentList.length > 0?'50%':'100%'}};justify-content: {{btnRightFlag?'flex-end':'left'}};"> -->
     <view style="display: flex;width: {{contentList && contentList.length > 0?'auto':'100%'}};justify-content: {{btnRightFlag?'flex-end':'left'}};min-width:236rpx;">
       <view class="btn-class" style="margin-right: {{(btnAutoWidthFlag && index != buttonList.length - 1)?'20rpx':''}};  width:{{btnAutoWidthFlag?(100/buttonList.length + '%'): (item.width?item.width:'156rpx')}};" wx:for="{{buttonList}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
-        <van-button size="large" plain="{{item.plain}}" data-item="{{item}}" color="{{item.color?item.color:'#3E69F6'}}" custom-style="height:88rpx;border-radius:15rpx ;" bind:click="submit" type="info">{{item.title}}
+        <van-button size="large" plain="{{item.plain}}" data-item="{{item}}" color="{{item.color?item.color:'#3E69F6'}}" custom-style="height:88rpx;border-radius:15rpx ; color:{{item.plain?'#3E69F6':'#FFFFFF'}};background:{{item.plain?'#FFFFFF':'#3E69F6'}}" bind:click="submit" type="info">{{item.title}}
         </van-button>
       </view>
     </view>

components/dkbase/dk-side-pull-menu/dk-side-pull-menu.js

@@ -24,6 +24,11 @@ Component({
     searchFormNumber: {
       type: Number,
       default: 0
+    },
+    // 自定义导航栏高度
+    navBarHeight: {
+      type: Number,
+      default: 0
     }
   },
   options: {

components/dkbase/dk-side-pull-menu/dk-side-pull-menu.wxml

@@ -1,5 +1,5 @@
 <!-- 抽屉 侧拉菜单-->
-<van-popup show="{{show_p}}" position="right" bind:close="onClose" class="popup" custom-style="height:100%;width:75%">
+<van-popup show="{{show_p}}" position="right" bind:close="onClose" class="popup" custom-style="height:100%;width:75%;padding-top:{{navBarHeight}}px">
   <view style="height:45rpx;"></view>
   <scroll-view scroll-y class="popup-scroll-view">
     <slot>

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

@@ -44,6 +44,11 @@ Component({
     searchTextPlaceholder: {
       type: String,
     },
+    // 自定义导航栏高度
+    navBarHeight: {
+      type: Number,
+      value: 0
+    },
     // 结果集
     value: {
       type: String,
@@ -88,7 +93,6 @@ Component({
   },
   lifetimes: {
     attached: function () {
-      console.log('ttttt',this.data.pullMenuList);
       let pullMSelectMenuList = this.data.pullMenuList.filter(it => it.pullType == Constants.pullType.mSelect);
       let pullOtherMenuList = this.data.pullMenuList.filter(it => it.pullType != Constants.pullType.mSelect);
       this.setData({

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

@@ -13,11 +13,12 @@
     </van-dropdown-item>
   </van-dropdown-menu>
   <!-- 多选 -->
-  <dk-muti-dropdown-item show="{{dropDownFlag}}" typeName="{{dropType}}" bind:commit='mutiSearchAll' bind:muticlose='mutiCloseAll'></dk-muti-dropdown-item>
+  <dk-muti-dropdown-item show="{{dropDownFlag}}" typeName="{{dropType}}" bind:commit='mutiSearchAll' navBarHeight="{{navBarHeight}}" bind:muticlose='mutiCloseAll'></dk-muti-dropdown-item>
   <!--单选-->
-  <dk-single-dropdown-item show="{{dropSingleDownFlag}}" typeName='{{dropType}}' bind:commit='chooseData' bind:muticlose='muticlose'></dk-single-dropdown-item>
+  <dk-single-dropdown-item show="{{dropSingleDownFlag}}" typeName='{{dropType}}' bind:commit='chooseData' navBarHeight="{{navBarHeight}}" bind:muticlose='muticlose'></dk-single-dropdown-item>
   <!-- 筛选 -->
-  <dk-side-pull-menu show_p="{{pickFlag}}" searchForm="{{form}}" bind:clearSearchForm="clearform" bind:doSearchData="mutiSearchAll" bind:onClose="mutiCloseAll">
+  <dk-side-pull-menu show_p="{{pickFlag}}" searchForm="{{form}}" bind:clearSearchForm="clearform" bind:doSearchData="mutiSearchAll" 
+  navBarHeight="{{navBarHeight}}" bind:onClose="mutiCloseAll">
     <view wx:for="{{pullMSelectMenuList}}" data-index="{{index}}" data-item="{{item}}">
       <dk-label-multiple-select id="{{item.code}}" show="{{dropDownFlag}}" typeName="{{item.typeName}}" bind:onClickTag="onClickTag"></dk-label-multiple-select>
     </view>

components/dkbusiness/dk-muti-dropdown-item/dk-muti-dropdown-item.js

@@ -204,6 +204,11 @@ Component({
           })
         }
       }
+    },
+    // 自定义导航栏高度
+    navBarHeight: {
+      type: Number,
+      value: 0
     }
   },
 

components/dkbusiness/dk-muti-dropdown-item/dk-muti-dropdown-item.wxml

@@ -2,7 +2,7 @@
 <!-- 弹窗 -->
 <van-popup show="{{show}}" position="right" z-index="9999999" custom-style="overflow-x:hidden;width: 75%;z-index:9999999;height:100%;" bind:close="onClose">
  
- <van-sticky scroll-top="0">
+ <van-sticky scroll-top="0" offset-top="{{ navBarHeight }}">
    <view wx:if="{{Top_Height_Flag}}" style="height: 21vw;background: #fff;"></view>
    <van-search custom-class="search-class" shape="round" model:value="{{ conditions[typeName] }}" input-class="background:#c8c8c8;" placeholder="搜索" bind:change="onChange_input" bind:blur="blur_input" />
    <view class="choose_label" >
@@ -10,7 +10,7 @@
    </view>
  </van-sticky>
 
- <view class="root" style="height:calc(100% - 120rpx)">
+ <view class="root" style="height:calc(100% - 120rpx - 88px);margin-top: {{navBarHeight}}px;">
    <view class="scroll_search" style="overflow-x:hidden;">
      <scroll-view class="scroll_position"  scroll-x="{{false}}" scroll-y enable-back-to-top>
        <view wx:if="{{Top_Height_Flag}}" style="height: 21vw;background: #fff;"></view>

mixins/index.js

@@ -81,7 +81,9 @@ module.exports = {
     // 初始加载查询
     initSearchFlag: true,
     // params事件监听，解决重复进入的问题
-    paramsInitFlag: true
+    paramsInitFlag: true,
+    // 自定义导航栏的高度
+    navBarHeight: 0
   },
   /**
    * @desc : 获取路由信息，供data中的对象使用
@@ -1308,4 +1310,14 @@ module.exports = {
       wx.stopPullDownRefresh()
     }, 300)
   },
+  /**
+   * 获取自定义导航栏高度
+   * @author: 刘尧
+   */
+  getNavbarHeight(e){
+    const detail = e.detail
+    this.setData({
+      navBarHeight: detail.height
+    })
+  }
 };

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

@@ -404,7 +404,7 @@
 </dk-popup>
 
 <!-- 库存 -->
-<dk-popup wx:if="{{ billType == 'inventory' }}" type="sale" descCol="skuName"stepperDecimal ="decimalPlaces"  subCol="calculationFormula" titleTagCol="" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="标价：" priceCol="sumPrice" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox"bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:changeField= "changeField" >
+<dk-popup wx:if="{{ billType == 'inventory' }}" type="sale" descCol="skuName"stepperDecimal ="decimalPlaces"  subCol="calculationFormula" titleTagCol="" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="sumPrice" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox"bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:changeField= "changeField" >
 </dk-popup>
 
 

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

@@ -119,6 +119,7 @@ Page({
      */
     countSummaryAmount() {
         let item = this.data.curentAdItem;
+        if(!item)return;
         let staffCount = this.data.staffCount;
         let summaryInfo = this.data.summaryInfo
         let amount = 0;

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

@@ -1,7 +1,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
+<dk-navbar titleFontColor="#000000" navbarTitle="基础资料" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
 <van-sticky scroll-top="0">
-  <dk-navbar titleFontColor="#000000" navbarTitle="基础资料" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <!-- 查询条件 -->
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['dataName','dataCode','remarks'])}}">
   </dk-dropdown-menu>

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

@@ -1,10 +1,10 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
+<dk-navbar titleFontColor="#000000" navbarTitle="客户列表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
 <van-sticky scroll-top="0">
-  <dk-navbar titleFontColor="#000000" navbarTitle="客户列表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['cusName','cusPhone','adddressFull','remarks'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['cusName','cusPhone','adddressFull','remarks'])}}">
   </dk-dropdown-menu>
   <dk-tabs wx:if="{{gradeCode !== 'STD'}}" active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs"> </dk-tabs>
 </van-sticky>

package-basic-data/pages/product-attribute/product-attribute.wxml

@@ -1,7 +1,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<dk-navbar titleFontColor="#000000" navbarTitle="商品属性" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
 <!-- 顶部信息 -->
 <van-sticky scroll-top="0">
-  <dk-navbar titleFontColor="#000000" navbarTitle="商品属性" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <!-- 查询条件 -->
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['attributeName'])}}">
   </dk-dropdown-menu>

package-basic-data/pages/product-file/product-file.wxml

@@ -1,7 +1,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}" loadingName="{{$t['loading']}}" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<dk-navbar titleFontColor="#000000" navbarTitle="商品档案" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
 <van-sticky scroll-top="0">
-  <dk-navbar titleFontColor="#000000" navbarTitle="商品档案" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <!-- 查询条件 -->
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuName','skuModel'])}}">
   </dk-dropdown-menu>

package-basic-data/pages/register/product-detail/product-detail.wxml

@@ -1,5 +1,5 @@
 <!-- 头部导航栏以及销售任务进度 -->
-<dk-navbar fixed="{{true}}" titleFontColor="#ffffff" navbarTitle="产品详情" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
+<dk-navbar fixed="{{true}}" titleFontColor="#ffffff" navbarTitle="产品详情" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" customStyle="background-color:transparent;"/>
 <view class="top-navigation">
   <image class="background-image" src="{{imageUrl + 'computer.png'}}" />
   <view class="navigation-content">

package-basic-data/pages/staff/staff.wxml

@@ -2,11 +2,11 @@
 
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <van-dialog id="van-dialog" />
+<dk-navbar titleFontColor="#000000" navbarTitle="员工列表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
 <!-- 加载图层 -->
 <loading wx:if="{{loading}}"></loading>
 <!-- 粘性布局的查询条件 -->
 <van-sticky scroll-top="0">
-  <dk-navbar titleFontColor="#000000" navbarTitle="员工列表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <!-- 查询条件 -->
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['staffName','telephone'])}}">
   </dk-dropdown-menu>

package-business-analysis/pages/cus-rec-pay-report/cus-rec-pay-report.wxml

@@ -1,7 +1,8 @@
 <view>
-  <dk-navbar titleFontColor="#000000" navbarTitle="客户收支表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}"
-    bind:search="searchData" searchTextPlaceholder="{{placeholder}}"></dk-dropdown-menu>
+  <dk-navbar titleFontColor="#000000" navbarTitle="客户收支表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
+  <van-sticky scroll-top="0">
+    <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{placeholder}}"></dk-dropdown-menu>
+  </van-sticky>
   <view class="content">
     <view class="item-card" wx:for="{{cardDate}}" wx:for-index="index" wx:for-item="item">
       <view class="card-title">

package-business-analysis/pages/detail-report/detail-report.wxml

@@ -1,9 +1,9 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <loading wx:if="{{loading}}"></loading>
+<dk-navbar titleFontColor="#000000" navbarTitle="{{titleText}}" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
 <van-sticky scroll-top="0" wx:if="{{loadFlag}}">
-  <dk-navbar titleFontColor="#000000" navbarTitle="{{titleText}}" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
 	<!-- 查询条件 -->
-	<dk-dropdown-menu  model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{placeholder}}">
+	<dk-dropdown-menu  model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{placeholder}}">
 	</dk-dropdown-menu>
 </van-sticky> 
 

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

@@ -2,9 +2,8 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
 <van-dialog id="van-dialog" />
-
+<dk-navbar titleFontColor="#000000" navbarTitle="库存查询" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"  bind:getNavbarHeight="getNavbarHeight"/>
 <van-sticky offset-top="{{ 0 }}">
-  <dk-navbar titleFontColor="#000000" navbarTitle="库存查询" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <view style="display: flex;">
     <view style="width: 85%;">
       <!-- 查询条件 -->

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

@@ -1,10 +1,10 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
+<dk-navbar titleFontColor="#000000" navbarTitle="收发存汇总表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"  bind:getNavbarHeight="getNavbarHeight"/>
 <van-sticky scroll-top="0">
-  <dk-navbar titleFontColor="#000000" navbarTitle="收发存汇总表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuName','skuModel'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" navBarHeight="{{navBarHeight}}" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuName','skuModel'])}}">
   </dk-dropdown-menu>
 </van-sticky>
 

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

@@ -2,9 +2,8 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
 <van-dialog id="van-dialog" />
-
+<dk-navbar titleFontColor="#000000" navbarTitle="库存预警" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
 <van-sticky offset-top="{{ 0 }}">
-  <dk-navbar titleFontColor="#000000" navbarTitle="库存预警" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <view style="display: flex;">
     <view style="width: 85%;">
       <!-- 查询条件 -->

package-inventory/pages/warehousing-processing/warehousing-processing.wxml

@@ -2,10 +2,10 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <van-dialog id="van-dialog" />
 <loading wx:if="{{loading}}"></loading>
+<dk-navbar titleFontColor="#000000" navbarTitle="入库办理" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
 <van-sticky scroll-top="0">
-  <dk-navbar titleFontColor="#000000" navbarTitle="入库办理" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orderNo','telephone','adddress'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orderNo','telephone','adddress'])}}">
   </dk-dropdown-menu>
 
   <dk-tabs  active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs"> </dk-tabs>

package-purchase/pages/supplier-list/supplier-list.wxml

@@ -3,9 +3,9 @@
 <loading wx:if="{{loading}}" ></loading>
 <!-- 添加模版 -->
 <import src="/utils/template.wxml" />
+<dk-navbar titleFontColor="#000000" navbarTitle="供应商列表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
 <template is="myTemplate" />
 <van-sticky scroll-top="0">
-  <dk-navbar titleFontColor="#000000" navbarTitle="供应商列表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <!-- 查询条件 --> 
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['supplierName','contactName','contactPhone'])}}">
   </dk-dropdown-menu>

package-sales/pages/customer-collection/customer-collection.wxml

@@ -1,11 +1,11 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}" loadingName="{{$t['loading']}}" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<!-- 自定义导航 -->
+<dk-navbar titleFontColor="#000000" navbarTitle="客户收款" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
 <van-sticky scroll-top="0">
-  <!-- 自定义导航 -->
-  <dk-navbar titleFontColor="#000000" navbarTitle="客户收款" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress','contractNumber'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress','contractNumber'])}}">
   </dk-dropdown-menu>
 </van-sticky>
 

package-sales/pages/order-billing/add/add.js

@@ -714,7 +714,7 @@ Page({
    * @author : 于继渤
    */
   setGoods(e) {
-    console.log("jm1", this.data.cardList);
+    console.log("jm1", this.data.formData);
     //校验库存
     let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
     if (btnFormData.flag) {
@@ -1042,14 +1042,14 @@ Page({
     formData.goodsList.forEach(item => {
       //标价合计 =  商品标价 x  商品数量
       item.priceStd = item.priceStd ? item.priceStd : item.priceStandard //标价
-      item.amtStd = Number(item.priceStd * item.itemQty) //合计标价金额
-      item.itemAmt = item.priceSale * item.itemQty
-      item.factAmt = item.factPrice * item.itemQty
-      item.priceDiscount = item.priceStandard ? Number((item.priceSale / item.priceStandard) * 100).toFixed(2) : 100 //售价折扣
-      sumStandard += item.priceStandard * item.itemQty
-      sumAmount += item.itemAmt
-      factAmt += item.factAmt
-      sumQuantity += item.itemQty //数量
+      item.amtStd = Number(item.priceStd) *  Number(item.itemQty) //合计标价金额
+      item.itemAmt =  Number(item.priceSale) *  Number(item.itemQty)
+      item.factAmt =  Number(item.factPrice) *  Number(item.itemQty)
+      item.priceDiscount = item.priceStandard ? Number(( Number(item.priceSale) /  Number(item.priceStandard)) * 100).toFixed(2) : 100 //售价折扣
+      sumStandard +=  Number(item.priceStandard) *  Number(item.itemQty)
+      sumAmount +=  Number(item.itemAmt)
+      factAmt +=  Number(item.factAmt)
+      sumQuantity += Number( item.itemQty) //数量
 
     })
     formData.sumStandard = sumStandard

package-sales/pages/order-billing/add/add.wxml

@@ -11,7 +11,7 @@ bind:customersChoose="customersChoose" bind:changeCheckBox="changeCheckBox" bind
 <view style="height: 200rpx;"></view>
 
 <!--  保存 -->
-<dk-save-button id="saveButton"  model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" contentLineFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" bind:open="saveButton" contentList="{{contentSaveList}}" bind:change="saveChange"></dk-save-button>
+<dk-save-button id="saveButton"  model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" contentLineFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" bind:open="saveButton" contentList="{{contentSaveList}}" bind:change="saveChange"></dk-save-button>
 <!-- 修改价格反算 -->
 <dk-popup type="basic" title="修改价格"   value="{{dataItem}}" show="{{showReverseCalculationPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContentReverse}}" validFlag="{{true}}"  bind:blurNumberField ="blurNumberField"   bind:commit="editItemsReverse"  ></dk-popup>
 <!--  新手引导 -->

package-sales/pages/order-billing/detail/detail.js

@@ -39,8 +39,7 @@ Page({
     ],
     contentSaveList: [
       { code: 'flag', title: mixins.$t('saleOutBoundFlag'), type: 'checkbox' },
-      { code: 'need', title: mixins.$t('saleCollection'), type: 'str' },
-      { code: 'receivable', content: 0, type: 'number' },
+      { code: 'receivable', content: 0, type: 'number' ,title: mixins.$t('saleCollection')},
       {
         code: 'factAmt',
         content: 0,
@@ -67,8 +66,7 @@ Page({
       { code: 'collection', title: mixins.$t('collection'), plain: true }
     ],
     contentSaveList: [
-      { code: 'need', title:  mixins.$t('saleCollection'), type: 'str' },
-      { code: 'receivable', content: 0, type: 'number' },
+      { code: 'receivable', content: 0, type: 'number', title:  mixins.$t('saleCollection') },
       {
         code: 'factAmt',
         content: 0,

package-sales/pages/order-billing/order-billing.js

@@ -56,12 +56,7 @@ Page({
         code: 'outStatus',
         pullType: 'mSelect',
         typeName: 'outStatus'
-      },
-      {
-        code: 'receiveStatus',
-        pullType: 'mSelect',
-        typeName: 'receiveStatus'
-      },
+      }, 
       {
         code: 'deliveryDate',
         dataType: 'date'

package-sales/pages/order-billing/order-billing.wxml

@@ -2,10 +2,10 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <van-dialog id="van-dialog" />
 <loading wx:if="{{loading}}" loadingName="{{$t['loading']}}" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<dk-navbar titleFontColor="#000000" navbarTitle="订单开单" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
 <van-sticky scroll-top="0">
-  <dk-navbar titleFontColor="#000000" navbarTitle="订单开单" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress'])}}">
   </dk-dropdown-menu>
   <dk-tabs active="{{active}}"  list="{{tagList}}" bind:onChange="onChangeTabs"></dk-tabs>
 </van-sticky>

package-sales/pages/order-return/order-return.wxml

@@ -1,10 +1,10 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<dk-navbar titleFontColor="#000000" navbarTitle="销售退货" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
 <loading wx:if="{{loading}}" ></loading>
 <van-sticky scroll-top="0">
-  <dk-navbar titleFontColor="#000000" navbarTitle="销售退货" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress'])}}">
   </dk-dropdown-menu>
  
   <dk-tabs wx:if="{{!flgHandleSetting}}" active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>

package-sales/pages/order-return/order-return.wxss

@@ -0,0 +1,6 @@
+.title{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  align-content: center;
+}

package-sales/pages/sales-outbound/sales-outbound.wxml

@@ -1,10 +1,10 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}" loadingName="{{$t['loading']}}" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<dk-navbar titleFontColor="#000000" navbarTitle="销售出库" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
 <van-sticky scroll-top="0">  
-  <dk-navbar titleFontColor="#000000" navbarTitle="销售出库" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"/>
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress'])}}">
   </dk-dropdown-menu>
  
   <dk-tabs wx:if="{{!flgHandleSetting}}" active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>

pages/index/index.js

@@ -415,11 +415,10 @@ Page({
     let guideUrl = null;
     let menuList = app.globalData.menus
     let companyVip = app.globalData.company.vip
-    console.log('e', e);
     if(e.currentTarget.dataset.item.isVip){      
       if(companyVip){
         if (menuList && menuList.length > 0) {
-          let filters = menuList.filter(it => it.objectCode == code);
+          let filters = menuList.filter(it => it.id == code);
           if (filters && filters.length > 0) {
             guideUrl = filters[0].guideUrl
           }
@@ -436,9 +435,12 @@ Page({
       }
     }else{
       if (menuList && menuList.length > 0) {
-        let filters = menuList.filter(it => it.objectCode == code);
+        let filters = menuList.filter(it => it.id == code);
         if (filters && filters.length > 0) {
           guideUrl = filters[0].guideUrl
+          this.setData({
+            guideUrl:guideUrl
+          })
         }
       }
       // 调转页面