头部导航栏整体更新

package-accounts-manage/pages/daily-reconciliation-statement/daily-reconciliation-statement.json

@@ -1,5 +1,6 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText":"资金日记账"
+    "navigationBarTitleText":"资金日记账",
+    "navigationStyle": "custom"
     
 }

package-accounts-manage/pages/daily-reconciliation-statement/daily-reconciliation-statement.wxml

@@ -3,6 +3,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
 <van-sticky scroll-top="0">
+  <dk-navbar titleFontColor="#000000" navbarTitle="资金日记账" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
   <!-- 查询条件 -->
   <dk-dropdown-menu model:value="{{searchForm}}" flgSearchText="{{false}}" menuList="{{searchContent}}" bind:search="searchData">
   </dk-dropdown-menu>

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

@@ -2,5 +2,6 @@
     "usingComponents": {},
     "navigationBarTitleText": "客户接待",
     "enablePullDownRefresh": true,
-    "backgroundTextStyle": "light"
+    "backgroundTextStyle": "light",
+    "navigationStyle": "custom"
   }

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

@@ -2,6 +2,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}" ></loading>
 <van-sticky scroll-top="0">
+  <dk-navbar titleFontColor="#000000" navbarTitle="客户接待" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
   <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>

package-business-analysis/pages/business-overview/business-overview.json

@@ -1,4 +1,5 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText": "经营概况"
+    "navigationBarTitleText": "经营概况",
+    "navigationStyle": "custom"
   }

package-business-analysis/pages/business-overview/business-overview.wxml

@@ -1,5 +1,8 @@
 <loading wx:if="{{loading}}"></loading>
 <view>
+  <van-sticky scroll-top="0">
+    <dk-navbar titleFontColor="#000000" navbarTitle="经营概况" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
+  </van-sticky>
   <view class="content">
     <view class="item-card" catchtap="toDetail" data-item="INT">
       <view class="card-title">

package-business-analysis/pages/profit-report/profit-report.json

@@ -1,4 +1,5 @@
 {
   "usingComponents": {  "ec-canvas": "./ec-canvas/ec-canvas"},
-  "navigationBarTitleText":"销售利润"
+  "navigationBarTitleText":"销售利润",
+  "navigationStyle": "custom"
 }

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

@@ -2,17 +2,19 @@
 
 <loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 <!-- 顶部 -->
-
-<!-- 顶部筛选条件 -->
-<view class="head" style="position: fixed;top:0; z-index: 95;">
-  <view style="overflow: hidden;position: absolute;width: 100%; z-index: 6666;">
+<van-sticky scroll-top="0">
+    <dk-navbar titleFontColor="#000000" navbarTitle="销售利润" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
     <dk-dropdown-menu id="menu" model:value="{{searchForm}}" menuList="{{searchContent}}" bind:dkdropdowndateCommit="changeSearchContent"  bind:search="getSaleProfit" flgSearchText="{{false}}">
 	</dk-dropdown-menu>
+</van-sticky>
+<!-- 顶部筛选条件 -->
+<!-- <view class="head" style="position: fixed;top:0; z-index: 95;">
+  <view style="overflow: hidden;position: absolute;width: 100%; z-index: 6666;">
   </view>
-</view>
+</view> -->
 
 
-<view class="func" style="margin-top:100rpx;">
+<view class="func">
   <!-- 报表相关 -->
 
 

package-purchase/pages/pur-track-report/pur-track-report.json

@@ -1,4 +1,5 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "采购跟踪表"
+  "navigationBarTitleText": "采购跟踪表",
+  "navigationStyle": "custom"
 }

package-purchase/pages/pur-track-report/pur-track-report.wxml

@@ -2,6 +2,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}" loadingName="{{$t['loading']}}" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 <van-sticky scroll-top="0">
+  <dk-navbar titleFontColor="#000000" navbarTitle="采购跟踪表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}"  bind:getNavbarHeight="getNavbarHeight"/>
   <!-- 查询条件 -->
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['supplierName','telephone','adddress','orderNo'])}}">
   </dk-dropdown-menu>

package-purchase/pages/purchase-order/purchase-order.json

@@ -1,5 +1,6 @@
 {
     "usingComponents": {},
     "navigationBarTitleText": "采购订单",
-    "enablePullDownRefresh":true
+    "enablePullDownRefresh":true,
+    "navigationStyle": "custom"
 }

package-purchase/pages/purchase-order/purchase-order.wxml

@@ -4,6 +4,7 @@
 <loading wx:if="{{loading}}" ></loading>
 <van-dialog id="van-dialog" />
 <van-sticky scroll-top="0">
+  <dk-navbar titleFontColor="#000000" navbarTitle="采购订单" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
   <!-- 查询条件 --> 
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['supplierName','orderNo'])}}">
   </dk-dropdown-menu>

package-purchase/pages/purchase-return/purchase-return.json

@@ -1,4 +1,5 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText": "采购退货"
+    "navigationBarTitleText": "采购退货",
+    "navigationStyle": "custom"
 }

package-purchase/pages/purchase-return/purchase-return.wxml

@@ -2,7 +2,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 <van-sticky scroll-top="0">
-  <!-- 查询条件 -->
+  <dk-navbar titleFontColor="#000000" navbarTitle="采购退货" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
   <!-- 查询条件 -->
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['rpNo','supName','contactPhone','returnAddress'])}}">
   </dk-dropdown-menu>

package-sales/pages/order-sum-report/order-sum-report.json

@@ -1,4 +1,5 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText":"销售汇总表"
+    "navigationBarTitleText":"销售汇总表",
+    "navigationStyle": "custom"
 }

package-sales/pages/order-sum-report/order-sum-report.wxml

@@ -3,6 +3,7 @@
 <loading wx:if="{{loading}}"></loading>
 <van-dialog id="van-dialog" />
 <van-sticky scroll-top="0">
+  <dk-navbar titleFontColor="#000000" navbarTitle="销售汇总表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
   <!-- 查询条件 -->
   <dk-dropdown-menu id="dk-dropdown-menu" model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" bind:dkdropdowndateCommit="dkdropdowndateCommit" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuModel','skuName','cusName','cusPhone'])}}">
   </dk-dropdown-menu>