jufubao-forms 1.0.0-beta5 → 1.0.0-beta6

package/package.json

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

package/src/components/JfbFormsDynamicForm/JfbFormsDynamicForm.vue

@@ -202,6 +202,9 @@
       ...mapState({
         brandInfo: state => state.brandInfo
       }),
+      bucket(){
+        return this.formBe == 1 ? 'default' : 'saas';
+      }
     },
     watch: {
       container(value, oldValue) {
@@ -230,14 +233,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();
@@ -409,14 +412,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();

package/src/components/JfbFormsQaResult/JfbFormsQaResult.vue

@@ -23,7 +23,7 @@
         <view class="result_total">共{{ formList.length }}道题</view>
         <view class="btn_wrap">
           <view class="btn" @click="toHomePage">返回首页</view>
-          <view class="btn primary" @click="isShowAnalysis=true">答案解析</view>
+          <view v-if="is_show_error_answer_analysis==='Y'" class="btn primary" @click="isShowAnalysis=true">答案解析</view>
         </view>
       </view>
       
@@ -117,6 +117,8 @@
 
         isShowAnalysis: false,  //是否显示解析
         isOnlyError: false,  //是否只看错题
+
+        is_show_error_answer_analysis: "", //创建表单是创建的是否展示错误答案解析Y/N
         //todo
 
         returnHomePath: "",
@@ -155,6 +157,7 @@
             '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;

package/src/components/JfbFormsQuestionAndAnswer/JfbFormsQuestionAndAnswer.vue

@@ -70,8 +70,8 @@
           <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>
@@ -81,6 +81,7 @@
           <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>
+          <view class="status_btn" @click="doClose" style="border-radius: 8rpx;">关闭</view>
         </view>
       </view>
 
@@ -276,6 +277,10 @@
           this.curIndex++;
         }
       },
+      doClose(){
+        window.location.href = 'about:blank';
+        window.close();
+      },
       p_submitQaForm(){
         uni.showModal({
           title: '提示',