17:56

app.json

@@ -1,7 +1,8 @@
 {
   "pages": [
-    "pages/point/point",
     "pages/home/home",
+    "pages/about/about",
+    "pages/point/point",
     "pages/pointapply/pointapply",
     "pages/approval/approval",
     "pages/mine/mine",

pages/about/about.js

@@ -0,0 +1,66 @@
+// pages/about/about.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/about/about.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "关于"
+}

pages/about/about.wxml

@@ -0,0 +1,33 @@
+<view><image src='../../img/about_topimg.png' class='top_img'></image></view>
+<view class='title'>概括介绍</view>
+<view class='content'>优软科技致力于企业信息化管理系统和互联网平台的研发、咨询与应用，并在国内率先推出基于浏览器的ERP应用平台，是国内领先的企业管理软件及服务商。
+</view>
+<view class='content'>智慧积分系统是一款轻量的“绩效”管理系统，通过量化的积分奖惩制度、实现对员工的有效激励手段，激发员工的工作热情和提高员工的满意度。
+</view>
+
+<view class='call_view'>联系方式 <text style='font-size:20rpx;color:#737373;'>（服务时间：工作日08：30-18:00）</text></view>
+
+<view class='commonHview'>
+  <view class='left_view'>
+    <view>总机:</view>
+    <view  class='call_item_view'>合作加盟:</view>
+    <view  class='call_item_view'>售前:</view>
+    <view  class='call_item_view'>售后:</view>
+    <view  class='call_item_view'>邮箱:</view>
+  </view>
+  <view class='right_view'>
+    <view >0755-26994749</view>
+    <view  class='call_item_view'>15814041616（廖先生）</view>
+    <view  class='call_item_view'>0755-26994808</view>
+    <view  class='call_item_view'>400-830-1818</view>
+    <view  class='call_item_view'>sa@usoftchina.com</view>
+  </view>
+</view>
+
+<view class='call_view'>联系地址 </view>
+
+<view class='commonHview' style='font-size:30rpx;padding:20rpx;'>
+<view style='width:20%;color:#333333;' >地址:</view>
+<view style='width:80%;color:#666666;'>深圳市南山区高新技术产业园科技南五路
+英唐大厦六楼</view>
+</view>

pages/about/about.wxss

@@ -0,0 +1,22 @@
+/* pages/about/about.wxss */
+.title{
+  width: 100%;text-align: center;font-size: 30rpx;color:#333333;margin-top: 20rpx;
+}
+.content{
+  margin: 20rpx;color: #666666;font-size: 24rpx;text-indent: 40rpx;
+}
+.call_view{
+font-size:24rpx;color:#3581EB;height: 50rpx;text-align: left;
+background-color: #F2F2F2;padding:20rpx 0 0 20rpx;margin-top: 30rpx;
+}
+.left_view{
+  width: 30%;padding: 30rpx;font-size: 30rpx;color: #333333;
+}
+.right_view{
+  width: 70%;padding: 30rpx;font-size: 30rpx;color: #666666;
+}
+.call_item_view{
+  margin-top: 20rpx;
+}.top_img{
+  width: 100%;height: 300rpx;
+}

pages/applyjoinapprovel/applyjoinapprovel.js

@@ -10,7 +10,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    approvelStatus:1,//单据账套 0：待审批，1：已审批，2：我发起的
+    approvelStatus:2,//单据账套 0：待审批，1：已审批，2：我发起的
     applyName:'',
     applyPhone:'',
     enterDate:'',

pages/applyjoinapprovel/applyjoinapprovel.wxml

@@ -70,7 +70,10 @@
 
     <view class='commonHview'>
       <view class='left_sty' style='height:auto;min-height:100rxp;' >申请标准</view>
-      <view class='right_sty' style='height:auto;min-height:100rxp;'>{{applyNorm}}</view>
+       <scroll-view scroll-y='true' style='height: 100rpx;'>
+           <view class='right_sty3'>{{applyNorm}}</view>
+      </scroll-view>
+      <!-- <view class='right_sty' style='height:auto;min-height:100rxp;'>{{applyNorm}}</view> -->
     </view>
     <view class='commonhline' style='height:3rpx;'></view>
 
@@ -81,7 +84,7 @@
     </view>
 <view class='commonhline' style='height:20rpx;'></view>
     <view class='commonHview'>
-      <view class='left_sty'>积分数量</view>
+      <view class='left_sty'>积分</view>
       <view class='right_sty'>{{applyPoint}}</view>
     </view>
     <view class='commonhline' style='height:20rpx;'></view>
@@ -133,7 +136,10 @@
 
     <view class='commonHview'>
       <view class='left_sty' style='height:auto;min-height:100rxp;' >申请标准</view>
-      <view class='right_sty' style='height:auto;min-height:100rxp;'>{{applyNorm}}</view>
+       <scroll-view scroll-y='true' style='height: 100rpx'>
+           <view class='right_sty3'>{{applyNorm}}</view>
+      </scroll-view>
+      <!-- <view class='right_sty' style='height:auto;min-height:100rxp;'>{{applyNorm}}</view> -->
     </view>
     <view class='commonhline' style='height:3rpx;'></view>
 
@@ -144,7 +150,7 @@
     </view>
 <view class='commonhline' style='height:20rpx;'></view>
     <view class='commonHview'>
-      <view class='left_sty'>积分数量</view>
+      <view class='left_sty'>积分</view>
       <view class='right_sty'>{{applyPoint}}</view>
     </view>
     <view class='commonhline' style='height:20rpx;'></view>

pages/applyjoinapprovel/applyjoinapprovel.wxss

@@ -6,6 +6,9 @@
 .right_sty{
   width: 50%;height: 100rpx;text-align: right;color: #666666;font-size: 30rpx;line-height: 100rpx;margin-right: 20rpx;
 }
+.right_sty3{
+  width: 95%;height: 100rpx;text-align: right;color: #666666;font-size: 30rpx;margin-right: 20rpx;margin-top: 25rpx;
+}
 .right_sty1{
  height: 100rpx;color: #666666;font-size: 30rpx;padding-top: 20rpx;width: 70%;text-align: right;
   line-height: 50rpx; 

pages/approval/approval.js

@@ -171,7 +171,7 @@ Page({
       // complete
       wx.hideNavigationBarLoading() //完成停止加载
       wx.stopPullDownRefresh() //停止下拉刷新
-    }, 2000);
+    }, 500);
   },
 
   /**

pages/approval/approval.wxml

@@ -10,7 +10,7 @@
 
 <swiper current="{{currentTab}}" class="swiper-box" duWration="300" style="height:{{winHeight-31}}px;margin:85rpx 0 0 0;" bindchange="bindChange">
       <swiper-item>  
-      <scroll-view  scroll-y="true" style="height:100%;">
+      <scroll-view  scroll-y="true" >
       <view wx:for='{{wait}}' bindtap='ApprovaledClick' data-item='{{item}}'  data-fromtype='{{1}}'>
          <template is='waitApproval' data='{{...item}}' /> 
       </view>
@@ -18,7 +18,7 @@
     </swiper-item> 
 
       <swiper-item>  
-      <scroll-view  scroll-y="true" style="height:100%;">
+      <scroll-view  scroll-y="true" >
       <view wx:for='{{already}}' bindtap='ApprovaledClick' data-item='{{item}}' data-fromtype='{{2}}'>
          <template is='Approvaled' data='{{...item}}'/> 
       </view>
@@ -26,7 +26,7 @@
     </swiper-item> 
 
       <swiper-item >  
-      <scroll-view  scroll-y="true" style="height:100%;">
+      <scroll-view  scroll-y="true">
       <view wx:for='{{fill}}'  bindtap='ApprovaledClick' data-item='{{item}}' data-fromtype='{{3}}'>
          <template is='isendApproval' data='{{...item}}'/> 
       </view>
@@ -67,7 +67,8 @@
         <view class='commonVview itemMsg'>
           <view style='font-size:30rpx;margin-top:10rpx;'>{{fillName}}的积分申报</view>
           <view style='color:#999999;font-size:24rpx;margin-top:20rpx;' wx:if='{{invoicesStatus == 1}}'>待审批</view>
-          <view style='color:#999999;font-size:24rpx;margin-top:20rpx;' wx:else>已审批</view>
+           <view style='color:#999999;font-size:24rpx;margin-top:20rpx;' wx:elif='{{invoicesStatus == 2}}'>已审批</view>
+          <view style='color:#FF0000;font-size:24rpx;margin-top:20rpx;' wx:else>未通过</view>
         </view>
         <view class='itemStatue_finish'>{{invoicesDate}}</view>
         </view>

pages/corporateInfo/corporateInfo.wxml

@@ -2,7 +2,7 @@
 
 <view class='top_view'>
   <view><image class='img_sty' src='../../img/common_header_boy.png'></image></view>
-  <view class='companyname_sty'>摩双子羯克己无限公私</view>
+  <view class='companyname_sty'>摩双子羯有限公司</view>
 </view>
 
 <!-- <view wx:for='{{comDataList}}'> -->

pages/home/home.wxml

@@ -28,7 +28,7 @@
      <view class='commonhline' style='height:3rpx;'></view>
      <view class='commonHview' style='margin:10rpx;height:156rpx;'>
        <view wx:if='{{item.newsimgurl}}'><image src='{{baseUrl+item.newsimgurl}}' class='newsimgs'></image></view>
-       <view wx:else><image src='../../img/nophoto.png' class='newsimgs'></image></view>
+       <view wx:else><image src='../../img/morenimg.png' class='newsimgs'></image></view>
         <view style='text-align:left;margin-left:10rpx;'  class='commonVview'>
           <view  class='title' >{{item.newstitle}}</view>
           <view class='newContextSty'>{{item.filell}}</view>

pages/mine/mine.js

@@ -43,6 +43,12 @@ Page({
   btnClick: function (event) {
     var that = this
     var id = event.currentTarget.id
+    if (id == that.data.idAbout) {
+      wx.navigateTo({
+        url: '../about/about',
+      })
+      return
+    } 
     isregistered = wx.getStorageSync('isregistered')
     console.log('isregistered', isregistered)
     if (id == that.data.idWxlogin){
@@ -84,8 +90,6 @@ Page({
       wx.navigateTo({
         url: '../corporateInfo/corporateInfo',
       })
-    } else if (id == that.data.idAbout){
-      
     } 
   },
   /**

pages/mine/mine.wxml

@@ -18,8 +18,8 @@
  <view class='headerdata' wx:if='{{isLogin}}'>
     <view class='commonHview' style='margin-left:30rpx;'>
         <view style='width:50%;'>
-            <view class='h_data_left'>本月当前积分: <text class='h_data_right'>{{curmonth_points}}</text></view>
-              <view class='h_data_left'>本月当前积分: <text class='h_data_right1'>{{curmonth_points}}</text></view>
+            <view class='h_data_left' wx:if='{{curmonth_points>0}}'>本月当前积分: <text class='h_data_right' >{{curmonth_points}}</text></view>
+            <view class='h_data_left'  wx:else>本月当前积分: <text class='h_data_right1' style='color:#FF0000;'>{{curmonth_points}}</text></view>
             <view class='h_data_left'>本月当前排名: <text class='h_data_right'>{{curmonth_rank}}</text></view>
         </view>
         <view style='width:50%;'>

pages/minusapply/minusapply.wxml

@@ -20,7 +20,7 @@
 <view class='commonHview'>
   <view class='left_sty'>被扣人</view>
    <view class='right_sty' style='display: flex;flex-direction: row;margin-right:0rpx;'>
-      <view><input disabled='true' class='input_sty' value='{{minusName}}' placeholder='请选择' type='text' name='minusName' bindtap='selctMinusPerson' placeholder-style='color:#666666;' ></input></view>
+      <view><input disabled='true' class='input_sty' value='{{minusName}}' placeholder='请选择' type='text' name='minusName' bindtap='selctMinusPerson' placeholder-style='color:#666666;' style='padding-top: 10rpx;'></input></view>
     </view>
     <view ><image class='nextImg' src='../../img/next.png'> </image></view>
 </view>
@@ -33,9 +33,11 @@
     <view wx:if='{{!isDetails}}'><image class='nextImg' src='../../img/next.png'> </image></view>
     </view> -->
 
-     <view class='right_sty1' >
+     <view class='right_sty1'  >
         <picker bindchange="bindPickerChange" value="{{CotegoryArray[index].name}}" range="{{CotegoryArray}}"   disabled='{{isDetails}}'>
-          <view>{{minusNorm}}</view>
+        <scroll-view scroll-y='true' style='height: 100rpx;'>
+           <view>{{minusNorm}}</view>
+        </scroll-view>
         </picker>
     </view>
     <view><image class='nextImg'src='../../img/next.png'> </image></view>

pages/minusapply/minusapply.wxss

@@ -13,8 +13,10 @@
 }.nextImg{
    width: 20rpx;
   height: 30rpx;
-  text-align: right;margin:30rpx 20rpx;
+  text-align: right;margin:40rpx 20rpx 0 0;
 }.right_sty1{
- height: 100rpx;color: #666666;font-size: 30rpx;padding-top: 20rpx;width: 70%;text-align: right;
+ height: 100rpx;color: #666666;font-size: 30rpx;padding-top: 30rpx;width: 70%;text-align: right;
   line-height: 50rpx;
+}.right_sty3{
+  width: 95%;height: 100rpx;text-align: right;color: #666666;font-size: 30rpx;margin-right: 20rpx;
 }

pages/point/point.js

@@ -233,7 +233,7 @@ Page({
       // complete
       wx.hideNavigationBarLoading() //完成停止加载
       wx.stopPullDownRefresh() //停止下拉刷新
-    }, 2000);
+    }, 500);
   },
 
   /**

pages/point/point.json

@@ -1,5 +1,4 @@
 {
   "navigationBarTitleText": "积分",
-  "disableScroll": true,
   "enablePullDownRefresh": true
 }

pages/point/point.wxml

@@ -25,7 +25,7 @@
 <swiper current="{{currentTab}}" class="swiper-box" duWration="300"  bindchange="bindChange" 
 style="height:{{winHeight-31}}px;margin:185rpx 0 0 0;">
       <swiper-item>  
-      <scroll-view  scroll-y="true" style="height:100%;">
+      <scroll-view  scroll-y="true" >
       <view wx:for='{{addList}}' bindtap='addListClick' data-item='{{item}}' >
          <template is='addPointTem' data='{{...item}}'  /> 
       </view>
@@ -33,7 +33,7 @@ style="height:{{winHeight-31}}px;margin:185rpx 0 0 0;">
     </swiper-item> 
 
       <swiper-item>  
-      <scroll-view  scroll-y="true" style="height:100%;">
+      <scroll-view  scroll-y="true">
       <view wx:for='{{minusList}}' bindtap='minusListClick' data-item='{{item}}' >
          <template is='minusPointTem' data='{{...item}}'/> 
       </view>
@@ -41,7 +41,7 @@ style="height:{{winHeight-31}}px;margin:185rpx 0 0 0;">
     </swiper-item> 
 
       <swiper-item >  
-      <scroll-view  scroll-y="true" style="height:100%;">
+      <scroll-view  scroll-y="true" >
         <view class='commonHview' style='background-color:#B1F4AE;height:100rpx;' wx:if='{{points_rank.my_rank}}'>
           <view style='color:#333333;font-size:30rpx;text-align:left;margin:25rpx;width:50%;'>当前排名：{{points_rank.my_rank.rank}}</view>
           <view style='color:#666666;font-size:30rpx;text-align:right;margin:25rpx;width:50%;'>{{points_rank.my_rank.point}} 积分</view>

pages/pointapply/pointapply.wxml

@@ -39,7 +39,9 @@
   <view class='left_sty' style='width: 30%;'>申请标准</view>
    <view class='right_sty1' >
         <picker disabled='{{isDetails}}' bindchange="bindPickerChange" value="{{CotegoryArray[index].name}}" range="{{CotegoryArray}}" >
-          <view style='overflow:hidden; text-overflow:ellipsis;white-space:nowrap;'>{{applyNorm}}</view>
+         <scroll-view scroll-y='true' style='height: 100rpx;'>
+           <view>{{applyNorm}}</view>
+        </scroll-view>
         </picker>
     </view>
     <view><image class='nextImg'src='../../img/next.png'> </image></view>

pages/pointapply/pointapply.wxss

@@ -5,8 +5,7 @@
   width: 50%;height: 100rpx;text-align: right;color: #666666;font-size: 30rpx;line-height: 100rpx;margin-right: 20rpx;
 }
 .right_sty1{
- height: 100rpx;color: #666666;font-size: 30rpx;padding-top: 20rpx;width: 70%;text-align: right;
-  line-height: 50rpx;
+ height: 100rpx;color: #666666;font-size: 30rpx;padding-top: 30rpx;width: 70%;text-align: right;
 }
 .input_sty{
   margin-top: 20rpx;
@@ -19,5 +18,5 @@
 }.nextImg{
   width: 20rpx;
   height: 30rpx;
-  text-align: right;margin:30rpx 20rpx;
+  text-align: right;margin:40rpx 20rpx 0 0;
 }

pages/selectnorm/selectnorm.wxml

@@ -11,7 +11,7 @@
         <view class="nav_right">
             <scroll-view scroll-y = "true" style="height:1200rpx;">
             <!--暂无数据  -->
-            <view  wx:if='{{noData}}' class='nodata_view'>
+            <view  wx:if='{{navRightItems.length == 0}}' class='nodata_view'>
               <view><image class='nodata_style' src='../../img/common_nodata.png'></image></view>
               <!-- <view style='font-size:30rpx;text-align:top;'>暂无菜品</view>     -->
             </view>

pages/selectnorm/selectnorm.wxss

@@ -37,10 +37,5 @@
   height:200rpx;
   text-align:center;
 }
-.nodata_view{
-  display: flex;
-  flex-direction: column;
-  text-align:center;
-  margin-top:200rpx;
-}
+
 /* edn 无数据时 样式  */