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

LAPTOP-RI7D261L\Mr Ke

2020-03-09 a2d1b9886b00b5f4d4722c3379d3bd4f2f94b421

 SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js

@@ -53,7 +53,7 @@
            that.setData({
              signStatus: options.signStatus
            })
          } else {
          } else {sign
            if (options.flag == 'true') {
              //可报名
              console.log('可报名')
@@ -138,7 +138,7 @@
          title: '识别中',
        })
        wx.request({
          url: app.globalData.url + '/api/activity/sign?id'+id+'&code='+res.result+'&userId='+userId,
          url: app.globalData.url + '/api/activity/sign?id='+id+'&code='+res.result+'&userId='+userId,
          method: 'GET',
          header: {
            "Content-Type": "application/json"
@@ -153,7 +153,7 @@
              })
            } else {
              wx.showToast({
                title: '报名失败,请稍后重试!',
                title: '签到失败,请稍后重试!',
                icon: 'none'
              })
            }