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

@@ -25,6 +25,14 @@ Component({
       type: Boolean,
       value: false
     },
+    totalTipFlag: {
+      type: Boolean,
+      value: false
+    },
+   detailTipFlag: {
+      type: Boolean,
+      value: false
+    },
     // 区域
     cardList: {
       type: Array,
@@ -446,8 +454,35 @@ Component({
      * @author : 王英杰
      */
     clickTip() {
-      this.triggerEvent("clickTip", {})
+      this.handleTap()
+      // this.triggerEvent("clickTip", {})
+    },
+     /**
+     * @desc : 关闭tip
+     * @date : 2024/5/24 15:49
+     * @author : 王英杰
+     */
+    handleTap() {
+      if(this.data.totalTipFlag){
+        let contentObj = this.data.contentObj
+        Object.keys(contentObj).forEach(key => {
+          // key 是对象的键名  
+          let array = contentObj[key];
+          // 检查它是否真的是一个数组  
+          if (Array.isArray(array)) {
+            array.forEach(item => {
+              if (item.tip&&this.selectComponent('#' + item.code)) {
+                this.selectComponent('#' + item.code).setShowTipFlag(false)
+              }
+            });
+          }
+        });  
+      } 
+      if(this.data.detailTipFlag){ 
+        this.selectComponent('#dkPopup').handleTap()
+      }  
     },
+    
     /**
      * @desc   : 改变后是否弹出询问
      * @author : 周兴

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

@@ -216,8 +216,8 @@
 
             <!--文本框-->
             <van-field wx:if="{{item.type=='str' && (item.show || item.show == undefined) && !item.hide }}" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize clearable border="{{ false }}" readonly="{{!!readonly || !!item.readonly}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:blur="blurField" bind:clear="clearField" errorMessage="{{item.errMsg}}">
-              <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
-              <!-- <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}'  bind:clickTip="clickTip"></dk-tip> -->
+              <!-- <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" /> -->
+              <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}'  bind:clickTip="clickTip"></dk-tip>
             </van-field>
             <!--选单-->
             <van-field wx:if="{{item.type=='choose' && (item.show || item.show == undefined) && !item.hide}}" type="textarea" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link="{{!item.readonly}}" catchtap="open" autosize border="{{ false }}" readonly="{{true}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
@@ -257,7 +257,7 @@
               <van-icon wx:if="{{!readonly && form[item.code]}}" data-item="{{item}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
             </van-field>
             <!--数字类-->
-            <dk-number-input wx:if="{{item.type=='number'  && (item.show || item.show == undefined)}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" required="{{item.required?true:false }}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" center="left" readonly="{{!!readonly || !!item.readonly}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#FF7B1A" titleFontWeight="normal" titleColor="{{!!item.readonly?'#95A8CB':'#002340'}}" inputValue="{{form[item.code]}}" negative="{{item.negative}}" maxFlag="{{item.maxFlag}}" max="{{item.max}}" bind:triggerBindBlur="changeNumberBlur" bind:triggerBindValue="changeNumberField" min="{{item.min}}"></dk-number-input>
+            <dk-number-input wx:if="{{item.type=='number'  && (item.show || item.show == undefined)}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" required="{{item.required?true:false }}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" center="left" readonly="{{!!readonly || !!item.readonly}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#FF7B1A" titleFontWeight="normal" titleColor="{{!!item.readonly?'#95A8CB':'#002340'}}" inputValue="{{form[item.code]}}" negative="{{item.negative}}" maxFlag="{{item.maxFlag}}" max="{{item.max}}" bind:clickTip ="clickTip" bind:triggerBindBlur="changeNumberBlur" bind:triggerBindValue="changeNumberField" min="{{item.min}}"></dk-number-input>
 
             <!--备注-->
             <van-field wx:if="{{item.type=='textarea'  && (item.show || item.show == undefined)}}" type="textarea" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" clearable readonly="{{!!readonly && !!item.readonly}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:blur="blurField" bind:clear="clearField" errorMessage="{{item.errMsg}}">
@@ -300,9 +300,8 @@
 <van-popup show="{{ showDate }}" custom-style="border-radius:30rpx 30rpx 0 0;" position="bottom" bind:close="cancelDatePop">
   <van-datetime-picker type="date" bind:confirm="chooseDate" bind:cancel="cancelDatePop" loading="{true}" value="{{dataTime}}" min-date="{{ minDate }}" />
 </van-popup>
- 
- 
-<dk-popup id="dkPopup" stepperDecimal="decimalPlaces" type="{{popType}}" routeObjName="{{routeObjName}}" titleTagCol="{{titleTagCol}}" titleCol="{{titleCol}}" subCol="{{subCol}}" descCol="{{descCol}}" iconCol="{{iconCol}}" priceTailCol="{{priceTailCol}}" priceCol="{{pupPriceCol}}" priceTitle="{{priceTitle}}" value="{{dataItem}}" show="{{showPop}}" contentObj="{{popContent_sku}}" popupTopObj="{{popupTopObj_sku}}" bind:changeStep="changeStep" bind:changeCheckBox="changeCheckBox" bind:openChoose="openChoose" readonly="{{readonly}}" bind:changeField="changeDetailField" bind:blurNumberField="blurNumberField" bind:commit="editItems" bind:openPackageBox="openPackageBox" bind:openDkNumberInput="openPopDkNumberInput"validFlag='{{validFlag}}'></dk-popup> 
+  
+<dk-popup id="dkPopup" stepperDecimal="decimalPlaces" type="{{popType}}" routeObjName="{{routeObjName}}" titleTagCol="{{titleTagCol}}" titleCol="{{titleCol}}" subCol="{{subCol}}" descCol="{{descCol}}" iconCol="{{iconCol}}" priceTailCol="{{priceTailCol}}" priceCol="{{pupPriceCol}}" priceTitle="{{priceTitle}}" value="{{dataItem}}" show="{{showPop}}" contentObj="{{popContent_sku}}" popupTopObj="{{popupTopObj_sku}}" bind:changeStep="changeStep" bind:changeCheckBox="changeCheckBox" bind:openChoose="openChoose" readonly="{{readonly}}" bind:changeField="changeDetailField" bind:blurNumberField="blurNumberField" bind:commit="editItems" bind:openPackageBox="openPackageBox" bind:openDkNumberInput="openPopDkNumberInput"validFlag='{{validFlag}}'  bind:clickTip='clickTip'  ></dk-popup> 
 <!-- 箱片 -->
 <dk-popup type="basic" title="修改包装数量" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPopBox}}" routeObjName="{{routeObjName}}" contentObj="{{popContentBox}}" bind:changeStep="changeStep" bind:commit="editItemsBox" stepperDecimal="decimalPlaces"></dk-popup>
 

components/dkbase/dk-form-more-items/dk-form-more-items.js

@@ -234,6 +234,36 @@ Component({
    * 组件的方法列表
    */
   methods: {
+       /**
+     * @desc : tip点击事件
+     * @date : 2024/5/24 15:49
+     * @author : 王英杰
+     */
+    clickTip() {
+      this.handleTap()
+      // this.triggerEvent("clickTip", {})
+    },
+     /**
+     * @desc : 关闭tip
+     * @date : 2024/5/24 15:49
+     * @author : 王英杰
+     */
+    handleTap() { 
+        let contentObj = this.data.contentObj
+        Object.keys(contentObj).forEach(key => {
+          // key 是对象的键名  
+          let array = contentObj[key];
+          // 检查它是否真的是一个数组  
+          if (Array.isArray(array)) {
+            array.forEach(item => {
+              if (item.tip&&this.selectComponent('#' + item.code)) {
+                this.selectComponent('#' + item.code).setShowTipFlag(false)
+              }
+            });
+          }
+        });    
+    },
+    
     /**
      * @desc   : 显示tip
      * @author : 周兴

components/dkbase/dk-form-more-items/dk-form-more-items.wxml

@@ -111,7 +111,8 @@
     <view wx:if="{{card.name != 'items'}}" wx:for="{{contentObj[card.name]}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
       <!--文本框-->
       <van-field id="{{item.code}}" wx:if="{{item.type=='str'}}" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize clearable border="{{ false }}" readonly="{{!!item.readonly}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:blur="blurField" bind:clear="clearField" errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
+        <!-- <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" /> -->
+        <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}'  bind:clickTip="clickTip"></dk-tip>
       </van-field>
       <!--下拉-->
       <van-field id="{{item.code}}" wx:if="{{item.type=='drop'}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}"  label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">

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

@@ -174,7 +174,7 @@ Component({
         // 检查它是否真的是一个数组  
         if (Array.isArray(array)) {
           array.forEach(item => {
-            if (item.tip) {
+            if (item.tip&&this.selectComponent('#' + item.code)) {
               this.selectComponent('#' + item.code).setShowTipFlag(false)
             }
           });
@@ -187,7 +187,8 @@ Component({
      * @author : 王英杰
      */
     clickTip() {
-      this.triggerEvent("clickTip", {})
+      this.handleTap()
+      // this.triggerEvent("clickTip", {})
     },
     /**
      * @desc   : 打开下拉

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

@@ -5,8 +5,8 @@
     <view wx:for="{{contentObj[card]}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
       <!--文本框-->
       <van-field wx:if="{{item.type=='str' && !item.hide}}" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" clearable readonly="{{!!item.readonly}}" label-class="{{!!item.readonly?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:blur="blurField" bind:clear="clearField" catchtap="openStr" errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
-        <!-- <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}' textColor="red" bind:clickTip="clickTip"></dk-tip> -->
+        <!-- <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" /> -->
+        <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}'   bind:clickTip="clickTip"></dk-tip>
       </van-field>
       <!--单选下拉-->
       <van-field wx:if="{{item.type=='drop' && !item.hide}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" label-class="{{!!item.readonly?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
@@ -33,8 +33,8 @@
       </van-field>
       <!--开关-->
       <van-field wx:if="{{item.type=='switch'}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="{{!!item.readonly?'readonly-label':'nomal-label'}}" input-align="right" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
-        <!-- <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}' textColor="red" bind:clickTip="clickTip"></dk-tip> -->
+        <!-- <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" /> -->
+        <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}'  bind:clickTip="clickTip"></dk-tip>
         <view slot="inputbefor" style="width:100%;text-align: left;padding-top: 5rpx;">
           <van-switch size="20px" checked="{{ form[item.code]}}" bind:change="onChange" active-color="#3E69F6" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" data-value="{{form[item.code]}}" data-key="{{item.code}}" disabled="{{item.disabled}}" />
         </view>
@@ -95,8 +95,8 @@
 
       <!--备注-->
       <van-field wx:if="{{item.type=='textarea' && !item.hide}}" rows="{{item.rows}}" show-word-limit="{{item.showWordLimit}}" type="textarea" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!item.readonly}}" label-class="{{!!item.readonly?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class {{item.rows ?  'input-rows-class' : ''}}" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:blur="blurField" errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
-        <!-- <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}' textColor="red" bind:clickTip="clickTip"></dk-tip> -->
+        <!-- <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" /> -->
+        <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}' bind:clickTip="clickTip"></dk-tip>
       </van-field>
       <!--附件-->
       <view style="display:flex;width:100%;margin: 1vw; padding-top: 20rpx;" wx:if="{{item.type=='uploader'}}">

components/dkbase/dk-list-report/dk-list-report.js

@@ -199,6 +199,37 @@ Component({
         })
       }
     },
+     /**
+     * @desc : 关闭tip
+     * @date : 2024/5/24 15:49
+     * @author : 王英杰
+     */
+    handleTap() {
+      let content = this.data.content
+      let list = this.data.list 
+      if(list){
+        list.forEach((key,index) => { 
+          // 检查它是否真的是一个数组  
+          if (Array.isArray(content)) {
+            content.forEach(item => {
+              if (item.tip&&this.selectComponent('#' + item.code+index)) {
+                this.selectComponent('#' + item.code+index).setShowTipFlag(false)
+              }
+            });
+          }
+        }); 
+      }
+     
+    },
+    /**
+     * @desc : tip点击事件
+     * @date : 2024/5/24 15:49
+     * @author : 王英杰
+     */
+    clickTip() {
+      this.handleTap()
+      // this.triggerEvent("clickTip", {})
+    },
     /**
      * @desc   : 选择数据
      * @author : 周兴
@@ -251,6 +282,7 @@ Component({
      * @date   : 2024/1/26 11:46
      */
     toDetail(e) { 
+      this.handleTap()
       // 相当于勾选
       if (this.data.chooseFlag) {
         this.chooseData(e);
@@ -266,6 +298,7 @@ Component({
      * @date   : 2024/1/26 11:46
      */
     toTitle(e) {
+      this.handleTap()
       this.triggerEvent("toTitle", {
         item: e.currentTarget.dataset.item
       })

components/dkbase/dk-list-report/dk-list-report.wxml

@@ -115,11 +115,12 @@
     </view>
     <!-- 内容 -->
     <view style="width:100%;display: flex;flex-wrap: wrap;justify-content: center;" catchtap="toDetail" data-item="{{item}}" data-index="{{index}}">
-      <view wx:if="{{!contentCol}}"  wx:for="{{content}}" class="{{contentCardTwoFlg?'card-class_four':'card-class'}}" wx:for-item="col" data-item="{{col}}" style="{{content.length <= 4? 'width: 46%;': ''}}">
+      <view wx:if="{{!contentCol}}"  wx:for="{{content}}" class="{{contentCardTwoFlg?'card-class_four':'card-class'}}" wx:for-item="col"  wx:for-index="colindex" data-item="{{col}}" style="{{content.length <= 4? 'width: 46%;': ''}}">
         <image src="{{imageUrl + col.image + '.png'}} " class="card-bottom-image" />
         <view id="itemCardView" style="position: absolute;z-index: 1;width: 98%;">
-          <view class="card-label-class" catchtap="showTip" data-item="{{col}}">{{col.label}}
-            <van-icon wx:if="{{col.tip}}" custom-style="margin-left: 10rpx;" name="question-o" />
+          <view class="card-label-class">{{col.label}}
+            <!-- <van-icon wx:if="{{col.tip}}" custom-style="margin-left: 10rpx;" name="question-o" /> --> 
+            <dk-tip wx:if="{{col.tip}}"  style="margin-left: 10rpx; " id="{{col.code+index}}" Up="{{true}}" Right="{{true}}" tipContent='{{col.tip}}'  bind:clickTip="clickTip"></dk-tip>
           </view>
           <view>
             <!-- <view style="color:#606EB2;display: flex;margin-top: 10rpx;">

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

@@ -6,8 +6,8 @@
     </dk-cell> -->
 
     <van-field label-class="input-title-class" style="--color--:{{titleColor}};--fontSize--:{{fontSize + 'px'}};--width--:{{titleWidth}};--fontWeight--:{{titleFontWeight}};" required="{{required?true:false }}" input-align="{{left}}" label="{{titleValue}}" placeholder="{{(inputValue || inputValue == 0)?'':placeholder}}" data-type='name' readonly="{{true}}" autosize border="{{ false }}" errorMessage="{{errorMessage}}" catchtap="handleInput" showInput="{{false}}" >
-      <van-icon wx:if="{{tip}}" slot="label-icon" name="question-o" catchtap="showTip" />
-      <!-- <dk-tip wx:if="{{tip}}" slot="label-icon" style="display: inline-block;" id="{{code}}" Up="{{true}}" Right="{{true}}" tipContent='{{tip}}' bind:clickTip="clickTip"></dk-tip> -->
+      <!-- <van-icon wx:if="{{tip}}" slot="label-icon" name="question-o" catchtap="showTip" /> -->
+      <dk-tip wx:if="{{tip}}" slot="label-icon" style="display: inline-block;" id="{{code}}" Up="{{true}}" Right="{{true}}" tipContent='{{tip}}' bind:clickTip="clickTip"></dk-tip>
       <dk-cell slot="inputbefor" style="width: 100%;" center="{{center=='right'?'flex-end':center}}" contentRight="{{contentRight}}" left="0" height="{{height}}" contentFontSize="{{fontSize}}" contentColor="{{inputColor}}" contentFontWeight="{{fontWeight}}" amount="{{sign?true:false }}" tail="{{percentSignFlag ? '%' : ''}}" percentSignFlag="{{percentSignFlag}}" placeholderColor="#c8c9cc" content="{{(inputValue || inputValue == 0)?inputValue:null}}" placeholder="{{(inputValue || inputValue == 0)?'':placeholder}}"></dk-cell>
     </van-field>
   </view>

components/dkbase/dk-popup/dk-popup.js

@@ -172,6 +172,22 @@ Component({
    */
   methods: {
     /**
+     * @desc : 关闭tip
+     * @date : 2024/5/24 15:49
+     * @author : 王英杰
+     */
+    handleTap() { 
+      let contentObj = this.data.contentObj
+         // 检查它是否真的是一个数组  
+         if (Array.isArray(contentObj)) {
+          contentObj.forEach(item => {
+            if (item.tip&&this.selectComponent('#' + item.code)) {
+              this.selectComponent('#' + item.code).setShowTipFlag(false)
+            }
+          });
+        } 
+    },
+    /**
      * @desc   : 显示tip
      * @author : 周兴
      * @date   : 2024/4/25 11:46
@@ -230,6 +246,15 @@ Component({
       })
       this.triggerEvent("onClosePopup", {})
     },
+
+    /**
+     * @desc : tip点击事件
+     * @date : 2024/5/24 15:49
+     * @author : 王英杰
+     */
+    clickTip() { 
+      this.triggerEvent("clickTip", {})
+    },
     /**
      * @desc :  选择数据
      * @author : 周兴

components/dkbase/dk-popup/dk-popup.wxml

@@ -51,16 +51,19 @@
     <view wx:for="{{contentObj}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
       <!--文本框-->
       <van-field wx:if="{{item.type=='str'}}" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{!!readonly || !!item.readonly}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
+        <!-- <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" /> -->
+        <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}'   bind:clickTip="clickTip"></dk-tip>
       </van-field>
       <!--下拉-->
       <van-field wx:if="{{item.type=='drop'}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.name]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
+        <!-- <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" /> -->
+        <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}'   bind:clickTip="clickTip"></dk-tip>
       </van-field>
       <!--选单-->
       <van-field wx:if="{{item.type=='choose'}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" data-readonly = "{{!!readonly || item.readonly}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
         <van-icon wx:if="{{(!readonly ) && form[item.name] && (item.clear || item.clear == undefined)}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
-        <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
+        <!-- <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" /> -->
+        <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}'   bind:clickTip="clickTip"></dk-tip>
       </van-field>
       <!--选择框-->
       <van-field wx:if="{{item.type=='checkbox'}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-align="right" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}"  errorMessage="{{item.errMsg}}">
@@ -89,9 +92,10 @@
  
       <!--箱片-->
       <van-field   wx:if="{{item.type=='packageBox' && !!form['flgSubUnit'] }}"  required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" readonly="{{true}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" catchtap="openPackageBox" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}"   errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
+        <!-- <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" /> -->
+        <dk-tip wx:if="{{item.tip}}" slot="label-icon" style="display: inline-block;" id="{{item.code}}" Up="{{true}}" Right="{{true}}" tipContent='{{item.tip}}'   bind:clickTip="clickTip"></dk-tip>
       </van-field>
-
+ 
      
     </view>
   </view>

components/dkbase/dk-tip/dk-tip.js

@@ -37,6 +37,13 @@ Component({
       type: String,
       value: "white"
     },
+     /**
+     * 字体大小（默认12px）
+     */
+    fontSize:{
+      type:String,
+      value:'12px'
+    },
   },
 
   /**
@@ -56,9 +63,10 @@ Component({
      * @date   : 2024/4/25 11:46
      */
     showTip(e) {
-      this.triggerEvent('clickTip', {    })
+      let showTip = this.data.showTip
+      this.triggerEvent('clickTip', {    }) 
       this.setData({
-        showTip: true
+        showTip: !showTip
       })
     },
     setShowTipFlag(flag) {

components/dkbase/dk-tip/dk-tip.wxml

@@ -13,8 +13,8 @@
     <van-icon name="question-o" size="30rpx" catchtap="showTip" /> <!-- 添加size属性以控制图标大小（可选） -->
   </view>
   <!-- 下右弹框 -->
-  <view wx:if="{{showTip&&Down&&Right}}" class="tipDownRight" >
-    <text> {{tipContent}}</text>
+  <view wx:if="{{showTip&&Down&&Right}}" class="tipDownRight" > 
+    <text class="tipContentStyle" style="--color--:{{textColor}};--fontSize--:{{fontSize}};">{{tipContent}}</text>
   </view>
   <!-- 下左弹框 -->
   <view wx:if="{{showTip&&Down&&Left}}" class="tipDownLeft"  >

components/dkbase/dk-tip/dk-tip.wxss

@@ -1,5 +1,5 @@
 .tipDownRight {
-  min-height: 80rpx;
+  min-height: 60rpx;
   color: white ;
   display: flex;
   align-items: center;
@@ -31,7 +31,7 @@
 }
 
 .tipDownLeft {
-  min-height: 80rpx;
+  min-height: 60rpx;
   color: white;
   display: flex;
   align-items: center;
@@ -61,9 +61,12 @@
   top: -14rpx;
   right: 10rpx;
 }
-
+.tipContentStyle{ 
+  color:var(--color--); 
+  font-size:var(--fontSize--);
+}
 .tipUpRight {
-  min-height: 80rpx;
+  min-height: 60rpx;
   color: white;
   display: flex;
   align-items: center;
@@ -96,7 +99,7 @@
 }
 
 .tipUpLeft {
-  min-height: 80rpx;
+  min-height: 60rpx;
   color: white;
   display: flex;
   align-items: center;

mixins/index.js

@@ -728,6 +728,14 @@ module.exports = {
     })
   },
   /**
+   * @desc : 关闭所有的tip
+   * @date : 2024/5/24 15:49
+   * @author : 王英杰
+   */
+  handleTap(){  
+    this.selectComponent('#'+this.data.formName).handleTap() 
+  },
+  /**
    * @desc   : 查询明细的方法（不给外部调用）
    * @author : 周兴
    * @date   : 2022/12/8 17:56

package-accounts-manage/pages/fund-account/add/add.wxml

@@ -3,7 +3,7 @@
 <!-- 加载图层 -->
 <loading wx:if="{{loading}}"></loading>
 <!-- 列表区 -->
-<dk-form id="{{formName}}"  routeObjName="{{routeObjName}}"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" table="{{table}}"bind:chooseData="chooseData">
+<dk-form id="{{formName}}"  routeObjName="{{routeObjName}}"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" table="{{table}}"bind:chooseData="chooseData"  bindtap="handleTap"  >
 </dk-form>
  
 

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

@@ -106,6 +106,22 @@ Page({
       active: e.currentTarget.dataset.active
     })
   },
+  /**
+   * @desc : 关闭所有的tip
+   * @date : 2024/5/24 15:49
+   * @author : 王英杰
+   */
+  handleTap(){  
+    this.selectComponent('#dkPopup').handleTap()
+  },
+   /**
+     * @desc : tip点击事件
+     * @date : 2024/5/24 15:49
+     * @author : 王英杰
+     */
+    clickTip() {
+      this.handleTap() 
+    },
   onClickLeft() {
     wx.navigateBack({
       data: 1

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

@@ -16,6 +16,8 @@
 <loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 
 <van-dialog id="van-dialog" />
+
+<view bindtap="handleTap">
 <van-sticky offset-top="{{ 0 }}">
   <!-- <van-nav-bar title="选择商品" left-text="" border="{{false}}" left-arrow="{{true}}" bind:click-left="onClickLeft" /> -->
   <dk-navbar titleFontColor="#000000" navbarTitle="选择商品" bind:clickBack="onClickLeft" operateShow="{{false}}" bind:getNavbarHeight="getNavbarHeight" />
@@ -394,23 +396,23 @@
 
 <!--  采购入库 采购订单 其它入库  -->
  
-<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' && billType !== 'inventory' && billType !== 'out'   }}" stepperDecimal="decimalPlaces" type="sale" descCol="skuName" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" subCol="calculationFormula" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="sumPrice" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:changeField="changeField" bind:blurNumberField="blurNumberField" bind:openPackageBox="openPackageBox" bind:commit="editItems"validFlag='{{true}}' bind:openChoose="openChoose"validFlag='{{true}}'>
+<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' && billType !== 'inventory' && billType !== 'out'   }}"  id="dkPopup" stepperDecimal="decimalPlaces" type="sale" descCol="skuName" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" subCol="calculationFormula" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="sumPrice" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:changeField="changeField" bind:blurNumberField="blurNumberField" bind:openPackageBox="openPackageBox" bind:commit="editItems"validFlag='{{true}}' bind:openChoose="openChoose"validFlag='{{true}}'bind:clickTip='clickTip'>
 </dk-popup> 
  
-<dk-popup wx:if="{{ billType == 'out' }}" stepperDecimal="decimalPlaces" type="sale" descCol="skuName" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" subCol="calculationFormula" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:changeField="changeField" bind:blurNumberField="blurNumberField" bind:openPackageBox="openPackageBox" bind:commit="editItems"validFlag='{{true}}'>
+<dk-popup wx:if="{{ billType == 'out' }}" id="dkPopup" stepperDecimal="decimalPlaces" type="sale" descCol="skuName" titleTagCol="brandName" titleCol="skuModel" iconCol="imagesUrl" subCol="calculationFormula" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:changeField="changeField" bind:blurNumberField="blurNumberField" bind:openPackageBox="openPackageBox" bind:commit="editItems"validFlag='{{true}}' bind:clickTip='clickTip'>
 </dk-popup>
  
 
 <!-- 库存 -->
-<dk-popup id="dkPopup" wx:if="{{ billType == 'inventory' }}" type="sale" descCol="skuName" stepperDecimal="decimalPlaces" subCol="calculationFormula" titleTagCol="brandName" 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" bind:changeCheckBox="popupChangeCheckBox"validFlag='{{true}}'>
+<dk-popup id="dkPopup" wx:if="{{ billType == 'inventory' }}" type="sale" descCol="skuName" stepperDecimal="decimalPlaces" subCol="calculationFormula" titleTagCol="brandName" 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" bind:changeCheckBox="popupChangeCheckBox"validFlag='{{true}}'bind:clickTip='clickTip'>
 </dk-popup>
 
 
 <!-- 销售开单 -->
-<dk-popup id="dkPopup" wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="brandName" subCol="calculationFormula" descCol="skuName" stepperDecimal="decimalPlaces" titleCol="skuModel" priceCol="sumPrice" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" bind:changeStep="changeStep" bind:openPackageBox="openPackageBox" contentObj="{{popContent}}" bind:commit="editItems" bind:blurNumberField="blurNumberField" bind:changeField="changeField" bind:changeCheckBox="popupChangeCheckBox"validFlag='{{true}}'>
+<dk-popup id="dkPopup" wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="brandName" subCol="calculationFormula" descCol="skuName" stepperDecimal="decimalPlaces" titleCol="skuModel" priceCol="sumPrice" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" bind:changeStep="changeStep" bind:openPackageBox="openPackageBox" contentObj="{{popContent}}" bind:commit="editItems" bind:blurNumberField="blurNumberField" bind:changeField="changeField" bind:changeCheckBox="popupChangeCheckBox"validFlag='{{true}}'bind:clickTip='clickTip'>
 </dk-popup>
 <!-- 销售出库 -->
-<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="brandName" subCol="calculationFormula" descCol="skuName" stepperDecimal="decimalPlaces" titleCol="skuModel" priceCol="sumPrice" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:commit="editItems" popupTopObj="{{popupTopObj}}" bind:openPackageBox="openPackageBox" bind:blurNumberField="blurNumberField" bind:changeField="changeField" validFlag='{{true}}'>
+<dk-popup wx:if="{{ billType == 'saleOut'}}" id="dkPopup" type="sale" titleTagCol="brandName" subCol="calculationFormula" descCol="skuName" stepperDecimal="decimalPlaces" titleCol="skuModel" priceCol="sumPrice" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:changeStep="changeStep" bind:commit="editItems" popupTopObj="{{popupTopObj}}" bind:openPackageBox="openPackageBox" bind:blurNumberField="blurNumberField" bind:changeField="changeField" validFlag='{{true}}'bind:clickTip='clickTip'>
 </dk-popup>
 
 <!-- 箱片 -->
@@ -423,4 +425,6 @@
 </dk-single-dropdown-item>
 
 <!-- 修改已选商品金额 和单价 -->
-<dk-popup type="basic" title="修改价格" value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}" bind:commit="editItemsChangePrice" bind:changeStep="changePriceStep" bind:blurNumberField="blurNumPriceberField" stepperDecimal="decimalPlaces"></dk-popup>
+<dk-popup type="basic" title="修改价格" value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}" bind:commit="editItemsChangePrice" bind:changeStep="changePriceStep" bind:blurNumberField="blurNumPriceberField" stepperDecimal="decimalPlaces"></dk-popup>
+
+</view>

package-basic-data/pages/product-file/add/add.js

@@ -182,14 +182,7 @@ Page({
       dataItem: JSON.stringify(dataItem)
     })
   },
-   /**
-   * @desc : 关闭所有的tip
-   * @date : 2024/5/24 15:49
-   * @author : 王英杰
-   */
-  handleTap(){  
-    this.selectComponent('#'+this.data.formName).handleTap() 
-  },
+   
 
   /**
    * @desc : dk-form 里 str的点击回调 的输入回调
@@ -467,7 +460,7 @@ Page({
               sign: "",
               digits: formData.decimalPlaces,
               title: mixins.$t("openingInventoryQty"),
-              required: checkFlag,   
+              required: checkFlag,    
             },
             { //期初成本价
               code: 'priceInto',

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

@@ -4,7 +4,7 @@
 <loading wx:if="{{loading}}" ></loading>
  
 <dk-form id="{{formName}}" routeObjName="{{routeObjName}}"uploaderMAX="1"  cardList="{{cardList}}" contentObj="{{contentObj}}"  table="{{table}}" bind:onSwitchChange = "onSwitchChange"  bind:triggerBindBlur ="triggerBindBlur" bind:openStr= "openStr"
-model:value="{{formData}}" bind:chooseData="chooseData" bindtap="handleTap" bind:clickTip ="handleTap" >
+model:value="{{formData}}" bind:chooseData="chooseData" bindtap="handleTap"  >
 </dk-form>
  
 <view style="height: 200rpx;"></view>

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

@@ -24,7 +24,23 @@ Page({
     loading: false,
     ec: {},
   },
-
+ /**
+   * @desc : 关闭所有的tip
+   * @date : 2024/5/24 15:49
+   * @author : 王英杰
+   */
+  handleTap(){  
+    this.selectComponent('#dk-tip1').setShowTipFlag(false)
+    this.selectComponent('#dk-tip2').setShowTipFlag(false)
+  },
+    /**
+     * @desc : tip点击事件
+     * @date : 2024/5/24 15:49
+     * @author : 王英杰
+     */
+    clickTip() {
+      this.handleTap() 
+    },
   /**
    * @desc : 查询条件改变 传递到明细中用
    * @date : 2024/7/5 15:49

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

@@ -2,139 +2,142 @@
 
 <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 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 bindtap="handleTap">
+  <!-- 顶部筛选条件 -->
+  <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">
-  <!-- 报表相关 -->
+  <view class="func">
+    <!-- 报表相关 -->
 
 
 
-  <view class="main">
+    <view class="main">
 
 
-    <view class="card-view">
-      <view class="top-card">
-        <view class="top-card-title">销售利润</view>
-        <view class="top-card-icon">
-          <van-icon size="26rpx" name="question-o" data-item="销售利润=收入-成本" catchtap="showTip"/>
-        </view>
-        <view class="top-card-money">
- 
-          <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="16" contentColor="#caa977"
-              contentFontWeight="bold" content="{{profit.profit || 0}}"></dk-cell>
+      <view class="card-view">
+        <view class="top-card">
+          <view class="top-card-title">销售利润</view>
+          <view class="top-card-icon">
+            <!-- <van-icon size="26rpx" name="question-o" data-item="销售利润=收入-成本" catchtap="showTip"/> -->
+            <dk-tip style="display: inline-block;" id="dk-tip1" Down="{{true}}" Right="{{true}}" tipContent='销售利润=收入-成本' bind:clickTip="clickTip"></dk-tip>
+          </view>
+          <view class="top-card-money">
+
+            <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="16" contentColor="#caa977" contentFontWeight="bold" content="{{profit.profit || 0}}"></dk-cell>
+          </view>
+          <view style="clear: both;" />
         </view>
-        <view style="clear: both;" />
-      </view>
 
-      <view class="top-card">
-        <view class="top-card-title">销售利润率</view>
-        <view class="top-card-icon">
-          <van-icon size="26rpx" name="question-o" data-item="销售利润率=(收入-成本)/收入×100%" catchtap="showTip"/>
+        <view class="top-card">
+          <view class="top-card-title">销售利润率</view>
+          <view class="top-card-icon">
+            <!-- <van-icon size="26rpx" name="question-o" data-item="销售利润率=(收入-成本)/收入×100%" catchtap="showTip"/> -->
+            <dk-tip style="display: inline-block;" id="dk-tip2" Down="{{true}}" Right="{{true}}" tipContent='销售利润率=(收入-成本)/收入×100%' bind:clickTip="clickTip"></dk-tip>
+          </view>
+          <view class="top-card-percent">{{profit.profitRate || 0}}%</view>
+          <view style="clear: both;" />
         </view>
-        <view class="top-card-percent">{{profit.profitRate || 0}}%</view>
-        <view style="clear: both;" />
-      </view>
 
-      <view class="top-card top-card-bottom">
-        <view class="top-card-bottom-text">
-          <view class="top-card-bottom-text-title">销售总额</view>
-          <dk-cell left="0rpx" height="50rpx" contentRight="{{false}}" contentFontSize="13" contentColor="#95a8cb"
-               content="{{profit.outbound || 0}}"></dk-cell>
+        <view class="top-card top-card-bottom">
+          <view class="top-card-bottom-text">
+            <view class="top-card-bottom-text-title">销售总额</view>
+            <dk-cell left="0rpx" height="50rpx" contentRight="{{false}}" contentFontSize="13" contentColor="#95a8cb" content="{{profit.outbound || 0}}"></dk-cell>
+          </view>
+          <view class="top-card-bottom-text">
+            <view class="top-card-bottom-text-title">成本总额</view>
+            <dk-cell left="0rpx" height="50rpx" contentRight="{{false}}" contentFontSize="13" contentColor="#95a8cb" content="{{profit.inbound || 0}}"></dk-cell>
+          </view>
+
         </view>
-        <view class="top-card-bottom-text">
-          <view class="top-card-bottom-text-title">成本总额</view>
-          <dk-cell left="0rpx" height="50rpx" contentRight="{{false}}" contentFontSize="13" contentColor="#95a8cb"
-               content="{{profit.inbound || 0}}"></dk-cell>
       </view>
-          
-      </view>
-    </view>
 
 
-    <!-- 销售利润 -->
-    <view class="card-view2">
-      <view class="card-view-header2">
-        <view class="card-view-header-name2">
-          销售利润
-          <span class="card-view-header-name3" wx:if="{{byDate=='true'}}">（近一月）</span>
-          <span class="card-view-header-name3" wx:if="{{!byDate || byDate=='false'}}">（近一年）</span>
-        </view>
-        <view class="card-view-header-tags2">
-          <van-button color="#f0f0f0" size="mini" bind:click="clickProfitDate" data-value="true" custom-style="{{byDate=='true'?'color: #5c91ce; border: 1px solid #5c91ce':'color: black'}}" style="margin-right: 10rpx">按日</van-button>
-          <van-button color="#ecf1fa" size="mini" bind:click="clickProfitDate" data-value="false" custom-style="{{!byDate || byDate=='false'?'color: #5c91ce; border: 1px solid #5c91ce':'color: black'}}">按月</van-button>
-          <!-- <view class="card-view-header-tags-tag">详情
+      <!-- 销售利润 -->
+      <view class="card-view2">
+        <view class="card-view-header2">
+          <view class="card-view-header-name2">
+            销售利润
+            <span class="card-view-header-name3" wx:if="{{byDate=='true'}}">（近一月）</span>
+            <span class="card-view-header-name3" wx:if="{{!byDate || byDate=='false'}}">（近一年）</span>
+          </view>
+          <view class="card-view-header-tags2">
+            <van-button color="#f0f0f0" size="mini" bind:click="clickProfitDate" data-value="true" custom-style="{{byDate=='true'?'color: #5c91ce; border: 1px solid #5c91ce':'color: black'}}" style="margin-right: 10rpx">按日</van-button>
+            <van-button color="#ecf1fa" size="mini" bind:click="clickProfitDate" data-value="false" custom-style="{{!byDate || byDate=='false'?'color: #5c91ce; border: 1px solid #5c91ce':'color: black'}}">按月</van-button>
+            <!-- <view class="card-view-header-tags-tag">详情
             <van-icon style="margin-left: 14rpx;" name="arrow" />
           </view> -->
+          </view>
         </view>
-      </view>
 
-      <view style="z-index: 0 !important;width: 100%; height: 600rpx;">
-        <ec-canvas type="2d" canvas-id="echartsProfitDate" id="echartsProfitDate" ec="{{ ec }}" />
+        <view style="z-index: 0 !important;width: 100%; height: 600rpx;">
+          <ec-canvas type="2d" canvas-id="echartsProfitDate" id="echartsProfitDate" ec="{{ ec }}" />
+        </view>
       </view>
-    </view>
 
-    <!-- 部门利润排行 -->
-    <view class="card-view">
-      <view class="card-view-header">
-        <view class="card-view-header-name">
-          <!-- <image src="/static/image/app.png" class="header-icon" style="width: 30rpx;height:30rpx;margin-right: 15rpx;"></image> -->
-          部门利润排行
-        </view>
-        <view class="card-view-header-tags" catchtap="toDetail" data-url="org-rank/org-rank">
-          <view class="card-view-header-tags-tag">详情
-            <van-icon style="margin-left: 14rpx;" name="arrow" />
+      <!-- 部门利润排行 -->
+      <view class="card-view">
+        <view class="card-view-header">
+          <view class="card-view-header-name">
+            <!-- <image src="/static/image/app.png" class="header-icon" style="width: 30rpx;height:30rpx;margin-right: 15rpx;"></image> -->
+            部门利润排行
+          </view>
+          <view class="card-view-header-tags" catchtap="toDetail" data-url="org-rank/org-rank">
+            <view class="card-view-header-tags-tag">详情
+              <van-icon style="margin-left: 14rpx;" name="arrow" />
+            </view>
           </view>
         </view>
+        <view style="z-index: 0 !important;width: 100%; height: 327rpx;">
+          <ec-canvas type="2d" canvas-id="echartsProfitOrg" id="echartsProfitOrg" ec="{{ ec }}" />
+        </view>
       </view>
-      <view style="z-index: 0 !important;width: 100%; height: 327rpx;">
-        <ec-canvas type="2d" canvas-id="echartsProfitOrg" id="echartsProfitOrg" ec="{{ ec }}" />
-      </view>
-    </view>
 
-    <!-- 业务员利润排行 -->
-    <view class="card-view">
-      <view class="card-view-header">
-        <view class="card-view-header-name">
-          <!-- <image src="/static/image/app.png" class="header-icon" style="width: 30rpx;height:30rpx;margin-right: 15rpx;"></image> -->
-          业务员利润排行
-        </view>
-        <view class="card-view-header-tags" catchtap="toDetail" data-url="staff-rank/staff-rank">
-          <view class="card-view-header-tags-tag">详情
-            <van-icon style="margin-left: 14rpx;" name="arrow" />
+      <!-- 业务员利润排行 -->
+      <view class="card-view">
+        <view class="card-view-header">
+          <view class="card-view-header-name">
+            <!-- <image src="/static/image/app.png" class="header-icon" style="width: 30rpx;height:30rpx;margin-right: 15rpx;"></image> -->
+            业务员利润排行
+          </view>
+          <view class="card-view-header-tags" catchtap="toDetail" data-url="staff-rank/staff-rank">
+            <view class="card-view-header-tags-tag">详情
+              <van-icon style="margin-left: 14rpx;" name="arrow" />
+            </view>
           </view>
         </view>
-      </view>
 
-      <view style="z-index: 0 !important;width: 100%; height: 327rpx;">
-        <ec-canvas type="2d" canvas-id="echartsProfitStaff" id="echartsProfitStaff" ec="{{ ec }}" />
+        <view style="z-index: 0 !important;width: 100%; height: 327rpx;">
+          <ec-canvas type="2d" canvas-id="echartsProfitStaff" id="echartsProfitStaff" ec="{{ ec }}" />
+        </view>
       </view>
-    </view>
 
 
-    <!-- 商品利润排行 -->
-    <view class="card-view">
-      <view class="card-view-header">
-        <view class="card-view-header-name">
-          <!-- <image src="/static/image/app.png" class="header-icon" style="width: 30rpx;height:30rpx;margin-right: 15rpx;"></image> -->
-          商品利润排行
-        </view>
-        <view class="card-view-header-tags" catchtap="toDetail" data-url="sku-rank/sku-rank">
-          <view class="card-view-header-tags-tag">详情
-            <van-icon style="margin-left: 14rpx;" name="arrow" />
+      <!-- 商品利润排行 -->
+      <view class="card-view">
+        <view class="card-view-header">
+          <view class="card-view-header-name">
+            <!-- <image src="/static/image/app.png" class="header-icon" style="width: 30rpx;height:30rpx;margin-right: 15rpx;"></image> -->
+            商品利润排行
+          </view>
+          <view class="card-view-header-tags" catchtap="toDetail" data-url="sku-rank/sku-rank">
+            <view class="card-view-header-tags-tag">详情
+              <van-icon style="margin-left: 14rpx;" name="arrow" />
+            </view>
           </view>
         </view>
-      </view>
-      <!-- <view class="card-view-content-data-echarts">
+        <!-- <view class="card-view-content-data-echarts">
         <view class="card-view-content-data-echarts-data">
           <view>
             <text class="small-small-font">￥</text>{{indexStaffOrder.sumAmount ? numberFormat.toThousandCents(numberFormat.numberFormat(indexStaffOrder.sumAmount/10000)) : '0.00'}}
@@ -142,20 +145,22 @@
           <view>成交额(万)</view>
         </view>
       </view> -->
-      <view style="z-index: 0 !important;width: 100%; height: 327rpx;">
-        <ec-canvas type="2d" canvas-id="echartsProfitSku" id="echartsProfitSku" ec="{{ ec }}" />
+        <view style="z-index: 0 !important;width: 100%; height: 327rpx;">
+          <ec-canvas type="2d" canvas-id="echartsProfitSku" id="echartsProfitSku" ec="{{ ec }}" />
+        </view>
       </view>
-    </view>
 
 
-  </view>
+    </view>
 
 
-</view>
+  </view>
 
-<!-- 购买功能包 -->
-<view wx:if="{{params.testFlag}}" style="position: fixed;bottom: 230rpx;right: 30rpx;">
-  <view bind:tap="toBuy" class="btn-add-class">
-    <van-icon name="cart-o" color="#FFFFFF" size="60rpx" />
+  <!-- 购买功能包 -->
+  <view wx:if="{{params.testFlag}}" style="position: fixed;bottom: 230rpx;right: 30rpx;">
+    <view bind:tap="toBuy" class="btn-add-class">
+      <van-icon name="cart-o" color="#FFFFFF" size="60rpx" />
+    </view>
   </view>
+
 </view>

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

@@ -579,6 +579,7 @@ page {
   float: left;
   margin-left: 40rpx;
   height: 100%;
+  display: flex;
 }
 
 .top-card-icon van-icon {

package-inventory/pages/inventory-adjustment/add/add.wxml

@@ -9,7 +9,7 @@
 </dk-form> -->
 
 <dk-form-bill sumAmountColFlag="{{false}}" type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel"   descCol="skuName"  subCol="calculationFormula"     quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale"  bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}"  iconCol="imagesUrl" 
-bind:delItem="setGoods" bind:setGoods="setGoods" bind:changeField="changeField" controlFlags ="{{controlFlags}}">
+bind:delItem="setGoods" bind:setGoods="setGoods" bind:changeField="changeField" controlFlags ="{{controlFlags}}" detailTipFlag="{{true}}"bindtap="handleTap"  >
 </dk-form-bill>
 
 

package-inventory/pages/inventory-adjustment/detail/detail.wxml

@@ -9,7 +9,7 @@
 </dk-form> -->
 
 <dk-form-bill sumAmountColFlag="{{false}}" type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel"   descCol="skuName"  subCol="calculationFormula"    quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale"  bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}"  iconCol="imagesUrl" 
-bind:delItem="setGoods" bind:setGoods="setGoods" bind:changeField="changeField" controlFlags ="{{controlFlags}}">
+bind:delItem="setGoods" bind:setGoods="setGoods" bind:changeField="changeField" controlFlags ="{{controlFlags}}"detailTipFlag="{{true}}"bindtap="handleTap">
 </dk-form-bill>
 
 

package-inventory/pages/inventory-check/add/add.wxml

@@ -7,7 +7,7 @@
 </dk-form> -->
 
 <dk-form-bill sumAmountColFlag="{{false}}" type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" descCol="skuName" subCol="calculationFormula"  priceCol="priceInto"pupPriceCol="pricePurchase"  quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['wholesalePrice']}}：" bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}"controlFlags="{{controlFlags}}" iconCol="imagesUrl" 
-bind:delItem="setGoods" bind:setGoods="setGoods" contentBottomLeft="{{contentBottomLeft}}" lossReasonFlag="{{true}}">
+bind:delItem="setGoods" bind:setGoods="setGoods" contentBottomLeft="{{contentBottomLeft}}" lossReasonFlag="{{true}}" detailTipFlag="{{true}}"bindtap="handleTap">
 </dk-form-bill>
 
 

package-inventory/pages/inventory-check/detail/detail.wxml

@@ -7,7 +7,7 @@
 </dk-form> -->
 
 <dk-form-bill type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" descCol="skuName"    subCol="calculationFormula"  quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['wholesalePrice']}}：" bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}"
-bind:delItem="setGoods" bind:setGoods="setGoods"  iconCol="imagesUrl"lossReasonFlag="{{true}}" >
+bind:delItem="setGoods" bind:setGoods="setGoods"  iconCol="imagesUrl"lossReasonFlag="{{true}}"detailTipFlag="{{true}}"bindtap="handleTap" >
 </dk-form-bill>
 
 

package-inventory/pages/inventory-freeze/add/add.wxml

@@ -1,8 +1,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
 <dk-form-bill type="out" popType ="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel"  subCol="calculationFormula"  descCol="skuName"  quantityCol="itemQty"  contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}"
-bind:editItems="editItems" sumAmountColFlag="{{false}}"  iconCol="imagesUrl" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"
- 
+bind:editItems="editItems" sumAmountColFlag="{{false}}"  iconCol="imagesUrl" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"detailTipFlag="{{true}}"bindtap="handleTap"
 >
 </dk-form-bill>
 <view style="height: 200rpx;"></view>

package-inventory/pages/other-outbound/other-outbound.wxml

@@ -8,7 +8,7 @@ bind:delItem="setGoods" bind:setGoods="setGoods" bind:clickAttach="clickAttach"
 cardContentList="{{cardContentList}}"
 quantityRedTitle="可售量："
 quantityRedCol="usableQty"
-quantityRedColFlagKey="usableQtyInsufficientFlag"
+quantityRedColFlagKey="usableQtyInsufficientFlag"detailTipFlag="{{true}}"bindtap="handleTap"
  >
 </dk-form-bill> 
 <view style="height: 200rpx;"></view>

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

@@ -4,7 +4,7 @@
 <loading wx:if="{{loading}}"></loading>
 
 <dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuModel" descCol="skuName"   priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}" bind:clickAttach="clickAttach"  bind:uploadSucess="uploadSucess" bind:uploadError="uploadError"deleteName="deleteItemList" 
-bind:delItem="setGoods" bind:setGoods="setGoods"validFlag="{{true}}">
+bind:delItem="setGoods" bind:setGoods="setGoods"validFlag="{{true}}" detailTipFlag="{{true}}"bindtap="handleTap">
 </dk-form-bill>
 <view style="height: 200rpx;"></view>
 <!-- 新建按钮 -->

package-inventory/pages/outbound-processing/detail/detail.wxml

@@ -2,7 +2,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading> 
 
-<dk-form-bill id="{{formName}}" type="out" routeObjName="{{routeObjName}}" readonly="{{item.outStatus == $t['outBoundedOutStatus']}}" cardList="{{cardList}}"  titleCol="skuModel"  subCol="calculationFormula" descCol="skuName"   quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}"   iconCol="imagesUrl" discountStandardCol="saleDiscount"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" table="{{table}}" bind:editItems="setGoods" bind:delItem="setGoods" bind:setGoods="setGoods" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag"  popType="sale" popupTopObj = "{{popupTopObj}}" titpsFlag="{{titpsFlag}}">
+<dk-form-bill id="{{formName}}" type="out" routeObjName="{{routeObjName}}" readonly="{{item.outStatus == $t['outBoundedOutStatus']}}" cardList="{{cardList}}"  titleCol="skuModel"  subCol="calculationFormula" descCol="skuName"   quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}"   iconCol="imagesUrl" discountStandardCol="saleDiscount"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" table="{{table}}" bind:editItems="setGoods" bind:delItem="setGoods" bind:setGoods="setGoods" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag"  popType="sale" popupTopObj = "{{popupTopObj}}" titpsFlag="{{titpsFlag}}" detailTipFlag="{{true}}"bindtap="handleTap">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

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

@@ -49,7 +49,7 @@
   </view>
 </view>
 
-<dk-form-bill id="{{formName}}" type="purInto"  routeObjName="{{routeObjName}}" readonly="{{item.intoStatus == $t['inBoundedIntoStatus']}}" cardList="{{cardList}}"   titleCol="skuModel" descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{quantityCol}}" sumAmountCol="itemAmt" sumQuantityCol="{{sumQuantityCol}}" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}" bind:delItem="setGoods" bind:setGoods="setGoods"  >
+<dk-form-bill id="{{formName}}" type="purInto"  routeObjName="{{routeObjName}}" readonly="{{item.intoStatus == $t['inBoundedIntoStatus']}}" cardList="{{cardList}}"   titleCol="skuModel" descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{quantityCol}}" sumAmountCol="itemAmt" sumQuantityCol="{{sumQuantityCol}}" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}" bind:delItem="setGoods" bind:setGoods="setGoods" detailTipFlag="{{true}}"bindtap="handleTap" >
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

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

@@ -6,7 +6,7 @@
 <!-- <dk-form id="{{formName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form> -->
 
-<dk-form-bill id="{{formName}}"  type="pur"  routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleTagCol="brandName"   titleCol="skuModel"   descCol="skuName" subCol="calculationFormula" priceCol="pricePur"  pupPriceCol="sumPrice"  quantityCol="itemQty" sumAmountCol="itemAmt" sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="" bind:editItems="setGoods" bind:clear = "clear" table="{{table}}"  dataTime = "{{dataTime}}" iconCol="imagesUrl" bind:delItem="setGoods" bind:setGoods="setGoods"  minDate="{{minDate}}"validFlag="{{true}}"sumAmountColFlag="{{false}}">
+<dk-form-bill id="{{formName}}"  type="pur"  routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleTagCol="brandName"   titleCol="skuModel"   descCol="skuName" subCol="calculationFormula" priceCol="pricePur"  pupPriceCol="sumPrice"  quantityCol="itemQty" sumAmountCol="itemAmt" sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="" bind:editItems="setGoods" bind:clear = "clear" table="{{table}}"  dataTime = "{{dataTime}}" iconCol="imagesUrl" bind:delItem="setGoods" bind:setGoods="setGoods"  minDate="{{minDate}}"validFlag="{{true}}"sumAmountColFlag="{{false}}" detailTipFlag="{{true}}"bindtap="handleTap">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

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

@@ -93,7 +93,7 @@
 </view>
 
 <!-- 商品信息 和 其他信息 -->
-<dk-form-bill id="{{formName}}" titleTagCol="brandName" type="pur" routeObjName="{{routeObjName}}" readonly="{{true}}" cardList="{{cardList}}" titleCol="skuModel" descCol="skuName" subCol="calculationFormula" priceCol="pricePur" pupPriceCol="sumPrice" quantityCol="itemQty" iconCol="imagesUrl" sumAmountCol="itemAmt" sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale"  isShowOutQty="{{true}}" outQtyKey="outQty" returnQtyKey="returnQty" >
+<dk-form-bill id="{{formName}}" titleTagCol="brandName" type="pur" routeObjName="{{routeObjName}}" readonly="{{true}}" cardList="{{cardList}}" titleCol="skuModel" descCol="skuName" subCol="calculationFormula" priceCol="pricePur" pupPriceCol="sumPrice" quantityCol="itemQty" iconCol="imagesUrl" sumAmountCol="itemAmt" sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale"  isShowOutQty="{{true}}" outQtyKey="outQty" returnQtyKey="returnQty" detailTipFlag="{{true}}"bindtap="handleTap">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

package-purchase/pages/purchase-receipt/add/add.wxml

@@ -5,7 +5,7 @@
 
  
 <dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" titleTagCol="brandName"  subCol="calculationFormula"  descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{(!intoStatusflag)?'intoQty':'intoingQty'}}" sumAmountCol="itemAmt"sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle=""   bind:clear = "clear" readonly = "{{readonly}}"   controlFlags ="{{controlFlags}}"
-bind:delItem="setGoods" bind:setGoods="setGoods" bind:editItems="setGoods" table="{{table}}">
+bind:delItem="setGoods" bind:setGoods="setGoods" bind:editItems="setGoods" table="{{table}}" detailTipFlag="{{true}}"bindtap="handleTap">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

package-purchase/pages/purchase-receipt/detail/detail.wxml

@@ -42,7 +42,7 @@
   </view>
 </view>
 
-<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuModel" titleTagCol="brandName"  iconCol="imagesUrl" descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" quantityCol="{{intoStatusflag?'intoingQty':'intoQty'}}" sumAmountCol="itemAmt" sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['referencePrice']+'：'}}" bind:delItem="setGoods" bind:setGoods="setGoods" bind:editItems="setGoods">
+<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuModel" titleTagCol="brandName"  iconCol="imagesUrl" descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" quantityCol="{{intoStatusflag?'intoingQty':'intoQty'}}" sumAmountCol="itemAmt" sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['referencePrice']+'：'}}" bind:delItem="setGoods" bind:setGoods="setGoods" bind:editItems="setGoods" detailTipFlag="{{true}}"bindtap="handleTap">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

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

@@ -35,7 +35,7 @@
   </view>
 </view>
 
-<dk-form-bill type="purReturn" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula" descCol="skuName" priceCol="priceInto" quantityCol="intoingQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" pupPriceCol="sumPrice" contentObj="{{contentObj}}" iconCol="imagesUrl" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" bind:editItems="setGoods"  bind:openChoosedItemInfo="openChoosedItemInfo" bind:delItem="delItem" deleteName="deleteItemList" bind:customersChoose="customersChoose" popType="sale" priceTitle="" satffAndOrgReadonly="{{satffAndOrgReadonly}}" staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel" titleTagCol="brandName">
+<dk-form-bill type="purReturn" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula" descCol="skuName" priceCol="priceInto" quantityCol="intoingQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" pupPriceCol="sumPrice" contentObj="{{contentObj}}" iconCol="imagesUrl" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" bind:editItems="setGoods"  bind:openChoosedItemInfo="openChoosedItemInfo" bind:delItem="delItem" deleteName="deleteItemList" bind:customersChoose="customersChoose" popType="sale" priceTitle="" satffAndOrgReadonly="{{satffAndOrgReadonly}}" staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel" titleTagCol="brandName" detailTipFlag="{{true}}"bindtap="handleTap">
 </dk-form-bill> 
 
 <!-- 空高度  -->

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

@@ -45,7 +45,7 @@
 </dk-form-bill> -->
 
 
-<dk-form-bill type="purReturn" id="{{formName}}" readonly="{{true}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula" descCol="skuName" priceCol="priceInto" quantityCol="intoingQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" pupPriceCol="sumPrice" contentObj="{{contentObj}}" iconCol="imagesUrl" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" bind:editItems="setGoods"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:customersChoose="customersChoose" popType="sale" priceTitle="" saleStaffAndOrgFlag="{{false}}" staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel" titleTagCol="brandName">
+<dk-form-bill type="purReturn" id="{{formName}}" readonly="{{true}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula" descCol="skuName" priceCol="priceInto" quantityCol="intoingQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" pupPriceCol="sumPrice" contentObj="{{contentObj}}" iconCol="imagesUrl" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" bind:editItems="setGoods"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:customersChoose="customersChoose" popType="sale" priceTitle="" saleStaffAndOrgFlag="{{false}}" staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel" titleTagCol="brandName" detailTipFlag="{{true}}"bindtap="handleTap">
 </dk-form-bill> 
 
 <!-- 空高度  -->

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

@@ -197,8 +197,9 @@ Page({
         code: 'nonStdCode',
         title: mixins.$t("goodsBatch"),
         type: 'str',
-        readonly: true
-      },
+        readonly: true,
+        tip: mixins.$t('tipPop'),
+      }, 
       {
         code: 'flgGift',
         title: mixins.$t("flgGift"),

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

@@ -3,8 +3,8 @@
 <loading wx:if="{{loading}}"></loading>
 
 <!-- 除了编辑显示的 -->
-<dk-form-bill    type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="brandName"  titleCol="skuModel" iconCol="imagesUrl" descCol="skuName"  subCol="calculationFormula" pupPriceCol="factAmt" priceCol="factPrice"  quantityCol="itemQty" sumAmountCol="sumAmount" sumQuantityCol="sumQuantity" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" swipeDisabled ="cannotModifyFlag" bind:editItems="editItems"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose"  bind:changePhoneblur="changePhoneblur" satffAndOrgReadonly="{{satffAndOrgReadonly}}" validFlag="{{true}}"
-bind:clickAttach="clickAttach"  bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" popType="sale" priceTitle="" staff="staff" org="org"  wholeOrderDiscountCol="discount" discountAmountCol="discAmt" dataTime="{{dataTime}}" minDate="{{minDate}}" ></dk-form-bill>
+<dk-form-bill    type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="brandName"  titleCol="skuModel" iconCol="imagesUrl" descCol="skuName"  subCol="calculationFormula" pupPriceCol="factAmt" priceCol="factPrice"  quantityCol="itemQty" sumAmountCol="sumAmount" sumQuantityCol="sumQuantity" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" swipeDisabled ="cannotModifyFlag" bind:editItems="editItems"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose"  bind:changePhoneblur="changePhoneblur" satffAndOrgReadonly="{{satffAndOrgReadonly}}" validFlag="{{true}}" 
+bind:clickAttach="clickAttach"  bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" popType="sale" priceTitle="" staff="staff" org="org"  wholeOrderDiscountCol="discount" discountAmountCol="discAmt" dataTime="{{dataTime}}" minDate="{{minDate}}" detailTipFlag="{{true}}"bindtap="handleTap"></dk-form-bill>
 <!-- 编辑时候显示的 -->
 <!-- <dk-form-bill wx:else  type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="brandName"  titleCol="skuModel" iconCol="imagesUrl" descCol="skuName"  subCol="calculationFormula" pupPriceCol="factAmt" priceCol="factPrice"  quantityCol="itemQtyShowEdit" sumAmountCol="sumAmountShowEdit" sumQuantityCol="sumQuantityShowEdit" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" swipeDisabled ="cannotModifyFlag" bind:editItems="editItems"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose"  bind:changePhoneblur="changePhoneblur" 
 bind:clickAttach="clickAttach"  bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" popType="sale" priceTitle="" staff="staff" org="org"    dataTime="{{dataTime}}" minDate="{{minDate}}" ></dk-form-bill> -->

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

@@ -6,7 +6,7 @@
  
 <dk-form-bill type="saleOut" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula" descCol="skuName"     priceCol="factPrice" quantityCol="outingQty" sumAmountCol="sumAmount" iconCol="imagesUrl" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}" pupPriceCol="factAmt"  bind:editItems="editItems" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"  bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose" popType="sale"   staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel" readonly="{{isDetailFlag}}" isDetailFlag="{{isDetailFlag}}"dataTime="{{dataTime}}"minDate="{{dataTime}}"titleTagCol="brandName" bind:openReverseCalculationPop="openReverseCalculationPop1" reverseCalculationFlag="{{false}}"wholeOrderDiscountCol="discount"discountAmountCol="discAmt" sumAmountColTitle="折后金额"
 bind:clickAttach="clickAttach" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" bind:changePhoneblur="changePhoneblur"
->
+detailTipFlag="{{true}}"bindtap="handleTap">
  
 </dk-form-bill>
 <van-dialog id="van-dialog" />

package-sales/pages/sales-tracking-report/sales-tracking-report.wxml

@@ -10,4 +10,4 @@
 
 
 <!-- 列表区 -->
-<dk-list-report  list="{{tableData}}" flgSubFormatDate="{{true}}" titleCorner="salesChannelName" title="cusName"  no="orderNo" statusRight="orderStatusName" colorLeft="#437FF8" colorRight="#F43636"  statusLeft="outStatusName" subTitle="makeTime" content="{{contentList}}" contentObj="{{contentObj}}"  bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus"bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list-report>
+<dk-list-report id="{{formName}}" list="{{tableData}}" flgSubFormatDate="{{true}}" titleCorner="salesChannelName" title="cusName"  no="orderNo" statusRight="orderStatusName" colorLeft="#437FF8" colorRight="#F43636"  statusLeft="outStatusName" subTitle="makeTime" content="{{contentList}}" contentObj="{{contentObj}}"  bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus"bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open" bindtap="handleTap"></dk-list-report>

pages/company/company.js

@@ -9,6 +9,7 @@
 *******************************************************************************/
 const api = require('@/utils/api.js');
 const Constants = require('@/utils/Constants.js');
+const config = require('@/config/config.js');
 const util = require('@/utils/util');
 
 const app = getApp()
@@ -179,6 +180,18 @@ Page({
                     // 菜单
                     let menuList = res.data.data.menuList
                     if (menuList) {
+                        // 处理操作链接
+                        let filters = menuList.filter(it => it.menuTags)
+                        if (filters && filters.length > 0) {
+                            filters.forEach(t => {
+                                if (t.menuTags.value) {
+                                    let val = JSON.parse(t.menuTags.value)
+                                    if(val.guideUrl == 'knowledge-view' ){
+                                        t.guideUrl = config.knowledge_url + '/' + val.guideUrl + '?appCode=CP-WXP&funId=' + t.funUuid
+                                    }
+                                }
+                            })
+                        }
                          // 处理功能包
                          app.globalData.menus = util.handleMenu(app.globalData.company.funPackage,menuList);
                     }

pages/login/login.js

@@ -256,6 +256,18 @@ Page({
           // 菜单
           let menuList = res.data.data.menuList
           if (menuList) {
+            // 处理操作链接
+            let filters = menuList.filter(it => it.menuTags)
+            if (filters && filters.length > 0) {
+                filters.forEach(t => {
+                    if (t.menuTags.value) {
+                        let val = JSON.parse(t.menuTags.value)
+                        if(val.guideUrl == 'knowledge-view' ){
+                            t.guideUrl = config.knowledge_url + '/' + val.guideUrl + '?appCode=CP-WXP&funId=' + t.funUuid
+                        }
+                    }
+                })
+            }
             app.globalData.menus = util.handleMenu(app.globalData.company.funPackage, menuList);
           }
           // 常用菜单

pages/shopping/shopping.js

@@ -155,6 +155,22 @@ Page({
       }
     })
   },
+   /**
+   * @desc : 关闭所有的tip
+   * @date : 2024/5/24 15:49
+   * @author : 王英杰
+   */
+  handleTap(){  
+    this.selectComponent('#dkPopup').handleTap()
+  },
+   /**
+     * @desc : tip点击事件
+     * @date : 2024/5/24 15:49
+     * @author : 王英杰
+     */
+    clickTip() {
+      this.handleTap() 
+    },
   /**
     * @desc : 已选商品修改单价 金额pop 确定事件
     * @date : 2024/2/1 15:49

pages/shopping/shopping.wxml

@@ -3,7 +3,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
 <van-dialog id="van-dialog" />
-
+<view bindtap="handleTap">
 <van-sticky offset-top="{{ 0 }}">
   <van-nav-bar title="开单"  border="{{false}}"  left-text="" left-arrow="{{false}}" bind:click-left="onClickLeft" />
 <view style="display: flex;">
@@ -187,7 +187,7 @@
 
 
 
-<dk-popup id="dkPopup"  type="sale"  titleTagCol="brandName"    subCol="calculationFormula" descCol="skuName" titleCol="skuModel"  priceCol="{{ 'sumPrice'}}" iconCol="imagesUrl"  value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox" bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:changeCheckBox="popupChangeCheckBox" stepperDecimal ="decimalPlaces" >
+<dk-popup id="dkPopup"  type="sale"  titleTagCol="brandName"    subCol="calculationFormula" descCol="skuName" titleCol="skuModel"  priceCol="{{ 'sumPrice'}}" iconCol="imagesUrl"  value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox" bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:changeCheckBox="popupChangeCheckBox" stepperDecimal ="decimalPlaces" bind:clickTip='clickTip'>
 </dk-popup>
 
 <!-- 箱片 -->
@@ -196,4 +196,5 @@
 <dk-save-button  countName="商品数量" countEnd="" cssType="sale" model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="submit"></dk-save-button>
 
 <!-- 修改已选商品金额 和单价 -->
-<dk-popup type="basic" title="修改价格"   value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}"  bind:commit="editItemsChangePrice" bind:changeStep="changePriceStep" bind:blurNumberField="blurNumPriceberField" stepperDecimal="decimalPlaces" ></dk-popup>
+<dk-popup type="basic" title="修改价格"   value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}"  bind:commit="editItemsChangePrice" bind:changeStep="changePriceStep" bind:blurNumberField="blurNumPriceberField" stepperDecimal="decimalPlaces" ></dk-popup>
+</view>