嘻嘻

Component/selectRule/selectRule.axml

@@ -1,6 +1,6 @@
 <view class="all">
   <view class="close">
-      <image mode="scaleToFill" catchTap="plusOne"  src="../../../image/close.png"/>
+    <image mode="scaleToFill" catchTap="plusOne" src="../../../image/close.png"/>
   </view>
   <form onReset="onReset">
     <view class="search flex-box flex-v-ce">
@@ -11,10 +11,12 @@
   </form>
   <view class="flex-box content">
     <scroll-view class="flex-2 left" scroll-y="{{true}}" a:if="{{isItem}}">
-      <view class="tree" a:for="{{rule_tree}}">
-        <view class="{{item.id == activeIndex ? 'active':''}} yi" catchTap="activeTree" data-item="{{item}}">{{item.name}}</view>
-        <view catchTap="activeItem" data-item="{{child}}" class="{{child.id == activeItemIndex ? 'itemActive':''}} er" a:if="{{item.child&&item.child.length>0&&item.id == activeIndex}}" a:for="{{item.child}}" a:for-index="idx" a:for-item="child">
+      <view style="height: 100%">
+        <view class="tree" a:for="{{rule_tree}}">
+          <view class="{{item.id == activeIndex ? 'active':''}} yi" catchTap="activeTree" data-item="{{item}}">{{item.name}}</view>
+          <view catchTap="activeItem" data-item="{{child}}" class="{{child.id == activeItemIndex ? 'itemActive':''}} er" a:if="{{item.child&&item.child.length>0&&item.id == activeIndex}}" a:for="{{item.child}}" a:for-index="idx" a:for-item="child">
               {{child.name}}
+          </view>
         </view>
       </view>
     </scroll-view>

Component/selectSx/selectSx.acss

@@ -35,7 +35,7 @@
 .sx-ul{
   width: 100%;
   background-color: #fff;
-  height: 400rpx;
+  height: 600rpx;
   box-sizing: border-box;
 }
 .rule-title{

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;

app.json

@@ -53,7 +53,8 @@
     "pages/statistics/getTask/getTask",
     "pages/statistics/assaign_set/assaign_set",
     "pages/statistics/offerAreward_set/offerAreward_set",
-    "pages/statistics/logDetail/logDetail"
+    "pages/statistics/logDetail/logDetail",
+    "pages/demo/demo"
   ],
   "window": {
     "defaultTitle": "功道云",

pages/demo/demo.acss

@@ -0,0 +1,88 @@
+.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;
+	}
+

pages/demo/demo.axml

@@ -0,0 +1,56 @@
+<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>

pages/demo/demo.js

@@ -0,0 +1,32 @@
+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: ''
+    });
+  },
+});

pages/demo/demo.json

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

pages/statistics/glz_execute/glz_execute.acss

@@ -30,3 +30,17 @@
 .scroll {
   height:  calc(100vh - 160rpx);
 }
+.text2 {
+  border-radius: 50%;
+  border: 1px solid #909399;
+  color: #909399;
+  width: 26rpx;
+  height: 26rpx;
+  font-size: 22rpx;
+  text-align: center;
+  display: inline-block;
+  margin-left: 10rpx;
+  position: relative;
+  line-height: 26rpx;
+  box-sizing: border-box;
+}

pages/statistics/glz_execute/glz_execute.axml

@@ -13,8 +13,11 @@
         </picker>
       </view>
     </view>
+
+
     <view class="flex-box flex-v-ce titles">
-      <view class="flex-2" style="font-size:28rpx">管理者奖扣任务均为B分，对A分不做要求</view>
+      <view class="flex-2" style="font-size:28rpx">管理者
+      <text class="text2" catchTap="showText">?</text></view>
       <view class="flex-1">人均奖分（次）</view>
       <view class="flex-1">人均扣分（次）</view>
     </view>

pages/statistics/glz_execute/glz_execute.js

@@ -16,6 +16,16 @@ Page({
     dd.setNavigationBar({ title: "管理者奖扣执行情况" });
     this.getData();
   },
+  showText() {
+    dd.alert({
+        title: '温馨提示',
+        content: '管理者奖扣任务均为B分，对A分不做要求',
+        buttonText: '我知道了',
+        success: (result) => {
+
+        },
+      });
+  },
   sotrs(str) {
     return function (a, b) {
       var val = a[str];
@@ -95,7 +105,7 @@ Page({
       format: 'yyyy-MM',
       currentDate: this.data.month,
       success: (res) => {
-        if (res.data) {
+        if (res.date) {
           this.setData({
             month: res.date,
             page: 1

pages/statistics/prizeBuckleDetail/prizeBuckleDetail.axml

@@ -73,7 +73,7 @@
     <view class="flex-1 blueBtn" catchTap="openCx">撤销奖扣</view>
   </view>
   <!-- 调用过程组件 -->
-  <view class="">
+  <view class="" style="margin-bottom:140rpx">
     <process process="{{dataDetail.process}}" a:if="{{dataDetail.process.length>0}}"/>
   </view>
 </view>