jufubao-forms 1.0.1 → 1.0.2-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-forms",
-  "version": "1.0.1",
+  "version": "1.0.2-beta2",
   "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">
@@ -117,28 +119,18 @@
           <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"
-          content-align="left"
-          label-position="left"
-          :paddingBetween="0"
-        >
-          <xd-form-item label="" :labelWidth="1" content-align="left" :paddingBetween="0">
-            <view class="valid_wrap">
-              <xd-form-input v-model="valid_code" placeholder="请输入验证码" style="width: 300rpx;"></xd-form-input>
-              <view class="capture" @click="switchValidToken">
-                <image
-                  style="width: 100%;height:100%"
-                  :src="validImageAPIUrl + '?image_width=180&image_height=80&token='+ valid_token"
-                />
-              </view>
-            </view>
-          </xd-form-item>
-        </xd-form>
-        
+        <view class="valid_wrap">
+          <input v-model="valid_code" placeholder="请输入验证码" class="valid_input"></input>
+          <view class="capture" @click="switchValidToken">
+            <image
+              style="width: 100%;height:100%"
+              :src="validImageAPIUrl + '?image_width=180&image_height=80&token='+ valid_token"
+            />
+          </view>
+        </view>
         <view slot="btn">
           <xd-button type="primary" width="400rpx" @click="doCheckValidCode">提交</xd-button>
         </view>
@@ -198,7 +190,7 @@
         renderForm: "renderForm",
         form_id: "",
         foreign_id: "",
-        isShowDialog: false,
+        isShowDialog: true,
         validImageAPIUrl: "",
         valid_token: "",
         valid_code: "",
@@ -287,7 +279,7 @@
           }
           this.dynamicFormList = res.list.map((item, i) => {
             item.error = "";
-            
+
             if(item.is_show_explain !== 'Y'){
               item.explain = "";
             }
@@ -620,7 +612,7 @@
             return this.getDecimalTip(item);
           }
         }
-        
+
         //开始验证限制范围
         if(fieldValue && !showRange) return errTip;
         max = Number(max);
@@ -740,7 +732,7 @@
           }
         }
       }
-     
+
       .align-center{
         display: flex;
         align-items: center;
@@ -755,6 +747,12 @@
         display: flex;
         align-items: center;
         border: 1px solid #DDD;
+        .valid_input{
+          width: 300rpx;
+          text-align: left;
+          padding-left: 20rpx;
+          flex: 1;
+        }
       }
       .capture{
         width: 180rpx;
@@ -815,7 +813,7 @@
         }
         .uni-easyinput__content-input{
           font-size: 24rpx;
-          
+
           .uni-easyinput__placeholder-class{
             font-size: 24rpx;
           }
@@ -827,7 +825,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,14 +10,16 @@
       :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 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)"
           >

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="{
@@ -29,7 +31,7 @@
           <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>
@@ -422,7 +424,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,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'">
@@ -58,10 +61,12 @@
               </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)"
+            <xd-button v-if="curQA.required && (!qaValue || qaValue.length === 0)" type="primary" :disabled="true"
+              :style="[fixedButtonStyle]" @click="handleNext">{{isLastQA ? '确认提交':'下一题'}}</xd-button>
+            <xd-button type="primary" :disabled="false" v-else
               :style="[fixedButtonStyle]" @click="handleNext">{{isLastQA ? '确认提交':'下一题'}}</xd-button>
           </view>
         </view>
@@ -141,6 +146,9 @@
       }
     },
     computed: {
+      fixedBottom(){
+        return this.fixedStyle({paddingBottom: 24, zIndex: 111})
+      },
       progressBarInnerStyle(){
         let width = ((this.curIndex + 1) / this.formList.length) * 100 + '%';
         return {
@@ -224,8 +232,6 @@
       this.init(this.container);
       this.mainColorAlpha = Color(this.mainColor).alpha(0.15).string();
       this.isPreview = this.$configProject['isPreview'];
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {

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