jufubao-forms 1.0.0-beta1 → 1.0.0-beta10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-forms",
-  "version": "1.0.0-beta1",
+  "version": "1.0.0-beta10",
   "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

@@ -10,7 +10,9 @@
       :class="{ editx : isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-forms-dynamic-form__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-forms-dynamic-form__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
     </view>
     <!-- #endif -->
     <view class="jfb-forms-dynamic-form__body">
@@ -76,7 +78,7 @@
                   :end="item.end_time"
                   :border="false"
                   placeholder="请选择日期"
-                  @change="handleClearError(item)">
+                  @change="e => handleDateTimePicker(e, item)">
                 </uni-datetime-picker>
               </template>
               <!-- <xd-form-date v-if="item.field_type === 'calendar'"
@@ -103,13 +105,15 @@
           <view class="status_btn" @click="doClose">关闭</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>
-      
-      
+
+
       <xd-dialog :show.sync="isShowDialog" title="请输入验证码" :showCloseIcon="false">
         <xd-form
           label-align="left"
@@ -129,7 +133,7 @@
             </view>
           </xd-form-item>
         </xd-form>
-        
+
         <view slot="btn">
           <xd-button type="primary" width="400rpx" @click="doCheckValidCode">提交</xd-button>
         </view>
@@ -157,6 +161,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: {
@@ -191,10 +196,12 @@
         err_msg: "",
         loaded: false,
         isPreview: false,
+        emptyImage: getServiceUrl('/common/empty/qa.png'),
 
         //面板
         submitPagePath: "",
         formBe: "1",
+        qaListPath: "",
         // description: "",
       }
     },
@@ -202,6 +209,9 @@
       ...mapState({
         brandInfo: state => state.brandInfo
       }),
+      bucket(){
+        return this.formBe == 1 ? 'default' : 'saas';
+      }
     },
     watch: {
       container(value, oldValue) {
@@ -230,14 +240,14 @@
           this.form_id = 1;
         }
         let getFormFn = "getDynamicForm";  //加盟商营销动态表单fn
-        if(this.formBe == 2) getFormFn = "getSaasDynamicForm"
-
+        // if(this.formBe == 2) getFormFn = "getSaasDynamicForm"
 
         this.$xdShowLoading({});
         jfbRootExec(getFormFn, {
           vm: this,
           data: {
             form_id: this.form_id,
+            bucket: this.bucket
           }
         }).then(res => {
           this.$xdHideLoading();
@@ -250,7 +260,7 @@
           }
           this.dynamicFormList = res.list.map((item, i) => {
             item.error = "";
-            
+
             if(item.is_show_explain !== 'Y'){
               item.explain = "";
             }
@@ -310,6 +320,8 @@
           setTimeout(() => {
             this.setFieldItemTop();
           }, 100)
+        }).catch(err => {
+          this.$xdHideLoading();
         })
       },
       setFieldItemTop(){
@@ -366,6 +378,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){
@@ -407,14 +420,15 @@
         console.log(contents, "contents")
 
         let submitFormFn = "submitDynamicForm";  //加盟商营销动态表单fn
-        if(this.formBe == 2) submitFormFn = "submitSaasDynamicForm"
+        // if(this.formBe == 2) submitFormFn = "submitSaasDynamicForm"
 
         this.$xdShowLoading({});
         jfbRootExec(submitFormFn, {
           vm: this,
           data: {
             contents,
-            form_id: this.form_id
+            form_id: this.form_id,
+            bucket: this.bucket,
           }
         }).then(res => {
           this.$xdHideLoading();
@@ -563,7 +577,7 @@
             return this.getDecimalTip(item);
           }
         }
-        
+
         //开始验证限制范围
         if(fieldValue && !showRange) return errTip;
         max = Number(max);
@@ -592,6 +606,10 @@
         this.$set(this.form, item.field_value, value);
         this.$set(item, "error", "")
       },
+      handleDateTimePicker(time, item){
+        this.$set(this.form, item.field_value, time);
+        this.$set(item, "error", "")
+      },
       doClose(){
         this.$xdUniHelper.navigateTo({
           url: this.submitPagePath
@@ -599,6 +617,11 @@
         // window.location.href = 'about:blank';
         // window.close();
       },
+      toQaList(){
+        this.$xdUniHelper.redirectTo({
+          url: this.qaListPath
+        })
+      },
       onJfbScroll(options) {
         // console.log('event.onJfbScroll', options)
       },
@@ -636,6 +659,13 @@
         flex-direction: column;
         align-items: center;
         padding-top: 100rpx;
+        .empty_image{
+          width: 500rpx;
+
+          image{
+            width: 100%;
+          }
+        }
         .status_tip{
           color: #06bc85;
           margin-top: 32rpx;
@@ -659,7 +689,7 @@
           text-align: center;
         }
       }
-     
+
       .align-center{
         display: flex;
         align-items: center;
@@ -734,7 +764,7 @@
         }
         .uni-easyinput__content-input{
           font-size: 24rpx;
-          
+
           .uni-easyinput__placeholder-class{
             font-size: 24rpx;
           }
@@ -746,7 +776,7 @@
           font-size: 24rpx !important;
           border: none !important;
         }
-        
+
       }
       .description{
         color: #666666;

package/src/components/JfbFormsDynamicForm/JfbFormsDynamicFormLess.less

@@ -44,17 +44,18 @@
     cursor: pointer;
     position: absolute;
     right: unit(0, rpx);
-    top: unit(-52, rpx);
+    top: unit(0, rpx);
     height: unit(50, rpx);
-    line-height: unit(50, rpx);
+    z-index: 100;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
     box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
     color: #fff;
     font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
 
     &-icon{
       padding: 0 unit(20, rpx);

package/src/components/JfbFormsDynamicForm/uni-datetime-picker/calendar.vue

@@ -595,6 +595,9 @@
 					this.tempRange.before = this.cale.multipleStatus.before
 					this.tempRange.after = this.cale.multipleStatus.after
 				}
+        if(this.hasTime && !this.time) {
+          this.time = getTime(new Date(), this.hideSecond)
+        }
 				this.change()
 			},
       changeMonth(type) {

package/src/components/JfbFormsList/Api.js

@@ -8,7 +8,7 @@ module.exports = [
   {
     mapFnName: 'getSaasFormList',
     title: '获取问卷列表',
-    path: '/saas-app/v1/sms-form',
+    path: '/forms/v1/sms-form',
     isRule: false,
     params: {
       page_token: ['当前页', 'Number', '必选'],

package/src/components/JfbFormsList/Attr.js

@@ -7,6 +7,17 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: "表单所属业务",
+        ele: "xd-radio",
+        valueKey: "bucket",
+        value: data['bucket'] || 'default',
+        groupKey:'content',
+        list: [
+          { label: "加盟商营销", value: "default"},
+          { label: 'saas系统', value: 'saas'}
+        ]
+      },
       {
         label: "列表外边距设置",
         groupKey:'style',
@@ -64,6 +75,18 @@ export default {
         },
         inline: false,
       },
+      {
+        label: "问答详情跳转路径",
+        ele: 'xd-select-pages-path',
+        valueKey: 'qaDetailPath',
+        groupKey:'advanced',
+        placeholder: '请选择问卷详情跳转路径',
+        value: data['qaDetailPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbFormsList/JfbFormsList.vue

@@ -10,16 +10,18 @@
       :class="{ editx : isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-forms-list__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-forms-list__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
     </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"
             :style="listItemBoxStyle"
-            @click="toDetail(item.form_id)"
+            @click="toDetail(item)"
           >
             <view class="item_img">
               <image :src="item.cover" mode="aspectFill"></image>
@@ -31,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>
@@ -59,12 +65,16 @@
         list: [],
         next_page_token: "",
         hasNext: true,
+        loaded: false,
+        emptyImage: getServiceUrl('/common/empty/qa.png'),
 
         //todo
         listMargin: {},
         listPadding: {},
         itemRadius: 0,
         detailPath: "",
+        bucket: "default",
+        qaDetailPath: "",
       }
     },
     computed: {
@@ -113,17 +123,21 @@
         this.listMargin = getContainerPropsValue(container, 'content.listMargin', {});
         this.listPadding = getContainerPropsValue(container, 'content.listPadding', {});
         this.itemRadius = getContainerPropsValue(container, 'content.itemRadius', 0);
+        this.bucket = getContainerPropsValue(container, 'content.bucket', 'default');
         this.detailPath = getContainerPropsValue(container, 'content.detailPath', {value: ""}).value;
+        this.qaDetailPath = getContainerPropsValue(container, 'content.qaDetailPath', {value: ""}).value;
       },
       getList(){
         let data = {
           page_token: this.page_token+'',
-          page_size: this.page_size
+          page_size: this.page_size,
+          bucket: this.bucket
         }
         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;
@@ -139,10 +153,17 @@
           this.hasNext = !!res.next_page_token;
         })
       },
-      toDetail(form_id){
-        this.$xdUniHelper.navigateTo({
+      toDetail(item){
+        let form_id = item.form_id;
+        if(item.base_type=='form'){
+          this.$xdUniHelper.navigateTo({
           url: this.detailPath + `?form_id=${form_id}`
         })
+        }else{
+          this.$xdUniHelper.navigateTo({
+            url: this.qaDetailPath + `?form_id=${form_id}`
+          })
+        }
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
@@ -179,6 +200,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/JfbFormsList/JfbFormsListLess.less

@@ -44,17 +44,18 @@
     cursor: pointer;
     position: absolute;
     right: unit(0, rpx);
-    top: unit(-52, rpx);
+    top: unit(0, rpx);
     height: unit(50, rpx);
-    line-height: unit(50, rpx);
+    z-index: 100;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
     box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
     color: #fff;
     font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
 
     &-icon{
       padding: 0 unit(20, rpx);

package/src/components/JfbFormsQaResult/Api.js

@@ -0,0 +1,19 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Qa
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getFormContentResult',
+    title: '获取问卷结果',
+    path: '/forms/v1/sms-form-content/:form_id',
+    isRule: false,
+    params: {
+      form_id: ['form_id', '表单ID', 'string'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbFormsQaResult/Attr.js

@@ -0,0 +1,25 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+      {
+        label: "返回首页跳转路径",
+        ele: 'xd-select-pages-path',
+        valueKey: 'returnHomePath',
+        groupKey:'advanced',
+        placeholder: '请选择返回首页跳转路径',
+        value: data['returnHomePath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+    ].filter(i=>i)
+  },
+  advanced: [],
+};

package/src/components/JfbFormsQaResult/JfbFormsQaResult.vue

@@ -0,0 +1,453 @@
+<template>
+  <view
+    class="jfb-forms-qa-result"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-forms-qa-result__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-forms-qa-result__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-forms-qa-result__body" :style="{
+      '--main-color': mainColor,
+      '--main-color-alpha': mainColorAlpha,
+    }">
+      <view class="qa_result_box">
+        <view class="result_tt">答对提数</view>
+        <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="is_show_error_answer_analysis==='Y'" class="btn primary" @click="isShowAnalysis=true">答案解析</view>
+        </view>
+      </view>
+
+      <template v-if="isShowAnalysis">
+        <view class="analysis_head">
+          <view class="_left">答案解析</view>
+          <view class="_right" :class="{active: isOnlyError}" @click="isOnlyError=!isOnlyError">
+            <xd-radio :value="isOnlyError" :width="40" :height="40" :iconSize="18" :isClickEvent="false"></xd-radio>
+            仅看错题
+          </view>
+        </view>
+
+        <view class="analysis_body">
+          <view class="analysis_title">
+            <view class="_left">选择题</view>
+            <view class="_right">共{{ formList.length }}题</view>
+          </view>
+          <view class="qa_list">
+            <view class="qa_item" v-for="(item,i) in showFormList" :key="item.field_id">
+              <view class="qa_type">【{{item.field_type_name}}】</view>
+              <view class="qa_title">{{ item.key }}.{{ item.field_name }}</view>
+              <view class="answer_list">
+                <view class="answer_item"
+                  v-for="ans in item.options"
+                  :key="ans.value"
+                  :class="{
+                    a_right : ans.is_checked,
+                  }"
+                >
+                  {{ans.abc}} {{ ans.label }}
+                  <!-- <view v-if="ans.is_error" class="err_tip">
+                    <xd-font-icon icon="iconguanbi" size="32" color="#FF7063"></xd-font-icon>
+                  </view> -->
+                </view>
+                <!-- <view class="answer_item a_error a_right">ASF3244</view> -->
+              </view>
+              <view class="qa_explain">
+                <view class="answer_right">
+                  <view class="flex-center">
+                    <xd-font-icon v-if="item.isRight" icon="icondui_fill" size="32" :color="mainColor" style="margin-right: 6rpx;"></xd-font-icon>
+                    <xd-font-icon v-else icon="iconshibai" size="32" color="#FF7063" style="margin-right: 6rpx;"></xd-font-icon>
+                    {{ item.isRight ? '回答正确' : '回答错误' }}
+                  </view>
+                  <view class="is_right">正确答案: {{ item.answer_right_abc }}</view>
+                </view>
+                <view v-if="!item.isRight && item.answer_analysis" class="answer_analysis">
+                  <view class="_title">
+                    <xd-font-icon icon="icondanghang" size="32" style="margin-right: 6rpx;"></xd-font-icon>
+                    答案解析</view>
+                  <view class="_content">{{ item.answer_analysis }}</view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="to_top_wrap">
+          <view class="to_top" @click="scrollToTop">返回顶部</view>
+        </view>
+      </template>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdButton from "@/components/XdButton/XdButton";
+  import XdRadio from "@/components/XdRadio/XdRadio"
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbFormsQaResultMixin from "./JfbFormsQaResultMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  import Color from "color"
+  export default {
+    name: "JfbFormsQaResult",
+    components: {
+      XdFontIcon,
+      XdButton,
+      XdRadio
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbFormsQaResultMixin
+    ],
+    data() {
+      return {
+        mainColorAlpha: "",
+        form_id: "",
+        main_content_id: "",
+        formList: [],
+        right_number: 0,
+
+        isShowAnalysis: false,  //是否显示解析
+        isOnlyError: false,  //是否只看错题
+
+        is_show_error_answer_analysis: "", //创建表单是创建的是否展示错误答案解析Y/N
+        //todo
+
+        returnHomePath: "",
+      }
+    },
+    computed: {
+      showFormList(){
+        return this.isOnlyError ? this.formList.filter(item => !item.isRight) : this.formList;
+      }
+    },
+    watch: {
+      container(value, oldValue) {
+        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
+    },
+    created() {
+      this.init(this.container);
+      this.mainColorAlpha = Color(this.mainColor).alpha(0.15).toString();
+      //todo
+    },
+    methods: {
+      onJfbLoad(options) {
+        this.form_id = options.form_id;
+        this.main_content_id = options.main_content_id;
+
+        jfbRootExec("getFormContentResult",{
+          vm: this,
+          data:{
+            form_id: this.form_id,
+            main_content_id: this.main_content_id
+          }
+        }).then(res => {
+          let abc = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J'];
+          let fileTypes = {
+            'radio': '单选',
+            'checkbox': '多选'
+          }
+          this.is_show_error_answer_analysis = res.is_show_error_answer_analysis;
+          this.formList = res.list.map((item, index) => {
+            let defaultValue = JSON.parse(item.default);
+            item.rightValue = item.answer;
+            item.isRight = this.isSameArray(defaultValue, item.answer);
+            item.field_type_name = fileTypes[item.field_type];
+            item.key = index + 1;
+
+            item.options = item.options.map((ans, i) => {
+              ans['is_checked'] = defaultValue.includes(ans.value);
+              // ans['is_error'] = item.answer.includes(ans.value) && !item.rightValue.includes(ans.value);
+              // ans['is_right'] = item.answer.includes(ans.value);
+              ans['abc'] = abc[i];
+              return ans;
+            })
+            item['answer_right_abc'] = this.getRightAbc(item);
+
+            return item;
+          });
+          this.right_number = res.right_number;
+        })
+
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+        this.returnHomePath = getContainerPropsValue(container, 'content.returnHomePath', {value: ''}).value;
+      },
+      toHomePage(){
+        this.$xdUniHelper.navigateTo({
+          url: this.returnHomePath
+        })
+      },
+      //判断两个包含数组是否相同
+      isSameArray(arr1, arr2){
+        if(arr1.length != arr2.length) return false;
+        for (let i = 0; i < arr1.length; i++) {
+          if(!arr2.includes(arr1[i])){
+            return false;
+          }
+        }
+        return true;
+      },
+      getRightAbc(item){
+        return item.options.filter((ans) => {
+          return item.answer.includes(ans.value)
+        }).map(item => item.abc).join(",")
+      },
+      scrollToTop(){
+        uni.pageScrollTo({
+          scrollTop: 0,
+        })
+      },
+      onJfbScroll(options) {
+        // console.log('event.onJfbScroll', options)
+      },
+      onJfbReachBottom(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+      onJfbShow(options) {
+        console.log('event.onJfbShow', options)
+      },
+      onJfbHide(options) {
+        console.log('event.onJfbHide', options)
+      },
+      onJfbBack(options) {
+        console.log('event.onJfbBack', options)
+      },
+      onJfbUpdate(...data) {
+        console.log('event.onJfbUpdate', data)
+      },
+      onJfbCustomEvent(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbFormsQaResultLess.less";
+
+  .jfb-forms-qa-result {
+    &__body{
+      padding: 0 0 40rpx;
+      font-size: 28rpx;
+      .qa_result_box{
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        background-color: #FFFFFF;
+        margin-bottom: 20rpx;
+        padding: 48rpx;
+        .result_tt{
+          color: var(--main-color);
+          font-size: 32rpx;
+          font-weight: 400;
+        }
+        .result_num{
+          color: var(--main-color);
+          font-size: 160rpx;
+          font-weight: 700;
+        }
+        .result_total{
+          color: #AAAAAA;
+          font-weight: 400;
+          font-size: 28rpx;
+        }
+        .btn_wrap{
+          display: flex;
+          margin-top: 28rpx;
+          justify-content: center;
+          .btn{
+            width: 230rpx;
+            height: 88rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border-radius: 16rpx;
+            background: #F0F0F0;
+            color: #AAAAAA;
+            font-size: 28rpx;
+            &.primary{
+              background: var(--main-color-alpha);
+              color: var(--main-color);
+            }
+
+            & + .btn{
+              margin-left: 60rpx;
+            }
+          }
+        }
+      }
+      .analysis_head{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        background-color: #FFFFFF;
+        margin-bottom: 20rpx;
+        padding: 24rpx 40rpx;
+        ._left{
+          color: #666666;
+          font-size: 28rpx;
+        }
+        ._right{
+          // border: 1px solid #666666;
+          // padding: 14rpx 24rpx;
+          border-radius: 12rpx;
+          color: #666666;
+          font-size: 24rpx;
+          display: flex;
+          align-items: center;
+
+          &.active{
+            // border: 1px solid var(--main-color);
+            color: var(--main-color);
+          }
+        }
+      }
+      .analysis_body{
+        .analysis_title{
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          border-bottom: 1px solid #EEEEEE;
+          padding: 24rpx 40rpx;
+          background-color: #FFFFFF;
+          ._left{
+            color: #666666;
+            font-size: 28rpx;
+            font-weight: 400;
+            position: relative;
+            padding-left: 20rpx;
+            &::before{
+              position: absolute;
+              content: ' ';
+              width: 6rpx;
+              height: 32rpx;
+              background: var(--main-color);
+              left: 0;
+              top: 50%;
+              transform: translate(0, -50%);
+              border-radius: 2rpx;
+            }
+          }
+          ._right{
+            font-size: 24rpx;
+            color: #CCCCCC;
+            font-weight: 400
+          }
+        }
+        .qa_list{
+          .qa_item{
+            background-color: #FFFFFF;
+            padding: 40rpx;
+            margin-bottom: 20rpx;
+
+            .qa_type{
+              background: var(--main-color-alpha);
+              color: var(--main-color);
+              font-size: 20rpx;
+              font-weight: 400;
+              display: inline-block;
+              padding: 4rpx;
+              border-radius: 8rpx;
+              margin-bottom: 16rpx;
+            }
+            .qa_title{
+              color: #666666;
+              font-weight: 400;
+            }
+
+            .answer_list{
+              .answer_item{
+                background: #F7F7F7;
+                padding: 16rpx 32rpx;
+                border-radius: 12rpx;
+                margin: 24rpx 0;
+                color: #666666;
+                font-size: 28rpx;
+                font-weight: 400;
+                position: relative;
+                .err_tip{
+                  position: absolute;
+                  right: 32rpx;
+                  top: 16rpx;
+                }
+
+                &.a_right{
+                  color: #FFFFFF;
+                  background: var(--main-color);
+                }
+                // &.a_error{
+                //   color: #FF7063;
+                //   background: #FFE3E0;
+                // }
+              }
+            }
+            .qa_explain{
+              .answer_right{
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                padding: 0 24rpx;
+                margin-top: 36rpx;
+
+                .flex-center{
+                  display: flex;
+                  align-items: center;
+                }
+
+                .is_right{
+                  color: var(--main-color);
+                }
+              }
+              .answer_analysis{
+                color: var(--main-color);
+                background-color: var(--main-color-alpha);
+                margin-top: 36rpx;
+                padding: 24rpx;
+                border-radius: 12rpx;
+                ._title{
+                  font-size: 28rpx;
+                  display: flex;
+                  align-items: center;
+                }
+                ._content{
+                  font-size: 26rpx;
+                  padding-left: 42rpx;
+                  margin-top: 16rpx;
+                }
+              }
+            }
+          }
+        }
+      }
+
+      .to_top_wrap{
+        display: flex;
+        justify-content: center;
+        .to_top{
+          padding: 16rpx 40rpx;
+          border-radius: 50rpx;
+          background: #F0F0F0;
+          color: #A6A6A6;
+        }
+      }
+    }
+  }
+</style>

package/src/components/JfbFormsQaResult/JfbFormsQaResultLess.less

@@ -0,0 +1,80 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-forms-qa-result {
+  box-sizing: border-box;
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx,&.editx:hover {
+    position: relative;
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: var(--preview-z-index);
+      cursor: pointer;
+    }
+
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(0, rpx);
+    height: unit(50, rpx);
+    z-index: 100;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-forms-qa-result {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbFormsQaResult/JfbFormsQaResultMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-forms-qa-result'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbFormsQaResult/Mock.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  
+}

package/src/components/JfbFormsQuestionAndAnswer/Attr.js

@@ -7,7 +7,30 @@ export default {
   style: [],
   content: (data) => {
     return [
-      
+      {
+        label: "问卷结果跳转路径",
+        ele: 'xd-select-pages-path',
+        valueKey: 'qaResultPath',
+        groupKey:'advanced',
+        placeholder: '请选择问卷详情跳转路径',
+        value: data['qaResultPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        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/JfbFormsQuestionAndAnswer/JfbFormsQuestionAndAnswer.vue

@@ -10,12 +10,15 @@
       :class="{ editx : isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-forms-question-and-answer__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-forms-question-and-answer__edit-icon" @click.stop="delEdit">
+        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      </view>
     </view>
     <!-- #endif -->
     <view class="jfb-forms-question-and-answer__body" :style="{
       '--main-color': mainColor,
       '--main-color-alpha': mainColorAlpha,
+      'min-height': layoutInfo.bodyMinHeight
     }">
       <view v-if="loaded">
         <view v-if="form_status === 'content'">
@@ -30,6 +33,7 @@
             <view v-if="curQA" class="qa_content">
               <view class="qa_type">【{{qaType}}】</view>
               <view class="qa_question">{{ curIndex+1 }}.{{ curQA.field_name }}</view>
+              <view v-if="curQA.is_show_explain === 'Y' && curQA.explain" class="qa_explain">{{ curQA.explain }}</view>
               <view class="qa_answer">
                 <view class="answer_column" v-for="o in curQA.options" :key="o.value"
                   @click="handleCheck(o.value)"
@@ -43,7 +47,7 @@
               </view>
             </view>
           </view>
-          <view v-if="qaResult" class="qa_result">
+          <!-- <view v-if="qaResult" class="qa_result">
             <view class="result_status" v-if="qaResult.right">
               <xd-font-icon class="icon_font" icon="iconzan_mian"></xd-font-icon> 恭喜您，回答正确！</view>
             <template v-else>
@@ -56,8 +60,7 @@
                 <view class="ans_explain">{{ qaResult.explain }}</view>
               </view>
             </template>
-            
-          </view>
+          </view> -->
           <view class="bottom_fixed">
             <xd-button type="primary" :disabled="curIndex === 0"
               :style="[fixedButtonStyle]" @click="handlePrev">上一题</xd-button>
@@ -70,13 +73,20 @@
           <view class="status_tip">您已成功提交</view>
           <view class="status_name">{{ formName }}</view>
           <view class="status_btn_wrap">
-            <view class="status_btn">关闭</view>
-            <view class="status_btn" v-if="marketToolText" 
+            <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> -->
+          <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>
 
     </view>
@@ -94,6 +104,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import Color from "color"
+  import getServiceUrl from '@/common/getServiceUrl'
   export default {
     name: "JfbFormsQuestionAndAnswer",
     components: {
@@ -111,10 +122,12 @@
         loaded: false,
         isPreview: false,
         form_status: "content",
+        err_msg: "",
         formName: "",
         marketing_tool: "",
         activity_page_url: "",
         activity_id: "",
+        emptyImage: getServiceUrl('/common/empty/qa.png'),
         
         value: [],
         qaValue: "",
@@ -124,6 +137,9 @@
 
         curIndex: 0,
         //todo
+
+        qaResultPath: "",
+        qaListPath: "",
       }
     },
     computed: {
@@ -210,8 +226,6 @@
       this.init(this.container);
       this.mainColorAlpha = Color(this.mainColor).alpha(0.15).string();
       this.isPreview = this.$configProject['isPreview'];
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {
@@ -238,6 +252,13 @@
           this.loaded = true;
           this.formList = res.list;
           this.formName = res.form_name;
+          this.err_msg = res.message;
+          if(res.message){
+            this.form_status = "error";
+            return;
+          }
+        }).catch(err => {
+          this.$xdHideLoading();
         })
       },
       /**
@@ -245,10 +266,8 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
+        this.qaResultPath = getContainerPropsValue(container, 'content.qaResultPath', {value: ''}).value;
+        this.qaListPath = getContainerPropsValue(container, 'content.qaListPath', {value: ""}).value;
       },
       handlePrev(){
         if(this.curIndex > 0){
@@ -264,6 +283,15 @@
           this.curIndex++;
         }
       },
+      doClose(){
+        window.location.href = 'about:blank';
+        window.close();
+      },
+      toQaList(){
+        this.$xdUniHelper.redirectTo({
+          url: this.qaListPath
+        })
+      },
       p_submitQaForm(){
         uni.showModal({
           title: '提示',
@@ -275,7 +303,7 @@
                 data: {
                   form_id: this.form_id,
                   contents: this.formList.map(item => {
-                    let content = Array.isArray(item.value) ? item.value : [item.value];
+                    let content = Array.isArray(item.value) ? item.value : (item.value ? [item.value] : []);
                     return {
                       field_id: item.field_id,
                       content: JSON.stringify(content)
@@ -283,13 +311,15 @@
                   }),
                 }
               }).then(res => {
-                const { activity_id, marketing_tool, activity_page_url } = res;
+                const { activity_id, marketing_tool, activity_page_url, main_content_id } = res;
                 this.marketing_tool = marketing_tool;
                 this.activity_page_url = activity_page_url;
                 this.activity_id = activity_id;
-
                 // uni.showToast({title: '提交成功'});
                 this.form_status = 'success';
+                this.$xdUniHelper.navigateTo({
+                  url: this.qaResultPath + `?form_id=${this.form_id}&main_content_id=${main_content_id}`
+                })
               })
             }
           }
@@ -404,6 +434,11 @@
           margin-top: 16rpx;
           font-size: 28rpx;
         }
+        .qa_explain{
+          color: #808080;
+          font-size: 20rpx;
+          margin-top: 10rpx;
+        }
         .qa_answer{
           margin-top: 40rpx;
           font-size: 28rpx;
@@ -469,6 +504,13 @@
         flex-direction: column;
         align-items: center;
         padding-top: 100rpx;
+        .empty_image{
+          width: 500rpx;
+
+          image{
+            width: 100%;
+          }
+        }
         .status_tip{
           color: #06bc85;
           margin-top: 32rpx;

package/src/components/JfbFormsQuestionAndAnswer/JfbFormsQuestionAndAnswerLess.less

@@ -44,17 +44,18 @@
     cursor: pointer;
     position: absolute;
     right: unit(0, rpx);
-    top: unit(-52, rpx);
+    top: unit(0, rpx);
     height: unit(50, rpx);
-    line-height: unit(50, rpx);
+    z-index: 100;
     display: flex;
     justify-content: center;
     align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
+    background: rgba(0, 0, 0, .4);
+    border-radius: 0 0 0 20rpx;
     box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
     color: #fff;
     font-size: unit(22, rpx);
+    padding: 0 6rpx 0 6px;
 
     &-icon{
       padding: 0 unit(20, rpx);