组件的颜色

components/dkbase/dk-cell/dk-cell.js

@@ -180,7 +180,7 @@ Component({
      */
     spaceWidth:{
       type:String,
-      value:'20rpx'
+      value:'36rpx'
     },
     /**
      * 内容是否是金额

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

@@ -49,11 +49,14 @@
   <view class="dk-card-class" wx:for="{{cardList}}" wx:for-item="card" wx:for-index="cardIndex" data-item="{{card}}">
     <view wx:if="{{card.title}}" class="item-class">
       <view class="item-title-class">{{card.title}}</view>
-      <view class="item-count-class" wx:if="{{card.name == 'items'}}">{{$t['together'] + form[itemName].length + $t['bill']}}</view>
+      <view class="item-count-class" wx:if="{{card.name == 'items'}}"> </view>
       <view class="item-count-class" wx:else=""></view>
       <view style="width:{{(card.chooseFlag && card.name=='items')?'50%':'15%'}} ;text-align: right;">
-        <dk-tag wx:if="{{card.chooseFlag && form[objIdCol]}}" type="primary" padding="0 20rpx" height="40rpx" color="#9FAEE5" textColor="#FFFFFF" radius="5rpx" roundFlag="{{true}}" data-index="{{cardIndex}}" value="{{card.chooseTitle}}" catchtap="choose"></dk-tag>
-        <dk-tag wx:if="{{card.name=='items'}}" type="primary" style="margin-left: 10rpx;" padding="0 20rpx" height="40rpx" color="#9FAEE5" textColor="#FFFFFF" radius="5rpx" roundFlag="{{true}}" data-index="{{cardIndex}}" value="{{(card.show ||  card.show == undefined )?'收起':'展开'}}" catchtap="clickTag"></dk-tag>
+        <!-- <dk-tag wx:if="{{card.chooseFlag && form[objIdCol]}}" type="primary" padding="0 20rpx" height="40rpx" color="#9FAEE5" textColor="#FFFFFF" radius="5rpx" roundFlag="{{true}}" data-index="{{cardIndex}}" value="{{card.chooseTitle}}" catchtap="choose"></dk-tag> -->
+        <view style="margin-right: 20rpx;" data-index="{{cardIndex}}"  catchtap="choose" wx:if="{{card.chooseFlag && form[objIdCol]}}" >
+          <van-image round width="30rpx" height="30rpx" src="/static/image/right.png" />
+        </view>        
+        <!-- <dk-tag wx:if="{{card.name=='items'}}" type="primary" style="margin-left: 10rpx;" padding="0 20rpx" height="40rpx" color="#9FAEE5" textColor="#FFFFFF" radius="5rpx" roundFlag="{{true}}" data-index="{{cardIndex}}" value="{{(card.show ||  card.show == undefined )?'收起':'展开'}}" catchtap="clickTag"></dk-tag> -->
       </view>
     </view>
     <!--明细card-->
@@ -81,7 +84,7 @@
               </view>
             </van-field>
             <!--数字类-->
-            <dk-number-input wx:if="{{item.type=='number'}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{indext}}" data-card="{{card.name}}" center="left" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{itemt[item.code + '_errMsg']}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#CAA977" titleFontWeight="{{item.required?'bold':'normal'}}" titleColor="{{item.required?'#E4002B':'#95A8CB'}}" inputValue="{{itemt[item.code]}}" readonly="{{!!readonly || !!item.readonly || (objIdCol && !form[objIdCol]) || (item.control && !itemt[item.control])}}" bind:triggerBindValue="changeItemNumberField"></dk-number-input>
+            <dk-number-input wx:if="{{item.type=='number'}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{indext}}" data-card="{{card.name}}" center="left" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{itemt[item.code + '_errMsg']}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#CAA977" titleFontWeight="{{item.required?'bold':'normal'}}" titleColor="{{item.required?'#DB3333':'#95A8CB'}}" inputValue="{{itemt[item.code]}}" readonly="{{!!readonly || !!item.readonly || (objIdCol && !form[objIdCol]) || (item.control && !itemt[item.control])}}" bind:triggerBindValue="changeItemNumberField"></dk-number-input>
             <!--备注-->
             <van-field wx:if="{{item.type=='textarea'}}" type="textarea" label-class="{{item.required?'red-label':'nomal-label' }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{indext}}" data-card="{{card.name}}" value="{{ itemt[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" clearable autosize border="{{ false }}" readonly="{{!!readonly || !!item.readonly|| !form[objIdCol]}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeItemField" bind:clear="clearItemField" errorMessage="{{itemt[item.code + '_errMsg']}}">
             </van-field>
@@ -157,7 +160,7 @@
     <!--合计信息-->
     <van-grid wx:if="{{totalObj && totalObj[card.name]}}" column-num="2" border="{{ false }}" center="{{false}}">
       <van-grid-item use-slot wx:for="{{totalObj[card.name]}}" data-item="{{item}}" wx:key="index" content-class="grid-item-class">
-        <dk-cell contentColor="#CAA977" titleColor="#95A8CB;" title="{{item.title}}" content="{{form[item.code]?form[item.code]:0}}"></dk-cell>
+        <dk-cell contentColor="#FF7B1A" titleColor="#002340;" title="{{item.title}}" content="{{form[item.code]?form[item.code]:0}}"></dk-cell>
       </van-grid-item>
     </van-grid>
   </view>

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

@@ -52,7 +52,7 @@
 /**红色label**/
 .red-label,
 .red-label>view {
-  color: #E4002B !important;
+  color: #DB3333 !important;
   font-style: normal;
   font-weight: bold;
   font-size: 14px;

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

@@ -5,11 +5,11 @@
     <view wx:if="{{contentList && contentList.length > 0}}" style="width: 50%;">
       <view wx:for="{{contentList}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
         <!--文本-->
-        <view wx:if="{{item.type == 'str'}}" style="color: {{item.color?item.color:'#CAA977'}};font-size: {{item.fontSize?item.fontSize:'15px'}}">
+        <view wx:if="{{item.type == 'str'}}" style="color: {{item.color?item.color:'#002340'}};font-size: {{item.fontSize?item.fontSize:'15px'}};font-weight:600;">
           {{item.title}}
         </view>
         <!--数字-->
-        <dk-cell wx:if="{{item.type=='number'}}" fontSize="{{item.fontSize?item.fontSize:16}}" contentFontSize="{{item.fontSize?item.fontSize:16}}" height="{{item.height?item.height:'44rpx'}}" fontWeight="{{item.fontWeight?item.fontWeight:600}}" left="0rpx" contentColor="{{item.color?item.color:'#CAA977'}}" title="{{item.title}}" content="{{ item.content}}" amount="{{true}}"></dk-cell>
+        <dk-cell wx:if="{{item.type=='number'}}" fontSize="{{item.fontSize?item.fontSize:16}}" contentFontSize="{{item.fontSize?item.fontSize:16}}" height="{{item.height?item.height:'44rpx'}}" fontWeight="{{item.fontWeight?item.fontWeight:600}}" left="0rpx" contentColor="{{item.color?item.color:'#FF7B1A'}}" titleColor="{{'#002340'}}" title="{{item.title}}" content="{{ item.content}}" amount="{{true}}"></dk-cell>
         <!--选择框-->
         <view wx:if="{{item.type=='checkbox'}}" style="display: flex;margin-top: 10rpx; margin-bottom: 10rpx;">
           <van-checkbox value="{{ form[item.code] }}" icon-size="{{item.iconSize?item.iconSize:'16px'}}" data-code="{{item.code}}" bind:change="change"></van-checkbox>
@@ -26,7 +26,7 @@
     <!-- 保存确定区域 -->
     <view style="display: flex;width: {{contentList && contentList.length > 0?'50%':'100%'}};justify-content: {{btnRightFlag?'flex-end':'left'}};">
       <view class="btn-class" style="margin-right: {{btnAutoWidthFlag?'20rpx':''}};  width:{{btnAutoWidthFlag?(100/buttonList.length + '%'): (item.width?item.width:'196rpx')}}" wx:for="{{buttonList}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
-        <van-button round size="large" plain="{{item.plain}}"  data-item="{{item}}" color="{{item.color?item.color:'#1B365D'}}" custom-style="height:88rpx;" bind:click="submit" type="info">{{item.title}}
+        <van-button   size="large" plain="{{item.plain}}"  data-item="{{item}}" color="{{item.color?item.color:'#3E69F6'}}" custom-style="height:88rpx;border-radius:15rpx ;" bind:click="submit" type="info">{{item.title}}
         </van-button>
       </view>
     </view>

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

@@ -7,7 +7,7 @@
   border-top: 1px solid #efefef;
   z-index: 7;
   box-shadow: 0px -8rpx 24rpx rgba(0, 16, 39, 0.1);
-  border-radius: 30rpx 30rpx 0rpx 0rpx;
+  /* border-radius: 0rpx 0rpx 0rpx 0rpx; */
 }
 
 .bottom-class-2 {
@@ -20,7 +20,7 @@
   margin-left: 5%;
   background: #1B365D;
   box-shadow: 0px 17rpx 22rpx rgba(27, 54, 93, 0.2);
-  border-radius: 15rpx;
+  /* border-radius: 15rpx; */
 }
 
 .btn-main-class {
@@ -32,7 +32,7 @@
 }
 
 .btn-class {
-  border-radius: 15rpx;
+  border-radius: 10rpx;
   height: 88rpx;
   font-size: 16px;
   line-height: 40rpx;

package-accounts-manage/pages/receipt/add/add.js

@@ -81,6 +81,7 @@ Page({
     contentList: [{
       code: 'need',
       title: mixins.$t('totalAmount'),
+      content: 0,
       type: 'str'
     }, {
       code: 'amount',