Merge branch '蓝色' into 测试

app.json

@@ -223,6 +223,8 @@
         "Yl_ListBox": "/components/Yl_ListBox/index",
         "My_switch": "/components/My_switch/index",
         "My_empty": "/components/My_empty/index",
+        "shrink": "/components/shrink/shrink",
+        "timeRange": "/components/timeRange/timeRange",
         "van-button": "@vant/weapp/button/index",
         "van-icon": "@vant/weapp/icon/index",
         "van-image": "@vant/weapp/image/index",
@@ -249,8 +251,7 @@
         "color": "#000000",
         "selectedColor": "#000000",
         "backgroundColor": "#000000",
-        "list": [
-            {
+        "list": [{
                 "pagePath": "pages/tabbar/home/index"
             },
             {

packageA/salesHourglass/index.wxml

@@ -101,7 +101,7 @@
     <view class="top-title">{{ pageMsg.signdate_due ?pageMsg.signdate_due+(language['月']||'月'):'全部'}}_{{language['预计成交项目']||'预计成交项目'}}({{list[0].sa_projectid?pageMsg.total:0}})</view>
     <view class="amount-row">
         <view>{{language['预计签约金额']||'预计签约金额'}}：{{pageMsg.sumsignamount_due }}{{language['万元']||'万元'}}</view>
-        <view>{{language['项目成交金额']||'项目成交金额'}}：{{pageMsg.sumdealamount_due }}{{language['万元']||'万元'}}</view>
+        <view>{{language['预计成交金额']||'预计成交金额'}}：{{pageMsg.sumdealamount_due }}{{language['万元']||'万元'}}</view>
     </view>
     <block wx:if="{{list[0].sa_projectid}}">
         <navigator url="/packageA/project/detail?id={{item.sa_projectid}}" class="project-item" wx:for="{{list}}" wx:key="sa_projectid">
@@ -137,7 +137,7 @@
                     <text style="color: #3874F6;">{{item.signamount_due}}</text>
                 </view>
                 <view class="replenish">
-                    <text style="color: #999;">{{language['预计成交金额']||'预计成交金额'}}：</text>
+                    <text style="color: #999;">{{language['项目成交金额']||'项目成交金额'}}：</text>
                     <text style="color: #FF3B30;">{{item.dealamount}}</text>
                 </view>
                 <view class="replenish">

packageA/select/clue/select.wxml

@@ -32,7 +32,7 @@
         <view class="count">
             {{language['已选']||'已选'}}：{{result.length}}
         </view>
-        <van-button custom-class='but' disabled='{{result.length==0}}' bind:click="submit">{{language['确定']||'确定'}}</van-button>
+        <van-button custom-class='but' bind:click="submit">{{language['确定']||'确定'}}</van-button>
     </view>
     <wxs module="handle">
         module.exports = {

packageA/select/project/select.wxml

@@ -41,7 +41,7 @@
         <view class="count">
             {{language['已选']||'已选'}}：{{result.length}}
         </view>
-        <van-button custom-class='but' disabled='{{result.length==0}}' bind:click="submit">{{language['确定']||'确定'}}</van-button>
+        <van-button custom-class='but' bind:click="submit">{{language['确定']||'确定'}}</van-button>
     </view>
     <wxs module="handle">
         module.exports = {

packageA/select/setclient/select.wxml

@@ -26,7 +26,7 @@
         <view class="count">
             {{language['已选']||'已选'}}：{{result.length}}
         </view>
-        <van-button custom-class='but' disabled='{{result.length==0}}' bind:click="submit">{{language['确定']||'确定'}}</van-button>
+        <van-button custom-class='but'  bind:click="submit">{{language['确定']||'确定'}}</van-button>
     </view>
 </block>
 <wxs module="handle">