瀏覽代碼

钉钉小程序第三期

347617796@qq.com 4 年之前
父節點
當前提交
b4c3e61438
共有 3 個文件被更改,包括 10 次插入5 次删除
  1. 2 2
      app.js
  2. 3 1
      package-lock.json
  3. 5 2
      pages/workbench/index/index.axml

+ 2 - 2
app.js

@@ -1,8 +1,8 @@
 import { showToast } from './utils/feedback'
 import { formatTime, arrRemoveObj, getTypeItem } from './utils/util'
 
-const baseUrl = "https://test-ding.g107.com/";//测试
-// const baseUrl = "https://ding.insys.g107.com/";//正式
+// const baseUrl = "https://test-ding.g107.com/";//测试
+const baseUrl = "https://ding.insys.g107.com/";//正式
 var that;
 var yearArr = [];
 var year = formatTime(new Date()).year;

+ 3 - 1
package-lock.json

@@ -90,6 +90,7 @@
       "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"
       }
@@ -107,7 +108,8 @@
     "promise-polyfill": {
       "version": "7.1.2",
       "resolved": "https://registry.npm.taobao.org/promise-polyfill/download/promise-polyfill-7.1.2.tgz",
-      "integrity": "sha1-qwUwHYwoU2MBYi1pInYyJppwyjs="
+      "integrity": "sha1-qwUwHYwoU2MBYi1pInYyJppwyjs=",
+      "dev": true
     },
     "regenerator-runtime": {
       "version": "0.13.5",

+ 5 - 2
pages/workbench/index/index.axml

@@ -31,8 +31,11 @@
         <view class="ranking_name font-flex-word"> {{ item.group_name.slice(0,2)}}</view>
         <view class="ranking_num flex-1">
           <view>{{ item.group_name }}</view>
-          <text class="fontColorF" a:if="{{getRole_four}}">第 {{ item.rank }} 名:{{item.employee_name}}</text>
-          <text class="fontColorF" a:else>第 {{ item.rank }} 名</text>
+          <block a:if="{{item.rank}}">
+            <text class="fontColorF" a:if="{{getRole_four}}">第 {{ item.rank }} 名:{{item.employee_name}}</text>
+            <text class="fontColorF" a:else>第 {{ item.rank }} 名</text>
+          </block>
+           <text class="fontColorF" a:else>不参与排名</text>
         </view>
         <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
       </view>