更新客户收支表页面，新增自定义导航栏组件

app.json

@@ -351,7 +351,8 @@
         "dk-guide": "components/dkbase/dk-guide/dk-guide",
         "dk-list-report": "components/dkbase/dk-list-report/dk-list-report",
         "dk-goos-list": "components/dkbase/dk-goos-list/dk-goos-list",
-        "dk-stepper": "components/dkbase/dk-stepper/dk-stepper"
+        "dk-stepper": "components/dkbase/dk-stepper/dk-stepper",
+        "dk-navbar":"components/dkbase/dk-navbar/dk-navbar"
     },
     "tabBar": {
         "color": "#95A8CB",

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

@@ -0,0 +1,74 @@
+// components/dkbase/dk-navbar/dk-navbar.js
+Component({
+
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+      navbarTitle:{
+        type: String,
+        value: 'dk自定义头部导航'
+      },
+      leftArrow:{
+        type: Boolean,
+        value: true
+      },
+      operateShow:{
+        type: Boolean,
+        value: true
+      },
+      navigationStyle: {
+        type: String,
+        value: ''
+      },
+      titleFontColor: {
+        type: String,
+        value: '#000000'
+      },
+      fixed:{
+        type: Boolean,
+        value: false
+      },
+      operateUrl:{
+        type: String,
+        value: ''
+      }
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+      paddingTopNum: wx.getSystemInfoSync().statusBarHeight+7
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+      clickLeft(e){
+        this.triggerEvent('clickBack', {
+          value: e
+        })
+      },
+      operateClick(e){
+        let url = this.data.operateUrl
+        let toUrl = null;
+        if (url) {
+          // 看下是否包括http,http就跳转到product页面
+          if (url.indexOf('http') >= 0) {
+            toUrl = '/pages/product/product'
+          } else {
+            // 说明是跳本产品
+            toUrl = url;
+          }
+          wx.navigateTo({
+            url: toUrl,
+            success: function (res) {
+              res.eventChannel.emit('url', url);
+            }
+          })
+        }
+      }
+    }
+})

components/dkbase/dk-navbar/dk-navbar.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

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

@@ -0,0 +1,12 @@
+<!--components/dkbase/dk-navbar/dk-navbar.wxml-->
+<view class="content" style="padding-top: {{paddingTopNum}}px;background: {{navigationStyle === 'none' || fixed == false ? 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>
+      <van-icon wx:if="{{operateShow}}" style="margin-left: 10rpx;" size="15px" name="question-o" data-item="{{item}}" catchtap="operateClick" color="{{titleFontColor}}" />
+    </view>
+  </view>
+</view>

components/dkbase/dk-navbar/dk-navbar.wxss

@@ -0,0 +1,39 @@
+.content{
+	width: 100%;
+	height: 30px;
+  line-height: 30px;
+  padding-bottom: 15rpx;
+	top: 0;
+	left: 0;
+}
+
+.title-content{
+  display: flex;
+  justify-content: center;
+  align-content: center;
+}
+
+.title{
+  width: 91%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  align-content: center;
+}
+
+.left-button{
+  display: flex;
+  justify-content: center;
+  align-content: center;
+  position: fixed;
+  left: 20rpx;
+  padding: 15rpx;
+}
+
+.back-left-button{
+  width: 20rpx;
+  height: 17px;
+  margin: auto;
+  padding: auto;
+  left: 30rpx;
+}

mixins/index.js

@@ -14,7 +14,7 @@ import Dialog from '@/dist/dialog/dialog.js';
 const app = getApp()
 
 module.exports = {
-  data: {  
+  data: {
     // 系统版本
     gradeCode: null,
     // 图片路径
@@ -79,7 +79,7 @@ module.exports = {
     // 初始加载查询
     initSearchFlag: true,
     // params事件监听，解决重复进入的问题
-    paramsInitFlag:true
+    paramsInitFlag: true
   },
   /**
    * @desc : 获取路由信息，供data中的对象使用
@@ -379,7 +379,7 @@ module.exports = {
   printedBill(row) {
     // 查询票据
     let docName = app.globalData['routeUrl'][this.data.routeObjName].docName
-    console.log('docName',docName,row);
+    console.log('docName', docName, row);
     if (!docName || !row || !row.id) {
       return;
     }
@@ -464,7 +464,7 @@ module.exports = {
                 url: url,
                 events: {
                   // 回调后
-                  refresh: function (data) { 
+                  refresh: function (data) {
                     if (that.handleSaveData) {
                       that.handleSaveData();
                     }
@@ -492,7 +492,7 @@ module.exports = {
               url: url,
               events: {
                 // 回调后
-                refresh: function (data) { 
+                refresh: function (data) {
                   if (that.handleSaveData) {
                     that.handleSaveData();
                   }
@@ -502,7 +502,7 @@ module.exports = {
                 // 通过eventChannel向被打开页面传送数据
                 res.eventChannel.emit('params', {
                   params: that.data.params,
-                  formType:that.data.params.formType?that.data.params.formType:''
+                  formType: that.data.params.formType ? that.data.params.formType : ''
                 })
               }
             })
@@ -1077,6 +1077,16 @@ module.exports = {
     }
   },
   /**
+   * 点击返回按钮返回上一层
+   * @author 刘尧
+   * @date 2024.05.31
+   */
+  handleNavBack() {
+    wx.navigateBack({
+      data: 1
+    })
+  },
+  /**
    * @desc : 生命周期函数（onShow)
    * @author : 周兴
    * @date : 2024/1/22
@@ -1121,11 +1131,11 @@ module.exports = {
       let _this = this;
       // 指定类型
       eventChannel.once('params', function (data) {
-        if(!_this.data.paramsInitFlag){
+        if (!_this.data.paramsInitFlag) {
           return;
         }
         _this.setData({
-          paramsInitFlag:false
+          paramsInitFlag: false
         })
         // 获取参数
         if (data.formMode) {
@@ -1136,9 +1146,9 @@ module.exports = {
             menuUuid: data.menuUuid,
           })
         }
-        if(data.params){
+        if (data.params) {
           _this.setData({
-            params:data.params
+            params: data.params
           })
         }
         //菜单编码
@@ -1202,11 +1212,11 @@ module.exports = {
           // _this.loadTempData();
         }
       })
-      setTimeout(()=>{
+      setTimeout(() => {
         _this.setData({
-          paramsInitFlag:true
+          paramsInitFlag: true
         })
-      },2000)
+      }, 2000)
     } else {
       // 加载后续数据
       this.handleLoadData();

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

@@ -158,14 +158,5 @@ Page({
 
     },
 
-    /**
-     * 点击返回按钮返回上一层
-     * @author 刘尧
-     * @date 2024.05.31
-     */
-    navBackClick(){
-      wx.navigateBack({
-        data: 1
-      })
-    }
+    
 })

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

@@ -1,11 +1,8 @@
 <!-- 头部导航栏以及销售任务进度 -->
+<dk-navbar navigationStyle="none" fixed="{{true}}" titleFontColor="#ffffff" navbarTitle="产品详情" bind:clickBack="handleNavBack" operateShow="{{true}}" operateUrl="https://mp.weixin.qq.com/s/DbqdMosevFqIB5QezsBcSw"/>
 <view class="top-navigation">
   <image class="background-image" src="{{imageUrl + 'computer.png'}}" />
   <view class="navigation-content">
-    <view class="navigation-menu" style="top:{{statusHeight + 'rpx'}}">
-      <image class="back-left-button" catchtap="navBackClick" src="{{imageUrl + 'back_left.png'}}" />
-      <view style="color: #FFFFFF;">产品详情</view>
-    </view>
     <view class="navigation-task-progress">
       <view class="task-progress-top">
         <view class="task-progress-standard">

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

@@ -1,4 +1,3 @@
-<!--package-business-analysis/pages/cus-rec-pay-report/cus-rec-pay-report.wxml-->
 <view>
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}"
     bind:search="searchData" searchTextPlaceholder="{{placeholder}}"></dk-dropdown-menu>
@@ -15,14 +14,9 @@
               实际欠款
             </view>
             <view class="icon-view">
-              <van-icon size="15px" name="question-o" />
-              <!-- <van-icon size="15px" name="gold-coin-o" style="margin-left:10rpx;" /> -->
+              <van-icon size="12px" name="question-o" />
             </view>
-            <!-- <view style="font-size: 28rpx;font-weight: 700;">
-              ￥{{item.arrears}}
-            </view> -->
-            <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="14" contentColor="#FF7B1A"
-              contentFontWeight="bold" content="{{item.arrears}}"></dk-cell>
+            <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="14" contentColor="#002340" contentFontWeight="bold" content="{{item.arrears}}"></dk-cell>
           </view>
         </view>
       </view>
@@ -30,8 +24,7 @@
         <view class="content-item" wx:for="{{item.item}}" wx:for-index="index" wx:for-item="itemInfo">
           <view class="top">
             <view class="title">{{itemInfo.biznisNo}}</view>
-            <!-- <view class="money">￥{{itemInfo.outAmt || itemInfo.returnAmt}}</view> -->
-            <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="14" contentColor="#FF7B1A"
+            <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="14" contentColor="#A5814A"
               contentFontWeight="bold" content="{{itemInfo.outAmt || itemInfo.returnAmt}}"></dk-cell>
           </view>
           <view class="under">
@@ -41,8 +34,7 @@
         </view>
         <view class="total">
           <view class="total-title">合计</view>
-          <!-- <view class="total-money">￥{{item.totalMoney? item.totalMoney: 0}}</view> -->
-          <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="17" contentColor="#FF7B1A"
+          <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="17" contentColor="#A5814A"
             contentFontWeight="bold" content="{{item.totalMoney? item.totalMoney: 0}}"></dk-cell>
         </view>
       </view>