347617796@qq.com 3 years ago
parent
commit
91ccd6cd99
100 changed files with 433 additions and 922 deletions
  1. 26 32
      .mini-ide/compileMode.json
  2. 6 0
      .mini-ide/project-ide.json
  3. 2 7
      Component/img-box/index.js
  4. 89 0
      Component/selectJx/selectJx.acss
  5. 34 0
      Component/selectJx/selectJx.axml
  6. 120 0
      Component/selectJx/selectJx.js
  7. 3 0
      Component/selectJx/selectJx.json
  8. 0 1
      Component/selectRule/selectRule.axml
  9. 9 9
      Component/selectSection/selectSection.axml
  10. 8 8
      Component/selectSection/selectSection.js
  11. 41 46
      Component/selectSectionStaff/selectSectionStaff.js
  12. 1 1
      Component/selectSectionStaff_tow/selectSectionStaff_tow.js
  13. 3 3
      Component/selectStaff/selectStaff.js
  14. 46 23
      app.acss
  15. 8 9
      app.js
  16. 26 85
      app.json
  17. BIN
      image/1.png
  18. BIN
      image/2.png
  19. BIN
      image/3.png
  20. BIN
      image/Bf.png
  21. BIN
      image/Bj.png
  22. BIN
      image/a_apply.png
  23. BIN
      image/a_entry.png
  24. BIN
      image/addImg.png
  25. BIN
      image/add_ticket.png
  26. BIN
      image/all.png
  27. BIN
      image/all2.png
  28. BIN
      image/apply_list.png
  29. 0 0
      image/approval_process.svg
  30. BIN
      image/att_sign.png
  31. BIN
      image/att_statistics.png
  32. BIN
      image/caback6.png
  33. BIN
      image/ch1.png
  34. BIN
      image/ch11.png
  35. BIN
      image/ch2.png
  36. BIN
      image/ch3.png
  37. BIN
      image/code.jpg
  38. BIN
      image/date.png
  39. BIN
      image/date2.png
  40. BIN
      image/delete.png
  41. BIN
      image/dept.png
  42. BIN
      image/dh.png
  43. BIN
      image/dhm.png
  44. BIN
      image/entry_list.png
  45. BIN
      image/event_list_a.png
  46. BIN
      image/fl.png
  47. BIN
      image/glz.png
  48. BIN
      image/jb.png
  49. BIN
      image/jcf.png
  50. BIN
      image/jfsj.png
  51. BIN
      image/jk.png
  52. BIN
      image/jkaf.png
  53. BIN
      image/jkbf.png
  54. BIN
      image/jsqx.png
  55. BIN
      image/ju.png
  56. BIN
      image/kfdh.png
  57. BIN
      image/kq.png
  58. BIN
      image/length_point.png
  59. BIN
      image/ljpm.png
  60. BIN
      image/log1.png
  61. BIN
      image/log2.png
  62. BIN
      image/mx.png
  63. BIN
      image/my.png
  64. BIN
      image/my_examine.png
  65. BIN
      image/my_task.png
  66. BIN
      image/my_ticket.png
  67. BIN
      image/noTask.png
  68. BIN
      image/rule.png
  69. BIN
      image/select_my.png
  70. BIN
      image/sj2.png
  71. BIN
      image/snapshot.png
  72. BIN
      image/sqjf.png
  73. BIN
      image/sx.png
  74. BIN
      image/task_hall.png
  75. BIN
      image/tq.png
  76. BIN
      image/tz.png
  77. BIN
      image/wsqd.png
  78. BIN
      image/zdjf.png
  79. BIN
      image/zdyfz.png
  80. BIN
      image/zt.png
  81. 11 6
      package-lock.json
  82. 0 39
      pages/begin/begin.js
  83. 0 88
      pages/demo/demo.acss
  84. 0 56
      pages/demo/demo.axml
  85. 0 32
      pages/demo/demo.js
  86. 0 1
      pages/demo/demo.json
  87. 0 17
      pages/deploy/addMoney/addMoney.acss
  88. 0 9
      pages/deploy/addMoney/addMoney.axml
  89. 0 20
      pages/deploy/addMoney/addMoney.js
  90. 0 1
      pages/deploy/addMoney/addMoney.json
  91. 0 33
      pages/deploy/buy/buy.acss
  92. 0 11
      pages/deploy/buy/buy.axml
  93. 0 39
      pages/deploy/buy/buy.js
  94. 0 1
      pages/deploy/buy/buy.json
  95. 0 82
      pages/deploy/index/index.acss
  96. 0 77
      pages/deploy/index/index.axml
  97. 0 66
      pages/deploy/index/index.js
  98. 0 5
      pages/deploy/index/index.json
  99. 0 57
      pages/deploy/integralRule/integralRule.acss
  100. 0 58
      pages/deploy/integralRule/integralRule.axml

+ 26 - 32
.mini-ide/compileMode.json

@@ -1,60 +1,54 @@
 {
   "modes": [
     {
-      "title": "日志分",
-      "page": "pages/statistics/log_rank/log_rank"
+      "title": "选择管理记录",
+      "page": "pages/home/actionplanList/actionplanList"
     },
     {
-      "title": "兑换",
-      "page": "pages/exchange/exchange/exchange"
+      "title": "绩效详情",
+      "page": "pages/home/actionplanDetails/actionplanDetails"
     },
     {
-      "title": "功勋点明显",
-      "page": "pages/exchange/gxdDetail/gxdDetail"
+      "title": "绩效考核",
+      "page": "pages/home/performanceDetails/performanceDetails",
+      "pageQuery": "Tit=2022年03月绩效考核&id=7"
     },
     {
-      "title": "兑换记录",
-      "page": "pages/exchange/exchangeRecord/exchangeRecord"
+      "title": "编辑管理记录",
+      "page": "pages/home/addthePlan/addthePlan"
     },
     {
-      "title": "奖品详情",
-      "page": "pages/exchange/prizeDetail/prizeDetail"
+      "title": "人员明细",
+      "page": "pages/home/statementDetails/statementDetails"
     },
     {
-      "title": "商品详情",
-      "page": "pages/exchange/commodityDetail/commodityDetail"
+      "title": "我参与的",
+      "page": "pages/home/participation/participation"
     },
     {
-      "title": "公告内容",
-      "page": "pages/workbench/noticeDetail/noticeDetail",
-      "pageQuery": "id=20"
+      "title": "报表",
+      "page": "pages/home/statistics/statistics"
     },
     {
-      "title": "阶段排名",
-      "page": "pages/statistics/sectionRanking/sectionRanking"
+      "title": "全部绩效",
+      "page": "pages/home/allJx/allJx"
     },
     {
-      "title": "悬赏任务详情",
-      "page": "pages/statistics/taskDetail/taskDetail",
-      "pageQuery": "id=2538"
+      "title": "我",
+      "page": "pages/home/workList/workList"
     },
     {
-      "title": "审批详情",
-      "page": "pages/workbench/approveDetail/approveDetail",
-      "pageQuery": "id=7567"
+      "title": "待办事项",
+      "page": "pages/home/backlog/backlog"
     },
     {
-      "title": "我的任务",
-      "page": "pages/statistics/my_task/my_task"
+      "title": "服务台",
+      "page": "pages/index/start/start"
     },
     {
-      "title": "本周任务",
-      "page": "pages/newspaperTask/newspaperTask"
-    },
-    {
-      "title": "周报",
-      "page": "pages/reportBox/report/report",
-      "pageQuery": "employee_id=181"
+      "title": "结果值录入",
+      "page": "pages/home/resultValueEntry/resultValueEntry",
+      "pageQuery": "id=116"
     }
   ]
 }

+ 6 - 0
.mini-ide/project-ide.json

@@ -0,0 +1,6 @@
+{
+  "enableBackgroundBuild": true,
+  "enableCloudBuild": false,
+  "disableRemoteDebugSourcePanel": true,
+  "enableLegacyRemoteDebug": false
+}

+ 2 - 7
Component/img-box/index.js

@@ -29,13 +29,8 @@ Component({
           var str=this.props.name;
           var name=str.substr(str.length-2);
           let userImg=this.props.imgUrl;
-          if(this.props.id&&app.globalData.usersList.length>0&&!userImg){
-              app.globalData.usersList.some(item=>{
-                if(this.props.id==item.id){
-                  userImg=item.img_url
-                  return true
-                }
-              })
+          if(app.globalData.usersList[this.props.id]){
+              userImg=app.globalData.usersList[this.props.id].img_url
           }
           this.setData({
             userName:name,

+ 89 - 0
Component/selectJx/selectJx.acss

@@ -0,0 +1,89 @@
+
+.all{
+  background-color: #fff;
+  height: 100%;
+  margin-top: 40rpx;
+  border-radius: 20rpx 20rpx 0 0; 
+  padding-top: 80rpx;
+  z-index: 999
+}
+.close{
+  position: absolute;
+  right: 10rpx !important;
+  top: 50rpx !important;
+  padding: 20rpx;
+}
+.close image{
+  width: 40rpx;
+  height: 40rpx;
+}
+.left{
+  background: #f1f1f1;
+   height: calc(100vh - 140rpx);
+}
+.left .yi{
+  padding: 20rpx 24rpx;
+  position: relative;
+}
+.left .er{
+  border-bottom: 1px solid #f1f1f1;
+  background-color: #fff;
+  padding: 20rpx  0rpx;
+  padding-left: 40rpx;
+  position: relative;
+}
+.left .active::before{
+    position: absolute;
+    content: " ";
+    width: 6rpx;
+    height: 22rpx;
+    background: #26A2FF;
+    left: 10rpx;
+    top:50%;
+    margin-top: -11rpx;
+}
+.left .itemActive{
+  color: #26A2FF;
+}
+.right{
+   height: calc(100vh - 140rpx);
+}
+.search{
+    background-color: #f1f1f1;
+    border-radius: 6rpx;
+    width: 80%;
+    margin: 0 auto;
+    padding:6rpx 10rpx;
+}
+.search input{
+    background-color: #f1f1f1;
+}
+.search image{
+  width: 30rpx;
+  height: 30rpx;
+  margin-left: 10rpx;
+}
+.content{
+    margin-top: 16rpx;
+    border-top: 1px solid #f1f1f1;
+}
+.radio{
+  width: 80rpx;
+  text-align: center;
+  box-sizing: border-box;
+}
+.items{
+  padding: 14rpx;
+  border-bottom: 1px solid #f1f1f1;
+}
+.num{
+  font-size: 28rpx;
+}
+.items-top{
+  padding:20rpx 28rpx;
+  border-bottom: 1px solid #f1f1f1;
+}
+.nodata{
+  text-align: center;
+  padding: 40rpx;
+}

+ 34 - 0
Component/selectJx/selectJx.axml

@@ -0,0 +1,34 @@
+<view class="all">
+  <view class="close">
+    <image mode="scaleToFill" catchTap="plusOne" src="../../../image/close.png" />
+  </view>
+  <view class="flex-box content">
+    <scroll-view class="flex-2 left" scroll-y="{{true}}">
+      <view style="height: 100%">
+        <view class="tree" a:for="{{list}}">
+          <view class="{{item.id == activeIndex ? 'active':''}} yi" catchTap="activeTree" data-item="{{item}}">{{item.name}}</view>
+        </view>
+      </view>
+    </scroll-view>
+    <scroll-view class="flex-5 right" scroll-y="{{true}}">
+        <radio-group class="radio-group" onChange="radioChange">
+          <label class="flex-box flex-v-ce items" a:for="{{child_list}}">
+            <view class="radio">
+              <radio value="{{item}}" checked="{{true}}" a:if="{{item.id==defaultId}}"/>
+              <radio value="{{item}}" checked="{{false}}" a:else/>
+              {{item.value}}
+            </view>
+            <view class="radio-right flex-1">
+              <view>{{item.name}}</view>
+            </view>
+          </label>
+        </radio-group>
+        <view a:if="{{child_list.length==0}}" class="nodata fontColorF">
+          <view>
+            <image mode="scaleToFill" src="../../../image/noData.png" style="width: 340rpx;height: 340rpx;margin-bottom:20rpx;" />
+          </view>
+          <text>暂无相关绩效</text>
+        </view>
+    </scroll-view>
+  </view>
+</view>

+ 120 - 0
Component/selectJx/selectJx.js

@@ -0,0 +1,120 @@
+var app = getApp()
+var that;
+Component({
+  mixins: [],
+  data: {
+    allItems: [],
+    item_list: {},
+    list: [],
+    child_list: [],
+    activeIndex: '',//一级索引
+  },
+  props: {
+    onClose: (data) => console.log(data),
+    onConfirm: (data) => console.log(data),
+    defaultId: '',//默认选中
+    tree: false,//是否使用 api/per/package/tree||api/per/package/list
+  },
+  didMount() {
+    that = this;
+
+    this.getData();
+  },
+  didUpdate() { },
+  didUnmount() { },
+  methods: {
+    //点击一级
+    activeTree(e) {
+      var item = e.target.dataset.item
+      if (item.id == this.data.activeIndex) {
+        return false;
+      }
+      this.setData({
+        activeIndex: item.id,
+        child_list: item.list
+      })
+    },
+    openDetail(e) {
+      var id = e.target.dataset.item.id;
+      this.setData({
+        activeItemIndex: id,
+      });
+      this.getItem(id);
+    },
+    getItem(id) {
+      var item_list = this.data.allItems;
+      var items = item_list.filter((item) => { return item.rule_id == id });
+      that.setData({
+        item_list: items,
+      })
+    },
+    radioChange: function (e) {
+      this.props.onConfirm(e.detail.value);
+      this.plusOne();
+    },
+    getData() {
+      // that.setData({
+      //   list: [],
+      //   child_list: child_list,
+      //   activeIndex: activeIndex
+      // })
+      let data = {};
+      let str = 'api/per/package/tree';
+      if (this.props.tree) {
+        data = { page: 0, is_manage_scope: 1 };
+        str = 'api/per/package/list';
+      }
+      app.$get2(str, data).then((res) => {
+        if (this.props.tree) {
+          let obj = res.data.data.list;
+          let arr = [
+            { name: '月度', id: 2, list: [] },
+            { name: '日', id: 1, list: [] },
+            { name: '季度', id: 3, list: [] },
+            { name: '半年度', id: 4, list: [] },
+            { name: '年度', id: 5, list: [] },
+            { name: '自定义', id: 6, list: [] }
+          ];
+          obj.forEach(item => {
+            arr.forEach(item2 => {
+              if (item2.id == item.cycle_type) {
+                item2.list.push(item);
+              }
+            });
+          });
+          let data = arr;
+          let list = [];
+          data.forEach(item => {
+            if (item.list.length > 0) {
+              list.push(item);
+            }
+          });
+          this.setList(list)
+        } else {
+          var list = res.data.data
+          this.setList(list)
+        }
+      })
+    },
+    setList(list) {
+      let child_list = [];
+      let activeIndex;
+      list.some(item => {
+        if (item.list.length > 0) {
+          child_list = item.list;
+          activeIndex = item.id
+          return true;
+        }
+      });
+      that.setData({
+        list: list,
+        child_list: child_list,
+        activeIndex: activeIndex
+      })
+    },
+    //关闭
+    plusOne(e) {
+      this.props.onClose();
+    },
+  },
+});

+ 3 - 0
Component/selectJx/selectJx.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

+ 0 - 1
Component/selectRule/selectRule.axml

@@ -65,7 +65,6 @@
         </label>
       </radio-group>
       <view a:else class="nodata fontColorT">暂无积分规则,请前往钉钉电脑端添加【积分规则】</view>
-      </view>
     </scroll-view>
   </view>
 </view>

+ 9 - 9
Component/selectSection/selectSection.axml

@@ -4,19 +4,19 @@
     <view>
       <view class="flex-box flex-v-ce shu" a:if="{{terr.length>1}}">
         <view a:for="{{terr}}" class="flex-box flex-v-ce flex-d-wrap" data-index="{{index}}" catchTap="activeItem" data-item="{{item}}">
-          <image mode="scaleToFill" src="../../../image/right.png" style="width:20rpx;height:20rpx;margin:0 6rpx;" a:if="{{index!=0}}"/>
-                {{item.name}}
+          <image mode="scaleToFill" src="../../../image/right.png" style="width:20rpx;height:20rpx;margin:0 6rpx;" a:if="{{index!=0}}" />
+          {{item.name}}
         </view>
       </view>
       <scroll-view class="ul" scroll-y="{{true}}">
-          <view class="flex-box flex-v-ce li2" a:for="{{rule_tree}}" a:key="{{index}}">
-            <view  class="{{item.id==activeId? 'active':''}} flex-box flex-v-ce flex-1"  data-item="{{item}}"   catchTap="radioChange">
-              <view class="radio_"></view>
-              <image  class="images" src="../../../image/BM.png"/>
-              <view class="font-flex-word">{{item.name}}</view>
-            </view>
-            <view class="xia" data-item="{{item}}" catchTap="openDown" a:if="{{item._child.length>0}}">| 下级</view>
+        <view class="flex-box flex-v-ce li2" a:for="{{rule_tree}}" a:key="{{index}}">
+          <view class="{{item.dept_id==activeId? 'active':''}} flex-box flex-v-ce flex-1" data-item="{{item}}" catchTap="radioChange">
+            <view class="radio_"></view>
+            <image class="images" src="../../../image/BM.png" />
+            <view class="font-flex-word">{{item.name}}</view>
           </view>
+          <view class="xia" data-item="{{item}}" catchTap="openDown" a:if="{{item._child.length>0}}">| 下级</view>
+        </view>
       </scroll-view>
     </view>
     <view class="flex-box date-btn">

+ 8 - 8
Component/selectSection/selectSection.js

@@ -21,8 +21,8 @@ Component({
     this.setData({
       isShow:this.props.isShow,
       activeId:this.props.defaultSection,
-      terr:[{name: '全部', id:0}],
-      selectTissue:{name:'全公司',id:''}
+      terr:[{name: '全部', dept_id:0}],
+      selectTissue:{name:'全公司',dept_id:''}
     })
     this.getBmData();
   },
@@ -46,7 +46,7 @@ Component({
       this.setData({ rule_tree:[]});
       if(index==0){
         this.setData({
-          terr:[{name: '全部', id:0}],
+          terr:[{name: '全部', dept_id:0}],
           rule_tree:this.data.all_rule_list
         })
       }else{
@@ -65,7 +65,7 @@ Component({
        terr.push(item);
        if(item._child.length>0){
         item._child.map(item=>{
-          if(item.id==this.props.defaultSection){
+          if(item.dept_id==this.props.defaultSection){
             item.checked=true;
           }
         }) 
@@ -78,16 +78,16 @@ Component({
     radioChange: function(e) {
         this.setData({
           selectTissue:e.target.dataset.item,
-          activeId:e.target.dataset.item.id,
+          activeId:e.target.dataset.item.dept_id,
         })
     },
     //获取部门列表
     getBmData() {
-      app.$get("api/department/tree", {}).then((res) => {
-        var list = res.data.data.list||[];
+      app.$get("api/per/user/department", {}).then((res) => {
+        var list = res.data.data.dept_tree||[];
         list.unshift({
           name:'全公司',
-          id:''
+          dept_id:''
         })
         this.setData({
           rule_tree: list,

+ 41 - 46
Component/selectSectionStaff/selectSectionStaff.js

@@ -8,7 +8,7 @@ Component({
     isShow: false,
     showId: 0,//显示的部门ID下员工
     terr: [
-      { name: '全部', id: 0 }
+      { name: '全部', dept_id: 0 }
     ],
     all_rule_list: [],
     rule_tree: [],
@@ -17,8 +17,7 @@ Component({
     isAll: true,
     userData: [],
     isCreator: false,
-    creatorName: '',
-    keyVal:'',
+    keyVal: '',
   },
   props: {
     onClose: (data) => console.log(data),
@@ -31,19 +30,15 @@ Component({
   },
   didMount() {
     that = this;
-    this.setData({ isCreator: app.globalData.isCreator, creatorName: app.globalData.corpMessage.creators })
-    // app.login(app.globalData.corpId, function (is) {
-      // if (is) {
-        that.setData({
-          selectUserId: that.props.selectUser[0] ? that.props.selectUser : [],
-          isAll: that.props.isAllSelect,
-          userData:app.globalData.userData.employee_detail.manage_scope,
-          terr: [{ name: '全部', id: 0 }]
-        })
-      // }
-      that.getData(0);
-      that.getBmData();
-    // })
+    that.getData(0);
+    that.getBmData();
+    that.setData({
+      isCreator: app.globalData.isCreator, 
+      selectUserId: that.props.selectUser[0] ? that.props.selectUser : [],
+      isAll: that.props.isAllSelect,
+      // userData: app.globalData.userData.employee_detail.manage_scope,
+      terr: [{ name: '全部', dept_id: 0 }]
+    })
   },
   didUpdate() { },
   didUnmount() {
@@ -52,7 +47,7 @@ Component({
     onReset() {
       this.setData({
         isVal: false,
-        keyVal:''
+        keyVal: ''
       })
     },
     onConfirm() {
@@ -66,7 +61,7 @@ Component({
     //搜索
     bindKeyInput(e) {
       this.setData({
-        keyVal:e.detail.value,
+        keyVal: e.detail.value,
         isVal: e.detail.value ? true : false
       })
     },
@@ -87,7 +82,7 @@ Component({
           isAllChecked: false
         })
       }
-      this.getData(item.id);
+      this.getData(item.dept_id);
     },
     //点击导航栏
     activeItem(e) {
@@ -98,7 +93,7 @@ Component({
       this.setData({ rule_tree: [] });
       if (index == 0) {
         this.setData({
-          terr: [{ name: '全部', id: 0 }],
+          terr: [{ name: '全部', dept_id: 0 }],
           rule_tree: this.data.all_rule_list,
           isAllChecked: false
         })
@@ -110,7 +105,7 @@ Component({
           isAllChecked: false
         })
       }
-      this.getData(item.id);
+      this.getData(item.dept_id);
     },
     // 点击下一级
     openDown(e) {
@@ -125,7 +120,7 @@ Component({
           isAllChecked: false
         })
       }
-      this.getData(item.id);
+      this.getData(item.dept_id);
     },
     getArrDifference(arr1, arr2) {
       var obj = {};
@@ -181,7 +176,7 @@ Component({
 
         //将所有的选中状态改成未中
         var userList = this.data.userList;
-        userList.map((item, item_index) => {  
+        userList.map((item, item_index) => {
           if (item.checked) {
             var item_checked = `userList[${item_index}].checked`;
             this.setData({
@@ -189,21 +184,21 @@ Component({
             })
           }
         })
-        if(!elm){
+        if (!elm) {
           selectUserId.forEach((element, _this) => {
             if (element.id == item.id) {
               isExist = true;
             }
           });
           if (!isExist) {
-            selectUserId=[];
+            selectUserId = [];
             selectUserId.push(item);
           }
-        }else{//取消选中
-            selectUserId=[];
+        } else {//取消选中
+          selectUserId = [];
         }
         this.setData({
-            [checked]: !elm,
+          [checked]: !elm,
         })
       } else {//多选择
         let item = e.target.dataset.item;
@@ -211,7 +206,7 @@ Component({
         let checked = `userList[${index}].checked`;//获取当前控制选中的字段
         let elm = this.data.userList[index].checked;//当前的状态
         this.setData({
-           [checked]: !elm,
+          [checked]: !elm,
         })
         if (e.detail.value) {//当有值时选中
           selectUserId.forEach((element, _this) => {
@@ -231,7 +226,7 @@ Component({
         }
       }
       this.setData({
-          selectUserId: selectUserId
+        selectUserId: selectUserId
       })
     },
     //关闭
@@ -244,18 +239,18 @@ Component({
         userList: [],
         all_user_list: []
       })
-      app.$get("api/employee/list", { dept_id: dept_id }).then((res) => {
+      app.$get("api/per/user/employee_list", { dept_id: dept_id,page:0,pageSize:0 }).then((res) => {
         var list = res.data.data.list || [];
         var selectUserId = this.data.selectUserId;
         var arr = [];
         var userList = [];
         list.forEach(item => {
-          if(this.props.isBoss&&item.is_creator == 1){
-              return null
-          }else if(this.props.isUser&&item.id == app.globalData.userData.id){
-              return null
-          }else{
-              userList.push(item)
+          if (this.props.isBoss && item.is_creator == 1) {
+            return null
+          } else if (this.props.isUser && item.id == app.globalData.userData.id) {
+            return null
+          } else {
+            userList.push(item)
           }
         });
         userList.map((item) => { //设置列表的选中状态
@@ -268,13 +263,13 @@ Component({
             })
           }
         })
-        that.data.userData.map((item) => {//列表数据是否是自己的管理范围
-          userList.map((item2) => {
-            if (item.id == item2.id) {
-              arr.push(item2);
-            }
-          })
-        })
+        // that.data.userData.map((item) => {//列表数据是否是自己的管理范围
+        //   userList.map((item2) => {
+        //     if (item.id == item2.id) {
+        //       arr.push(item2);
+        //     }
+        //   })
+        // })
         this.setData({
           userList: that.props.isLeadership ? arr : userList,
           all_user_list: that.props.isLeadership ? arr : userList,
@@ -283,8 +278,8 @@ Component({
     },
     //获取部门列表
     getBmData() {
-      app.$get("api/department/tree", {}).then((res) => {
-        var list = res.data.data.list;
+      app.$get("api/per/user/department", {}).then((res) => {
+        var list = res.data.data.dept_tree;
         this.setData({
           rule_tree: list,
           all_rule_list: list

+ 1 - 1
Component/selectSectionStaff_tow/selectSectionStaff_tow.js

@@ -158,7 +158,7 @@ Component({
     //获取人员列表
     getData(dept_id) {
       this.setData({ userList: [], all_user_list: [] })
-      app.$get("api/employee/list", { dept_id: dept_id }).then((res) => {
+      app.$get("api/per/user/employee_list", { dept_id: dept_id,page:0,pageSize:0  }).then((res) => {
         var list = res.data.data.list;
         var selectUserId = this.data.selectUserId;
         var arr = [];

+ 3 - 3
Component/selectStaff/selectStaff.js

@@ -44,7 +44,7 @@ Component({
       var isExist = false;
       let item = e.target.dataset.item;
       let index = e.target.dataset.index;
-      let checked = `userList[${index}].checked`;//获取当前控制选中的字段
+      let checked = `userList[${index}].checked`; //获取当前控制选中的字段
       let elm = this.data.userList[index].checked;//当前的状态
       if (this.data.isAll) {//当可多选时
         if (e.detail.value) {//当有值时选中
@@ -85,8 +85,8 @@ Component({
         selectUserId: selectUserId
       })
     },
-    getData(keywords) {
-      app.$get("api/employee/list", { dept_id: 0, keywords: keywords }).then((res) => {
+    getData() {
+      app.$get("api/per/user/employee_list", { page:0,pageSize:0 }).then((res) => {
         var list = res.data.data.list;
         var arr = this.props.defaultUser;
         if (typeof (arr) == 'string') {

+ 46 - 23
app.acss

@@ -1,4 +1,6 @@
-	page {
+  @import './utils/iconfont.acss';
+  
+  page {
 		color: #303133;
 		font-size: 32rpx;
 		background: rgba(245, 247, 250, 1);
@@ -13,12 +15,10 @@
 
 	.nodeBer {
 		border: none!important;
-	}
-
-	view, text {
-		line-height: 40rpx;
-	}
-
+  }
+  .white{
+    color: #fff!important;
+  }
 	.blue {
 		color: #26A2FF!important;
 	}
@@ -28,15 +28,15 @@
 	}
 
 	.yellow {
-		color: #E6A23C!important;
+		color: #ffcc00!important;
 	}
 
-	.yellow2 {
-		color: #fc0!important;
+	.orange {
+		color: #f0a020!important;
 	}
 
 	.green {
-		color: #67C23A!important;
+		color: #49d3a7!important;
 	}
 
 	.fontColorZ {
@@ -48,7 +48,7 @@
 	}
 
 	.fontColorX {
-		color: #969799 !important;
+		color: #909399 !important;
 	}
 
 	.fontColorT {
@@ -58,7 +58,7 @@
 	/* 搜索框 */
 
 	.search {
-		background-color: #f1f1f1;
+		background-color: #f7f8fa;
 		border-radius: 10rpx;
 		width: 90%;
 		margin: 0 auto;
@@ -66,7 +66,7 @@
 	}
 
 	.search input {
-		background-color: #f1f1f1;
+		background-color: #f7f8fa;
 		font-size: 32rpx !important;
 	}
 
@@ -124,7 +124,7 @@
 
 	.tab view text {
 		position: relative;
-		padding: 20rpx 0;
+		padding: 24rpx 0;
 		/* width: 120%; */
 		white-space: nowrap
 	}
@@ -200,11 +200,20 @@
 		line-height: 100rpx;
 		box-shadow: 0 0 0.12rem rgba(0, 0, 0, .15);
 	}
-
+  .showdown{
+    animation: showdown 0.2s linear both;
+  }
 	.showPop {
 		animation: showLayer 0.2s linear both;
 	}
-
+	@keyframes showdown {
+		0% {
+			transform: translateY(100%);
+		}
+		100% {
+			transform: translateY(0%);
+		}
+  }
 	@keyframes showLayer {
 		0% {
 			transform: translateY(-100%);
@@ -227,12 +236,12 @@
 	.greenBox {
 		border-radius: 6rpx;
 		background: rgba(103,194,58,.1);
-		color: #67C23A;
+		color: #49d3a7;
 		font-size: 28rpx;
 		padding: 0 6rpx;
 	}
 
-	.yellowBox2{
+	.yellowBox{
 		border-radius: 6rpx;
 		background: rgba(255,204,0,.1);
 		color: #fc0;
@@ -240,10 +249,10 @@
 		padding: 0 6rpx;
 	}
 
-	.yellowBox {
+	.orangeBox{
 		border-radius: 6rpx;
 		background: rgba(230,162,60,.1);
-		color: #E6A23C;
+		color: #f0a020;
 		font-size: 28rpx;
 		padding: 0 6rpx;
 	}
@@ -292,8 +301,22 @@
 	.noDatas {
 		text-align: center;
 		padding: 16rpx 0;
-		color: #909399
-	}
+    color: #909399;
+    font-size: 0.3rem;
+  }
+  .tabs{
+    position: relative;
+  }
+  .tabs::after{
+    position: absolute;
+    content: " ";
+    height: 0.06rem;
+    width: 1.4rem;
+    background-color: #26A2FF;
+    left: 50%;
+    margin-left: -0.7rem;
+    bottom: 0;
+  }
 
 	.radio_ {
 		width: 40rpx !important;

File diff suppressed because it is too large
+ 8 - 9
app.js


+ 26 - 85
app.json

@@ -1,81 +1,28 @@
 {
   "pages": [
-    "pages/begin/begin",
-    "pages/workbench/approval_batch/approval_batch",
-    "pages/workbench/index/index",
-    "pages/statistics/index/index",
-    "pages/deploy/index/index",
-    "pages/workbench/statistics_A/statistics_A",
-    "pages/workbench/statistics_B/statistics_B",
-    "pages/workbench/jk_A/jk_A",
-    "pages/workbench/jk_B/jk_B",
-    "pages/workbench/apply/apply",
-    "pages/workbench/prize_buckle/prize_buckle",
-    "pages/workbench/my_approve/my_approve",
-    "pages/workbench/approveDetail/approveDetail",
-    "pages/statistics/my_PrizeBuckle/my_PrizeBuckle",
-    "pages/statistics/prizeBuckleDetail/prizeBuckleDetail",
-    "pages/statistics/my_apply/my_apply",
-    "pages/statistics/applyDetail/applyDetail",
-    "pages/statistics/glz_execute/glz_execute",
-    "pages/statistics/check_top/check_top",
-    "pages/statistics/checkDetail/checkDetail",
-    "pages/statistics/integralEvent/integralEvent",
-    "pages/statistics/sectionRanking/sectionRanking",
-    "pages/statistics/B_ranking/B_ranking",
-    "pages/statistics/customRamking/customRamking",
-    "pages/statistics/addCustom/addCustom",
-    "pages/statistics/customDetail/customDetail",
-    "pages/statistics/userRamking/userRamking",
-    "pages/deploy/organization/organization",
-    "pages/deploy/addMoney/addMoney",
-    "pages/deploy/setCheck/setCheck",
-    "pages/deploy/integralRule/integralRule",
-    "pages/workbench/approve/approve",
-    "pages/statistics/C_ranking/C_ranking",
-    "pages/noJurisdiction/noJurisdiction",
-    "pages/init/init",
-    "pages/deploy/sku/sku",
-    "pages/start/start",
-    "pages/deploy/upgrade/upgrade",
-    "pages/deploy/upgradeDetail/upgradeDetail",
-    "pages/statistics/grant/grant",
-    "pages/statistics/myGrant/myGrant",
-    "pages/statistics/assaign/assaign",
-    "pages/statistics/offerAreward/offerAreward",
-    "pages/statistics/my_issue/my_issue",
-    "pages/statistics/workDetail/workDetail",
-    "pages/statistics/schedule/schedule",
-    "pages/statistics/recordOne/recordOne",
-    "pages/statistics/workpoints/workpoints",
-    "pages/statistics/my_task/my_task",
-    "pages/statistics/openPerform/openPerform",
-    "pages/statistics/taskDetail/taskDetail",
-    "pages/statistics/repetitive_tasks_detail/repetitive_tasks_detail",
-    "pages/statistics/getTask/getTask",
-    "pages/statistics/assaign_set/assaign_set",
-    "pages/statistics/offerAreward_set/offerAreward_set",
-    "pages/statistics/logDetail/logDetail",
-    "pages/demo/demo",
-    "pages/statistics/my_sp/my_sp",
-    "pages/statistics/allTask/allTask",
-    "pages/deploy/buy/buy",
-    "pages/statistics/log_rank/log_rank",
-    "pages/statistics/task_rank/task_rank",
-    "pages/exchange/exchange/exchange",
-    "pages/exchange/exchangeRecord/exchangeRecord",
-    "pages/exchange/gxdDetail/gxdDetail",
-    "pages/exchange/prizeDetail/prizeDetail",
-    "pages/exchange/commodityDetail/commodityDetail",
-    "pages/workbench/noticeDetail/noticeDetail",
-    "pages/reportBox/report/report",
-    "pages/reportBox/noUser/noUser",
-    "pages/reportBox/newspaperTask/newspaperTask",
-    "pages/reportBox/moreE/moreE"
+    "pages/index/begin/begin",
+    "pages/index/noJurisdiction/noJurisdiction",
+    "pages/index/init/init",
+    "pages/index/start/start",
+    "pages/home/home/home",
+    "pages/home/myJx/myJx",
+    "pages/home/statistics/statistics",
+    "pages/home/participation/participation",
+    "pages/home/allJx/allJx",
+    "pages/home/backlog/backlog",
+    "pages/home/messageInform/messageInform",
+    "pages/home/workList/workList",
+    "pages/home/performanceDetails/performanceDetails",
+    "pages/home/actionplanList/actionplanList",
+    "pages/home/actionplanDetails/actionplanDetails",
+    "pages/home/addthePlan/addthePlan",
+    "pages/home/statementDetails/statementDetails",
+    "pages/home/resultValueEntry/resultValueEntry",
+    "pages/serve/serve/serve",
+    "pages/serve/webView/webView"
   ],
   "window": {
     "defaultTitle": "功道云",
-    "titleBarColor": "#26A2FF",
     "pullRefresh": false,
     "allowsBounceVertical": "NO"
   },
@@ -85,22 +32,16 @@
     "backgroundColor": "#ffffff",
     "items": [
       {
-        "pagePath": "pages/workbench/index/index",
-        "name": "首页",
-        "icon": "image/home.png",
-        "activeIcon": "image/activeHome.png"
-      },
-      {
-        "pagePath": "pages/statistics/index/index",
-        "name": "工作台",
+        "pagePath": "pages/home/home/home",
+        "name": "绩效首页",
         "icon": "image/tj.png",
         "activeIcon": "image/activeTj.png"
       },
       {
-        "pagePath": "pages/deploy/index/index",
-        "name": "我的",
-        "icon": "image/my.png",
-        "activeIcon": "image/select_my.png"
+        "pagePath": "pages/serve/serve/serve",
+        "name": "服务台",
+        "icon": "image/home.png",
+        "activeIcon": "image/activeHome.png"
       }
     ]
   }

BIN
image/1.png


BIN
image/2.png


BIN
image/3.png


BIN
image/Bf.png


BIN
image/Bj.png


BIN
image/a_apply.png


BIN
image/a_entry.png


BIN
image/addImg.png


BIN
image/add_ticket.png


BIN
image/all.png


BIN
image/all2.png


BIN
image/apply_list.png


File diff suppressed because it is too large
+ 0 - 0
image/approval_process.svg


BIN
image/att_sign.png


BIN
image/att_statistics.png


BIN
image/caback6.png


BIN
image/ch1.png


BIN
image/ch11.png


BIN
image/ch2.png


BIN
image/ch3.png


BIN
image/code.jpg


BIN
image/date.png


BIN
image/date2.png


BIN
image/delete.png


BIN
image/dept.png


BIN
image/dh.png


BIN
image/dhm.png


BIN
image/entry_list.png


BIN
image/event_list_a.png


BIN
image/fl.png


BIN
image/glz.png


BIN
image/jb.png


BIN
image/jcf.png


BIN
image/jfsj.png


BIN
image/jk.png


BIN
image/jkaf.png


BIN
image/jkbf.png


BIN
image/jsqx.png


BIN
image/ju.png


BIN
image/kfdh.png


BIN
image/kq.png


BIN
image/length_point.png


BIN
image/ljpm.png


BIN
image/log1.png


BIN
image/log2.png


BIN
image/mx.png


BIN
image/my.png


BIN
image/my_examine.png


BIN
image/my_task.png


BIN
image/my_ticket.png


BIN
image/noTask.png


BIN
image/rule.png


BIN
image/select_my.png


BIN
image/sj2.png


BIN
image/snapshot.png


BIN
image/sqjf.png


BIN
image/sx.png


BIN
image/task_hall.png


BIN
image/tq.png


BIN
image/tz.png


BIN
image/wsqd.png


BIN
image/zdjf.png


BIN
image/zdyfz.png


BIN
image/zt.png


+ 11 - 6
package-lock.json

@@ -111,9 +111,9 @@
       }
     },
     "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=",
+      "version": "2.13.71",
+      "resolved": "https://registry.npmjs.org/dingtalk-jsapi/-/dingtalk-jsapi-2.13.71.tgz",
+      "integrity": "sha512-fi5qX/BvxZ/HopKS7T2V84fiG2CWzcPaSblC0UqAU/cVdJ4QZMt/19P0o5kWrHbflAMSh72ygP8ErrRwE/tKmg==",
       "requires": {
         "promise-polyfill": "^7.1.0"
       }
@@ -129,15 +129,20 @@
       "integrity": "sha1-lI50FX3xoy/RsSw6PDzctuydls0="
     },
     "follow-redirects": {
-      "version": "1.14.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
-      "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
+      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="
     },
     "hammerjs": {
       "version": "2.0.8",
       "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
+    "moment": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",

+ 0 - 39
pages/begin/begin.js

@@ -1,39 +0,0 @@
-var app = getApp();
-var that;
-Page({
-  data: {
-    num:0,
-    str:'企业信息同步中...',
-  },
-  onLoad() {
-   that = this;
-   that.loginAll();
-  },
-  loginAll(){
-      app.login(app.globalData.corpId, function (is) {
-        if(is){
-          dd.reLaunch({
-            url: '../workbench/index/index'
-          })
-        } else {
-          dd.reLaunch({
-            url: '../noJurisdiction/noJurisdiction'
-          })
-        }
-      },function(data){
-        if(data.code==3000){
-          if(that.data.num==3){ return false}
-          setTimeout(function(){ 
-            let num=that.data.num;
-            that.setData({ num:num+1 })
-            that.loginAll();
-          }, 3000);
-        }else{
-             that.setData({
-              num:0,
-              str:data.msg
-            })
-        }
-      },true)
-  },
-});

+ 0 - 88
pages/demo/demo.acss

@@ -1,88 +0,0 @@
-.box{
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0,0,0,0.2);
-  z-index: 999;
-  transform: translate(0,100%);
-}
-.all{
-  background-color: #fff;
-  height: 100%;
-  margin-top: 40rpx;
-  border-radius: 20rpx 20rpx 0 0; 
-  padding-top: 80rpx;
-  z-index: 999
-}
-.close{
-  position: absolute;
-  right: 10rpx !important;
-  top: 50rpx !important;
-  padding: 20rpx;
-}
-	.container__mask {
-		overflow: hidden;
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 0;
-}
-
-	/* 盒子模型 */
-
-	.flex-box {
-		display: -webkit-box;
-		display: -moz-box;
-		display: -ms-flexbox;
-		display: -webkit-flex;
-		display: flex;
-	}
-  
-	.flex-1 {
-		-webkit-box-flex: 1;
-		-moz-box-flex: 1;
-		-webkit-flex: 1;
-		-ms-flex: 1;
-		flex: 1;
-	}
-
-	.flex-2 {
-		-webkit-box-flex: 2;
-		box-flex: 2;
-		-moz-box-flex: 2;
-		-webkit-flex: 2;
-		-ms-flex: 2;
-		flex: 2;
-	}
-
-	.flex-3 {
-		-webkit-box-flex: 3;
-		box-flex: 3;
-		-moz-box-flex: 3;
-		-webkit-flex: 3;
-		-ms-flex: 3;
-		flex: 3;
-	}
-
-	.flex-4 {
-		-webkit-box-flex: 4;
-		box-flex: 4;
-		-moz-box-flex: 4;
-		-webkit-flex: 4;
-		-ms-flex: 4;
-		flex: 4;
-	}
-
-	.flex-5 {
-		-webkit-box-flex: 5;
-		box-flex: 5;
-		-moz-box-flex: 5;
-		-webkit-flex: 5;
-		-ms-flex: 5;
-		flex: 5;
-	}
-

+ 0 - 56
pages/demo/demo.axml

@@ -1,56 +0,0 @@
-<view>
-  <view class="{{popupCx}}">
-    <view catchTap="onOpen" style="padding:20rpx;">打开</view>
-  </view>
-  <view class="box" animation="{{animationInfo}}">
-    <view class="all">
-      <view class="close" catchTap="onClose">关</view>
-      <view class="flex-box">
-        <scroll-view class="flex-2" scroll-y="{{true}}" style="height:500rpx;">
-          <view style="height:500rpx;background:#E6A23C">
-            // 配置用户账号信息
-            git config --global user.name 'gitHub name'
-            git config --global user.email 'gitHub email'
-
-            // 重置或者修改用户账号信息
-            // 第一种直接按上面配置,第二种就是替换(备用),这个是全局配置
-            git config --global user.name "James"
-            git config --global user.email "1282285801@qq.com"
-
-            // 查看当前使用者的信息和邮箱
-            git config user.name
-            git config user.email
-            // 也可以通过全局查看
-            git config --global --list
-                
-            // 添加多个用户配置
-            git config --global --add user.name 'name'
-            git config --global --add user.email 'email'
-          </view>
-        </scroll-view>
-        <scroll-view class="flex-5" scroll-y="{{true}}" style="height:500rpx;">
-          <view style="height:1500rpx;background:#F56C6C">
-            // 配置用户账号信息
-            git config --global user.name 'gitHub name'
-            git config --global user.email 'gitHub email'
-
-            // 重置或者修改用户账号信息
-            // 第一种直接按上面配置,第二种就是替换(备用),这个是全局配置
-            git config --global user.name "James"
-            git config --global user.email "1282285801@qq.com"
-
-            // 查看当前使用者的信息和邮箱
-            git config user.name
-            git config user.email
-            // 也可以通过全局查看
-            git config --global --list
-                
-            // 添加多个用户配置
-            git config --global --add user.name 'name'
-            git config --global --add user.email 'email'
-          </view>
-        </scroll-view>
-      </view>
-    </view>
-  </view>
-</view>

+ 0 - 32
pages/demo/demo.js

@@ -1,32 +0,0 @@
-var app = getApp()
-var that;
-var animation;
-Page({
-  data: {
-    animationInfo:'',
-    popupCx:''
-  },
-  onLoad() {
-     that = this;
-  },
-  onShow() {
-    animation = dd.createAnimation({
-      duration: 200,
-      timeFunction: "linear",
-    });
-  },
-  onOpen(){
-    animation.translateY(0).step();
-    that.setData({
-      animationInfo: animation.export(),
-      popupCx: 'container__mask'
-    });
-  },
-  onClose() {
-    animation.translateY(1200).step();
-    that.setData({
-      animationInfo: animation.export(),
-      popupCx: ''
-    });
-  },
-});

+ 0 - 1
pages/demo/demo.json

@@ -1 +0,0 @@
-{}

+ 0 - 17
pages/deploy/addMoney/addMoney.acss

@@ -1,17 +0,0 @@
-.footer{
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: #fff;
-  padding: 10rpx;
-  border-top: 1px solid #f1f1f1;
-}
-.footer view{
-  border-radius: 6rpx;
-  background: #26A2FF;
-  color: #fff;
-  height: 88rpx;
-  text-align: center;
-  line-height: 88rpx;
-}

+ 0 - 9
pages/deploy/addMoney/addMoney.axml

@@ -1,9 +0,0 @@
-<view>
-  <image  src="../../../image/money.jpg" mode='widthFix' style="width:100%;"/>
-  <view style="height:100rpx">
-    
-  </view>
-  <view class="footer" onTap="openUrl">
-    <view>续费升级</view>
-  </view>
-</view>

+ 0 - 20
pages/deploy/addMoney/addMoney.js

@@ -1,20 +0,0 @@
-var app = getApp();
-var that;
-import 'dingtalk-jsapi/entry/mobile';
-import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
-Page({
-  data: {},
-  onLoad() {
-    that = this;
-    dd.setNavigationBar({ title: "续费升级" });
-  },
-  openUrl() {
-    // app.$get("api/order/goods/sku", { callback: "pages/deploy/sku/sku", goods_code: 'DT_GOODS_881634720824433' }).then((res) => {
-    //   console.log(res.data.data.url)
-      openLink({
-          // url: res.data.data.url
-        url: 'https://h5.dingtalk.com/open-market/share.html?shareGoodsCode=D34E5A30A9AC7FC6327AB5E6D2D145418457E59F16C3FC969F1A50AEF2E5E320588012470F1AB045&token=d37751d45abad15178adf60f936d7c28&shareUid=C5EB7B5C85793F3D909B2AC4771E12D7'
-      })
-    // })
-  },
-});

+ 0 - 1
pages/deploy/addMoney/addMoney.json

@@ -1 +0,0 @@
-{}

+ 0 - 33
pages/deploy/buy/buy.acss

@@ -1,33 +0,0 @@
-.vip{
-  width: 100%;
-  vertical-align:bottom
-}
-.footer{
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: #201C19;
-  padding: 10rpx;
-  /* border-top: 1px solid #f1f1f1; */
-  box-sizing: border-box;
-}
-.footer view{
-  border-radius: 50rpx;
-  background-image: linear-gradient(to bottom, #ffeab2 0%, #e1bf66 100%);
-  color: #201C19;
-  height: 88rpx;
-  text-align: center;
-  line-height: 88rpx;
-}
-.icon{
-  width: 24rpx;
-  height: 24rpx;
-  margin-right: 10rpx;
-}
-.msg{
-  background: #FFF5CE;
-  color: #FFB441;
-  padding:4rpx 0;
-  font-size: 30rpx;
-}

+ 0 - 11
pages/deploy/buy/buy.axml

@@ -1,11 +0,0 @@
-<view style="line-height: 0rpx;">
-  <!-- <view class="flex-box-ce flex-center-center msg" a:if="{{vipData.status==2}}">
-    <image mode="scaleToFill" class="icon" src="../../../image/lb.png"/>
-    <text>{{vipData.msg}}</text>     
-  </view> -->
-  <image src="{{item}}" class="vip" mode='widthFix' a:for="{{vipData.banner}}"/>
-  <view style="height:100rpx"></view>
-  <view class="footer" onTap="openUrl">
-    <view>成为尊享会员</view>
-  </view>
-</view>

+ 0 - 39
pages/deploy/buy/buy.js

@@ -1,39 +0,0 @@
-var app = getApp();
-var that;
-import 'dingtalk-jsapi/entry/mobile';
-import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
-Page({
-  data: {
-    vipData:{}
-  },
-  onLoad(e) {
-    that = this;
-    dd.setNavigationBar({ title: "功道云尊享会员" });
-    dd.setStorage({
-      key: 'isShowNew',
-      data: true,
-    });
-    if(e.code){
-        this.getDetail(e.code)
-     }
-  },
-  getDetail(code){
-    app.$get("api/order/goods/info", {goods_code:code}).then((res) => {
-        this.setData({
-          vipData:res.data.data,
-        })
-    })
-  },
-  //跳转
-  openUrl() {
-    if(this.data.vipData.charge_type==1&&this.data.vipData.status==2){
-         app.globalData.showToast("你已是尊享会员,请勿重复购买");
-         return false;
-    }
-    app.$get("api/order/goods/sku", { callback: "pages/deploy/sku/sku", goods_code: this.data.vipData.goods_code }).then((res) => {
-      openLink({
-          url: res.data.data.url
-      })
-    })
-  },
-});

+ 0 - 1
pages/deploy/buy/buy.json

@@ -1 +0,0 @@
-{}

+ 0 - 82
pages/deploy/index/index.acss

@@ -1,82 +0,0 @@
-.top {
-  width: 100%;
-  height: 70rpx;
-  background-color: #26A2FF;
-  margin-bottom: 94rpx;
-}
-.vip{
-  padding:0 20rpx;
-  line-height: 0rpx;
-  position: relative;
-}
-.vip image{
-  width: 100%;
-  height: 140rpx;
-}
-.btn{
-    background-image: linear-gradient(to bottom, #ffeab2 0%, #e1bf66 100%);
-    text-align: center;
-    color: #232d48;
-    border-radius: 50rpx;
-    line-height: 70rpx;
-    height: 70rpx;
-    padding: 0 20rpx;
-    position: absolute;
-    right: 40rpx;
-    width: 160rpx;
-    top: 50%;
-    margin-top: -35rpx;
-    text-align: center;
-    font-size: 32rpx;
-}
-.new{
-  background: red;
-  color: #fff;
-  border-radius: 50rpx;
-  margin-left: 20rpx;
-  font-size: 24rpx;
-  padding: 4rpx 6rpx;
-}
-.head{
-  background-color: #fff;
-  box-shadow: 0 0.04rem 0.12rem 0 rgba(0,0,0,.05);
-  height: 140rpx;
-  border-bottom: 1px solid #f1f1f1;
-}
-.head .flex-box-ce{
-  padding:0 28rpx;
-  height: 100%;
-}
-.name{
-  font-size: 36rpx;
-  margin-left: 20rpx;
-}
-.li{
-  background-color: #fff;
-  border-bottom: 1px solid #f1f1f1;
-}
-.img-left{
-  width: 40rpx;
-  height: 40rpx;
-  margin: 0 28rpx;
-}
-.img-right{
-  width: 24rpx;
-  height: 24rpx;
-  margin-right: 28rpx;
-}
-.li-right{
-  padding: 28rpx 0;
-}
-.date{
-  font-size: 28rpx;
-  color: #999
-}
-.xusj{
-  color: #fff;
-  background-color: #26A2FF;
-  border-radius: 6rpx;
-  margin-right: 28rpx;
-  font-size: 28rpx;
-  padding: 5rpx 10rpx; 
-}

+ 0 - 77
pages/deploy/index/index.axml

@@ -1,77 +0,0 @@
-<view>
-  <view class="head">
-    <view class="flex-box-ce">
-      <img-box name="{{userData.name}}" imgUrl="{{userData.img_url}}" height="100rpx" width="100rpx"></img-box>
-      <view class="name font-flex-word">
-        <view>{{userData.name}}</view>
-        <view class="fontColorF font-flex-word" style="font-size:28rpx;margin-top:10rpx;">{{userData.post}}</view>
-      </view>
-    </view>
-  </view>
-  <view class="margin-bottom">
-    <!-- <view class="top"></view> -->
-    <view class="header">
-      <view class="flex-box flex-v-ce li margin-bottom">
-        <image class="img-left" mode="scaleToFill" src="../../../image/xf.png"></image>
-        <view class="flex-box flex-v-ce flex-1" style="padding: 20rpx 0;">
-          <view class="title flex-1">
-            <view>当前为{{corpMessage.package_name}}</view>
-            <view class="date">有效期至<text style="color:#FF9600">{{corpMessage.expire_time}}</text></view>
-          </view>
-          <view class="xusj" data-index="1" onTap="openView">续费升级</view>
-        </view>
-      </view>
-      <view class="vip margin-bottom" a:if="{{vipData}}"  onTap="openView2">
-        <image mode="scaleToFill" src="../../../image/vip.png"></image>
-        <!-- <view class="btn">{{vipText}}</view> -->
-        <view class="btn">立即开通</view>
-      </view>
-
-      <!-- <view class="flex-box flex-v-ce li " data-index="2" onTap="openView">
-        <image class="img-left" mode="scaleToFill" src="../../../image/bmyg.png"></image>
-        <view class="flex-box flex-v-ce flex-1 li-right">
-          <view class="title flex-1">组织架构</view>
-          <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
-        </view>
-      </view>
-      <view class="flex-box flex-v-ce li" data-index="3" onTap="openView">
-        <image class="img-left" mode="scaleToFill" src="../../../image/jfgz.png"></image>
-        <view class="flex-box flex-v-ce flex-1 li-right">
-          <view class="title flex-1">积分规则</view>
-          <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
-        </view>
-      </view>
-      <view class="flex-box flex-v-ce li nodeBer margin-bottom" data-index="4" onTap="openView">
-        <image class="img-left" mode="scaleToFill" src="../../../image/kqjf.png"></image>
-        <view class="flex-box flex-v-ce flex-1 li-right">
-          <view class="title flex-1">考勤积分规则</view>
-          <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
-        </view>
-      </view> -->
-      <!-- <view class="flex-box flex-v-ce li" data-index="7" onTap="openView">
-        <image class="img-left" mode="scaleToFill" src="../../../image/bmyg.png"></image>
-        <view class="flex-box flex-v-ce flex-1 li-right">
-          <view class="title flex-1">上面落地服务 <text class="new" a:if="{{isShowNew}}">new</text></view>
-          <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
-        </view>
-      </view> -->
-
-      <view class="flex-box flex-v-ce li" data-index="5" onTap="openView">
-        <image class="img-left" mode="scaleToFill" src="../../../image/sj.png"></image>
-        <view class="flex-box flex-v-ce flex-1 li-right">
-          <view class="title flex-1">系统公告</view>
-          <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
-        </view>
-      </view>
-
-      <view class="flex-box flex-v-ce li nodeBer" data-index="6" onTap="openView">
-        <image class="img-left" mode="scaleToFill" src="../../../image/kf.png"></image>
-        <view class="flex-box flex-v-ce flex-1 li-right">
-          <view class="title flex-1">官方服务群</view>
-          <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
-        </view>
-      </view>
-
-    </view>
-  </view>
-</view>

+ 0 - 66
pages/deploy/index/index.js

@@ -1,66 +0,0 @@
-var app = getApp();
-var that;
-import 'dingtalk-jsapi/entry/mobile';
-import openLink from 'dingtalk-jsapi/api/biz/util/openLink';
-Page({
-  data: {
-    userData:[],
-    corpMessage:{},
-    vipText:'立即开通',
-    isShowNew:true,
-    vipData:'',
-  },
-  onLoad(query) {
-    that = this;
-    dd.setNavigationBar({ title: "我的" });
-    this.setData({userData:app.globalData.userData,corpMessage:app.globalData.corpMessage});
-    this.getVip();
-    // console.log("123")
-  },
-  getVip(){
-    app.$get("api/order/goods/special").then((res) => {
-        this.setData({
-          vipData:res.data.data,
-          vipText:res.data.data.status==2?'已开通':'立即开通'
-        })
-    })
-  },
-  openView2(){
-    dd.navigateTo({
-      url: '../buy/buy?code=' + this.data.vipData.goods_code
-    })
-  },
-  onShow(){
-    dd.getStorage({
-      key: 'isShowNew',
-      success: function (res) {
-        if(res.data){
-          that.setData({isShowNew:false});
-        }
-      }
-    });
-  },
-  //跳转
-  openView(e) {
-    var index = e.target.dataset.index-1;
-    if(index==5){
-      openLink({
-        url: `https://page.dingtalk.com/wow/dingtalk/act/serviceconversation?wh_biz=tm&showmenu=false&goodsCode=DT_GOODS_881607043109331&corpId=${app.globalData.corpId}&token=5784a3e6b5e025ee891517ea814180f4`
-      })
-      return;
-    }
-    var urls = [
-      { url: '../addMoney/addMoney', query: '' },
-      { url: '../organization/organization', query: '' },
-      { url: '../integralRule/integralRule', query: '' },
-      { url: '../setCheck/setCheck', query: '' },
-      { url: '../upgrade/upgrade', query: '' },
-      { url: '../buy/buy', query: '' },
-      { url: '../buy/buy', query: '' },
-    ];
-    
-    dd.navigateTo({
-      url: urls[index].url+'?'+urls[index].query
-    })
-  },
-});

+ 0 - 5
pages/deploy/index/index.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "img-box": "/Component/img-box/index"
-  }
-}

+ 0 - 57
pages/deploy/integralRule/integralRule.acss

@@ -1,57 +0,0 @@
-.header{
-  background: #fff;
-  padding: 24rpx;
-  position: sticky;
-  top: 0;
-}
-.search{
-    background-color: #f1f1f1;
-    border-radius: 10rpx;
-    padding:8rpx 10rpx;
-}
-.search input{
-    background-color: #f1f1f1;
-    font-size: 26rpx;
-}
-.search image{
-  width: 30rpx;
-  height: 30rpx;
-  margin-left: 10rpx;
-}
-.tree{
-  background: #fff;
-}
-.tree-item{
-  padding:34rpx 28rpx;
-  border-bottom: 1px solid #f1f1f1; 
-}
-.main .tree-item:last-child{
-    border: none;
-}
-.main{
-  height: calc(100vh - 132rpx);
-} 
-.list-items{
-  background: #fff;
-  padding:16rpx 28rpx;
-  margin-bottom: 14rpx
-}
-.remark{
-  font-weight: 600;
-  margin-bottom: 10rpx;
-  width: 100%;
-  word-break:break-all
-}
-.num{
-  font-size: 28rpx;
-}
-.shu{
-  padding:24rpx 0;
-  background: #fff;
-  font-size: 28rpx;
-  color: #26A2FF;
-  padding-bottom: 0rpx;
-}
-.shu view:last-child{
-  color: #ccc;
-}

+ 0 - 58
pages/deploy/integralRule/integralRule.axml

@@ -1,58 +0,0 @@
-<view>
-  <view class="header margin-bottom">
-  <form onReset="onReset">  
-    <view class="search flex-box flex-v-ce">
-      <image mode="scaleToFill" src="../../../image/ss.png"/>
-      <input placeholder="请输入规则内容" onInput="bindKeyInput" class="flex-1"/>
-      <button a:if="{{isVal}}" class="delVal" formType="reset">×</button>
-    </view>
-  </form>
-    <view class="flex-box flex-v-ce shu" a:if="{{terr.length>1}}">
-      <view a:for="{{terr}}" class="flex-box flex-v-ce" data-index="{{index}}" catchTap="activeItem" data-item="{{item}}">
-        <image mode="scaleToFill" src="../../../image/right.png" style="width:20rpx;height:20rpx;margin:0 6rpx;" a:if="{{index!=0}}"/>{{item.name}}
-      </view>
-    </view>
-  </view>
-  <scroll-view a:if="{{isItem}}" class="main" scroll-y="{{true}}" style="{{terr.length>1? 'height: calc(100vh - 206rpx)':'height: calc(100vh - 142rpx)'}}">
-    <view a:if="{{rule_tree.length>0||item_list.length>0}}">
-      <view class="margin-bottom tree" a:if="{{rule_tree.length}}">
-        <view a:for="{{rule_tree}}" class="flex-box flex-v-ce tree-item" data-item="{{item}}" catchTap="activeTree">
-          <view class="rule-name flex-1">{{item.name}}</view>
-          <image mode="scaleToFill" src="../../../image/right.png" style="width:24rpx;height:24rpx;"/>
-        </view>
-      </view>
-      <view class="item-list">
-        <view a:for="{{item_list}}" class="list-items">
-          <view class="remark">{{item.remark}}</view>
-          <view class="flex-box flex-v-ce">
-            <view class="red num flex-1" a:if="{{item.min_point>0}}">+{{(item.range_type == 1 ? item.min_point : item.min_point+'~'+item.max_point)}}
-              <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
-            </view>
-            <view class="green num flex-1" a:if="{{item.min_point<0}}">{{(item.range_type == 1 ? item.min_point : item.min_point+'~'+item.max_point)}}
-              <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
-            </view>
-            <view class="item-type fontColorF num">{{item.typeName.name}}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <no-data a:else content="暂无数据"></no-data>
-  </scroll-view>
-  <scroll-view a:else class="main" scroll-y="{{true}}" style="height: calc(100vh - 142rpx)">
-    <view class="item-list" a:if="{{selectItem.length>0}}">
-      <view a:for="{{selectItem}}" class="list-items">
-        <view class="remark">{{item.remark}}</view>
-        <view class="flex-box flex-v-ce">
-          <view class="red num flex-1" a:if="{{item.min_point>0}}">+{{(item.range_type == 1 ? item.min_point : item.min_point+'~'+item.max_point)}}
-            <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
-          </view>
-          <view class="green num flex-1" a:if="{{item.min_point<0}}">{{(item.range_type == 1 ? item.min_point : item.min_point+'~'+item.max_point)}}
-            <text class="fontColorT" style="margin-left:10rpx">{{item.pt_Obj[0].name}}</text>
-          </view>
-          <view class="item-type fontColorF num">{{item.typeName.name}}</view>
-        </view>
-      </view>
-    </view>
-    <no-data a:else content="暂无数据"></no-data>
-  </scroll-view>
-</view>

Some files were not shown because too many files changed in this diff