Merge branch '蓝色' into 测试

packageA/achievement/index.js

@@ -122,7 +122,7 @@ Page({
           case 1:
             data = {
               tab: {
-                active: "bz",
+                active: "by",
                 list: [{
                   name: "本周",
                   id: "bz"
@@ -163,7 +163,7 @@ Page({
           case 2:
             data = {
               tab: {
-                active: "bz",
+                active: "by",
                 list: [{
                   name: "本周",
                   id: "bz"
@@ -234,13 +234,12 @@ Page({
         res[key].outamount = conversion(res[key].outamount);
         res[key].invoiceamount = conversion(res[key].invoiceamount);
         //差额
-        res[key].unamount = CNY(currency(res[key].unamount).divide(10000), '') - 0;
+        res[key].unamount = CNY(res[key].unamount / 10000, '');
         res[key].unamountcolor = res[key].unamount >= 0 ? '#5AB73F' : '#EB4B5C';
 
-        res[key].unoutamount = CNY(currency(res[key].unoutamount).divide(10000), '') - 0;
+        res[key].unoutamount = CNY(res[key].unoutamount / 10000, '');
         res[key].unoutamountcolor = res[key].unoutamount >= 0 ? '#5AB73F' : '#EB4B5C';
-
-        res[key].uninvoiceamount = CNY(currency(res[key].uninvoiceamount).divide(10000), '') - 0;
+        res[key].uninvoiceamount = CNY(res[key].uninvoiceamount / 10000, '');
         res[key].uninvoiceamountcolor = res[key].uninvoiceamount >= 0 ? '#5AB73F' : '#EB4B5C';
         //达成率
         res[key].wcamount = currency(res[key].wcamount).multiply(100) + '%';

packageA/achievement/index.scss

@@ -134,7 +134,6 @@ page {
         }
 
         .value {
-          height: 42rpx;
           line-height: 42rpx;
           font-size: 30rpx;
           font-weight: 700;

packageA/achievement/index.wxml

@@ -23,22 +23,22 @@
           <view class="label">新增线索数</view>
           <view class="value">{{zysj[zysj.tab.active].xsxz}}</view>
         </view>
-        <view class="item">
-          <view class="label">线索跟进数</view>
-          <view class="value">{{zysj[zysj.tab.active].xsgj }}</view>
-        </view>
         <view class="item">
           <view class="label">新增客户数</view>
           <view class="value">{{zysj[zysj.tab.active].khxz}}</view>
         </view>
-        <view class="item">
-          <view class="label">客户跟进次数</view>
-          <view class="value">{{zysj[zysj.tab.active].khgj}}</view>
-        </view>
         <view class="item">
           <view class="label">新增项目数</view>
           <view class="value">{{zysj[zysj.tab.active].xmxz}}</view>
         </view>
+        <view class="item">
+          <view class="label">线索跟进次数</view>
+          <view class="value">{{zysj[zysj.tab.active].xsgj }}</view>
+        </view>
+        <view class="item">
+          <view class="label">客户跟进次数</view>
+          <view class="value">{{zysj[zysj.tab.active].khgj}}</view>
+        </view>
         <view class="item">
           <view class="label">项目跟进次数</view>
           <view class="value">{{zysj[zysj.tab.active].xmgj}}</view>

packageA/achievement/modules/bills.js

@@ -11,9 +11,9 @@ Component({
             pageNumber: 1,
             pageSize: 20,
             dataType: "10",
-            dateType: '周',
+            dateType: '月',
             where: {
-                dateType: '周',
+                dateType: '月',
                 begindate: "",
                 enddate: ""
             }

packageA/achievement/modules/client.js

@@ -11,9 +11,9 @@ Component({
             pageNumber: 1,
             pageSize: 20,
             dataType: "4",
-            dateType: '周',
+            dateType: '月',
             where: {
-                dateType: '周',
+                dateType: '月',
                 begindate: "",
                 enddate: ""
             }

packageA/achievement/modules/clue.js

@@ -11,9 +11,9 @@ Component({
             pageNumber: 1,
             pageSize: 20,
             dataType: "1",
-            dateType: '周',
+            dateType: '月',
             where: {
-                dateType: '周',
+                dateType: '月',
                 begindate: "",
                 enddate: ""
             }

packageA/achievement/modules/project.js

@@ -11,9 +11,9 @@ Component({
             pageNumber: 1,
             pageSize: 20,
             dataType: "7",
-            dateType: '周',
+            dateType: '月',
             where: {
-                dateType: '周',
+                dateType: '月',
                 begindate: "",
                 enddate: ""
             }