Merge branch 'dev3.6' of http://192.168.3.207:10080/qmx/jy into dev3.6

src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js

@@ -410,7 +410,7 @@ var vNode = {
           score: _this.addHowPoints()
         },
         success: function(res){
-          if (res.error_code === 0 && res.data.points) {
+          if (res.error_code === 0) {
             _this.signInfo.days++
             _this.signInfo.state = true
             _this.showAnimate = true
@@ -495,7 +495,7 @@ var vNode = {
       return points
     },
     recordFn: function() {
-      window.location.href = '/page_points/list'
+      window.location.href = '/page_points_app/list'
     }
   }
 }

src/jfw/modules/subscribepay/src/service/commonAction.go

@@ -162,11 +162,14 @@ func (p *CommonAction) IsPaySuccess() {
 func (d *CommonAction) GetwxSdkSign() {
 	var sign []string
 	url := d.GetString("url")
+	openId, _ := d.GetSession("s_m_openid").(string)
 	if url != "" {
 		sign = SignJSSDK(url)
 	}
 	d.ServeJson(map[string]interface{}{
-		"wxsdk": sign,
+		"wxsdk":     sign,
+		"openid":    se.EncodeString(openId),
+		"webdomain": config.Config.WebDomain,
 	})
 }
 

src/web/staticres/me/js/mine.js

@@ -262,7 +262,7 @@ var vNode = {
           score: _this.addHowPoints()
         },
         success: function(res){
-          if (res.error_code === 0 && res.data.points) {
+          if (res.error_code === 0) {
             _this.signInfo.days++
             _this.signInfo.state = true
             _this.showAnimate = true
@@ -347,7 +347,7 @@ var vNode = {
       return points
     },
     recordFn: function() {
-      window.location.href = '/page_points/list'
+      window.location.href = '/page_points_app/list'
     }
   }
 }