Merge remote-tracking branch 'origin/master'

app.wxss

@@ -95,4 +95,7 @@ contact-button {
 .ipXbtn{
   width: 100%;
   height: 50px;
+}
+.btnView{
+  opacity: 0.8;
 }

pages/apply/approval/approval.wxml

@@ -58,15 +58,15 @@
   </view> 
 
   <view class="bottomBtn">
-    <view bindtap="openBox">
+    <view bindtap="openBox" hover-class="btnView">
       <image src="/image/icon/icon_xzmb.png"></image>
       <text>选择审批模板</text>  
     </view>
-    <view bindtap="showPopupNew" style="margin: 0 10px;">
+    <view bindtap="showPopupNew" style="margin: 0 10px;" hover-class="btnView">
       <image src="/image/icon/icon_zfmb.png"></image>
       <text>保存支付模板</text>  
     </view>
-    <view bindtap="showPopup">
+    <view bindtap="showPopup" hover-class="btnView">
       <image src="/image/icon/icon_shmb.png"></image>
       <text>保存审批模板</text>  
     </view>
@@ -79,7 +79,7 @@
 
 <view class="bottom">
   <view class="btn1" bindtap="save">保存</view>
-  <view class="btn2" bindtap="submit">保存并提交</view>
+  <view class="btn2" bindtap="submit" hover-class="btnView">保存并提交</view>
 </view>
 
 <van-action-sheet show="{{show}}" title="选择审批模板" bind:close="closeBox" safe-area-inset-bottom="{{true}}">

pages/apply/paymentTemplate/add/add.wxml

@@ -604,7 +604,7 @@
   <view class="bottom">
     <!-- <view class="btn1" data-type="3" bindtap="goSubmit">提交复核</view> -->
     <view class="btn1" bindtap="back">上一步</view>
-    <view class="btn2" data-type="0" bindtap="goSubmit">下一步</view>
+    <view class="btn2" data-type="0" bindtap="goSubmit" hover-class="btnView">下一步</view>
   </view>
 </block>
 <block wx:if="{{isUpdate}}">

pages/apply/paymentTemplate/add/add.wxss

@@ -461,4 +461,4 @@ text{display: block;}
   }
   .van-collapse .tit_box .top-box .van-cell{
     margin-bottom: 15px;
-  }
+  }

pages/index/index.wxml

@@ -45,25 +45,25 @@
    
     <!--主导航-->
     <view class="navList_main">
-        <view class="tab_item" bindtap='swichPayment'>
+        <view class="tab_item" bindtap='swichPayment' hover-class="btnView">
             <view class="icon">
                 <image class="icon_img" src="../../image/index/nav_01.png" mode="aspectFit"></image>
             </view>
             <text class="desc">支出申请</text>
         </view>
-        <view class="tab_item"  bindtap='swichInCome'>
+        <view class="tab_item"  bindtap='swichInCome' hover-class="btnView">
             <view class="icon">
                 <image class="icon_img" src="../../image/index/nav_02.png" mode="aspectFit"></image>
             </view>
             <text class="desc">收入登记</text>
         </view>
-        <view class="tab_item" bindtap="swichKeeping">
+        <view class="tab_item" bindtap="swichKeeping" hover-class="btnView">
             <view class="icon">
                 <image class="icon_img" src="../../image/index/nav_03.png" mode="aspectFit"></image>
             </view>
             <text class="desc">记账申请</text>
         </view>
-        <view class="tab_item" data-url="/pages/finance/finance"  bindtap="navigate">
+        <view class="tab_item" data-url="/pages/finance/finance"  bindtap="navigate" hover-class="btnView">
             <view class="icon">
              <image class="icon_img" src="../../image/index/nav_04.png" mode="aspectFit"></image>
             </view>
@@ -72,37 +72,37 @@
     </view>
     <!--子导航功能导航-->
     <view class="child_function">
-        <view class="flex_block" data-url="/pages/payee/list/list"  bindtap="navigate"><!--bindtap="navigate"-->
+        <view class="flex_block" data-url="/pages/payee/list/list"  bindtap="navigate" hover-class="btnView"><!--bindtap="navigate"-->
             <view class="image"><image class="attribute" src="../../image/index/child_function_01.png" mode="aspectFit"></image></view>
             <text class="desc">收款人</text>
         </view>
-        <view class="flex_block" data-url="/pages/drawee/drawee"  bindtap="navigate"><!--bindtap="navigate"-->
+        <view class="flex_block" data-url="/pages/drawee/drawee"  bindtap="navigate" hover-class="btnView"><!--bindtap="navigate"-->
             <view class="image"><image class="attribute" src="../../image/index/child_function_02.png" mode="aspectFit"></image></view>
             <text class="desc">付款人</text>
         </view>
-        <view class="flex_block" data-url="/pages/bank/bank" bindtap="navigate">
+        <view class="flex_block" data-url="/pages/bank/bank" bindtap="navigate" hover-class="btnView">
             <view class="image"><image class="attribute" src="../../image/index/child_function_07.png" mode="aspectFit"></image></view>
             <text class="desc">开户行</text>
         </view>
-        <view class="flex_block" data-url="/pages/bankDraft/bankDraft" bindtap="navigate">
+        <view class="flex_block" data-url="/pages/bankDraft/bankDraft" bindtap="navigate" hover-class="btnView">
             <view class="image"><image class="attribute" src="../../image/index/child_function_04.png" mode="aspectFit"></image></view>
             <text class="desc">银行汇票</text>
         </view>
         <block wx:if="{{showList}}">
-          <view class="flex_block" data-url="/pages/project/project" bindtap="navigate">
+          <view class="flex_block" data-url="/pages/project/project" bindtap="navigate" hover-class="btnView">
               <view class="image"><image class="attribute" src="../../image/index/child_function_08.png" mode="aspectFit"></image></view>
               <text class="desc">工程项目</text>
           </view>
-          <view class="flex_block" data-url="/pages/contract/contract" bindtap="navigate">
+          <view class="flex_block" data-url="/pages/contract/contract" bindtap="navigate" hover-class="btnView">
                 <view class="image"><image class="attribute" src="../../image/index/child_function_03.png" mode="aspectFit"></image></view>
                 <text class="desc">合同信息</text>
             </view>
-            <view class="flex_block"  data-url="/pages/fixedAssets/fixedAssets" bindtap="navigate">
+            <view class="flex_block"  data-url="/pages/fixedAssets/fixedAssets" bindtap="navigate" hover-class="btnView">
                 <view class="image"><image class="attribute" src="../../image/index/child_function_10.png" mode="aspectFit"></image></view>
                 <text class="desc">固定资产</text>
             </view>
         </block>
-        <view class="flex_block" bindtap="openView">
+        <view class="flex_block" bindtap="openView" hover-class="btnView">
             <view class="image"><image class="attribute" src="../../image/index/child_function_06.png" mode="aspectFit"></image></view>
             <text class="desc">{{showListText}}</text>
         </view>