Browse Source

首次commit

FANGLH 6 years ago
parent
commit
0515a256e9
54 changed files with 1873 additions and 0 deletions
  1. 39 0
      app.js
  2. 51 0
      app.json
  3. 52 0
      app.wxss
  4. BIN
      img/add_point.png
  5. BIN
      img/announcement.png
  6. BIN
      img/approvel_noselected.png
  7. BIN
      img/approvel_selected.png
  8. BIN
      img/common_header_boy.png
  9. BIN
      img/h-data_bg.png
  10. BIN
      img/home_noselected.png
  11. BIN
      img/home_selected.png
  12. BIN
      img/mine_noselected.png
  13. BIN
      img/mine_selected.png
  14. BIN
      img/minus_point.png
  15. BIN
      img/next.png
  16. BIN
      img/nophoto.png
  17. BIN
      img/point_noselected.png
  18. BIN
      img/point_selected.png
  19. BIN
      img/speaker.png
  20. 84 0
      pages/applyjoinapprovel/applyjoinapprovel.js
  21. 3 0
      pages/applyjoinapprovel/applyjoinapprovel.json
  22. 65 0
      pages/applyjoinapprovel/applyjoinapprovel.wxml
  23. 8 0
      pages/applyjoinapprovel/applyjoinapprovel.wxss
  24. 150 0
      pages/approval/approval.js
  25. 4 0
      pages/approval/approval.json
  26. 48 0
      pages/approval/approval.wxml
  27. 28 0
      pages/approval/approval.wxss
  28. 80 0
      pages/home/home.js
  29. 3 0
      pages/home/home.json
  30. 48 0
      pages/home/home.wxml
  31. 14 0
      pages/home/home.wxss
  32. 123 0
      pages/mine/mine.js
  33. 5 0
      pages/mine/mine.json
  34. 60 0
      pages/mine/mine.wxml
  35. 50 0
      pages/mine/mine.wxss
  36. 95 0
      pages/minusapply/minusapply.js
  37. 3 0
      pages/minusapply/minusapply.json
  38. 67 0
      pages/minusapply/minusapply.wxml
  39. 17 0
      pages/minusapply/minusapply.wxss
  40. 66 0
      pages/perinfo/perinfo.js
  41. 3 0
      pages/perinfo/perinfo.json
  42. 73 0
      pages/perinfo/perinfo.wxml
  43. 10 0
      pages/perinfo/perinfo.wxss
  44. 160 0
      pages/point/point.js
  45. 5 0
      pages/point/point.json
  46. 112 0
      pages/point/point.wxml
  47. 56 0
      pages/point/point.wxss
  48. 109 0
      pages/pointapply/pointapply.js
  49. 3 0
      pages/pointapply/pointapply.json
  50. 71 0
      pages/pointapply/pointapply.wxml
  51. 18 0
      pages/pointapply/pointapply.wxss
  52. 40 0
      project.config.json
  53. 19 0
      utils/util.js
  54. 31 0
      utils/wxconstant.js

+ 39 - 0
app.js

@@ -0,0 +1,39 @@
+//app.js
+App({
+  onLaunch: function () {
+    // 展示本地存储能力
+    var logs = wx.getStorageSync('logs') || []
+    logs.unshift(Date.now())
+    wx.setStorageSync('logs', logs)
+
+    // 登录
+    wx.login({
+      success: res => {
+        // 发送 res.code 到后台换取 openId, sessionKey, unionId
+      }
+    })
+    // 获取用户信息
+    wx.getSetting({
+      success: res => {
+        if (res.authSetting['scope.userInfo']) {
+          // 已经授权,可以直接调用 getUserInfo 获取头像昵称,不会弹框
+          wx.getUserInfo({
+            success: res => {
+              // 可以将 res 发送给后台解码出 unionId
+              this.globalData.userInfo = res.userInfo
+
+              // 由于 getUserInfo 是网络请求,可能会在 Page.onLoad 之后才返回
+              // 所以此处加入 callback 以防止这种情况
+              if (this.userInfoReadyCallback) {
+                this.userInfoReadyCallback(res)
+              }
+            }
+          })
+        }
+      }
+    })
+  },
+  globalData: {
+    userInfo: null
+  }
+})

+ 51 - 0
app.json

@@ -0,0 +1,51 @@
+{
+  "pages": [
+    "pages/home/home",
+    "pages/applyjoinapprovel/applyjoinapprovel",
+    "pages/minusapply/minusapply",
+    "pages/pointapply/pointapply",
+    "pages/perinfo/perinfo",
+    "pages/approval/approval",
+    "pages/point/point",
+    "pages/mine/mine"
+  ],
+  "window": {
+    "backgroundTextStyle": "light",
+    "navigationBarBackgroundColor": "#3581EB",
+    "navigationBarTitleText": "WeChat",
+    "navigationBarTextStyle": "white"
+  },
+  "tabBar": {
+    "selectedColor": "#219bf3",
+    "color": "#444",
+    "backgroundColor": "#DADADA",
+    "borderStyle": "white",
+    "position": "bottom",
+    "list": [
+      {
+        "pagePath": "pages/home/home",
+        "text": "首页",
+        "iconPath": "img/home_noselected.png",
+        "selectedIconPath": "img/home_selected.png"
+      },
+      {
+        "pagePath": "pages/point/point",
+        "text": "积分",
+        "iconPath": "img/point_noselected.png",
+        "selectedIconPath": "img/point_selected.png"
+      },
+      {
+        "pagePath": "pages/approval/approval",
+        "text": "审批",
+        "iconPath": "img/approvel_noselected.png",
+        "selectedIconPath": "img/approvel_selected.png"
+      },
+      {
+        "pagePath": "pages/mine/mine",
+        "text": "我的",
+        "iconPath": "img/mine_noselected.png",
+        "selectedIconPath": "img/mine_selected.png"
+      }
+    ]
+  }
+}

+ 52 - 0
app.wxss

@@ -0,0 +1,52 @@
+/**app.wxss**/
+.container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  padding: 200rpx 0;
+  box-sizing: border-box;
+} 
+.commonVview{
+  display: flex;flex-direction: column;
+}
+.commonHview{
+  display: flex;flex-direction: row;
+}
+.commonhline{
+  background-color: #F2F2F2;height: 10rpx;width: 100%;
+}
+.comStyleColor{
+  background-color: #e5973a;
+}
+.comGriView{
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+}
+.comBtn{
+  width: 40%;
+  background-color: #FFFFFF ;
+  color: #3C85EC;
+  height: 80rpx;
+  line-height: 80rpx;
+  margin:50rpx auto;
+  font-size: 30rpx;border: 1rpx solid #3C85EC;border-radius: 40rpx;
+}
+/* start 无数据时 样式  */
+.nodata_style{
+  width:200rpx;
+  height:200rpx;
+  text-align:center;
+}
+.nodata_view{
+  display: flex;
+  flex-direction: column;
+  text-align:center;
+  margin-top:200rpx;
+}
+/* edn 无数据时 样式  */
+.commonclick-btn{
+  background-color: #F5F5F5;
+}

BIN
img/add_point.png


BIN
img/announcement.png


BIN
img/approvel_noselected.png


BIN
img/approvel_selected.png


BIN
img/common_header_boy.png


BIN
img/h-data_bg.png


BIN
img/home_noselected.png


BIN
img/home_selected.png


BIN
img/mine_noselected.png


BIN
img/mine_selected.png


BIN
img/minus_point.png


BIN
img/next.png


BIN
img/nophoto.png


BIN
img/point_noselected.png


BIN
img/point_selected.png


BIN
img/speaker.png


+ 84 - 0
pages/applyjoinapprovel/applyjoinapprovel.js

@@ -0,0 +1,84 @@
+// pages/applyjoinapprovel/applyjoinapprovel.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    approvelStatus:0,//单据账套 0:待审批,1:已审批,2:我发起的
+    applyName:'吴彦祖',
+    applyPhone:'18130506086',
+    enterDate:'2016-06-12',
+    birthDate:'2006-06-12',
+    applyMail:'18130506086@163.com',
+    companyName:'优软科技'
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this
+    var approvelStatus = options.getapprovelStatus
+    console.log('approvelStatus=', approvelStatus)
+    that.setData({
+      approvelStatus: approvelStatus
+    })
+  },
+
+  agreeBtnClick:function(){
+
+  },
+
+  disagreeBtnClick:function(){
+
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 3 - 0
pages/applyjoinapprovel/applyjoinapprovel.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "申请加入审批"
+}

+ 65 - 0
pages/applyjoinapprovel/applyjoinapprovel.wxml

@@ -0,0 +1,65 @@
+<view class='commonHview'>
+  <view class='left_sty'>
+    申请人
+  </view>
+   <view class='right_sty'>
+        <input class='input_sty'  type='text'  name='applyName' value='{{applyName}}' disabled='true'></input>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    申请手机号
+  </view>
+   <view class='right_sty'>
+        <input class='input_sty'  type='text'  name='applyPhone' value='{{applyPhone}}' disabled='true'></input>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    入职日期
+  </view>
+   <view class='right_sty'>
+        <input class='input_sty'  type='text'  name='enterDate' value='{{enterDate}}' disabled='true'></input>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    出生日期
+  </view>
+   <view class='right_sty'>
+        <input class='input_sty'  type='text'  name='birthDate' value='{{birthDate}}' disabled='true'></input>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    邮箱
+  </view>
+   <view class='right_sty'>
+        <input class='input_sty'  type='text'  name='applyMail' value='{{applyMail}}' disabled='true'></input>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    加入公司
+  </view>
+   <view class='right_sty'>
+        <input class='input_sty'  type='text'  name='companyName' value='{{companyName}}' disabled='true'></input>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+<view class='commonHview' style='margin-top:400rpx;' wx:if='{{approvelStatus == 0}}'>
+    <button  class='comBtn' style='background-color: #3C85EC;color:#FFF;' formType="submit" hover-class="commonclick-btn" bindtap='agreeBtnClick'>同意</button>
+    <button  class='comBtn' formType="submit" hover-class="commonclick-btn" bindtap='disagreeBtnClick'>不同意</button>
+</view>

+ 8 - 0
pages/applyjoinapprovel/applyjoinapprovel.wxss

@@ -0,0 +1,8 @@
+.left_sty{
+  width: 50%;height: 100rpx;text-align: left;color: #333333;font-size: 30rpx;line-height: 100rpx;margin-left: 20rpx;
+}
+.right_sty{
+  width: 50%;height: 100rpx;text-align: right;color: #666666;font-size: 30rpx;line-height: 100rpx;margin-right: 20rpx;
+}.input_sty{
+  margin-top: 20rpx;
+}

+ 150 - 0
pages/approval/approval.js

@@ -0,0 +1,150 @@
+// pages/Hisorders/Hisorders.js
+var BASEURL = require('../../utils/wxconstant.js')
+var baseUrl = BASEURL.BaseUrl()
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    allorders: [],
+    todayorders: [1],
+    weekorders: [1, 2, 3],
+    monthorders: [1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4],
+    // tab切换  
+    currentTab: 0,
+    clientHeight: '',
+
+    /** 
+      * 页面配置 
+      */
+    winWidth: 0,
+    winHeight: 0,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this
+    /** 
+     * 获取系统信息 
+     */
+    wx.getSystemInfo({
+      success: function (res) {
+        that.setData({
+          winWidth: res.windowWidth,
+          winHeight: res.windowHeight,
+          clientHeight: res.windowHeight
+        });
+      }
+    })
+
+    that.getHisOrderData()
+  },
+  approItemClick:function(){
+    wx.navigateTo({
+      url: '../applyjoinapprovel/applyjoinapprovel?getapprovelStatus='+1,
+    })
+  },
+  getHisOrderData: function () {
+    var that = this
+    wx.request({
+      url: baseUrl + BASEURL.getUrl.list,
+      method: 'GET',
+      data: {
+        accountphone: 18130506086,
+        openid: wx.getStorageSync('openId')
+      },
+      header: {
+        'content-type': 'application/json;charset=UTF-8'
+      },
+      success: function (res) {
+        console.log('queryOrder=', res)
+        if (res.data.success) {
+          if (res.data.data.length > 0) {
+            that.setData({
+              allorders: res.data.data
+            })
+          }
+        }
+      }
+    })
+  },
+  ScanPayClick: function () {
+
+  },
+  /** 
+   * 点击tab切换 
+   */
+  swichNav: function (e) {
+    var that = this;
+    console.log('swichNav=', e)
+    if (this.data.currentTab == e.target.dataset.current) {
+      return false;
+    } else {
+      that.setData({
+        currentTab: e.target.dataset.current
+      })
+    }
+  },
+
+  /** 
+* 滑动切换tab 
+*/
+  bindChange: function (e) {
+    var that = this;
+    if (e.detail.source == 'touch') {
+      that.setData({ currentTab: e.detail.current });
+    }
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 4 - 0
pages/approval/approval.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "审批",
+  "disableScroll": true
+}

+ 48 - 0
pages/approval/approval.wxml

@@ -0,0 +1,48 @@
+<view class="swiper-tab">  
+    <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">待审批</view>  
+    <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">已审批</view>  
+    <view class="swiper-tab-list {{currentTab==2 ? 'on' : ''}}" data-current="2" bindtap="swichNav">我发起的</view>  
+</view>  
+
+ <view wx:if='{{(currentTab == 1 && todayorders.length == 0) || (currentTab == 2 && weekorders.length == 0) || (currentTab == 0 && monthorders.length == 0)}}' class='nodata_view'>
+     <view><image class='nodata_style' src='../../resource/images/common_nodata.png'></image></view> 
+</view> 
+
+<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%;">
+      <block wx:for='{{todayorders}}'>
+         <template is='ordertep' data='{{...item}}'/> 
+      </block>
+     </scroll-view> 
+    </swiper-item> 
+
+      <swiper-item>  
+      <scroll-view  scroll-y="true" style="height:100%;">
+      <block wx:for='{{weekorders}}'>
+         <template is='ordertep' data='{{...item}}'/> 
+      </block>
+     </scroll-view> 
+    </swiper-item> 
+
+      <swiper-item >  
+      <scroll-view  scroll-y="true" style="height:100%;">
+      <block wx:for='{{monthorders}}'>
+         <template is='ordertep' data='{{...item}}'/> 
+      </block>
+     </scroll-view> 
+    </swiper-item> 
+</swiper>
+
+
+<template name='ordertep'>
+  <view class='commonHview itemRow' bindtap='approItemClick' >
+        <view><image src='../../img/common_header_boy.png' class='img1'></image></view>
+        <view class='commonVview itemMsg'>
+          <view style='font-size:30rpx;margin-top:10rpx;'>陈冠希的积分申报</view>
+          <view style='color:#999999;font-size:24rpx;margin-top:20rpx;'>等待古天乐审批</view>
+        </view>
+        <view class='itemStatue_finish'>2018-09-19</view>
+        </view>
+        <view class='commonhline' style='height:3rpx;'></view>
+</template>

+ 28 - 0
pages/approval/approval.wxss

@@ -0,0 +1,28 @@
+.swiper-tab{  
+    width: 100%;  
+    border-bottom: 1rpx solid #F0F0F0;  
+    text-align: center;  
+    position: fixed;
+    top: 0;
+    background-color: #FFFFFF;
+    } 
+.swiper-tab-list{  
+    display: inline-block;  
+    width: 33.33%;  
+    color: #929292 ;  
+    background-color: #FFFFFF;
+    font-size: 30rpx;
+    padding: 20rpx 0 20rpx 0;
+} 
+.on{ color: #3C85EC;  border-bottom: 5rpx solid #3C85EC ;}  
+.swiper-box{ display: block; height: 100%; width: 100%; overflow: hidden; } 
+.img1{height: 120rpx;width: 120rpx;border-radius: 10rpx;}
+.itemRow{
+  padding: 10rpx 20rpx;width: 100%;height:140rpx;
+}
+.itemMsg{
+  font-size: 30rpx;margin-left: 10rpx;text-align: left;width: 60%;
+}
+.itemStatue_finish{
+  font-size: 24rpx;text-align: right;color: #666666;
+}

+ 80 - 0
pages/home/home.js

@@ -0,0 +1,80 @@
+// pages/home/home.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    imgUrls: [
+      {
+        "aa_urla": "http://113.105.74.140:8081/u/123/100123/201801/o/5e2b30db6a3c4f7399ff185ca7eee713.png"
+      },
+      {
+        "aa_urla": "http://113.105.74.140:8081/u/123/100123/201801/o/5e2b30db6a3c4f7399ff185ca7eee713.png"
+      },
+      {
+        "aa_urla": "http://113.105.74.140:8081/u/123/100123/201801/o/5e2b30db6a3c4f7399ff185ca7eee713.png"
+      }
+    ],
+    indicatorDots: true,
+    autoplay: true,
+    interval: 5000,
+    duration: 500,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 3 - 0
pages/home/home.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "首页"
+}

+ 48 - 0
pages/home/home.wxml

@@ -0,0 +1,48 @@
+<scroll-view scroll-y='true'>
+  <view>
+
+
+                <!--start 轮播图片  -->
+      <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" indicator-active-color='#FF0000' bindchange="SIChange" style=' width:100%;height:392rpx;' circular='true'>
+      <block wx:for="{{imgUrls}}">
+        <swiper-item>
+          <image src="{{item.aa_urla}}" class="slide-image" style='width:100%; height:392rpx;'  bindtap="clickGGItem" data-data="{{item}}"/>
+        </swiper-item>
+      </block>
+    </swiper>
+    <!--end 轮播图片  -->
+  
+
+   <view class='announcement_sty'>
+      <view class='announcement_sty1'>
+        <image src='../../img/announcement.png'  class='announcement_img'></image>
+         <view class='ann_right' style="{{orientation}}:{{marqueeDistance}}px;">homeData.announcement.content</view>
+      </view>
+    </view>
+
+    <view class='commonHview' style='text-align:left;margin:5rpx 0 0 10rpx;'>
+    <view><image style='width:30rpx;height:30rpx;margin-top:10rpx;line-height:30rpx;' src='../../img/speaker.png'></image></view>
+    <view style='font-size:26rpx;color:#000;margin-left:10rpx;margin-top:8rpx;'>最新资讯</view>
+    </view>
+    <view class='commonVview' wx:for='{{[1,2,3,4,5]}}' bindtap='newsItemClick' data-newsid='{{item.cid}}'>
+     <view class='commonhline' style='height:3rpx;'></view>
+     <view class='commonHview' style='margin:10rpx;height:156rpx;'>
+       <view wx:if='{{item.newsimgurl}}'><image src='{{item.newsimgurl}}' class='newsimgs'></image></view>
+        <view  ><image src='../../img/nophoto.png' class='newsimgs'></image></view>
+        <view style='text-align:left;margin-left:10rpx;'  class='commonVview'>
+          <view class='commonHview'>
+            <view style='margin-top:20rpx;font-size:30rpx;color:#000;overflow:hidden; text-overflow:ellipsis;white-space:nowrap;width:300rpx;width:50%;' >这是标题</view>
+          <view style='font-size:24rpx;color:#999999;margin-top:40rpx;text-align:right;width:40%;'>2018-09-19</view>
+          </view>
+        <view class='newContextSty'>这是内容</view>
+        </view>
+     </view>
+    
+    </view>
+
+
+
+
+
+  </view>
+</scroll-view>

+ 14 - 0
pages/home/home.wxss

@@ -0,0 +1,14 @@
+.announcement_sty{
+  height: 90rpx;width: 100%;background-color:#F3F2F0;border-radius: 5rpx;text-align: left;line-height: 50rpx;padding-left: 20rpx;display: flex;flex-direction: row;
+}
+.announcement_img{
+  width: 90rpx;height: 40rpx;margin:10rpx 0 0 10rpx;
+}
+.announcement_sty1{
+ height: 64rpx;background-color:#FFF;border-radius: 40rpx;width: 95%;border: 1rpx solid #CCCCCC;display: flex;flex-direction: row;margin-top: 10rpx;
+}
+.newsimgs{
+  width: 130rpx;height: 130rpx;margin-top: 10rpx;
+}.newContextSty{
+  font-size:28rpx;color:#999999; overflow:hidden; text-overflow:ellipsis;white-space:nowrap;width:640rpx;margin-top: 20rpx;
+}

+ 123 - 0
pages/mine/mine.js

@@ -0,0 +1,123 @@
+// pages/mine/mine.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+   //id
+    idMyInfo:'idMyInfo',
+    idCompanyInfo: 'idCompanyInfo',
+    idAbout: 'idAbout',
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+  btnClick: function (event) {
+    var that = this
+    var id = event.currentTarget.id
+
+    if (id == that.data.idMyInfo){
+      wx.navigateTo({
+        url: '../perinfo/perinfo',
+      })
+    } else if (id == that.data.idCompanyInfo){
+
+    } else if (id == that.data.idAbout){
+      
+    }
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    this.setData({
+      isRegistered: wx.getStorageSync('isRegistered'),
+      isLogin: wx.getStorageSync('wxnickName') ? true : false,
+      canIUse: wx.canIUse('button.open-type.getUserInfo'),
+      headerImg: wx.getStorageSync('wxavatarUrl'),
+      wxNickname: wx.getStorageSync('wxnickName'),
+      isRegistered: wx.getStorageSync('isRegistered'),
+    })
+  },
+
+  bindGetUserInfo: function (e) {
+    var that = this
+    var userInfo = e.detail.userInfo
+    // console.log('bindGetUserInfo', userInfo)
+    var nickName = userInfo.nickName
+    var avatarUrl = userInfo.avatarUrl
+    var gender = userInfo.gender //性别 0:未知、1:男、2:女
+    var province = userInfo.province
+    var city = userInfo.city
+    var country = userInfo.country
+    if (nickName && avatarUrl) {
+      that.setData({
+        wxNickname: nickName,
+        wxHeader: avatarUrl,
+        isLogin: true
+      })
+      try {
+        wx.setStorageSync('wxavatarUrl', userInfo.avatarUrl)
+        wx.setStorageSync('wxnickName', userInfo.nickName)
+      } catch (e) {
+      }
+    }
+
+  },
+
+
+
+
+
+
+
+
+
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 5 - 0
pages/mine/mine.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "我的",
+  "enablePullDownRefresh": false,
+  "disableScroll": true
+}

+ 60 - 0
pages/mine/mine.wxml

@@ -0,0 +1,60 @@
+<view>
+
+ <view wx:if='{{!isLogin}}' class='beforeLoginview' bindtap='btnClick' id='{{idBLV}}'>
+    <view><image src='../../img/common_header_boy.png' class='headerImg'></image></view>
+    <view class='menuText2' style='width:auto;' wx:if="{{canIUse}}"><button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" style='height:60rpx;text-align:center;font-size:25rpx;margin:30rpx 0 0 10rpx;'>微信授权登录</button></view>
+    <view wx:else>请升级微信版本</view>
+  </view>
+  
+<view wx:if='{{isLogin}}'class='headerView' >
+  <view class='newHeaderView'>
+    <view wx:if='{{headerImg.length == 0 || headerImg == null}}'><image class='headerImg' src='{{wxHeader}}' bindtap='btnClick' id='{{idHeader}}' > </image></view> 
+    <view wx:else><image class='headerImg' src='{{headerImg}}'> </image></view> 
+    <view class='loginname'>{{wxNickname}}</view>
+    </view>
+  </view>
+   
+ <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'>520</text></view>
+            <view class='h_data_left'>本月当前排名: <text class='h_data_right'>520</text></view>
+        </view>
+        <view style='width:50%;'>
+            <view class='h_data_left'>上月积分:<text class='h_data_right'>520</text></view>
+            <view class='h_data_left'>上月排名:<text class='h_data_right'>520</text></view>
+        </view>
+    </view>
+ </view>
+    <view style='height:32rpx;width:100%;background-color:#F2F2F2;'></view>
+
+<view class='commonHview'  >
+    <view class='menuhview' bindtap='btnClick' id='{{idMyInfo}}'>
+    <view class='menuText1' >个人资料</view>
+    </view>
+    <view style='width:5%;' ><image class='nextImg' src='../../img/next.png'> </image></view>
+  </view>
+ <view class='commonhline' style='height:3rpx;'></view>
+
+<view class='commonHview'  >
+    <view class='menuhview' bindtap='btnClick' id='{{idCompanyInfo}}'>
+    <view class='menuText1' >企业信息</view>
+    </view>
+    <view style='width:5%;' ><image class='nextImg' src='../../img/next.png'> </image></view>
+  </view>
+ <view class='commonhline' style='height:3rpx;'></view>
+
+ <view class='commonHview'  >
+    <view class='menuhview' bindtap='btnClick' id='{{idAbout}}'>
+    <view class='menuText1' >关于</view>
+    </view>
+    <view style='width:5%;' ><image class='nextImg' src='../../img/next.png'> </image></view>
+  </view>
+ <view class='commonhline' style='height:3rpx;'></view>
+
+
+
+
+
+
+</view>

+ 50 - 0
pages/mine/mine.wxss

@@ -0,0 +1,50 @@
+.beforeLoginview{
+  text-align: left;
+  padding: 30rpx 0 20rpx 40rpx;
+  display: flex;
+  flex-direction: row;
+}.headerImg{
+  margin-top: 10rpx;
+  width: 92rpx;
+  height: 92rpx;
+  border-radius: 50%;
+  border:2px solid #fff;
+  box-shadow: 3px 3px 10px rgba(0,0,0,0.2);
+}.menuText2{
+  font-size: 22rpx;color: #666666;text-align: center;
+}.headerView{
+  height: 360rpx;
+  text-align: center;
+  padding: 30rpx 0 20rpx 0;
+  background-color:#3581EB;
+   /* background-image: url('../../img/h-data_bg.png'); */
+  flex-direction: row;
+}.loginname{
+  font-size: 30rpx;
+  color: #FFF;
+  font-weight:bold; line-height: 92rpx;margin: 20rpx; 
+}.newHeaderView{
+  z-index:99;position: fixed;left: 5%; display: flex;
+  flex-direction: row;
+}.headerdata{
+   z-index:99;position: fixed;height: 220rpx;width: 560rpx;background: #FFF;
+   border-radius: 20rpx 20rpx 0 0;left: 13%;top: 18%;opacity: 0.9;
+}
+.h_data_left{
+color:#666666;font-size:24rpx;margin-top: 30rpx;
+}.h_data_right{
+color:#242323;font-size:30rpx;margin-top: 30rpx;
+}.menuhview{
+  display: flex;flex-direction: row; width: 100%;
+}
+.menuText1{
+  font-size: 30rpx;
+  text-align: left;
+  margin: 25rpx 10rpx 20rpx 20rpx;
+  width: 95%;
+  color: #333333;background-color: #FFF;
+}.nextImg{
+  width: 20rpx;
+  height: 30rpx;
+  text-align: left;margin-top: 30rpx;
+}

+ 95 - 0
pages/minusapply/minusapply.js

@@ -0,0 +1,95 @@
+// pages/minusapply/minusapply.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    isDetails: false, //减分申请详情时状态
+    minusPerson:'吴彦祖',
+    minusTime:'2018-09-20',
+    minusName:'',
+    minusPoints:50
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this
+    var isDetails = options.getisDetails
+    that.setData({
+      isDetails: isDetails
+    })
+    that.changeTitle()
+  },
+
+  /**
+      *修改Title
+      */
+  changeTitle: function () {
+    var that = this;
+    var isDetails = that.data.isDetails
+    var title
+    if (isDetails) {
+      title = '减分详情'
+    } else {
+      title = '减分申请'
+    }
+    that.setData({
+      mername: title
+    })
+    wx.setNavigationBarTitle({
+      title: that.data.mername
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 3 - 0
pages/minusapply/minusapply.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "减分申请"
+}

+ 67 - 0
pages/minusapply/minusapply.wxml

@@ -0,0 +1,67 @@
+
+<form bindsubmit='minusSubmit'>
+
+<view class='commonHview' wx:if='{{isDetails}}'>
+  <view class='left_sty'>
+    扣分人
+  </view>
+   <view class='right_sty'>
+        <input class='input_sty'  type='text'  name='minusPerson' value='{{minusPerson}}' disabled='{{isDetails}}'></input>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    日期
+  </view>
+   <view class='right_sty'>
+        <input class='input_sty'  type='text'  name='minusTime' value='{{minusTime}}' disabled='true'></input>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    被扣人
+  </view>
+   <view class='right_sty' style='display: flex;flex-direction: row;'>
+      <view><input class='input_sty' disabled='true' value='{{minusName}}' placeholder='请选择' type='text' name='minusName' disabled='{{isDetails}}'></input></view>
+    <view wx:if='{{!isDetails}}'><image class='nextImg' src='../../img/next.png'> </image></view>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    被扣标准
+  </view>
+   <view class='right_sty' style='display: flex;flex-direction: row;'>
+      <view><input class='input_sty' disabled='true' value='{{minusNorm}}' placeholder='请选择' type='text' name='minusNorm' disabled='{{isDetails}}'></input></view>
+    <view wx:if='{{!isDetails}}'><image class='nextImg' src='../../img/next.png'> </image></view>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    被扣数值
+  </view>
+   <view class='right_sty' style='display: flex;flex-direction: row;'>
+      <view><input class='input_sty' disabled='true' value='{{minusPoints}}' placeholder='请选择' type='text' name='minusPoints' disabled='{{isDetails}}'></input></view>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+<view class='commonHview'>
+  <view class='left_sty'  style='width: 20%;'>
+    被扣事情
+  </view>
+   <view class='righttextarea' >
+        <textarea placeholder='请输入...' name='applyReason' maxlength='200' disabled='{{isDetails}}'> </textarea>
+    </view>
+</view>
+<view class='commonhline' style='height:20rpx;'></view>
+
+<button wx:if='{{!isDetails}}' class='comBtn' formType="submit" hover-class="commonclick-btn">提交</button>
+</form>

+ 17 - 0
pages/minusapply/minusapply.wxss

@@ -0,0 +1,17 @@
+.left_sty{
+  width: 50%;height: 100rpx;text-align: left;color: #333333;font-size: 30rpx;line-height: 100rpx;margin-left: 20rpx;
+}
+.right_sty{
+  width: 50%;height: 100rpx;text-align: right;color: #666666;font-size: 30rpx;line-height: 100rpx;margin-right: 20rpx;
+}.input_sty{
+  margin-top: 20rpx;
+}.righttextarea{
+   width:200rpx;
+  font-size: 30rpx;
+  margin: 30rpx;
+  text-align: left;color: #666666;height: 300rpx;
+}.nextImg{
+  width: 20rpx;
+  height: 30rpx;
+  text-align: left;margin:30rpx 10rpx;
+}

+ 66 - 0
pages/perinfo/perinfo.js

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

+ 3 - 0
pages/perinfo/perinfo.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "个人资料"
+}

+ 73 - 0
pages/perinfo/perinfo.wxml

@@ -0,0 +1,73 @@
+ <view class='commonHview'>
+        <view class='add_item_left_sty'>
+          <view style='color:#333333;font-size:30rpx;'>手机号</view>
+          <view style='color:#666666;font-size:30rpx;margin-top:20rpx;'>18130506086</view>
+        </view>
+        <view class='add_item_right_sty'>
+          <view class='deit_sty'>编辑</view>
+        </view>
+    </view>
+  <view class='commonhline' style='height:20rpx;'></view>
+
+   <view class='commonHview'>
+        <view class='add_item_left_sty'>
+          <view style='color:#333333;font-size:30rpx;'>姓名</view>
+          <view style='color:#666666;font-size:30rpx;margin-top:20rpx;'>吴彦祖</view>
+        </view>
+        <view class='add_item_right_sty'>
+          <view class='deit_sty'>编辑</view>
+        </view>
+    </view>
+  <view class='commonhline' style='height:3rpx;'></view>
+   <view class='commonHview'>
+        <view class='add_item_left_sty'>
+          <view style='color:#333333;font-size:30rpx;'>性别</view>
+          <view style='color:#666666;font-size:30rpx;margin-top:20rpx;'>男</view>
+        </view>
+        <view class='add_item_right_sty'>
+          <view class='deit_sty'>编辑</view>
+        </view>
+    </view>
+  <view class='commonhline' style='height:20rpx;'></view>
+
+     <view class='commonHview'>
+        <view class='add_item_left_sty'>
+          <view style='color:#333333;font-size:30rpx;'>入职日期</view>
+          <view style='color:#666666;font-size:30rpx;margin-top:20rpx;'>2018-09-20</view>
+        </view>
+        <view class='add_item_right_sty'>
+          <view class='deit_sty'>编辑</view>
+        </view>
+    </view>
+  <view class='commonhline' style='height:3rpx;'></view>
+   <view class='commonHview'>
+        <view class='add_item_left_sty'>
+          <view style='color:#333333;font-size:30rpx;'>出生日期</view>
+          <view style='color:#666666;font-size:30rpx;margin-top:20rpx;'>2018-09-20</view>
+        </view>
+        <view class='add_item_right_sty'>
+          <view class='deit_sty'>编辑</view>
+        </view>
+    </view>
+  <view class='commonhline' style='height:3rpx;'></view>
+
+     <view class='commonHview'>
+        <view class='add_item_left_sty'>
+          <view style='color:#333333;font-size:30rpx;'>个人邮箱</view>
+          <view style='color:#666666;font-size:30rpx;margin-top:20rpx;'>18130506086@163.com</view>
+        </view>
+        <view class='add_item_right_sty'>
+          <view class='deit_sty'>编辑</view>
+        </view>
+    </view>
+  <view class='commonhline' style='height:3rpx;'></view>
+   <view class='commonHview'>
+        <view class='add_item_left_sty'>
+          <view style='color:#333333;font-size:30rpx;'>所属公司</view>
+          <view style='color:#666666;font-size:30rpx;margin-top:20rpx;'>英唐集团</view>
+        </view>
+        <view class='add_item_right_sty'>
+          <view class='deit_sty'>编辑</view>
+        </view>
+    </view>
+  <view class='commonhline' style='height:3rpx;'></view>

+ 10 - 0
pages/perinfo/perinfo.wxss

@@ -0,0 +1,10 @@
+.add_item_left_sty{
+  width: 90%;text-align: left;height: 100rpx;padding: 20rpx 40rpx;
+}
+.add_item_right_sty{
+  width: 10%;text-align: right;height: 100rpx;padding: 20rpx 40rpx;
+}
+.deit_sty{
+  text-align: center;font-size: 22rpx;color: #333333;border-radius: 5rpx;margin-top: 20rpx;
+  background-color: #E6E6E6;padding: 5rpx;width: 60rpx;
+}

+ 160 - 0
pages/point/point.js

@@ -0,0 +1,160 @@
+// pages/point/point.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    allorders: [],
+    todayorders: [1, 2, 3, 4, 5, 6, 1, 2, 3, 4, 5, 6,1, 2, 3, 4, 5, 6],
+    weekorders: [1, 2, 3],
+    monthorders: [1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4],
+    // tab切换  
+    currentTab: 0,
+    clientHeight: '',
+
+    /** 
+      * 页面配置 
+      */
+    winWidth: 0,
+    winHeight: 0,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this
+    /** 
+     * 获取系统信息 
+     */
+    wx.getSystemInfo({
+      success: function (res) {
+        that.setData({
+          winWidth: res.windowWidth,
+          winHeight: res.windowHeight,
+          clientHeight: res.windowHeight
+        });
+      }
+    })
+
+    that.getHisOrderData()
+  },
+  getHisOrderData: function () {
+    var that = this
+    wx.request({
+      url: baseUrl + BASEURL.getUrl.list,
+      method: 'GET',
+      data: {
+        accountphone: 18130506086,
+        openid: wx.getStorageSync('openId')
+      },
+      header: {
+        'content-type': 'application/json;charset=UTF-8'
+      },
+      success: function (res) {
+        console.log('queryOrder=', res)
+        if (res.data.success) {
+          if (res.data.data.length > 0) {
+            that.setData({
+              allorders: res.data.data
+            })
+          }
+        }
+      }
+    })
+  },
+  enterAddPoint:function(){
+    wx.navigateTo({
+      url: '../pointapply/pointapply',
+    })
+  },
+  enterMinusPoint:function(){
+    wx.navigateTo({
+      url: '../minusapply/minusapply',
+    })
+  },
+  addListClick:function(){
+    wx.navigateTo({
+      url: '../pointapply/pointapply?getisDetails='+true,
+    })
+  },
+  minusListClick:function(){
+    wx.navigateTo({
+      url: '../minusapply/minusapply?getisDetails=' + true,
+    })
+  },
+  /** 
+    * 点击tab切换 
+    */
+  swichNav: function (e) {
+    var that = this;
+    console.log('swichNav=', e)
+    if (this.data.currentTab == e.target.dataset.current) {
+      return false;
+    } else {
+      that.setData({
+        currentTab: e.target.dataset.current
+      })
+    }
+  },
+
+  /** 
+* 滑动切换tab 
+*/
+  bindChange: function (e) {
+    var that = this;
+    if (e.detail.source == 'touch') {
+      that.setData({ currentTab: e.detail.current });
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 5 - 0
pages/point/point.json

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

+ 112 - 0
pages/point/point.wxml

@@ -0,0 +1,112 @@
+   <view class='commonHview'   >
+      <view class='header_left_view' bindtap='enterAddPoint'>
+        <image src='../../img/add_point.png' class='im_sty1'></image>
+        <text class='add_text_sty'>加分单</text>
+      </view>
+      <view style='width:6rpx;height:50rpx;background-color:#F2F2F2;margin-top:10rpx;'></view>
+      <view class='header_left_view' bindtap='enterMinusPoint'>
+        <image src='../../img/minus_point.png' class='im_sty1'></image>
+        <text class='minus_text_sty'>减分单</text>
+      </view>
+    </view> 
+<view class='commonhline' style='height:20rpx;'></view>
+
+
+<view class="swiper-tab" style='margin-top:100rpx;'>  
+    <view class="swiper-tab-list {{currentTab==0 ? 'on' : ''}}" data-current="0" bindtap="swichNav">加分记录</view>  
+    <view class="swiper-tab-list {{currentTab==1 ? 'on' : ''}}" data-current="1" bindtap="swichNav">扣分记录</view>  
+    <view class="swiper-tab-list {{currentTab==2 ? 'on' : ''}}" data-current="2" bindtap="swichNav">积分排名</view>  
+</view>  
+
+ <view wx:if='{{(currentTab == 1 && todayorders.length == 0) || (currentTab == 2 && weekorders.length == 0) || (currentTab == 0 && monthorders.length == 0)}}' class='nodata_view'>
+     <view><image class='nodata_style' src='../../resource/images/common_nodata.png'></image></view> 
+</view> 
+
+<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%;">
+      <block wx:for='{{todayorders}}'>
+         <template is='addPointTem' data='{{...item}}' /> 
+      </block>
+     </scroll-view> 
+    </swiper-item> 
+
+      <swiper-item>  
+      <scroll-view  scroll-y="true" style="height:100%;">
+      <block wx:for='{{weekorders}}'>
+         <template is='minusPointTem' data='{{...item}}'/> 
+      </block>
+     </scroll-view> 
+    </swiper-item> 
+
+      <swiper-item >  
+      <scroll-view  scroll-y="true" style="height:100%;">
+        <view class='commonHview' style='background-color:#B1F4AE;height:100rpx;'>
+          <view style='color:#333333;font-size:30rpx;text-align:left;margin:25rpx;width:50%;'>当前排名:1</view>
+          <view style='color:#666666;font-size:30rpx;text-align:right;margin:25rpx;width:50%;'>5201314 积分</view>
+        </view>
+      <block wx:for='{{monthorders}}'>
+         <!-- <template is='pointRankTem' data='{{...item}}'/>  -->
+          <view class='commonHview' style='height:100rpx;'>
+  
+          <view  wx:if='{{index == 0}}' style='color:#F60000;font-size:30rpx;text-align:left;margin:25rpx;width:50%;' >{{index+1}} <text style='color:#333333'>吴彦祖</text></view>
+          <view  wx:elif='{{index == 1}}' style='color:#FF9700;font-size:30rpx;text-align:left;margin:25rpx;width:50%;' >{{index+1}} <text style='color:#333333'>吴彦祖</text></view>
+          <view  wx:elif='{{index == 2}}' style='color:#09C44D;font-size:30rpx;text-align:left;margin:25rpx;width:50%;' >{{index+1}} <text style='color:#333333'>吴彦祖</text></view>
+          <view  wx:else style='color:#666666;font-size:30rpx;text-align:left;margin:25rpx;width:50%;' >{{index+1}} 吴彦祖</view>
+          <view style='color:#666666;font-size:30rpx;text-align:right;margin:25rpx;width:50%;'>5201314 积分</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+      </block>
+     </scroll-view> 
+    </swiper-item> 
+</swiper>
+
+
+<template name='addPointTem'> 
+    <view class='commonHview' bindtap='addListClick'>
+        <view class='add_item_left_sty'>
+          <view style='color:#333333;font-size:30rpx;'>加分标准</view>
+          <view style='color:#20AB41;font-size:30rpx;margin-top:20rpx;'>+520</view>
+        </view>
+        <view class='add_item_right_sty'>
+          <view style='color:#666666;font-size:26rpx;'>通过</view>
+          <view style='color:#666666;font-size:26rpx;margin-top:20rpx;'>2018-09-19</view>
+        </view>
+    </view>
+     <view class='commonhline' style='height:3rpx;'></view>
+</template>
+
+<template name='minusPointTem'> 
+    <view class='commonHview'  bindtap='minusListClick'>
+        <view class='add_item_left_sty'>
+          <view style='color:#333333;font-size:30rpx;'>扣分标准</view>
+          <view style='color:#CB0404;font-size:30rpx;margin-top:20rpx;'>-250</view>
+        </view>
+        <view class='add_item_right_sty'>
+          <view style='color:#666666;font-size:26rpx;'>扣分人:吴彦祖</view>
+          <view style='color:#666666;font-size:26rpx;margin-top:20rpx;'>2018-09-19</view>
+        </view>
+    </view>
+     <view class='commonhline' style='height:3rpx;'></view>
+</template>
+
+<template name='pointRankTem'>
+    <view class='commonHview' style='height:100rpx;'>
+          <view style='color:#333333;font-size:30rpx;text-align:left;margin:25rpx;width:50%;'>{{index}}.吴彦祖</view>
+          <view style='color:#666666;font-size:30rpx;text-align:right;margin:25rpx;width:50%;'>520131 积分</view>
+    </view>
+    <view class='commonhline' style='height:3rpx;'></view>
+</template>
+
+<!-- <template name='ordertep'>
+  <view class='commonHview itemRow' >
+        <view><image src='../../img/common_header_boy.png' class='img1'></image></view>
+        <view class='commonVview itemMsg'>
+          <view style='font-size:28rpx;'>西红柿</view>
+          <view style='color:#999999;font-size:24rpx;line-height:40rpx;'>1斤</view>
+          <view style='color:#999999;font-size:24rpx;'>实付款<text style='color:#FF0000;'>¥28</text></view>
+        </view>
+        <view class='itemStatue_finish'>已完成</view>
+        </view>
+        <view class='commonhline' style='height:3rpx;'></view>
+</template> -->

+ 56 - 0
pages/point/point.wxss

@@ -0,0 +1,56 @@
+/* pages/point/point.wxss */
+.header_left_view{
+  width: 50%;text-align: center;height: 80rpx;line-height: 80rpx;
+}
+.im_sty1{
+  height: 38rpx;width: 36rpx;margin-right: 20rpx;
+}.add_text_sty{
+  font-size: 36rpx;color: #20AB41;
+}.minus_text_sty{
+  font-size: 36rpx;color: #E30000;
+}
+
+.swiper-tab{  
+    width: 100%;  
+    border-bottom: 1rpx solid #F0F0F0;  
+    text-align: center;  
+    position: fixed;
+    top: 0;
+    background-color: #FFFFFF;
+    } 
+.swiper-tab-list{  
+    display: inline-block;  
+    width: 33.33%;  
+    color: #000000 ;  
+    background-color: #FFFFFF;
+    font-size: 30rpx;
+    padding: 20rpx 0 20rpx 0;
+} 
+.on{ color: #3581EB;  border-bottom: 5rpx solid #3581EB ;}  
+.swiper-box{ display: block; height: 100%; width: 100%; overflow: hidden; } 
+
+.add_item_left_sty{
+  width: 50%;text-align: left;height: 100rpx;padding: 20rpx 40rpx;
+}
+.add_item_right_sty{
+  width: 50%;text-align: right;height: 100rpx;padding: 20rpx 40rpx;
+}
+.first{
+  color: #F60000;
+}.second{
+  color: #FF9700;
+}.thired{
+  color: #09C44D;
+}
+
+/*  */
+.img1{height: 120rpx;width: 120rpx;border-radius: 10rpx;}
+.itemRow{
+  padding: 5rpx 20rpx;width: 100%;height:140rpx;
+}
+.itemMsg{
+  font-size: 30rpx;margin-left: 10rpx;text-align: left;width: 65%;
+}
+.itemStatue_finish{
+  font-size: 24rpx;text-align: right;color: #FF0000;
+}

+ 109 - 0
pages/pointapply/pointapply.js

@@ -0,0 +1,109 @@
+// pages/pointapply/pointapply.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    isDetails: false, //加分申请详情时状态
+    applyStatus:'待审批',
+    applyTime:'2018-09-20',
+    applyNorm:'标准1'
+  },
+  /**
+    *修改Title
+    */
+  changeTitle: function () {
+    var that = this;
+    var isDetails = that.data.isDetails
+    var title
+    if(isDetails){
+      title = '加分申请详情'
+    }else{
+      title = '积分申请'
+    }
+    that.setData({
+      mername: title
+    })
+    wx.setNavigationBarTitle({
+      title: that.data.mername
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this 
+    var isDetails = options.getisDetails
+    that.setData({
+      isDetails: isDetails
+    })
+    that.changeTitle()
+  },
+ /**
+   * 提交申请
+   */
+  applySubmit: function (event) {
+    var that = this
+    console.log(event.detail.value)
+  },
+  /**
+   * 撤回
+   */
+  cancelApply:function(){
+
+  },
+
+
+
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 3 - 0
pages/pointapply/pointapply.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "积分申请"
+}

+ 71 - 0
pages/pointapply/pointapply.wxml

@@ -0,0 +1,71 @@
+<form bindsubmit='applySubmit'>
+
+<view class='commonHview' wx:if='{{isDetails}}'>
+  <view class='left_sty'>
+    状态
+  </view>
+   <view class='right_sty'>
+        <input class='input_sty'  type='text'  name='applyStatus' value='{{applyStatus}}' disabled='{{isDetails}}'></input>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    申请时间
+  </view>
+   <view class='right_sty'>
+        <input class='input_sty'  type='text'  name='applyTime' value='{{applyTime}}' disabled='true'></input>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    申请人
+  </view>
+   <view class='right_sty'>
+      <input class='input_sty'  placeholder='请输入姓名' type='text' maxlength='10' name='applyName' disabled='{{isDetails}}'></input>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    申请人岗位
+  </view>
+   <view class='right_sty'>
+      <input class='input_sty'  placeholder='请输入岗位' type='text' maxlength='10' name='applyJob' disabled='{{isDetails}}' ></input>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+
+<view class='commonHview'>
+  <view class='left_sty'>
+    申请标准
+  </view>
+   <view class='right_sty' style='display: flex;flex-direction: row;'>
+      <view><input class='input_sty' disabled='true' value='{{applyNorm}}' type='text' maxlength='10' name='applyNorm'    disabled='{{isDetails}}'></input></view>
+    <view><image class='nextImg' src='../../img/next.png'> </image></view>
+    </view>
+</view>
+<view class='commonhline' style='height:3rpx;'></view>
+
+
+<view class='commonHview'>
+  <view class='left_sty' style='width: 10%;'>
+    事由
+  </view>
+   <view class='righttextarea' >
+        <textarea placeholder='请输入...' name='applyReason' maxlength='200' disabled='{{isDetails}}'> </textarea>
+    </view>
+</view>
+<view class='commonhline' style='height:20rpx;' ></view>
+
+
+<button wx:if='{{!isDetails}}' class='comBtn' formType="submit" hover-class="commonclick-btn">提交申请</button>
+<button wx:if='{{isDetails}}'class='comBtn' hover-class="commonclick-btn" bindtap='cancelApply'>撤回</button>
+</form>

+ 18 - 0
pages/pointapply/pointapply.wxss

@@ -0,0 +1,18 @@
+.left_sty{
+  width: 50%;height: 100rpx;text-align: left;color: #333333;font-size: 30rpx;line-height: 100rpx;margin-left: 20rpx;
+}
+.right_sty{
+  width: 50%;height: 100rpx;text-align: right;color: #666666;font-size: 30rpx;line-height: 100rpx;margin-right: 20rpx;
+}.input_sty{
+  margin-top: 20rpx;
+}
+.righttextarea{
+   width:200rpx;
+  font-size: 30rpx;
+  margin: 30rpx;
+  text-align: left;color: #666666;height: 300rpx;
+}.nextImg{
+  width: 20rpx;
+  height: 30rpx;
+  text-align: left;margin:30rpx 10rpx;
+}

+ 40 - 0
project.config.json

@@ -0,0 +1,40 @@
+{
+	"description": "项目配置文件",
+	"packOptions": {
+		"ignore": []
+	},
+	"setting": {
+		"urlCheck": false,
+		"es6": true,
+		"postcss": true,
+		"minified": true,
+		"newFeature": true,
+		"nodeModules": false
+	},
+	"compileType": "miniprogram",
+	"libVersion": "2.3.0",
+	"appid": "wx172657dad29220cc",
+	"projectname": "PointManagement",
+	"debugOptions": {
+		"hidedInDevtools": []
+	},
+	"isGameTourist": false,
+	"condition": {
+		"search": {
+			"current": -1,
+			"list": []
+		},
+		"conversation": {
+			"current": -1,
+			"list": []
+		},
+		"game": {
+			"currentL": -1,
+			"list": []
+		},
+		"miniprogram": {
+			"current": -1,
+			"list": []
+		}
+	}
+}

+ 19 - 0
utils/util.js

@@ -0,0 +1,19 @@
+const formatTime = date => {
+  const year = date.getFullYear()
+  const month = date.getMonth() + 1
+  const day = date.getDate()
+  const hour = date.getHours()
+  const minute = date.getMinutes()
+  const second = date.getSeconds()
+
+  return [year, month, day].map(formatNumber).join('/') + ' ' + [hour, minute, second].map(formatNumber).join(':')
+}
+
+const formatNumber = n => {
+  n = n.toString()
+  return n[1] ? n : '0' + n
+}
+
+module.exports = {
+  formatTime: formatTime
+}

+ 31 - 0
utils/wxconstant.js

@@ -0,0 +1,31 @@
+function BaseUrl(){
+  // var baseUrl = 'http://nf20718343.iask.in:32004/'
+  // var baseUrl =  'http://192.168.0.111:8080/'
+  var baseUrl = 'https://www.akuiguoshu.com/'
+  // var baseUrl = 'http://nf20718343.iask.in:32004/'
+  return baseUrl
+}
+function getTXMapApiKay(){
+  return 'HPYBZ-IFY2J-E5KFY-K24IF-Q3UMS-GJFBV'
+}
+const getUrl = {
+  getOpenid:'fruits/wxpay/getOpenid',
+  getAd: 'fruits/fruits/ad/getAd',
+  bindable:'fruits/fruits/usr/bindable',
+  sendVcode:'fruits/fruits/usr/sendVcode',
+  getBindable:'fruits/fruits/usr/getBindable',
+  list: 'fruits/fruits/order/list',
+  getBindable: 'fruits/fruits/usr/getBindable',
+  saveOrder:'fruits/fruits/order/saveOrder',
+  pay:'fruits/wxpay/pay',
+  getSign:'fruits/wxpay/getSign',
+  isPaydeposit: 'fruits/fruits/usr/isPaydeposit',
+  listBy:'fruits/fruits/order/listBy',
+  getByMachineId:'fruits/fruits/aisle/getByMachineId',
+  sendSocket:'fruits/fruits/aisle/sendSocket'
+}
+module.exports = {
+  BaseUrl: BaseUrl,
+  getTXMapApiKay: getTXMapApiKay,
+  getUrl: getUrl
+}