jufubao-forms 1.0.0-beta14 → 1.0.0-beta16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-forms",
-  "version": "1.0.0-beta14",
+  "version": "1.0.0-beta16",
   "private": false,
   "description": "聚福宝表单业务插件库",
   "main": "index.js",

package/src/components/JfbFormsDynamicForm/JfbFormsDynamicForm.vue

@@ -377,7 +377,7 @@
           if(this.marketing_tool === 'prize') url = url + '?id=' + this.activity_id;
           else if(this.marketing_tool === 'coupon') url = url + '?activity_id=' + this.activity_id;
           else url = url + `?id=${this.activity_id}&activity_id=${this.activity_id}&foreign_id=${this.foreign_id}`;
-          this.$xdUniHelper.navigateTo({
+          this.$xdUniHelper.redirectTo({
             url: url
           })
         }

package/src/components/JfbFormsQaResult/JfbFormsQaResult.vue

@@ -24,7 +24,10 @@
         <view class="result_num">{{ right_number }}</view>
         <view class="result_total">共{{ formList.length }}道题</view>
         <view class="btn_wrap">
-          <view class="btn" @click="toHomePage">返回首页</view>
+          <view v-if="marketToolText" class="btn primary" 
+            style="background:#FE7A63;color:#FFFFFF;"
+            @click="handleMarketToolBtn">{{ marketToolText }}</view>
+          <view v-else class="btn" @click="toHomePage">返回首页</view>
           <view v-if="is_show_error_answer_analysis==='Y'" class="btn primary" @click="isShowAnalysis=true">答案解析</view>
         </view>
       </view>
@@ -117,6 +120,11 @@
         formList: [],
         right_number: 0,
 
+        marketing_tool: "",
+        activity_page_url: "",
+        activity_id: "",
+        foreign_id: "",
+
         isShowAnalysis: false,  //是否显示解析
         isOnlyError: false,  //是否只看错题
 
@@ -129,7 +137,16 @@
     computed: {
       showFormList(){
         return this.isOnlyError ? this.formList.filter(item => !item.isRight) : this.formList;
-      }
+      },
+      marketToolText(){
+        let toolText = {
+          prize: '去抽奖',
+          coupon: '去领券',
+          walking: '健步走',
+        };
+        let btnText = toolText[this.marketing_tool];
+        return btnText ? btnText : '';
+      },
     },
     watch: {
       container(value, oldValue) {
@@ -179,6 +196,10 @@
             return item;
           });
           this.right_number = res.right_number;
+          this.marketing_tool = res.marketing_tool;
+          this.activity_page_url = res.activity_page_url;
+          this.activity_id = res.activity_id;
+          this.foreign_id = res.foreign_id;
         })
 
       },
@@ -189,6 +210,17 @@
       init(container) {
         this.returnHomePath = getContainerPropsValue(container, 'content.returnHomePath', {value: ''}).value;
       },
+      handleMarketToolBtn(){
+        let url = this.checkUrlIsValid(this.activity_page_url);
+        if(url){
+          if(this.marketing_tool === 'prize') url = url + '?id=' + this.activity_id;
+          else if(this.marketing_tool === 'coupon') url = url + '?activity_id=' + this.activity_id;
+          else url = url + `?id=${this.activity_id}&activity_id=${this.activity_id}&foreign_id=${this.foreign_id}`;
+          this.$xdUniHelper.navigateTo({
+            url: url
+          })
+        }
+      },
       toHomePage(){
         this.$xdUniHelper.navigateTo({
           url: this.returnHomePath

package/src/components/JfbFormsQuestionAndAnswer/JfbFormsQuestionAndAnswer.vue

@@ -325,8 +325,8 @@
                 this.activity_page_url = activity_page_url;
                 this.activity_id = activity_id;
                 // uni.showToast({title: '提交成功'});
-                this.form_status = 'success';
-                this.$xdUniHelper.navigateTo({
+                // this.form_status = 'success';
+                this.$xdUniHelper.redirectTo({
                   url: this.qaResultPath + `?form_id=${this.form_id}&main_content_id=${main_content_id}`
                 })
               })
@@ -340,7 +340,7 @@
           if(this.marketing_tool === 'prize') url = url + '?id=' + this.activity_id;
           else if(this.marketing_tool === 'coupon') url = url + '?activity_id=' + this.activity_id;
           else url = url + `?id=${this.activity_id}&activity_id=${this.activity_id}&foreign_id=${this.foreign_id}`;
-          this.$xdUniHelper.navigateTo({
+          this.$xdUniHelper.redirectTo({
             url: url
           })
         }