Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

LAPTOP-RI7D261L\Mr Ke

2020-02-26 a92f3c4d10bebbdc55270e72ccd97cd1ba7d4e28

 SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js

@@ -12,6 +12,9 @@
    loading: false,
    peopleInfo: {},
    signStatus: '',
    id: "",
    topattList:[],
    bottomattList:[]
  },

  /**
@@ -39,7 +42,9 @@
        if (res.data.code == 0) {
          res.data.data.startTime = app.formatDate(res.data.data.startTime)
          that.setData({
            activity: res.data.data
            activity: res.data.data,
            bottomattList:res.data.data.attList.filter((item)=>(item.associateType==1020)),
            topattList:res.data.data.attList.filter((item)=>(item.associateType==1000))
          })
          console.log('传过来', options.flag)
          console.log('传过来', options.signStatus)
@@ -121,11 +126,39 @@

  // 签到
  sign: function () {
    var id = this.data.id;
    var userinfo = wx.getStorageSync("user");
    var userId = userinfo.id;
    // 只允许从相机扫码
    wx.scanCode({
      onlyFromCamera: true,
      success(res) {
        console.log(res)
        wx.showLoading({
          title: '识别中',
        })
        wx.request({
          url: app.globalData.url + '/api/activity/sign?id'+id+'&code='+res.result+'&userId='+userId,
          method: 'GET',
          header: {
            "Content-Type": "application/json"
          },
          success: function (res) {
            wx.hideLoading();
            if (res.data.code == 0) {
              wx.showToast({
                title: '签到成功！',
                icon: 'success',
                duration: 2000
              })
            } else {
              wx.showToast({
                title: '报名失败,请稍后重试!',
                icon: 'none'
              })
            }
          }
        })
      }
    })
  },