jufubao-forms 1.0.0-beta11 → 1.0.0-beta13

package/package.json

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

package/src/components/JfbFormsDynamicForm/JfbFormsDynamicForm.vue

@@ -188,6 +188,7 @@
         dynamicFormList: [],
         renderForm: "renderForm",
         form_id: "",
+        foreign_id: "",
         isShowDialog: false,
         validImageAPIUrl: "",
         valid_token: "",
@@ -236,18 +237,26 @@
             });
           }
           this.form_id = options.form_id;
+          this.foreign_id = options.foreign_id;
         }else{
           this.form_id = 1;
         }
         let getFormFn = "getDynamicForm";  //加盟商营销动态表单fn
         // if(this.formBe == 2) getFormFn = "getSaasDynamicForm"
 
+        let activity_range = 2;
+        // #ifdef MP
+        activity_range = 4;
+        // #endif
+
         this.$xdShowLoading({});
         jfbRootExec(getFormFn, {
           vm: this,
           data: {
             form_id: this.form_id,
-            bucket: this.bucket
+            bucket: this.bucket,
+            foreign_id: this.foreign_id,
+            activity_range: activity_range
           }
         }).then(res => {
           this.$xdHideLoading();
@@ -429,6 +438,7 @@
             contents,
             form_id: this.form_id,
             bucket: this.bucket,
+            foreign_id: this.foreign_id
           }
         }).then(res => {
           this.$xdHideLoading();

package/src/components/JfbFormsList/JfbFormsList.vue

@@ -130,11 +130,17 @@
         this.qaDetailPath = getContainerPropsValue(container, 'content.qaDetailPath', {value: ""}).value;
       },
       getList(){
+        let activity_show_terminal = 2;
+        
+        // #ifdef MP
+        activity_show_terminal = 4;
+        // #endif
         let data = {
           page_token: this.page_token+'',
           page_size: this.page_size,
           bucket: this.bucket,
-          base_type: this.base_type
+          base_type: this.base_type,
+          activity_range: activity_show_terminal
         }
         jfbRootExec("getSaasFormList", {
           vm: this,

package/src/components/JfbFormsQuestionAndAnswer/JfbFormsQuestionAndAnswer.vue

@@ -119,6 +119,7 @@
     data() {
       return {
         form_id: '',
+        foreign_id: "",
         loaded: false,
         isPreview: false,
         form_status: "content",
@@ -240,12 +241,19 @@
           this.form_id = '123';
         }else{
           this.form_id = options.form_id;
+          this.foreign_id = options.foreign_id;
         }
+        let activity_range = 2;
+        // #ifdef MP
+        activity_range = 4;
+        // #endif
         this.$xdShowLoading({});
         jfbRootExec("getDynamicForm", {
           vm: this,
           data: {
             form_id: this.form_id,
+            foreign_id: this.foreign_id,
+            activity_range: activity_range
           }
         }).then(res => {
           this.$xdHideLoading();
@@ -302,6 +310,7 @@
                 vm: this,
                 data: {
                   form_id: this.form_id,
+                  foreign_id: this.foreign_id,
                   contents: this.formList.map(item => {
                     let content = Array.isArray(item.value) ? item.value : (item.value ? [item.value] : []);
                     return {
@@ -330,7 +339,7 @@
         if(url){
           if(this.marketing_tool === 'prize') url = url + '?id=' + this.activity_id;
           if(this.marketing_tool === 'coupon') url = url + '?activity_id=' + this.activity_id;
-          else url = url + `?id=${this.activity_id}&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
           })