jufubao-forms 1.0.0-beta9 → 1.0.2-beta1

package/package.json

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

package/src/components/JfbFormsDynamicForm/Attr.js

@@ -29,6 +29,18 @@ export default {
           router: XdBus.getParentApi('getPagesTree')
         },
       },
+      {
+        label: "表单列表跳转路径",
+        ele: 'xd-select-pages-path',
+        valueKey: 'qaListPath',
+        groupKey:'advanced',
+        placeholder: '请选择表单列表跳转路径',
+        value: data['qaListPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbFormsDynamicForm/JfbFormsDynamicForm.vue

@@ -102,12 +102,21 @@
           <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>
-          <view class="status_tip error_tip">{{ err_msg }}</view>
-          <view class="status_name">{{ formName }}</view>
+          <!-- <xd-font-icon icon="iconshibai" color="#ff5235" :size="64"></xd-font-icon> -->
+          <image class="empty_image" :src="emptyImage" mode="widthFix"></image>
+          <view class="status_tip error_tip" style="color: #333333;">{{ err_msg }}</view>
+          <!-- <view class="status_name">{{ formName }}</view> -->
+          <view class="status_btn" @click="toQaList" style="border-radius: 8rpx;margin-top: 100rpx;">返回列表</view>
         </view>
       </view>
 
@@ -159,6 +168,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import { mapState } from "vuex";
+  import getServiceUrl from "@/common/getServiceUrl";
   export default {
     name: "JfbFormsDynamicForm",
     components: {
@@ -182,9 +192,14 @@
       return {
         formName: "",
         form: {},
+        marketing_tool: "",
+        activity_page_url: "",
+        activity_id: "",
+        foreign_id: "",
         dynamicFormList: [],
         renderForm: "renderForm",
         form_id: "",
+        foreign_id: "",
         isShowDialog: false,
         validImageAPIUrl: "",
         valid_token: "",
@@ -193,10 +208,12 @@
         err_msg: "",
         loaded: false,
         isPreview: false,
+        emptyImage: getServiceUrl('/common/empty/qa.png'),
 
         //面板
         submitPagePath: "",
         formBe: "1",
+        qaListPath: "",
         // description: "",
       }
     },
@@ -204,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';
       }
@@ -231,18 +257,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();
@@ -337,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.redirectTo({
+            url: url
+          })
+        }
+      },
       doCheckValidCode(){
         let token = this.valid_token;
         let valid_code = this.valid_code;
@@ -373,6 +418,7 @@
       init(container) {
         this.submitPagePath = getContainerPropsValue(container, 'content.submitPagePath', {value: ""}).value;
         this.formBe = getContainerPropsValue(container, 'content.formBe', '1');
+        this.qaListPath = getContainerPropsValue(container, 'content.qaListPath', {value: ""}).value;
         // this.description = getContainerPropsValue(container, 'content.description', "");
       },
       handleClearError(item){
@@ -423,9 +469,14 @@
             contents,
             form_id: this.form_id,
             bucket: this.bucket,
+            foreign_id: this.foreign_id
           }
         }).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';
         })
       },
@@ -611,6 +662,11 @@
         // window.location.href = 'about:blank';
         // window.close();
       },
+      toQaList(){
+        this.$xdUniHelper.redirectTo({
+          url: this.qaListPath
+        })
+      },
       onJfbScroll(options) {
         // console.log('event.onJfbScroll', options)
       },
@@ -648,6 +704,13 @@
         flex-direction: column;
         align-items: center;
         padding-top: 100rpx;
+        .empty_image{
+          width: 500rpx;
+
+          image{
+            width: 100%;
+          }
+        }
         .status_tip{
           color: #06bc85;
           margin-top: 32rpx;
@@ -660,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;
@@ -669,6 +737,9 @@
           height: 80rpx;
           line-height: 80rpx;
           text-align: center;
+          & + .status_btn{
+            margin-left: 32rpx;
+          }
         }
       }
 

package/src/components/JfbFormsList/Attr.js

@@ -18,6 +18,17 @@ export default {
           { label: 'saas系统', value: 'saas'}
         ]
       },
+      {
+        label: "表单类型",
+        ele: "xd-radio",
+        valueKey: "base_type",
+        value: data['base_type'] || '',
+        groupKey:'content',
+        list: [
+          { label: "员工调研", value: "form"},
+          { label: '知识竞赛', value: 'answer'}
+        ]
+      },
       {
         label: "列表外边距设置",
         groupKey:'style',

package/src/components/JfbFormsList/JfbFormsList.vue

@@ -16,10 +16,10 @@
     </view>
     <!-- #endif -->
     <view class="jfb-forms-list__body">
-      <view class="activity_list_wrap" :style="listWrapBoxStyle">
-        <view class="activity_list">
+      <view v-if="loaded" class="activity_list_wrap" :style="listWrapBoxStyle">
+        <view class="activity_list" v-if="list.length">
           <view class="activity_item"
-            v-for="(item,i) in list" :key="item.id"
+            v-for="(item,i) in list" :key="item.form_id"
             :style="listItemBoxStyle"
             @click="toDetail(item)"
           >
@@ -33,6 +33,10 @@
             </view>
           </view>
         </view>
+        <view v-else class="empty_data" style="display: flex;align-items: center;justify-content: center;">
+          <image class="empty_image" :src="emptyImage" mode="widthFix"></image>
+          <view class="empty_text">暂无活动</view>
+        </view>
       </view>
     </view>
   </view>
@@ -61,6 +65,8 @@
         list: [],
         next_page_token: "",
         hasNext: true,
+        loaded: false,
+        emptyImage: getServiceUrl('/common/empty/qa.png'),
 
         //todo
         listMargin: {},
@@ -69,6 +75,7 @@
         detailPath: "",
         bucket: "default",
         qaDetailPath: "",
+        base_type: "",
       }
     },
     computed: {
@@ -118,19 +125,28 @@
         this.listPadding = getContainerPropsValue(container, 'content.listPadding', {});
         this.itemRadius = getContainerPropsValue(container, 'content.itemRadius', 0);
         this.bucket = getContainerPropsValue(container, 'content.bucket', 'default');
+        this.base_type = getContainerPropsValue(container, 'content.base_type', '');
         this.detailPath = getContainerPropsValue(container, 'content.detailPath', {value: ""}).value;
         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
+          bucket: this.bucket,
+          base_type: this.base_type,
+          activity_range: activity_show_terminal
         }
         jfbRootExec("getSaasFormList", {
           vm: this,
           data: data
         }).then(res => {
+          this.loaded = true;
           let list = res.list.map(item => {
             item['cover'] = getServiceUrl(item.cover);
             item["start_time"] = this.$xdUniHelper.getDate(item["start_time"] * 1000).fullDate;
@@ -193,6 +209,20 @@
 
   .jfb-forms-list {
     &__body{
+      .empty_data{
+        display: flex;
+        flex-direction: column;
+      }
+      .empty_image{
+        width: 500rpx;
+        margin: 50rpx auto;
+      }
+      .empty_text{
+        color: #666666;
+        font-size: 28rpx;
+
+      }
+
       .activity_item{
         background-color: #FFF;
         padding: 24rpx;

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

@@ -61,7 +61,7 @@
               </view>
             </template>
           </view> -->
-          <view class="bottom_fixed">
+          <view class="bottom_fixed" :style="fixedBottom">
             <xd-button type="primary" :disabled="curIndex === 0"
               :style="[fixedButtonStyle]" @click="handlePrev">上一题</xd-button>
             <xd-button type="primary" :disabled="curQA.required && (!qaValue || qaValue.length === 0)"
@@ -119,6 +119,7 @@
     data() {
       return {
         form_id: '',
+        foreign_id: "",
         loaded: false,
         isPreview: false,
         form_status: "content",
@@ -143,6 +144,9 @@
       }
     },
     computed: {
+      fixedBottom(){
+        return this.fixedStyle({paddingBottom: 24, zIndex: 111})
+      },
       progressBarInnerStyle(){
         let width = ((this.curIndex + 1) / this.formList.length) * 100 + '%';
         return {
@@ -240,12 +244,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 +313,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 {
@@ -316,8 +328,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}`
                 })
               })
@@ -329,9 +341,9 @@
         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 url = url + `?id=${this.activity_id}&activity_id=${this.activity_id}`;
-          this.$xdUniHelper.navigateTo({
+          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.redirectTo({
             url: url
           })
         }