jufubao-forms 1.0.0-beta12 → 1.0.0-beta14

package/package.json

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

package/src/components/JfbFormsDynamicForm/JfbFormsDynamicForm.vue

@@ -102,7 +102,14 @@
           <xd-font-icon icon="iconchenggong" color="#06bc85" :size="64"></xd-font-icon>
           <view class="status_tip">您已成功提交</view>
           <view class="status_name">{{ formName }}</view>
-          <view class="status_btn" @click="doClose">关闭</view>
+          <!-- <view class="status_btn" @click="doClose">关闭</view> -->
+          <view class="status_btn_wrap">
+            <view class="status_btn" @click="doClose">关闭</view>
+            <view class="status_btn" v-if="marketToolText"
+              style="background:#FE7A63;"
+              @click="handleMarketToolBtn"
+            >{{ marketToolText }}</view>
+          </view>
         </view>
         <view v-if="form_status === 'error'" class="form_status form_error">
           <!-- <xd-font-icon icon="iconshibai" color="#ff5235" :size="64"></xd-font-icon> -->
@@ -185,6 +192,10 @@
       return {
         formName: "",
         form: {},
+        marketing_tool: "",
+        activity_page_url: "",
+        activity_id: "",
+        foreign_id: "",
         dynamicFormList: [],
         renderForm: "renderForm",
         form_id: "",
@@ -210,6 +221,15 @@
       ...mapState({
         brandInfo: state => state.brandInfo
       }),
+      marketToolText(){
+        let toolText = {
+          prize: '去抽奖',
+          coupon: '去领券',
+          walking: '健步走',
+        };
+        let btnText = toolText[this.marketing_tool];
+        return btnText ? btnText : '';
+      },
       bucket(){
         return this.formBe == 1 ? 'default' : 'saas';
       }
@@ -244,13 +264,19 @@
         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,
-            foreign_id: this.foreign_id
+            foreign_id: this.foreign_id,
+            activity_range: activity_range
           }
         }).then(res => {
           this.$xdHideLoading();
@@ -345,6 +371,17 @@
       getTimeFormat2(num) {
         return Number(num) < 10 ? "0" + num : num;
       },
+      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
+          })
+        }
+      },
       doCheckValidCode(){
         let token = this.valid_token;
         let valid_code = this.valid_code;
@@ -436,6 +473,10 @@
           }
         }).then(res => {
           this.$xdHideLoading();
+          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;
           this.form_status = 'success';
         })
       },
@@ -682,6 +723,11 @@
           font-size: 32rpx;
           margin: 78rpx 0;
         }
+        .status_btn_wrap{
+          display: flex;
+          justify-content: center;
+          width: 80%;
+        }
         .status_btn{
           width: 80%;
           border-radius: 4px;
@@ -691,6 +737,9 @@
           height: 80rpx;
           line-height: 80rpx;
           text-align: center;
+          & + .status_btn{
+            margin-left: 32rpx;
+          }
         }
       }
 

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

@@ -243,12 +243,17 @@
           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
+            foreign_id: this.foreign_id,
+            activity_range: activity_range
           }
         }).then(res => {
           this.$xdHideLoading();
@@ -333,7 +338,7 @@
         let url = this.checkUrlIsValid(this.activity_page_url);
         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 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