jufubao-forms 1.0.9-beta3 → 1.0.9-beta5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-forms",
-  "version": "1.0.9-beta3",
+  "version": "1.0.9-beta5",
   "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/JfbFormsQaResult/JfbFormsQaResult.vue

@@ -132,6 +132,7 @@
         //todo
 
         returnHomePath: "",
+        returnDetailPath: "",
       }
     },
     computed: {
@@ -201,6 +202,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 +226,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){

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 {
@@ -516,13 +519,14 @@
         position: relative;
         .checkbox_btn{
           position: absolute;
-          bottom: -40rpx;
+          bottom: -80rpx;
           border: 1px solid var(--g-theme-main-color);
           color: var(--g-theme-main-color);
           border-radius: 80rpx;
           padding: 8rpx 32rpx;
           font-size: 28rpx;
           right: 40rpx;
+          z-index: 999;
         }
         .qa_type{
           color: var(--main-color);