jufubao-base 1.0.233-beta33 → 1.0.234-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.233-beta33",
+  "version": "1.0.234-beta1",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -287,7 +287,7 @@
               ></image>
               <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
             </view>
-
+            <view v-if="info.codes[0].tips" class="jfb-base-order-detail__body-cashier-text">{{ info.codes[0].tips }}</view>
             <view v-if="info.codes[0].can_read_password" class="jfb-base-order-detail__body-cashier-password" @click="showPassword = true">
               {{ showPassword ? info.codes[0].can_read_code : "查看" }}
             </view>
@@ -801,6 +801,7 @@
           </image>
         </view>
       </view>
+      <view v-if="dialogCode && dialogCode.tips" class="dialog_password"> {{ dialogCode.tips}}</view>
       <view v-if="dialogPassword" class="dialog_password">{{ dialogPassword }}</view>
     </xd-dailog>
   </view>
@@ -862,6 +863,7 @@ export default {
 
       showPassword: false,
       dialogPassword: "",
+      dialogCode: null,
 
       //基础
       radius: 0,
@@ -1274,6 +1276,7 @@ export default {
       this.showType = item.show_type;
       this.logo = item.logo;
       this.dialogPassword = item.can_read_code;
+      this.dialogCode = item;
       console.log(this.codeSrc, "this.codeSrc");
       this.showCode = true;
     },

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -102,16 +102,17 @@
                 class="jfb-base-success__body-card jfb-base-success__body-cashier"
               >
                 <view class="jfb-base-success__body-cashier-text">{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
-                  <view style="position: relative">
-                    <image
-                      :style="{
-                        height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
-                        width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
-                      }"
-                      :src="info.codes[0].code_url"
-                    ></image>
-                    <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
-                  </view>
+                <view style="position: relative">
+                  <image
+                    :style="{
+                      height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
+                      width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
+                    }"
+                    :src="info.codes[0].code_url"
+                  ></image>
+                  <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
+                </view>
+                <view v-if="info.codes[0].tips" class="jfb-base-success__body-cashier-text">{{ info.codes[0].tips }}</view>
                 <view
                   v-if="info.codes[0].can_read_password"
                   class="jfb-base-success__body-cashier-password"
@@ -354,6 +355,7 @@
           </image>
         </view>
       </view>
+      <view v-if="dialogCode && dialogCode.tips" class="jfb-base-success__body-d_password">{{ dialogCode.tips }}</view>
       <view v-if="dialogPassword" class="jfb-base-success__body-d_password">
         {{ dialogPassword }}
       </view>
@@ -443,6 +445,7 @@ export default {
       codeSrc: "",
       logo: "",
       dialogPassword: "",
+      dialogCode: null,
       ...styleForm.getDataItem(),
     };
   },
@@ -486,6 +489,7 @@ export default {
       this.showType = item.show_type;
       this.logo = item.logo;
       this.dialogPassword = item.can_read_code;
+      this.dialogCode = item;
       this.showCode = true;
     },
     /**

package/src/components/JfbBaseTfkSearch/Attr.js

@@ -7,6 +7,9 @@ import CusAttr from "./CusAttr";
 export default {
   style: [],
   content: (data) => {
+    let entryGroupId = 'default';
+    if(data['entryGroupId']) entryGroupId = data['entryGroupId'];
+
     return [
       {
         label: '是否支持聚好兑:',
@@ -239,89 +242,12 @@ export default {
         groupKey: "style",
         type: "number",
       },
-      // {
-      //   label: "全部 - 列表单个样式配置",
-      //   ele: "title",
-      //   groupKey:'style',
-      //   size: "small",
-      // },
-      // {
-      //   label: "业务板块列表单个背景色",
-      //   ele: "xd-color",
-      //   valueKey: 'allModuleItemContBgColor',
-      //   value: data['allModuleItemContBgColor'] || '#FFFFFF',
-      //   groupKey:'style',
-      // },
-      // {
-      //   label: "业务板块列表单个间距",
-      //   ele: "el-input",
-      //   valueKey: "allModuleItemContMargin",
-      //   value: data.allModuleItemContMargin || 20,
-      //   groupKey:'style',
-      //   type: "number",
-      // },
-      // {
-      //   label: "业务板块列表单个边框",
-      //   ele: "xd-border",
-      //   valueKey: 'allModuleItemContBorder',
-      //   value: data['allModuleItemContBorder'] || null,
-      //   groupKey:'style',
-      // },
-      // {
-      //   label: "业务板块列表单个阴影",
-      //   ele: "xd-shadow",
-      //   groupKey:'style',
-      //   valueKey: 'allModuleItemContShadow',
-      //   value: data['allModuleItemContShadow'] || null,
-      //   handleCustom({action, data}) {
-      //     XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
-      //       .then(res => {
-      //         data.cb(res.list)
-      //       })
-      //       .catch(error => {
-      //         console.error(error);
-      //         data.cb([])
-      //       });
-      //   },
-      // },
-      // {
-      //   label: "业务板块列表单个内边距",
-      //   ele: "xd-margin-padding",
-      //   valueKey: "allModuleItemContPadding",
-      //   value: data['allModuleItemContPadding'] || null,
-      //   groupKey:'style',
-      //   setting: {
-      //     type: 'padding',
-      //   },
-      //   placeholder: '请设置内边距',
-      //   inline: false,
-      //   notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
-      // },
-      // {
-      //   label: "业务板块列表单个圆角",
-      //   ele: 'xd-site-select-list',
-      //   valueKey: 'allModuleItemContRadius',
-      //   value: data.allModuleItemContRadius || 16,
-      //   groupKey:'style',
-      //   placeholder: '请选择内容圆角设置',
-      //   multiple: false,
-      //   className: 'input80',
-      //   handleCustom({ action, data }) {
-      //     XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
-      //       .then(res => {
-      //         data.cb(res.list)
-      //       })
-      //       .catch(error => {
-      //         console.error(error);
-      //       });
-      //   },
-      // },
 
       {
         label: '选择综合入口类型:',
         ele: 'xd-site-select-list',
         valueKey: 'entryGroupId',
-        value: data.entryGroupId || 'default',
+        value: entryGroupId,
         placeholder: '请选择综合入口类型',
         multiple: false,
         groupKey:'content',
@@ -349,12 +275,12 @@ export default {
         multiple: false,
         className: 'input80',
         setting: {
-          group_id: data.entryGroupId || 'default',
+          group_id: entryGroupId,
         },
-        handleCustom({ action, data }) {
-          XdBus.getParentApi('getSearchSettingOptions')({group_id: 'default', ...data.params})
+        handleCustom(resData) {
+          XdBus.getParentApi('getSearchSettingOptions')(resData.data.params)
             .then(res => {
-              data.cb(res.list)
+              resData.data.cb(res.list)
             })
             .catch(error => {
               console.error(error);