jufubao-forms 1.0.0-beta4 → 1.0.0-beta6

package/package.json

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

package/src/components/JfbFormsList/JfbFormsList.vue

@@ -65,6 +65,7 @@
         listPadding: {},
         itemRadius: 0,
         detailPath: "",
+        bucket: "default",
       }
     },
     computed: {
@@ -113,12 +114,14 @@
         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;
       },
       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,

package/src/components/JfbFormsQaResult/JfbFormsQaResult.vue

@@ -23,14 +23,17 @@
         <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>
       
       <template v-if="isShowAnalysis">
         <view class="analysis_head">
           <view class="_left">答案解析</view>
-          <view class="_right" :class="{active: isOnlyError}" @click="isOnlyError=!isOnlyError">仅看错题</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">
@@ -41,20 +44,19 @@
           <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">{{ i + 1 }}.{{ item.field_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_right,
-                    a_error : ans.is_error
+                    a_right : ans.is_checked,
                   }"
                 >
                   {{ans.abc}} {{ ans.label }}
-                  <view v-if="ans.is_error" class="err_tip">
+                  <!-- <view v-if="ans.is_error" class="err_tip">
                     <xd-font-icon icon="iconguanbi" size="32" color="#FF7063"></xd-font-icon>
-                  </view>
+                  </view> -->
                 </view>
                 <!-- <view class="answer_item a_error a_right">ASF3244</view> -->
               </view>
@@ -88,6 +90,7 @@
 <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";
@@ -98,7 +101,8 @@
     name: "JfbFormsQaResult",
     components: {
       XdFontIcon,
-      XdButton
+      XdButton,
+      XdRadio
     },
     mixins: [
       componentsMixins, extsMixins, JfbFormsQaResultMixin
@@ -113,6 +117,8 @@
 
         isShowAnalysis: false,  //是否显示解析
         isOnlyError: false,  //是否只看错题
+
+        is_show_error_answer_analysis: "", //创建表单是创建的是否展示错误答案解析Y/N
         //todo
 
         returnHomePath: "",
@@ -151,15 +157,18 @@
             'radio': '单选',
             'checkbox': '多选'
           }
-          this.formList = res.list.map(item => {
+          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 = defaultValue;
+            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_error'] = item.answer.includes(ans.value) && !item.rightValue.includes(ans.value);
-              ans['is_right'] = item.rightValue.includes(ans.value);
+              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;
             })
@@ -195,7 +204,7 @@
       },
       getRightAbc(item){
         return item.options.filter((ans) => {
-          return item.rightValue.includes(ans.value)
+          return item.answer.includes(ans.value)
         }).map(item => item.abc).join(",")
       },
       scrollToTop(){
@@ -295,14 +304,16 @@
           font-size: 28rpx;
         }
         ._right{
-          border: 1px solid #666666;
-          padding: 14rpx 24rpx;
+          // 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);
+            // border: 1px solid var(--main-color);
             color: var(--main-color);
           }
         }
@@ -379,11 +390,11 @@
                 &.a_right{
                   color: #FFFFFF;
                   background: var(--main-color);
-                }
-                &.a_error{
-                  color: #FF7063;
-                  background: #FFE3E0;
-                }
+                } 
+                // &.a_error{
+                //   color: #FF7063;
+                //   background: #FFE3E0;
+                // }
               }
             }
             .qa_explain{

package/src/components/JfbFormsQuestionAndAnswer/JfbFormsQuestionAndAnswer.vue

@@ -30,6 +30,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 +44,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 +57,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,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: '提示',
@@ -287,7 +292,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)
@@ -418,6 +423,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;