Browse Source

钉钉小程序第三期

347617796@qq.com 4 years ago
parent
commit
a783c385e9

+ 0 - 1
Component/selectSectionStaff/selectSectionStaff.axml

@@ -20,7 +20,6 @@
           <view class="flex-box flex-v-ce flex-1" data-item="{{item}}" catchTap="changeSection">
             <image mode="scaleToFill" style="width:50rpx;height:50rpx; margin:0 10rpx;" src="../../../image/BM.png"></image>
             <text class="flex-1">{{item.name}}</text>
-              
           </view>
           <view a:if="{{item._child.length>0}}" class="xia" data-item="{{item}}" catchTap="openDown">| 下级</view>
         </view>

+ 0 - 4
Component/selectSectionStaff/selectSectionStaff.js

@@ -268,8 +268,6 @@ Component({
             })
           }
         })
-
-
         that.data.userData.map((item) => {//列表数据是否是自己的管理范围
           userList.map((item2) => {
             if (item.id == item2.id) {
@@ -277,8 +275,6 @@ Component({
             }
           })
         })
-
-        
         this.setData({
           userList: that.props.isLeadership ? arr : userList,
           all_user_list: that.props.isLeadership ? arr : userList,

BIN
image/init.gif


BIN
image/logo.png


BIN
image/money.png


BIN
image/start1.jpg


BIN
image/start1.png


BIN
image/start2.jpg


BIN
image/start2.png


BIN
image/start3.jpg


BIN
image/start3.png


+ 94 - 3
package-lock.json

@@ -86,36 +86,127 @@
         "regenerator-runtime": "^0.13.4"
       }
     },
+    "async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npm.taobao.org/async/download/async-2.6.3.tgz",
+      "integrity": "sha1-1yYl4jRKNlbjo61Pp0n6gymdgv8=",
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
     "dingtalk-jsapi": {
       "version": "2.13.23",
       "resolved": "https://registry.npm.taobao.org/dingtalk-jsapi/download/dingtalk-jsapi-2.13.23.tgz",
       "integrity": "sha1-O2IykfH/sPXBuJtg1vjfJ2Y2cWA=",
-      "dev": true,
       "requires": {
         "promise-polyfill": "^7.1.0"
       }
     },
+    "duplexer": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz",
+      "integrity": "sha1-Or5DrvODX4rgd9E23c4PJ2sEAOY="
+    },
+    "event-stream": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npm.taobao.org/event-stream/download/event-stream-4.0.1.tgz",
+      "integrity": "sha1-QJKAjsmV0N116kWAwd9qdNss3mU=",
+      "requires": {
+        "duplexer": "^0.1.1",
+        "from": "^0.1.7",
+        "map-stream": "0.0.7",
+        "pause-stream": "^0.0.11",
+        "split": "^1.0.1",
+        "stream-combiner": "^0.2.2",
+        "through": "^2.3.8"
+      }
+    },
     "fecha": {
       "version": "2.3.3",
       "resolved": "https://registry.npm.taobao.org/fecha/download/fecha-2.3.3.tgz",
       "integrity": "sha1-lI50FX3xoy/RsSw6PDzctuydls0="
     },
+    "from": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npm.taobao.org/from/download/from-0.1.7.tgz",
+      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4="
+    },
     "hammerjs": {
       "version": "2.0.8",
       "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1613835838133&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.21.tgz",
+      "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw="
+    },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npm.taobao.org/lodash.assign/download/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
+    },
+    "map-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npm.taobao.org/map-stream/download/map-stream-0.0.7.tgz",
+      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg="
+    },
+    "mingo": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npm.taobao.org/mingo/download/mingo-1.3.3.tgz",
+      "integrity": "sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY="
+    },
+    "pause-stream": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npm.taobao.org/pause-stream/download/pause-stream-0.0.11.tgz",
+      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+      "requires": {
+        "through": "~2.3"
+      }
+    },
     "promise-polyfill": {
       "version": "7.1.2",
       "resolved": "https://registry.npm.taobao.org/promise-polyfill/download/promise-polyfill-7.1.2.tgz",
-      "integrity": "sha1-qwUwHYwoU2MBYi1pInYyJppwyjs=",
-      "dev": true
+      "integrity": "sha1-qwUwHYwoU2MBYi1pInYyJppwyjs="
     },
     "regenerator-runtime": {
       "version": "0.13.5",
       "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.5.tgz?cache=0&sync_timestamp=1584052481783&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.5.tgz",
       "integrity": "sha1-2Hih0JS0MG0QuQlkhLM+vVXiZpc="
     },
+    "save": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npm.taobao.org/save/download/save-2.4.0.tgz",
+      "integrity": "sha1-r5P/mz16QdCv9JojQzhwYTpGD5s=",
+      "requires": {
+        "async": "^2.6.2",
+        "event-stream": "^4.0.1",
+        "lodash.assign": "^4.2.0",
+        "mingo": "1"
+      }
+    },
+    "split": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/split/download/split-1.0.1.tgz",
+      "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=",
+      "requires": {
+        "through": "2"
+      }
+    },
+    "stream-combiner": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npm.taobao.org/stream-combiner/download/stream-combiner-0.2.2.tgz",
+      "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
+      "requires": {
+        "duplexer": "~0.1.1",
+        "through": "~2.3.4"
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
     "tslib": {
       "version": "1.13.0",
       "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-1.13.0.tgz?cache=0&sync_timestamp=1589411820927&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.13.0.tgz",

+ 2 - 0
pages/init/init.acss

@@ -10,4 +10,6 @@
   .initImg{
     width: 200rpx;
     height: 200rpx;
+		position: relative;
+		top: -60rpx;
   }

+ 1 - 1
pages/init/init.axml

@@ -1,5 +1,5 @@
 <view>
   <view class="noData flex-box-v flex-center-center">
-    <image mode="scaleToFill" src="../../image/init.gif" class="initImg"/>
+    <image mode="scaleToFill" src="../../image/logo.png" class="initImg"/>
   </view>
 </view>

+ 3 - 3
pages/start/start.axml

@@ -17,7 +17,7 @@
         </view>
       </view>
       <view class="c_footer">
-        <image mode="scaleToFill" src="../../image/start3.png" data-str="../../image/start1.png"></image>
+        <image mode="scaleToFill" src="../../image/start3.jpg" data-str="../../image/start3.jpg"></image>
       </view>
       <button type="primary" class="btn" data-index="2" catchTap="openView">下一步</button>
     </view>
@@ -38,7 +38,7 @@
         </view>
       </view>
       <view class="c_footer">
-        <image mode="scaleToFill" src="../../image/start2.png" data-str="../../image/start1.png"></image>
+        <image mode="scaleToFill" src="../../image/start2.jpg" data-str="../../image/start2.jpg"></image>
       </view>
       <button type="primary" class="btn" data-index="3" catchTap="openView">下一步</button>
     </view>
@@ -51,7 +51,7 @@
         <view class="fontColorF">请前往电脑端体验完整管理流程</view>
       </view>
       <view class="c_footer">
-        <image mode="scaleToFill" src="../../image/start1.png" data-str="../../image/start1.png"></image>
+        <image mode="scaleToFill" src="../../image/start1.jpg" data-str="../../image/start1.jpg"></image>
       </view>
       <view class="fontColorT text_f">路径:钉钉电脑端(需下载安装)-工作-功道云积分制</view>
 

+ 0 - 3
pages/statistics/integralEvent/integralEvent.js

@@ -75,7 +75,6 @@ Page({
           if (that.data.page == 1) {
             that.getData();
           }
-
         } else {
           dd.reLaunch({
             url: '../noJurisdiction/noJurisdiction'
@@ -205,8 +204,6 @@ Page({
     } else {
       this.setData({ staffVal: '员工', employee_ids: [], page: 1 })
     }
-
-
     this.getData();
   },
   //选择规则

+ 1 - 1
pages/statistics/sectionRanking/sectionRanking.js

@@ -42,7 +42,7 @@ Page({
       rule_id: that.data.rule_id,
       sort:that.data.sort,
       position:that.data.position,
-      page_size:10
+      page_size:20
     }
     if(that.data.dateIndex=='1'){
       data.year=that.data.year;