jufubao-forms 1.0.0-beta5 → 1.0.0-beta7

package/package.json

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

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">
@@ -108,8 +110,8 @@
           <view class="status_name">{{ formName }}</view>
         </view>
       </view>
-      
-      
+
+
       <xd-dialog :show.sync="isShowDialog" title="请输入验证码" :showCloseIcon="false">
         <xd-form
           label-align="left"
@@ -129,7 +131,7 @@
             </view>
           </xd-form-item>
         </xd-form>
-        
+
         <view slot="btn">
           <xd-button type="primary" width="400rpx" @click="doCheckValidCode">提交</xd-button>
         </view>
@@ -202,6 +204,9 @@
       ...mapState({
         brandInfo: state => state.brandInfo
       }),
+      bucket(){
+        return this.formBe == 1 ? 'default' : 'saas';
+      }
     },
     watch: {
       container(value, oldValue) {
@@ -230,14 +235,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 +255,7 @@
           }
           this.dynamicFormList = res.list.map((item, i) => {
             item.error = "";
-            
+
             if(item.is_show_explain !== 'Y'){
               item.explain = "";
             }
@@ -409,14 +414,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();
@@ -565,7 +571,7 @@
             return this.getDecimalTip(item);
           }
         }
-        
+
         //开始验证限制范围
         if(fieldValue && !showRange) return errTip;
         max = Number(max);
@@ -661,7 +667,7 @@
           text-align: center;
         }
       }
-     
+
       .align-center{
         display: flex;
         align-items: center;
@@ -736,7 +742,7 @@
         }
         .uni-easyinput__content-input{
           font-size: 24rpx;
-          
+
           .uni-easyinput__placeholder-class{
             font-size: 24rpx;
           }
@@ -748,7 +754,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/JfbFormsList/JfbFormsList.vue

@@ -10,7 +10,9 @@
       :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">

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/JfbFormsQaResult.vue

@@ -10,7 +10,9 @@
       :class="{ editx : isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-forms-qa-result__edit-icon" @click="delEdit">删除</view>
+      <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="{
@@ -23,10 +25,10 @@
         <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>
@@ -117,6 +119,8 @@
 
         isShowAnalysis: false,  //是否显示解析
         isOnlyError: false,  //是否只看错题
+
+        is_show_error_answer_analysis: "", //创建表单是创建的是否展示错误答案解析Y/N
         //todo
 
         returnHomePath: "",
@@ -155,6 +159,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;
@@ -387,7 +392,7 @@
                 &.a_right{
                   color: #FFFFFF;
                   background: var(--main-color);
-                } 
+                }
                 // &.a_error{
                 //   color: #FF7063;
                 //   background: #FFE3E0;

package/src/components/JfbFormsQaResult/JfbFormsQaResultLess.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/JfbFormsQuestionAndAnswer/JfbFormsQuestionAndAnswer.vue

@@ -10,7 +10,9 @@
       :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="{
@@ -70,8 +72,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 +83,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>
 
@@ -121,7 +124,7 @@
         marketing_tool: "",
         activity_page_url: "",
         activity_id: "",
-        
+
         value: [],
         qaValue: "",
 
@@ -276,6 +279,10 @@
           this.curIndex++;
         }
       },
+      doClose(){
+        window.location.href = 'about:blank';
+        window.close();
+      },
       p_submitQaForm(){
         uni.showModal({
           title: '提示',

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);