jufubao-forms 1.0.9-beta4 → 1.0.9-beta6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-forms",
-  "version": "1.0.9-beta4",
+  "version": "1.0.9-beta6",
   "private": false,
   "description": "聚福宝表单业务插件库",
   "main": "index.js",
@@ -86,7 +86,6 @@
     "mini-css-extract-plugin": "^1.1.1",
     "mini-types": "*",
     "miniprogram-api-typings": "*",
-    "node-sass": "^4.0.0",
     "postcss-comment": "^2.0.0",
     "require-context": "^1.1.0",
     "sass": "^1.29.0",

package/src/components/JfbFormsQaRecord/JfbFormsQaRecord.vue

@@ -33,6 +33,7 @@
                   <xd-font-icon icon="iconquanbudingdan1" :size="24" color="#32C93A"></xd-font-icon>
                 </view>
                 答对 {{item.right_number}}题
+                <text v-if="item.score" class="score_text">得分 {{item.score}}分</text>
               </view>
             </view>
           </view>
@@ -111,6 +112,7 @@
             //正确率
             item.right_rate = (item.right_number / item.content_number * 100).toFixed(2);
             item.created_time = this.$xdUniHelper.getDate(item.created_time * 1000).fullTime;
+            item.score = item.score;
             return item;
           });
         })
@@ -182,6 +184,11 @@
             justify-content: center;
             margin-right: 8rpx;
           }
+          .score_text{
+            margin-left: 16rpx;
+            color: #FF7063;
+            font-size: 28rpx;
+          }
         }
         .qa_foot{
           padding: 32rpx 24rpx;

package/src/components/JfbFormsQaResult/JfbFormsQaResult.vue

@@ -41,13 +41,13 @@
           </view>
         </view>
 
-        <view class="analysis_body">
+        <view class="analysis_body" v-if="!hasNoErrorQuestions">
           <view class="analysis_title">
             <view class="_left">选择题</view>
-            <view class="_right">共{{ formList.length }}题</view>
+            <view class="_right">共{{ showFormList.length }}题</view>
           </view>
           <view class="qa_list">
-            <view class="qa_item" v-for="(item,i) in showFormList" :key="item.field_id">
+            <view class="qa_item" v-for="item 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">
@@ -72,6 +72,7 @@
                     <xd-font-icon v-else icon="iconshibai" size="32" color="#FF7063" style="margin-right: 6rpx;"></xd-font-icon>
                     {{ item.isRight ? '回答正确' : '回答错误' }}
                   </view>
+                  <view v-if="item.score">得分{{ item.score }}分</view>
                   <view class="is_right">正确答案: {{ item.answer_right_abc }}</view>
                 </view>
                 <view v-if="!item.isRight && item.answer_analysis" class="answer_analysis">
@@ -84,6 +85,9 @@
             </view>
           </view>
         </view>
+        <view class="no_error_tip" v-if="hasNoErrorQuestions">
+          <text>暂无错题</text>
+        </view>
         <view class="to_top_wrap">
           <view class="to_top" @click="scrollToTop">返回顶部</view>
         </view>
@@ -132,12 +136,16 @@
         //todo
 
         returnHomePath: "",
+        returnDetailPath: "",
       }
     },
     computed: {
       showFormList(){
         return this.isOnlyError ? this.formList.filter(item => !item.isRight) : this.formList;
       },
+      hasNoErrorQuestions(){
+        return this.isOnlyError && this.showFormList.length === 0;
+      },
       marketToolText(){
         let toolText = {
           'prize-answer': '去抽奖',
@@ -201,6 +209,9 @@
           this.activity_page_url = res.activity_page_url;
           this.activity_id = res.activity_id;
           this.foreign_id = res.foreign_id;
+          if (res.previous_page) {
+            this.returnDetailPath = Base64.decode(res.previous_page);
+          }
         })
 
       },
@@ -222,10 +233,16 @@
           })
         }
       },
-      toHomePage(){
-        this.$xdUniHelper.navigateTo({
-          url: this.returnHomePath
-        })
+      toHomePage() {
+        if (this.returnDetailPath) {
+          this.$xdUniHelper.navigateTo({
+            url: this.returnDetailPath
+          })
+        } else {
+          this.$xdUniHelper.navigateTo({
+            url: this.returnHomePath
+          })
+        }
       },
       //判断两个包含数组是否相同
       isSameArray(arr1, arr2){
@@ -481,6 +498,16 @@
           color: #A6A6A6;
         }
       }
+
+      .no_error_tip{
+        background-color: #FFFFFF;
+        padding: 40rpx;
+        text-align: center;
+        text{
+          color: #CCCCCC;
+          font-size: 28rpx;
+        }
+      }
     }
   }
 </style>

package/src/components/JfbFormsQuestionAndAnswer/JfbFormsQuestionAndAnswer.vue

@@ -147,6 +147,7 @@
         banner_image: "",
         qaResultPath: "",
         qaListPath: "",
+        source_path: '',
       }
     },
     computed: {
@@ -259,6 +260,7 @@
     methods: {
       onJfbLoad(options) {
         options.form_id = options.form_id || options.id;
+        this.source_path = options.source_path || '';
         if(!this.isPreview && !options.form_id) {
           return uni.showToast({
             title: '请配置表单id',
@@ -381,6 +383,7 @@
                 data: {
                   form_id: this.form_id,
                   foreign_id: this.foreign_id,
+                  previous_page: this.source_path,
                   contents: this.formList.map(item => {
                     let content = Array.isArray(item.value) ? item.value : (item.value ? [item.value] : []);
                     return {