Merge branch 'feature/questionSubmit' into 'release/5.9.1'

Feature/question submit



See merge request !724

@@ -39,6 +39,7 @@ module.exports = class extends global.yoho.BaseModel {
     getQuestionList() {
     getQuestionList() {
         return this.get({
         return this.get({
             url: 'activity/question/questionList',
             url: 'activity/question/questionList',
+            data: {uid: _.get(this.ctx, 'req.user.uid', 0)},
             api: global.yoho.ServiceAPI
             api: global.yoho.ServiceAPI
         }).then(result => {
         }).then(result => {
             let list = _.get(result, 'data.rows', []);
             let list = _.get(result, 'data.rows', []);

@@ -220,8 +220,14 @@ let question = {
             }
             }
         }).then(function(data) {
         }).then(function(data) {
             that.saving = false;
             that.saving = false;
-            if (data.code === 200) {
-                tipDg.show('调查问卷已成功提交,感谢您的帮助！');
+            if (data.code === 200 || data.code === 206) {
+                let tip = '调查问卷已成功提交,感谢您的帮助！';
+
+                if (data.code === 206 && data.message) {
+                    tip = data.message;
+                }
+
+                tipDg.show(tip);
 
 
                 setTimeout(function() {
                 setTimeout(function() {
                     if (yoho.isApp) {
                     if (yoho.isApp) {